From 18d202f3bd5404fd1dc70964cc194aa1d3fa0c69 Mon Sep 17 00:00:00 2001 From: Alfonso Grillo Date: Mon, 6 Feb 2023 12:36:31 +0100 Subject: [PATCH 1/2] Improve SegmentedPicker UI --- .../PollHistory/View/SegmentedPicker.swift | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/RiotSwiftUI/Modules/Room/PollHistory/View/SegmentedPicker.swift b/RiotSwiftUI/Modules/Room/PollHistory/View/SegmentedPicker.swift index 520a649c7..14b53d644 100644 --- a/RiotSwiftUI/Modules/Room/PollHistory/View/SegmentedPicker.swift +++ b/RiotSwiftUI/Modules/Room/PollHistory/View/SegmentedPicker.swift @@ -39,7 +39,7 @@ struct SegmentedPicker: View { } label: { Text(segment.description) .font(isSelectedSegment ? theme.fonts.headline : theme.fonts.body) - .underline(isSelectedSegment) + .underlineBar(isSelectedSegment) } .accentColor(isSelectedSegment ? theme.colors.accent : theme.colors.primaryContent) .accessibilityLabel(segment.description) @@ -49,6 +49,23 @@ struct SegmentedPicker: View { } } +private extension Text { + @ViewBuilder + func underlineBar(_ isActive: Bool) -> some View { + if #available(iOS 15.0, *) { + overlay(alignment: .bottom) { + if isActive { + Rectangle() + .frame(height: 1) + .offset(y: 2) + } + } + } else { + underline(isActive) + } + } +} + struct SegmentedPicker_Previews: PreviewProvider { static var previews: some View { SegmentedPicker( From d96c7f9ec1b65c86c095a476eff778e5cca9c224 Mon Sep 17 00:00:00 2001 From: Alfonso Grillo Date: Mon, 6 Feb 2023 12:42:34 +0100 Subject: [PATCH 2/2] Add changelog.d file --- changelog.d/pr-7341.change | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/pr-7341.change diff --git a/changelog.d/pr-7341.change b/changelog.d/pr-7341.change new file mode 100644 index 000000000..2129cec32 --- /dev/null +++ b/changelog.d/pr-7341.change @@ -0,0 +1 @@ +Polls: update poll history UI.