feat: update storyview background for iphone, fix audio bug on arstory

moco-team · Dec 9, 2023 · 2a64b2d · 2a64b2d
1 parent 6968211
commit 2a64b2d
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 33 deletions.
diff --git a/Moco/MocoApp.swift b/Moco/MocoApp.swift
@@ -57,7 +57,6 @@ struct MocoApp: App {
                 .environment(\.audioViewModel, audioViewModel)
                 .environment(\.timerViewModel, timerViewModel)
                 .environment(\.mazePromptViewModel, mazePromptViewModel)
-                .environment(/*@START_MENU_TOKEN@*//*@PLACEHOLDER=Key Path@*/ \.sizeCategory/*@END_MENU_TOKEN@*/, /*@START_MENU_TOKEN@*//*@PLACEHOLDER=Value@*/ .extraExtraLarge/*@END_MENU_TOKEN@*/)
                 .environmentObject(objectDetectionViewModel)
                 .environmentObject(arViewModel)
                 .environmentObject(motionViewModel)

diff --git a/Moco/View/Components/Prompts/ARStory/ARStory.swift b/Moco/View/Components/Prompts/ARStory/ARStory.swift
@@ -24,6 +24,7 @@ struct ARStory: View {
     }
 
     @State private var isStoryDone: Bool = false
+    @State private var isMakeSentence: Bool = false
 
     var prompt: PromptModel = .init(
         correctAnswer: "honey_jar", // object to be found
@@ -67,7 +68,7 @@ struct ARStory: View {
     var body: some View {
         ZStack {
             if isTutorialFinished {
-                if !isStoryDone {
+                if !isStoryDone && !showLastIsland && !isMakeSentence {
                     ARCameraView(
                         clue: prompt,
                         lastPrompt: lastPrompt,
@@ -87,6 +88,8 @@ struct ARStory: View {
                             isStoryDone = true
                             if !lastPrompt {
                                 doneHandler?()
+                            } else {
+                                isMakeSentence = true
                             }
                         }
                     )
@@ -114,7 +117,7 @@ struct ARStory: View {
                             }
                         }
                     }
-                } else if lastPrompt && !showLastIsland {
+                } else if lastPrompt && !showLastIsland && isMakeSentence {
                     MakeSentence {
                         showLastIsland = true
                     }
@@ -159,6 +162,9 @@ struct ARStory: View {
             arViewModel.pause()
             arViewModel.resetSession()
         }
+        .onAppear {
+            isStoryDone = false
+        }
         .task {
             isTutorialFinished = arViewModel.isTutorialDone
         }

diff --git a/Moco/View/Components/Prompts/ARStory/MakeSentence.swift b/Moco/View/Components/Prompts/ARStory/MakeSentence.swift
@@ -27,7 +27,7 @@ struct MakeSentence: View {
 
     var prompts: [PromptModel] = [
         .init(
-            correctAnswer: "bebe makan madu",
+            correctAnswer: "bebe",
             startTime: 0,
             promptType: PromptType.card,
             hints: nil,
@@ -116,6 +116,7 @@ struct MakeSentence: View {
             }
         }
         .onAppear {
+            print("cukurukuk")
             currentPromptIndex = 0
 
             DispatchQueue.main.asyncAfter(deadline: .now() + 1) {

diff --git a/Moco/View/Components/Prompts/Card/CardView.swift b/Moco/View/Components/Prompts/Card/CardView.swift
@@ -53,22 +53,25 @@ struct CardView: View {
         VStack {
             switch state {
             case .active:
-                VStack {
-                    GeometryReader { proxy in
-                        let frame = proxy.frame(in: .local)
-                        Image(getActiveCard())
-                            .resizable()
-                            .scaledToFit()
-                            .onTapGesture {
-                                onTap?()
-                            }
-                            .scaleEffect(minScale: 1.0, maxScale: 1.05)
-                            .pointer(
-                                position: CGPoint(x: frame.midX, y: frame.midY),
-                                isShowing: showPointer
-                            )
+                Image(getActiveCard())
+                    .resizable()
+                    .scaledToFit()
+                    .overlay {
+                        GeometryReader { proxy in
+                            let frame = proxy.frame(in: .local)
+                            Image(getActiveCard())
+                                .resizable()
+                                .scaledToFit()
+                                .onTapGesture {
+                                    onTap?()
+                                }
+                                .scaleEffect(minScale: 1.0, maxScale: 1.05)
+                                .pointer(
+                                    position: CGPoint(x: frame.midX, y: frame.midY),
+                                    isShowing: showPointer
+                                )
+                        }
                     }
-                }
             case .inactive:
                 Image("Story/Prompts/card-inactive")
                     .resizable()

diff --git a/Moco/View/User/HomeView.swift b/Moco/View/User/HomeView.swift
@@ -19,8 +19,6 @@ struct HomeView: View {
 
     @State private var homeViewModel = HomeViewModel()
 
-    @State private var isShowing3d = false
-    @State private var isMakeSentenceTest = true
 
     var body: some View {
         ZStack {
@@ -116,11 +114,6 @@ struct HomeView: View {
                 homeViewModel.soundLevel = 0.3
                 homeViewModel.setVolume()
             }
-            if isShowing3d {
-                ThreeDRenderer {
-                    print("test 3d render selesai!")
-                }
-            }
         }
     }
 }

diff --git a/Moco/View/User/StoryView.swift b/Moco/View/User/StoryView.swift
@@ -37,17 +37,27 @@ struct StoryView: View {
 
     var body: some View {
         ZStack {
+            Color.text.primary
             ScrollView(.horizontal) {
                 LazyHStack(spacing: 0) {
                     if let stories = episodeViewModel.selectedEpisode!.stories {
                         ForEach(Array(stories.enumerated()), id: \.offset) { index, _ in
                             ZStack {
                                 PeelEffectTappable(state: $svvm.peelEffectState, isReverse: svvm.isReversePeel) {
-                                    Image(storyViewModel.storyPage!.background)
-                                        .resizable()
-                                        .scaledToFill()
-                                        .frame(width: Screen.width, height: Screen.height, alignment: .center)
-                                        .clipped()
+                                    if UIDevice.isIPad {
+                                        Image(storyViewModel.storyPage!.background)
+                                            .resizable()
+                                            .scaledToFill()
+                                            .frame(width: Screen.width, height: Screen.height, alignment: .center)
+                                            .clipped()
+                                    } else {
+                                        Image(storyViewModel.storyPage!.background)
+                                            .resizable()
+                                            .scaledToFit()
+                                            .scaleEffect(1.4)
+                                            .frame(width: Screen.width, height: Screen.height, alignment: .center)
+                                            .clipped()
+                                    }
                                 } background: {
                                     svvm.peelBackground
                                 } onComplete: {

diff --git a/Moco/ViewModel/StoryViewViewModel.swift b/Moco/ViewModel/StoryViewViewModel.swift
@@ -127,11 +127,15 @@ extension StoryViewViewModel {
 
         let nextPageBg = storyViewModel.getPageBackground(scrollPosition! + 1, episode: episodeViewModel.selectedEpisode!)
 
-        peelBackground = AnyView(Image(nextPageBg ?? storyViewModel.storyPage!.background)
+        peelBackground = UIDevice.isIPad ? AnyView(Image(nextPageBg ?? storyViewModel.storyPage!.background)
             .resizable()
             .scaledToFill()
             .frame(width: Screen.width, height: Screen.height, alignment: .center)
-            .clipped())
+            .clipped()) : AnyView(Image(nextPageBg ?? storyViewModel.storyPage!.background)
+                .resizable()
+                .scaledToFit()
+                .frame(width: Screen.width, height: Screen.height, alignment: .center)
+                .clipped())
         peelEffectState = .start
         toBeExecutedByPeelEffect = {
             self.scrollPosition! += 1