Skip to content

version 1.1.1 #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sim-hs wants to merge 1 commit into
base: main
Choose a base branch
from
Open

version 1.1.1 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions iOS-TicketTimer.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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";
Expand All @@ -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";
Expand All @@ -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";
Expand Down
9 changes: 5 additions & 4 deletions iOS-TicketTimer/Presentation/CalendarScene/View/CalendarViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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)
Expand All @@ -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 {
Expand Down
3 changes: 3 additions & 0 deletions iOS-TicketTimer/Presentation/AlarmScene/ViewModel/AlarmViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ class AlarmViewModel {
var alarmId: String?
var notice: MusicalNotice?
var savedLocalAlarms = [LocalAlarm]()
var savedDate: Date?

let input = Input()
let output = Output()
Expand Down Expand Up @@ -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)
Expand Down