Update draft display in widget

This commit is contained in:
Moez Bhatti
2020-05-10 14:28:52 -04:00
parent 7fd7b2ce13
commit 35ccd05374
@@ -27,6 +27,8 @@ import android.view.View
import android.widget.RemoteViews import android.widget.RemoteViews
import android.widget.RemoteViewsService import android.widget.RemoteViewsService
import androidx.core.text.bold import androidx.core.text.bold
import androidx.core.text.buildSpannedString
import androidx.core.text.color
import com.moez.QKSMS.R import com.moez.QKSMS.R
import com.moez.QKSMS.common.util.Colors import com.moez.QKSMS.common.util.Colors
import com.moez.QKSMS.common.util.DateFormatter import com.moez.QKSMS.common.util.DateFormatter
@@ -139,7 +141,12 @@ class WidgetAdapter(intent: Intent) : RemoteViewsService.RemoteViewsFactory {
// Name // Name
remoteViews.setTextColor(R.id.name, textPrimary) remoteViews.setTextColor(R.id.name, textPrimary)
remoteViews.setTextViewText(R.id.name, boldText(conversation.getTitle(), conversation.unread)) remoteViews.setTextViewText(R.id.name, boldText(buildSpannedString {
append(conversation.getTitle())
if (conversation.draft.isNotEmpty()) {
color(theme.theme) { append(" " + context.getString(R.string.main_draft)) }
}
}, conversation.unread))
// Date // Date
val timestamp = conversation.date.takeIf { it > 0 }?.let(dateFormatter::getConversationTimestamp) val timestamp = conversation.date.takeIf { it > 0 }?.let(dateFormatter::getConversationTimestamp)
@@ -148,7 +155,7 @@ class WidgetAdapter(intent: Intent) : RemoteViewsService.RemoteViewsFactory {
// Snippet // Snippet
val snippet = when { val snippet = when {
conversation.draft.isNotEmpty() -> context.getString(R.string.main_draft, conversation.draft) conversation.draft.isNotEmpty() -> conversation.draft
conversation.me -> context.getString(R.string.main_sender_you, conversation.snippet) conversation.me -> context.getString(R.string.main_sender_you, conversation.snippet)
else -> conversation.snippet else -> conversation.snippet
} }
@@ -172,7 +179,7 @@ class WidgetAdapter(intent: Intent) : RemoteViewsService.RemoteViewsFactory {
return view return view
} }
private fun boldText(text: String?, shouldBold: Boolean): CharSequence? = when { private fun boldText(text: CharSequence?, shouldBold: Boolean): CharSequence? = when {
shouldBold -> SpannableStringBuilder() shouldBold -> SpannableStringBuilder()
.bold { append(text) } .bold { append(text) }
else -> text else -> text