Fixed #70

Author: caseyryan

CHANGELOG.md

@@ -1,3 +1,6 @@
+## [2.5.1]
+- New PosInputFormatter. Thanks to [SimoneBressan](https://github.com/SimoneBres) for this contribution 
+- Fixed the issue with CreditCardExpirationDateFormatter https://github.com/caseyryan/flutter_multi_formatter/issues/70
 ## [2.4.4]
 - https://github.com/caseyryan/flutter_multi_formatter/issues/68 fixed a typo in README section
 - Added alternative mask for Australean phone numbers

README.md

@@ -87,6 +87,7 @@ RestrictingInputFormatter
 
 /// for currencies
 MoneyInputFormatter
+PosInputFormatter
 ```
 
 ## Utility methods and widgets
@@ -341,6 +342,8 @@ TextFormField(
     ],
 ),
 ```
+
+
 ## Money Input formatter
 
 ```dart
@@ -371,6 +374,20 @@ TextFormField(
 
 ```
 
+## Point of Sale input formatter
+```dart
+PosInputFormatter
+```
+Allows you to enter numbers like you would normally do 
+on a sales terminal 
+```dart
+TextFormField(
+    keyboardType: TextInputType.number,
+    inputFormatters: [
+        PosInputFormatter(),
+    ],
+),
+...
 
 
 For more details see [example](https://github.com/caseyryan/flutter_multi_formatter/tree/master/example) project. And feel free to open an issue if you find any bugs of errors

example/ios/Flutter/AppFrameworkInfo.plist

@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>CFBundleDevelopmentRegion</key>
-  <string>$(DEVELOPMENT_LANGUAGE)</string>
-  <key>CFBundleExecutable</key>
-  <string>App</string>
-  <key>CFBundleIdentifier</key>
-  <string>io.flutter.flutter.app</string>
-  <key>CFBundleInfoDictionaryVersion</key>
-  <string>6.0</string>
-  <key>CFBundleName</key>
-  <string>App</string>
-  <key>CFBundlePackageType</key>
-  <string>FMWK</string>
-  <key>CFBundleShortVersionString</key>
-  <string>1.0</string>
-  <key>CFBundleSignature</key>
-  <string>????</string>
-  <key>CFBundleVersion</key>
-  <string>1.0</string>
-  <key>MinimumOSVersion</key>
-  <string>8.0</string>
-</dict>
-</plist>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>$(DEVELOPMENT_LANGUAGE)</string>
+  <key>CFBundleExecutable</key>
+  <string>App</string>
+  <key>CFBundleIdentifier</key>
+  <string>io.flutter.flutter.app</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>App</string>
+  <key>CFBundlePackageType</key>
+  <string>FMWK</string>
+  <key>CFBundleShortVersionString</key>
+  <string>1.0</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>1.0</string>
+  <key>MinimumOSVersion</key>
+  <string>9.0</string>
+</dict>
+</plist>

example/ios/Runner.xcodeproj/project.pbxproj

@@ -280,7 +280,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -362,7 +362,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -411,7 +411,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;

example/pubspec.lock

@@ -7,7 +7,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.6.1"
+    version: "2.8.1"
   base58check:
     dependency: transitive
     description:
@@ -42,7 +42,7 @@ packages:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   clock:
     dependency: transitive
     description:
@@ -96,7 +96,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "2.4.4"
+    version: "2.5.1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -115,7 +115,7 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.7.0"
   path:
     dependency: transitive
     description:
@@ -169,7 +169,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.0"
+    version: "0.4.2"
   typed_data:
     dependency: transitive
     description:

lib/formatters/credit_card_cvc_input_formatter.dart

@@ -27,5 +27,5 @@ THE SOFTWARE.
 import 'package:flutter_multi_formatter/formatters/masked_input_formatter.dart';
 
 class CreditCardCvcInputFormatter extends MaskedInputFormatter {
-  CreditCardCvcInputFormatter() : super('0000');
+  CreditCardCvcInputFormatter() : super('000');
 }

lib/formatters/credit_card_expiration_input_formatter.dart

@@ -35,15 +35,18 @@ class CreditCardExpirationDateFormatter extends MaskedInputFormatter {
     var fv = super.applyMask(text);
     var result = fv.toString();
     var numericString = toNumericString(result);
+    var numAddedLeadingSymbols = 0;
     String? ammendedMonth;
     if (numericString.length > 0) {
       var allDigits = numericString.split('');
       var stringBuffer = StringBuffer();
       var firstDigit = int.parse(allDigits[0]);
+
       if (firstDigit > 1) {
         stringBuffer.write('0');
         stringBuffer.write(firstDigit);
         ammendedMonth = stringBuffer.toString();
+        numAddedLeadingSymbols = 1;
       } else if (firstDigit == 1) {
         if (allDigits.length > 1) {
           stringBuffer.write(firstDigit);
@@ -65,6 +68,12 @@ class CreditCardExpirationDateFormatter extends MaskedInputFormatter {
         result = '$ammendedMonth$sub';
       }
     }
+    fv = super.applyMask(result);
+    /// a little hack to be able to move caret by one 
+    /// symbol to the right if a leading zero was added automatically
+    for (var i = 0; i < numAddedLeadingSymbols; i++) {
+      fv.increaseNumberOfLeadingSymbols();
+    }
     return fv;
   }
 }

lib/formatters/credit_card_number_input_formatter.dart

@@ -61,28 +61,36 @@ class CreditCardNumberInputFormatter extends TextInputFormatter {
       if (newValue.text.isEmpty) {
         _removeFirstLetter();
       }
-
-      /// FIXME: не помню зачем это добавлял но из-за этого не
-      /// работало форматирование при стирании. Если что-то сломается, разобраться
-      /// подробнее
-      // return newValue;
     }
-    var onlyNumbers = toNumericString(newValue.text);
-    String maskedValue = _applyMask(onlyNumbers);
+    var onlyNumbers = toNumericString(
+      newValue.text,
+    );
+    String maskedValue = _applyMask(
+      onlyNumbers,
+    );
     if (maskedValue.length == oldValue.text.length) {
       return oldValue;
     }
-    var endOffset = max(oldValue.text.length - oldValue.selection.end, 0);
+    var endOffset = max(
+      oldValue.text.length - oldValue.selection.end,
+      0,
+    );
     var selectionEnd = maskedValue.length - endOffset;
     return TextEditingValue(
-      selection: TextSelection.collapsed(offset: selectionEnd),
+      selection: TextSelection.collapsed(
+        offset: selectionEnd,
+      ),
       text: maskedValue,
     );
   }
 
   /// this is a small dirty hask to be able to remove the first character
   Future _removeFirstLetter() async {
-    await Future.delayed(Duration(milliseconds: 5));
+    await Future.delayed(
+      Duration(
+        milliseconds: 5,
+      ),
+    );
     _updateCardSystemData(null);
   }
 
@@ -95,15 +103,19 @@ class CreditCardNumberInputFormatter extends TextInputFormatter {
     }
   }
 
-  String _applyMask(String numericString) {
+  String _applyMask(
+    String numericString,
+  ) {
     if (numericString.isEmpty) {
       _updateCardSystemData(null);
     } else {
       var countryData = _CardSystemDatas.getCardSystemDataByNumber(
         numericString,
       );
       if (countryData != null) {
-        _updateCardSystemData(countryData);
+        _updateCardSystemData(
+          countryData,
+        );
       }
     }
     if (_cardSystemData != null) {
@@ -232,8 +244,7 @@ class _CardSystemDatas {
     if (rawData != null) {
       return CardSystemData.fromMap(rawData);
     }
-    return getCardSystemDataByNumber(cardNumber,
-        subscringLength: subscringLength - 1);
+    return getCardSystemDataByNumber(cardNumber, subscringLength: subscringLength - 1);
   }
 
   static int get _maxDigitsInCard {

lib/formatters/masked_input_formatter.dart

@@ -85,15 +85,26 @@ class MaskedInputFormatter extends TextInputFormatter {
     var numSeparatorsInNew = 0;
     var numSeparatorsInOld = 0;
 
+    /// For not it's only used in CreditCardExpirationDateFormatter
+    /// when it adds a leading zero to the input
+    var addOffset = newFormattedValue._numLeadingSymbols;
+
+
     /// without this condition there might be a range exception
     if (oldValue.selection.end <= oldFormattedValue.text.length) {
       numSeparatorsInOld = _countSeparators(
-        oldFormattedValue.text.substring(0, oldValue.selection.end),
+        oldFormattedValue.text.substring(
+          0,
+          oldValue.selection.end,
+        ),
       );
     }
     if (newValue.selection.end <= newFormattedValue.text.length) {
       numSeparatorsInNew = _countSeparators(
-        newFormattedValue.text.substring(0, newValue.selection.end),
+        newFormattedValue.text.substring(
+          0,
+          newValue.selection.end,
+        ),
       );
     } else {
       numSeparatorsInNew = numSeparatorsInOld;
@@ -113,7 +124,7 @@ class MaskedInputFormatter extends TextInputFormatter {
     return TextEditingValue(
       text: _maskedValue,
       selection: TextSelection.collapsed(
-        offset: selectionOffset,
+        offset: selectionOffset + addOffset,
         affinity: TextAffinity.upstream,
       ),
     );
@@ -201,11 +212,18 @@ class MaskedInputFormatter extends TextInputFormatter {
 class FormattedValue {
   String _formattedValue = '';
   bool _isErasing = false;
+  int _numLeadingSymbols = 0;
 
   String get text {
     return _formattedValue;
   }
 
+  /// Used in CreditCardExpirationInputFormatter
+  /// to be able to add a leading zero
+  void increaseNumberOfLeadingSymbols() {
+    _numLeadingSymbols++;
+  }
+
   @override
   String toString() {
     return _formattedValue;