Merge pull request #117 from TeamDMU/feat-#116/schedule

leeyebeen-dev · web-flow · commit bef228b6ed2c · 2024-07-11T14:15:39.000+09:00
[FEAT] 학사일정 화면
diff --git a/DMU-iOS/DMU-iOS.xcodeproj/project.pbxproj b/DMU-iOS/DMU-iOS.xcodeproj/project.pbxproj
@@ -16,6 +16,7 @@
 		F91189122B5DF82200492AB1 /* ReactiveMoya in Frameworks */ = {isa = PBXBuildFile; productRef = F91189112B5DF82200492AB1 /* ReactiveMoya */; };
 		F91189142B5DF82200492AB1 /* RxMoya in Frameworks */ = {isa = PBXBuildFile; productRef = F91189132B5DF82200492AB1 /* RxMoya */; };
 		F914AD822B47C85400706D48 /* SettingDepartmentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F914AD812B47C85400706D48 /* SettingDepartmentView.swift */; };
+		F915DC1E2C3E1ED6009F2ABA /* ScheduleDatePickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F915DC1D2C3E1ED6009F2ABA /* ScheduleDatePickerView.swift */; };
 		F92116172B90621000A5507A /* DepartmentNoticeDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = F92116162B90621000A5507A /* DepartmentNoticeDTO.swift */; };
 		F92116192B90627100A5507A /* DepartmentNoticeRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = F92116182B90627100A5507A /* DepartmentNoticeRepository.swift */; };
 		F921161B2B90642300A5507A /* DepartmentNoticeService.swift in Sources */ = {isa = PBXBuildFile; fileRef = F921161A2B90642300A5507A /* DepartmentNoticeService.swift */; };
@@ -119,6 +120,7 @@
 		F90D26482B3D9C0100C864C4 /* Onboarding-Step-Two.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Onboarding-Step-Two.swift"; sourceTree = "<group>"; };
 		F90D264A2B3DA00600C864C4 /* CustomKeyword.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomKeyword.swift; sourceTree = "<group>"; };
 		F914AD812B47C85400706D48 /* SettingDepartmentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingDepartmentView.swift; sourceTree = "<group>"; };
+		F915DC1D2C3E1ED6009F2ABA /* ScheduleDatePickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScheduleDatePickerView.swift; sourceTree = "<group>"; };
 		F92116162B90621000A5507A /* DepartmentNoticeDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DepartmentNoticeDTO.swift; sourceTree = "<group>"; };
 		F92116182B90627100A5507A /* DepartmentNoticeRepository.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DepartmentNoticeRepository.swift; sourceTree = "<group>"; };
 		F921161A2B90642300A5507A /* DepartmentNoticeService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DepartmentNoticeService.swift; sourceTree = "<group>"; };
@@ -448,6 +450,7 @@
 			isa = PBXGroup;
 			children = (
 				F9AF3C532B416E5D001779E3 /* ScheduleView.swift */,
+				F915DC1D2C3E1ED6009F2ABA /* ScheduleDatePickerView.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -958,6 +961,7 @@
 				F929935E2B63E59F009DC2B6 /* ScheduleService.swift in Sources */,
 				F9F85E6C2B75C6A1005EFAE2 /* DateFormatExtension.swift in Sources */,
 				F93816882B561BEF00DA15F9 /* NotificationKeywordEditView.swift in Sources */,
+				F915DC1E2C3E1ED6009F2ABA /* ScheduleDatePickerView.swift in Sources */,
 				F9EE42482B3C302600307BA7 /* Department.swift in Sources */,
 				F9AF3C672B418DFE001779E3 /* NoticeViewModel.swift in Sources */,
 				F9AF3C572B416EE2001779E3 /* MealView.swift in Sources */,
diff --git a/DMU-iOS/DMU-iOS/Features/Schedule/ViewModels/ScheduleViewModel.swift b/DMU-iOS/DMU-iOS/Features/Schedule/ViewModels/ScheduleViewModel.swift
@@ -8,8 +8,17 @@
 import Foundation
 
 class ScheduleViewModel: ObservableObject {
-        
-    @Published var currentDate = Date()
+    
+    @Published var currentDate = Date() {
+        didSet {
+            selectedYear = calendar.component(.year, from: currentDate)
+            selectedMonth = calendar.component(.month, from: currentDate)
+        }
+    }
+    
+    @Published var selectedYear: Int = Calendar.current.component(.year, from: Date())
+    @Published var selectedMonth: Int = Calendar.current.component(.month, from: Date())
+    
     @Published var schedules: [Schedule] = []
     @Published var isScheduleLoading = false
     @Published var isScheduleLoadingFailed = false
@@ -46,13 +55,12 @@ class ScheduleViewModel: ObservableObject {
         }
     }
     
-    // MARK: 학사일정 월 이동
-    func changeMonth(by increment: Int) {
-        guard let newDate = calendar.date(byAdding: .month, value: increment, to: currentDate) else { return }
-        
-        currentDate = newDate
-        
-        loadScheduleData()
+    // MARK: 데이트피커를 통해 년월 선택
+    func selectYearMonth() {
+        if let newDate = Calendar.current.date(from: DateComponents(year: selectedYear, month: selectedMonth)) {
+            currentDate = newDate
+            loadScheduleData()
+        }
     }
     
     // MARK: 현재 년월
diff --git a/DMU-iOS/DMU-iOS/Features/Schedule/Views/ScheduleDatePickerView.swift b/DMU-iOS/DMU-iOS/Features/Schedule/Views/ScheduleDatePickerView.swift
@@ -0,0 +1,51 @@
+//
+//  ScheduleDatePickerView.swift
+//  DMU-iOS
+//
+//  Created by 이예빈 on 7/10/24.
+//
+
+import SwiftUI
+
+struct ScheduleDatePickerView: View {
+    
+    @StateObject var viewModel: ScheduleViewModel
+    @Binding var isPresented: Bool
+    
+    @State private var tempSelectedYear: Int = 0
+    @State private var tempSelectedMonth: Int = 0
+    
+    var body: some View {
+        VStack {
+            HStack {
+                Picker("년도", selection: $tempSelectedYear) {
+                    Text("2024년").tag(2024)
+                    Text("2025년").tag(2025)
+                }
+                .pickerStyle(WheelPickerStyle())
+                
+                Picker("월", selection: $tempSelectedMonth) {
+                    ForEach(1..<13) { month in
+                        Text("\(month)월").tag(month)
+                    }
+                }
+                .pickerStyle(WheelPickerStyle())
+            }
+            
+            CustomButton(title: "완료", action: {
+                viewModel.selectedYear = tempSelectedYear
+                viewModel.selectedMonth = tempSelectedMonth
+                viewModel.selectYearMonth()
+                isPresented = false
+            }, isEnabled: true)
+        }
+        .onAppear {
+            tempSelectedYear = viewModel.selectedYear
+            tempSelectedMonth = viewModel.selectedMonth
+        }
+    }
+}
+
+#Preview {
+    ScheduleDatePickerView(viewModel: ScheduleViewModel(), isPresented: .constant(true))
+}
diff --git a/DMU-iOS/DMU-iOS/Features/Schedule/Views/ScheduleView.swift b/DMU-iOS/DMU-iOS/Features/Schedule/Views/ScheduleView.swift
@@ -11,108 +11,100 @@ struct ScheduleView: View {
     
     @StateObject var viewModel: ScheduleViewModel
     
+    @State private var isDatePickerPresented = false
+    
     var body: some View {
         ZStack{
             VStack {
-                ScheduleTitle
+                ScheduleTitleView()
                 
-                ScheduleMonthNavigationBarView
+                ScheduleMonthNavigationBarView(currentYearMonth: viewModel.currentYearMonth, isDatePickerPresented: $isDatePickerPresented)
                 
-                SchedulesListView
+                SchedulesListView(schedules: viewModel.schedules, loadScheduleData: viewModel.loadScheduleData)
             }
             
             VStack {
                 if viewModel.isScheduleLoadingFailed {
-                    VStack(alignment: .center) {
-                        Text("학사일정을 불러오지 못했어요")
-                            .font(.SemiBold20)
-                            .foregroundColor(Color.Gray600)
-                            .environment(\.sizeCategory, .large)
-                            .padding(.bottom, 12)
-                        Text("네트워크 상태를 확인한 후,\n새로고침 버튼을 눌러 페이지를 불러올 수 있어요.")
-                            .font(.Medium16)
-                            .foregroundColor(Color.Gray400)
-                            .environment(\.sizeCategory, .large)
-                            .padding(.bottom, 28)
-                        CustomButton(title: "새로고침", action: {
-                            viewModel.loadScheduleData()
-                        }, isEnabled: true)
-                    }
-                    .multilineTextAlignment(.center)
+                    ScheduleLoadingFailedView(loadScheduleData: viewModel.loadScheduleData)
                 } else if viewModel.isScheduleLoading {
                     LoadingView(lottieFileName: "DMforU_Loading_GIF")
                         .frame(width: 100, height: 100)
                 }
             }
         }
         .onAppear(perform: viewModel.loadScheduleData)
+        .sheet(isPresented: $isDatePickerPresented) {
+            ScheduleDatePickerView(viewModel: viewModel, isPresented: $isDatePickerPresented)
+                .presentationDetents([
+                    .fraction(0.48)
+                ])
+                .presentationDragIndicator(.hidden)
+        }
     }
-    
-    // MARK: 학사일정 화면 타이틀 뷰
-    private var ScheduleTitle: some View {
+}
+
+struct ScheduleTitleView: View {
+    var body: some View {
         Text("학사일정")
             .font(.SemiBold20)
             .frame(maxWidth: .infinity)
             .foregroundColor(Color.Gray500)
             .environment(\.sizeCategory, .large)
             .padding()
     }
+}
+
+struct ScheduleMonthNavigationBarView: View {
+    let currentYearMonth: String
     
-    // MARK: 학사일정 화면 네비게이션바 뷰
-    private var ScheduleMonthNavigationBarView: some View {
-        HStack {
-            if viewModel.currentYearMonth != "2023년 1월" {
-                monthChangeButton(direction: -1, systemName: "chevron.left")
-            } else {
-                Spacer()
-            }
-            
-            Spacer().frame(minWidth: 100)
-            
-            Text(viewModel.currentYearMonth)
+    @Binding var isDatePickerPresented: Bool
+    
+    var body: some View {
+        HStack(spacing: 4) {
+            Text(currentYearMonth)
                 .font(.Medium16)
                 .foregroundColor(Color.Gray500)
                 .environment(\.sizeCategory, .large)
                 .lineLimit(1)
             
-            Spacer().frame(minWidth: 100)
-            
-            if viewModel.currentYearMonth != "2025년 2월" {
-                monthChangeButton(direction: 1, systemName: "chevron.right")
-            } else {
-                Spacer()
-            }
+            Image(isDatePickerPresented ? "polygon-up" : "polygon-down")
+                .resizable()
+                .aspectRatio(contentMode: .fit)
+                .frame(width: 16, height: 14)
         }
         .padding(.horizontal, 24)
-    }
-    
-    // MARK: 학사일정 화면 월 이동 버튼
-    private func monthChangeButton(direction: Int, systemName: String) -> some View {
-        Button(action: {
-            viewModel.changeMonth(by: direction)
-        }) {
-            Image(systemName: systemName)
-                .resizable()
-                .frame(width: 12, height: 20)
-                .foregroundColor(Color.blue300)
+        .onTapGesture {
+            isDatePickerPresented.toggle()
         }
     }
+}
+
+struct SchedulesListView: View {
+    let schedules: [Schedule]
+    let loadScheduleData: () -> Void
     
-    // MARK: 학사일정 화면 일정 리스트 뷰
-    private var SchedulesListView: some View {
+    var body: some View {
         ScrollView {
             VStack(spacing: 0) {
-                ForEach(viewModel.schedules) { schedule in
+                ForEach(schedules) { schedule in
                     ScheduleSingleView(for: schedule)
                 }
             }
         }
         .refreshable {
-            viewModel.loadScheduleData()
+            loadScheduleData()
         }
     }
+}
+
+struct ScheduleSingleView: View {
+    let schedule: Schedule
+    
+    init(for schedule: Schedule) {
+        self.schedule = schedule
+    }
     
-    private func ScheduleSingleView(for schedule: Schedule) -> some View {
+    var body: some View {
         VStack {
             HStack {
                 Text(schedule.scheduleDisplay)
@@ -126,7 +118,7 @@ struct ScheduleView: View {
                 Text(schedule.detail)
                     .font(.SemiBold14)
                     .foregroundColor(Color.Gray500)
-                    .multilineTextAlignment(.center)
+                    .multilineTextAlignment(.trailing)
                     .lineLimit(nil)
                     .environment(\.sizeCategory, .large)
             }
@@ -141,6 +133,30 @@ struct ScheduleView: View {
     }
 }
 
+struct ScheduleLoadingFailedView: View {
+    let loadScheduleData: () -> Void
+    
+    var body: some View {
+        VStack(alignment: .center) {
+            Text("학사일정을 불러오지 못했어요")
+                .font(.SemiBold20)
+                .foregroundColor(Color.Gray600)
+                .environment(\.sizeCategory, .large)
+                .padding(.bottom, 12)
+            Text("네트워크 상태를 확인한 후,\n새로고침 버튼을 눌러 페이지를 불러올 수 있어요.")
+                .font(.Medium16)
+                .foregroundColor(Color.Gray400)
+                .environment(\.sizeCategory, .large)
+                .padding(.bottom, 28)
+            CustomButton(title: "새로고침", action: {
+                loadScheduleData()
+            }, isEnabled: true)
+        }
+        .multilineTextAlignment(.center)
+    }
+}
+
+
 #Preview {
     ScheduleView(viewModel: ScheduleViewModel())
 }
diff --git a/DMU-iOS/DMU-iOS/Resources/Assets.xcassets/polygon-down.imageset/Contents.json b/DMU-iOS/DMU-iOS/Resources/Assets.xcassets/polygon-down.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "polygon-down.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DMU-iOS/DMU-iOS/Resources/Assets.xcassets/polygon-down.imageset/polygon-down.png b/DMU-iOS/DMU-iOS/Resources/Assets.xcassets/polygon-down.imageset/polygon-down.png
diff --git a/DMU-iOS/DMU-iOS/Resources/Assets.xcassets/polygon-up.imageset/Contents.json b/DMU-iOS/DMU-iOS/Resources/Assets.xcassets/polygon-up.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "polygon-up.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DMU-iOS/DMU-iOS/Resources/Assets.xcassets/polygon-up.imageset/polygon-up.png b/DMU-iOS/DMU-iOS/Resources/Assets.xcassets/polygon-up.imageset/polygon-up.png
