Merge pull request #54 from moneymanagerex/ipad

Refine Txn edit to better use available space
moneymanagerex · Sep 27, 2024 · ce3bbfe · ce3bbfe
2 parents 09a67f8 + 73cf641
commit ce3bbfe
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/MMEX/Views/Transactions/TransactionAddView.swift b/MMEX/Views/Transactions/TransactionAddView.swift
@@ -31,10 +31,14 @@ struct TransactionAddView: View {
                             isPresentingTransactionAddView = false
                             onSave(&newTxn)
                         }
+                        .disabled(!isTransactionValid())
                     }
                 }
         }
     }
+    func isTransactionValid() -> Bool {
+        return newTxn.payeeId > 0 && newTxn.categId > 0
+    }
 }
 
 #Preview {

diff --git a/MMEX/Views/Transactions/TransactionAddView2.swift b/MMEX/Views/Transactions/TransactionAddView2.swift
@@ -37,6 +37,7 @@ struct TransactionAddView2: View {
                             selectedTab = 0
                             newTxn = TransactionData()
                         }
+                        .disabled(!isTransactionValid())
                     }
                 }
         }
@@ -57,6 +58,10 @@ struct TransactionAddView2: View {
         }
     }
 
+    func isTransactionValid() -> Bool {
+        return newTxn.payeeId > 0 && newTxn.categId > 0
+    }
+
     func addTransaction(txn: inout TransactionData) {
         let repository = dataManager.getTransactionRepository()
         if repository.insert(&txn) {

diff --git a/MMEX/Views/Transactions/TransactionEditView.swift b/MMEX/Views/Transactions/TransactionEditView.swift
@@ -33,7 +33,6 @@ struct TransactionEditView: View {
                     }
                 }
                 .pickerStyle(SegmentedPickerStyle()) // Use a segmented style for the picker
-                .padding(.horizontal)
 
                 Spacer()
 
@@ -45,11 +44,12 @@ struct TransactionEditView: View {
                         Text(account.data.name).tag(account.data.id)
                     }
                 }
+                .frame(maxWidth: .infinity) // Allow picker to use available space
             }
-            .padding(.horizontal)
+            .padding(.horizontal, 0)
 
             // 2. Unified Numeric Input for the Amount with automatic keyboard focus
-            TextField("¥0", text: $amountString)
+            TextField("0", text: $amountString)
                 .keyboardType(.decimalPad) // Show numeric keyboard with decimal support
                 .font(.system(size: 48, weight: .bold)) // Large, bold text for amount input
                 .multilineTextAlignment(.center) // Center the text for better UX
@@ -101,7 +101,7 @@ struct TransactionEditView: View {
                     }
                 }
             }
-            .padding(.horizontal)
+            .padding(.horizontal, 0)
 
             // 5. Horizontal stack for Payee and Category pickers
             HStack {
@@ -132,7 +132,7 @@ struct TransactionEditView: View {
                 }
                 .pickerStyle(MenuPickerStyle()) // Show a menu for the category picker
             }
-            .padding(.horizontal)
+            .padding(.horizontal, 0)
 
             Spacer() // Push the contents to the top
         }