Merge pull request #935 from synonymdev/fix/os-widgets-fixes

ovitrif · web-flow · commit 87c788edb670 · 2026-05-07T23:02:30.000+02:00
diff --git a/app/src/main/java/to/bitkit/appwidget/config/AppWidgetConfigActivity.kt b/app/src/main/java/to/bitkit/appwidget/config/AppWidgetConfigActivity.kt
@@ -85,8 +85,8 @@ class AppWidgetConfigActivity : ComponentActivity() {
         val providerClass = AppWidgetManager.getInstance(this)
             .getAppWidgetInfo(appWidgetId)?.provider?.className
         return when (providerClass) {
-            HeadlinesGlanceReceiver::class.java.name -> AppWidgetType.HEADLINES
             PriceGlanceReceiver::class.java.name -> AppWidgetType.PRICE
+            HeadlinesGlanceReceiver::class.java.name -> AppWidgetType.HEADLINES
             BlocksGlanceReceiver::class.java.name -> AppWidgetType.BLOCKS
             WeatherGlanceReceiver::class.java.name -> AppWidgetType.WEATHER
             else -> {
diff --git a/app/src/main/java/to/bitkit/appwidget/config/BlocksConfigContent.kt b/app/src/main/java/to/bitkit/appwidget/config/BlocksConfigContent.kt
@@ -198,7 +198,7 @@ private fun BlockToggleRow(
                 Icon(
                     painter = painterResource(R.drawable.ic_checkmark),
                     contentDescription = null,
-                    tint = if (isEnabled) Colors.Brand else Colors.White50,
+                    tint = if (isEnabled) Colors.Brand else Colors.Gray3,
                     modifier = Modifier.size(32.dp)
                 )
             }
diff --git a/app/src/main/java/to/bitkit/appwidget/config/HeadlinesConfigContent.kt b/app/src/main/java/to/bitkit/appwidget/config/HeadlinesConfigContent.kt
@@ -154,7 +154,7 @@ private fun ToggleRow(
             Icon(
                 painter = painterResource(R.drawable.ic_checkmark),
                 contentDescription = null,
-                tint = if (isEnabled) Colors.Brand else Colors.White50,
+                tint = if (isEnabled) Colors.Brand else Colors.Gray3,
                 modifier = Modifier.size(32.dp)
             )
         }
diff --git a/app/src/main/java/to/bitkit/appwidget/config/PriceConfigContent.kt b/app/src/main/java/to/bitkit/appwidget/config/PriceConfigContent.kt
@@ -136,14 +136,12 @@ private fun SelectableRow(
                 color = if (isSelected) Colors.White else Colors.White64,
                 modifier = Modifier.weight(1f)
             )
-            if (isSelected) {
-                Icon(
-                    painter = painterResource(R.drawable.ic_checkmark),
-                    contentDescription = null,
-                    tint = Colors.Brand,
-                    modifier = Modifier.size(32.dp)
-                )
-            }
+            Icon(
+                painter = painterResource(R.drawable.ic_checkmark),
+                contentDescription = null,
+                tint = if (isSelected) Colors.Brand else Colors.Gray3,
+                modifier = Modifier.size(32.dp)
+            )
         }
         HorizontalDivider()
     }
diff --git a/app/src/main/java/to/bitkit/appwidget/config/WeatherConfigContent.kt b/app/src/main/java/to/bitkit/appwidget/config/WeatherConfigContent.kt
@@ -147,7 +147,7 @@ private fun WeatherOptionRow(
             Icon(
                 painter = painterResource(R.drawable.ic_checkmark),
                 contentDescription = null,
-                tint = if (isSelected) Colors.Brand else Colors.White50,
+                tint = if (isSelected) Colors.Brand else Colors.Gray3,
                 modifier = Modifier.size(32.dp)
             )
         }
diff --git a/app/src/main/java/to/bitkit/appwidget/ui/blocks/BlocksGlanceReceiver.kt b/app/src/main/java/to/bitkit/appwidget/ui/blocks/BlocksGlanceReceiver.kt
@@ -3,11 +3,6 @@ package to.bitkit.appwidget.ui.blocks
 import android.content.Context
 import androidx.glance.appwidget.GlanceAppWidget
 import androidx.glance.appwidget.GlanceAppWidgetReceiver
-import dagger.hilt.android.EntryPointAccessors
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import to.bitkit.appwidget.AppWidgetEntryPoint
 import to.bitkit.appwidget.AppWidgetRefreshWorker
 
 class BlocksGlanceReceiver : GlanceAppWidgetReceiver() {
@@ -18,21 +13,6 @@ class BlocksGlanceReceiver : GlanceAppWidgetReceiver() {
         AppWidgetRefreshWorker.enqueue(context)
     }
 
-    override fun onDeleted(context: Context, appWidgetIds: IntArray) {
-        super.onDeleted(context, appWidgetIds)
-        val pendingResult = goAsync()
-        val store = EntryPointAccessors
-            .fromApplication(context, AppWidgetEntryPoint::class.java)
-            .appWidgetPreferencesStore()
-        CoroutineScope(Dispatchers.IO).launch {
-            try {
-                appWidgetIds.forEach { store.unregisterWidget(it) }
-            } finally {
-                pendingResult.finish()
-            }
-        }
-    }
-
     override fun onDisabled(context: Context) {
         super.onDisabled(context)
         AppWidgetRefreshWorker.cancelIfNoWidgets(context)
diff --git a/app/src/main/java/to/bitkit/appwidget/ui/blocks/BlocksGlanceWidget.kt b/app/src/main/java/to/bitkit/appwidget/ui/blocks/BlocksGlanceWidget.kt
@@ -37,4 +37,12 @@ class BlocksGlanceWidget : GlanceAppWidget() {
             )
         }
     }
+
+    override suspend fun onDelete(context: Context, glanceId: GlanceId) {
+        val appWidgetId = GlanceAppWidgetManager(context).getAppWidgetId(glanceId)
+        EntryPointAccessors
+            .fromApplication(context, AppWidgetEntryPoint::class.java)
+            .appWidgetPreferencesStore()
+            .unregisterWidget(appWidgetId)
+    }
 }
diff --git a/app/src/main/java/to/bitkit/appwidget/ui/facts/FactsGlanceReceiver.kt b/app/src/main/java/to/bitkit/appwidget/ui/facts/FactsGlanceReceiver.kt
@@ -3,11 +3,6 @@ package to.bitkit.appwidget.ui.facts
 import android.content.Context
 import androidx.glance.appwidget.GlanceAppWidget
 import androidx.glance.appwidget.GlanceAppWidgetReceiver
-import dagger.hilt.android.EntryPointAccessors
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import to.bitkit.appwidget.AppWidgetEntryPoint
 import to.bitkit.appwidget.AppWidgetRefreshWorker
 
 class FactsGlanceReceiver : GlanceAppWidgetReceiver() {
@@ -18,21 +13,6 @@ class FactsGlanceReceiver : GlanceAppWidgetReceiver() {
         AppWidgetRefreshWorker.enqueue(context)
     }
 
-    override fun onDeleted(context: Context, appWidgetIds: IntArray) {
-        super.onDeleted(context, appWidgetIds)
-        val pendingResult = goAsync()
-        val store = EntryPointAccessors
-            .fromApplication(context, AppWidgetEntryPoint::class.java)
-            .appWidgetPreferencesStore()
-        CoroutineScope(Dispatchers.IO).launch {
-            try {
-                appWidgetIds.forEach { store.unregisterWidget(it) }
-            } finally {
-                pendingResult.finish()
-            }
-        }
-    }
-
     override fun onDisabled(context: Context) {
         super.onDisabled(context)
         AppWidgetRefreshWorker.cancelIfNoWidgets(context)
diff --git a/app/src/main/java/to/bitkit/appwidget/ui/facts/FactsGlanceWidget.kt b/app/src/main/java/to/bitkit/appwidget/ui/facts/FactsGlanceWidget.kt
@@ -48,4 +48,12 @@ class FactsGlanceWidget : GlanceAppWidget() {
             FactsGlanceContent(fact = fact)
         }
     }
+
+    override suspend fun onDelete(context: Context, glanceId: GlanceId) {
+        val appWidgetId = GlanceAppWidgetManager(context).getAppWidgetId(glanceId)
+        EntryPointAccessors
+            .fromApplication(context, AppWidgetEntryPoint::class.java)
+            .appWidgetPreferencesStore()
+            .unregisterWidget(appWidgetId)
+    }
 }
diff --git a/app/src/main/java/to/bitkit/appwidget/ui/headlines/HeadlinesGlanceReceiver.kt b/app/src/main/java/to/bitkit/appwidget/ui/headlines/HeadlinesGlanceReceiver.kt
@@ -3,11 +3,6 @@ package to.bitkit.appwidget.ui.headlines
 import android.content.Context
 import androidx.glance.appwidget.GlanceAppWidget
 import androidx.glance.appwidget.GlanceAppWidgetReceiver
-import dagger.hilt.android.EntryPointAccessors
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import to.bitkit.appwidget.AppWidgetEntryPoint
 import to.bitkit.appwidget.AppWidgetRefreshWorker
 
 class HeadlinesGlanceReceiver : GlanceAppWidgetReceiver() {
@@ -18,21 +13,6 @@ class HeadlinesGlanceReceiver : GlanceAppWidgetReceiver() {
         AppWidgetRefreshWorker.enqueue(context)
     }
 
-    override fun onDeleted(context: Context, appWidgetIds: IntArray) {
-        super.onDeleted(context, appWidgetIds)
-        val pendingResult = goAsync()
-        CoroutineScope(Dispatchers.IO).launch {
-            try {
-                val store = EntryPointAccessors
-                    .fromApplication(context, AppWidgetEntryPoint::class.java)
-                    .appWidgetPreferencesStore()
-                appWidgetIds.forEach { store.unregisterWidget(it) }
-            } finally {
-                pendingResult.finish()
-            }
-        }
-    }
-
     override fun onDisabled(context: Context) {
         super.onDisabled(context)
         AppWidgetRefreshWorker.cancelIfNoWidgets(context)
diff --git a/app/src/main/java/to/bitkit/appwidget/ui/headlines/HeadlinesGlanceWidget.kt b/app/src/main/java/to/bitkit/appwidget/ui/headlines/HeadlinesGlanceWidget.kt
@@ -50,4 +50,12 @@ class HeadlinesGlanceWidget : GlanceAppWidget() {
             )
         }
     }
+
+    override suspend fun onDelete(context: Context, glanceId: GlanceId) {
+        val appWidgetId = GlanceAppWidgetManager(context).getAppWidgetId(glanceId)
+        EntryPointAccessors
+            .fromApplication(context, AppWidgetEntryPoint::class.java)
+            .appWidgetPreferencesStore()
+            .unregisterWidget(appWidgetId)
+    }
 }
diff --git a/app/src/main/java/to/bitkit/appwidget/ui/price/PriceGlanceReceiver.kt b/app/src/main/java/to/bitkit/appwidget/ui/price/PriceGlanceReceiver.kt
@@ -3,11 +3,6 @@ package to.bitkit.appwidget.ui.price
 import android.content.Context
 import androidx.glance.appwidget.GlanceAppWidget
 import androidx.glance.appwidget.GlanceAppWidgetReceiver
-import dagger.hilt.android.EntryPointAccessors
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import to.bitkit.appwidget.AppWidgetEntryPoint
 import to.bitkit.appwidget.AppWidgetRefreshWorker
 
 class PriceGlanceReceiver : GlanceAppWidgetReceiver() {
@@ -18,21 +13,6 @@ class PriceGlanceReceiver : GlanceAppWidgetReceiver() {
         AppWidgetRefreshWorker.enqueue(context)
     }
 
-    override fun onDeleted(context: Context, appWidgetIds: IntArray) {
-        super.onDeleted(context, appWidgetIds)
-        val pendingResult = goAsync()
-        CoroutineScope(Dispatchers.IO).launch {
-            try {
-                val store = EntryPointAccessors
-                    .fromApplication(context, AppWidgetEntryPoint::class.java)
-                    .appWidgetPreferencesStore()
-                appWidgetIds.forEach { store.unregisterWidget(it) }
-            } finally {
-                pendingResult.finish()
-            }
-        }
-    }
-
     override fun onDisabled(context: Context) {
         super.onDisabled(context)
         AppWidgetRefreshWorker.cancelIfNoWidgets(context)
diff --git a/app/src/main/java/to/bitkit/appwidget/ui/price/PriceGlanceWidget.kt b/app/src/main/java/to/bitkit/appwidget/ui/price/PriceGlanceWidget.kt
@@ -58,6 +58,14 @@ class PriceGlanceWidget : GlanceAppWidget() {
         }
     }
 
+    override suspend fun onDelete(context: Context, glanceId: GlanceId) {
+        val appWidgetId = GlanceAppWidgetManager(context).getAppWidgetId(glanceId)
+        EntryPointAccessors
+            .fromApplication(context, AppWidgetEntryPoint::class.java)
+            .appWidgetPreferencesStore()
+            .unregisterWidget(appWidgetId)
+    }
+
     private fun resolveWidget(price: PriceDTO?, entry: AppWidgetEntry): PriceWidgetData? {
         val widgets = price?.widgets ?: return null
         val enabledPairs = entry.pricePreferences.enabledPairs
diff --git a/app/src/main/java/to/bitkit/appwidget/ui/weather/WeatherGlanceReceiver.kt b/app/src/main/java/to/bitkit/appwidget/ui/weather/WeatherGlanceReceiver.kt
@@ -3,11 +3,6 @@ package to.bitkit.appwidget.ui.weather
 import android.content.Context
 import androidx.glance.appwidget.GlanceAppWidget
 import androidx.glance.appwidget.GlanceAppWidgetReceiver
-import dagger.hilt.android.EntryPointAccessors
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import to.bitkit.appwidget.AppWidgetEntryPoint
 import to.bitkit.appwidget.AppWidgetRefreshWorker
 
 class WeatherGlanceReceiver : GlanceAppWidgetReceiver() {
@@ -18,21 +13,6 @@ class WeatherGlanceReceiver : GlanceAppWidgetReceiver() {
         AppWidgetRefreshWorker.enqueue(context)
     }
 
-    override fun onDeleted(context: Context, appWidgetIds: IntArray) {
-        super.onDeleted(context, appWidgetIds)
-        val pendingResult = goAsync()
-        CoroutineScope(Dispatchers.IO).launch {
-            try {
-                val store = EntryPointAccessors
-                    .fromApplication(context, AppWidgetEntryPoint::class.java)
-                    .appWidgetPreferencesStore()
-                appWidgetIds.forEach { store.unregisterWidget(it) }
-            } finally {
-                pendingResult.finish()
-            }
-        }
-    }
-
     override fun onDisabled(context: Context) {
         super.onDisabled(context)
         AppWidgetRefreshWorker.cancelIfNoWidgets(context)
diff --git a/app/src/main/java/to/bitkit/appwidget/ui/weather/WeatherGlanceWidget.kt b/app/src/main/java/to/bitkit/appwidget/ui/weather/WeatherGlanceWidget.kt
@@ -40,4 +40,12 @@ class WeatherGlanceWidget : GlanceAppWidget() {
             )
         }
     }
+
+    override suspend fun onDelete(context: Context, glanceId: GlanceId) {
+        val appWidgetId = GlanceAppWidgetManager(context).getAppWidgetId(glanceId)
+        EntryPointAccessors
+            .fromApplication(context, AppWidgetEntryPoint::class.java)
+            .appWidgetPreferencesStore()
+            .unregisterWidget(appWidgetId)
+    }
 }
diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/blocks/BlocksEditScreen.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/blocks/BlocksEditScreen.kt
@@ -258,7 +258,7 @@ private fun BlockEditOptionRow(
                 Icon(
                     painter = painterResource(R.drawable.ic_checkmark),
                     contentDescription = null,
-                    tint = if (isEnabled) Colors.Brand else Colors.White50,
+                    tint = if (isEnabled) Colors.Brand else Colors.Gray3,
                     modifier = Modifier
                         .size(32.dp)
                         .testTag("${testTagPrefix}_toggle_icon")
diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/headlines/HeadlinesEditScreen.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/headlines/HeadlinesEditScreen.kt
@@ -157,7 +157,7 @@ fun HeadlinesEditContent(
                     Icon(
                         painter = painterResource(R.drawable.ic_checkmark),
                         contentDescription = null,
-                        tint = if (headlinePreferences.showSource) Colors.Brand else Colors.White50,
+                        tint = if (headlinePreferences.showSource) Colors.Brand else Colors.Gray3,
                         modifier = Modifier
                             .size(32.dp)
                             .testTag("source_toggle_icon")
@@ -192,7 +192,7 @@ fun HeadlinesEditContent(
                     Icon(
                         painter = painterResource(R.drawable.ic_checkmark),
                         contentDescription = null,
-                        tint = if (headlinePreferences.showTime) Colors.Brand else Colors.White50,
+                        tint = if (headlinePreferences.showTime) Colors.Brand else Colors.Gray3,
                         modifier = Modifier
                             .size(32.dp)
                             .testTag("time_toggle_icon")
diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/price/PriceEditScreen.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/price/PriceEditScreen.kt
@@ -199,16 +199,14 @@ private fun SelectableRow(
                     .weight(1f)
                     .testTag("${testTagPrefix}_label")
             )
-            if (isSelected) {
-                Icon(
-                    painter = painterResource(R.drawable.ic_checkmark),
-                    contentDescription = null,
-                    tint = Colors.Brand,
-                    modifier = Modifier
-                        .size(32.dp)
-                        .testTag("${testTagPrefix}_toggle_icon")
-                )
-            }
+            Icon(
+                painter = painterResource(R.drawable.ic_checkmark),
+                contentDescription = null,
+                tint = if (isSelected) Colors.Brand else Colors.Gray3,
+                modifier = Modifier
+                    .size(32.dp)
+                    .testTag("${testTagPrefix}_toggle_icon")
+            )
         }
 
         HorizontalDivider(
diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/weather/WeatherEditScreen.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/weather/WeatherEditScreen.kt
@@ -212,7 +212,7 @@ private fun WeatherEditOptionRow(
                 Icon(
                     painter = painterResource(R.drawable.ic_checkmark),
                     contentDescription = null,
-                    tint = if (isSelected) Colors.Brand else Colors.White50,
+                    tint = if (isSelected) Colors.Brand else Colors.Gray3,
                     modifier = Modifier
                         .size(32.dp)
                         .testTag("${testTagPrefix}_toggle_icon")
diff --git a/changelog.d/next/935.fixed.md b/changelog.d/next/935.fixed.md
@@ -0,0 +1 @@
+Fix several OS widget issues including an intermittent crash when removing or cancelling a home screen widget, ordering of widget options, and the color of disabled checkboxes in widget configuration screens.

Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ private fun BlockToggleRow(`
`198`	`198`	`Icon(`
`199`	`199`	`painter = painterResource(R.drawable.ic_checkmark),`
`200`	`200`	`contentDescription = null,`
`201`		`- tint = if (isEnabled) Colors.Brand else Colors.White50,`
	`201`	`+ tint = if (isEnabled) Colors.Brand else Colors.Gray3,`
`202`	`202`	`modifier = Modifier.size(32.dp)`
`203`	`203`	`)`
`204`	`204`	`}`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ private fun ToggleRow(`
`154`	`154`	`Icon(`
`155`	`155`	`painter = painterResource(R.drawable.ic_checkmark),`
`156`	`156`	`contentDescription = null,`
`157`		`- tint = if (isEnabled) Colors.Brand else Colors.White50,`
	`157`	`+ tint = if (isEnabled) Colors.Brand else Colors.Gray3,`
`158`	`158`	`modifier = Modifier.size(32.dp)`
`159`	`159`	`)`
`160`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ private fun WeatherOptionRow(`
`147`	`147`	`Icon(`
`148`	`148`	`painter = painterResource(R.drawable.ic_checkmark),`
`149`	`149`	`contentDescription = null,`
`150`		`- tint = if (isSelected) Colors.Brand else Colors.White50,`
	`150`	`+ tint = if (isSelected) Colors.Brand else Colors.Gray3,`
`151`	`151`	`modifier = Modifier.size(32.dp)`
`152`	`152`	`)`
`153`	`153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,4 +37,12 @@ class BlocksGlanceWidget : GlanceAppWidget() {`
`37`	`37`	`)`
`38`	`38`	`}`
`39`	`39`	`}`
	`40`	`+`
	`41`	`+ override suspend fun onDelete(context: Context, glanceId: GlanceId) {`
	`42`	`+ val appWidgetId = GlanceAppWidgetManager(context).getAppWidgetId(glanceId)`
	`43`	`+ EntryPointAccessors`
	`44`	`+ .fromApplication(context, AppWidgetEntryPoint::class.java)`
	`45`	`+ .appWidgetPreferencesStore()`
	`46`	`+ .unregisterWidget(appWidgetId)`
	`47`	`+ }`
`40`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,4 +48,12 @@ class FactsGlanceWidget : GlanceAppWidget() {`
`48`	`48`	`FactsGlanceContent(fact = fact)`
`49`	`49`	`}`
`50`	`50`	`}`
	`51`	`+`
	`52`	`+ override suspend fun onDelete(context: Context, glanceId: GlanceId) {`
	`53`	`+ val appWidgetId = GlanceAppWidgetManager(context).getAppWidgetId(glanceId)`
	`54`	`+ EntryPointAccessors`
	`55`	`+ .fromApplication(context, AppWidgetEntryPoint::class.java)`
	`56`	`+ .appWidgetPreferencesStore()`
	`57`	`+ .unregisterWidget(appWidgetId)`
	`58`	`+ }`
`51`	`59`	`}`