From 3c8af144956e3ead989a82e0f81a375ee01d48a0 Mon Sep 17 00:00:00 2001 From: Christophe Deschamps Date: Wed, 2 Nov 2022 20:27:20 +0100 Subject: [PATCH] Conference subject hint changing if groupcall or meeting --- .../Views/ConferenceSchedulingView.swift | 3 ++- Classes/Swift/Voip/Theme/VoipTexts.swift | 1 + .../Swift/Voip/Widgets/StyledTextView.swift | 11 +++++++++++ Resources/fr.lproj/Localizable.strings | Bin 72370 -> 72472 bytes 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Classes/Swift/Conference/Views/ConferenceSchedulingView.swift b/Classes/Swift/Conference/Views/ConferenceSchedulingView.swift index ae2bd1da0..52768af0b 100644 --- a/Classes/Swift/Conference/Views/ConferenceSchedulingView.swift +++ b/Classes/Swift/Conference/Views/ConferenceSchedulingView.swift @@ -35,6 +35,7 @@ import IQKeyboardManager let durationValue = StyledValuePicker(liveIndex: ConferenceSchedulingViewModel.shared.scheduledDuration,options: ConferenceSchedulingViewModel.durationList.map({ (duration: Duration) -> String in duration.display})) let timePicker = StyledDatePicker(liveValue: ConferenceSchedulingViewModel.shared.scheduledDateTime,pickerMode: .time) let descriptionInput = StyledTextView(VoipTheme.conference_scheduling_font, placeHolder:VoipTexts.conference_schedule_description_hint,liveValue: ConferenceSchedulingViewModel.shared.description) + let subjectInput = StyledTextView(VoipTheme.conference_scheduling_font, placeHolder:VoipTexts.conference_schedule_subject_hint, liveValue: ConferenceSchedulingViewModel.shared.subject,maxLines:1) override func viewDidLoad() { @@ -53,7 +54,6 @@ import IQKeyboardManager contentView.addSubview(subjectLabel) subjectLabel.alignParentLeft(withMargin: form_margin).alignParentTop().done() - let subjectInput = StyledTextView(VoipTheme.conference_scheduling_font, placeHolder:VoipTexts.conference_schedule_subject_hint, liveValue: ConferenceSchedulingViewModel.shared.subject,maxLines:1) contentView.addSubview(subjectInput) subjectInput.alignUnder(view: subjectLabel,withMargin: form_margin).matchParentSideBorders(insetedByDx: form_margin).height(form_input_height).done() @@ -196,6 +196,7 @@ import IQKeyboardManager // Schedule for later observer ConferenceSchedulingViewModel.shared.scheduleForLater.readCurrentAndObserve { (forLater) in + self.subjectInput.setPlaceHolder(phText: forLater == true ? VoipTexts.conference_schedule_subject_hint : VoipTexts.conference_group_call_subject_hint) scheduleForm.isHidden = forLater != true super.titleLabel.text = forLater == true ? ConferenceSchedulingViewModel.shared.existingConfInfo.value != nil ? VoipTexts.conference_schedule_edit : VoipTexts.conference_schedule_title : VoipTexts.conference_group_call_title mandatoryLabel.removeConstraints().done() diff --git a/Classes/Swift/Voip/Theme/VoipTexts.swift b/Classes/Swift/Voip/Theme/VoipTexts.swift index ddfef06f0..f1ef256a1 100644 --- a/Classes/Swift/Voip/Theme/VoipTexts.swift +++ b/Classes/Swift/Voip/Theme/VoipTexts.swift @@ -126,6 +126,7 @@ import UIKit @objc static let conference_schedule_start = NSLocalizedString("Schedule meeting",comment:"") @objc static let conference_schedule_edit = NSLocalizedString("Edit meeting",comment:"") @objc static let conference_schedule_subject_hint = NSLocalizedString("Meeting subject",comment:"") + @objc static let conference_group_call_subject_hint = NSLocalizedString("Group call subject",comment:"") @objc static let conference_schedule_subject_title = NSLocalizedString("Subject",comment:"") @objc static let conference_schedule_summary = NSLocalizedString("Meeting info",comment:"") @objc static let conference_schedule_time = NSLocalizedString("Time",comment:"") diff --git a/Classes/Swift/Voip/Widgets/StyledTextView.swift b/Classes/Swift/Voip/Widgets/StyledTextView.swift index 9c7ce1f39..2230dc40d 100644 --- a/Classes/Swift/Voip/Widgets/StyledTextView.swift +++ b/Classes/Swift/Voip/Widgets/StyledTextView.swift @@ -41,6 +41,8 @@ class StyledTextView: UITextView, UITextViewDelegate { } } + + init (_ style:TextStyle, placeHolder:String? = nil, liveValue: MutableLiveData, readOnly:Bool = false, maxLines:Int = 999) { self.maxLines = maxLines self.style = style @@ -92,4 +94,13 @@ class StyledTextView: UITextView, UITextViewDelegate { liveValue?.value = textView.text } + func setPlaceHolder(phText:String) { + if text == "" || text == placeholder { + self.placeholder = phText + showPlaceHolder() + } else { + self.placeholder = phText + } + } + } diff --git a/Resources/fr.lproj/Localizable.strings b/Resources/fr.lproj/Localizable.strings index dbb507f94bbded2f7377b08893465bb997e60e1a..4004afb217172a3fac9a0810fd4373aec55469bb 100644 GIT binary patch delta 40 ycmV+@0N4MrwFH>91c0;wA`z47L=FXE0Bitkm)#HnE0f%)2$SIdBDW+F0geefq7NDX delta 17 ZcmbQSjb+nTmWC~iN`l)v1Q{oA0suc;1`q%M