Procházet zdrojové kódy

Merge pull request #381 from nightscout/launchscreen

Add Trio LaunchScreen
Mike Plante před 1 rokem
rodič
revize
2e96f0bb18

+ 6 - 1
Trio/Resources/Info.plist

@@ -107,7 +107,12 @@
 	<key>UIFileSharingEnabled</key>
 	<true/>
 	<key>UILaunchScreen</key>
-	<dict/>
+	<dict>
+		<key>UIColorName</key>
+		<string>Background_DarkBlue</string>
+		<key>UIImageName</key>
+		<string>trioCircledNoBackground</string>
+	</dict>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>

+ 8 - 2
Trio/Sources/Application/TrioApp.swift

@@ -145,14 +145,20 @@ extension Notification.Name {
                 Main.LoadingView(showError: $showLoadingError, retry: retryCoreDataInitialization)
                     .onAppear {
                         if self.initState.complete {
-                            self.showLoadingView = false
+                            Task { @MainActor in
+                                try? await Task.sleep(for: .seconds(1.8))
+                                self.showLoadingView = false
+                            }
                         }
                         if self.initState.error {
                             self.showLoadingError = true
                         }
                     }
                     .onReceive(Foundation.NotificationCenter.default.publisher(for: .initializationCompleted)) { _ in
-                        self.showLoadingView = false
+                        Task { @MainActor in
+                            try? await Task.sleep(for: .seconds(1.8))
+                            self.showLoadingView = false
+                        }
                     }
                     .onReceive(Foundation.NotificationCenter.default.publisher(for: .initializationError)) { _ in
                         self.showLoadingError = true

+ 1 - 1
Trio/Sources/Helpers/CustomProgressView.swift

@@ -32,7 +32,7 @@ struct CustomProgressView: View {
                         .frame(width: 80, height: 3)
                         .offset(x: self.animate ? 180 : -180, y: 0)
                         .animation(
-                            Animation.linear(duration: 2)
+                            Animation.linear(duration: 1)
                                 .repeatForever(autoreverses: false), value: UUID()
                         )
                 )

+ 0 - 4
Trio/Sources/Modules/Base/BaseStateModel.swift

@@ -11,10 +11,6 @@ protocol StateModel: ObservableObject {
     func view(for screen: Screen) -> AnyView
 }
 
-protocol CGMStateModel: StateModel {
-    var cgmCurrent: CGMType { get }
-}
-
 class BaseStateModel<Provider>: StateModel, Injectable where Provider: Trio.Provider {
     @Injected() var router: Router!
     @Injected() var settingsManager: SettingsManager!