Fix/#162 2차 QA 반영

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 = "";

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)
                     }
                 }

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
@@ -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
     }
-  }
+}

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

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)

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

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
                             )

Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Home/HomeViewModel.swift

@@ -62,21 +62,21 @@ final class HomeViewModel: ObservableObject {
         return String(format: "%.0f%%", rate)
     }
 
-    var challengeName: String {
-        dashboardData?.challengeName ?? "챌린지"
+    var challengeName: String? {
+        return dashboardData?.challengeName
     }
 
     var cherryLevel: Int {
         dashboardData?.cherryLevel ?? 0
     }
 
     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)"
     }
 

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()
-        }
-    }
 }

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())
     }
 }
 

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)")
+    }
+}