changes to allow individual widget conversations to launch corresponding compose activity in thread of conversation. widget footer item 'view more conversations' launches main activity/conversations view.

This commit is contained in:
gavine99
2025-01-15 19:59:54 +11:00
parent 75b4cf17d1
commit 0a75651ede
6 changed files with 122 additions and 23 deletions
@@ -19,7 +19,6 @@
package dev.octoshrimpy.quik.feature.widget
import android.appwidget.AppWidgetManager
import android.content.ComponentName
import android.content.Context
import android.content.Intent
import android.text.SpannableStringBuilder
@@ -34,12 +33,11 @@ import dev.octoshrimpy.quik.common.util.Colors
import dev.octoshrimpy.quik.common.util.DateFormatter
import dev.octoshrimpy.quik.common.util.extensions.dpToPx
import dev.octoshrimpy.quik.common.util.extensions.getColorCompat
import dev.octoshrimpy.quik.feature.compose.ComposeActivity
import dev.octoshrimpy.quik.feature.main.MainActivity
import dev.octoshrimpy.quik.injection.appComponent
import dev.octoshrimpy.quik.model.Contact
import dev.octoshrimpy.quik.model.Conversation
import dev.octoshrimpy.quik.model.PhoneNumber
import dev.octoshrimpy.quik.receiver.StartActivityFromWidgetReceiver
import dev.octoshrimpy.quik.repository.ConversationRepository
import dev.octoshrimpy.quik.util.GlideApp
import dev.octoshrimpy.quik.util.Preferences
@@ -163,11 +161,13 @@ class WidgetAdapter(intent: Intent) : RemoteViewsService.RemoteViewsFactory {
remoteViews.setTextColor(R.id.snippet, if (conversation.unread) textPrimary else textTertiary)
remoteViews.setTextViewText(R.id.snippet, boldText(snippet, conversation.unread))
// Launch conversation on click
val clickIntent = Intent()
.putExtra("screen", "compose")
// set fill-in intent to be used for current item
remoteViews.setOnClickFillInIntent(
R.id.conversation,
Intent()
.putExtra("activityToStart", StartActivityFromWidgetReceiver.COMPOSE_ACTIVITY)
.putExtra("threadId", conversation.id)
remoteViews.setOnClickFillInIntent(R.id.conversation, clickIntent)
)
return remoteViews
}
@@ -176,7 +176,11 @@ class WidgetAdapter(intent: Intent) : RemoteViewsService.RemoteViewsFactory {
val view = RemoteViews(context.packageName, R.layout.widget_loading)
view.setTextColor(R.id.loadingText, textSecondary)
view.setTextViewText(R.id.loadingText, context.getString(R.string.widget_more))
view.setOnClickFillInIntent(R.id.loading, Intent())
view.setOnClickFillInIntent(
R.id.loadingText,
Intent()
.putExtra("activityToStart", StartActivityFromWidgetReceiver.MAIN_ACTIVITY)
)
return view
}
@@ -35,6 +35,7 @@ import dev.octoshrimpy.quik.common.util.extensions.getColorCompat
import dev.octoshrimpy.quik.feature.compose.ComposeActivity
import dev.octoshrimpy.quik.feature.main.MainActivity
import dev.octoshrimpy.quik.manager.WidgetManager
import dev.octoshrimpy.quik.receiver.StartActivityFromWidgetReceiver
import dev.octoshrimpy.quik.util.Preferences
import timber.log.Timber
import javax.inject.Inject
@@ -129,8 +130,6 @@ class WidgetProvider : AppWidgetProvider() {
false -> R.color.textPrimary
}))
remoteViews.setInt(R.id.compose, "setColorFilter", colors.theme().theme)
// Set adapter for conversations
val intent = Intent(context, WidgetService::class.java)
.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId)
@@ -138,20 +137,40 @@ class WidgetProvider : AppWidgetProvider() {
intent.data = Uri.parse(intent.toUri(Intent.URI_INTENT_SCHEME))
remoteViews.setRemoteAdapter(R.id.conversations, intent)
// Main intent
val mainIntent = Intent(context, MainActivity::class.java)
val mainPI = PendingIntent.getActivity(context, 0, mainIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
remoteViews.setOnClickPendingIntent(R.id.title, mainPI)
// compose new message image color and on click intent
remoteViews.setInt(R.id.compose, "setColorFilter", colors.theme().theme)
remoteViews.setOnClickPendingIntent(
R.id.compose,
PendingIntent.getActivity(
context,
0,
Intent(context, ComposeActivity::class.java),
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
)
)
// Compose intent
val composeIntent = Intent(context, ComposeActivity::class.java)
val composePI = PendingIntent.getActivity(context, 0, composeIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
remoteViews.setOnClickPendingIntent(R.id.compose, composePI)
// use a single pending intent for launching main activity because they
// can sometimes be in short supply in the OS
val mainActivityPendingIntent = PendingIntent.getActivity(
context,
99,
Intent(context, MainActivity::class.java),
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
)
// Conversation intent
val startActivityIntent = Intent(context, MainActivity::class.java)
val startActivityPendingIntent = PendingIntent.getActivity(context, 0, startActivityIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
remoteViews.setPendingIntentTemplate(R.id.conversations, startActivityPendingIntent)
// title click to load app main activity / conversation view
remoteViews.setOnClickPendingIntent(R.id.title, mainActivityPendingIntent)
// pending intent template to be used for all list items
remoteViews.setPendingIntentTemplate(
R.id.conversations,
PendingIntent.getBroadcast(
context,
1,
Intent(context, StartActivityFromWidgetReceiver::class.java),
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE
)
)
AppWidgetManager.getInstance(context).updateAppWidget(appWidgetId, remoteViews)
}
@@ -41,6 +41,7 @@ import dev.octoshrimpy.quik.receiver.SmsSentReceiver
import dagger.Module
import dagger.android.ContributesAndroidInjector
import dev.octoshrimpy.quik.receiver.SpeakThreadsReceiver
import dev.octoshrimpy.quik.receiver.StartActivityFromWidgetReceiver
@Module
abstract class BroadcastReceiverBuilderModule {
@@ -73,6 +74,10 @@ abstract class BroadcastReceiverBuilderModule {
@ContributesAndroidInjector()
abstract fun bindSpeakThreadsReceiver(): SpeakThreadsReceiver
@ActivityScope
@ContributesAndroidInjector()
abstract fun bindStartActivityFromWidgetReceiver(): StartActivityFromWidgetReceiver
@ActivityScope
@ContributesAndroidInjector()
abstract fun bindMarkSeenReceiver(): MarkSeenReceiver