🗑 Remove deprecate code.

✏️ Fix typo
shahanajparvin · Nov 5, 2022 · 385b883 · 385b883
1 parent 81363a1
commit 385b883
Show file tree

Hide file tree

Showing 15 changed files with 90 additions and 102 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,10 +1,11 @@
 {
-    "cSpell.words": [
-        "Alives",
-        "Fwitter",
-        "parentkey",
-        "Retwetkey",
-        "RGBO",
-        "userlist"
-    ]
-}
+  "cSpell.words": [
+    "Alives",
+    "Fwitter",
+    "parentkey",
+    "Retwetkey",
+    "RGBO",
+    "thumbpin",
+    "userlist"
+  ]
+}
diff --git a/lib/helper/utility.dart b/lib/helper/utility.dart
@@ -198,32 +198,29 @@ class Utility {
   }
 
   static bool validateCredentials(
-      GlobalKey<ScaffoldState> _scaffoldKey, String? email, String? password) {
+      BuildContext context, String? email, String? password) {
     if (email == null || email.isEmpty) {
-      customSnackBar(_scaffoldKey, 'Please enter email id');
+      customSnackBar(context, 'Please enter email id');
       return false;
     } else if (password == null || password.isEmpty) {
-      customSnackBar(_scaffoldKey, 'Please enter password');
+      customSnackBar(context, 'Please enter password');
       return false;
     } else if (password.length < 8) {
-      customSnackBar(_scaffoldKey, 'Password must me 8 character long');
+      customSnackBar(context, 'Password must me 8 character long');
       return false;
     }
 
     var status = validateEmail(email);
     if (!status) {
-      customSnackBar(_scaffoldKey, 'Please enter valid email id');
+      customSnackBar(context, 'Please enter valid email id');
       return false;
     }
     return true;
   }
 
-  static customSnackBar(GlobalKey<ScaffoldState>? _scaffoldKey, String msg,
+  static customSnackBar(BuildContext context, String msg,
       {double height = 30, Color backgroundColor = Colors.black}) {
-    if (_scaffoldKey == null || _scaffoldKey.currentState == null) {
-      return;
-    }
-    _scaffoldKey.currentState!.hideCurrentSnackBar();
+    ScaffoldMessenger.of(context).hideCurrentSnackBar();
     final snackBar = SnackBar(
       backgroundColor: backgroundColor,
       content: Text(
@@ -233,7 +230,7 @@ class Utility {
         ),
       ),
     );
-    _scaffoldKey.currentState!.showSnackBar(snackBar);
+    ScaffoldMessenger.of(context).showSnackBar(snackBar);
   }
 
   static bool validateEmail(String email) {
@@ -281,13 +278,13 @@ class Utility {
   }
 
   static void copyToClipBoard({
-    required GlobalKey<ScaffoldState> scaffoldKey,
+    required BuildContext context,
     required String text,
     required String message,
   }) {
     var data = ClipboardData(text: text);
     Clipboard.setData(data);
-    customSnackBar(scaffoldKey, message);
+    customSnackBar(context, message);
   }
 
   static Locale getLocale(BuildContext context) {

diff --git a/lib/state/authState.dart b/lib/state/authState.dart
@@ -74,7 +74,7 @@ class AuthState extends AppState {
 
   /// Verify user's credentials for login
   Future<String?> signIn(String email, String password,
-      {required GlobalKey<ScaffoldState> scaffoldKey}) async {
+      {required BuildContext context}) async {
     try {
       isBusy = true;
       var result = await _firebaseAuth.signInWithEmailAndPassword(
@@ -84,17 +84,17 @@ class AuthState extends AppState {
       return user!.uid;
     } on FirebaseException catch (error) {
       if (error.code == 'firebase_auth/user-not-found') {
-        Utility.customSnackBar(scaffoldKey, 'User not found');
+        Utility.customSnackBar(context, 'User not found');
       } else {
         Utility.customSnackBar(
-          scaffoldKey,
+          context,
           error.message ?? 'Something went wrong',
         );
       }
       cprint(error, errorIn: 'signIn');
       return null;
     } catch (error) {
-      Utility.customSnackBar(scaffoldKey, error.toString());
+      Utility.customSnackBar(context, error.toString());
       cprint(error, errorIn: 'signIn');
 
       return null;
@@ -173,8 +173,7 @@ class AuthState extends AppState {
 
   /// Create new user's profile in db
   Future<String?> signUp(UserModel userModel,
-      {required GlobalKey<ScaffoldState> scaffoldKey,
-      required String password}) async {
+      {required BuildContext context, required String password}) async {
     try {
       isBusy = true;
       var result = await _firebaseAuth.createUserWithEmailAndPassword(
@@ -197,7 +196,7 @@ class AuthState extends AppState {
     } catch (error) {
       isBusy = false;
       cprint(error, errorIn: 'signUp');
-      Utility.customSnackBar(scaffoldKey, error.toString());
+      Utility.customSnackBar(context, error.toString());
       return null;
     }
   }
@@ -260,22 +259,21 @@ class AuthState extends AppState {
   }
 
   /// Send email verification link to email2
-  Future<void> sendEmailVerification(
-      GlobalKey<ScaffoldState> scaffoldKey) async {
+  Future<void> sendEmailVerification(BuildContext context) async {
     User user = _firebaseAuth.currentUser!;
     user.sendEmailVerification().then((_) {
       Utility.logEvent('email_verification_sent',
           parameter: {userModel!.displayName!: user.email});
       Utility.customSnackBar(
-        scaffoldKey,
+        context,
         'An email verification link is send to your email.',
       );
     }).catchError((error) {
       cprint(error.message, errorIn: 'sendEmailVerification');
       Utility.logEvent('email_verification_block',
           parameter: {userModel!.displayName!: user.email});
       Utility.customSnackBar(
-        scaffoldKey,
+        context,
         error.message,
       );
     });
@@ -289,17 +287,17 @@ class AuthState extends AppState {
 
   /// Send password reset link to email
   Future<void> forgetPassword(String email,
-      {required GlobalKey<ScaffoldState> scaffoldKey}) async {
+      {required BuildContext context}) async {
     try {
       await _firebaseAuth.sendPasswordResetEmail(email: email).then((value) {
-        Utility.customSnackBar(scaffoldKey,
+        Utility.customSnackBar(context,
             'A reset password link is sent yo your mail.You can reset your password from there');
         Utility.logEvent('forgot+password', parameter: {});
       }).catchError((error) {
         cprint(error.message);
       });
     } catch (error) {
-      Utility.customSnackBar(scaffoldKey, error.toString());
+      Utility.customSnackBar(context, error.toString());
       return Future.value(false);
     }
   }

diff --git a/lib/ui/page/Auth/forgetPasswordPage.dart b/lib/ui/page/Auth/forgetPasswordPage.dart
@@ -20,7 +20,6 @@ class ForgetPasswordPage extends StatefulWidget {
 class _ForgetPasswordPageState extends State<ForgetPasswordPage> {
   late FocusNode _focusNode;
   late TextEditingController _emailController;
-  final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
   @override
   void initState() {
     _focusNode = FocusNode();
@@ -48,14 +47,14 @@ class _ForgetPasswordPageState extends State<ForgetPasswordPage> {
             const SizedBox(
               height: 50,
             ),
-            _entryFeild('Enter email', controller: _emailController),
+            _entryField('Enter email', controller: _emailController),
             // SizedBox(height: 10,),
             _submitButton(context),
           ],
         ));
   }
 
-  Widget _entryFeild(String hint,
+  Widget _entryField(String hint,
       {required TextEditingController controller, bool isPassword = false}) {
     return Container(
       margin: const EdgeInsets.symmetric(vertical: 15),
@@ -116,26 +115,25 @@ class _ForgetPasswordPageState extends State<ForgetPasswordPage> {
 
   void _submit() {
     if (_emailController.text.isEmpty) {
-      Utility.customSnackBar(_scaffoldKey, 'Email field cannot be empty');
+      Utility.customSnackBar(context, 'Email field cannot be empty');
       return;
     }
     var isValidEmail = Utility.validateEmail(
       _emailController.text,
     );
     if (!isValidEmail) {
-      Utility.customSnackBar(_scaffoldKey, 'Please enter valid email address');
+      Utility.customSnackBar(context, 'Please enter valid email address');
       return;
     }
 
     _focusNode.unfocus();
     var state = Provider.of<AuthState>(context, listen: false);
-    state.forgetPassword(_emailController.text, scaffoldKey: _scaffoldKey);
+    state.forgetPassword(_emailController.text, context: context);
   }
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      key: _scaffoldKey,
       appBar: AppBar(
         title: customText('Forget Password',
             context: context, style: const TextStyle(fontSize: 20)),

diff --git a/lib/ui/page/Auth/signin.dart b/lib/ui/page/Auth/signin.dart
@@ -45,8 +45,8 @@ class _SignInState extends State<SignIn> {
           crossAxisAlignment: CrossAxisAlignment.center,
           children: <Widget>[
             const SizedBox(height: 150),
-            _entryFeild('Enter email', controller: _emailController),
-            _entryFeild('Enter password',
+            _entryField('Enter email', controller: _emailController),
+            _entryField('Enter password',
                 controller: _passwordController, isPassword: true),
             _emailLoginButton(context),
             const SizedBox(height: 20),
@@ -70,7 +70,7 @@ class _SignInState extends State<SignIn> {
     );
   }
 
-  Widget _entryFeild(String hint,
+  Widget _entryField(String hint,
       {required TextEditingController controller, bool isPassword = false}) {
     return Container(
       margin: const EdgeInsets.symmetric(vertical: 15),
@@ -132,11 +132,11 @@ class _SignInState extends State<SignIn> {
     }
     loader.showLoader(context);
     var isValid = Utility.validateCredentials(
-        _scaffoldKey, _emailController.text, _passwordController.text);
+        context, _emailController.text, _passwordController.text);
     if (isValid) {
       state
           .signIn(_emailController.text, _passwordController.text,
-              scaffoldKey: _scaffoldKey)
+              context: context)
           .then((status) {
         if (state.user != null) {
           loader.hideLoader();

diff --git a/lib/ui/page/Auth/signup.dart b/lib/ui/page/Auth/signup.dart
@@ -28,7 +28,6 @@ class _SignupState extends State<Signup> {
   late TextEditingController _confirmController;
   late CustomLoader loader;
   final _formKey = GlobalKey<FormState>();
-  final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
   @override
   void initState() {
     loader = CustomLoader();
@@ -58,13 +57,12 @@ class _SignupState extends State<Signup> {
           mainAxisAlignment: MainAxisAlignment.center,
           crossAxisAlignment: CrossAxisAlignment.center,
           children: <Widget>[
-            _entryFeild('Name', controller: _nameController),
-            _entryFeild('Enter email',
+            _entryField('Name', controller: _nameController),
+            _entryField('Enter email',
                 controller: _emailController, isEmail: true),
-            // _entryFeild('Mobile no',controller: _mobileController),
-            _entryFeild('Enter password',
+            _entryField('Enter password',
                 controller: _passwordController, isPassword: true),
-            _entryFeild('Confirm password',
+            _entryField('Confirm password',
                 controller: _confirmController, isPassword: true),
             _submitButton(context),
 
@@ -82,7 +80,7 @@ class _SignupState extends State<Signup> {
     );
   }
 
-  Widget _entryFeild(String hint,
+  Widget _entryField(String hint,
       {required TextEditingController controller,
       bool isPassword = false,
       bool isEmail = false}) {
@@ -121,28 +119,27 @@ class _SignupState extends State<Signup> {
       margin: const EdgeInsets.symmetric(vertical: 35),
       child: CustomFlatButton(
         label: "Sign up",
-        onPressed: _submitForm,
+        onPressed: () => _submitForm(context),
         borderRadius: 30,
       ),
     );
   }
 
-  void _submitForm() {
+  void _submitForm(BuildContext context) {
     if (_emailController.text.isEmpty) {
-      Utility.customSnackBar(_scaffoldKey, 'Please enter name');
+      Utility.customSnackBar(context, 'Please enter name');
       return;
     }
     if (_emailController.text.length > 27) {
-      Utility.customSnackBar(
-          _scaffoldKey, 'Name length cannot exceed 27 character');
+      Utility.customSnackBar(context, 'Name length cannot exceed 27 character');
       return;
     }
     if (_emailController.text.isEmpty || _passwordController.text.isEmpty) {
-      Utility.customSnackBar(_scaffoldKey, 'Please fill form carefully');
+      Utility.customSnackBar(context, 'Please fill form carefully');
       return;
     } else if (_passwordController.text != _confirmController.text) {
       Utility.customSnackBar(
-          _scaffoldKey, 'Password and confirm password did not match');
+          context, 'Password and confirm password did not match');
       return;
     }
 
@@ -166,7 +163,7 @@ class _SignupState extends State<Signup> {
         .signUp(
       user,
       password: _passwordController.text,
-      scaffoldKey: _scaffoldKey,
+      context: context,
     )
         .then((status) {
       print(status);
@@ -184,7 +181,6 @@ class _SignupState extends State<Signup> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      key: _scaffoldKey,
       appBar: AppBar(
         title: customText(
           'Sign Up',

diff --git a/lib/ui/page/Auth/verifyEmail.dart b/lib/ui/page/Auth/verifyEmail.dart
@@ -74,7 +74,7 @@ class _VerifyEmailPageState extends State<VerifyEmailPage> {
 
   void _submit() {
     var state = Provider.of<AuthState>(context, listen: false);
-    state.sendEmailVerification(_scaffoldKey);
+    state.sendEmailVerification(context);
   }
 
   @override

diff --git a/lib/ui/page/profile/EditProfilePage.dart b/lib/ui/page/profile/EditProfilePage.dart
@@ -197,8 +197,7 @@ class _EditProfilePageState extends State<EditProfilePage> {
 
   void _submitButton() {
     if (_name.text.length > 27) {
-      Utility.customSnackBar(
-          _scaffoldKey, 'Name length cannot exceed 27 character');
+      Utility.customSnackBar(context, 'Name length cannot exceed 27 character');
       return;
     }
     var state = Provider.of<AuthState>(context, listen: false);

diff --git a/lib/ui/page/profile/qrCode/scanner.dart b/lib/ui/page/profile/qrCode/scanner.dart
@@ -1,6 +1,5 @@
 import 'dart:io';
 import 'dart:math';
-import 'dart:typed_data';
 import 'dart:ui' as ui;
 
 import 'package:flutter/material.dart';

diff --git a/lib/ui/theme/extention.dart b/lib/ui/theme/extention.dart
@@ -4,7 +4,7 @@ extension SizeHelper on BuildContext {
   double get width => MediaQuery.of(this).size.width;
   double get height => MediaQuery.of(this).size.height;
 
-  double getDimention(context, double unit) {
+  double getDimension(context, double unit) {
     if (width <= 360.0) {
       return unit / 1.3;
     } else {