Merge pull request #63 from Nexters/fix/mypage-badge

Mincheol Kim · web-flow · commit e5c7a09017f1 · 2021-02-19T21:35:11.000+09:00
Fix/mypage badge
diff --git a/Sticky.xcodeproj/project.pbxproj b/Sticky.xcodeproj/project.pbxproj
@@ -1083,7 +1083,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_ASSET_PATHS = "\"Sticky/Preview Content\"";
 				DEVELOPMENT_TEAM = 787Q6972XA;
 				ENABLE_PREVIEWS = YES;
@@ -1111,7 +1111,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_ASSET_PATHS = "\"Sticky/Preview Content\"";
 				DEVELOPMENT_TEAM = 787Q6972XA;
 				ENABLE_PREVIEWS = YES;
diff --git a/Sticky/Features/MyPage/Components/BadgeItem.swift b/Sticky/Features/MyPage/Components/BadgeItem.swift
@@ -13,7 +13,7 @@ struct BadgeItem: View {
     var badge: Badge
     @Binding var selection: ShareType?
     @Binding var showCountBadge: Bool
-    @EnvironmentObject var shareViewModel: ShareViewModel
+    @StateObject var shareViewModel: ShareViewModel
 
     var body: some View {
         Button(action: {
@@ -63,7 +63,8 @@ struct BadgeItem_Previews: PreviewProvider {
             BadgeItem(
                 badge: Badge(badgeType: BadgeType.monthly, badgeValue: "10"),
                 selection: .constant(ShareType.card),
-                showCountBadge: .constant(true)
+                showCountBadge: .constant(true),
+                shareViewModel: ShareViewModel()
             )
         }
         .environmentObject(ShareViewModel())
diff --git a/Sticky/Features/MyPage/Components/BadgePanel.swift b/Sticky/Features/MyPage/Components/BadgePanel.swift
@@ -18,6 +18,7 @@ struct BadgePanel: View {
     var badges: [Badge]?
     @Binding var selection: ShareType?
     @Binding var showCountBadge: Bool
+    @StateObject var shareViewModel: ShareViewModel
 
     var body: some View {
         VStack {
@@ -46,7 +47,8 @@ struct BadgePanel: View {
                     BadgeItem(
                         badge: badge,
                         selection: $selection,
-                        showCountBadge: $showCountBadge
+                        showCountBadge: $showCountBadge,
+                        shareViewModel: shareViewModel
                     )
                 }
             }
@@ -77,7 +79,8 @@ struct BadgePanel_Previews: PreviewProvider {
             trailing: AnyView(Text("이번 달")),
             badges: badgeMocks(count: 6),
             selection: .constant(ShareType.card),
-            showCountBadge: .constant(true)
+            showCountBadge: .constant(true),
+            shareViewModel: ShareViewModel()
         )
         .padding()
     }
diff --git a/Sticky/Features/MyPage/Components/Summary.swift b/Sticky/Features/MyPage/Components/Summary.swift
@@ -14,7 +14,7 @@ struct Summary: View {
     var seconds: Int
     @Binding var selection: ShareType?
     @EnvironmentObject var user: User
-    @EnvironmentObject var shareViewModel: ShareViewModel
+    @StateObject var shareViewModel: ShareViewModel
 
     var body: some View {
         let tier = Tier(level: user.level)
@@ -91,8 +91,7 @@ struct Summary_Previews: PreviewProvider {
     static var previews: some View {
         ZStack {
             Color.GrayScale._100.ignoresSafeArea()
-            Summary(seconds: 10, selection: .constant(ShareType.card))
-                .environmentObject(ShareViewModel())
+            Summary(seconds: 10, selection: .constant(ShareType.card), shareViewModel: ShareViewModel())
                 .border(Color.black)
         }
     }
diff --git a/Sticky/Features/MyPage/Views/MyPage.swift b/Sticky/Features/MyPage/Views/MyPage.swift
@@ -74,7 +74,8 @@ struct MyPage: View {
             VStack(alignment: .leading, spacing: 20) {
                 Summary(
                     seconds: user.accumulateSeconds,
-                    selection: $navSelection
+                    selection: $navSelection,
+                    shareViewModel: shareViewModel
                 )
                 .padding(.bottom, 15)
                 Divider()
@@ -84,22 +85,25 @@ struct MyPage: View {
                     subtitle: "특별한 기록을 달성하면 받을 수 있어요.",
                     badges: badgeViewModel.specials,
                     selection: $navSelection,
-                    showCountBadge: .constant(false)
+                    showCountBadge: .constant(false),
+                    shareViewModel: shareViewModel
                 )
                 BadgePanel(
                     title: "월간 달성",
                     subtitle: "한달 내에 쌓은 시간을 기준으로 합니다.",
                     trailing: monthlyButton as? AnyView,
                     badges: badgeViewModel.monthly,
                     selection: $navSelection,
-                    showCountBadge: $badgeViewModel.showCountBadge
+                    showCountBadge: $badgeViewModel.showCountBadge,
+                    shareViewModel: shareViewModel
                 )
                 BadgePanel(
                     title: "연속 달성",
                     subtitle: "멈추지 않고 이어서 기록된 시간을 기준으로 합니다.",
                     badges: badgeViewModel.continuous,
                     selection: $navSelection,
-                    showCountBadge: .constant(false)
+                    showCountBadge: .constant(false),
+                    shareViewModel: shareViewModel
                 )
 
                 Spacer()
diff --git a/Sticky/Features/Share/Model/ShareViewModel.swift b/Sticky/Features/Share/Model/ShareViewModel.swift
@@ -13,17 +13,6 @@ 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/makefile b/makefile
@@ -51,6 +51,7 @@ endif
 
 release:
 	sed -i ".bak" "s/MARKETING_VERSION = .*/MARKETING_VERSION = $(shell npx next-standard-version);/g" ${PROJECT_NAME}.xcodeproj/project.pbxproj
+	sed -i ".bak" "s/CURRENT_PROJECT_VERSION = .*/CURRENT_PROJECT_VERSION = ${GITHUB_RUN_NUMBER};/g" ${PROJECT_NAME}.xcodeproj/project.pbxproj
 .PHONY: release
 
 # 마지막 tag로부터 현재까지의 changelog 및 버전 확인 용

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ struct BadgePanel: View {`
`18`	`18`	`var badges: [Badge]?`
`19`	`19`	`@Binding var selection: ShareType?`
`20`	`20`	`@Binding var showCountBadge: Bool`
	`21`	`+ @StateObject var shareViewModel: ShareViewModel`
`21`	`22`
`22`	`23`	`var body: some View {`
`23`	`24`	`VStack {`
`@@ -46,7 +47,8 @@ struct BadgePanel: View {`
`46`	`47`	`BadgeItem(`
`47`	`48`	`badge: badge,`
`48`	`49`	`selection: $selection,`
`49`		`- showCountBadge: $showCountBadge`
	`50`	`+ showCountBadge: $showCountBadge,`
	`51`	`+ shareViewModel: shareViewModel`
`50`	`52`	`)`
`51`	`53`	`}`
`52`	`54`	`}`
`@@ -77,7 +79,8 @@ struct BadgePanel_Previews: PreviewProvider {`
`77`	`79`	`trailing: AnyView(Text("이번 달")),`
`78`	`80`	`badges: badgeMocks(count: 6),`
`79`	`81`	`selection: .constant(ShareType.card),`
`80`		`- showCountBadge: .constant(true)`
	`82`	`+ showCountBadge: .constant(true),`
	`83`	`+ shareViewModel: ShareViewModel()`
`81`	`84`	`)`
`82`	`85`	`.padding()`
`83`	`86`	`}`