feat: DetailPopupView 작성, setTimeout 함수 추가 #14

MC1-morning-coffee · Mar 28, 2023 · a9ecc15 · a9ecc15
1 parent ff8c175
commit a9ecc15
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 23 deletions.
diff --git a/Data/Global/globalStore.swift b/Data/Global/globalStore.swift
@@ -30,44 +30,48 @@ enum EnumSpeaker: CaseIterable {
     case autodoor
 }
 
+enum EnumDetailImage: CaseIterable {
+    case joljol
+    case autodoor
+    case key1 // 주머니에 열쇠가 들어있다.
+    case key2 // 컬러스왑한 열쇠가 6개가 있다.
+    case key3 // 열쇠 중 1개(커피)를 선택한다.
+}
+
 class GlobalStore: ObservableObject {
     /**
      현재 Scene을 구분하기 위한 enum
      */
     @Published
-    var currentScene = EnumScene.opeaning
-
+    var currentScene = EnumScene.opeaning {
+        didSet {
+            scriptCount = 0
+        }
+    }
     /**
      현재 스크립트를 말하는 대상을 구분하기 위한 enum
      */
     @Published
     var currentSpeaker = EnumSpeaker.system
-
+    /**
+     현재 오브젝트의 디테일 이미지를 보여주는 팝업뷰가  열려있는지 확인하기 위한 변수
+     */
     @Published
-    var isPopupActive = false {
-        didSet{
-            if isPopupActive == true {
-                DispatchQueue.main.asyncAfter(deadline: .now() + 4) {
-                    self.isPopupActive = false
-                }
-            }
-        }
-    }
-
+    var isPopupActive = false
     @Published
+    /**
+     씬 별로 스크립트 진행도를 표현하기 위한 변수
+     */
     var scriptCount = 0
-    
+
     init() {
         print("globalStore is ready")
     }
-
-    func updateCurrentScene (scene: EnumScene){
-        currentScene = scene
-    }
 }
 
 protocol ObservableStore: ObservableObject {}
 
+// currentSpeaker
 extension GlobalStore: ObservableStore {
 
     func updateCurrentSpeaker(speaker: EnumSpeaker){
@@ -78,3 +82,24 @@ extension GlobalStore: ObservableStore {
         currentSpeaker = EnumSpeaker.system
     }
 }
+
+// currentScene
+extension GlobalStore {
+    func updateCurrentScene (scene: EnumScene){
+        currentScene = scene
+    }
+}
+
+// isPopupActive
+extension GlobalStore {
+    func toggleIsPopupActive(){
+        isPopupActive.toggle()
+    }
+}
+
+// scriptCount
+extension GlobalStore {
+    func addScriptCount() {
+        scriptCount += 1
+    }
+}
diff --git a/Utils/Timeout/setTimeout.swift b/Utils/Timeout/setTimeout.swift
@@ -0,0 +1,15 @@
+//
+//  File.swift
+//  
+//
+//  Created by Yun Dongbeom on 2023/03/28.
+//
+
+import Foundation
+
+
+public func setTimeoutClosure(timeCount: Int, completion: @escaping ()->()) {
+    DispatchQueue.main.asyncAfter(deadline: .now() + DispatchTimeInterval.seconds(timeCount)) {
+        completion()
+    }
+}
diff --git a/View/DetailPopupView/DetailPopupView.swift b/View/DetailPopupView/DetailPopupView.swift
@@ -12,9 +12,14 @@ import SwiftUI
  2. 값을 받아서 다른 이미지를 보여준다.
  */
 struct DetailPopupView: View {
+    var target: EnumDetailImage = .key1
+
+    private let IMAGE_PATH = "Frame_290_290"
+    private let IMAGE_SIZE: CGFloat = 290
+
     var body: some View {
-        Image("Frame_Mission_290_290")
-            .frame(width: 290, height: 290)
+        Image("\(IMAGE_PATH)_\(target)")
+            .frame(width: IMAGE_SIZE, height: IMAGE_SIZE)
     }
 }
 
diff --git a/View/SceneView/SceneView.swift b/View/SceneView/SceneView.swift
@@ -16,7 +16,7 @@ struct SceneView: View {
     var globalStore: GlobalStore
 
     private func delayText() {
-        DispatchQueue.main.asyncAfter(deadline: .now() + 3) {
+        setTimeoutClosure(timeCount: 3) {
             globalStore.isPopupActive = true
         }
     }
@@ -35,6 +35,8 @@ struct SceneView: View {
                             print(globalStore.currentSpeaker)
                             delayText()
                     }
+                }else if globalStore.currentScene == .sequence1 {
+                    SequenceOneView()
                 }
                 if globalStore.isPopupActive {
                     DetailPopupView()

diff --git a/View/ScriptBoxView/ScriptBoxView.swift b/View/ScriptBoxView/ScriptBoxView.swift
@@ -29,8 +29,6 @@ struct ScriptBoxView: View {
             VStack(alignment: .leading) {
                 HStack(spacing: 0){
                     VStack(alignment: .leading, spacing: 0){
-//                        Text(scripts[scriptCount])
-//                            .frame(width: width - 32)
                         CustomText(value: "\(EnumSpeaker.coffee)", fontSize: 24)
                             .padding(.bottom, 4)
                         CustomText(value: "내 열쇠와 색이 같은 문을 열고 들어가보자.")