Allow setting allocation date only no category

Author: riley-x

lib/components/menus/category_selection_menu.dart

@@ -140,3 +140,60 @@ class CategorySelectionFormFieldV2 extends StatelessWidget {
     );
   }
 }
+
+/// Doesn't wrap with FormField which is annoying and hard to see state
+class CategorySelectionDropDownV2 extends StatelessWidget {
+  const CategorySelectionDropDownV2({
+    super.key,
+    required this.categories,
+    this.selected,
+    this.onSelected,
+    this.borderRadius,
+    this.height,
+    this.superAsNone = false,
+    this.nullText,
+    this.hasError = false,
+  });
+
+  final List<Category?> categories;
+  final Category? selected;
+  final Function(Category?)? onSelected;
+  final BorderRadius? borderRadius;
+  final double? height;
+  final bool superAsNone;
+  final String? nullText;
+  final bool hasError;
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      height: height,
+      child: BorderedDropdownSelector<Category?>(
+        selected: selected,
+        items: categories,
+        subItems: (item) {
+          if (item != null && item.subCats.isNotEmpty) {
+            return item.subCats;
+          }
+          return null;
+        },
+        borderRadius: borderRadius,
+        hasError: hasError,
+        builder: (context, cat) => categoryMenuBuilder(
+          context,
+          cat,
+          indentSubcats: false,
+          superAsNone: superAsNone,
+          nullText: nullText,
+        ),
+        selectedBuilder: (context, cat) => categoryMenuBuilder(
+          context,
+          cat,
+          superAsNone: superAsNone,
+          selected: true,
+          nullText: nullText,
+        ),
+      ),
+    );
+  }
+}

lib/components/menus/dropdown_selector.dart

@@ -127,6 +127,52 @@ class _DropdownSelectorState<T> extends State<DropdownSelector<T>> {
   }
 }
 
+class BorderedDropdownSelector<T> extends StatelessWidget {
+  const BorderedDropdownSelector({
+    super.key,
+    required this.selected,
+    required this.items,
+    this.subItems,
+    this.borderRadius,
+    this.hasError = false,
+    required this.builder,
+    this.selectedBuilder,
+    this.onSelected,
+  });
+
+  final T selected;
+  final List<T> items; // this should be nullable because FormField uses T? too
+  final Iterable<T>? Function(T item)? subItems;
+  final BorderRadius? borderRadius;
+  final bool hasError;
+  final Widget Function(BuildContext, T) builder;
+  final Widget Function(BuildContext, T)? selectedBuilder;
+  final Function(T)? onSelected;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      decoration: BoxDecoration(
+        borderRadius: borderRadius ?? BorderRadius.circular(4),
+        border: Border.all(
+          color: (hasError)
+              ? Theme.of(context).colorScheme.error
+              : Theme.of(context).colorScheme.outline,
+        ),
+      ),
+      child: DropdownSelector<T>(
+        selected: selected,
+        items: items,
+        subItems: subItems,
+        builder: builder,
+        selectedBuilder: selectedBuilder,
+        borderRadius: borderRadius ?? BorderRadius.circular(4),
+        onSelected: onSelected,
+      ),
+    );
+  }
+}
+
 class LibraDropdownFormField<T> extends StatelessWidget {
   const LibraDropdownFormField({
     super.key,

lib/tabs/transactionDetails/allocation_editor.dart

@@ -74,6 +74,7 @@ class AllocationEditor extends StatelessWidget {
                   categories: categories,
                   onSave: (it) => state.updatedAllocation.category = it,
                   borderRadius: BorderRadius.circular(4),
+                  validator: (cat) => null, // can be empty if only allocating by date
                 ),
               ),
             ],
@@ -88,6 +89,15 @@ class AllocationEditor extends StatelessWidget {
           onSave: state.saveAllocation,
           onCancel: state.clearFocus,
         ),
+        const SizedBox(height: 10),
+        if (state.allocationErrorMessage != null)
+          ConstrainedBox(
+            constraints: const BoxConstraints(maxWidth: 500),
+            child: Text(
+              state.allocationErrorMessage!,
+              style: TextStyle(color: Theme.of(context).colorScheme.error),
+            ),
+          ),
       ],
     );
   }

lib/tabs/transactionDetails/transaction_details_editor.dart

@@ -38,16 +38,6 @@ class TransactionDetailsEditor extends StatelessWidget {
     final state = context.watch<TransactionDetailsState>();
     var categories = context.watch<LibraAppState>().categories.parentCategories(state.expenseType);
     categories += [Category.ignore, Category.other];
-    // the transaction constructor will convert Category.empty into the correct super category
-    // however we must manually convert the initial category to [Category.empty] so that there isn't
-    // a duplicate.
-    Category? initialCategory() {
-      if (state.seed == null) return null;
-      if (state.seed!.category == Category.income || state.seed!.category == Category.expense) {
-        return Category.empty;
-      }
-      return state.seed!.category;
-    }
 
     /// WARNING!
     /// Form rebuilds every FormField descendant on every change of one of the fields (i.e. it calls
@@ -123,11 +113,11 @@ class TransactionDetailsEditor extends StatelessWidget {
                         labelRow(
                           context,
                           '', // not used
-                          CategorySelectionFormFieldV2(
+                          CategorySelectionDropDownV2(
                             height: 35,
-                            initial: initialCategory(),
+                            selected: state.category,
                             categories: categories,
-                            onSave: (it) => state.category = it,
+                            onSelected: state.onCategorySelected,
                           ),
                           labelCustom: const _CategoryLabel(),
                         ),

lib/tabs/transactionDetails/transaction_details_state.dart

@@ -76,14 +76,13 @@ class TransactionDetailsState extends ChangeNotifier {
   String? name;
   DateTime? date;
   int? value;
-  Category? category;
   String? note;
 
   /// Reimbursement editor
   int reimbursementValue = 0;
 
   /// Allocation editor
-  final Allocation updatedAllocation = Allocation(name: '', category: null, value: 0);
+  Allocation updatedAllocation = Allocation(name: '', category: null, value: 0);
 
   //---------------------------------------------------------------------------------------------
   // These variables are the UI state for the relevant fields. They are used to finalize the output
@@ -94,7 +93,9 @@ class TransactionDetailsState extends ChangeNotifier {
   /// filter state of the reimbursement targets. It is set on each [onValueChanged].
   ExpenseFilterType expenseType = ExpenseFilterType.all;
   TransactionDetailActiveFocus focus = TransactionDetailActiveFocus.none;
+  Category? category;
   String? errorMessage;
+  String? allocationErrorMessage;
   String? reimbursementError;
   bool saveAsRule = false;
 
@@ -117,10 +118,24 @@ class TransactionDetailsState extends ChangeNotifier {
       tags.insertAll(0, seed?.tags ?? const []);
       allocations.insertAll(0, seed?.allocations ?? const []);
       reimbursements.insertAll(0, seed?.reimbursements ?? const []);
+
+      category = _initialCategory();
+
       notifyListeners();
     }
   }
 
+  // the transaction constructor will convert Category.empty into the correct super category
+  // however we must manually convert the initial category to [Category.empty] so that there isn't
+  // a duplicate.
+  Category? _initialCategory() {
+    if (seed == null) return null;
+    if (seed!.category == Category.income || seed!.category == Category.expense) {
+      return Category.empty;
+    }
+    return seed!.category;
+  }
+
   void replaceSeed(Transaction? t) {
     seed = t;
     reset();
@@ -131,6 +146,7 @@ class TransactionDetailsState extends ChangeNotifier {
     /// Reset manual state elements
     saveAsRule = false;
     errorMessage = null;
+    allocationErrorMessage = null;
     reimbursementError = null;
     reimburseTarget = null;
     tags.clear();
@@ -320,22 +336,42 @@ class TransactionDetailsState extends ChangeNotifier {
     }
   }
 
+  String? _validateAllocation() {
+    if (!(allocationFormKey.currentState?.validate() ?? false)) {
+      return '';
+    }
+    allocationFormKey.currentState?.save();
+
+    if (updatedAllocation.category == null) {
+      if (updatedAllocation.timestamp != null && category != null) {
+        updatedAllocation.category = category;
+      } else {
+        return 'Category must be selected';
+      }
+    }
+    return null;
+  }
+
   /// Save a single allocation from the allocation editor in [allocations]
   void saveAllocation() {
-    if (allocationFormKey.currentState?.validate() ?? false) {
-      allocationFormKey.currentState?.save();
-      if (focusedAllocation == null) {
-        allocations.add(updatedAllocation.copy());
-      } else {
-        for (int i = 0; i < allocations.length; i++) {
-          if (allocations[i] == focusedAllocation) {
-            allocations[i] = updatedAllocation.copy(key: allocations[i].key);
-            break;
-          }
+    String? errorMsg = _validateAllocation();
+    if (errorMsg != null) {
+      allocationErrorMessage = errorMsg;
+      notifyListeners();
+      return;
+    }
+
+    if (focusedAllocation == null) {
+      allocations.add(updatedAllocation.copy());
+    } else {
+      for (int i = 0; i < allocations.length; i++) {
+        if (allocations[i] == focusedAllocation) {
+          allocations[i] = updatedAllocation.copy(key: allocations[i].key);
+          break;
         }
       }
-      clearFocus();
     }
+    clearFocus();
   }
 
   /// Validates the form for the reimbursement editor only. Returns an error message, or null on
@@ -417,16 +453,19 @@ class TransactionDetailsState extends ChangeNotifier {
   //---------------------------------------------------------------------------------------------
   void clearFocus() {
     focusedAllocation = null;
+    updatedAllocation = Allocation(name: '', category: null, value: 0);
+    allocationErrorMessage = null;
     focusedReimbursement = null;
     reimburseTarget = null;
     focus = TransactionDetailActiveFocus.none;
     notifyListeners();
   }
 
   void focusAllocation(Allocation? alloc) {
-    if (focus == TransactionDetailActiveFocus.reimbursement) {
-      focusedReimbursement = null;
+    if (focus == TransactionDetailActiveFocus.allocation) {
+      return;
     }
+    clearFocus();
     focusedAllocation = alloc;
     focus = TransactionDetailActiveFocus.allocation;
     resetAllocation();
@@ -436,9 +475,10 @@ class TransactionDetailsState extends ChangeNotifier {
   }
 
   void focusReimbursement(Reimbursement? it) {
-    if (focus == TransactionDetailActiveFocus.allocation) {
-      focusedAllocation = null;
+    if (focus == TransactionDetailActiveFocus.reimbursement) {
+      return;
     }
+    clearFocus();
     focusedReimbursement = it;
     reimburseTarget = it?.target;
     focus = TransactionDetailActiveFocus.reimbursement;
@@ -469,6 +509,13 @@ class TransactionDetailsState extends ChangeNotifier {
     }
   }
 
+  void onCategorySelected(Category? cat) {
+    if (category != cat) {
+      category = cat;
+      notifyListeners();
+    }
+  }
+
   void onTagChanged(Tag tag, bool? selected) {
     if (selected == true) {
       tags.add(tag);

lib/todo.md

@@ -15,7 +15,6 @@
 
 ## Refactor
 - Undo make AccountState an independent ChangeNotifier; huge hassle, need to watch the state everywhere you use an account. Alternative is to always fetch the account object from the AccountState instead of making it linked in other objects, to force the watch.
-- Remove MutableAllocation
 
 
 ## Low priority features