From d33bb1875f569ff89dcfab126a7cb2f4b67bf4cf Mon Sep 17 00:00:00 2001
From: Jigar <prajapatijigar791@gmail.com>
Date: Fri, 12 May 2023 05:05:50 +0530
Subject: [PATCH 1/3] fixed validating username problem

---
 lib/screens/auth_screen.dart | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/screens/auth_screen.dart b/lib/screens/auth_screen.dart
index 27c006de2..d19e39f90 100644
--- a/lib/screens/auth_screen.dart
+++ b/lib/screens/auth_screen.dart
@@ -246,12 +246,13 @@ class _AuthCardState extends State<AuthCard> {
                     textInputAction: TextInputAction.next,
                     keyboardType: TextInputType.emailAddress,
                     validator: (value) {
-                      if (!RegExp(r'^[\w.@+-]+$').hasMatch(value!)) {
-                        return AppLocalizations.of(context).usernameValidChars;
-                      }
                       if (value.isEmpty) {
                         return AppLocalizations.of(context).invalidUsername;
                       }
+                      if (!RegExp(r'^[\w.@+-]+$').hasMatch(value!)) {
+                        return AppLocalizations.of(context).usernameValidChars;
+                      }
+                      
                       return null;
                     },
                     inputFormatters: [FilteringTextInputFormatter.deny(RegExp(r'\s\b|\b\s'))],

From 7db4f60e4a0b77feb75e440ff27d3a11b4b7006d Mon Sep 17 00:00:00 2001
From: Jigar <prajapatijigar791@gmail.com>
Date: Fri, 12 May 2023 05:37:19 +0530
Subject: [PATCH 2/3] added myself to AUTHORS.md

---
 AUTHORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index a14238764..91d8eee02 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -2,6 +2,7 @@
 
 ## Developers
 
+- Jigar Prajapati - <https://github.com/Jiggy9>
 - Roland Geider – <https://github.com/rolandgeider>
 - Dylan Aird - <https://github.com/Dolaned>
 - Jannik Norden - <https://github.com/Jannik-dev>

From aba4b824fc36461194427225dc23ca9ea3f03280 Mon Sep 17 00:00:00 2001
From: Jigar <prajapatijigar791@gmail.com>
Date: Wed, 17 May 2023 15:25:51 +0530
Subject: [PATCH 3/3] now it is fixed for null check

---
 lib/screens/auth_screen.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/screens/auth_screen.dart b/lib/screens/auth_screen.dart
index d19e39f90..e1dd7eb36 100644
--- a/lib/screens/auth_screen.dart
+++ b/lib/screens/auth_screen.dart
@@ -246,7 +246,7 @@ class _AuthCardState extends State<AuthCard> {
                     textInputAction: TextInputAction.next,
                     keyboardType: TextInputType.emailAddress,
                     validator: (value) {
-                      if (value.isEmpty) {
+                      if (value==null || value.isEmpty) {
                         return AppLocalizations.of(context).invalidUsername;
                       }
                       if (!RegExp(r'^[\w.@+-]+$').hasMatch(value!)) {