diff --git a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/Coordinator/ViewModel/ChallengeProgressViewModel.swift b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/Coordinator/ViewModel/ChallengeProgressViewModel.swift index fa49b395..d0c61c61 100644 --- a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/Coordinator/ViewModel/ChallengeProgressViewModel.swift +++ b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/Coordinator/ViewModel/ChallengeProgressViewModel.swift @@ -15,7 +15,7 @@ final class ChallengeProgressViewModel: ObservableObject { @Published private(set) var remainMissions: Int = 0 @Published private(set) var progressRate = 0 @Published private(set) var currentDay: Int = 1 - @Published private(set) var challengeTitle: String = "챌린지" + @Published private(set) var challengeTitle: String = "" @Published private(set) var todayRoutines: [ProgressRoutineEntity] = [] private let fetchChallengeUseCase: FetchChallengeUseCase @@ -94,6 +94,10 @@ final class ChallengeProgressViewModel: ObservableObject { } extension ChallengeProgressViewModel { + var isChallengeCompleted: Bool { + currentDay == 7 + } + @MainActor private func updateInfo() { guard let challengeData else { return } @@ -101,7 +105,7 @@ extension ChallengeProgressViewModel { remainMissions = challengeData.remainingRoutinesToNextLevel progressRate = challengeData.progressPercentage currentDay = challengeData.currentDay - challengeTitle = challengeData.title + challengeTitle = challengeData.title + " 챌린지" todayRoutines = challengeData.todayRoutines } } diff --git a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/ChallengeLoadingView.swift b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/ChallengeLoadingView.swift index 5a99b923..52097bb3 100644 --- a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/ChallengeLoadingView.swift +++ b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/ChallengeLoadingView.swift @@ -16,7 +16,8 @@ struct ChallengeLoadingView: View { VStack { VStack(spacing: 4.adjustedH) { highlight(highlightText: viewModel.selectedRoutine?.description ?? "", normalText: "방향을 바탕으로") - .padding(.top, 113.adjustedH) + .frame(height: 27.adjustedH) + .padding(.top, 94.adjustedH) TypographyText("TO-DO 미션을 만들고 있어요.", style: .title1_sb_18, color: .gray800) LottieView(animationName: "splash", loopMode: .loop) @@ -26,12 +27,14 @@ struct ChallengeLoadingView: View { Spacer() .frame(height: 80.adjustedH) - TypographyText("잠시만 기다려주세요!", style: .title2_sb_16, color: .gray800) + TypographyText("잠시만 기다려주세요!", style: .title2_m_16, color: .gray800) + .frame(height: 24.adjustedH) .padding(.top, 17.adjustedH) Spacer() TypographyText("AI가 맞춤형 루틴을 제작하고 있어요.", style: .body3_m_12, color: .gray600) + .frame(height: 17.adjustedH) .padding(.bottom, 30.adjustedH) } } diff --git a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/ChallengeProgressView.swift b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/ChallengeProgressView.swift similarity index 71% rename from Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/ChallengeProgressView.swift rename to Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/ChallengeProgressView.swift index d5ff8a3f..240dadcb 100644 --- a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/ChallengeProgressView.swift +++ b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/ChallengeProgressView.swift @@ -48,17 +48,20 @@ enum CherryLevel: Int { } struct ChallengeProgressView: View { + @EnvironmentObject private var challengeCoordinator: ChallengeCoordinator @StateObject var viewModel: ChallengeProgressViewModel let buttonState: ButtonState = .active - + var body: some View { ScrollView { VStack { HStack { TypographyText(viewModel.challengeTitle, style: .title1_sb_18, color: .gray1000) + .frame(height: 27.adjustedH) .padding(.trailing, 12.adjustedW) TypographyText("7일 플랜", style: .body3_m_12, color: .gray700) + .frame(height: 17.adjustedH) .padding(.horizontal, 8.adjustedW) .padding(.vertical, 3.adjustedH) .overlay( @@ -82,25 +85,38 @@ struct ChallengeProgressView: View { extension ChallengeProgressView { private var CherryGrowthView: some View { - VStack { - VStack { + VStack(spacing: 0) { + VStack(spacing: 0) { HStack { - TypographyText("Lv.\(viewModel.cherryLevel.levelNumber) \(viewModel.cherryLevel.name)", style: .body1_m_14, color: .gray900) + TypographyText("Lv.\(viewModel.cherryLevel.levelNumber)", style: .body1_m_14, color: .gray900) + .frame(height: 20.adjustedH) + TypographyText("\(viewModel.cherryLevel.name)", style: .body1_m_14, color: .gray900) + .frame(height: 20.adjustedH) + .padding(.leading, 6.adjustedW) Spacer() } viewModel.cherryLevel.cherryImage - .padding(.top, 14.adjustedH) - TypographyText("체리가 크려면 \(viewModel.remainMissions)개의 미션을 수행해야 해요!", style: .body2_r_13, color: .gray800) - .padding(.top, 14.adjustedH) + .frame(width: 154.adjustedW, height: 154.adjustedW) + .padding(.bottom, 5.adjustedH) + if viewModel.cherryLevel.levelNumber == 4 { + TypographyText("챌린지 완료까지 \(viewModel.remainMissions)개의 미션을 수행해야 해요!", style: .body2_r_13, color: .gray800) + .frame(height: 18.adjustedH) + .padding(.bottom, 14.adjustedH) + }else { + TypographyText("체리가 크려면 \(viewModel.remainMissions)개의 미션을 수행해야 해요!", style: .body2_r_13, color: .gray800) + .frame(height: 18.adjustedH) + .padding(.bottom, 14.adjustedH) + } } .padding(.horizontal, 25.adjustedW) Rectangle() .fill(.gray300) .frame(height: 1) - .padding(.vertical, 14.adjustedH) + .padding(.bottom, 14.adjustedH) VStack { HStack { TypographyText("챌린지 달성률 \(viewModel.progressRate)%", style: .body1_m_14, color: .gray900) + .frame(height: 20.adjustedH) Spacer() } .padding(.bottom, 12.adjustedH) @@ -129,6 +145,7 @@ extension ChallengeProgressView { VStack { HStack { TypographyText("\(viewModel.currentDay)일차 TO-DO 미션", style: .body1_sb_14, color: .gray1000) + .frame(height: 20.adjustedH) Spacer() } Spacer() @@ -149,14 +166,21 @@ extension ChallengeProgressView { } CherrishButton( - title: "오늘 미션 종료하기", + title: viewModel.isChallengeCompleted ? "챌린지 종료하기":"오늘 미션 종료하기", type: .small, state: .constant(buttonState), leadingIcon: nil, trailingIcon: nil ) { - Task { - await viewModel.advanceDay() + if viewModel.isChallengeCompleted { + Task { + await viewModel.advanceDay() + challengeCoordinator.push(.startChallenge) + } + }else { + Task { + await viewModel.advanceDay() + } } } .padding(.top, 10.adjustedH) diff --git a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/ChallengeSelectMissionView.swift b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/ChallengeSelectMissionView.swift index a044ace9..d7b67b1b 100644 --- a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/ChallengeSelectMissionView.swift +++ b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/ChallengeSelectMissionView.swift @@ -17,20 +17,17 @@ struct ChallengeSelectMissionView: View { VStack { VStack { HStack { - VStack(alignment: .leading) { - TypographyText("챌린지 기간 동안", - style: .title1_sb_18, - color: .gray1000 - ) - TypographyText("진행할 미션을 선택해주세요.", + VStack(alignment: .leading, spacing: 4.adjustedH) { + TypographyText("챌린지 기간 동안\n진행할 미션을 선택해주세요.", style: .title1_sb_18, color: .gray1000 ) + .frame(height: 54.adjustedH) TypographyText("복수 선택이 가능해요.", style: .body1_r_14, color: .gray700 ) - .padding(.top, 4.adjustedH) + .frame(height: 20.adjustedH) } Spacer() } diff --git a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/ChallengeSelectRoutineView.swift b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/ChallengeSelectRoutineView.swift index 4ee31641..0d7f464c 100644 --- a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/ChallengeSelectRoutineView.swift +++ b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/ChallengeSelectRoutineView.swift @@ -18,11 +18,17 @@ struct ChallengeSelectRoutineView: View { var body: some View { VStack { HStack{ - VStack(alignment: .leading){ - TypographyText("지금 나에게 가장 필요한\n관리 루틴을 선택해주세요.", + VStack(alignment: .leading, spacing: 0){ + TypographyText("지금 나에게 가장 필요한", style: .title1_sb_18, color: .gray1000 ) + .frame(height: 27.adjustedH) + TypographyText("관리 루틴을 선택해주세요.", + style: .title1_sb_18, + color: .gray1000 + ) + .frame(height: 27.adjustedH) } Spacer() } diff --git a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/StartChallengeView.swift b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/StartChallengeView.swift similarity index 88% rename from Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/StartChallengeView.swift rename to Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/StartChallengeView.swift index 72207bfe..3b97fd20 100644 --- a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/StartChallengeView.swift +++ b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/StartChallengeView.swift @@ -18,7 +18,9 @@ struct ChallengeStartChallengeView: View { HStack { VStack(alignment: .leading, spacing: 4) { TypographyText("이번엔 어떤 루틴으로 관리할까요?", style: .headline_sb_20, color: .gray1000) + .frame(height: 30.adjustedH) TypographyText("루틴을 지킬수록 체리가 성장해요.", style: .title2_m_16, color: .gray800) + .frame(height: 24.adjustedH) } Spacer() } @@ -30,11 +32,12 @@ struct ChallengeStartChallengeView: View { .padding(.top, 10.adjustedH) .padding(.horizontal, 24.adjustedW) - HStack(spacing: 12) { + HStack(spacing: 0) { Image("info") TypographyText("이 챌린지는 설정 시점부터 7일간 진행됩니다.", style: .body3_m_12, color: .gray600) + .frame(height: 24.adjustedH) } - .padding(.bottom, 12.adjustedH) + .padding(.top, 20.adjustedH) CherrishButton( title: "챌린지 시작하기", diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_0.imageset/Contents.json b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_0.imageset/Contents.json deleted file mode 100644 index fdf92f1b..00000000 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_0.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "filename" : "challenge_gaugebar_0.svg", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_0.imageset/challenge_gaugebar_0.svg b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_0.imageset/challenge_gaugebar_0.svg deleted file mode 100644 index aba3df7e..00000000 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_0.imageset/challenge_gaugebar_0.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_1.imageset/Contents.json b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_1.imageset/Contents.json index 861337ac..5c89ead9 100644 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_1.imageset/Contents.json +++ b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_1.imageset/Contents.json @@ -1,8 +1,19 @@ { "images" : [ { - "filename" : "challenge_gaugebar_1.svg", - "idiom" : "universal" + "filename" : "challenge_gaugebar_1.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "challenge_gaugebar_1@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "challenge_gaugebar_1@3x.png", + "idiom" : "universal", + "scale" : "3x" } ], "info" : { diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_1.imageset/challenge_gaugebar_1.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_1.imageset/challenge_gaugebar_1.png new file mode 100644 index 00000000..9517cae8 Binary files /dev/null and b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_1.imageset/challenge_gaugebar_1.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_1.imageset/challenge_gaugebar_1.svg b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_1.imageset/challenge_gaugebar_1.svg deleted file mode 100644 index 35471d31..00000000 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_1.imageset/challenge_gaugebar_1.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_1.imageset/challenge_gaugebar_1@2x.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_1.imageset/challenge_gaugebar_1@2x.png new file mode 100644 index 00000000..1b2d76d8 Binary files /dev/null and b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_1.imageset/challenge_gaugebar_1@2x.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_1.imageset/challenge_gaugebar_1@3x.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_1.imageset/challenge_gaugebar_1@3x.png new file mode 100644 index 00000000..550a203f Binary files /dev/null and b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_1.imageset/challenge_gaugebar_1@3x.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_2.imageset/Contents.json b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_2.imageset/Contents.json index 3bcead8f..d1d7ddb4 100644 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_2.imageset/Contents.json +++ b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_2.imageset/Contents.json @@ -1,8 +1,19 @@ { "images" : [ { - "filename" : "challenge_gaugebar_2.svg", - "idiom" : "universal" + "filename" : "challenge_gaugebar_2.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "challenge_gaugebar_2@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "challenge_gaugebar_2@3x.png", + "idiom" : "universal", + "scale" : "3x" } ], "info" : { diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_2.imageset/challenge_gaugebar_2.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_2.imageset/challenge_gaugebar_2.png new file mode 100644 index 00000000..6d65deb4 Binary files /dev/null and b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_2.imageset/challenge_gaugebar_2.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_2.imageset/challenge_gaugebar_2.svg b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_2.imageset/challenge_gaugebar_2.svg deleted file mode 100644 index a3219da1..00000000 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_2.imageset/challenge_gaugebar_2.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_2.imageset/challenge_gaugebar_2@2x.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_2.imageset/challenge_gaugebar_2@2x.png new file mode 100644 index 00000000..640e6099 Binary files /dev/null and b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_2.imageset/challenge_gaugebar_2@2x.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_2.imageset/challenge_gaugebar_2@3x.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_2.imageset/challenge_gaugebar_2@3x.png new file mode 100644 index 00000000..08260ba7 Binary files /dev/null and b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_2.imageset/challenge_gaugebar_2@3x.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_3.imageset/Contents.json b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_3.imageset/Contents.json index 81a57d6e..b38e9d4f 100644 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_3.imageset/Contents.json +++ b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_3.imageset/Contents.json @@ -1,8 +1,19 @@ { "images" : [ { - "filename" : "challenge_gaugebar_3.svg", - "idiom" : "universal" + "filename" : "challenge_gaugebar_3.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "challenge_gaugebar_3@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "challenge_gaugebar_3@3x.png", + "idiom" : "universal", + "scale" : "3x" } ], "info" : { diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_3.imageset/challenge_gaugebar_3.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_3.imageset/challenge_gaugebar_3.png new file mode 100644 index 00000000..3516d503 Binary files /dev/null and b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_3.imageset/challenge_gaugebar_3.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_3.imageset/challenge_gaugebar_3.svg b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_3.imageset/challenge_gaugebar_3.svg deleted file mode 100644 index 1856b9a2..00000000 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_3.imageset/challenge_gaugebar_3.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_3.imageset/challenge_gaugebar_3@2x.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_3.imageset/challenge_gaugebar_3@2x.png new file mode 100644 index 00000000..90226dcd Binary files /dev/null and b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_3.imageset/challenge_gaugebar_3@2x.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_3.imageset/challenge_gaugebar_3@3x.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_3.imageset/challenge_gaugebar_3@3x.png new file mode 100644 index 00000000..c3bfc4cb Binary files /dev/null and b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_3.imageset/challenge_gaugebar_3@3x.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_4.imageset/Contents.json b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_4.imageset/Contents.json index d15faf25..27d10c7f 100644 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_4.imageset/Contents.json +++ b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_4.imageset/Contents.json @@ -1,8 +1,19 @@ { "images" : [ { - "filename" : "challenge_gaugebar_4.svg", - "idiom" : "universal" + "filename" : "challenge_gaugebar_4.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "challenge_gaugebar_4@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "challenge_gaugebar_4@3x.png", + "idiom" : "universal", + "scale" : "3x" } ], "info" : { diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_4.imageset/challenge_gaugebar_4.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_4.imageset/challenge_gaugebar_4.png new file mode 100644 index 00000000..bfd0b2b0 Binary files /dev/null and b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_4.imageset/challenge_gaugebar_4.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_4.imageset/challenge_gaugebar_4.svg b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_4.imageset/challenge_gaugebar_4.svg deleted file mode 100644 index b716ac98..00000000 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_4.imageset/challenge_gaugebar_4.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_4.imageset/challenge_gaugebar_4@2x.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_4.imageset/challenge_gaugebar_4@2x.png new file mode 100644 index 00000000..5c9b5d0a Binary files /dev/null and b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_4.imageset/challenge_gaugebar_4@2x.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_4.imageset/challenge_gaugebar_4@3x.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_4.imageset/challenge_gaugebar_4@3x.png new file mode 100644 index 00000000..04e5ce30 Binary files /dev/null and b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_4.imageset/challenge_gaugebar_4@3x.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry1.imageset/Contents.json b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry1.imageset/Contents.json index a182c665..55010d63 100644 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry1.imageset/Contents.json +++ b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry1.imageset/Contents.json @@ -1,8 +1,19 @@ { "images" : [ { - "filename" : "cherry0.svg", - "idiom" : "universal" + "filename" : "home_lv.1.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "home_lv.1@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "home_lv.1@3x.png", + "idiom" : "universal", + "scale" : "3x" } ], "info" : { diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry1.imageset/cherry0.svg b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry1.imageset/cherry0.svg deleted file mode 100644 index 330ce5f8..00000000 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry1.imageset/cherry0.svg +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry1.imageset/home_lv.1.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry1.imageset/home_lv.1.png new file mode 100644 index 00000000..40f80815 Binary files /dev/null and b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry1.imageset/home_lv.1.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry1.imageset/home_lv.1@2x.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry1.imageset/home_lv.1@2x.png new file mode 100644 index 00000000..1c2384d1 Binary files /dev/null and b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry1.imageset/home_lv.1@2x.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry1.imageset/home_lv.1@3x.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry1.imageset/home_lv.1@3x.png new file mode 100644 index 00000000..2c43a674 Binary files /dev/null and b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry1.imageset/home_lv.1@3x.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry2.imageset/Contents.json b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry2.imageset/Contents.json index d8b7d328..df89b655 100644 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry2.imageset/Contents.json +++ b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry2.imageset/Contents.json @@ -1,8 +1,19 @@ { "images" : [ { - "filename" : "cherry1.svg", - "idiom" : "universal" + "filename" : "home_lv.2.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "home_lv.2@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "home_lv.2@3x.png", + "idiom" : "universal", + "scale" : "3x" } ], "info" : { diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry2.imageset/cherry1.svg b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry2.imageset/cherry1.svg deleted file mode 100644 index 782aa55c..00000000 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry2.imageset/cherry1.svg +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry2.imageset/home_lv.2.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry2.imageset/home_lv.2.png new file mode 100644 index 00000000..fa5a3a7a Binary files /dev/null and b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry2.imageset/home_lv.2.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry2.imageset/home_lv.2@2x.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry2.imageset/home_lv.2@2x.png new file mode 100644 index 00000000..85231112 Binary files /dev/null and b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry2.imageset/home_lv.2@2x.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry2.imageset/home_lv.2@3x.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry2.imageset/home_lv.2@3x.png new file mode 100644 index 00000000..01435579 Binary files /dev/null and b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry2.imageset/home_lv.2@3x.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry3.imageset/Contents.json b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry3.imageset/Contents.json index 14a34885..3cc6f656 100644 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry3.imageset/Contents.json +++ b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry3.imageset/Contents.json @@ -1,8 +1,19 @@ { "images" : [ { - "filename" : "cherry3.svg", - "idiom" : "universal" + "filename" : "home_lv.3.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "home_lv.3@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "home_lv.3@3x.png", + "idiom" : "universal", + "scale" : "3x" } ], "info" : { diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry3.imageset/cherry3.svg b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry3.imageset/cherry3.svg deleted file mode 100644 index 8a559a05..00000000 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry3.imageset/cherry3.svg +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry3.imageset/home_lv.3.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry3.imageset/home_lv.3.png new file mode 100644 index 00000000..76667b78 Binary files /dev/null and b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry3.imageset/home_lv.3.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry3.imageset/home_lv.3@2x.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry3.imageset/home_lv.3@2x.png new file mode 100644 index 00000000..123da0c8 Binary files /dev/null and b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry3.imageset/home_lv.3@2x.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry3.imageset/home_lv.3@3x.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry3.imageset/home_lv.3@3x.png new file mode 100644 index 00000000..fc7615cd Binary files /dev/null and b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry3.imageset/home_lv.3@3x.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry4.imageset/Contents.json b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry4.imageset/Contents.json index 8db2ecd3..b9f6c47b 100644 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry4.imageset/Contents.json +++ b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry4.imageset/Contents.json @@ -1,8 +1,19 @@ { "images" : [ { - "filename" : "cherry4.svg", - "idiom" : "universal" + "filename" : "home_lv.4.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "home_lv.4@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "home_lv.4@3x.png", + "idiom" : "universal", + "scale" : "3x" } ], "info" : { diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry4.imageset/cherry4.svg b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry4.imageset/cherry4.svg deleted file mode 100644 index 90bf5e55..00000000 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry4.imageset/cherry4.svg +++ /dev/null @@ -1,206 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry4.imageset/home_lv.4.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry4.imageset/home_lv.4.png new file mode 100644 index 00000000..96062676 Binary files /dev/null and b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry4.imageset/home_lv.4.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry4.imageset/home_lv.4@2x.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry4.imageset/home_lv.4@2x.png new file mode 100644 index 00000000..196041b4 Binary files /dev/null and b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry4.imageset/home_lv.4@2x.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry4.imageset/home_lv.4@3x.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry4.imageset/home_lv.4@3x.png new file mode 100644 index 00000000..ca51eb48 Binary files /dev/null and b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/cherry4.imageset/home_lv.4@3x.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/cherrishIcon/checkbox_active.imageset/Contents.json b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/cherrishIcon/checkbox_active.imageset/Contents.json index 24abe026..2fd66ba6 100644 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/cherrishIcon/checkbox_active.imageset/Contents.json +++ b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/cherrishIcon/checkbox_active.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "checkbox_active.svg", + "filename" : "icon_checkbox_active.png", "idiom" : "universal" } ], diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/cherrishIcon/checkbox_active.imageset/checkbox_active.svg b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/cherrishIcon/checkbox_active.imageset/checkbox_active.svg deleted file mode 100644 index fbe45d5c..00000000 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/cherrishIcon/checkbox_active.imageset/checkbox_active.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/cherrishIcon/checkbox_active.imageset/icon_checkbox_active.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/cherrishIcon/checkbox_active.imageset/icon_checkbox_active.png new file mode 100644 index 00000000..2735911a Binary files /dev/null and b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/cherrishIcon/checkbox_active.imageset/icon_checkbox_active.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/cherrishIcon/checkbox_default.imageset/Contents.json b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/cherrishIcon/checkbox_default.imageset/Contents.json index b37ef50c..dbeaa820 100644 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/cherrishIcon/checkbox_default.imageset/Contents.json +++ b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/cherrishIcon/checkbox_default.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "checkbox_default.svg", + "filename" : "icon_checkbox_default.png", "idiom" : "universal" } ], diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/cherrishIcon/checkbox_default.imageset/checkbox_default.svg b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/cherrishIcon/checkbox_default.imageset/checkbox_default.svg deleted file mode 100644 index ae101c1a..00000000 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/cherrishIcon/checkbox_default.imageset/checkbox_default.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/cherrishIcon/checkbox_default.imageset/icon_checkbox_default.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/cherrishIcon/checkbox_default.imageset/icon_checkbox_default.png new file mode 100644 index 00000000..af1f1003 Binary files /dev/null and b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/cherrishIcon/checkbox_default.imageset/icon_checkbox_default.png differ