New code field design (#119)

* feat: removed all that shit about git submodules and reverted back to normal usage of SPM * feat: implemented the pin code text field @RobotsAndPencils, this is huge, lovin this thing! * feat: improved menubar item design also added a placeholder for a future "Chat Shortcut" feature
mock-foundation · Aug 7, 2022 · ea43ab6 · ea43ab6
1 parent bd8a9c3
commit ea43ab6
Show file tree

Hide file tree

Showing 15 changed files with 399 additions and 111 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/Backend/Package.swift b/Backend/Package.swift
@@ -15,8 +15,8 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(path: "../third-party/tdlibkit"),
-        .package(path: "../third-party/Resolver"),
+        .package(url: "https://github.com/hmlongco/Resolver.git", from: "1.0.0"),
+        .package(url: "https://github.com/mock-foundation/tdlibkit", from: "3.0.1-1.8.4-07b7faf6"),
         .package(path: "../Utilities"),
         .package(path: "../Caching"),
         .package(path: "../Logs")

diff --git a/Caching/Package.swift b/Caching/Package.swift
@@ -14,7 +14,7 @@ let package = Package(
             targets: ["Caching"]),
     ],
     dependencies: [
-        .package(path: "../third-party/GRDB.swift"),
+        .package(url: "https://github.com/groue/GRDB.swift.git", from: "5.26.0"),
         .package(path: "../Utilities"),
         .package(path: "../Logs")
     ],

diff --git a/Moc.xcodeproj/project.pbxproj b/Moc.xcodeproj/project.pbxproj
diff --git a/Shared/Commands/About/AboutCommand.swift b/Shared/Commands/About/AboutCommand.swift
@@ -17,6 +17,7 @@ struct BackportedAboutCommand: Commands {
             Button {
                 openURL(URL(string: "moc://internal/openAbout")!)
             } label: {
+                Image(systemName: "info.circle.fill")
                 Text("About Moc")
             }
         }

diff --git a/Shared/Commands/AppCommands.swift b/Shared/Commands/AppCommands.swift
@@ -6,6 +6,7 @@
 //
 
 import SwiftUI
+import AppCenterAnalytics
 
 struct AppCommands: Commands {
     #if os(macOS)
@@ -15,32 +16,31 @@ struct AppCommands: Commands {
     var body: some Commands {
         #if os(macOS)
         CommandGroup(after: .appInfo) {
-            Button("Check for updates...", action: updateManager.checkForUpdates)
-                .disabled(!updateManager.canCheckForUpdates)
+            Button(action: updateManager.checkForUpdates) {
+                Image(systemName: updateManager.canCheckForUpdates
+                      ? "arrow.triangle.2.circlepath"
+                      : "exclamationmark.arrow.triangle.2.circlepath")
+                Text("Check for updates...")
+            }.disabled(!updateManager.canCheckForUpdates)
         }
         #endif
         CommandGroup(after: .appSettings) {
-            Button(action: {
-                
-            }, label: {
+            Button {
+
+            } label: {
                 Image(systemName: "bookmark")
                 Text("Saved messages")
-            }).keyboardShortcut("0")
-            Button(action: {
-
-            }, label: {
-                Image(systemName: "person.wave.2")
-                Text("Find people nearby")
-            })
+            }.keyboardShortcut("0")
+            Text("No chat shortcuts")
             Divider()
             Button(action: {
-
+                Analytics.trackEvent("Opened \"Telegram Tips\" channel from the menubar")
             }, label: {
                 Image(systemName: "text.book.closed")
                 Text("Telegram Tips")
             })
             Button(action: {
-
+                Analytics.trackEvent("Opened \"Moc Updates\" channel from the menubar")
             }, label: {
                 Image(systemName: "newspaper")
                 Text("Moc Updates")

diff --git a/Shared/MocApp+Injection.swift b/Shared/MocApp+Injection.swift
@@ -51,10 +51,16 @@ struct MocApp: App {
         ))
         TdApi.shared[0].startTdLibUpdateHandler()
 
+        Task {
+            AppCenter.countryCode = try await TdApi.shared[0].getCountryCode().text
+        }
+
         AppCenter.start(withAppSecret: Secret.appCenterSecret, services: [
             Analytics.self,
             Crashes.self
         ])
+
+        Analytics.enabled = true
     }
 
     #if os(macOS)

diff --git a/Shared/ViewModels/MainViewModel.swift b/Shared/ViewModels/MainViewModel.swift
@@ -129,7 +129,7 @@ class MainViewModel: ObservableObject {
     }
 
     @Published var showingLoginScreen = false
-    @Published var isSessionTerminationAlertShown = false
+//    @Published var isSessionTerminationAlertShown = false
 
     @Published var sidebarSize: SidebarSize = .medium
 
@@ -147,7 +147,9 @@ class MainViewModel: ObservableObject {
                     case let .authorizationState(info):
                         switch info.authorizationState {
                             case .closed:
-                                isSessionTerminationAlertShown = true
+//                                isSessionTerminationAlertShown = true
+                                allChats.removeAll()
+                                chatFilters.removeAll()
                             case .ready, .waitEncryptionKey, .waitTdlibParameters: break // do nothing
                             default:
                                 showingLoginScreen = true

diff --git a/Shared/Views/ContentView.swift b/Shared/Views/ContentView.swift
@@ -490,19 +490,19 @@ struct ContentView: View {
             LoginView()
                 .frame(width: 400, height: 500)
         }
-        .alert("Your session was ended", isPresented: $mainViewModel.isSessionTerminationAlertShown) {
-            Button {
-                #if os(macOS)
-                NSApp.terminate(self)
-                #elseif os(iOS)
-                exit(0)
-                #endif
-            } label: {
-                Text("Close")
-            }
-        } message: {
-            Text("Please relogin to continue using Moc.")
-        }
+//        .alert("Your session was ended", isPresented: $mainViewModel.isSessionTerminationAlertShown) {
+//            Button {
+//                #if os(macOS)
+//                NSApp.terminate(self)
+//                #elseif os(iOS)
+//                exit(0)
+//                #endif
+//            } label: {
+//                Text("Close")
+//            }
+//        } message: {
+//            Text("Please relogin to continue using Moc.")
+//        }
     }
 
     private var chatPlaceholder: some View {

diff --git a/Shared/Views/Login/LoginView+Code.swift b/Shared/Views/Login/LoginView+Code.swift
@@ -13,20 +13,34 @@ extension LoginView {
         VStack {
             Text("Enter the code")
                 .font(.title)
-            TextField("Code", text: $code)
-                .onSubmit {
-                    Task {
-                        do {
-                            withAnimation { showLoadingSpinner = true }
-                            try await service.checkAuth(code: code)
-                            withAnimation { showLoadingSpinner = false }
-                        } catch {
-                            showErrorAlert = true
+            PinCodeTextField(code: $code, numberOfDigits: 5)
+                .onChange(of: code) { value in
+                    if value.count == 5 {
+                        Task {
+                            do {
+                                withAnimation { showLoadingSpinner = true }
+                                try await service.checkAuth(code: code)
+                                withAnimation { showLoadingSpinner = false }
+                            } catch {
+                                showErrorAlert = true
+                            }
                         }
                     }
                 }
-                .frame(width: 156)
-                .textFieldStyle(.roundedBorder)
+//            TextField("Code", text: $code)
+//                .onSubmit {
+//                    Task {
+//                        do {
+//                            withAnimation { showLoadingSpinner = true }
+//                            try await service.checkAuth(code: code)
+//                            withAnimation { showLoadingSpinner = false }
+//                        } catch {
+//                            showErrorAlert = true
+//                        }
+//                    }
+//                }
+//                .frame(width: 156)
+//                .textFieldStyle(.roundedBorder)
 
 //            Button {
 //                Task {