From 405a49868257f1a3f28417a24008f3364811668c Mon Sep 17 00:00:00 2001 From: soseoyo12 Date: Fri, 23 Jan 2026 00:43:48 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20#168=202=EC=B0=A8=20QA=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xcshareddata/swiftpm/Package.resolved | 11 +---- .../View/DowntimeBottomSheetView.swift | 2 +- .../Presentation/Feature/Home/HomeView.swift | 2 +- .../Onboarding/OnboardingContainerView.swift | 17 +++++--- .../Feature/Onboarding/OnboardingPage1.swift | 11 +++-- .../Feature/Onboarding/OnboardingPage2.swift | 19 ++++++--- .../home_gradient1.colorset/Contents.json | 4 +- .../Contents.json | 38 ++++++++++++++++++ .../Contents.json | 2 + .../challenge_gaugebar_1@2x.png | Bin 0 -> 3381 bytes .../challenge_gaugebar_1@3x.png | Bin 0 -> 4990 bytes .../Contents.json | 4 +- .../challenge_gaugebar_1.png | Bin 0 -> 1907 bytes .../challenge_gaugebar_1@2x.png | Bin 0 -> 3782 bytes .../challenge_gaugebar_1@3x.png | Bin 0 -> 5687 bytes .../home_chellenge_bar.svg | 10 ----- .../Contents.json | 4 +- .../challenge_gaugebar_2.png | Bin 0 -> 2015 bytes .../challenge_gaugebar_2@2x.png | Bin 0 -> 3970 bytes .../challenge_gaugebar_2@3x.png | Bin 0 -> 5909 bytes .../home_chellenge_bar2.svg | 10 ----- .../Contents.json | 4 +- .../challenge_gaugebar_3.png | Bin 0 -> 2008 bytes .../challenge_gaugebar_3@2x.png | Bin 0 -> 4013 bytes .../challenge_gaugebar_3@3x.png | Bin 0 -> 6041 bytes .../home_chellenge_bar3.svg | 10 ----- .../Contents.json | 4 +- .../challenge_gaugebar_4.png | Bin 0 -> 3297 bytes .../challenge_gaugebar_4@2x.png | Bin 0 -> 8204 bytes .../challenge_gaugebar_4@3x.png | Bin 0 -> 14779 bytes .../home_chellenge_bar4.svg | 25 ------------ 31 files changed, 86 insertions(+), 91 deletions(-) create mode 100644 Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/Color/home_gradient1_onboarding.colorset/Contents.json create mode 100644 Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar0.imageset/challenge_gaugebar_1@2x.png create mode 100644 Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar0.imageset/challenge_gaugebar_1@3x.png create mode 100644 Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar1.imageset/challenge_gaugebar_1.png create mode 100644 Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar1.imageset/challenge_gaugebar_1@2x.png create mode 100644 Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar1.imageset/challenge_gaugebar_1@3x.png delete mode 100644 Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar1.imageset/home_chellenge_bar.svg create mode 100644 Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar2.imageset/challenge_gaugebar_2.png create mode 100644 Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar2.imageset/challenge_gaugebar_2@2x.png create mode 100644 Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar2.imageset/challenge_gaugebar_2@3x.png delete mode 100644 Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar2.imageset/home_chellenge_bar2.svg create mode 100644 Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar3.imageset/challenge_gaugebar_3.png create mode 100644 Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar3.imageset/challenge_gaugebar_3@2x.png create mode 100644 Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar3.imageset/challenge_gaugebar_3@3x.png delete mode 100644 Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar3.imageset/home_chellenge_bar3.svg create mode 100644 Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar4.imageset/challenge_gaugebar_4.png create mode 100644 Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar4.imageset/challenge_gaugebar_4@2x.png create mode 100644 Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar4.imageset/challenge_gaugebar_4@3x.png delete mode 100644 Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/home_icon/home_chellenge_bar4.imageset/home_chellenge_bar4.svg 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 0000000000000000000000000000000000000000..1ed749d2ee4ec877cc1f29ec6e917a71483aecbe GIT binary patch literal 3381 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 J_qvax{|});hS~rC literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e25c232741e2b626a6ba8f9491a707cb2dccdb71 GIT binary patch literal 4990 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9517cae891e0841c81584483ed09e6b06973d4b9 GIT binary patch literal 1907 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..550a203faed0d112b26b5d875409d4b04f90dfd6 GIT binary patch literal 5687 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 - - - - - - - - - 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 0000000000000000000000000000000000000000..6d65deb4d5481263af9fbbb8b2bfe163c0a6407d GIT binary patch literal 2015 zcmV<52O#)~P)at5VQ9hz=bbGKoXf z(h7EQXe$&&FjNJrQ<{DWZG0ptQgIVkDfk~)!C7#yh*WTKa1cZX5#5|RDY$5O-j`I` zBHqX4{WzR+xm>^-P#G)s0x0R0kxay-wbZ)gdxM9bQ>tdNsG=+i{{6e_^U?L*Pl#Df zyLJ%SPh6MIE|+$m0#kqeUDcn-ni~Dz)Ip6I7T}SIm2Ha&-X$I}Xer{V;JnMng3~Ua zJD!zfocNYl(h6#ZxJfLhJM?@9mx^VrwS(B+pVe2F#T@EU%wZEI7>ZC)fdmENfBe&q zKaMSOS71;sj{+>pL`e}7vc&VypY?`La=`luFqi^{?NiPd)$u1{_I5K~#7F?VayWQ)d*%zt1f~VZy4;nduU%n^LXL z5`)QJt-SCx_+m2DrQE+@@)rPq0pl;YB}y19ruYXeVD@rL#-g|?%T|qXOAxI;fYKlL z**Op1iVUVyP1fG?Np5+bhv&ZN={e_~AGfy(&(W!=IJEAkBSzB@gvwdU0Z*RN@eF?F z>CR?6*!zJw1fh&l)6f_>b@H>MnevOiGS!cUx&a*g7-(t)>H-knfJcvkJAVP&n}A*K z!`J-%0J!-(a?wwbYmdUuEG{l#e*OWPTbi+J=MMN8PZmYj9cXVmKB)ASA9~SH@8H-W zaX@dAQVF;|2ka(=YYM{G6pFx)KjYcy&r#g>A^eQ%y10Ay9`@|njmE}C_!&e!+s{>9%5d3Kte#f#bx29^car70pp7R3^TcK}C46n+XYQIT3HKv<0g zT+s^y%Yq2etD3>mGK6=)qbE`y@}Q!1aqn&jT&P{7`jF@a!?NHGnngv`LHuzK5*58= zSe|$8Q%dq4d=D3^sdJW(9Dv{9NN9e30WHnV@H?I?pi3i``ttNNmUDx+K^>llQdoUs z*a7kVLo82j-&1YGx3B|R$eNB>F8YbD9T6Md(sIspiCU3r^ONZ_AXOpjePAV0`Qege=m7eXu7C9U_+OME`X_(QjHGKQ_^+{AY&gF?I`@-2R$-)^M3&XXBXc&W58M3-Q z(x(|zF~%<7#w*qDvP=|4>~r0d7KHzXoDeyb@at|j0$$4h0+(17m7CUC6 z6XJ*}z!{xzoJ(VIZ=M{TNYPrXyrHSS%{+mwMmcmS8f!grH08}Bkz?`0k*KqFk5X#J zf}7-VI-SlaSealjS94GPWIb?3zx(#Ze7uW}ftNNFO16FBE3?P$>B*4sp%z(h7whM1 z)_XM%G)BBNaYU7%-Ctp;E*^3Oq_vKDp*Aa;edbISHO$=H?2M+XnHS->&JEs0r5B*jm0!{*qhfB#o!D%mQIt76UtHv1n^SYW!pU&$4Q0Q0G-isa^R(5)FQ6F z3KdB3&}0T$Q|i_;y>`p$IuaBi53XGoM^p)gh9oPW8M}daEk{3_p_O&Dp|Q}rIzenM zJ)7KUUnCL>7fXd93#BdBn5qHWri+dy16(R}v9mE3C8~LBxLLa)lGS5aftpC!|3$HW znp0QflsB;plai^@h=~l>AdaX4jPg+gV8YG~yt^L=XiU<3?>v0uco!8MH!Qre6LM7{ zRTn^CO-4gy^rX>)`a;)c7bVsiPS5NM-My5Ug*HlAs-3b^ewK?Fc>pg(eq6rL{9RVp z3Y+v*sV_)&oh*ww2$i9!{-MabLx()?Zt6r$+iE^FV>tC{jU1z{m`+et-Y6WWYQZ2v z>GVv-b3)rJ*t4^f6-op%(t1-q@w9-rTL57foGA>jZVirg@!HH5cYe*rrjW;brJo6h!}6PWo8UNO xVbKvm5ClOG1VIo4K@bE%5ClOG1VIos<{zM1xsHRnYmoo|002ovPDHLkV1i*GyO;m~ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..640e6099a51a4a455e306b122de36da8a17e9e05 GIT binary patch literal 3970 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 - - - - - - - - - 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 0000000000000000000000000000000000000000..3516d50349825d0a5d4df8be8bd990273e4c5f1c GIT binary patch literal 2008 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 N)7LhJRcqRZ{U2|=Wbpt1 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c3bfc4cb3349c61091ed9de6405bab619b54532c GIT binary patch literal 6041 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 NMR`@Zs@G - - - - - - - - - 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 0000000000000000000000000000000000000000..bfd0b2b028a45e8cb9e5763064ed42b211d6c0af GIT binary patch literal 3297 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5c9b5d0a2a8393977f3609e4b3340ed564d61bfb GIT binary patch literal 8204 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 - - - - - - - - - - - - - - - - - - - - - - - -