Merge pull request #56 from Nexters/refactor/badge-vm

refactor: badge 리팩토링

Author: Mincheol Kim

Sticky/Assets.xcassets/special_locked.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "special_locked.pdf",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sticky/Assets.xcassets/special_locked.imageset/special_locked.pdf

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "special_welcome.pdf",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sticky/Assets.xcassets/special_welcome.imageset/Contents.json

@@ -22,60 +22,62 @@ struct Banner: View {
     var body: some View {
         var nextMonthlyBadge = nextBadge(
             badgeType: BadgeType.monthly,
-            badges: self.badgeViewModel.monthly.items
+            badges: self.badgeViewModel.monthly
         )
-        // 월간 배지 획득까지 남은 seconds; 뱃지 필요한 시간 - (챌린지 시간 + 이번 달 누적 시간)
         let remainMonthlyBadge = (Int(nextMonthlyBadge.badgeValue) ?? 0) * 3600
             - (challengeState.timeData.toSeconds() + user.thisMonthAccumulateSeconds)
-        var nextContiousBadge = nextBadge(
-            badgeType: BadgeType.continuous,
-            badges: self.badgeViewModel.continuous.items
-        )
-        // 연속 배지 획득까지 남은 seconds; 뱃지 필요한 시간 - 챌린지 시간
-        var remainContinuousBadge = nextContiousBadge.badgeValue == "0.5" ? 12 * 3600 : (Int(nextContiousBadge.badgeValue) ?? 0) * 3600 * 24
-        remainContinuousBadge -= challengeState.timeData.toSeconds()
-
         if remainMonthlyBadge <= 0 {
-            let key = nextMonthlyBadge.badgeValue
             nextMonthlyBadge.updated = Date()
-            nextMonthlyBadge.count = 1
-            badgeViewModel.monthly.items[key] = CountAndUpdated(count: 1, date: Date())
+            nextMonthlyBadge.count += 1
+            badgeViewModel.monthly = badgeViewModel.monthly
             badgeViewModel.badgeQueue.append(nextMonthlyBadge)
         } else {
             print("월간 배지 획득 남은 시간: \(remainMonthlyBadge)")
         }
+
+        var nextContiousBadge = nextBadge(
+            badgeType: BadgeType.continuous,
+            badges: self.badgeViewModel.continuous
+        )
+        // 연속 배지 획득까지 남은 seconds; 뱃지 필요한 시간 - 챌린지 시간
+        var remainContinuousBadge = nextContiousBadge.badgeValue == "0.5" ? 12 * 3600 : (Int(nextContiousBadge.badgeValue) ?? 0) * 3600 * 24
+        remainContinuousBadge -= challengeState.timeData.toSeconds()
         if remainContinuousBadge <= 0 {
-            let key = nextContiousBadge.badgeValue
             nextContiousBadge.updated = Date()
-            nextContiousBadge.count = 1
-            badgeViewModel.continuous.items[key] = CountAndUpdated(count: 1, date: Date())
+            nextContiousBadge.count += 1
+            badgeViewModel.continuous = badgeViewModel.continuous
             badgeViewModel.badgeQueue.append(nextContiousBadge)
         } else {
             print("연속 배지 획득 남은 시간: \(remainContinuousBadge)")
         }
 
         return ScrollView(.horizontal, showsIndicators: false) {
             HStack {
-                Button(action: {
-                    self.bannerDetailPresented = true
-                    self.badgeViewModel.select = nextMonthlyBadge
-                }) {
-                    BannerItem(
-                        image: nextMonthlyBadge.image,
-                        title: nextMonthlyBadge.name,
-                        subtitle: "\(remainTime(remainMonthlyBadge)) 남음"
-                    )
-                }
+                Button(
+                    action: {
+                        self.bannerDetailPresented = true
+                        self.badgeViewModel.select = nextMonthlyBadge
+                    },
+                    label: {
+                        BannerItem(
+                            image: nextMonthlyBadge.image,
+                            title: nextMonthlyBadge.name,
+                            subtitle: "\(remainTime(remainMonthlyBadge)) 남음"
+                        )
+                    }
+                )
+
                 Button(action: {
                     self.bannerDetailPresented = true
                     self.badgeViewModel.select = nextContiousBadge
-                }) {
+                }, label: {
                     BannerItem(
                         image: nextContiousBadge.image,
                         title: nextContiousBadge.name,
                         subtitle: "\(remainTime(remainContinuousBadge)) 남음"
                     )
-                }
+                })
+
                 Button(action: { self.mypagePresented = true }) {
                     RoundedRectangle(cornerRadius: 20)
                         .frame(width: 96, height: 60)

Sticky/Assets.xcassets/special_welcome.imageset/special_welcome.pdf

@@ -39,7 +39,7 @@ struct BadgePanel: View {
             }
 
             LazyVGrid(columns: columns) {
-                ForEach(badges!, id: \.self) { badge in
+                ForEach(badges!, id: \.id) { badge in
                     BadgeItem(
                         badge: badge,
                         selection: $selection,

Sticky/Features/Banner/Components/Banner.swift

@@ -17,7 +17,7 @@ import Foundation
  - count: 획득 횟수
  - active: 활성여부
  */
-struct Badge: Codable, Hashable {
+class Badge: Codable, Hashable, Identifiable {
     // MARK: Lifecycle
 
     init(
@@ -34,23 +34,38 @@ struct Badge: Codable, Hashable {
         self.count = count
     }
 
+    // MARK: Public
+
+    public var updated: Date?
+    public var count: Int = 0
+
     // MARK: Internal
 
+    var id = UUID()
     var badgeType: BadgeType
     var badgeValue: String
     var _name: String = ""
-    var updated: Date?
-    var count: Int = 0
 
+    // 업데이트 일자가 이번 달에만 활성화
     var active: Bool {
-        count > 0 || updated != nil
+        guard let date = updated else { return false }
+        switch badgeType {
+        case .monthly:
+            return isItThisMonth(date: date)
+        case .continuous,
+             .level,
+             .special:
+            // 한 번이라도 획득했으면 무조건 활성화
+            return count > 0
+        }
     }
 
     var image: String {
         switch badgeType {
+        case .special:
+            return active ? "\(badgeType)_\(badgeValue)" : "special_locked"
         case .continuous,
-             .monthly,
-             .special:
+             .monthly:
             return "\(badgeType)_\(badgeValue)\(active ? "" : "_locked")"
         case .level:
             return "level\(badgeValue)"
@@ -89,6 +104,22 @@ struct Badge: Codable, Hashable {
             return "준비 중입니다."
         }
     }
+
+    static func == (lhs: Badge, rhs: Badge) -> Bool {
+        return lhs.badgeType == rhs.badgeType
+            && lhs.badgeValue == rhs.badgeValue
+            && lhs._name == rhs._name
+            && lhs.updated == rhs.updated
+            && lhs.count == rhs.count
+    }
+
+    func hash(into hasher: inout Hasher) {
+        hasher.combine(badgeType)
+        hasher.combine(badgeValue)
+        hasher.combine(_name)
+        hasher.combine(updated)
+        hasher.combine(count)
+    }
 }
 
 /// 다국어 지원 시 locale 변경필요
@@ -121,7 +152,7 @@ extension BadgeType {
     func toString(value: String) -> String {
         switch self {
         case .special:
-            return "특별한 배지"
+            return value
         case .monthly:
             return "한달 동안 집에서 보낸 시간\n\(value)을 달성했습니다!"
         case .continuous:
@@ -144,20 +175,3 @@ extension BadgeType {
         }
     }
 }
-
-// MARK: - Special
-
-enum Special: String {
-    case first
-}
-
-func makeBadges(badgeType: BadgeType, dict: [String: CountAndUpdated]) -> [Badge] {
-    return dict.sorted { Double($0.0)! < Double($1.0)! }.map { key, value in
-        Badge(
-            badgeType: badgeType,
-            badgeValue: key,
-            updated: value.date,
-            count: value.count
-        )
-    }
-}