refactor: removed ActivityHomeHeardeView.DataSource and create a ActivityHomeHeardeView.State with less params

Author: r1b2ns

BDKSwiftExampleWallet/View/Home/ActivityHomeHeaderView.swift

@@ -9,88 +9,82 @@ import SwiftUI
 
 struct ActivityHomeHeaderView: View {
 
-    struct DataSource {
-        let walletSyncState: WalletSyncState
-        let progress: Float
-        let inspectedScripts: UInt64
-        let totalScripts: UInt64
-        let needsFullScan: Bool
+    enum State {
+        case synced
+        case fullSyncing(inspectedScripts: UInt64)
+        case syncing(progress: Float, inspectedScripts: UInt64, totalScripts: UInt64)
+        case notStarted
+        case error(Error)
     }
 
-    let dataSource: ActivityHomeHeaderView.DataSource
+    let state: State
 
     let showAllTransactions: () -> Void
 
     var body: some View {
         HStack {
             Text("Activity")
             Spacer()
-            if dataSource.walletSyncState == .syncing {
-                HStack {
-                    if dataSource.progress < 1.0 {
-                        Text("\(dataSource.inspectedScripts)")
-                            .padding(.trailing, -5.0)
-                            .fontWeight(.semibold)
-                            .contentTransition(.numericText())
-                            .transition(.opacity)
+            
+            HStack {
+                if case let .fullSyncing(inspectedScripts) = state {
+                    Text("\(inspectedScripts)")
+                        .padding(.trailing, -5.0)
+                        .fontWeight(.semibold)
+                        .contentTransition(.numericText())
+                        .transition(.opacity)
+                        .fontDesign(.monospaced)
+                        .foregroundStyle(.secondary)
+                        .font(.caption2)
+                        .fontWeight(.thin)
+                        .animation(.easeInOut, value: inspectedScripts)
+                }
+                if case let .syncing(progress, inspectedScripts, totalScripts) = state {
+                    HStack {
+                        if progress < 1.0 {
+                            Text("\(inspectedScripts)")
+                                .padding(.trailing, -5.0)
+                                .fontWeight(.semibold)
+                                .contentTransition(.numericText())
+                                .transition(.opacity)
 
-                        if !dataSource.needsFullScan {
                             Text("/")
                                 .padding(.trailing, -5.0)
                                 .transition(.opacity)
-                            Text("\(dataSource.totalScripts)")
+                            Text("\(totalScripts)")
                                 .contentTransition(.numericText())
                                 .transition(.opacity)
                         }
-                    }
 
-                    if !dataSource.needsFullScan {
                         Text(
                             String(
                                 format: "%.0f%%",
-                                dataSource.progress * 100
+                                progress * 100
                             )
                         )
                         .contentTransition(.numericText())
                         .transition(.opacity)
                     }
+                    .fontDesign(.monospaced)
+                    .foregroundStyle(.secondary)
+                    .font(.caption2)
+                    .fontWeight(.thin)
+                    .animation(.easeInOut, value: inspectedScripts)
+                    .animation(.easeInOut, value: totalScripts)
+                    .animation(.easeInOut, value: progress)
                 }
-                .fontDesign(.monospaced)
-                .foregroundStyle(.secondary)
-                .font(.caption2)
-                .fontWeight(.thin)
-                .animation(.easeInOut, value: dataSource.inspectedScripts)
-                .animation(.easeInOut, value: dataSource.totalScripts)
-                .animation(.easeInOut, value: dataSource.progress)
             }
             HStack {
                 HStack(spacing: 5) {
-                    if dataSource.walletSyncState == .syncing {
-                        Image(systemName: "slowmo")
-                            .symbolEffect(
-                                .variableColor.cumulative
-                            )
-                    } else if dataSource.walletSyncState == .synced {
-                        Image(systemName: "checkmark.circle.fill")
-                            .foregroundStyle(
-                                dataSource.walletSyncState == .synced
-                                    ? .green : .secondary
-                            )
-                    } else if dataSource.walletSyncState == .notStarted {
-                        Image(systemName: "arrow.clockwise")
-                    } else {
-                        Image(
-                            systemName: "person.crop.circle.badge.exclamationmark"
-                        )
-                    }
+                    state.syncImageIndicator
                 }
                 .contentTransition(.symbolEffect(.replace.offUp))
 
             }
             .foregroundStyle(.secondary)
             .font(.caption)
-
-            if dataSource.walletSyncState == .synced {
+            
+            if case .synced = state {
                 Button {
                     self.showAllTransactions()
                 } label: {
@@ -103,8 +97,40 @@ struct ActivityHomeHeaderView: View {
                     .fontWeight(.regular)
                 }
             }
-
         }
         .fontWeight(.bold)
     }
 }
+
+
+fileprivate extension ActivityHomeHeaderView.State {
+    
+    var syncImageIndicator: some View {
+        switch self {
+        case .synced:
+            return AnyView(
+                Image(systemName: "checkmark.circle.fill")
+                    .foregroundStyle(.green)
+            )
+            
+        case .syncing(_, _, _), .fullSyncing(_):
+            return AnyView(
+                Image(systemName: "slowmo")
+                    .symbolEffect(
+                        .variableColor.cumulative
+                    )
+            )
+            
+        case .notStarted:
+            return AnyView(
+                Image(systemName: "arrow.clockwise")
+            )
+        default:
+            return AnyView(
+                Image(
+                    systemName: "person.crop.circle.badge.exclamationmark"
+                )
+            )
+        }
+    }
+}

BDKSwiftExampleWallet/View/WalletView.swift

@@ -43,15 +43,11 @@ struct WalletView: View {
 
                 VStack {
                     ActivityHomeHeaderView(
-                        dataSource: .init(
-                            walletSyncState: $viewModel.walletSyncState.wrappedValue,
-                            progress: $viewModel.progress.wrappedValue,
-                            inspectedScripts: $viewModel.inspectedScripts.wrappedValue,
-                            totalScripts: $viewModel.totalScripts.wrappedValue,
-                            needsFullScan: viewModel.bdkClient.needsFullScan()
-                        )) {
-                            showAllTransactions = true
-                        }
+                        state: viewModel.activityHeaderStateSync
+                    ) {
+                        showAllTransactions = true
+                    }
+                    
                     TransactionListView(
                         viewModel: .init(),
                         transactions: viewModel.recentTransactions,
@@ -185,6 +181,28 @@ struct WalletView: View {
     }
 }
 
+fileprivate extension WalletViewModel {
+    
+    var activityHeaderStateSync: ActivityHomeHeaderView.State {
+        let walletSyncState = walletSyncState
+        let needsFullScan = bdkClient.needsFullScan()
+        
+        if needsFullScan {
+            return .fullSyncing(inspectedScripts: inspectedScripts)
+        } else if walletSyncState == .synced {
+            return .synced
+        } else if walletSyncState == .syncing {
+            return .syncing(
+                progress: progress,
+                inspectedScripts: inspectedScripts,
+                totalScripts: totalScripts
+            )
+        } else {
+            return .notStarted
+        }
+    }
+}
+
 #if DEBUG
     #Preview("WalletView - en") {
         WalletView(