diff --git a/iOS-TicketTimer.xcodeproj/project.pbxproj b/iOS-TicketTimer.xcodeproj/project.pbxproj index cc90095..36e0120 100644 --- a/iOS-TicketTimer.xcodeproj/project.pbxproj +++ b/iOS-TicketTimer.xcodeproj/project.pbxproj @@ -1183,7 +1183,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = "iOS-TicketTimer/iOS-TicketTimer.entitlements"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 202311241; DEVELOPMENT_TEAM = 89BLGRU39K; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = "iOS-TicketTimer/Info.plist"; @@ -1197,7 +1197,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 1.1.1; PRODUCT_BUNDLE_IDENTIFIER = "com.Ticket-Timer"; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1217,7 +1217,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = "iOS-TicketTimer/iOS-TicketTimer.entitlements"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 202311241; DEVELOPMENT_TEAM = 89BLGRU39K; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = "iOS-TicketTimer/Info.plist"; @@ -1231,7 +1231,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 1.1.1; PRODUCT_BUNDLE_IDENTIFIER = "com.Ticket-Timer"; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; diff --git "a/iOS-TicketTimer/Presentation/\020CalendarScene/View/CalendarViewController.swift" "b/iOS-TicketTimer/Presentation/\020CalendarScene/View/CalendarViewController.swift" index b9bd906..1e32e6d 100644 --- "a/iOS-TicketTimer/Presentation/\020CalendarScene/View/CalendarViewController.swift" +++ "b/iOS-TicketTimer/Presentation/\020CalendarScene/View/CalendarViewController.swift" @@ -37,13 +37,13 @@ class CalendarViewController: UIViewController { super.viewDidLoad() setAtt() setLayout() - - input.getCalendarAllEvent.onNext(()) - input.getCalendarAlarmSections.onNext(Date()) } override func viewWillAppear(_ animated: Bool) { navigationItem.title = "캘린더" + + input.getCalendarAllEvent.onNext(()) + input.getCalendarAlarmSections.onNext(Date()) } private func setAtt() { @@ -243,7 +243,7 @@ extension CalendarViewController: FSCalendarDelegate, FSCalendarDataSource { func calendar(_ calendar: FSCalendar, boundingRectWillChange bounds: CGRect, animated: Bool) { monthlyCalendar.snp.updateConstraints { - $0.height.equalTo(320) + $0.height.equalTo(300) } weeklyCalendar.snp.updateConstraints { $0.height.equalTo(80) @@ -253,6 +253,7 @@ extension CalendarViewController: FSCalendarDelegate, FSCalendarDataSource { func calendar(_ calendar: FSCalendar, didSelect date: Date, at monthPosition: FSCalendarMonthPosition) { input.getCalendarAlarmSections.onNext(date) + viewModel.savedDate = date } func calendar(_ calendar: FSCalendar, numberOfEventsFor date: Date) -> Int { diff --git a/iOS-TicketTimer/Presentation/AlarmScene/ViewModel/AlarmViewModel.swift b/iOS-TicketTimer/Presentation/AlarmScene/ViewModel/AlarmViewModel.swift index 3e92a7a..4915582 100644 --- a/iOS-TicketTimer/Presentation/AlarmScene/ViewModel/AlarmViewModel.swift +++ b/iOS-TicketTimer/Presentation/AlarmScene/ViewModel/AlarmViewModel.swift @@ -18,6 +18,7 @@ class AlarmViewModel { var alarmId: String? var notice: MusicalNotice? var savedLocalAlarms = [LocalAlarm]() + var savedDate: Date? let input = Input() let output = Output() @@ -153,6 +154,8 @@ class AlarmViewModel { guard let notice = self.notice else { return } self.alarmService.updateNoticeAlarms(savedLocalAlarms: self.savedLocalAlarms, notice: notice, newAlarmTimes: newTimes) { self.input.getAlarmSections.onNext(()) + self.input.getCalendarAlarmSections.onNext(self.savedDate ?? Date()) + self.input.getCalendarAllEvent.onNext(()) } } .disposed(by: disposeBag)