ui: send moved from tabview to main view

Author: reez

BDKSwiftExampleWallet/View/TabHomeView.swift

@@ -9,7 +9,6 @@ import SwiftUI
 
 struct TabHomeView: View {
     @Bindable var viewModel: TabHomeViewModel
-    @State private var sendNavigationPath = NavigationPath()
 
     var body: some View {
 
@@ -27,34 +26,6 @@ struct TabHomeView: View {
                     Image(systemName: "bitcoinsign")
                 }
 
-                NavigationStack(path: $sendNavigationPath) {
-                    AmountView(viewModel: .init(), navigationPath: $sendNavigationPath)
-                        .navigationDestination(for: NavigationDestination.self) { destination in
-                            switch destination {
-                            case .address(let amount):
-                                AddressView(amount: amount, navigationPath: $sendNavigationPath)
-                            case .fee(let amount, let address):
-                                FeeView(
-                                    amount: amount,
-                                    address: address,
-                                    viewModel: .init(),
-                                    navigationPath: $sendNavigationPath
-                                )
-                            case .buildTransaction(let amount, let address, let fee):
-                                BuildTransactionView(
-                                    amount: amount,
-                                    address: address,
-                                    fee: fee,
-                                    viewModel: .init(),
-                                    navigationPath: $sendNavigationPath
-                                )
-                            }
-                        }
-                }
-                .tabItem {
-                    Image(systemName: "arrow.up")
-                }
-
                 SettingsView(viewModel: .init())
                     .tabItem {
                         Image(systemName: "gear")
@@ -81,6 +52,7 @@ struct TabHomeView: View {
 }
 
 enum NavigationDestination: Hashable {
+    case amount
     case address(amount: String)
     case fee(amount: String, address: String)
     case buildTransaction(amount: String, address: String, fee: Int)

BDKSwiftExampleWallet/View/WalletView.swift

@@ -16,10 +16,11 @@ struct WalletView: View {
     @State private var newTransactionSent = false
     @State private var showAllTransactions = false
     @State private var showReceiveView = false
+    @State private var sendNavigationPath = NavigationPath()
 
     var body: some View {
 
-        NavigationStack {
+        NavigationStack(path: $sendNavigationPath) {
 
             ZStack {
                 Color(uiColor: .systemBackground)
@@ -196,6 +197,29 @@ struct WalletView: View {
             .navigationDestination(isPresented: $showAllTransactions) {
                 ActivityListView(viewModel: .init())
             }
+            .navigationDestination(for: NavigationDestination.self) { destination in
+                switch destination {
+                case .amount:
+                    AmountView(viewModel: .init(), navigationPath: $sendNavigationPath)
+                case .address(let amount):
+                    AddressView(amount: amount, navigationPath: $sendNavigationPath)
+                case .fee(let amount, let address):
+                    FeeView(
+                        amount: amount,
+                        address: address,
+                        viewModel: .init(),
+                        navigationPath: $sendNavigationPath
+                    )
+                case .buildTransaction(let amount, let address, let fee):
+                    BuildTransactionView(
+                        amount: amount,
+                        address: address,
+                        fee: fee,
+                        viewModel: .init(),
+                        navigationPath: $sendNavigationPath
+                    )
+                }
+            }
             .toolbar {
                 ToolbarItem(placement: .navigationBarLeading) {
                     Button(action: {
@@ -210,6 +234,13 @@ struct WalletView: View {
                             .foregroundColor(.clear)
                     }
                 }
+                ToolbarItem(placement: .navigationBarTrailing) {
+                    Button(action: {
+                        sendNavigationPath.append(NavigationDestination.amount)
+                    }) {
+                        Image(systemName: "qrcode.viewfinder")
+                    }
+                }
             }
 
         }