Merge pull request #65 from Nexters/fix/qa

Fix/qa

Author: Mincheol Kim

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

@@ -1,16 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "close_small.png",
+      "filename" : "Subtract.svg",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "close_small@2x.svg",
+      "filename" : "Subtract-1.svg",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "Subtract-2.svg",
       "idiom" : "universal",
       "scale" : "3x"
     }

Sticky/Assets.xcassets/close_small.imageset/Subtract-1.svg

@@ -45,6 +45,9 @@ struct EditText: View {
                         }
                     }, label: {
                         Image("ic_close_small")
+                            .resizable()
+                            .scaledToFit()
+                            .frame(width: 20, height: 20)
                     })
                 }
             }

Sticky/Assets.xcassets/close_small.imageset/Subtract-2.svg

@@ -24,59 +24,68 @@ struct Banner: View {
             badgeType: BadgeType.monthly,
             badges: self.badgeViewModel.monthly
         )
-        let remainMonthlyBadge = (Int(nextMonthlyBadge.badgeValue) ?? 0) * 3600
-            - challengeState.seconds
-        if remainMonthlyBadge <= 0 {
-            nextMonthlyBadge.updated = Date()
-            nextMonthlyBadge.count += 1
-            badgeViewModel.monthly = badgeViewModel.monthly
-            badgeViewModel.badgeQueue.append(nextMonthlyBadge)
-        } else {
-            print("월간 배지 획득 남은 시간: \(remainMonthlyBadge)")
+        var remainMonthlyBadge = 0
+        if nextMonthlyBadge.badgeType != .unknown {
+            remainMonthlyBadge = (Int(nextMonthlyBadge.badgeValue) ?? 0) * 3600
+                - challengeState.seconds
+            if remainMonthlyBadge <= 0 {
+                nextMonthlyBadge.updated = Date()
+                nextMonthlyBadge.count += 1
+                badgeViewModel.monthly = badgeViewModel.monthly
+                badgeViewModel.badgeQueue.append(nextMonthlyBadge)
+            } else {
+                print("월간 배지 획득 남은 시간: \(remainMonthlyBadge)")
+            }
         }
 
         let 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.seconds
-        if remainContinuousBadge <= 0 {
-            nextContiousBadge.updated = Date()
-            nextContiousBadge.count += 1
-            badgeViewModel.continuous = badgeViewModel.continuous
-            badgeViewModel.badgeQueue.append(nextContiousBadge)
-        } else {
-            print("연속 배지 획득 남은 시간: \(remainContinuousBadge)")
+        var remainContinuousBadge = 0
+        if nextContiousBadge.badgeType != .unknown {
+            // 연속 배지 획득까지 남은 seconds; 뱃지 필요한 시간 - 챌린지 시간
+            remainContinuousBadge = nextContiousBadge.badgeValue == "0.5" ? 12 * 3600 : (Int(nextContiousBadge.badgeValue) ?? 0) * 3600 * 24
+            remainContinuousBadge -= challengeState.seconds
+            if remainContinuousBadge <= 0 {
+                nextContiousBadge.updated = Date()
+                nextContiousBadge.count += 1
+                badgeViewModel.continuous = badgeViewModel.continuous
+                badgeViewModel.badgeQueue.append(nextContiousBadge)
+            } else {
+                print("연속 배지 획득 남은 시간: \(remainContinuousBadge)")
+            }
         }
 
         return ScrollView(.horizontal, showsIndicators: false) {
             HStack {
-                Button(
-                    action: {
+                if nextMonthlyBadge.badgeType != .unknown {
+                    Button(
+                        action: {
+                            self.bannerDetailPresented = true
+                            self.badgeViewModel.select = nextMonthlyBadge
+                        },
+                        label: {
+                            BannerItem(
+                                image: nextMonthlyBadge.image,
+                                title: nextMonthlyBadge.name,
+                                subtitle: "\(remainTime(remainMonthlyBadge)) 남음"
+                            )
+                        }
+                    )
+                }
+                if nextContiousBadge.badgeType != .unknown {
+                    Button(action: {
                         self.bannerDetailPresented = true
-                        self.badgeViewModel.select = nextMonthlyBadge
-                    },
-                    label: {
+                        self.badgeViewModel.select = nextContiousBadge
+                    }, label: {
                         BannerItem(
-                            image: nextMonthlyBadge.image,
-                            title: nextMonthlyBadge.name,
-                            subtitle: "\(remainTime(remainMonthlyBadge)) 남음"
+                            image: nextContiousBadge.image,
+                            title: nextContiousBadge.name,
+                            subtitle: "\(remainTime(remainContinuousBadge)) 남음"
                         )
-                    }
-                )
-
-                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)

Sticky/Assets.xcassets/close_small.imageset/Subtract.svg

@@ -57,6 +57,8 @@ class Badge: Codable, Hashable, Identifiable {
              .special:
             // 한 번이라도 획득했으면 무조건 활성화
             return count > 0
+        case .unknown:
+            return false
         }
     }
 
@@ -69,6 +71,8 @@ class Badge: Codable, Hashable, Identifiable {
             return "\(badgeType)_\(badgeValue)\(active ? "" : "_locked")"
         case .level:
             return "level\(badgeValue)"
+        case .unknown:
+            return ""
         }
     }
 
@@ -81,7 +85,8 @@ class Badge: Codable, Hashable, Identifiable {
             switch badgeType {
             case .continuous,
                  .monthly,
-                 .special:
+                 .special,
+                 .unknown:
                 if badgeType == BadgeType.continuous, badgeValue == "0.5" {
                     return "12 Hours"
                 }
@@ -99,8 +104,9 @@ class Badge: Codable, Hashable, Identifiable {
         case .continuous:
             return "이번 챌린지에서 집에서 보낸 시간\n\(name)을 달성하면 받을 수 있습니다."
         case .level,
-             .special:
-            return "준비 중입니다."
+             .special,
+             .unknown:
+            return ""
         }
     }
 
@@ -141,6 +147,7 @@ extension Date {
  - level: 레벨
  */
 enum BadgeType: String, Codable {
+    case unknown
     case special
     case monthly
     case continuous
@@ -150,6 +157,8 @@ enum BadgeType: String, Codable {
 extension BadgeType {
     func toString(value: String) -> String {
         switch self {
+        case .unknown:
+            return ""
         case .special:
             if value.trimmingCharacters(in: .whitespaces) == "welcome" {
                 return "스티키에 오신걸 환영합니다!"
@@ -166,19 +175,21 @@ extension BadgeType {
 
     var unit: String {
         switch self {
-        case BadgeType.special:
+        case .level,
+             .special,
+             .unknown:
             return ""
-        case BadgeType.monthly:
+        case .monthly:
             return "Hours"
-        case BadgeType.continuous:
+        case .continuous:
             return "Days"
-        case BadgeType.level:
-            return ""
         }
     }
 
     var alias: String {
         switch self {
+        case .unknown:
+            return ""
         case .continuous:
             return "연속 달성 기록"
         case .monthly:

Sticky/Assets.xcassets/close_small.imageset/close_small.png

@@ -151,7 +151,7 @@ func nextBadge(
     return badges
         .filter { badge in !badge.active }
         .sorted { Double($0.badgeValue)! < Double($1.badgeValue)! }
-        .first ?? Badge(badgeType: .special, badgeValue: "locked")
+        .first ?? Badge(badgeType: .unknown, badgeValue: "")
 }
 
 /// 이번달 여부 확인