- changed ui main screen for cupertino

- bug fix about navigation screens - bug fix about not registered users nickname
maliksenpai · Jan 23, 2022 · 13c794f · 13c794f
1 parent 59c3a75
commit 13c794f
Show file tree

Hide file tree

Showing 8 changed files with 235 additions and 105 deletions.
diff --git a/lib/data/firebase/firebase_user.dart b/lib/data/firebase/firebase_user.dart
@@ -94,6 +94,7 @@ class FirebaseUser extends GetxService{
       //await databaseReference.child(firebaseAuth.currentUser!.uid.toString()).child("username").set(username);
       var checkTakenUsername = await collectionReference.where('displayName',isEqualTo: username).get();
       if(checkTakenUsername.size == 0){
+        await firebaseAuth.currentUser?.updateDisplayName(username);
         await collectionReference.doc(firebaseAuth.currentUser!.uid.toString()).update({"displayName": username});
       }else{
         return false;

diff --git a/lib/model/game_types.dart b/lib/model/game_types.dart
@@ -1,6 +1,6 @@
 enum GameType{
+  all,
   frp,
   boardGame,
   tcg,
-  all,
 }
diff --git a/lib/screen/create_game_screen.dart b/lib/screen/create_game_screen.dart
@@ -33,62 +33,62 @@ class _CreateGameScreenState extends State<CreateGameScreen> {
     super.initState();
   }
 
-  @override
-  Widget build(BuildContext context) {
+  void cupertinoGameTypeSelector(context){
+    showCupertinoModalPopup(
+        context: context,
+        builder: (_) => Container(
+          color: Colors.white,
+          width: 300,
+          alignment: Alignment.center,
+          height: MediaQuery.of(context).size.height * 0.2,
+          child: CupertinoPicker(
+            itemExtent: 30,
+            children: gameTypeList.map(
+                  (e) => DropdownMenuItem(
+                child: Center(
+                  child: Text(e == GameType.frp
+                      ? "FRP"
+                      : e == GameType.boardGame
+                      ? "Kutu oyunu"
+                      : "TCG"),
+                ),
+                value: e,
+              ),
+            ).toList(),
+            onSelectedItemChanged: (int index) {
+              setState(() {
+                selectedGameType = gameTypeList[index];
+              });
+            },
+          ),
+        )
+    );
+  }
 
+  void cupertinoProvienceSelector(){
+    showCupertinoModalPopup(
+        context: context,
+        builder: (_) => Container(
+          color: Colors.white,
+          width: 300,
+          alignment: Alignment.center,
+          height: MediaQuery.of(context).size.height * 0.4,
+          child: CupertinoPicker(
+            itemExtent: 30,
+            children: gameProvinceList.map((e) => Center(child: Text(e))).toList(),
+            onSelectedItemChanged: (int index) {
+              setState(() {
+                selectedGameProvince = gameProvinceList[index];
+              });
+            },
+          ),
+        )
+    );
+  }
 
-    void cupertinoGameTypeSelector(context){
-      showCupertinoModalPopup(
-          context: context,
-          builder: (_) => Container(
-            color: Colors.white,
-            width: 300,
-            alignment: Alignment.center,
-            height: MediaQuery.of(context).size.height * 0.2,
-            child: CupertinoPicker(
-              itemExtent: 30,
-              children: gameTypeList.map(
-                    (e) => DropdownMenuItem(
-                  child: Center(
-                    child: Text(e == GameType.frp
-                        ? "FRP"
-                        : e == GameType.boardGame
-                        ? "Kutu oyunu"
-                        : "TCG"),
-                  ),
-                  value: e,
-                ),
-              ).toList(),
-              onSelectedItemChanged: (int index) {
-                setState(() {
-                  selectedGameType = gameTypeList[index];
-                });
-              },
-            ),
-          )
-      );
-    }
+  @override
+  Widget build(BuildContext context) {
 
-    void cupertinoProvienceSelector(){
-      showCupertinoModalPopup(
-          context: context,
-          builder: (_) => Container(
-            color: Colors.white,
-            width: 300,
-            alignment: Alignment.center,
-            height: MediaQuery.of(context).size.height * 0.4,
-            child: CupertinoPicker(
-              itemExtent: 30,
-              children: gameProvinceList.map((e) => Center(child: Text(e))).toList(),
-              onSelectedItemChanged: (int index) {
-                setState(() {
-                  selectedGameProvince = gameProvinceList[index];
-                });
-              },
-            ),
-          )
-      );
-    }
 
     return PlatformScaffold(
       appBar: PlatformAppBar(

diff --git a/lib/screen/login_screen.dart b/lib/screen/login_screen.dart
@@ -135,7 +135,7 @@ class _LoginScreenState extends State<LoginScreen> {
     DialogUtils.createLoadingDialog(context, "Yükleniyor", "Uygulamaya giriş yapılmaya çalışılıyor");
     if( _formKey.currentState!.validate()){
       LoginResponse loginResponse = await userGet.loginUser(LoginRequest(mail: mailController.text, passHash: passController.text));
-      Navigator.of(Get.overlayContext!).pop();
+      Navigator.of(Get.overlayContext!, rootNavigator: true).pop();
       if(loginResponse == LoginResponse.successful){
         Get.offAll(const MainScreen());
       } else if(loginResponse == LoginResponse.userNotFound){
@@ -154,7 +154,7 @@ class _LoginScreenState extends State<LoginScreen> {
         Get.snackbar("Hata", "Hata oluştu");
       }
     }else{
-      Navigator.of(Get.overlayContext!).pop();
+      Navigator.of(Get.overlayContext!, rootNavigator: true).pop();
     }
   }
 

diff --git a/lib/screen/main_screen.dart b/lib/screen/main_screen.dart
@@ -95,6 +95,7 @@ class _MainScreenState extends State<MainScreen> with TickerProviderStateMixin {
   void checkUsername() {
     if (userDatabase.getUser()!.displayName == null) {
       TextEditingController controller = TextEditingController();
+      bool isLoading = false;
       bool isErrorShort = false;
       bool isErrorTaken = false;
       bool isSuccess = false;
@@ -160,7 +161,10 @@ class _MainScreenState extends State<MainScreen> with TickerProviderStateMixin {
                     setState(() {
                       isErrorShort = true;
                     });
+                  } else if( isLoading) {
+
                   } else {
+                    isLoading = true;
                     bool response = await userGet.setUsername(controller.text);
                     if (response) {
                       setState(() {
@@ -169,7 +173,8 @@ class _MainScreenState extends State<MainScreen> with TickerProviderStateMixin {
                         isSuccess = true;
                       });
                       Future.delayed(Duration(seconds: 2), () {
-                        Navigator.of(Get.overlayContext!).pop();
+                        isLoading = false;
+                        Navigator.of(Get.overlayContext!, rootNavigator: true).pop();
                       });
                     } else {
                       setState(() {

diff --git a/lib/screen/settings_screen.dart b/lib/screen/settings_screen.dart
@@ -77,16 +77,9 @@ class _SettingsScreenState extends State<SettingsScreen> {
                       barrierDismissible: false
                     );
                     bool logout = await userGet.logoutUser();
-                    Navigator.of(Get.overlayContext!).pop();
+                    Navigator.of(Get.overlayContext!, rootNavigator: true).pop();
                     if(logout){
-                      Navigator.pushReplacement(
-                          context,
-                          platformPageRoute(
-                            context: context,
-                            material: (_, __) => MaterialPageRouteData((_) => LoginScreen(), RouteSettings(), true, false),
-                            cupertino: (_,__) => CupertinoPageRouteData((_) => LoginScreen(), RouteSettings(), true, false)
-                          )
-                      );
+                      Get.off(const LoginScreen());
                     }else{
                       Get.snackbar("İşlem Başarısız", "Çıkış işlemi başarısız oldu");
                     }