fix error login

xqsadness · Sep 16, 2023 · 87475d3 · 87475d3
1 parent d9a6333
commit 87475d3
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 25 deletions.
diff --git a/DefaultProject.xcworkspace/xcuserdata/darktech4.xcuserdatad/UserInterfaceState.xcuserstate b/DefaultProject.xcworkspace/xcuserdata/darktech4.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/DefaultProject/ContentView.swift b/DefaultProject/ContentView.swift
@@ -9,11 +9,11 @@ import SwiftUI
 
 struct ContentView: View {
     var body: some View {
-        if User.shared.userUID != ""{
-            HomeView()
-        } else {
+//        if User.shared.userUID != ""{
+//            HomeView()
+//        } else {
             LoginDefaultView()
-        }
+//        }
     }
 }
 

diff --git a/DefaultProject/DEFAULT_SOURCE/CONTROLL_APP/Coordinator.swift b/DefaultProject/DEFAULT_SOURCE/CONTROLL_APP/Coordinator.swift
@@ -97,6 +97,7 @@ class Coordinator: ObservableObject{
         case .createUsernameView:
             CreateUsernameView()
                 .environmentObject(Coordinator.shared)
+                .navigationBarBackButtonHidden(true)
         case .homeView:
             HomeView()
                 .environmentObject(Coordinator.shared)

diff --git a/DefaultProject/DefaultProjectApp.swift b/DefaultProject/DefaultProjectApp.swift
@@ -109,31 +109,31 @@ struct RootView: SwiftUI.View {
                     }
                 }
             }
-            .onReceive(NotificationCenter.default.publisher(for: Notification.Name("PushMessage"))) { (output) in
-                DispatchQueue.main.async {
-                    guard let str = output.userInfo?["data"] as? String else {return}
-
-                    appController.MESSAGE_ON_SCREEN = str
-                    withAnimation(.easeInOut(duration: 1)) {
-                        appController.SHOW_MESSAGE_ON_SCREEN  = true
-                    }
-                    appController.TIMER_MESSAGE_ON_SCREEN?.invalidate()
-                    appController.TIMER_MESSAGE_ON_SCREEN = Timer.scheduledTimer(withTimeInterval: 3, repeats: false, block: { _ in
-                        withAnimation(.easeInOut(duration: 1)){
-                            appController.SHOW_MESSAGE_ON_SCREEN  = false
-                        }
-                    })
-                }
-            }
-            .overlay(alignment: .bottom, content: {
-                appController.SHOW_MESSAGE_ON_SCREEN ?
-                NotificationView()
-                : nil
-            })
             .alert(isPresented: $alerter.isShowingAlert) {
                 alerter.alert ?? Alert(title: Text(""))
             }
         }
+        .onReceive(NotificationCenter.default.publisher(for: Notification.Name("PushMessage"))) { (output) in
+            DispatchQueue.main.async {
+                guard let str = output.userInfo?["data"] as? String else {return}
+
+                appController.MESSAGE_ON_SCREEN = str
+                withAnimation(.easeInOut(duration: 1)) {
+                    appController.SHOW_MESSAGE_ON_SCREEN  = true
+                }
+                appController.TIMER_MESSAGE_ON_SCREEN?.invalidate()
+                appController.TIMER_MESSAGE_ON_SCREEN = Timer.scheduledTimer(withTimeInterval: 3, repeats: false, block: { _ in
+                    withAnimation(.easeInOut(duration: 1)){
+                        appController.SHOW_MESSAGE_ON_SCREEN  = false
+                    }
+                })
+            }
+        }
+        .overlay(alignment: .bottom, content: {
+            appController.SHOW_MESSAGE_ON_SCREEN ?
+            NotificationView()
+            : nil
+        })
     }
 
     func openApp(){