Refactor & Migrate to Flutter 3.22

Author: ArmanKhanTech

android/app/src/debug/AndroidManifest.xml

@@ -1,9 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.divine">
-
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
@@ -15,7 +14,6 @@
    <application
         android:label="Divine"
         android:icon="@mipmap/app_icon">
-
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -26,21 +24,19 @@
             android:windowSoftInputMode="adjustResize">
             <meta-data
               android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"/>
+              android:resource="@style/NormalTheme" />
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
        <activity
            android:name="com.yalantis.ucrop.UCropActivity"
            android:screenOrientation="portrait"
-           android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+           android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
 
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
-
     </application>
-
 </manifest>

android/app/src/main/AndroidManifest.xml

@@ -2,11 +2,8 @@ import 'package:flutter/material.dart';
 
 class CustomCard extends StatelessWidget {
   final Widget? child;
-
   final BorderRadius? borderRadius;
-
   final bool elevated;
-
   final Function()? onTap;
 
   const CustomCard({
@@ -22,8 +19,7 @@ class CustomCard extends StatelessWidget {
     return Container(
       decoration: BoxDecoration(
           borderRadius: borderRadius,
-          color: Theme.of(context).colorScheme.background
-      ),
+          color: Theme.of(context).colorScheme.surface),
       child: Material(
         type: MaterialType.transparency,
         borderRadius: borderRadius,
@@ -36,5 +32,3 @@ class CustomCard extends StatelessWidget {
     );
   }
 }
-
-

android/app/src/profile/AndroidManifest.xml

@@ -1,58 +1,54 @@
-import 'package:divine/components/custom_card.dart';
+import 'package:divine/component/custom_card.dart';
+import 'package:divine/utility/commom_utility.dart';
+
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:ionicons/ionicons.dart';
 
 class PasswordFormBuilder extends StatefulWidget {
   final String? initialValue;
+  final String? hintText;
+  final String? whichPage;
 
   final bool? enabled;
-
-  final String? hintText;
+  final bool obscureText;
 
   final TextInputType? textInputType;
-
   final TextEditingController? controller;
-
   final TextInputAction? textInputAction;
-
-  final bool obscureText;
-
   final FocusNode? focusNode, nextFocusNode;
-
   final VoidCallback? submitAction;
-
   final FormFieldValidator<String>? validateFunction;
 
   final void Function(String)? onSaved, onChange;
 
-  final String? whichPage;
+  final CommomUtility commomUtility = CommomUtility();
 
   // ignore: overridden_fields
   @override
   final Key? key;
   final IconData? prefix;
   final IconData? suffix;
 
-  const PasswordFormBuilder({
-    this.prefix,
-    this.suffix,
-    this.initialValue,
-    this.enabled,
-    this.hintText,
-    this.textInputType,
-    this.controller,
-    this.textInputAction,
-    this.nextFocusNode,
-    this.focusNode,
-    this.submitAction,
-    this.obscureText = false,
-    this.validateFunction,
-    this.onSaved,
-    this.onChange,
-    required this.whichPage,
-    this.key
-  }) : super(key: key);
+  PasswordFormBuilder(
+      {this.prefix,
+      this.suffix,
+      this.initialValue,
+      this.enabled,
+      this.hintText,
+      this.textInputType,
+      this.controller,
+      this.textInputAction,
+      this.nextFocusNode,
+      this.focusNode,
+      this.submitAction,
+      this.obscureText = false,
+      this.validateFunction,
+      this.onSaved,
+      this.onChange,
+      required this.whichPage,
+      this.key})
+      : super(key: key);
 
   @override
   State<PasswordFormBuilder> createState() => _PasswordFormBuilderState();
@@ -111,20 +107,23 @@ class _PasswordFormBuilderState extends State<PasswordFormBuilder> {
                   textInputAction: widget.textInputAction,
                   focusNode: widget.focusNode,
                   decoration: InputDecoration(
-                    prefixIcon: Icon(
-                      widget.prefix,
-                      size: 20.0,
-                      color: widget.whichPage == 'login' ? Colors.orange : Colors.blue
-                    ),
+                    prefixIcon: Icon(widget.prefix,
+                        size: 20.0,
+                        color: widget.whichPage == 'login'
+                            ? Colors.orange
+                            : Colors.blue),
                     suffixIcon: GestureDetector(
                       onTap: () {
                         setState(() => obscureText = !obscureText);
                       },
                       child: Icon(
-                        obscureText ? widget.suffix : Ionicons.eye_off_outline,
-                        size: 20.0,
-                          color: widget.whichPage == 'login' ? Colors.orange : Colors.blue
-                      ),
+                          obscureText
+                              ? widget.suffix
+                              : Ionicons.eye_off_outline,
+                          size: 20.0,
+                          color: widget.whichPage == 'login'
+                              ? Colors.orange
+                              : Colors.blue),
                     ),
                     filled: true,
                     fillColor: Colors.grey[200],
@@ -136,9 +135,9 @@ class _PasswordFormBuilderState extends State<PasswordFormBuilder> {
                       height: 1.2,
                     ),
                     contentPadding: const EdgeInsets.all(15.0),
-                    border: border(context),
-                    enabledBorder: border(context),
-                    focusedBorder: focusBorder(context),
+                    border: widget.commomUtility.border(context),
+                    enabledBorder: widget.commomUtility.border(context),
+                    focusedBorder: widget.commomUtility.focusBorder(context),
                     errorStyle: const TextStyle(height: 10.0, fontSize: 0.0),
                   ))),
         ),
@@ -155,28 +154,4 @@ class _PasswordFormBuilderState extends State<PasswordFormBuilder> {
       ]),
     );
   }
-
-  border(BuildContext context) {
-    return const OutlineInputBorder(
-      borderRadius: BorderRadius.all(
-        Radius.circular(20.0),
-      ),
-      borderSide: BorderSide(
-        color: Colors.white,
-        width: 0.0,
-      ),
-    );
-  }
-
-  focusBorder(BuildContext context) {
-    return OutlineInputBorder(
-      borderRadius: const BorderRadius.all(
-        Radius.circular(20.0),
-      ),
-      borderSide: BorderSide(
-        color: Theme.of(context).colorScheme.secondary,
-        width: 1.0,
-      ),
-    );
-  }
 }