Add setting to hide balance tab buttons

horizontalsystems · May 20, 2024 · 22dfefc · 22dfefc
1 parent 6a2f2ae
commit 22dfefc
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 6 deletions.
diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/core/Interfaces.kt b/app/src/main/java/io/horizontalsystems/bankwallet/core/Interfaces.kt
@@ -112,6 +112,8 @@ interface ILocalStorage {
     var relaunchBySettingChange: Boolean
     var marketsTabEnabled: Boolean
     val marketsTabEnabledFlow: StateFlow<Boolean>
+    var balanceTabButtonsEnabled: Boolean
+    val balanceTabButtonsEnabledFlow: StateFlow<Boolean>
     var nonRecommendedAccountAlertDismissedAccounts: Set<String>
     var personalSupportEnabled: Boolean
     var hideSuspiciousTransactions: Boolean

diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/core/managers/LocalStorageManager.kt b/app/src/main/java/io/horizontalsystems/bankwallet/core/managers/LocalStorageManager.kt
@@ -450,6 +450,15 @@ class LocalStorageManager(
             }
         }
 
+    override var balanceTabButtonsEnabled: Boolean
+        get() = preferences.getBoolean("balanceTabButtonsEnabled", true)
+        set(value) {
+            preferences.edit().putBoolean("balanceTabButtonsEnabled", value).apply()
+            balanceTabButtonsEnabledFlow.update { value }
+        }
+
+    override val balanceTabButtonsEnabledFlow = MutableStateFlow(balanceTabButtonsEnabled)
+
     override var personalSupportEnabled: Boolean
         get() = preferences.getBoolean(PERSONAL_SUPPORT_ENABLED, false)
         set(enabled) {

diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/balance/BalanceViewModel.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/balance/BalanceViewModel.kt
@@ -52,6 +52,7 @@ class BalanceViewModel(
     private var isRefreshing = false
     private var openSendTokenSelect: OpenSendTokenSelect? = null
     private var errorMessage: String? = null
+    private var balanceTabButtonsEnabled = localStorage.balanceTabButtonsEnabled
 
     val sortTypes =
         listOf(BalanceSortType.Value, BalanceSortType.Name, BalanceSortType.PercentGrowth)
@@ -90,18 +91,26 @@ class BalanceViewModel(
             }
         }
 
+        viewModelScope.launch {
+            localStorage.balanceTabButtonsEnabledFlow.collect {
+                balanceTabButtonsEnabled = it
+                emitState()
+            }
+        }
+
         service.start()
 
         totalBalance.start(viewModelScope)
     }
 
-    override fun createState()= BalanceUiState(
+    override fun createState() = BalanceUiState(
         balanceViewItems = balanceViewItems,
         viewState = viewState,
         isRefreshing = isRefreshing,
         headerNote = headerNote(),
         errorMessage = errorMessage,
-        openSend = openSendTokenSelect
+        openSend = openSendTokenSelect,
+        balanceTabButtonsEnabled = balanceTabButtonsEnabled
     )
 
     private suspend fun handleUpdatedBalanceViewType(balanceViewType: BalanceViewType) {
@@ -329,6 +338,7 @@ data class BalanceUiState(
     val headerNote: HeaderNote,
     val errorMessage: String?,
     val openSend: OpenSendTokenSelect? = null,
+    val balanceTabButtonsEnabled: Boolean,
 )
 
 data class OpenSendTokenSelect(

diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/balance/ui/BalanceItems.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/balance/ui/BalanceItems.kt
@@ -261,7 +261,7 @@ fun BalanceItems(
                 )
             }
 
-            if (!accountViewItem.isWatchAccount) {
+            if (uiState.balanceTabButtonsEnabled && !accountViewItem.isWatchAccount) {
                 item {
                     Row(
                         modifier = Modifier.padding(horizontal = 24.dp),

diff --git a/...in/java/io/horizontalsystems/bankwallet/modules/settings/appearance/AppearanceFragment.kt b/...in/java/io/horizontalsystems/bankwallet/modules/settings/appearance/AppearanceFragment.kt
@@ -159,7 +159,7 @@ fun AppearanceScreen(navController: NavController) {
 
                     HeaderText(text = stringResource(id = R.string.Appearance_Tab))
                     CellUniversalLawrenceSection(
-                        listOf {
+                        listOf({
                             RowUniversal(
                                 modifier = Modifier.padding(horizontal = 16.dp),
                             ) {
@@ -185,8 +185,33 @@ fun AppearanceScreen(navController: NavController) {
                                 )
 
                             }
+                        }, {
+                            RowUniversal(
+                                modifier = Modifier.padding(horizontal = 16.dp),
+                            ) {
+                                Image(
+                                    modifier = Modifier.size(24.dp),
+                                    painter = painterResource(id = R.drawable.ic_more_24),
+                                    contentDescription = null,
+                                    colorFilter = ColorFilter.tint(ComposeAppTheme.colors.grey)
+                                )
 
-                        }
+                                body_leah(
+                                    text = stringResource(id = R.string.Appearance_BalanceTabButtons),
+                                    modifier = Modifier
+                                        .weight(1f)
+                                        .padding(horizontal = 16.dp)
+                                )
+
+                                HsSwitch(
+                                    checked = uiState.balanceTabButtonsEnabled,
+                                    onCheckedChange = {
+                                        viewModel.onSetBalanceTabButtons(it)
+                                    }
+                                )
+
+                            }
+                        })
                     )
                     Spacer(modifier = Modifier.height(24.dp))
 

diff --git a/...n/java/io/horizontalsystems/bankwallet/modules/settings/appearance/AppearanceViewModel.kt b/...n/java/io/horizontalsystems/bankwallet/modules/settings/appearance/AppearanceViewModel.kt
@@ -33,6 +33,7 @@ class AppearanceViewModel(
     private var themeOptions = themeService.optionsFlow.value
     private var baseTokenOptions = buildBaseTokenSelect(baseTokenManager.baseTokenFlow.value)
     private var marketsTabEnabled = localStorage.marketsTabEnabled
+    private var balanceTabButtonsEnabled = localStorage.balanceTabButtonsEnabled
     private var balanceViewTypeOptions =
         buildBalanceViewTypeSelect(balanceViewTypeManager.balanceViewTypeFlow.value)
     private val currentLanguageDisplayName: String
@@ -87,7 +88,8 @@ class AppearanceViewModel(
         balanceViewTypeOptions = balanceViewTypeOptions,
         marketsTabEnabled = marketsTabEnabled,
         currentLanguage = currentLanguageDisplayName,
-        baseCurrencyCode = baseCurrencyCode
+        baseCurrencyCode = baseCurrencyCode,
+        balanceTabButtonsEnabled = balanceTabButtonsEnabled
     )
 
     private fun buildBaseTokenSelect(token: Token?): SelectOptional<Token> {
@@ -153,6 +155,13 @@ class AppearanceViewModel(
         emitState()
     }
 
+    fun onSetBalanceTabButtons(enabled: Boolean) {
+        localStorage.balanceTabButtonsEnabled = enabled
+
+        balanceTabButtonsEnabled = enabled
+        emitState()
+    }
+
 }
 
 data class AppearanceUIState(
@@ -164,4 +173,5 @@ data class AppearanceUIState(
     val marketsTabEnabled: Boolean,
     val currentLanguage: String,
     val baseCurrencyCode: String,
+    val balanceTabButtonsEnabled: Boolean,
 )
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -967,6 +967,7 @@
     <string name="Appearance_BalanceValue">BALANCE VALUE</string>
     <string name="Appearance_Warning_CloseApplication">Changing icon will close application</string>
     <string name="Appearance_MarketsTab">Markets Tab</string>
+    <string name="Appearance_BalanceTabButtons">Balance Tab Buttons</string>
     <string name="Appearance_BalanceAutoHide">Balance Auto Hide</string>
     <string name="Appearance_BalanceAutoHide_Description">Automatically hides balance each time the app is opened, regardless of previous preferences.</string>