Google GMS in F-Droid build #478

README.md

@@ -39,6 +39,7 @@ cp android/build.gradle.foss android/build.gradle
 cp lib/utils/oauth.dart.foss lib/utils/oauth.dart
 cp lib/utils/app_review.dart.foss lib/utils/app_review.dart
 cp lib/ui/app/upgrade_dialog.dart.foss lib/ui/app/upgrade_dialog.dart
+cp lib/ui/app/pinput.dart.foss lib/ui/app/pinput.dart
 cp android/app/src/main/AndroidManifest.foss.xml android/app/src/main/AndroidManifest.xml
 cp pubspec.foss.yaml pubspec.yaml 
 rm pubspec.lock

lib/ui/app/sms_verification.dart

@@ -11,9 +11,9 @@ import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
 import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/ui/app/forms/app_form.dart';
 import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart';
+import 'package:invoiceninja_flutter/ui/app/pinput.dart';
 import 'package:invoiceninja_flutter/utils/dialogs.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
-import 'package:pinput/pinput.dart';
 
 class SmsVerification extends StatefulWidget {
   const SmsVerification();
@@ -134,15 +134,8 @@ class _SmsVerificationState extends State<SmsVerification> {
                   if (_showCode) ...[
                     Text(localization.codeWasSent),
                     SizedBox(height: 20),
-                    Pinput(
+                    AppPinput(
                       onCompleted: (code) => _code = code,
-                      autofocus: true,
-                      length: 6,
-                      showCursor: true,
-                      androidSmsAutofillMethod:
-                          AndroidSmsAutofillMethod.smsUserConsentApi,
-                      validator: (value) =>
-                          value.isEmpty ? localization.pleaseEnterACode : null,
                     ),
                   ] else
                     IntlPhoneField(

pubspec.foss.yaml

@@ -23,6 +23,7 @@ dependencies:
   # google_sign_in: ^5.0.7
   # in_app_review: ^2.0.4
   # in_app_purchase: ^3.0.6
+  # pinput: ^2.2.11
   flutter_redux: ^0.8.2
   redux_logging: ^0.5.0
   http: ^0.13.3
@@ -77,7 +78,6 @@ dependencies:
   window_manager: ^0.2.7
   # bitsdojo_window: ^0.1.2  
   intl_phone_field: ^3.1.0
-  pinput: ^2.2.11
   flutter_staggered_grid_view: ^0.6.2
   # quick_actions: ^0.2.1
   # idb_shim: ^1.11.1+1

pubspec.lock

@@ -949,7 +949,7 @@ packages:
       name: pinput
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.11"
+    version: "2.2.12"
   platform:
     dependency: transitive
     description:

pubspec.next.yaml

@@ -23,6 +23,7 @@ dependencies:
   google_sign_in: ^5.0.7
   in_app_review: ^2.0.4
   in_app_purchase: ^3.0.6
+  pinput: ^2.2.11
   flutter_redux: ^0.8.2
   redux_logging: ^0.5.0
   http: ^0.13.3
@@ -77,7 +78,6 @@ dependencies:
   window_manager: ^0.2.5
   bitsdojo_window: ^0.1.2
   intl_phone_field: ^3.1.0
-  pinput: ^2.2.11
   flutter_staggered_grid_view: ^0.6.2
   # quick_actions: ^0.2.1
   # idb_shim: ^1.11.1+1

pubspec.yaml

@@ -23,6 +23,7 @@ dependencies:
   google_sign_in: ^5.0.7
   in_app_review: ^2.0.4
   in_app_purchase: ^3.0.6
+  pinput: ^2.2.11
   flutter_redux: ^0.8.2
   redux_logging: ^0.5.0
   http: ^0.13.3
@@ -77,7 +78,6 @@ dependencies:
   window_manager: ^0.2.7
   # bitsdojo_window: ^0.1.2
   intl_phone_field: ^3.1.0
-  pinput: ^2.2.11
   flutter_staggered_grid_view: ^0.6.2
   # quick_actions: ^0.2.1
   # idb_shim: ^1.11.1+1