Null safety support added

Other minor bug fixes and improvement

README.md

@@ -48,6 +48,18 @@ Setup process is described below to integrate in sample project.
 
 ### Methods
 
+Configure Firebase in main method.
+
+    WidgetsFlutterBinding.ensureInitialized();
+    Platform.isAndroid
+        ? await Firebase.initializeApp(
+            options: const FirebaseOptions(
+                apiKey: 'xxxxxxxxxxxx-g-famDgC3jx6VV4h-xxxxxx',
+                appId: '1:xxxxxxxxxxxx:android:xxxxxxxb7ea052854b0005',
+                messagingSenderId: 'xxxxxxxxxxxx',
+                projectId: 'flutterxxxxxxxxx-9xxxa'))
+        : await Firebase.initializeApp();
+
 Configure Country Picker Widget & implement method for call back selected country details e.g
 
     // Put CountryPicker Widget
@@ -60,67 +72,79 @@ Configure Country Picker Widget & implement method for call back selected countr
         // place your code
     }
 
-Configure PINEntryTextField For OTP (One Time Password)
+Configure OtpPinField For OTP (One Time Password)
 
-    // add this package in pubspec.yaml file
-    pin_entry_text_field: ^0.1.4
+    // add these packages in pubspec.yaml file
+    otp_pin_field: ^1.2.2
+    firebase_core: ^2.25.4
 
     // run this command to install package
     flutter pub get
 
-    // add PINEntryTextField in class
-    PinEntryTextField(
-      fields: 6,
+    // initialize key and add OtpPinField in class
+
+    final _otpPinFieldKey = GlobalKey<OtpPinFieldState>();
+
+    OtpPinField(
+      key: _otpPinFieldKey,
+      textInputAction: TextInputAction.done,
+      maxLength: 6,
+      fieldWidth: 40,
       onSubmit: (text) {
+            smsOTP = text;
       },
+      onChange: (text) {}
     )
       
 Validate Phone Number & Generate Otp     
 
     // generate otp method and store Verification Id
     Future<void> generateOtp(String contact) async {
-      final PhoneCodeSent smsOTPSent = (String verId, [int forceCodeResend]) {
-        verificationId = verId;
+      final PhoneCodeSent smsOTPSent = (verId, forceResendingToken) {
+      verificationId = verId;
       };
       try {
         await _auth.verifyPhoneNumber(
-            phoneNumber: contact,
-            codeAutoRetrievalTimeout: (String verId) {
-              verificationId = verId;
-            },
-            codeSent: smsOTPSent,
-            timeout: const Duration(seconds: 60),
-            verificationCompleted: (AuthCredential phoneAuthCredential) {},
-            verificationFailed: (AuthException exception) {
-             // Navigator.pop(context, exception.message);
-            });
+        phoneNumber: contact,
+        codeAutoRetrievalTimeout: (String verId) {
+          verificationId = verId;
+        },
+        codeSent: smsOTPSent,
+        timeout: const Duration(seconds: 60),
+        verificationCompleted: (AuthCredential phoneAuthCredential) {},
+        verificationFailed: (error) {
+          print(error);
+        },
+       );
       } catch (e) {
-        Navigator.pop(context, (e as PlatformException).message);
-      }
+      handleError(e as PlatformException);
+     }
     }
 
 
 Verify otp                   
 
     //Method for verify otp entered by user  
     Future<void> verifyOtp() async {
-      if (smsOTP == null || smsOTP == '') {
-        showAlertDialog(context, 'please enter 6 digit otp');
-        return;
+       if (smsOTP.isEmpty || smsOTP == '') {
+          showAlertDialog(context, 'please enter 6 digit otp');
+          return;
+        }
+        try {
+              final AuthCredential credential = PhoneAuthProvider.credential(
+                verificationId: verificationId,
+                smsCode: smsOTP,
+              );
+              final UserCredential user = await _auth.signInWithCredential(credential);
+              final User? currentUser = _auth.currentUser;
+              assert(user.user?.uid == currentUser?.uid);
+              Navigator.pushReplacementNamed(context, '/homeScreen');
+            } on PlatformException catch(e){
+          handleError(e);
+        } catch (e) {
+              print('error $e');
+            }
       }
-      try {
-        final AuthCredential credential = PhoneAuthProvider.getCredential(
-          verificationId: verificationId,
-          smsCode: smsOTP,
-        );
-        final AuthResult user = await _auth.signInWithCredential(credential);
-        final FirebaseUser currentUser = await _auth.currentUser();
-        assert(user.user.uid == currentUser.uid);
-        Navigator.pushReplacementNamed(context, '/homeScreen');
-      } catch (e) {
-        handleError(e as PlatformException);
-      }
-    }
 
 
 Handle errors
@@ -136,7 +160,7 @@ Handle errors
           showAlertDialog(context, 'Invalid Code');
           break;
         default:
-          showAlertDialog(context, error.message);
+          showAlertDialog(context, error.message ?? 'Error');
           break;
       }
     }

android/app/build.gradle

@@ -1,3 +1,10 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+    id "com.google.gms.google-services"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -6,11 +13,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = '1'
@@ -21,29 +23,31 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 android {
-    compileSdkVersion 28
+    namespace "com.example.flutter_otp_module"
+    compileSdkVersion flutter.compileSdkVersion
+    ndkVersion flutter.ndkVersion
 
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
     }
 
-    lintOptions {
-        disable 'InvalidPackage'
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
     }
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.flutter_otp_module"
-        minSdkVersion 16
-        targetSdkVersion 28
+        minSdkVersion flutter.minSdkVersion
+        targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -59,12 +63,6 @@ flutter {
     source '../..'
 }
 
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
-    implementation 'androidx.browser:browser:1.2.0'
-}
+dependencies {}
 
 apply plugin: 'com.google.gms.google-services'

android/app/src/main/AndroidManifest.xml

@@ -6,7 +6,7 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
     <application
-        android:name="io.flutter.app.FlutterApplication"
+        android:name="${applicationName}"
         android:label="flutter_otp_module"
         android:icon="@mipmap/ic_launcher">
         <activity
@@ -15,7 +15,8 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>

android/build.gradle

@@ -1,21 +1,21 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:3.6.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.google.gms:google-services:4.2.0'
+        classpath 'com.google.gms:google-services:4.3.13'
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
@@ -27,6 +27,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+zipStorePath=wrapper/dists

android/settings.gradle

@@ -1,15 +1,30 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }
+    settings.ext.flutterSdkPath = flutterSdkPath()
 
-def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
+    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
 
-def plugins = new Properties()
-def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
-if (pluginsFile.exists()) {
-    pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+
+    plugins {
+        id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false
+    }
 }
 
-plugins.each { name, path ->
-    def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
-    include ":$name"
-    project(":$name").projectDir = pluginDirectory
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "7.3.0" apply false
 }
+
+include ":app"
+

ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>8.0</string>
+  <string>11.0</string>
 </dict>
 </plist>