fix: polish widget foundation

Author: ovitrif

app/src/androidTest/java/to/bitkit/ui/screens/widgets/headlines/HeadlinesPreviewContentTest.kt

@@ -58,7 +58,7 @@ class HeadlinesPreviewContentTest {
         // Verify settings and preview section
         composeTestRule.onNodeWithTag("WidgetEdit").assertExists()
         composeTestRule.onNodeWithTag("headlines_preview_carousel").assertExists()
-        composeTestRule.onNodeWithTag("headline_card_small").assertExists()
+        composeTestRule.onNodeWithTag("headline_card_wide").assertExists()
 
         // Verify buttons
         composeTestRule.onNodeWithTag("buttons_row").assertExists()
@@ -164,7 +164,7 @@ class HeadlinesPreviewContentTest {
         composeTestRule.onNodeWithTag("divider").assertExists()
         composeTestRule.onNodeWithTag("WidgetEdit").assertExists()
         composeTestRule.onNodeWithTag("headlines_preview_carousel").assertExists()
-        composeTestRule.onNodeWithTag("headline_card_small").assertExists()
+        composeTestRule.onNodeWithTag("headline_card_wide").assertExists()
         composeTestRule.onNodeWithTag("buttons_row").assertExists()
         composeTestRule.onNodeWithTag("WidgetDelete").assertExists()
         composeTestRule.onNodeWithTag("WidgetSave").assertExists()

app/src/main/java/to/bitkit/appwidget/AppWidgetPreferencesStore.kt

@@ -19,6 +19,7 @@ import to.bitkit.data.dto.WeatherDTO
 import to.bitkit.data.dto.price.GraphPeriod
 import to.bitkit.data.dto.price.PriceDTO
 import to.bitkit.data.serializers.AppWidgetDataSerializer
+import to.bitkit.repositories.CurrencyRepo
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -32,6 +33,7 @@ private val Context.appWidgetDataStore: DataStore<AppWidgetData> by dataStore(
 interface AppWidgetEntryPoint {
     fun appWidgetPreferencesStore(): AppWidgetPreferencesStore
     fun appWidgetDataRepository(): AppWidgetDataRepository
+    fun currencyRepo(): CurrencyRepo
 }
 
 @Singleton

app/src/main/java/to/bitkit/appwidget/config/AppWidgetConfigActivity.kt

@@ -1,6 +1,5 @@
 package to.bitkit.appwidget.config
 
-import android.app.Activity
 import android.appwidget.AppWidgetManager
 import android.content.Intent
 import android.os.Bundle
@@ -20,6 +19,7 @@ import to.bitkit.appwidget.ui.price.PriceGlanceWidget
 import to.bitkit.appwidget.ui.weather.WeatherGlanceReceiver
 import to.bitkit.appwidget.ui.weather.WeatherGlanceWidget
 import to.bitkit.ui.theme.AppThemeSurface
+import to.bitkit.ui.utils.enableAppEdgeToEdge
 import to.bitkit.utils.Logger
 
 @AndroidEntryPoint
@@ -34,6 +34,7 @@ class AppWidgetConfigActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        enableAppEdgeToEdge()
 
         val appWidgetId = intent?.extras?.getInt(
             AppWidgetManager.EXTRA_APPWIDGET_ID,
@@ -58,7 +59,9 @@ class AppWidgetConfigActivity : ComponentActivity() {
                     onConfirm = {
                         when (viewModel.uiState.value.type) {
                             AppWidgetType.PRICE -> PriceGlanceWidget().updateAll(this@AppWidgetConfigActivity)
-                            AppWidgetType.HEADLINES -> HeadlinesGlanceWidget().updateAll(this@AppWidgetConfigActivity)
+                            AppWidgetType.HEADLINES -> HeadlinesGlanceWidget().updateAll(
+                                this@AppWidgetConfigActivity,
+                            )
                             AppWidgetType.BLOCKS -> BlocksGlanceWidget().updateAll(this@AppWidgetConfigActivity)
                             AppWidgetType.FACTS -> Unit
                             AppWidgetType.WEATHER -> WeatherGlanceWidget().updateAll(this@AppWidgetConfigActivity)
@@ -68,7 +71,7 @@ class AppWidgetConfigActivity : ComponentActivity() {
                             AppWidgetManager.EXTRA_APPWIDGET_ID,
                             appWidgetId,
                         )
-                        setResult(Activity.RESULT_OK, result)
+                        setResult(RESULT_OK, result)
                         finish()
                     },
                     onCancel = { finish() },

app/src/main/java/to/bitkit/appwidget/config/AppWidgetConfigViewModel.kt

@@ -20,6 +20,7 @@ import to.bitkit.appwidget.model.HomeHeadlinePreferences
 import to.bitkit.appwidget.model.HomePricePreferences
 import to.bitkit.appwidget.model.HomeWeatherPreferences
 import to.bitkit.data.dto.FeeCondition
+import to.bitkit.data.dto.WeatherDTO
 import to.bitkit.data.dto.price.GraphPeriod
 import to.bitkit.data.dto.price.TradingPair
 import to.bitkit.models.widget.ArticleModel
@@ -29,6 +30,7 @@ import to.bitkit.models.widget.PricePreferences
 import to.bitkit.models.widget.WeatherDataOption
 import to.bitkit.models.widget.WeatherPreferences
 import to.bitkit.models.widget.toArticleModel
+import to.bitkit.repositories.CurrencyRepo
 import to.bitkit.ui.screens.widgets.blocks.WeatherModel
 import to.bitkit.ui.screens.widgets.blocks.toWeatherModel
 import to.bitkit.utils.Logger
@@ -39,6 +41,7 @@ import javax.inject.Inject
 class AppWidgetConfigViewModel @Inject constructor(
     private val preferencesStore: AppWidgetPreferencesStore,
     private val dataRepository: AppWidgetDataRepository,
+    private val currencyRepo: CurrencyRepo,
 ) : ViewModel() {
 
     companion object {
@@ -53,7 +56,7 @@ class AppWidgetConfigViewModel @Inject constructor(
             val entry = preferencesStore.getEntry(appWidgetId)
             val data = preferencesStore.data.first()
             val previewArticle = data.cachedArticles.randomOrNull()?.toArticleModel() ?: DEFAULT_PREVIEW_ARTICLE
-            val previewWeather = data.cachedWeather?.toWeatherModel() ?: DEFAULT_PREVIEW_WEATHER
+            val previewWeather = data.cachedWeather?.toPreviewWeather() ?: DEFAULT_PREVIEW_WEATHER
 
             _uiState.update {
                 it.copy(
@@ -72,7 +75,7 @@ class AppWidgetConfigViewModel @Inject constructor(
                 dataRepository.fetchWeather()
                     .onSuccess { fetched ->
                         preferencesStore.cacheWeather(fetched)
-                        _uiState.update { it.copy(previewWeather = fetched.toWeatherModel()) }
+                        _uiState.update { it.copy(previewWeather = fetched.toPreviewWeather()) }
                     }
                     .onFailure { Logger.warn("Failed to fetch weather for config preview", it, context = TAG) }
             }
@@ -239,6 +242,10 @@ class AppWidgetConfigViewModel @Inject constructor(
             .onSuccess { preferencesStore.cacheWeather(it) }
             .onFailure { Logger.warn("Failed to fetch initial weather", it, context = TAG) }
     }
+
+    private fun WeatherDTO.toPreviewWeather() = toWeatherModel(
+        currentFee = currencyRepo.formatSatsAsFiatWithSymbol(avgFeeSats, withSpace = true) ?: currentFee,
+    )
 }
 
 private val DEFAULT_PREVIEW_ARTICLE = ArticleModel(

app/src/main/java/to/bitkit/appwidget/config/BlocksConfigContent.kt

@@ -1,7 +1,6 @@
 package to.bitkit.appwidget.config
 
 import androidx.annotation.DrawableRes
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -61,10 +60,7 @@ internal fun BlocksConfigContent(
         )
     }
 
-    ScreenColumn(
-        noBackground = true,
-        modifier = Modifier.background(Colors.Gray7)
-    ) {
+    ScreenColumn {
         AppTopBar(
             titleText = stringResource(R.string.widgets__blocks__name),
             onBackClick = onCancel,

app/src/main/java/to/bitkit/appwidget/config/HeadlinesConfigContent.kt

@@ -1,6 +1,5 @@
 package to.bitkit.appwidget.config
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -43,10 +42,7 @@ internal fun HeadlinesConfigContent(
     val prefs = state.headlinePreferences
     val previewArticle = state.previewArticle
 
-    ScreenColumn(
-        noBackground = true,
-        modifier = Modifier.background(Colors.Gray7)
-    ) {
+    ScreenColumn {
         AppTopBar(
             titleText = stringResource(R.string.widgets__news__name),
             onBackClick = onCancel,

app/src/main/java/to/bitkit/appwidget/config/PriceConfigContent.kt

@@ -1,6 +1,5 @@
 package to.bitkit.appwidget.config
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -44,10 +43,7 @@ internal fun PriceConfigContent(
     val prefs = state.pricePreferences
     val selectedPair = prefs.enabledPairs.firstOrNull() ?: TradingPair.BTC_USD
 
-    ScreenColumn(
-        noBackground = true,
-        modifier = Modifier.background(Colors.Gray7)
-    ) {
+    ScreenColumn {
         AppTopBar(
             titleText = stringResource(R.string.widgets__price__name),
             onBackClick = onCancel,

app/src/main/java/to/bitkit/appwidget/config/WeatherConfigContent.kt

@@ -1,6 +1,5 @@
 package to.bitkit.appwidget.config
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -37,15 +36,11 @@ internal fun WeatherConfigContent(
     onReset: () -> Unit,
     onSave: () -> Unit,
     onCancel: () -> Unit,
-    modifier: Modifier = Modifier,
 ) {
     val prefs = state.weatherPreferences
     val weather = state.previewWeather
 
-    ScreenColumn(
-        noBackground = true,
-        modifier = modifier.background(Colors.Gray7)
-    ) {
+    ScreenColumn {
         AppTopBar(
             titleText = stringResource(R.string.widgets__weather__name),
             onBackClick = onCancel,

app/src/main/java/to/bitkit/appwidget/ui/facts/FactsGlanceContent.kt

@@ -1,12 +1,14 @@
 package to.bitkit.appwidget.ui.facts
 
+import android.content.Intent
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.unit.dp
 import androidx.glance.GlanceModifier
 import androidx.glance.Image
 import androidx.glance.ImageProvider
 import androidx.glance.LocalContext
 import androidx.glance.LocalSize
+import androidx.glance.appwidget.action.actionStartActivity
 import androidx.glance.layout.Alignment
 import androidx.glance.layout.Box
 import androidx.glance.layout.fillMaxSize
@@ -18,6 +20,7 @@ import to.bitkit.appwidget.ui.components.CaptionB
 import to.bitkit.appwidget.ui.components.GlanceLayoutDimens
 import to.bitkit.appwidget.ui.components.GlanceWidgetScaffold
 import to.bitkit.appwidget.ui.theme.GlanceTextStyles
+import to.bitkit.ui.MainActivity
 
 private val BADGE_SIZE = 32.dp
 private val BADGE_RESERVED_END = 40.dp
@@ -28,8 +31,11 @@ fun FactsGlanceContent(
     fact: String?,
 ) {
     val context = LocalContext.current
+    val openAppIntent = Intent(context, MainActivity::class.java).apply {
+        addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
+    }
 
-    GlanceWidgetScaffold {
+    GlanceWidgetScaffold(onClick = actionStartActivity(openAppIntent)) {
         if (fact == null) {
             CaptionB(text = context.getString(R.string.appwidget__loading))
             return@GlanceWidgetScaffold

app/src/main/java/to/bitkit/appwidget/ui/weather/WeatherGlanceWidget.kt

@@ -3,6 +3,7 @@ package to.bitkit.appwidget.ui.weather
 import android.content.Context
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.glance.GlanceId
 import androidx.glance.appwidget.GlanceAppWidget
 import androidx.glance.appwidget.GlanceAppWidgetManager
@@ -14,6 +15,8 @@ import to.bitkit.appwidget.model.AppWidgetData
 import to.bitkit.appwidget.model.AppWidgetEntry
 import to.bitkit.appwidget.model.AppWidgetType
 import to.bitkit.appwidget.ui.components.GlanceLayoutDimens
+import to.bitkit.data.dto.WeatherDTO
+import to.bitkit.repositories.CurrencyRepo
 import to.bitkit.ui.screens.widgets.blocks.toWeatherModel
 
 class WeatherGlanceWidget : GlanceAppWidget() {
@@ -23,16 +26,20 @@ class WeatherGlanceWidget : GlanceAppWidget() {
     )
 
     override suspend fun provideGlance(context: Context, id: GlanceId) {
-        val store = EntryPointAccessors
+        val accessor = EntryPointAccessors
             .fromApplication(context, AppWidgetEntryPoint::class.java)
-            .appWidgetPreferencesStore()
+        val store = accessor.appWidgetPreferencesStore()
+        val currencyRepo = accessor.currencyRepo()
         val appWidgetId = GlanceAppWidgetManager(context).getAppWidgetId(id)
 
         provideContent {
             val data by store.data.collectAsState(initial = AppWidgetData())
+            val currencyState by currencyRepo.currencyState.collectAsState()
             val entry = data.entries.find { it.appWidgetId == appWidgetId }
                 ?: AppWidgetEntry(appWidgetId = appWidgetId, type = AppWidgetType.WEATHER)
-            val weather = data.cachedWeather?.toWeatherModel()
+            val weather = remember(data.cachedWeather, currencyState) {
+                data.cachedWeather?.toGlanceWeather(currencyRepo)
+            }
 
             WeatherGlanceContent(
                 entry = entry,
@@ -48,4 +55,8 @@ class WeatherGlanceWidget : GlanceAppWidget() {
             .appWidgetPreferencesStore()
             .unregisterWidget(appWidgetId)
     }
+
+    private fun WeatherDTO.toGlanceWeather(currencyRepo: CurrencyRepo) = toWeatherModel(
+        currentFee = currencyRepo.formatSatsAsFiatWithSymbol(avgFeeSats, withSpace = true) ?: currentFee,
+    )
 }