From 4fa2d923821779aa6b548d236f1ad052b7c99ec2 Mon Sep 17 00:00:00 2001 From: QuentinArguillere Date: Thu, 19 Sep 2024 14:29:50 +0200 Subject: [PATCH] Remove "all day meeting" option in meeting scheduling --- .../Fragments/ScheduleMeetingFragment.swift | 78 ++++++------------- .../Meetings/ViewModel/MeetingViewModel.swift | 4 +- 2 files changed, 24 insertions(+), 58 deletions(-) diff --git a/Linphone/UI/Main/Meetings/Fragments/ScheduleMeetingFragment.swift b/Linphone/UI/Main/Meetings/Fragments/ScheduleMeetingFragment.swift index 4b9bf8e31..59e18b074 100644 --- a/Linphone/UI/Main/Meetings/Fragments/ScheduleMeetingFragment.swift +++ b/Linphone/UI/Main/Meetings/Fragments/ScheduleMeetingFragment.swift @@ -132,63 +132,31 @@ struct ScheduleMeetingFragment: View { Spacer() }.padding(.bottom, -5) - if !meetingViewModel.allDayMeeting { - HStack(spacing: 10) { - Text(meetingViewModel.fromTime) - .fontWeight(.bold) - .padding(.leading, 50) - .frame(height: 29, alignment: .leading) - .default_text_style_500(styleSize: 16) - .opacity(meetingViewModel.allDayMeeting ? 0 : 1) - .onTapGesture { - setFromDate = true - selectedDate = meetingViewModel.fromDate - showTimePicker.toggle() - } - Text(meetingViewModel.toTime) - .fontWeight(.bold) - .padding(.leading, 10) - .frame(height: 29, alignment: .leading) - .default_text_style_500(styleSize: 16) - .opacity(meetingViewModel.allDayMeeting ? 0 : 1) - .onTapGesture { - setFromDate = false - selectedDate = meetingViewModel.toDate - showTimePicker.toggle() - } - Spacer() - Toggle("", isOn: $meetingViewModel.allDayMeeting) - .labelsHidden() - .tint(Color.orangeMain300) - Text("All day") - .default_text_style_500(styleSize: 16) - .padding(.trailing, 15) - } - } else { - HStack(alignment: .center, spacing: 10) { - Image("clock") - .renderingMode(.template) - .resizable() - .foregroundStyle(Color.grayMain2c800) - .frame(width: 24, height: 24) - .padding(.leading, 15) - Text(meetingViewModel.toDateStr) - .fontWeight(.bold) - .default_text_style_500(styleSize: 16) - .onTapGesture { - setFromDate = false - selectedDate = meetingViewModel.toDate - showDatePicker.toggle() - } - Spacer() - Toggle("", isOn: $meetingViewModel.allDayMeeting) - .labelsHidden() - .tint(Color.orangeMain300) - Text("All day") - .default_text_style_500(styleSize: 16) - .padding(.trailing, 15) } + HStack(spacing: 10) { + Text(meetingViewModel.fromTime) + .fontWeight(.bold) + .padding(.leading, 50) + .frame(height: 29, alignment: .leading) + .default_text_style_500(styleSize: 16) + .onTapGesture { + setFromDate = true + selectedDate = meetingViewModel.fromDate + showTimePicker.toggle() + } + Text(meetingViewModel.toTime) + .fontWeight(.bold) + .padding(.leading, 10) + .frame(height: 29, alignment: .leading) + .default_text_style_500(styleSize: 16) + .onTapGesture { + setFromDate = false + selectedDate = meetingViewModel.toDate + showTimePicker.toggle() + } + Spacer() } + HStack(alignment: .center, spacing: 10) { Image("earth") .renderingMode(.template) diff --git a/Linphone/UI/Main/Meetings/ViewModel/MeetingViewModel.swift b/Linphone/UI/Main/Meetings/ViewModel/MeetingViewModel.swift index 7a012a95b..a41279957 100644 --- a/Linphone/UI/Main/Meetings/ViewModel/MeetingViewModel.swift +++ b/Linphone/UI/Main/Meetings/ViewModel/MeetingViewModel.swift @@ -31,7 +31,6 @@ class MeetingViewModel: ObservableObject { @Published var showBroadcastHelp: Bool = false @Published var subject: String = "" @Published var description: String = "" - @Published var allDayMeeting: Bool = false @Published var fromDateStr: String = "" @Published var fromTime: String = "" @Published var toDateStr: String = "" @@ -80,7 +79,6 @@ class MeetingViewModel: ObservableObject { showBroadcastHelp = false subject = "" description = "" - allDayMeeting = false sendInvitations = true participants = [] operationInProgress = false @@ -122,7 +120,7 @@ class MeetingViewModel: ObservableObject { func getFullDateString() -> String { let formatter = DateFormatter() formatter.dateFormat = "EEE d MMM yyyy" - return "\(formatter.string(from: fromDate)) | \(allDayMeeting ? "All day" : "\(fromTime) - \(toTime)")" + return "\(formatter.string(from: fromDate)) | \(fromTime) - \(toTime)" } func addParticipants(participantsToAdd: [SelectedAddressModel]) {