diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml index e96f2d2a..9009d685 100644 --- a/presentation/src/main/AndroidManifest.xml +++ b/presentation/src/main/AndroidManifest.xml @@ -201,6 +201,7 @@ 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 14e4c00a..f08f2bdb 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 @@ -94,7 +94,7 @@ class WidgetAdapter(intent: Intent) : RemoteViewsService.RemoteViewsFactory { * we'll return the max count + 1, where the last row just shows "View more conversations" */ override fun getCount(): Int { - val count = Math.min(conversations.size, MAX_CONVERSATIONS_COUNT) + val count = conversations.size.coerceAtMost(MAX_CONVERSATIONS_COUNT) val shouldShowViewMore = count < conversations.size return count + if (shouldShowViewMore) 1 else 0 } 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 78c6f191..8ff9ed13 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 @@ -25,7 +25,7 @@ import android.appwidget.AppWidgetProvider import android.content.ComponentName import android.content.Context import android.content.Intent -import android.net.Uri +import android.content.res.Configuration import android.os.Bundle import android.widget.RemoteViews import dagger.android.AndroidInjection @@ -39,6 +39,7 @@ import dev.octoshrimpy.quik.receiver.StartActivityFromWidgetReceiver import dev.octoshrimpy.quik.util.Preferences import timber.log.Timber import javax.inject.Inject +import androidx.core.net.toUri class WidgetProvider : AppWidgetProvider() { @@ -109,8 +110,11 @@ class WidgetProvider : AppWidgetProvider() { Timber.v("updateWidget appWidgetId: $appWidgetId") val remoteViews = RemoteViews(context.packageName, R.layout.widget) + val nightModeFlags = context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK + val isNightMode = nightModeFlags == Configuration.UI_MODE_NIGHT_YES + // Apply colors from theme - val night = prefs.night.get() + val night = prefs.night.get() || isNightMode val black = prefs.black.get() remoteViews.setInt(R.id.background, "setColorFilter", context.getColorCompat(when { @@ -134,7 +138,7 @@ class WidgetProvider : AppWidgetProvider() { val intent = Intent(context, WidgetService::class.java) .putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId) .putExtra("small_widget", smallWidget) - intent.data = Uri.parse(intent.toUri(Intent.URI_INTENT_SCHEME)) + intent.data = intent.toUri(Intent.URI_INTENT_SCHEME).toUri() remoteViews.setRemoteAdapter(R.id.conversations, intent) // compose new message image color and on click intent diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 72ecdb1e..5d7a4a13 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -433,6 +433,7 @@ Loading… View more conversations + All Conversations Mark read Call