Skip to content
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

Accessibility - Teacher - Calendar - Font size on Edit Event screen #3061

Closed
wants to merge 9 commits into from
Closed

Accessibility - Teacher - Calendar - Font size on Edit Event screen #3061

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
34c284f
refs: MBL-18306
ndrsszsz Jan 14, 2025
b0cff13
swiftlint
ndrsszsz Jan 14, 2025
2f4ab50
requested changes - use ViewThatFits
ndrsszsz Jan 28, 2025
8b92aef
requested changes - update EditCalendarToDoScreen and EditCustomFrequ…
ndrsszsz Jan 28, 2025
3cc591b
requested changes - remove unnecessary stuff
ndrsszsz Jan 28, 2025
d1a380d
requested changes - remove unnecessary stuff
ndrsszsz Jan 28, 2025
8348eaf
requested changes
ndrsszsz Jan 28, 2025
4a00df7
requested changes
ndrsszsz Jan 28, 2025
aed0fe8
requested changes - add maxWidth
ndrsszsz Jan 28, 2025
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
28 changes: 20 additions & 8 deletions Core/Core/Common/CommonUI/InstUI/Views/Cells/DatePickerCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,27 @@ extension InstUI {
public var body: some View {
VStack(spacing: 0) {
HStack(spacing: InstUI.Styles.Padding.standard.rawValue) {
label
.textStyle(.cellLabel)

if date != nil {
datePicker
if dynamicTypeSize > .accessibility3 {
Copy link
Contributor

@rh12 rh12 Jan 24, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This limit seems arbitrary to me, but not sure whether is there a proper way to check when would we extend the screen size.
What happens when we have the clear button?

Not sure this works here, but may worth to look into ViewThatFits.

If that fails, what do you think about another way, to add a geometry: GeometryProxy to DatePickerCell and add .frame(maxWidth: geometry.size.width) in there, in place of the .lineLimit(0).
It's less pretty but maybe less hacky as well. The label may disappear in certain conditions, so this is also not a perfect solution.
We could discuss it briefly with the others on Monday.

Please update the other screens which uses this cell as well (EditCalendarToDoScreen, EditCustomFrequencyScreen)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should definitely check ViewThatFits since that's the way Apple proposes for such use cases.

VStack(alignment: .leading) {
label
.textStyle(.cellLabel)

if date != nil {
datePicker
} else {
placeholderButtons
}
}
} else {
placeholderButtons
label
.textStyle(.cellLabel)

if date != nil {
datePicker
} else {
placeholderButtons
}
}

if isClearable {
clearButton
}
Expand Down Expand Up @@ -105,7 +117,7 @@ extension InstUI {
in: validFrom...validUntil,
displayedComponents: components,
label: {}
)
).lineLimit(0)
}

private var components: DatePicker<Label>.Components {
Expand Down
1 change: 1 addition & 0 deletions Core/Core/Features/Planner/CalendarEvent/View/EditCalendarEventScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ struct EditCalendarEventScreen: View, ScreenViewTrackable {
.id("details")
.focused($focusedInput, equals: .details)
}
.frame(maxWidth: geometry.size.width)
.animation(.default, value: viewModel.isAllDay)

// defocus inputs when otherwise non-tappable area is tapped
Expand Down