Merge pull request #62 from Nexters/fix/share-card

fix: 공유 화면 시간 관련 버그 수정

Author: Mincheol Kim

Sticky/Extensions/Int+.swift

@@ -25,7 +25,7 @@ extension Int {
     func toTimeData() -> TimeData {
         let time = (
             day: self / 86400,
-            hours: self / 3600,
+            hours: (self % 86400) / 3600,
             minutes: (self % 3600) / 60,
             seconds: (self % 3600) % 60
         )

Sticky/Features/Banner/Components/Banner.swift

@@ -25,7 +25,7 @@ struct Banner: View {
             badges: self.badgeViewModel.monthly
         )
         let remainMonthlyBadge = (Int(nextMonthlyBadge.badgeValue) ?? 0) * 3600
-            - (challengeState.timeData.toSeconds() + user.thisMonthAccumulateSeconds)
+            - challengeState.timeData.toSeconds()
         if remainMonthlyBadge <= 0 {
             nextMonthlyBadge.updated = Date()
             nextMonthlyBadge.count += 1

Sticky/Features/MyPage/Components/Summary.swift

@@ -13,11 +13,12 @@ struct Summary: View {
     /// 누적 시간
     var seconds: Int
     @Binding var selection: ShareType?
+    @EnvironmentObject var user: User
     @EnvironmentObject var shareViewModel: ShareViewModel
 
     var body: some View {
-        let tier = Tier.of(hours: seconds / 3600)
-        let remainNextLevel = tier.next() - seconds
+        let tier = Tier(level: user.level)
+        let remainNextLevel = tier.next() - user.accumulateSeconds
         return VStack(alignment: .trailing) {
             HStack(alignment: .top) {
                 Spacer()

Sticky/Features/MyPage/Models/User.swift

@@ -30,11 +30,4 @@ public class User: ObservableObject {
             UserDefaults.standard.set(accumulateSeconds, forKey: "accumulateSeconds")
         }
     }
-
-    // 이번 달 누적 시간
-    @Published var thisMonthAccumulateSeconds: Int = UserDefaults.standard.integer(forKey: "thisMonthAccumulateSeconds") {
-        didSet {
-            UserDefaults.standard.set(thisMonthAccumulateSeconds, forKey: "thisMonthAccumulateSeconds")
-        }
-    }
 }

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,14 +62,18 @@ 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() }
 
             VStack(alignment: .leading, spacing: 20) {
                 Summary(
-                    seconds: user.accumulateSeconds + challengeState.timeData.toSeconds(),
+                    seconds: user.accumulateSeconds,
                     selection: $navSelection
                 )
                 .padding(.bottom, 15)
@@ -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())
     }

Sticky/Features/Share/Component/CardSlide.swift

@@ -20,10 +20,9 @@ struct CardSlide: View {
     // MARK: Internal
 
     @EnvironmentObject var UIState: UIStateModel
-    @EnvironmentObject var challengeState: ChallengeState
-    @EnvironmentObject var shareViewModel: ShareViewModel
     @EnvironmentObject var user: User
     @ObservedObject var badgeViewModel: BadgeViewModel
+    @ObservedObject var shareViewModel: ShareViewModel
 
     @Binding var items: [Card]
     let randomBodyText_KR = ["와우! 끈기가 대단해요", "정말 대단해요!", "와 진짜 믿을수 없어"]
@@ -223,7 +222,7 @@ struct CardSlide: View {
     }
 
     private var level: Int {
-        switch Tier.of(hours: (user.accumulateSeconds + challengeState.timeData.toSeconds()) / 3600).level {
+        switch Tier.of(hours: user.accumulateSeconds / 3600).level {
         case 1...3:
             return 1
         case 4...6:
@@ -239,11 +238,11 @@ struct CardSlide: View {
     }
 
     private var isDayTextHidden: Bool {
-        return challengeState.timeData.day > 0 ? false : true
+        return shareViewModel.seconds.toTimeData().day > 0 ? false : true
     }
 
     private var isHourTextHidden: Bool {
-        return challengeState.timeData.hour > 0 ? false : true
+        return shareViewModel.seconds.toTimeData().hour > 0 ? false : true
     }
 
     private func getRandomText() -> String {
@@ -266,9 +265,8 @@ 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(ChallengeState())
             .environmentObject(User())
     }
 }

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())
     }
 }

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

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 {
@@ -86,15 +85,13 @@ struct Share: View {
     }
 
     private func setBackgroundColor(type: BadgeType) -> AnyView {
-        print("\(UIState.activeCard)asdasd")
         switch shareType {
         case .slide:
             return AnyView(setColor().ignoresSafeArea())
 
         default:
             switch type {
             case .level:
-
                 bgColor = Color.Sticky.blue_bg
                 return
                     AnyView(
@@ -118,11 +115,7 @@ struct Share: View {
 
     private func setColor() -> Color {
         var color: Color
-        let hours = (user.accumulateSeconds + challengeState.timeData.toSeconds()) / 3600
-
-        let level = Tier.of(hours: hours).level
-
-        switch level {
+        switch user.level {
         case 0...3:
             color = Color.Background.blue
         case 4...6:
@@ -144,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
@@ -186,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())
     }
 }

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)