chore: Unify AppStorage in StorageUtil

r1b2ns · r1b2ns · commit ba0f3485881a · 2025-05-24T15:04:21.000-03:00
diff --git a/BDKSwiftExampleWallet.xcodeproj/project.pbxproj b/BDKSwiftExampleWallet.xcodeproj/project.pbxproj
@@ -16,6 +16,7 @@
 		779E70892DB9C9AB006E22D3 /* WalletFullScanScriptInspector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 779E70882DB9C9AB006E22D3 /* WalletFullScanScriptInspector.swift */; };
 		77AD9F062DBB031D00182E65 /* ActivityHomeHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77AD9F052DBB031D00182E65 /* ActivityHomeHeaderView.swift */; };
 		77F0FDC92DA9A93D00B30E4F /* Connection+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77F0FDC82DA9A93700B30E4F /* Connection+Extensions.swift */; };
+		77F6A9E02DE23CA8003568F0 /* StorageUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77F6A9DF2DE23CA5003568F0 /* StorageUtil.swift */; };
 		A733D6D02A81113000F333B4 /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = A733D6CF2A81113000F333B4 /* Localizable.xcstrings */; };
 		A73F7A362A3B778E00B87FC6 /* Int+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A73F7A352A3B778E00B87FC6 /* Int+Extensions.swift */; };
 		AE0C30F72A804A2D008F1EAE /* TransactionListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE0C30F62A804A2D008F1EAE /* TransactionListView.swift */; };
@@ -125,6 +126,7 @@
 		779E70882DB9C9AB006E22D3 /* WalletFullScanScriptInspector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WalletFullScanScriptInspector.swift; sourceTree = "<group>"; };
 		77AD9F052DBB031D00182E65 /* ActivityHomeHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityHomeHeaderView.swift; sourceTree = "<group>"; };
 		77F0FDC82DA9A93700B30E4F /* Connection+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Connection+Extensions.swift"; sourceTree = "<group>"; };
+		77F6A9DF2DE23CA5003568F0 /* StorageUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StorageUtil.swift; sourceTree = "<group>"; };
 		A733D6CF2A81113000F333B4 /* Localizable.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = Localizable.xcstrings; sourceTree = "<group>"; };
 		A73F7A352A3B778E00B87FC6 /* Int+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Int+Extensions.swift"; sourceTree = "<group>"; };
 		AE0C30F62A804A2D008F1EAE /* TransactionListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransactionListView.swift; sourceTree = "<group>"; };
@@ -321,6 +323,7 @@
 		AE1C34202A42441F008F807A /* Utilities */ = {
 			isa = PBXGroup;
 			children = (
+				77F6A9DF2DE23CA5003568F0 /* StorageUtil.swift */,
 				AE79538D2A2D59F000CCB277 /* Constants.swift */,
 				AE2F255C2BED0BFB002A9AC6 /* AppError.swift */,
 			);
@@ -734,6 +737,7 @@
 				AE2381B52C60878E00F6B00C /* LocalOutputItemView.swift in Sources */,
 				7745E1912DD7C47F00D52A40 /* BDKSyncService.swift in Sources */,
 				AE3646262BEDB01200B04E25 /* FileManager+Extensions.swift in Sources */,
+				77F6A9E02DE23CA8003568F0 /* StorageUtil.swift in Sources */,
 				AEB6C9D12B7E8529003AD704 /* TransactionDetailViewModel.swift in Sources */,
 				AEB159D32D51A7E00006AE9E /* BalanceDisplayFormat.swift in Sources */,
 				AE18E9382A9528200019D2A4 /* Bundle+Extensions.swift in Sources */,
diff --git a/BDKSwiftExampleWallet/App/BDKSwiftExampleWalletApp.swift b/BDKSwiftExampleWallet/App/BDKSwiftExampleWalletApp.swift
@@ -11,7 +11,6 @@ import SwiftUI
 @main
 struct BDKSwiftExampleWalletApp: App {
     @AppStorage("isOnboarding") var isOnboarding: Bool = true
-    @AppStorage("isNeedFullScan") var isNeedFullScan: Bool = false
     @State private var navigationPath = NavigationPath()
 
     var body: some Scene {
@@ -40,7 +39,7 @@ struct BDKSwiftExampleWalletApp: App {
                 }
             }
             .onChange(of: isOnboarding) { oldValue, newValue in
-                isNeedFullScan = true
+                StorageUtil.shared.isNeedFullScan = true
                 navigationPath = NavigationPath()
             }
         }
diff --git a/BDKSwiftExampleWallet/Utilities/StorageUtil.swift b/BDKSwiftExampleWallet/Utilities/StorageUtil.swift
@@ -0,0 +1,17 @@
+//
+//  AppStorage.swift
+//  BDKSwiftExampleWallet
+//
+//  Created by Rubens Machion on 24/05/25.
+//
+
+import SwiftUI
+
+struct StorageUtil {
+    @AppStorage("isOnboarding") var isOnboarding: Bool?
+    @AppStorage("isNeedFullScan") var isNeedFullScan: Bool?
+    @AppStorage("balanceDisplayFormat") var balanceFormat: BalanceDisplayFormat =
+        .bitcoinSats
+    
+    static var shared = StorageUtil()
+}
diff --git a/BDKSwiftExampleWallet/View Model/OnboardingViewModel.swift b/BDKSwiftExampleWallet/View Model/OnboardingViewModel.swift
@@ -20,9 +20,6 @@ enum WalletSyncType: Hashable {
 class OnboardingViewModel: ObservableObject {
     
     private var bdkSyncService: BDKSyncService
-
-    @AppStorage("isOnboarding") var isOnboarding: Bool?
-    @AppStorage("isNeedFullScan") var isNeedFullScan: Bool?
     
     @Published var walletSyncType: WalletSyncType = .esplora {
         didSet {
@@ -100,10 +97,10 @@ class OnboardingViewModel: ObservableObject {
         do {
             try bdkSyncService.deleteWallet()
             try bdkSyncService.createWallet(params: words.isEmpty ? nil : words)
-            isNeedFullScan = true
+            StorageUtil.shared.isNeedFullScan = true
             
             DispatchQueue.main.async {
-                self.isOnboarding = false
+                StorageUtil.shared.isOnboarding = false
             }
             
         } catch let error as CreateWithPersistError {
diff --git a/BDKSwiftExampleWallet/View Model/Settings/SettingsViewModel.swift b/BDKSwiftExampleWallet/View Model/Settings/SettingsViewModel.swift
@@ -13,7 +13,6 @@ import SwiftUI
 class SettingsViewModel: ObservableObject {
     let bdkClient: BDKClient
 
-    @AppStorage("isOnboarding") var isOnboarding: Bool = true
     @Published var esploraURL: String?
     @Published var inspectedScripts: UInt64 = 0
     @Published var network: String?
@@ -40,7 +39,7 @@ class SettingsViewModel: ObservableObject {
     func delete() {
         do {
             try bdkClient.deleteWallet()
-            isOnboarding = true
+            StorageUtil.shared.isOnboarding = true
         } catch {
             self.settingsError = .generic(message: error.localizedDescription)
             self.showingSettingsViewErrorAlert = true
diff --git a/BDKSwiftExampleWallet/View/HomeView.swift b/BDKSwiftExampleWallet/View/HomeView.swift
@@ -7,9 +7,7 @@
 
 import SwiftUI
 
-struct HomeView: View {
-    @AppStorage("isNeedFullScan") var isNeedFullScan: Bool?
-    
+struct HomeView: View {    
     @Bindable var viewModel: HomeViewModel
     @Binding var navigationPath: NavigationPath
 
@@ -21,7 +19,7 @@ struct HomeView: View {
                 viewModel: .init(
                     priceClient: .live,
                     bdkSyncService: viewModel.bdkSyncService,
-                    isNeedFullScan: isNeedFullScan ?? false
+                    isNeedFullScan: StorageUtil.shared.isNeedFullScan ?? false
                 ),
                 sendNavigationPath: $navigationPath
             )
diff --git a/BDKSwiftExampleWallet/View/OnboardingView.swift b/BDKSwiftExampleWallet/View/OnboardingView.swift
@@ -9,8 +9,7 @@ import BitcoinDevKit
 import BitcoinUI
 import SwiftUI
 
-struct OnboardingView: View {    
-    @AppStorage("isOnboarding") var isOnboarding: Bool?
+struct OnboardingView: View {
     @ObservedObject var viewModel: OnboardingViewModel
     @State private var showingOnboardingViewErrorAlert = false
     @State private var showingImportView = false
diff --git a/BDKSwiftExampleWallet/View/WalletView.swift b/BDKSwiftExampleWallet/View/WalletView.swift
@@ -9,9 +9,7 @@ import BitcoinUI
 import SwiftUI
 
 struct WalletView: View {
-    @AppStorage("balanceDisplayFormat") private var balanceFormat: BalanceDisplayFormat =
-        .bitcoinSats
-    @AppStorage("isNeedFullScan") var isNeedFullScan: Bool?
+    
     @Bindable var viewModel: WalletViewModel
     @Binding var sendNavigationPath: NavigationPath
     @State private var isFirstAppear = true
@@ -30,14 +28,14 @@ struct WalletView: View {
             VStack(spacing: 20) {
 
                 BalanceView(
-                    format: balanceFormat,
+                    format: StorageUtil.shared.balanceFormat,
                     balance: viewModel.balanceTotal,
                     fiatPrice: viewModel.price
                 ).onTapGesture {
                     withAnimation(.spring(response: 0.3, dampingFraction: 0.7)) {
-                        balanceFormat =
+                        StorageUtil.shared.balanceFormat =
                             BalanceDisplayFormat.allCases[
-                                (balanceFormat.index + 1) % BalanceDisplayFormat.allCases.count
+                                (StorageUtil.shared.balanceFormat.index + 1) % BalanceDisplayFormat.allCases.count
                             ]
                     }
                 }
@@ -51,7 +49,7 @@ struct WalletView: View {
                         needsFullScan: viewModel.isNeedFullScan
                     ) {
                         // TODO: fix bug
-                        isNeedFullScan = false
+                        StorageUtil.shared.isNeedFullScan = false
                         showAllTransactions = true
                     }
                     

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ import SwiftUI`
`11`	`11`	`@main`
`12`	`12`	`struct BDKSwiftExampleWalletApp: App {`
`13`	`13`	`@AppStorage("isOnboarding") var isOnboarding: Bool = true`
`14`		`- @AppStorage("isNeedFullScan") var isNeedFullScan: Bool = false`
`15`	`14`	`@State private var navigationPath = NavigationPath()`
`16`	`15`
`17`	`16`	`var body: some Scene {`
`@@ -40,7 +39,7 @@ struct BDKSwiftExampleWalletApp: App {`
`40`	`39`	`}`
`41`	`40`	`}`
`42`	`41`	`.onChange(of: isOnboarding) { oldValue, newValue in`
`43`		`- isNeedFullScan = true`
	`42`	`+ StorageUtil.shared.isNeedFullScan = true`
`44`	`43`	`navigationPath = NavigationPath()`
`45`	`44`	`}`
`46`	`45`	`}`