From 060b5b2941b659990881878ce63b8dca1e6e0c93 Mon Sep 17 00:00:00 2001
From: yeonee <leenayeon@sookmyung.ac.kr>
Date: Thu, 22 Jan 2026 22:16:19 +0900
Subject: [PATCH 1/6] =?UTF-8?q?chore:=20#162=20=EB=B2=84=EC=A0=84=EC=97=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Cherrish-iOS/Cherrish-iOS.xcodeproj/project.pbxproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cherrish-iOS/Cherrish-iOS.xcodeproj/project.pbxproj b/Cherrish-iOS/Cherrish-iOS.xcodeproj/project.pbxproj
index 53b54410..c1938441 100644
--- a/Cherrish-iOS/Cherrish-iOS.xcodeproj/project.pbxproj
+++ b/Cherrish-iOS/Cherrish-iOS.xcodeproj/project.pbxproj
@@ -301,7 +301,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.nayeon.Cherrish-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -339,7 +339,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.nayeon.Cherrish-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

From d8cb60ec7b3760bfcb50d35f6fbec4213695823b Mon Sep 17 00:00:00 2001
From: yeonee <leenayeon@sookmyung.ac.kr>
Date: Thu, 22 Jan 2026 22:44:31 +0900
Subject: [PATCH 2/6] =?UTF-8?q?fix:=20#162=20=EB=94=94=EC=9E=90=EC=9D=B8?=
 =?UTF-8?q?=202=EC=B0=A8=20QA=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CalendarMain/CalendarCellView.swift       |  2 +-
 .../Calendar/CalendarMain/CalendarView.swift  |  2 +-
 .../View/ChallengeLoadingView.swift           | 50 +++++++++++--------
 3 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/CalendarMain/CalendarCellView.swift b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/CalendarMain/CalendarCellView.swift
index 94403c0e..6f1e4605 100644
--- a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/CalendarMain/CalendarCellView.swift
+++ b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/CalendarMain/CalendarCellView.swift
@@ -58,7 +58,7 @@ struct CalendarCellView: View {
                                 scheduleCircle
                             }
                         }
-                        .padding(.bottom, 4.adjustedH)
+                        .padding(.bottom, 6.adjustedH)
                         .padding(.top, 19.adjustedH)
                     }
                 }
diff --git a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/CalendarMain/CalendarView.swift b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/CalendarMain/CalendarView.swift
index 4c0a73cf..855bc59c 100644
--- a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/CalendarMain/CalendarView.swift
+++ b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/CalendarMain/CalendarView.swift
@@ -66,7 +66,7 @@ struct CalendarView: View {
                 }
             }
         }
-        .onChange(of: homeCalendarFlowState.treatmentDate) { date in
+        .onChange(of: homeCalendarFlowState.treatmentDate) { _, date in
             if let date = date {
                 viewModel.updateDate(date: date)
                 homeCalendarFlowState.treatmentDate = nil
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 52097bb3..697a21eb 100644
--- a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/ChallengeLoadingView.swift
+++ b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/ChallengeLoadingView.swift
@@ -10,33 +10,39 @@ import SwiftUI
 import Lottie
 
 struct ChallengeLoadingView: View {
-    @ObservedObject var viewModel: CreateChallengeViewModel   
-
+    @ObservedObject var viewModel: CreateChallengeViewModel
+    
     var body: some View {
-        VStack {
-            VStack(spacing: 4.adjustedH) {
+        VStack(alignment: .center) {
+            Spacer()
+                .frame(height: 94.adjustedH)
+            
+            VStack(spacing: 2) {
                 highlight(highlightText: viewModel.selectedRoutine?.description ?? "", normalText: "방향을 바탕으로")
                     .frame(height: 27.adjustedH)
-                    .padding(.top, 94.adjustedH)
                 TypographyText("TO-DO 미션을 만들고 있어요.", style: .title1_sb_18, color: .gray800)
-                
-                LottieView(animationName: "splash", loopMode: .loop)
-                    .frame(width: 130.adjustedW, height: 154.adjustedH)
-                    .padding(.top, 60.adjustedH)
-                
-                Spacer()
-                    .frame(height: 80.adjustedH)
-                
-                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)
+                    .frame(height: 27.adjustedH)
             }
+            
+            Spacer()
+                .frame(height: 80.adjustedH)
+            
+            LottieView(animationName: "splash", loopMode: .loop)
+                .frame(width: 130.adjustedW, height: 154.adjustedH)
+            
+            Spacer()
+                .frame(height: 80.adjustedH)
+            
+            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)
+            
         }
         .frame(maxHeight: .infinity)
         .ignoresSafeArea(edges: .bottom)

From 73a72d31d06941a429a7e59d69689c555ac42736 Mon Sep 17 00:00:00 2001
From: yeonee <leenayeon@sookmyung.ac.kr>
Date: Thu, 22 Jan 2026 23:00:59 +0900
Subject: [PATCH 3/6] =?UTF-8?q?fix:=20#162=20=EC=8A=A4=ED=81=AC=EB=A1=A4?=
 =?UTF-8?q?=EB=B7=B0=20=ED=83=91=20=EA=B7=B8=EB=9D=BC=EB=8D=B0=EC=9D=B4?=
 =?UTF-8?q?=EC=85=98=20=EC=95=88=EB=B3=B4=EC=9D=B4=EB=8D=98=20=EA=B2=83=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Calendar/CalendarMain/CalendarView.swift  | 50 +++++++++----------
 .../Global/Components/PreferenceKey.swift     |  2 +-
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/CalendarMain/CalendarView.swift b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/CalendarMain/CalendarView.swift
index 855bc59c..d39e9824 100644
--- a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/CalendarMain/CalendarView.swift
+++ b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/CalendarMain/CalendarView.swift
@@ -127,34 +127,34 @@ extension CalendarView {
         return VStack(spacing: 0) {
             LazyVGrid(columns: columns, spacing: calendarRowSpacing) {
                 ForEach(dates) { value in
-                if value.day != -1 {
-                    CalendarCellView(
-                        value: value,
-                        procedureCount: viewModel.getProcedureCount(for: value),
-                        isSelected: viewModel.isSelected(value),
-                        downtimeState: viewModel.getDowntimeState(for: value.date),
-                        isDDay: viewModel.isDDay(for: value.date, selectedProcedureID: selectedProcedureID ?? 0),
-                        calendarMode: $calendarMode
-                    )
-                    .onTapGesture {
-                        viewModel.select(date: value.date)
-                        calendarMode = .none
-                        selectedProcedureID = nil
-                        
-                        Task {
-                            do {
-                                try await viewModel.fetchTodayProcedureList()
-                            } catch {
-                                CherrishLogger.error(error)
+                    if value.day != -1 {
+                        CalendarCellView(
+                            value: value,
+                            procedureCount: viewModel.getProcedureCount(for: value),
+                            isSelected: viewModel.isSelected(value),
+                            downtimeState: viewModel.getDowntimeState(for: value.date),
+                            isDDay: viewModel.isDDay(for: value.date, selectedProcedureID: selectedProcedureID ?? 0),
+                            calendarMode: $calendarMode
+                        )
+                        .onTapGesture {
+                            viewModel.select(date: value.date)
+                            calendarMode = .none
+                            selectedProcedureID = nil
+                            
+                            Task {
+                                do {
+                                    try await viewModel.fetchTodayProcedureList()
+                                } catch {
+                                    CherrishLogger.error(error)
+                                }
                             }
                         }
+                    } else {
+                        Color.clear
+                            .frame(width: calendarCellWidth, height: calendarCellHeight)
                     }
-                } else {
-                    Color.clear
-                        .frame(width: calendarCellWidth, height: calendarCellHeight)
                 }
             }
-            }
             
             if rowCount == 4 {
                 Spacer()
@@ -290,7 +290,7 @@ extension CalendarView {
                     calendarCoordinator.push(
                         .selectTreatment
                     )
-                   
+                    
                 }
             )
             .padding(.horizontal, 24.adjustedW)
@@ -363,4 +363,4 @@ extension CalendarView {
         guard calendarMode == .none, let initial = initialTopGlobalY else { return false }
         return topGlobalY < initial - 0.1
     }
-  }
+}
diff --git a/Cherrish-iOS/Cherrish-iOS/Presentation/Global/Components/PreferenceKey.swift b/Cherrish-iOS/Cherrish-iOS/Presentation/Global/Components/PreferenceKey.swift
index 3230c784..8ad80b6a 100644
--- a/Cherrish-iOS/Cherrish-iOS/Presentation/Global/Components/PreferenceKey.swift
+++ b/Cherrish-iOS/Cherrish-iOS/Presentation/Global/Components/PreferenceKey.swift
@@ -10,7 +10,7 @@ import SwiftUI
 struct ScrollTopPreferenceKey: PreferenceKey {
     static var defaultValue: CGFloat = .zero
     static func reduce(value: inout CGFloat, nextValue: () -> CGFloat) {
-        value = max(value, nextValue())
+        value = min(value, nextValue())
     }
 }
 

From 8861cb5ab628a5cad9af03f433c1c5347b1fea34 Mon Sep 17 00:00:00 2001
From: yeonee <leenayeon@sookmyung.ac.kr>
Date: Fri, 23 Jan 2026 00:00:23 +0900
Subject: [PATCH 4/6] =?UTF-8?q?chore:=20#162=20=EB=8D=B0=EB=AA=A8=EB=8D=B0?=
 =?UTF-8?q?=EC=9D=B4=EC=9A=A9=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Feature/Onboarding/SplashView.swift       | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Onboarding/SplashView.swift b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Onboarding/SplashView.swift
index f7c621e8..a81e0a3d 100644
--- a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Onboarding/SplashView.swift
+++ b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Onboarding/SplashView.swift
@@ -11,13 +11,7 @@ import Lottie
 
 struct SplashView: View {
     @EnvironmentObject private var appCoordinator: AppCoordinator
-    
-    private let userDefaultService: UserDefaultService
 
-    init(userDefaultService: UserDefaultService = DefaultUserDefaultService()) {
-        self.userDefaultService = userDefaultService
-    }
-    
     var body: some View {
         ZStack(alignment: .center) {
             LinearGradient(
@@ -34,20 +28,9 @@ struct SplashView: View {
         }
         .onAppear {
             DispatchQueue.main.asyncAfter(deadline: .now() + 3) {
-                navigateBasedOnUserStatus()
+                appCoordinator.navigationToOnboarding()
             }
         }
         .ignoresSafeArea()
     }
-    
-    private func navigateBasedOnUserStatus() {
-        let userID: Int? = userDefaultService.load(key: .userID)
-        let isOnboardingCompleted: Bool = userDefaultService.load(key: .isOnboardingCompleted) ?? false
-        
-        if userID != nil && isOnboardingCompleted {
-            appCoordinator.navigationToTabbar()
-        } else {
-            appCoordinator.navigationToOnboarding()
-        }
-    }
 }

From 3ada98aff6c0c8b7a434f7005ba653f3b5ec1062 Mon Sep 17 00:00:00 2001
From: yeonee <leenayeon@sookmyung.ac.kr>
Date: Fri, 23 Jan 2026 01:06:31 +0900
Subject: [PATCH 5/6] =?UTF-8?q?feat:=20#162=20=EA=B8=B0=EB=94=94=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=EC=82=AC=ED=95=AD=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ChallengeProgressViewModel.swift          |  2 +-
 .../View/ChallengeProgressView.swift          | 40 -----------
 .../Presentation/Feature/Home/HomeView.swift  |  4 +-
 .../Feature/Home/HomeViewModel.swift          |  8 +--
 .../Global/Enum/CherryLevel.swift             | 66 +++++++++++++++++++
 .../Contents.json                             | 21 ++++++
 .../home_chellenge_bar0.svg                   | 10 +++
 7 files changed, 104 insertions(+), 47 deletions(-)
 create mode 100644 Cherrish-iOS/Cherrish-iOS/Presentation/Global/Enum/CherryLevel.swift
 create mode 100644 Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_0.imageset/Contents.json
 create mode 100644 Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_0.imageset/home_chellenge_bar0.svg

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 d0c61c61..818e01ba 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
@@ -11,7 +11,7 @@ final class ChallengeProgressViewModel: ObservableObject {
     @Published private(set) var challengeData: ProgressChallengeEntity?
     @Published private(set) var isLoading: Bool = false
     @Published private(set) var errorMessage: String?
-    @Published private(set) var cherryLevel: CherryLevel = .mong
+    @Published private(set) var cherryLevel: CherryLevel = .level1
     @Published private(set) var remainMissions: Int = 0
     @Published private(set) var progressRate = 0
     @Published private(set) var currentDay: Int = 1
diff --git a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/ChallengeProgressView.swift b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/ChallengeProgressView.swift
index 240dadcb..48fc6cdb 100644
--- a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/ChallengeProgressView.swift
+++ b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/ChallengeProgressView.swift
@@ -7,46 +7,6 @@
 
 import SwiftUI
 
-enum CherryLevel: Int {
-    case mong = 1
-    case bbo
-    case pang
-    case ggu
-
-    var levelNumber: Int { rawValue }
-
-    static func from(progressRate: Double) -> CherryLevel {
-        switch progressRate {
-        case 0.0..<25.0:
-            return .mong
-        case 25.0..<50.0:
-            return .bbo
-        case 50.0..<75.0:
-            return .pang
-        case 75.0...100.0:
-            return .ggu
-        default:
-            return .mong
-        }
-    }
-
-    var name: String {
-        switch self {
-        case .mong: return "몽롱체리"
-        case .bbo: return "뽀득체리"
-        case .pang: return "팡팡체리"
-        case .ggu: return "꾸꾸체리"
-        }
-    }
-
-    var cherryImage: Image {
-        Image("cherry\(rawValue)")
-    }
-    var progressImage: Image {
-        Image("challenge_gaugebar_\(levelNumber)")
-    }
-}
-
 struct ChallengeProgressView: View {
     @EnvironmentObject private var challengeCoordinator: ChallengeCoordinator
     @StateObject var viewModel: ChallengeProgressViewModel
diff --git a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Home/HomeView.swift b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Home/HomeView.swift
index 8f9ab938..12d8148d 100644
--- a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Home/HomeView.swift
+++ b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Home/HomeView.swift
@@ -18,13 +18,13 @@ struct HomeView: View {
                 VStack(spacing: 0) {
                     HeaderLogoView()
                     ZStack(alignment: .topTrailing) {
-                        if viewModel.cherryLevel == 0 {
+                        if viewModel.challengeName == nil {
                             ChallengeCardEmptyView(
                                 challengeBarImageName: viewModel.challengeBarImageName
                             )
                         } else {
                             ChallengeCardView(
-                                challengeName: viewModel.challengeName,
+                                challengeName: viewModel.challengeName ?? "챌린지",
                                 challengeRate: viewModel.challengeRateText,
                                 challengeBarImageName: viewModel.challengeBarImageName
                             )
diff --git a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Home/HomeViewModel.swift b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Home/HomeViewModel.swift
index 1f340b48..2f8ce16a 100644
--- a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Home/HomeViewModel.swift
+++ b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Home/HomeViewModel.swift
@@ -62,8 +62,8 @@ final class HomeViewModel: ObservableObject {
         return String(format: "%.0f%%", rate)
     }
     
-    var challengeName: String {
-        dashboardData?.challengeName ?? "챌린지"
+    var challengeName: String? {
+        return dashboardData?.challengeName
     }
     
     var cherryLevel: Int {
@@ -71,12 +71,12 @@ final class HomeViewModel: ObservableObject {
     }
     
     var challengeBarImageName: String {
-        let level = min(max(cherryLevel, 0), 4)
+        let level = cherryLevel 
         return "home_chellenge_bar\(level)"
     }
     
     var cherryLevelImageName: String {
-        let level = min(max(cherryLevel, 0), 4)
+        let level = cherryLevel == 0 ? 1 : cherryLevel
         return "home_lv.\(level)"
     }
     
diff --git a/Cherrish-iOS/Cherrish-iOS/Presentation/Global/Enum/CherryLevel.swift b/Cherrish-iOS/Cherrish-iOS/Presentation/Global/Enum/CherryLevel.swift
new file mode 100644
index 00000000..1ed588ea
--- /dev/null
+++ b/Cherrish-iOS/Cherrish-iOS/Presentation/Global/Enum/CherryLevel.swift
@@ -0,0 +1,66 @@
+//
+//  CherryLevel.swift
+//  Cherrish-iOS
+//
+//  Created by 이나연 on 1/23/26.
+//
+
+import Foundation
+import SwiftUI
+
+enum CherryLevel: Int {
+    case level0 = 0
+    case level1
+    case level2
+    case level3
+    case level4
+
+    var levelNumber: Int {
+        if self == .level0 {
+            return 1
+        }
+        else {
+            return rawValue
+        }
+    }
+
+    static func from(progressRate: Double) -> CherryLevel {
+        switch progressRate {
+        case 0:
+            return .level0
+        case 0.0..<25.0:
+            return .level1
+        case 25.0..<50.0:
+            return .level2
+        case 50.0..<75.0:
+            return .level3
+        case 75.0...100.0:
+            return .level4
+        default:
+            return .level1
+        }
+    }
+
+    var name: String {
+        switch self {
+        case .level0, .level1: return "몽롱체리"
+        case .level2: return "뽀득체리"
+        case .level3: return "팡팡체리"
+        case .level4: return "꾸꾸체리"
+        }
+    }
+
+    var cherryImage: Image {
+        switch self {
+        case .level0, .level1: return Image(.cherry1)
+        case .level2: return Image(.cherry2)
+        case .level3: return Image(.cherry3)
+        case .level4: return Image(.cherry4)
+        }
+    }
+    
+    
+    var progressImage: Image {
+        Image("challenge_gaugebar_\(rawValue)")
+    }
+}
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
new file mode 100644
index 00000000..c11fc122
--- /dev/null
+++ b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_0.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "home_chellenge_bar0.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_0.imageset/home_chellenge_bar0.svg b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_0.imageset/home_chellenge_bar0.svg
new file mode 100644
index 00000000..53bfc9ee
--- /dev/null
+++ b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/challenge_gaugebar_0.imageset/home_chellenge_bar0.svg
@@ -0,0 +1,10 @@
+<svg width="290" height="31" viewBox="0 0 290 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="201.5" y="0.5" width="88" height="9" rx="4.5" fill="#EFF1F3" stroke="#CACDD1" style="fill:#EFF1F3;fill:color(display-p3 0.9373 0.9451 0.9529);fill-opacity:1;stroke:#CACDD1;stroke:color(display-p3 0.7922 0.8039 0.8196);stroke-opacity:1;"/>
+<path d="M270.61 24V16.2227H271.577V23.1406H275.187V24H270.61ZM280.429 18.167L278.27 24H277.313L275.165 18.167H276.175L277.765 22.7969H277.829L279.419 18.167H280.429ZM281.739 24.0645C281.363 24.0645 281.041 23.7529 281.052 23.3662C281.041 22.9902 281.363 22.6787 281.739 22.6787C282.115 22.6787 282.427 22.9902 282.427 23.3662C282.427 23.7529 282.115 24.0645 281.739 24.0645ZM283.673 22.4102V21.6152L287.175 16.2227H288.367V21.5615H289.452V22.4102H288.367V24H287.443V22.4102H283.673ZM284.715 21.5615H287.443V17.4473H287.347L284.715 21.4971V21.5615Z" fill="#9FA4A9" style="fill:#9FA4A9;fill:color(display-p3 0.6235 0.6431 0.6627);fill-opacity:1;"/>
+<rect x="134.5" y="0.5" width="88" height="9" rx="4.5" fill="#EFF1F3" stroke="#CACDD1" style="fill:#EFF1F3;fill:color(display-p3 0.9373 0.9451 0.9529);fill-opacity:1;stroke:#CACDD1;stroke:color(display-p3 0.7922 0.8039 0.8196);stroke-opacity:1;"/>
+<path d="M203.976 24V16.2227H204.942V23.1406H208.552V24H203.976ZM213.794 18.167L211.635 24H210.679L208.53 18.167H209.54L211.13 22.7969H211.194L212.784 18.167H213.794ZM215.104 24.0645C214.729 24.0645 214.406 23.7529 214.417 23.3662C214.406 22.9902 214.729 22.6787 215.104 22.6787C215.48 22.6787 215.792 22.9902 215.792 23.3662C215.792 23.7529 215.48 24.0645 215.104 24.0645ZM219.627 24.1074C218.08 24.1074 216.974 23.2803 216.92 22.0449H217.897C217.951 22.7861 218.692 23.248 219.616 23.248C220.637 23.248 221.389 22.6895 221.389 21.8838C221.389 21.0352 220.712 20.4336 219.498 20.4336H218.864V19.585H219.498C220.443 19.585 221.099 19.0586 221.099 18.2529C221.099 17.4795 220.529 16.9531 219.648 16.9531C218.821 16.9531 218.059 17.415 218.016 18.1777H217.081C217.135 16.9424 218.273 16.1152 219.659 16.1152C221.142 16.1152 222.044 17.082 222.033 18.1992C222.044 19.0801 221.528 19.7354 220.712 19.9609V20.0146C221.722 20.1758 222.345 20.8955 222.334 21.8838C222.345 23.1621 221.174 24.1074 219.627 24.1074Z" fill="#9FA4A9" style="fill:#9FA4A9;fill:color(display-p3 0.6235 0.6431 0.6627);fill-opacity:1;"/>
+<rect x="67.5" y="0.5" width="88" height="9" rx="4.5" fill="#EFF1F3" stroke="#CACDD1" style="fill:#EFF1F3;fill:color(display-p3 0.9373 0.9451 0.9529);fill-opacity:1;stroke:#CACDD1;stroke:color(display-p3 0.7922 0.8039 0.8196);stroke-opacity:1;"/>
+<path d="M137.019 24V16.2227H137.985V23.1406H141.595V24H137.019ZM146.837 18.167L144.678 24H143.722L141.573 18.167H142.583L144.173 22.7969H144.237L145.827 18.167H146.837ZM148.147 24.0645C147.771 24.0645 147.449 23.7529 147.46 23.3662C147.449 22.9902 147.771 22.6787 148.147 22.6787C148.523 22.6787 148.835 22.9902 148.835 23.3662C148.835 23.7529 148.523 24.0645 148.147 24.0645ZM150.274 24L150.264 23.291L152.917 20.498C153.841 19.5205 154.281 18.9941 154.281 18.2744C154.281 17.4795 153.604 16.9531 152.734 16.9531C151.811 16.9531 151.22 17.5439 151.22 18.4141H150.307C150.296 17.0391 151.359 16.1152 152.767 16.1152C154.174 16.1152 155.184 17.0605 155.184 18.2744C155.184 19.1445 154.775 19.8213 153.4 21.2393L151.617 23.0762V23.1406H155.323V24H150.274Z" fill="#9FA4A9" style="fill:#9FA4A9;fill:color(display-p3 0.6235 0.6431 0.6627);fill-opacity:1;"/>
+<rect x="0.5" y="0.5" width="88" height="9" rx="4.5" fill="#EFF1F3" stroke="#CACDD1" style="fill:#EFF1F3;fill:color(display-p3 0.9373 0.9451 0.9529);fill-opacity:1;stroke:#CACDD1;stroke:color(display-p3 0.7922 0.8039 0.8196);stroke-opacity:1;"/>
+<path d="M72.5859 24V16.2227H73.5527V23.1406H77.1621V24H72.5859ZM82.4043 18.167L80.2451 24H79.2891L77.1406 18.167H78.1504L79.7402 22.7969H79.8047L81.3945 18.167H82.4043ZM83.7148 24.0645C83.3389 24.0645 83.0166 23.7529 83.0273 23.3662C83.0166 22.9902 83.3389 22.6787 83.7148 22.6787C84.0908 22.6787 84.4023 22.9902 84.4023 23.3662C84.4023 23.7529 84.0908 24.0645 83.7148 24.0645ZM87.6572 16.2227V24H86.6797V17.2324H86.6367L84.7461 18.4893V17.5117L86.6797 16.2227H87.6572Z" fill="#9FA4A9" style="fill:#9FA4A9;fill:color(display-p3 0.6235 0.6431 0.6627);fill-opacity:1;"/>
+</svg>

From cd0d3e180c16ea327a696ca6e17db767d489943d Mon Sep 17 00:00:00 2001
From: yeonee <leenayeon@sookmyung.ac.kr>
Date: Fri, 23 Jan 2026 01:26:47 +0900
Subject: [PATCH 6/6] =?UTF-8?q?style:=20#162=20=EB=94=94=EC=9E=90=EC=9D=B8?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95=EC=82=AC=ED=95=AD=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Presentation/Feature/MyPage/MyPageView.swift     |  2 +-
 .../Color/splash_gradient_2.colorset/Contents.json   | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/MyPage/MyPageView.swift b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/MyPage/MyPageView.swift
index 468aff46..c87ff9ba 100644
--- a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/MyPage/MyPageView.swift
+++ b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/MyPage/MyPageView.swift
@@ -70,7 +70,7 @@ extension MyPageView {
     
     private var grayEmptyBar: some View {
         Rectangle()
-            .fill(.gray100)
+            .fill(.gray200)
             .frame(height: 10.adjustedH)
     }
 }
diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/Color/splash_gradient_2.colorset/Contents.json b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/Color/splash_gradient_2.colorset/Contents.json
index 655618f1..4db05dcd 100644
--- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/Color/splash_gradient_2.colorset/Contents.json
+++ b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/Color/splash_gradient_2.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0xE6",
-          "green" : "0xE0",
-          "red" : "0xFA"
+          "blue" : "0xC7",
+          "green" : "0xC7",
+          "red" : "0xF9"
         }
       },
       "idiom" : "universal"
@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0xE6",
-          "green" : "0xE0",
-          "red" : "0xFA"
+          "blue" : "0xC7",
+          "green" : "0xC7",
+          "red" : "0xF9"
         }
       },
       "idiom" : "universal"