fix: remove non-functional show widget titles setting

Author: jvsena42

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

@@ -118,7 +118,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/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)

app/src/main/java/to/bitkit/ui/screens/widgets/weather/WeatherViewModel.kt

@@ -47,13 +47,6 @@ class WeatherViewModel @Inject constructor(
             initialValue = false
         )
 
-    val showWidgetTitles: StateFlow<Boolean> = widgetsRepo.showWidgetTitles
-        .stateIn(
-            scope = viewModelScope,
-            started = SharingStarted.WhileSubscribed(SUBSCRIPTION_TIMEOUT),
-            initialValue = true
-        )
-
     val currentWeather: StateFlow<WeatherModel?> = combine(
         widgetsRepo.weatherFlow,
         currencyRepo.currencyState,

app/src/main/java/to/bitkit/ui/settings/general/WidgetsSettingsScreen.kt

@@ -37,14 +37,11 @@ fun WidgetsSettingsScreen(
     val settings = settingsViewModel ?: return
 
     val showWidgets by settings.showWidgets.collectAsStateWithLifecycle()
-    val showWidgetTitles by settings.showWidgetTitles.collectAsStateWithLifecycle()
 
     WidgetsSettingsContent(
         onBackClick = { navController.popBackStack() },
         showWidgets = showWidgets,
-        showWidgetTitles = showWidgetTitles,
         onShowWidgetsClick = { settings.setShowWidgets(!showWidgets) },
-        onShowWidgetTitlesClick = { settings.setShowWidgetTitles(!showWidgetTitles) },
         onResetWidgetsClick = {
             settings.resetWidgets()
             navController.navigateToHome()
@@ -59,10 +56,8 @@ fun WidgetsSettingsScreen(
 @Composable
 private fun WidgetsSettingsContent(
     showWidgets: Boolean,
-    showWidgetTitles: Boolean,
     onBackClick: () -> Unit = {},
     onShowWidgetsClick: () -> Unit = {},
-    onShowWidgetTitlesClick: () -> Unit = {},
     onResetWidgetsClick: () -> Unit = {},
     onResetSuggestionsClick: () -> Unit = {},
 ) {
@@ -89,12 +84,6 @@ private fun WidgetsSettingsContent(
                 onClick = onShowWidgetsClick,
                 modifier = Modifier.testTag("ShowWidgets"),
             )
-            SettingsSwitchRow(
-                title = stringResource(R.string.settings__widgets__showWidgetTitles),
-                isChecked = showWidgetTitles,
-                onClick = onShowWidgetTitlesClick,
-                modifier = Modifier.testTag("ShowWidgetTitles"),
-            )
 
             // Reset section
             SectionHeader(
@@ -152,7 +141,6 @@ private fun Preview() {
     AppThemeSurface {
         WidgetsSettingsContent(
             showWidgets = true,
-            showWidgetTitles = false,
         )
     }
 }

app/src/main/java/to/bitkit/viewmodels/SettingsViewModel.kt

@@ -179,15 +179,6 @@ class SettingsViewModel @Inject constructor(
         }
     }
 
-    val showWidgetTitles = settingsStore.data.map { it.showWidgetTitles }
-        .asStateFlow(initialValue = false)
-
-    fun setShowWidgetTitles(value: Boolean) {
-        viewModelScope.launch {
-            settingsStore.update { it.copy(showWidgetTitles = value) }
-        }
-    }
-
     fun resetDismissedSuggestions() {
         viewModelScope.launch {
             settingsStore.update { it.copy(dismissedSuggestions = emptyList()) }