From 455de368e6c14bbe235f212f0f8eb5805aa405e2 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 2 Jan 2021 14:52:02 -0500 Subject: [PATCH] Fix "View more conversations" button on widget Closes #1516 --- .../java/com/moez/QKSMS/feature/main/MainViewModel.kt | 1 + .../com/moez/QKSMS/feature/widget/WidgetAdapter.kt | 11 ++++++----- .../com/moez/QKSMS/feature/widget/WidgetProvider.kt | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt index 20933a82..e1c2fc0e 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt @@ -160,6 +160,7 @@ class MainViewModel @Inject constructor( .autoDisposable(view.scope()) .subscribe { intent -> when (intent.getStringExtra("screen")) { + "compose" -> navigator.showConversation(intent.getLongExtra("threadId", 0)) "blocking" -> navigator.showBlockedConversations() } } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetAdapter.kt index e31596b5..325771ec 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetAdapter.kt @@ -18,8 +18,8 @@ */ package com.moez.QKSMS.feature.widget -import android.app.PendingIntent import android.appwidget.AppWidgetManager +import android.content.ComponentName import android.content.Context import android.content.Intent import android.text.SpannableStringBuilder @@ -34,6 +34,7 @@ import com.moez.QKSMS.common.util.Colors import com.moez.QKSMS.common.util.DateFormatter import com.moez.QKSMS.common.util.extensions.dpToPx import com.moez.QKSMS.common.util.extensions.getColorCompat +import com.moez.QKSMS.feature.compose.ComposeActivity import com.moez.QKSMS.feature.main.MainActivity import com.moez.QKSMS.injection.appComponent import com.moez.QKSMS.model.Contact @@ -163,7 +164,9 @@ class WidgetAdapter(intent: Intent) : RemoteViewsService.RemoteViewsFactory { remoteViews.setTextViewText(R.id.snippet, boldText(snippet, conversation.unread)) // Launch conversation on click - val clickIntent = Intent().putExtra("threadId", conversation.id) + val clickIntent = Intent() + .putExtra("screen", "compose") + .putExtra("threadId", conversation.id) remoteViews.setOnClickFillInIntent(R.id.conversation, clickIntent) return remoteViews @@ -171,11 +174,9 @@ class WidgetAdapter(intent: Intent) : RemoteViewsService.RemoteViewsFactory { private fun getOverflowView(): RemoteViews { val view = RemoteViews(context.packageName, R.layout.widget_loading) - val intent = Intent(context, MainActivity::class.java) - val pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT) view.setTextColor(R.id.loadingText, textSecondary) view.setTextViewText(R.id.loadingText, context.getString(R.string.widget_more)) - view.setOnClickPendingIntent(R.id.loading, pendingIntent) + view.setOnClickFillInIntent(R.id.loading, Intent()) return view } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt index 0bb09316..696823f1 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt @@ -149,7 +149,7 @@ class WidgetProvider : AppWidgetProvider() { remoteViews.setOnClickPendingIntent(R.id.compose, composePI) // Conversation intent - val startActivityIntent = Intent(context, ComposeActivity::class.java) + val startActivityIntent = Intent(context, MainActivity::class.java) val startActivityPendingIntent = PendingIntent.getActivity(context, 0, startActivityIntent, PendingIntent.FLAG_UPDATE_CURRENT) remoteViews.setPendingIntentTemplate(R.id.conversations, startActivityPendingIntent)