Merge pull request #33 from seungwook-jung/feature/splash_lottie

[NO_ISSEUE] Splash 구현
hunnit-log · Dec 15, 2020 · 9eaa5d7 · 9eaa5d7
2 parents 2aac45d + de64aa1
commit 9eaa5d7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/HunnitLog/HunnitLog.xcodeproj/project.pbxproj b/HunnitLog/HunnitLog.xcodeproj/project.pbxproj
@@ -57,6 +57,9 @@
 		E0B1887D25765B71003DF180 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E0B1887C25765B71003DF180 /* Images.xcassets */; };
 		E0B18882257662C0003DF180 /* RetrospectQuestionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B18881257662C0003DF180 /* RetrospectQuestionView.swift */; };
 		E0B18887257662CE003DF180 /* RetrospectQuestionViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B18886257662CE003DF180 /* RetrospectQuestionViewModel.swift */; };
+		E0A0AFD1257E2A0D0030F3F6 /* Lottie in Frameworks */ = {isa = PBXBuildFile; productRef = E0A0AFD0257E2A0D0030F3F6 /* Lottie */; };
+		E0A0AFD7257E2A2B0030F3F6 /* SplashView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0A0AFD6257E2A2B0030F3F6 /* SplashView.swift */; };
+		E0A0AFDF257E2BBB0030F3F6 /* splash.json in Resources */ = {isa = PBXBuildFile; fileRef = E0A0AFDE257E2BBB0030F3F6 /* splash.json */; };
 		E0B91481256158AA00F93987 /* Tracker.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B9147E256158AA00F93987 /* Tracker.swift */; };
 		E0B91482256158AA00F93987 /* APIService.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B9147F256158AA00F93987 /* APIService.swift */; };
 		E0B91483256158AA00F93987 /* APIServiceError.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B91480256158AA00F93987 /* APIServiceError.swift */; };
@@ -135,6 +138,8 @@
 		E0B1887C25765B71003DF180 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		E0B18881257662C0003DF180 /* RetrospectQuestionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RetrospectQuestionView.swift; sourceTree = "<group>"; };
 		E0B18886257662CE003DF180 /* RetrospectQuestionViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RetrospectQuestionViewModel.swift; sourceTree = "<group>"; };
+		E0A0AFD6257E2A2B0030F3F6 /* SplashView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplashView.swift; sourceTree = "<group>"; };
+		E0A0AFDE257E2BBB0030F3F6 /* splash.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = splash.json; sourceTree = "<group>"; };
 		E0B9147E256158AA00F93987 /* Tracker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Tracker.swift; sourceTree = "<group>"; };
 		E0B9147F256158AA00F93987 /* APIService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = APIService.swift; sourceTree = "<group>"; };
 		E0B91480256158AA00F93987 /* APIServiceError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = APIServiceError.swift; sourceTree = "<group>"; };

diff --git a/HunnitLog/HunnitLog/HunnitLogApp.swift b/HunnitLog/HunnitLog/HunnitLogApp.swift
@@ -13,19 +13,19 @@ struct HunnitLogApp: App {
         static let splashDuration: Double = 2
     }
 
-    @State var isActive:Bool = false
+    @State var isApplicationActive:Bool = false
 
     var body: some Scene {
         WindowGroup {
             VStack {
-                if self.isActive {
+                if self.isApplicationActive {
                     AchievementSetupView()
                 } else {
                     SplashView()
                 }
             }.onAppear {
                 DispatchQueue.main.asyncAfter(deadline: .now() + Constants.splashDuration) {
-                    self.isActive = true
+                    self.isApplicationActive = true
                 }
             }
         }