diff --git a/Cherrish-iOS/Cherrish-iOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Cherrish-iOS/Cherrish-iOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index cded0138..017b43ad 100644 --- a/Cherrish-iOS/Cherrish-iOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Cherrish-iOS/Cherrish-iOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "aceca0c973d8efe8d069cb81bf522ace08d6a1258b48197a08fc849f34cd8f80", + "originHash" : "11b78eba97192d19796cff581fdf69b3e65b441188b1448a1b67e5d7b825a354", "pins" : [ { "identity" : "alamofire", @@ -9,15 +9,6 @@ "revision" : "7be73f6c2b5cd90e40798b06ebd5da8f9f79cf88", "version" : "5.11.0" } - }, - { - "identity" : "lottie-ios", - "kind" : "remoteSourceControl", - "location" : "https://github.com/airbnb/lottie-ios", - "state" : { - "revision" : "0cb03fd7564d27345bcd96144b811e56212949c6", - "version" : "4.6.0" - } } ], "version" : 3 diff --git a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/Treatment/View/DowntimeBottomSheetView.swift b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/Treatment/View/DowntimeBottomSheetView.swift index 87b332c0..4ef12fe8 100644 --- a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/Treatment/View/DowntimeBottomSheetView.swift +++ b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/Treatment/View/DowntimeBottomSheetView.swift @@ -168,7 +168,7 @@ extension DowntimeBottomSheetView { Spacer() - CherrishPicker(selection: $selectedDowntime, range: 1...30) + CherrishPicker(selection: $selectedDowntime, range: 0...30) Spacer() } diff --git a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Home/HomeView.swift b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Home/HomeView.swift index 8f9ab938..3aeaf8d3 100644 --- a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Home/HomeView.swift +++ b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Home/HomeView.swift @@ -32,7 +32,7 @@ struct HomeView: View { if viewModel.cherryLevel != 0 { Image(viewModel.cherryLevelImageName) - .offset(x: -10.adjustedW, y: -67.adjustedH) + .offset(x: -20.adjustedW, y: -57.adjustedH) } } PlanBoxView(viewModel: viewModel) diff --git a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Onboarding/OnboardingContainerView.swift b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Onboarding/OnboardingContainerView.swift index c0577bdd..0d3cc02a 100644 --- a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Onboarding/OnboardingContainerView.swift +++ b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Onboarding/OnboardingContainerView.swift @@ -20,15 +20,18 @@ struct OnboardingContainerView: View { TabView(selection: $currentPage) { OnboardingPage1() .tag(0) - .padding(.bottom, 40.adjustedH) + .padding(.horizontal, 25.adjustedW) + OnboardingPage2() .tag(1) } .tabViewStyle(PageTabViewStyle(indexDisplayMode: .never)) + + Spacer() + .frame(height: 40.adjustedH) + PageIndicator(currentPage: currentPage, totalPages: 2) - .padding(.top, 46.adjustedH) - .padding(.bottom, 22.adjustedH) CherrishButton( title: "시작하기", @@ -39,10 +42,12 @@ struct OnboardingContainerView: View { ) { onboardingCoordinator.push(.information) } + .padding(.top, 21.adjustedH) .padding(.horizontal, 25.adjustedW) - .padding(.bottom, 57.adjustedH) .opacity(currentPage == 1 ? 1 : 0) .animation(.easeInOut(duration: 0.3), value: currentPage) + + Spacer() } Image(.close) @@ -61,11 +66,11 @@ struct OnboardingContainerView: View { .background( VStack(spacing: 0) { LinearGradient( - colors: [.homeGradient1, .homeGradient2], + colors: [.homeGradient1Onboarding, .homeGradient2], startPoint: .top, endPoint: .bottom ) - .frame(height: 310) + .frame(height: 310.adjustedH) Color.homeGradient2 } diff --git a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Onboarding/OnboardingPage1.swift b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Onboarding/OnboardingPage1.swift index e5cf2b57..f43964b9 100644 --- a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Onboarding/OnboardingPage1.swift +++ b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Onboarding/OnboardingPage1.swift @@ -12,6 +12,9 @@ struct OnboardingPage1: View { var body: some View { VStack(spacing: 0) { + Spacer() + .frame(height: 120.adjustedH) + Image(.illustrationOnboardingCal) .resizable() .scaledToFit() @@ -22,16 +25,14 @@ struct OnboardingPage1: View { .scaledToFit() .frame(width: 152.adjustedW, height: 204.adjustedH) .offset(x: 152.adjustedW, y: 209.adjustedH) - } - .padding(.top, 102.adjustedH) + } HStack(spacing: 0) { Image(.comment) .resizable() - .scaledToFit() + .scaledToFill() .frame(width: 100.adjustedW, height: 44.adjustedH) .padding(.top, 120.adjustedH) - .padding(.leading, 30.adjustedW) Spacer() } @@ -52,7 +53,6 @@ struct OnboardingPage1: View { TypographyText("일정을 한 눈에 정리해드려요", style: .title1_sb_18, color: .gray1000) .padding(.top, 6.adjustedH) } - .frame(maxWidth: .infinity) .background( VStack(alignment: .leading, spacing: 0) { TypographyText("시술 후 불편감이 남을 수 있는 기간", style: .title1_sb_18, color: .clear) @@ -62,7 +62,6 @@ struct OnboardingPage1: View { } ) } - .opacity(0) ) .onPreferenceChange(Line1WidthKey.self) { width in line1Width = width diff --git a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Onboarding/OnboardingPage2.swift b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Onboarding/OnboardingPage2.swift index 1e24c4a8..1498f5c5 100644 --- a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Onboarding/OnboardingPage2.swift +++ b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Onboarding/OnboardingPage2.swift @@ -16,6 +16,9 @@ struct OnboardingPage2: View { var body: some View { VStack(spacing: 0) { + Spacer() + .frame(height: 168.adjustedH) + HStack(spacing: 0) { TypographyText("원하는 추구미에 도달할 수 있도록\nTO-DO 루틴을 제시해줘요", style: .title1_sb_18, color: .gray1000) .fixedSize(horizontal: false, vertical: true) @@ -23,7 +26,6 @@ struct OnboardingPage2: View { Spacer() } .padding(.horizontal, 42.adjustedW) - .padding(.top, 124.adjustedH) Spacer() .frame(height: 40.adjustedH) @@ -31,15 +33,20 @@ struct OnboardingPage2: View { Image(.onboarding2) .resizable() .scaledToFit() - .frame(width: 293.adjustedW, height: 202.adjustedH) - .padding(.horizontal, 41.adjustedW) - + .frame(maxWidth: .infinity) + .padding(.horizontal, 42.adjustedW) + + Spacer() + .frame(height: 12.adjustedH) + InfiniteLevelCarousel(levelImages: levelImages, animationDuration: animationDuration) .frame(height: 89.adjustedH) - .padding(.top, 12.adjustedH) + Spacer() + .frame(height: 20.adjustedH) + TypographyText("TO-DO 미션을 채울때마다 아리가 변화해요!", style: .title2_r_16, color: .gray600) - .padding(.top, 30.adjustedH) + .padding(.horizontal, 42.adjustedW) Spacer() } diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/Color/home_gradient1.colorset/Contents.json b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/Color/home_gradient1.colorset/Contents.json index 04541345..c070bdf0 100644 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/Color/home_gradient1.colorset/Contents.json +++ b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/Color/home_gradient1.colorset/Contents.json @@ -5,8 +5,8 @@ "color-space" : "display-p3", "components" : { "alpha" : "1.000", - "blue" : "0xF7", - "green" : "0xF7", + "blue" : "0xEB", + "green" : "0xEB", "red" : "0xFF" } }, diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/Color/home_gradient1_onboarding.colorset/Contents.json b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/Color/home_gradient1_onboarding.colorset/Contents.json new file mode 100644 index 00000000..2a19ae3e --- /dev/null +++ b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/Color/home_gradient1_onboarding.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0xE5", + "green" : "0xE5", + "red" : "0xFF" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0xFD", + "green" : "0xFD", + "red" : "0xFF" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar0.imageset/Contents.json b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar0.imageset/Contents.json index c11fc122..dcb72c92 100644 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar0.imageset/Contents.json +++ b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar0.imageset/Contents.json @@ -6,10 +6,12 @@ "scale" : "1x" }, { + "filename" : "challenge_gaugebar_1@2x.png", "idiom" : "universal", "scale" : "2x" }, { + "filename" : "challenge_gaugebar_1@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar0.imageset/challenge_gaugebar_1@2x.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar0.imageset/challenge_gaugebar_1@2x.png new file mode 100644 index 00000000..1ed749d2 Binary files /dev/null and b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar0.imageset/challenge_gaugebar_1@2x.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar0.imageset/challenge_gaugebar_1@3x.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar0.imageset/challenge_gaugebar_1@3x.png new file mode 100644 index 00000000..e25c2327 Binary files /dev/null and b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar0.imageset/challenge_gaugebar_1@3x.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar1.imageset/Contents.json b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar1.imageset/Contents.json index a4fdccf7..5c89ead9 100644 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar1.imageset/Contents.json +++ b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar1.imageset/Contents.json @@ -1,15 +1,17 @@ { "images" : [ { - "filename" : "home_chellenge_bar.svg", + "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" } diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar1.imageset/challenge_gaugebar_1.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar1.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/home_icon/home_chellenge_bar1.imageset/challenge_gaugebar_1.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar1.imageset/challenge_gaugebar_1@2x.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar1.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/home_icon/home_chellenge_bar1.imageset/challenge_gaugebar_1@2x.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar1.imageset/challenge_gaugebar_1@3x.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar1.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/home_icon/home_chellenge_bar1.imageset/challenge_gaugebar_1@3x.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar1.imageset/home_chellenge_bar.svg b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar1.imageset/home_chellenge_bar.svg deleted file mode 100644 index 335a36c7..00000000 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar1.imageset/home_chellenge_bar.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar2.imageset/Contents.json b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar2.imageset/Contents.json index a5d9fd7b..d1d7ddb4 100644 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar2.imageset/Contents.json +++ b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar2.imageset/Contents.json @@ -1,15 +1,17 @@ { "images" : [ { - "filename" : "home_chellenge_bar2.svg", + "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" } diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar2.imageset/challenge_gaugebar_2.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar2.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/home_icon/home_chellenge_bar2.imageset/challenge_gaugebar_2.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar2.imageset/challenge_gaugebar_2@2x.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar2.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/home_icon/home_chellenge_bar2.imageset/challenge_gaugebar_2@2x.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar2.imageset/challenge_gaugebar_2@3x.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar2.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/home_icon/home_chellenge_bar2.imageset/challenge_gaugebar_2@3x.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar2.imageset/home_chellenge_bar2.svg b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar2.imageset/home_chellenge_bar2.svg deleted file mode 100644 index a3219da1..00000000 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar2.imageset/home_chellenge_bar2.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar3.imageset/Contents.json b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar3.imageset/Contents.json index 1f033af1..b38e9d4f 100644 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar3.imageset/Contents.json +++ b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar3.imageset/Contents.json @@ -1,15 +1,17 @@ { "images" : [ { - "filename" : "home_chellenge_bar3.svg", + "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" } diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar3.imageset/challenge_gaugebar_3.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar3.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/home_icon/home_chellenge_bar3.imageset/challenge_gaugebar_3.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar3.imageset/challenge_gaugebar_3@2x.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar3.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/home_icon/home_chellenge_bar3.imageset/challenge_gaugebar_3@2x.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar3.imageset/challenge_gaugebar_3@3x.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar3.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/home_icon/home_chellenge_bar3.imageset/challenge_gaugebar_3@3x.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar3.imageset/home_chellenge_bar3.svg b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar3.imageset/home_chellenge_bar3.svg deleted file mode 100644 index 1856b9a2..00000000 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar3.imageset/home_chellenge_bar3.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar4.imageset/Contents.json b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar4.imageset/Contents.json index 6ce25a4f..27d10c7f 100644 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar4.imageset/Contents.json +++ b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar4.imageset/Contents.json @@ -1,15 +1,17 @@ { "images" : [ { - "filename" : "home_chellenge_bar4.svg", + "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" } diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar4.imageset/challenge_gaugebar_4.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar4.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/home_icon/home_chellenge_bar4.imageset/challenge_gaugebar_4.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar4.imageset/challenge_gaugebar_4@2x.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar4.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/home_icon/home_chellenge_bar4.imageset/challenge_gaugebar_4@2x.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar4.imageset/challenge_gaugebar_4@3x.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar4.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/home_icon/home_chellenge_bar4.imageset/challenge_gaugebar_4@3x.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar4.imageset/home_chellenge_bar4.svg b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar4.imageset/home_chellenge_bar4.svg deleted file mode 100644 index b716ac98..00000000 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar4.imageset/home_chellenge_bar4.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - -