Merge pull request #111 from rcasula/bugfix/fix-keyboard-decimal-input

Allow decimal input in AddTransaction page.
RIP-Comm · Sep 12, 2023 · 5e3f2dd · 5e3f2dd
2 parents 30c71eb + e47474a
commit 5e3f2dd
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 2 deletions.
diff --git a/lib/pages/add_page/add_page.dart b/lib/pages/add_page/add_page.dart
@@ -2,6 +2,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import '../../utils/decimal_text_input_formatter.dart';
 import '../../model/transaction.dart';
 import 'widgets/details_tile.dart';
 import 'widgets/type_tab.dart';
@@ -337,9 +338,9 @@ class _AddPageState extends ConsumerState<AddPage> with Functions {
                               color: typeToColor(selectedType),
                             ),
                       ),
-                      keyboardType: TextInputType.number,
+                      keyboardType: const TextInputType.numberWithOptions(decimal: true),
                       inputFormatters: <TextInputFormatter>[
-                        FilteringTextInputFormatter.allow(RegExp(r'[0,0-9,9]')),
+                        DecimalTextInputFormatter(decimalDigits: 2)
                       ],
                       autofocus: true,
                       textAlign: TextAlign.center,

diff --git a/lib/utils/decimal_text_input_formatter.dart b/lib/utils/decimal_text_input_formatter.dart
@@ -0,0 +1,55 @@
+import 'dart:math' as math;
+import 'package:flutter/services.dart';
+
+class DecimalTextInputFormatter extends TextInputFormatter {
+  DecimalTextInputFormatter({this.decimalDigits})
+      : assert(decimalDigits == null || decimalDigits > 0);
+
+  final int? decimalDigits;
+  final String decimalSeparator = ".";
+  final String thousandsSeparator = ",";
+
+  @override
+  TextEditingValue formatEditUpdate(
+    TextEditingValue oldValue,
+    TextEditingValue newValue,
+  ) {
+    TextSelection newSelection = newValue.selection;
+    String value = newValue.text;
+
+    RegExp regex = RegExp(r'[\d\,\.]');
+
+    if (value.isNotEmpty && !regex.hasMatch(value[value.length -1])) {
+      return oldValue;
+    }
+
+    if (value.contains(thousandsSeparator)) {
+      value = value.replaceAll(thousandsSeparator, decimalSeparator);
+    }
+
+    if (decimalSeparator.allMatches(value).length > 1 || value.contains(thousandsSeparator)) {
+      return oldValue;
+    }
+
+    if (value == decimalSeparator) {
+      // Allow for .x decimal notation
+      value = "0$decimalSeparator";
+    }
+
+    if (decimalDigits != null && 
+        value.contains(decimalSeparator) && value.substring(value.indexOf(decimalSeparator) + 1).length > decimalDigits!) {
+      value = oldValue.text;
+    }
+
+    newSelection = newValue.selection.copyWith(
+      baseOffset: math.min(value.length, value.length + 1),
+      extentOffset: math.min(value.length, value.length + 1),
+    );
+
+    return TextEditingValue(
+      text: value,
+      selection: newSelection,
+      composing: TextRange.empty,
+    );
+  }
+}