Merge pull request #960 from synonymdev/fix/widgets-small-fixes

fix: polish widget screens and previews

Author: ovitrif

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

@@ -136,7 +136,7 @@ private fun FeeBlock(weather: WeatherModel, preferences: WeatherPreferences) {
 
     Column(modifier = GlanceModifier.fillMaxWidth()) {
         CaptionB(
-            text = context.getString(labelRes),
+            text = context.getString(labelRes).uppercase(),
             color = GlanceColors.textSecondary,
             maxLines = 1,
         )

app/src/main/java/to/bitkit/data/SettingsStore.kt

@@ -134,7 +134,6 @@ data class SettingsData(
     val isPinForPaymentsEnabled: Boolean = false,
     val isDevModeEnabled: Boolean = Env.isDebug,
     val showWidgets: Boolean = true,
-    val showWidgetTitles: Boolean = false,
     val lastUsedTags: List<String> = emptyList(),
     val enableSwipeToHideBalance: Boolean = true,
     val hideBalance: Boolean = false,

app/src/main/java/to/bitkit/repositories/WidgetsRepo.kt

@@ -18,7 +18,6 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import to.bitkit.data.SettingsStore
 import to.bitkit.data.WidgetsData
 import to.bitkit.data.WidgetsStore
 import to.bitkit.data.dto.ArticleDTO
@@ -54,16 +53,13 @@ class WidgetsRepo @Inject constructor(
     private val weatherService: WeatherService,
     private val priceService: PriceService,
     private val widgetsStore: WidgetsStore,
-    private val settingsStore: SettingsStore,
 ) {
     private val repoScope = CoroutineScope(bgDispatcher + SupervisorJob())
     private val widgetJobs = ConcurrentHashMap<WidgetType, Job>()
 
     val widgetsDataFlow: StateFlow<WidgetsData> = widgetsStore.data
         .stateIn(repoScope, SharingStarted.Eagerly, WidgetsData())
 
-    val showWidgetTitles = settingsStore.data.map { it.showWidgetTitles }
-
     val articlesFlow: StateFlow<List<ArticleDTO>> = widgetsDataFlow
         .map { it.articles }
         .stateIn(repoScope, SharingStarted.Eagerly, emptyList())

app/src/main/java/to/bitkit/services/MigrationService.kt

@@ -914,7 +914,6 @@ class MigrationService @Inject constructor(
                 enableAutoReadClipboard = settings.enableAutoReadClipboard ?: current.enableAutoReadClipboard,
                 enableSendAmountWarning = settings.enableSendAmountWarning ?: current.enableSendAmountWarning,
                 showWidgets = settings.showWidgets ?: current.showWidgets,
-                showWidgetTitles = settings.showWidgetTitles ?: current.showWidgetTitles,
                 defaultTransactionSpeed = when (settings.transactionSpeed) {
                     "fast" -> TransactionSpeed.Fast
                     "slow" -> TransactionSpeed.Slow
@@ -2153,7 +2152,6 @@ data class RNSettings(
     val enableQuickpay: Boolean? = null,
     val quickpayAmount: Int? = null,
     val showWidgets: Boolean? = null,
-    val showWidgetTitles: Boolean? = null,
     val transactionSpeed: String? = null,
     val customFeeRate: Int? = null,
     val hideBalance: Boolean? = null,

app/src/main/java/to/bitkit/ui/screens/wallets/HomeUiState.kt

@@ -21,7 +21,6 @@ data class HomeUiState(
     val suggestions: ImmutableList<Suggestion> = persistentListOf(),
     val banners: ImmutableList<BannerItem> = persistentListOf(),
     val showWidgets: Boolean = false,
-    val showWidgetTitles: Boolean = false,
     val widgetsWithPosition: ImmutableList<WidgetWithPosition> = persistentListOf(),
     val headlinePreferences: HeadlinePreferences = HeadlinePreferences(),
     val currentArticle: ArticleModel? = null,

app/src/main/java/to/bitkit/ui/screens/wallets/HomeViewModel.kt

@@ -85,7 +85,6 @@ class HomeViewModel @Inject constructor(
                 _uiState.update {
                     it.copy(
                         showWidgets = settings.showWidgets,
-                        showWidgetTitles = settings.showWidgetTitles,
                         widgetsWithPosition = if (it.isEditingWidgets &&
                             it.widgetsWithPosition.size == widgetsData.widgets.size
                         ) {

app/src/main/java/to/bitkit/ui/screens/widgets/blocks/BlocksViewModel.kt

@@ -45,13 +45,6 @@ class BlocksViewModel @Inject constructor(
             initialValue = false
         )
 
-    val showWidgetTitles: StateFlow<Boolean> = widgetsRepo.showWidgetTitles
-        .stateIn(
-            scope = viewModelScope,
-            started = SharingStarted.WhileSubscribed(SUBSCRIPTION_TIMEOUT),
-            initialValue = true
-        )
-
     val currentBlock: StateFlow<BlockModel?> = widgetsRepo.blocksFlow.map { block ->
         block?.toBlockModel()
     }.stateIn(

app/src/main/java/to/bitkit/ui/screens/widgets/price/PriceEditScreen.kt

@@ -130,7 +130,7 @@ fun PriceEditContent(
 
             Column {
                 AppTopBar(
-                    titleText = stringResource(R.string.widgets__widget__edit),
+                    titleText = stringResource(R.string.widgets__price__name),
                     onBackClick = onBack,
                     modifier = Modifier.background(
                         Brush.verticalGradient(

app/src/main/java/to/bitkit/ui/screens/widgets/price/PricePreviewScreen.kt

@@ -121,7 +121,7 @@ fun PricePreviewContent(
             )
 
             SettingsButtonRow(
-                title = stringResource(R.string.widgets__widget__edit),
+                title = stringResource(R.string.widgets__widget__settings),
                 value = SettingsButtonValue.StringValue(
                     if (pricePreferences == PricePreferences()) {
                         stringResource(R.string.widgets__widget__edit_default)

app/src/main/java/to/bitkit/ui/screens/widgets/suggestions/SuggestionsViewModel.kt

@@ -27,9 +27,6 @@ class SuggestionsViewModel @Inject constructor(
         }
         .stateIn(viewModelScope, SharingStarted.WhileSubscribed(SUBSCRIBE_TIMEOUT), false)
 
-    val showWidgetTitles: StateFlow<Boolean> = widgetsRepo.showWidgetTitles
-        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(SUBSCRIBE_TIMEOUT), false)
-
     fun addWidget() {
         viewModelScope.launch {
             widgetsRepo.addWidget(WidgetType.SUGGESTIONS)