Fix "View more conversations" button on widget

Closes #1516
This commit is contained in:
Moez Bhatti
2021-01-02 14:52:02 -05:00
parent 272ae27cc9
commit 455de368e6
3 changed files with 8 additions and 6 deletions
@@ -160,6 +160,7 @@ class MainViewModel @Inject constructor(
.autoDisposable(view.scope()) .autoDisposable(view.scope())
.subscribe { intent -> .subscribe { intent ->
when (intent.getStringExtra("screen")) { when (intent.getStringExtra("screen")) {
"compose" -> navigator.showConversation(intent.getLongExtra("threadId", 0))
"blocking" -> navigator.showBlockedConversations() "blocking" -> navigator.showBlockedConversations()
} }
} }
@@ -18,8 +18,8 @@
*/ */
package com.moez.QKSMS.feature.widget package com.moez.QKSMS.feature.widget
import android.app.PendingIntent
import android.appwidget.AppWidgetManager import android.appwidget.AppWidgetManager
import android.content.ComponentName
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.text.SpannableStringBuilder 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.DateFormatter
import com.moez.QKSMS.common.util.extensions.dpToPx import com.moez.QKSMS.common.util.extensions.dpToPx
import com.moez.QKSMS.common.util.extensions.getColorCompat 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.feature.main.MainActivity
import com.moez.QKSMS.injection.appComponent import com.moez.QKSMS.injection.appComponent
import com.moez.QKSMS.model.Contact 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)) remoteViews.setTextViewText(R.id.snippet, boldText(snippet, conversation.unread))
// Launch conversation on click // 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) remoteViews.setOnClickFillInIntent(R.id.conversation, clickIntent)
return remoteViews return remoteViews
@@ -171,11 +174,9 @@ class WidgetAdapter(intent: Intent) : RemoteViewsService.RemoteViewsFactory {
private fun getOverflowView(): RemoteViews { private fun getOverflowView(): RemoteViews {
val view = RemoteViews(context.packageName, R.layout.widget_loading) 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.setTextColor(R.id.loadingText, textSecondary)
view.setTextViewText(R.id.loadingText, context.getString(R.string.widget_more)) 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 return view
} }
@@ -149,7 +149,7 @@ class WidgetProvider : AppWidgetProvider() {
remoteViews.setOnClickPendingIntent(R.id.compose, composePI) remoteViews.setOnClickPendingIntent(R.id.compose, composePI)
// Conversation intent // 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) val startActivityPendingIntent = PendingIntent.getActivity(context, 0, startActivityIntent, PendingIntent.FLAG_UPDATE_CURRENT)
remoteViews.setPendingIntentTemplate(R.id.conversations, startActivityPendingIntent) remoteViews.setPendingIntentTemplate(R.id.conversations, startActivityPendingIntent)