Merge pull request #26 from opficdev/refactor/Architecture

update 2026.01.30

Author: opficdev

DevLog/Presentation/Extension/View+.swift

@@ -8,14 +8,14 @@
 import SwiftUI
 
 extension View {
-    var screenWidth: CGFloat {
+    var sceneWidth: CGFloat {
         guard let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene
         else { return UIScreen.main.bounds.width }
 
         return windowScene.screen.bounds.width
     }
 
-    var screenHeight: CGFloat {
+    var sceneHeight: CGFloat {
         guard let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene
         else { return UIScreen.main.bounds.height }
 

DevLog/Presentation/ViewModel/PushNotificationSettingsViewModel.swift

@@ -12,6 +12,7 @@ final class PushNotificationSettingsViewModel: Store {
         var pushNotificationEnable = false
         var pushNotificationTime = Date()
         var showTimePicker = false
+        var sheetHeight = CGFloat.pi
         var pushNotificationHour: Int {
             Calendar.current.component(.hour, from: pushNotificationTime)
         }
@@ -23,6 +24,7 @@ final class PushNotificationSettingsViewModel: Store {
         case setPushNotificationHour(Int)
         case setPushNotificationTime(Date)
         case setShowTimePicker(Bool)
+        case setSheetHeight(CGFloat)
     }
 
     enum SideEffect {
@@ -66,6 +68,8 @@ final class PushNotificationSettingsViewModel: Store {
             return [.updatePushNotificationSettings]
         case .setShowTimePicker(let value):
             state.showTimePicker = value
+        case .setSheetHeight(let value):
+            state.sheetHeight = value
         }
         self.state = state
         return []

DevLog/UI/Home/HomeView.swift

@@ -37,7 +37,7 @@ struct HomeView: View {
                                     HStack {
                                         RoundedRectangle(cornerRadius: 8)
                                             .fill(kind.color)
-                                            .frame(width: screenWidth * 0.08, height: screenWidth * 0.08)
+                                            .frame(width: sceneWidth * 0.08, height: sceneWidth * 0.08)
                                             .overlay {
                                                 Image(systemName: kind.symbolName)
                                                     .foregroundStyle(Color.white)
@@ -83,7 +83,7 @@ struct HomeView: View {
                                         HStack {
                                             RoundedRectangle(cornerRadius: 8)
                                                 .fill(todo.kind.color)
-                                                .frame(width: screenWidth * 0.08, height: screenWidth * 0.08)
+                                                .frame(width: sceneWidth * 0.08, height: sceneWidth * 0.08)
                                                 .overlay {
                                                     Image(systemName: todo.kind.symbolName)
                                                         .foregroundStyle(Color.white)

DevLog/UI/Login/LoginView.swift

@@ -18,23 +18,23 @@ struct LoginView: View {
                 Image("Primary")
                     .resizable()
                     .scaledToFit()
-                    .frame(width: screenWidth / 5)
+                    .frame(width: sceneWidth / 5)
                 Spacer()
                 VStack(spacing: 20) {
                     LoginButton(logo: Image("Google"), text: "구글 계정으로 로그인") {
                         viewModel.send(.tapSignInButton(.google))
                     }
-                    .frame(width: screenWidth * 3 / 4, height: screenWidth / 10)
+                    .frame(width: sceneWidth * 3 / 4, height: sceneWidth / 10)
 
                     LoginButton(logo: Image("Github"), text: "깃헙 계정으로 로그인") {
                         viewModel.send(.tapSignInButton(.github))
                     }
-                    .frame(width: screenWidth * 3 / 4, height: screenWidth / 10)
+                    .frame(width: sceneWidth * 3 / 4, height: sceneWidth / 10)
 
                     LoginButton(logo: Image("Apple"), text: "애플 계정으로 로그인") {
                         viewModel.send(.tapSignInButton(.apple))
                     }
-                    .frame(width: screenWidth * 3 / 4, height: screenWidth / 10)
+                    .frame(width: sceneWidth * 3 / 4, height: sceneWidth / 10)
                 }
                 .padding(.bottom, 30)
                 Text("로그인하면 사용 약관 및 개인 정보 취급 방침에 동의하게 됩니다.")

DevLog/UI/Setting/PushNotificationSettingsView.swift

@@ -9,7 +9,6 @@ import SwiftUI
 
 struct PushNotificationSettingsView: View {
     @StateObject var viewModel: PushNotificationSettingsViewModel
-    @State private var sheetHeight: CGFloat = 0 // 시트 높이 조정용
 
     var body: some View {
         List {
@@ -42,7 +41,7 @@ struct PushNotificationSettingsView: View {
                 HStack {
                     Text("사용자 설정")
                     Spacer()
-                    Text("\(viewModel.state.pushNotificationHour)시")
+                    Text(formattedTimeString(viewModel.state.pushNotificationTime))
                         .foregroundStyle(.secondary)
                     if ![9, 15, 18, 21].contains(viewModel.state.pushNotificationHour) {
                         Image(systemName: "checkmark")
@@ -77,7 +76,7 @@ struct PushNotificationSettingsView: View {
             .datePickerStyle(.wheel)
             .labelsHidden()
             .presentationDragIndicator(.hidden)
-            .presentationDetents([.height(sheetHeight)])
+            .presentationDetents([.height(viewModel.state.sheetHeight)])
             .onAppear {
                 UIDatePicker.appearance().minuteInterval = 5
             }
@@ -87,12 +86,23 @@ struct PushNotificationSettingsView: View {
             .background(
                 GeometryReader { geometry in
                     Color.clear.onAppear {
-                        if sheetHeight == 0 {
-                            sheetHeight = geometry.size.height
-                        }
+                        viewModel.send(.setSheetHeight(geometry.size.height))
                     }
                 }
             )
         }
     }
+
+    private func formattedTimeString(_ date: Date) -> String {
+        let minuteValue = Calendar.current.component(.minute, from: date)
+        let formatStyle: Date.FormatStyle = .dateTime.hour(.twoDigits(amPM: .wide))
+
+        if minuteValue == 0 {
+            return "\(date.formatted(formatStyle))"
+        }
+
+        let hourText = date.formatted(formatStyle)
+        let minuteText = date.formatted(.dateTime.minute(.twoDigits))
+        return "\(hourText) \(minuteText)분"
+    }
 }