Add Balance Auto Hide setting to Appearance module

UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Icons/eye_off_24.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "off@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "off@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

UnstoppableWallet/UnstoppableWallet/Core/App.swift

@@ -293,6 +293,7 @@ class App {
                 logRecordManager: logRecordManager,
                 deepLinkManager: deepLinkManager,
                 evmLabelManager: evmLabelManager,
+                balanceHiddenManager: balanceHiddenManager,
                 walletConnectV2SocketConnectionService: walletConnectV2SocketConnectionService,
                 nftMetadataSyncer: nftMetadataSyncer
         )

UnstoppableWallet/UnstoppableWallet/Core/Managers/AppManager.swift

@@ -17,6 +17,7 @@ class AppManager {
     private let logRecordManager: LogRecordManager
     private let deepLinkManager: DeepLinkManager
     private let evmLabelManager: EvmLabelManager
+    private let balanceHiddenManager: BalanceHiddenManager
     private let walletConnectV2SocketConnectionService: WalletConnectV2SocketConnectionService
     private let nftMetadataSyncer: NftMetadataSyncer
 
@@ -28,7 +29,7 @@ class AppManager {
          kitCleaner: KitCleaner, debugLogger: DebugLogger?,
          appVersionManager: AppVersionManager, rateAppManager: RateAppManager,
          logRecordManager: LogRecordManager,
-         deepLinkManager: DeepLinkManager, evmLabelManager: EvmLabelManager,
+         deepLinkManager: DeepLinkManager, evmLabelManager: EvmLabelManager, balanceHiddenManager: BalanceHiddenManager,
          walletConnectV2SocketConnectionService: WalletConnectV2SocketConnectionService, nftMetadataSyncer: NftMetadataSyncer
     ) {
         self.accountManager = accountManager
@@ -44,6 +45,7 @@ class AppManager {
         self.logRecordManager = logRecordManager
         self.deepLinkManager = deepLinkManager
         self.evmLabelManager = evmLabelManager
+        self.balanceHiddenManager = balanceHiddenManager
         self.walletConnectV2SocketConnectionService = walletConnectV2SocketConnectionService
         self.nftMetadataSyncer = nftMetadataSyncer
     }
@@ -84,6 +86,7 @@ extension AppManager {
 
         pinKit.didEnterBackground()
         walletConnectV2SocketConnectionService.didEnterBackground()
+        balanceHiddenManager.didEnterBackground()
     }
 
     func willEnterForeground() {

UnstoppableWallet/UnstoppableWallet/Core/Managers/BalanceHiddenManager.swift

@@ -4,6 +4,7 @@ import StorageKit
 
 class BalanceHiddenManager {
     private let keyBalanceHidden = "wallet-balance-hidden"
+    private let keyBalanceAutoHide = "wallet-balance-auto-hide"
 
     private let localStorage: StorageKit.ILocalStorage
 
@@ -14,6 +15,8 @@ class BalanceHiddenManager {
         }
     }
 
+    private(set) var balanceAutoHide: Bool
+
     init(localStorage: StorageKit.ILocalStorage) {
         self.localStorage = localStorage
 
@@ -25,6 +28,17 @@ class BalanceHiddenManager {
         } else {
             balanceHidden = false
         }
+
+        balanceAutoHide = localStorage.value(for: keyBalanceAutoHide) ?? false
+
+        if balanceAutoHide {
+            set(balanceHidden: true)
+        }
+    }
+
+    private func set(balanceHidden: Bool) {
+        self.balanceHidden = balanceHidden
+        localStorage.set(value: balanceHidden, for: keyBalanceHidden)
     }
 
 }
@@ -36,8 +50,18 @@ extension BalanceHiddenManager {
     }
 
     func toggleBalanceHidden() {
-        balanceHidden = !balanceHidden
-        localStorage.set(value: balanceHidden, for: keyBalanceHidden)
+        set(balanceHidden: !balanceHidden)
+    }
+
+    func set(balanceAutoHide: Bool) {
+        self.balanceAutoHide = balanceAutoHide
+        localStorage.set(value: balanceAutoHide, for: keyBalanceAutoHide)
+    }
+
+    func didEnterBackground() {
+        if balanceAutoHide {
+            set(balanceHidden: true)
+        }
     }
 
 }

UnstoppableWallet/UnstoppableWallet/Modules/Settings/Appearance/AppearanceAppIconsCell.swift

@@ -49,6 +49,7 @@ class AppearanceAppIconsCell: BaseThemeCell {
         self.onSelect = onSelect
 
         collectionView.reloadData()
+        collectionView.layoutIfNeeded()
     }
 
     static func height(viewItemsCount: Int) -> CGFloat {

UnstoppableWallet/UnstoppableWallet/Modules/Settings/Appearance/AppearanceModule.swift

@@ -9,7 +9,8 @@ struct AppearanceModule {
                 launchScreenManager: App.shared.launchScreenManager,
                 appIconManager: App.shared.appIconManager,
                 balancePrimaryValueManager: App.shared.balancePrimaryValueManager,
-                balanceConversionManager: App.shared.balanceConversionManager
+                balanceConversionManager: App.shared.balanceConversionManager,
+                balanceHiddenManager: App.shared.balanceHiddenManager
         )
 
         let viewModel = AppearanceViewModel(service: service)

UnstoppableWallet/UnstoppableWallet/Modules/Settings/Appearance/AppearanceService.swift

@@ -11,6 +11,7 @@ class AppearanceService {
     private let appIconManager: AppIconManager
     private let balancePrimaryValueManager: BalancePrimaryValueManager
     private let balanceConversionManager: BalanceConversionManager
+    private let balanceHiddenManager: BalanceHiddenManager
     private let disposeBag = DisposeBag()
 
     private let themeModeItemsRelay = PublishRelay<[ThemeModeItem]>()
@@ -53,12 +54,13 @@ class AppearanceService {
         launchScreenManager.showMarket
     }
 
-    init(themeManager: ThemeManager, launchScreenManager: LaunchScreenManager, appIconManager: AppIconManager, balancePrimaryValueManager: BalancePrimaryValueManager, balanceConversionManager: BalanceConversionManager) {
+    init(themeManager: ThemeManager, launchScreenManager: LaunchScreenManager, appIconManager: AppIconManager, balancePrimaryValueManager: BalancePrimaryValueManager, balanceConversionManager: BalanceConversionManager, balanceHiddenManager: BalanceHiddenManager) {
         self.themeManager = themeManager
         self.launchScreenManager = launchScreenManager
         self.appIconManager = appIconManager
         self.balancePrimaryValueManager = balancePrimaryValueManager
         self.balanceConversionManager = balanceConversionManager
+        self.balanceHiddenManager = balanceHiddenManager
 
         subscribe(disposeBag, launchScreenManager.launchScreenObservable) { [weak self] in self?.syncLaunchScreenItems(current: $0) }
         subscribe(disposeBag, appIconManager.appIconObservable) { [weak self] in self?.syncAppIconItems(current: $0) }
@@ -131,6 +133,10 @@ extension AppearanceService {
         balancePrimaryValueItemsRelay.asObservable()
     }
 
+    var balanceAutoHide: Bool {
+        balanceHiddenManager.balanceAutoHide
+    }
+
     var showMarketTabObservable: Observable<Bool> {
         showMarketTabRelay.asObservable()
     }
@@ -161,6 +167,10 @@ extension AppearanceService {
         balancePrimaryValueManager.balancePrimaryValue = BalancePrimaryValue.allCases[index]
     }
 
+    func set(balanceAutoHide: Bool) {
+        balanceHiddenManager.set(balanceAutoHide: balanceAutoHide)
+    }
+
 }
 
 extension AppearanceService {

UnstoppableWallet/UnstoppableWallet/Modules/Settings/Appearance/AppearanceViewController.swift

@@ -175,7 +175,7 @@ extension AppearanceViewController: SectionsDataSource {
         Section(
                 id: "app-icon",
                 headerState: tableView.sectionHeader(text: "appearance.app_icon".localized),
-                footerState: .margin(height: .margin24),
+                footerState: .margin(height: .margin32),
                 rows: [
                     Row<AppearanceAppIconsCell>(
                             id: "app-icon",
@@ -239,6 +239,24 @@ extension AppearanceViewController: SectionsDataSource {
         )
     }
 
+    private func balanceAutoHideSection() -> SectionProtocol {
+        Section(
+                id: "balance-auto-hide",
+                footerState: .margin(height: .margin24),
+                rows: [
+                    tableView.universalRow48(
+                            id: "balance-auto-hide",
+                            image: .local(UIImage(named: "eye_off_24")),
+                            title: .body("appearance.balance_auto_hide".localized),
+                            accessoryType: .switch(isOn: viewModel.balanceAutoHide) { [weak self] in self?.viewModel.onSet(balanceAutoHide: $0) },
+                            hash: "\(viewModel.balanceAutoHide)",
+                            isFirst: true,
+                            isLast: true
+                    )
+                ]
+        )
+    }
+
     func buildSections() -> [SectionProtocol] {
         var sections: [SectionProtocol] = [
             Section(id: "top-margin", headerState: .margin(height: .margin12)),
@@ -249,9 +267,10 @@ extension AppearanceViewController: SectionsDataSource {
             sections.append(launchScreenSection)
         }
         sections.append(contentsOf: [
-            appIconSection(viewItems: appIconViewItems),
             conversionSection(viewItems: conversionViewItems),
-            balanceValueSection(viewItems: balanceValueViewItems)
+            balanceValueSection(viewItems: balanceValueViewItems),
+            balanceAutoHideSection(),
+            appIconSection(viewItems: appIconViewItems)
         ])
         return sections
     }

UnstoppableWallet/UnstoppableWallet/Modules/Settings/Appearance/AppearanceViewModel.swift

@@ -115,6 +115,10 @@ extension AppearanceViewModel {
         service.showMarketTab
     }
 
+    var balanceAutoHide: Bool {
+        service.balanceAutoHide
+    }
+
     func onSelectThemeMode(index: Int) {
         service.setThemeMode(index: index)
     }
@@ -139,6 +143,10 @@ extension AppearanceViewModel {
         service.setBalancePrimaryValue(index: index)
     }
 
+    func onSet(balanceAutoHide: Bool) {
+        service.set(balanceAutoHide: balanceAutoHide)
+    }
+
 }
 
 extension AppearanceViewModel {

UnstoppableWallet/UnstoppableWallet/en.lproj/Localizable.strings

@@ -961,6 +961,8 @@ Go to Settings - > Unstoppable and allow access to the camera.";
 "appearance.balance_value.coin_value" = "Coin Value";
 "appearance.balance_value.fiat_value" = "Fiat Value";
 
+"appearance.balance_auto_hide" = "Balance Auto Hide";
+
 // Settings -> Contacts
 
 "contacts.title" = "Contacts";