Merge pull request #46 from wilburt/dev

Dev

Author: Wilberforce Uwadiegwu

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.0.3+1
+* Fixed issue with wrong plugin class in pubspec.yaml (#45)
+* Added spaces to initial string for card number field
+
+
 ## 1.0.3
 * Fixed issue with using disposed context(#26)
 * Removed hardcoded currency text in the checkout prompt (#30)

lib/src/api/service/base_service.dart

@@ -11,7 +11,7 @@ mixin BaseApiService {
     'X-Paystack-Build': PlatformInfo().paystackBuild,
     'X-PAYSTACK-USER-AGENT':
         jsonEncode({'lang': Platform.isIOS ? 'objective-c' : 'kotlin'}),
-    'bindings_version': "1.3.0", // TODO: Update for every new versions
+    'bindings_version': "1.3.0+1", // TODO: Update for every new versions
     'X-FLUTTER-USER-AGENT': jsonEncode({'version': '1.0.0'})
   };
   final String baseUrl = 'https://standard.paystack.co';

lib/src/common/card_utils.dart

@@ -78,6 +78,7 @@ class CardUtils {
     return year;
   }
 
+  /// Removes non numerical characters from the string
   static String getCleanedNumber(String text) {
     if (text == null) {
       return '';

lib/src/common/utils.dart

@@ -51,4 +51,17 @@ class Utils {
       throw new InvalidEmailException(charge.email);
     }
   }
+
+  /// Add double spaces after every 4th character
+  static String addSpaces(String text) {
+    var buffer = new StringBuffer();
+    for (int i = 0; i < text.length; i++) {
+      buffer.write(text[i]);
+      var nonZeroIndex = i + 1;
+      if (nonZeroIndex % 4 == 0 && nonZeroIndex != text.length) {
+        buffer.write('  '); // Add double spaces.
+      }
+    }
+    return buffer.toString();
+  }
 }

lib/src/widgets/common/input_formatters.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_paystack/src/common/utils.dart';
 
 class CardMonthInputFormatter extends TextInputFormatter {
   String previousText;
@@ -42,16 +43,7 @@ class CardNumberInputFormatter extends TextInputFormatter {
       return newValue;
     }
 
-    var buffer = new StringBuffer();
-    for (int i = 0; i < text.length; i++) {
-      buffer.write(text[i]);
-      var nonZeroIndex = i + 1;
-      if (nonZeroIndex % 4 == 0 && nonZeroIndex != text.length) {
-        buffer.write('  '); // Add double spaces.
-      }
-    }
-
-    var string = buffer.toString();
+    var string = Utils.addSpaces(text);
     return newValue.copyWith(
         text: string,
         selection: new TextSelection.collapsed(offset: string.length));

lib/src/widgets/input/card_input.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_paystack/src/common/card_utils.dart';
+import 'package:flutter_paystack/src/common/utils.dart';
 import 'package:flutter_paystack/src/models/card.dart';
 import 'package:flutter_paystack/src/widgets/buttons.dart';
 import 'package:flutter_paystack/src/widgets/input/cvc_field.dart';
@@ -36,8 +37,9 @@ class _CardInputState extends State<CardInput> {
     super.initState();
     numberController = new TextEditingController();
     numberController.addListener(_getCardTypeFrmNumber);
-    numberController.text =
-        _card != null && _card.number != null ? _card.number : null;
+    if (_card?.number != null) {
+      numberController.text = Utils.addSpaces(_card.number);
+    }
   }
 
   @override

pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_paystack
 description: A Flutter plugin for making payments via Paystack Payment Gateway. Completely supports Android and iOS.
-version: 1.0.3
+version: 1.0.3+1
 author: Wilberforce Uwadiegwu <[email protected]>
 homepage: https://github.com/wilburt/flutter_paystack
 
@@ -23,10 +23,10 @@ flutter:
   plugin:
     platforms:
       android:
-        package: io.flutter.plugins.webviewflutter
-        pluginClass: WebViewFlutterPlugin
+        package: co.paystack.flutterpaystack
+        pluginClass:  FlutterPaystackPlugin
       ios:
-        pluginClass: FLTWebViewFlutterPlugin
+        pluginClass:  FlutterPaystackPlugin
 
   assets:
    - assets/images/