felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-18 15:38:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

vector-im/element-ios/issues/5114 - Various tweaks following PR review.

Browse Source
This commit is contained in:
Stefan Ceriu
2022-01-14 17:02:04 +02:00
committed by Stefan Ceriu
parent bf6ef2bce2
commit d7e9fe61b4
14 changed files with 102 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RiotSwiftUI/Modules/Room/PollEditForm/View/PollEditForm.swift
View File

@@ -35,7 +35,7 @@ struct PollEditForm: View {
ScrollView {
VStack(alignment: .leading, spacing: 32.0) {
PollEditFormTypeView(selectedType: $viewModel.type)
PollEditFormTypePicker(selectedType: $viewModel.type)
VStack(alignment: .leading, spacing: 16.0) {
Text(VectorL10n.pollEditFormPollQuestionOrTopic)

4
RiotSwiftUI/Modules/Room/PollEditForm/View/PollEditFormAnswerOptionView.swift
View File

@@ -39,9 +39,7 @@ struct PollEditFormAnswerOptionView: View {
self.focused = edit
})
.textFieldStyle(BorderedInputFieldStyle(theme: _theme, isEditing: focused))
Button {
onDelete()
} label: {
Button(action: onDelete) {
Image(uiImage:Asset.Images.pollDeleteOptionIcon.image)
}
.accessibilityIdentifier("Delete answer option")

44
RiotSwiftUI/Modules/Room/PollEditForm/View/PollEditFormTypeView.swift → RiotSwiftUI/Modules/Room/PollEditForm/View/PollEditFormTypePicker.swift
View File

@@ -17,28 +17,28 @@
import SwiftUI
@available(iOS 14.0, *)
struct PollEditFormTypeView: View {
struct PollEditFormTypePicker: View {
@Environment(\.theme) private var theme: ThemeSwiftUI
@Binding var selectedType: PollEditFormType
@Binding var selectedType: EditFormPollType
var body: some View {
VStack(alignment: .leading, spacing: 16.0) {
Text(VectorL10n.pollEditFormPollType)
.font(theme.fonts.title3SB)
.foregroundColor(theme.colors.primaryContent)
PollTypeViewButton(type: .disclosed, selectedType: $selectedType)
PollTypeViewButton(type: .undisclosed, selectedType: $selectedType)
PollEditFormTypeButton(type: .disclosed, selectedType: $selectedType)
PollEditFormTypeButton(type: .undisclosed, selectedType: $selectedType)
}
}
}
@available(iOS 14.0, *)
private struct PollTypeViewButton: View {
private struct PollEditFormTypeButton: View {
@Environment(\.theme) private var theme: ThemeSwiftUI
var type: PollEditFormType
@Binding var selectedType: PollEditFormType
let type: EditFormPollType
@Binding var selectedType: EditFormPollType
var body: some View {
Button {
@@ -46,11 +46,7 @@ private struct PollTypeViewButton: View {
} label: {
HStack(alignment: .top, spacing: 8.0) {
if type == selectedType {
Image(uiImage: Asset.Images.pollTypeCheckboxSelected.image)
} else {
Image(uiImage: Asset.Images.pollTypeCheckboxDefault.image)
}
Image(uiImage: selectionImage)
VStack(alignment: .leading, spacing: 2) {
Text(title)
@@ -81,14 +77,22 @@ private struct PollTypeViewButton: View {
return VectorL10n.pollEditFormPollTypeClosedDescription
}
}
}
@available(iOS 14.0, *)
struct PollEditFormTypeView_Previews: PreviewProvider {
static var previews: some View {
VStack {
PollEditFormTypeView(selectedType: Binding.constant(.disclosed))
PollEditFormTypeView(selectedType: Binding.constant(.undisclosed))
private var selectionImage: UIImage {
if type == selectedType {
return Asset.Images.pollTypeCheckboxSelected.image
} else {
return Asset.Images.pollTypeCheckboxDefault.image
}
}
}
@available(iOS 14.0, *)
struct PollEditFormTypePicker_Previews: PreviewProvider {
static var previews: some View {
VStack {
PollEditFormTypePicker(selectedType: Binding.constant(.disclosed))
PollEditFormTypePicker(selectedType: Binding.constant(.undisclosed))
}
}
}