ConversationsClassic/View/Entering/LoginScreen.swift

@@ -13,9 +13,6 @@ struct LoginScreen: View {
 
     @FocusState private var focus: Field?
 
-    @State private var isLoading = false
-    @State private var isError = false
-
     #if DEBUG
         @State private var jidStr: String = "nartest1@conversations.im"
         @State private var pass: String = "nartest12345"
@@ -98,16 +95,6 @@ struct LoginScreen: View {
             }
             .padding(.horizontal, 32)
         }
-        .if(isLoading) {
-            $0.loadingOverlay()
-        }
-        .alert(isPresented: $isError) {
-            Alert(
-                title: Text(L10n.Global.Error.title),
-                message: Text(L10n.Login.error),
-                dismissButton: .default(Text(L10n.Global.ok))
-            )
-        }
     }
 
     private var loginInputValid: Bool {
@@ -115,7 +102,9 @@ struct LoginScreen: View {
     }
 
     private func tryLogin() async {
-        isLoading = true
+        router.showModal {
+            LoadingScreen()
+        }
 
         // login with fake timeout
         async let sleep: Void? = try? await Task.sleep(nanoseconds: 1 * NSEC_PER_SEC)
@@ -125,12 +114,17 @@ struct LoginScreen: View {
         switch result {
         case .success(let client):
             clientsStore.addNewClient(client)
-            isLoading = false
+            router.dismissModal()
-            isError = false
 
         case .failure:
-            isLoading = false
+            router.dismissModal()
-            isError = true
+            router.showAlert(
+                .alert,
+                title: L10n.Global.Error.title,
+                subtitle: L10n.Login.error
+            ) {
+                Button(L10n.Global.ok, role: .cancel) {}
+            }
         }
     }
 }

ConversationsClassic/View/SharedComponents/LoadingScreen.swift

@@ -1,23 +1,10 @@
-import Foundation
 import SwiftUI
 
-public extension View {
+struct LoadingScreen: View {
-    func loadingOverlay() -> some View {
+    var body: some View {
-        modifier(LoadingOverlay())
+        GeometryReader { geo in
-    }
-}
-
-struct LoadingOverlay: ViewModifier {
-    func body(content: Content) -> some View {
-        ZStack {
-            content
-            loadingView
-        }
-    }
-
-    private var loadingView: some View {
-        GeometryReader { proxyReader in
             ZStack {
+                // background with opacity
                 Color.Material.Elements.active.opacity(0.3)
                     .frame(maxWidth: .infinity, maxHeight: .infinity)
 
@@ -26,7 +13,7 @@ struct LoadingOverlay: ViewModifier {
                     .progressViewStyle(
                         CircularProgressViewStyle(tint: .Material.Elements.active)
                     )
-                    .position(x: proxyReader.size.width / 2, y: proxyReader.size.height / 2)
+                    .position(x: geo.size.width / 2, y: geo.size.height / 2)
                     .controlSize(.large)
             }
         }