felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-18 23:48:29 +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

29
RiotSwiftUI/Modules/Room/PollEditForm/Coordinator/PollEditFormCoordinator.swift
View File

@@ -39,7 +39,7 @@ final class PollEditFormCoordinator: Coordinator, Presentable {
}
// MARK: Public
var childCoordinators: [Coordinator] = []
var completion: (() -> Void)?
@@ -54,15 +54,12 @@ final class PollEditFormCoordinator: Coordinator, Presentable {
if let startEvent = parameters.pollStartEvent,
let pollContent = MXEventContentPollStart(fromJSON: startEvent.content) {
viewModel = PollEditFormViewModel(parameters: PollEditFormViewModelParameters(mode: .editing,
pollDetails: PollDetails(type: Self.pollKindKeyToDetailsType(pollContent.kind),
question: pollContent.question,
answerOptions: pollContent.answerOptions.map { $0.text })))
pollDetails: EditFormPollDetails(type: Self.pollKindKeyToDetailsType(pollContent.kind),
question: pollContent.question,
answerOptions: pollContent.answerOptions.map { $0.text })))
} else {
viewModel = PollEditFormViewModel(parameters: PollEditFormViewModelParameters(mode: .creation,
pollDetails: PollDetails(type: .disclosed,
question: "",
answerOptions: ["", ""])))
viewModel = PollEditFormViewModel(parameters: PollEditFormViewModelParameters(mode: .creation, pollDetails: .default))
}
let view = PollEditForm(viewModel: viewModel.context)
@@ -140,7 +137,7 @@ final class PollEditFormCoordinator: Coordinator, Presentable {
// MARK: - Private
private func buildPollContentWithDetails(_ details: PollDetails) -> MXEventContentPollStart {
private func buildPollContentWithDetails(_ details: EditFormPollDetails) -> MXEventContentPollStart {
var options = [MXEventContentPollStartAnswerOption]()
for answerOption in details.answerOptions {
options.append(MXEventContentPollStartAnswerOption(uuid: UUID().uuidString, text: answerOption))
@@ -153,17 +150,17 @@ final class PollEditFormCoordinator: Coordinator, Presentable {
}
private static func pollDetailsTypeToKindKey(_ type: PollEditFormType) -> String {
let mapping = [PollEditFormType.disclosed : kMXMessageContentKeyExtensiblePollKindDisclosed,
PollEditFormType.undisclosed : kMXMessageContentKeyExtensiblePollKindUndisclosed]
private static func pollDetailsTypeToKindKey(_ type: EditFormPollType) -> String {
let mapping = [EditFormPollType.disclosed : kMXMessageContentKeyExtensiblePollKindDisclosed,
EditFormPollType.undisclosed : kMXMessageContentKeyExtensiblePollKindUndisclosed]
return mapping[type] ?? kMXMessageContentKeyExtensiblePollKindDisclosed
}
private static func pollKindKeyToDetailsType(_ key: String) -> PollEditFormType {
let mapping = [kMXMessageContentKeyExtensiblePollKindDisclosed : PollEditFormType.disclosed,
kMXMessageContentKeyExtensiblePollKindUndisclosed : PollEditFormType.undisclosed]
private static func pollKindKeyToDetailsType(_ key: String) -> EditFormPollType {
let mapping = [kMXMessageContentKeyExtensiblePollKindDisclosed : EditFormPollType.disclosed,
kMXMessageContentKeyExtensiblePollKindUndisclosed : EditFormPollType.undisclosed]
return mapping[key] ?? PollEditFormType.disclosed
return mapping[key] ?? EditFormPollType.disclosed
}
}

24
RiotSwiftUI/Modules/Room/PollEditForm/PollEditFormModels.swift
View File

@@ -17,11 +17,20 @@
import Foundation
import SwiftUI
struct PollDetails {
let type: PollEditFormType
enum EditFormPollType {
case disclosed
case undisclosed
}
struct EditFormPollDetails {
let type: EditFormPollType
let question: String
let answerOptions: [String]
let maxSelections: UInt = 1
static var `default`: EditFormPollDetails {
EditFormPollDetails(type: .disclosed, question: "", answerOptions: ["", ""])
}
}
enum PollEditFormMode {
@@ -45,13 +54,8 @@ enum PollEditFormViewAction {
enum PollEditFormViewModelResult {
case cancel
case create(PollDetails)
case update(PollDetails)
}
enum PollEditFormType {
case disclosed
case undisclosed
case create(EditFormPollDetails)
case update(EditFormPollDetails)
}
struct PollEditFormQuestion {
@@ -96,7 +100,7 @@ struct PollEditFormViewState: BindableState {
struct PollEditFormViewStateBindings {
var question: PollEditFormQuestion
var answerOptions: [PollEditFormAnswerOption]
var type: PollEditFormType
var type: EditFormPollType
var alertInfo: PollEditFormErrorAlertInfo?
}

5
RiotSwiftUI/Modules/Room/PollEditForm/PollEditFormScreenState.swift
View File

@@ -26,10 +26,7 @@ enum MockPollEditFormScreenState: MockScreenState, CaseIterable {
}
var screenView: ([Any], AnyView) {
let viewModel = PollEditFormViewModel(parameters: PollEditFormViewModelParameters(mode: .creation,
pollDetails: PollDetails(type: .disclosed,
question: "",
answerOptions: ["", ""])))
let viewModel = PollEditFormViewModel(parameters: PollEditFormViewModelParameters(mode: .creation, pollDetails: .default))
return ([viewModel], AnyView(PollEditForm(viewModel: viewModel.context)))
}
}

8
RiotSwiftUI/Modules/Room/PollEditForm/PollEditFormViewModel.swift
View File

@@ -19,7 +19,7 @@ import Combine
struct PollEditFormViewModelParameters {
let mode: PollEditFormMode
let pollDetails: PollDetails
let pollDetails: EditFormPollDetails
}
@available(iOS 14, *)
@@ -97,7 +97,7 @@ class PollEditFormViewModel: PollEditFormViewModelType {
title: VectorL10n.pollEditFormPostFailureTitle,
subtitle: VectorL10n.pollEditFormPostFailureSubtitle)
case .failedUpdatingPoll:
state.bindings.alertInfo = PollEditFormErrorAlertInfo(id: .failedCreatingPoll,
state.bindings.alertInfo = PollEditFormErrorAlertInfo(id: .failedUpdatingPoll,
title: VectorL10n.pollEditFormUpdateFailureTitle,
subtitle: VectorL10n.pollEditFormUpdateFailureSubtitle)
case .none:
@@ -109,8 +109,8 @@ class PollEditFormViewModel: PollEditFormViewModelType {
// MARK: - Private
private func buildPollDetails() -> PollDetails {
return PollDetails(type: state.bindings.type,
private func buildPollDetails() -> EditFormPollDetails {
return EditFormPollDetails(type: state.bindings.type,
question: state.bindings.question.text.trimmingCharacters(in: .whitespacesAndNewlines),
answerOptions: state.bindings.answerOptions.compactMap({ answerOption in
let text = answerOption.text.trimmingCharacters(in: .whitespacesAndNewlines)

3
RiotSwiftUI/Modules/Room/PollEditForm/Test/Unit/PollEditFormViewModelTests.swift
View File

@@ -26,8 +26,7 @@ class PollEditFormViewModelTests: XCTestCase {
var cancellables = Set<AnyCancellable>()
override func setUpWithError() throws {
viewModel = PollEditFormViewModel(parameters: PollEditFormViewModelParameters(mode: .creation,
pollDetails: PollDetails(type: .disclosed, question: "", answerOptions: ["", ""])))
viewModel = PollEditFormViewModel(parameters: PollEditFormViewModelParameters(mode: .creation, pollDetails: .default))
context = viewModel.context
}

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))
}
}
}