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 3b6e4a4f..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 @@ -26,7 +26,6 @@ import android.content.ComponentName import android.content.Context import android.content.Intent import android.content.res.Configuration -import android.net.Uri import android.os.Bundle import android.widget.RemoteViews import dagger.android.AndroidInjection @@ -40,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() { @@ -138,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