fix(share-card): 공유 화면 시간 연동 버그 수정

Kim Mincheol · Kim Mincheol · commit db98f83ca933 · 2021-02-19T20:14:18.000+09:00
diff --git a/Sticky/Features/MyPage/Views/MyPage.swift b/Sticky/Features/MyPage/Views/MyPage.swift
@@ -13,9 +13,12 @@ struct MyPage: View {
     // MARK: Internal
 
     @Environment(\.presentationMode) var presentationMode: Binding<PresentationMode>
-    @StateObject var badgeViewModel: BadgeViewModel
+
     @EnvironmentObject var user: User
     @EnvironmentObject var challengeState: ChallengeState
+    @StateObject var shareViewModel: ShareViewModel
+    @StateObject var badgeViewModel: BadgeViewModel
+
     @State var showingActionSheet = false
 
     var monthlyButton: some View {
@@ -59,7 +62,11 @@ struct MyPage: View {
                 EmptyView()
             }
             NavigationLink(
-                destination: Share(shareType: ShareType.card, badgeViewModel: badgeViewModel),
+                destination: Share(
+                    shareType: ShareType.card,
+                    shareViewModel: shareViewModel,
+                    badgeViewModel: badgeViewModel
+                ),
                 tag: ShareType.card,
                 selection: $navSelection
             ) { EmptyView() }
@@ -145,7 +152,7 @@ struct MyPage: View {
 
 struct MyPage_Previews: PreviewProvider {
     static var previews: some View {
-        MyPage(badgeViewModel: BadgeViewModel())
+        MyPage(shareViewModel: ShareViewModel(), badgeViewModel: BadgeViewModel())
             .environmentObject(User())
             .environmentObject(ChallengeState())
     }
diff --git a/Sticky/Features/Share/Component/CardSlide.swift b/Sticky/Features/Share/Component/CardSlide.swift
@@ -20,9 +20,9 @@ struct CardSlide: View {
     // MARK: Internal
 
     @EnvironmentObject var UIState: UIStateModel
-    @EnvironmentObject var shareViewModel: ShareViewModel
     @EnvironmentObject var user: User
     @ObservedObject var badgeViewModel: BadgeViewModel
+    @ObservedObject var shareViewModel: ShareViewModel
 
     @Binding var items: [Card]
     let randomBodyText_KR = ["와우! 끈기가 대단해요", "정말 대단해요!", "와 진짜 믿을수 없어"]
@@ -265,7 +265,7 @@ public class UIStateModel: ObservableObject {
 
 struct CardSlide_Previews: PreviewProvider {
     static var previews: some View {
-        CardSlide(badgeViewModel: BadgeViewModel(), items: .constant(items))
+        CardSlide(badgeViewModel: BadgeViewModel(), shareViewModel: ShareViewModel(), items: .constant(items))
             .environmentObject(UIStateModel())
             .environmentObject(User())
     }
diff --git a/Sticky/Features/Share/Component/CardSlideView.swift b/Sticky/Features/Share/Component/CardSlideView.swift
@@ -14,6 +14,7 @@ struct CardSlideView: View {
 
     @EnvironmentObject var UIState: UIStateModel
     @ObservedObject var badgeViewModel: BadgeViewModel
+    @ObservedObject var shareViewModel: ShareViewModel
 
     var body: some View {
         VStack {
@@ -38,7 +39,11 @@ struct CardSlideView: View {
             }
             .padding(.bottom, 16)
             .foregroundColor(Color.white)
-            CardSlide(badgeViewModel: badgeViewModel, items: $items)
+            CardSlide(
+                badgeViewModel: badgeViewModel,
+                shareViewModel: shareViewModel,
+                items: $items
+            )
             HStack {
                 Text("나의 ")+Text(getBottomString()).bold()+Text(" 공유합니다")
             }
@@ -71,7 +76,10 @@ struct CardSlideView: View {
 
 struct CardSlideView_Previews: PreviewProvider {
     static var previews: some View {
-        CardSlideView(badgeViewModel: BadgeViewModel())
-            .environmentObject(UIStateModel())
+        CardSlideView(
+            badgeViewModel: BadgeViewModel(),
+            shareViewModel: ShareViewModel()
+        )
+        .environmentObject(UIStateModel())
     }
 }
diff --git a/Sticky/Features/Share/Model/ShareViewModel.swift b/Sticky/Features/Share/Model/ShareViewModel.swift
@@ -13,6 +13,17 @@ class ShareViewModel: ObservableObject {
     init() {
         badge = loadBadge(forKey: "shareBadge")
         seconds = UserDefaults.standard.integer(forKey: "shareSeconds")
+//        let type = Main.ChallengeType(
+//            rawValue: UserDefaults.standard.integer(forKey: "challengeType")
+//        ) ?? .notRunning
+//        switch type {
+//        case .notAtHome,
+//             .notRunning,
+//             .outing:
+//            seconds = 0
+//        case .running:
+//            seconds = UserDefaults.standard.integer(forKey: "shareSeconds")
+//        }
     }
 
     // MARK: Internal
diff --git a/Sticky/Features/Share/View/Share.swift b/Sticky/Features/Share/View/Share.swift
@@ -11,23 +11,22 @@ import SwiftUI
 // MARK: - Share
 
 struct Share: View {
-    // MARK: Lifecycle
-
-    init(shareType: ShareType, badgeViewModel: BadgeViewModel) {
-        self.shareType = shareType
-        self.badgeViewModel = badgeViewModel
-    }
-
     // MARK: Internal
 
+//    init(shareType: ShareType, badgeViewModel: BadgeViewModel, ) {
+//        self.shareType = shareType
+//        self.badgeViewModel = badgeViewModel
+//    }
+
     @State var bgColor: LinearGradient = Color.Sticky.blue_bg
     var shareType: ShareType
 
     @Environment(\.presentationMode) var presentationMode: Binding<PresentationMode>
-    @EnvironmentObject var shareViewModel: ShareViewModel
     @EnvironmentObject var UIState: UIStateModel
     @EnvironmentObject var user: User
     @EnvironmentObject var challengeState: ChallengeState
+
+    @ObservedObject var shareViewModel: ShareViewModel
     @ObservedObject var badgeViewModel: BadgeViewModel
 
     var body: some View {
@@ -138,7 +137,10 @@ struct Share: View {
         print("setCardView")
         switch shareType {
         case .slide:
-            view = AnyView(CardSlideView(badgeViewModel: badgeViewModel))
+            view = AnyView(CardSlideView(
+                badgeViewModel: badgeViewModel,
+                shareViewModel: shareViewModel
+            ))
 
         case .card:
             let badge = shareViewModel.badge
@@ -180,8 +182,12 @@ struct Share: View {
 
 struct Share_Previews: PreviewProvider {
     static var previews: some View {
-        Share(shareType: ShareType.card, badgeViewModel: BadgeViewModel())
-            .environmentObject(ShareViewModel())
-            .environmentObject(UIStateModel())
+        Share(
+            shareType: ShareType.card,
+            shareViewModel: ShareViewModel(),
+            badgeViewModel: BadgeViewModel()
+        )
+        .environmentObject(ShareViewModel())
+        .environmentObject(UIStateModel())
     }
 }
diff --git a/Sticky/Features/Timer/ChallengeState.swift b/Sticky/Features/Timer/ChallengeState.swift
@@ -27,6 +27,7 @@ public class ChallengeState: ObservableObject {
             timeData.hour = nowComponents.hour ?? 0
             timeData.minute = nowComponents.minute ?? 0
             timeData.second = nowComponents.second ?? 0
+            UserDefaults.standard.set(timeData.toSeconds(), forKey: "shareSeconds")
         }
         if type == .outing {
             let outingComponents = now.compareTo(date: outingDate)
diff --git a/Sticky/Features/Timer/Views/Main.swift b/Sticky/Features/Timer/Views/Main.swift
@@ -19,13 +19,14 @@ struct Main: View {
         case outing
     }
 
-    @EnvironmentObject private var popupState: PopupStateModel
+    @EnvironmentObject private var user: User
     @EnvironmentObject private var challengeState: ChallengeState
-    @EnvironmentObject private var shareViewModel: ShareViewModel
+    @StateObject private var shareViewModel = ShareViewModel()
+    @StateObject private var badgeViewModel = BadgeViewModel()
+
+    @EnvironmentObject private var popupState: PopupStateModel
     @EnvironmentObject private var locationManager: LocationManager
-    @EnvironmentObject private var user: User
     @EnvironmentObject private var rootManager: RootViewManager
-    @StateObject private var badgeViewModel = BadgeViewModel()
 
     @State var sharePresented: Bool = false
     @State var bannerDetailPresented: Bool = false
@@ -44,14 +45,20 @@ struct Main: View {
                 NavigationLink(
                     destination: Share(
                         shareType: ShareType.slide,
+                        shareViewModel: shareViewModel,
                         badgeViewModel: badgeViewModel
                     ),
                     isActive: $sharePresented
                 ) { EmptyView() }
+
                 NavigationLink(
-                    destination: MyPage(badgeViewModel: badgeViewModel),
+                    destination: MyPage(
+                        shareViewModel: shareViewModel,
+                        badgeViewModel: badgeViewModel
+                    ),
                     isActive: $mypagePresented
                 ) { EmptyView() }
+
                 NavigationLink(
                     destination: NewItemShare(badgeQueue: $badgeViewModel.badgeQueue, seconds: user.accumulateSeconds),
                     isActive: $showNewBadge
@@ -149,9 +156,9 @@ struct Main: View {
     }
 
     func addChallengeTimer() {
-        user.accumulateSeconds += 3600
-        shareViewModel.seconds += 3600
-        challengeState.timeData.minute += 60
+        user.accumulateSeconds += 1
+        shareViewModel.seconds += 1
+        challengeState.timeData.second += 1
         if challengeState.timeData.minute >= 60 {
             challengeState.timeData.hour += 1
             challengeState.timeData.minute = 0

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ public class ChallengeState: ObservableObject {`
`27`	`27`	`timeData.hour = nowComponents.hour ?? 0`
`28`	`28`	`timeData.minute = nowComponents.minute ?? 0`
`29`	`29`	`timeData.second = nowComponents.second ?? 0`
	`30`	`+ UserDefaults.standard.set(timeData.toSeconds(), forKey: "shareSeconds")`
`30`	`31`	`}`
`31`	`32`	`if type == .outing {`
`32`	`33`	`let outingComponents = now.compareTo(date: outingDate)`