fix: align widget screen backgrounds

ovitrif · ovitrif · commit d41073dcba79 · 2026-05-18T02:31:57.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
@@ -6,8 +6,6 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
-import androidx.compose.foundation.background
-import androidx.compose.ui.Modifier
 import androidx.glance.appwidget.updateAll
 import dagger.hilt.android.AndroidEntryPoint
 import to.bitkit.appwidget.AppWidgetRefreshWorker
@@ -22,7 +20,6 @@ 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.theme.Colors
 import to.bitkit.ui.utils.enableAppEdgeToEdge
 import to.bitkit.utils.Logger
 
@@ -57,9 +54,7 @@ class AppWidgetConfigActivity : ComponentActivity() {
         if (savedInstanceState == null) viewModel.init(appWidgetId, type)
 
         setContent {
-            AppThemeSurface(
-                modifier = Modifier.background(Colors.Gray7)
-            ) {
+            AppThemeSurface {
                 AppWidgetConfigScreen(
                     viewModel = viewModel,
                     onConfirm = {
diff --git a/app/src/main/java/to/bitkit/appwidget/config/BlocksConfigContent.kt b/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,
diff --git a/app/src/main/java/to/bitkit/appwidget/config/HeadlinesConfigContent.kt b/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,
diff --git a/app/src/main/java/to/bitkit/appwidget/config/PriceConfigContent.kt b/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,
diff --git a/app/src/main/java/to/bitkit/appwidget/config/WeatherConfigContent.kt b/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,
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
@@ -1,7 +1,6 @@
 package to.bitkit.ui.screens.widgets.blocks
 
 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
@@ -40,6 +39,7 @@ fun BlocksEditScreen(
     blocksViewModel: BlocksViewModel,
     onBack: () -> Unit,
     navigatePreview: () -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     val customPreference by blocksViewModel.customPreferences.collectAsStateWithLifecycle()
     val currentBlock by blocksViewModel.currentBlock.collectAsStateWithLifecycle()
@@ -67,6 +67,7 @@ fun BlocksEditScreen(
         onClickShowSource = { blocksViewModel.toggleShowSource() },
         onClickReset = { blocksViewModel.resetCustomPreferences() },
         onClickPreview = navigatePreview,
+        modifier = modifier
     )
 }
 
@@ -84,12 +85,10 @@ private fun Content(
     onClickPreview: () -> Unit,
     blocksPreferences: BlocksPreferences,
     block: BlockModel,
+    modifier: Modifier = Modifier,
 ) {
     ScreenColumn(
-        noBackground = true,
-        modifier = Modifier
-            .background(Colors.Gray7)
-            .testTag("blocks_edit_screen")
+        modifier = modifier.testTag("blocks_edit_screen")
     ) {
         AppTopBar(
             titleText = stringResource(R.string.widgets__blocks__name),
diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/blocks/BlocksPreviewScreen.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/blocks/BlocksPreviewScreen.kt
@@ -1,6 +1,5 @@
 package to.bitkit.ui.screens.widgets.blocks
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -37,6 +36,7 @@ fun BlocksPreviewScreen(
     onClose: () -> Unit,
     onBack: () -> Unit,
     navigateEditWidget: () -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     val customBlocksPreferences by blocksViewModel.customPreferences.collectAsStateWithLifecycle()
     val currentBlock by blocksViewModel.currentBlock.collectAsStateWithLifecycle()
@@ -60,6 +60,7 @@ fun BlocksPreviewScreen(
             blocksViewModel.savePreferences()
             onClose()
         },
+        modifier = modifier
     )
 }
 
@@ -72,12 +73,10 @@ private fun Content(
     isBlocksWidgetEnabled: Boolean,
     blocksPreferences: BlocksPreferences,
     block: BlockModel?,
+    modifier: Modifier = Modifier,
 ) {
     ScreenColumn(
-        noBackground = true,
-        modifier = Modifier
-            .background(Colors.Gray7)
-            .testTag("blocks_preview_screen")
+        modifier = modifier.testTag("blocks_preview_screen")
     ) {
         AppTopBar(
             titleText = stringResource(R.string.widgets__blocks__name),
diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/CalculatorPreviewScreen.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/CalculatorPreviewScreen.kt
@@ -1,6 +1,5 @@
 package to.bitkit.ui.screens.widgets.calculator
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -32,9 +31,10 @@ import to.bitkit.ui.theme.Colors
 
 @Composable
 fun CalculatorPreviewScreen(
-    viewModel: CalculatorViewModel = hiltViewModel(),
     onClose: () -> Unit,
     onBack: () -> Unit,
+    modifier: Modifier = Modifier,
+    viewModel: CalculatorViewModel = hiltViewModel(),
 ) {
     val isCalculatorWidgetEnabled by viewModel.isCalculatorWidgetEnabled.collectAsStateWithLifecycle()
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
@@ -53,6 +53,7 @@ fun CalculatorPreviewScreen(
             viewModel.saveWidget()
             onClose()
         },
+        modifier = modifier
     )
 }
 
@@ -62,15 +63,13 @@ fun CalculatorPreviewContent(
     onClickDelete: () -> Unit,
     onClickSave: () -> Unit,
     isCalculatorWidgetEnabled: Boolean,
+    modifier: Modifier = Modifier,
     uiState: CalculatorUiState = CalculatorUiState(),
     onBtcChange: (String) -> Unit = {},
     onFiatChange: (String) -> Unit = {},
 ) {
     ScreenColumn(
-        noBackground = true,
-        modifier = Modifier
-            .background(Colors.Gray7)
-            .testTag("calculator_preview_screen")
+        modifier = modifier.testTag("calculator_preview_screen")
     ) {
         AppTopBar(
             titleText = stringResource(R.string.widgets__calculator__name),
diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/facts/FactsPreviewScreen.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/facts/FactsPreviewScreen.kt
@@ -1,6 +1,5 @@
 package to.bitkit.ui.screens.widgets.facts
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -32,6 +31,7 @@ fun FactsPreviewScreen(
     factsViewModel: FactsViewModel,
     onClose: () -> Unit,
     onBack: () -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     val fact by factsViewModel.currentFact.collectAsStateWithLifecycle()
     val isFactsWidgetEnabled by factsViewModel.isFactsWidgetEnabled.collectAsStateWithLifecycle()
@@ -52,6 +52,7 @@ fun FactsPreviewScreen(
             factsViewModel.saveWidget()
             onClose()
         },
+        modifier = modifier
     )
 }
 
@@ -62,12 +63,10 @@ fun FactsPreviewContent(
     onClickSave: () -> Unit,
     isFactsWidgetEnabled: Boolean,
     fact: String,
+    modifier: Modifier = Modifier,
 ) {
     ScreenColumn(
-        noBackground = true,
-        modifier = Modifier
-            .background(Colors.Gray7)
-            .testTag("facts_preview_screen")
+        modifier = modifier.testTag("facts_preview_screen")
     ) {
         AppTopBar(
             titleText = stringResource(R.string.widgets__facts__name),
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
@@ -1,6 +1,5 @@
 package to.bitkit.ui.screens.widgets.headlines
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -40,6 +39,7 @@ fun HeadlinesEditScreen(
     headlinesViewModel: HeadlinesViewModel,
     onBack: () -> Unit,
     navigatePreview: () -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     val customHeadlinePreferences by headlinesViewModel.customPreferences.collectAsStateWithLifecycle()
     val article by headlinesViewModel.currentArticle.collectAsStateWithLifecycle()
@@ -60,6 +60,7 @@ fun HeadlinesEditScreen(
         onClickPreview = {
             navigatePreview()
         },
+        modifier = modifier
     )
 }
 
@@ -72,12 +73,10 @@ fun HeadlinesEditContent(
     onClickShowSource: () -> Unit,
     headlinePreferences: HeadlinePreferences,
     article: ArticleModel,
+    modifier: Modifier = Modifier,
 ) {
     ScreenColumn(
-        noBackground = true,
-        modifier = Modifier
-            .background(Colors.Gray7)
-            .testTag("headlines_edit_screen")
+        modifier = modifier.testTag("headlines_edit_screen")
     ) {
         AppTopBar(
             titleText = stringResource(R.string.widgets__news__name),
diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/headlines/HeadlinesPreviewScreen.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/headlines/HeadlinesPreviewScreen.kt
@@ -1,6 +1,5 @@
 package to.bitkit.ui.screens.widgets.headlines
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -37,6 +36,7 @@ fun HeadlinesPreviewScreen(
     onClose: () -> Unit,
     onBack: () -> Unit,
     navigateEditWidget: () -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     val customHeadlinePreferences by headlinesViewModel.customPreferences.collectAsStateWithLifecycle()
     val article by headlinesViewModel.currentArticle.collectAsStateWithLifecycle()
@@ -60,6 +60,7 @@ fun HeadlinesPreviewScreen(
             headlinesViewModel.savePreferences()
             onClose()
         },
+        modifier = modifier
     )
 }
 
@@ -72,12 +73,10 @@ fun HeadlinesPreviewContent(
     isHeadlinesImplemented: Boolean,
     headlinePreferences: HeadlinePreferences,
     article: ArticleModel,
+    modifier: Modifier = Modifier,
 ) {
     ScreenColumn(
-        noBackground = true,
-        modifier = Modifier
-            .background(Colors.Gray7)
-            .testTag("headlines_preview_screen")
+        modifier = modifier.testTag("headlines_preview_screen")
     ) {
         AppTopBar(
             titleText = stringResource(R.string.widgets__news__name),
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
@@ -48,6 +48,7 @@ fun PriceEditScreen(
     viewModel: PriceViewModel,
     onBack: () -> Unit,
     navigatePreview: () -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     val customPreferences by viewModel.customPreferences.collectAsStateWithLifecycle()
     val isLoading by viewModel.isLoading.collectAsStateWithLifecycle()
@@ -60,6 +61,7 @@ fun PriceEditScreen(
         onSelectTradingPair = { viewModel.selectTradingPair(pair = it) },
         onSelectPeriod = { viewModel.setPeriod(period = it) },
         isLoading = isLoading,
+        modifier = modifier
     )
 }
 
@@ -72,14 +74,12 @@ fun PriceEditContent(
     onClickPreview: () -> Unit,
     preferences: PricePreferences,
     isLoading: Boolean,
+    modifier: Modifier = Modifier,
 ) {
     val selectedPair = preferences.enabledPairs.firstOrNull() ?: TradingPair.BTC_USD
 
     ScreenColumn(
-        noBackground = true,
-        modifier = Modifier
-            .background(Colors.Gray7)
-            .testTag("price_edit_screen")
+        modifier = modifier.testTag("price_edit_screen")
     ) {
         Box(
             modifier = Modifier
diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/price/PricePreviewScreen.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/price/PricePreviewScreen.kt
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
diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/weather/WeatherPreviewScreen.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/weather/WeatherPreviewScreen.kt
