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

color improvements and implementing the cancel callback

Browse Source
This commit is contained in:
Mauro Romito
2022-10-11 19:58:22 +02:00
parent 9a7900fe3a
commit 516ab24c37
5 changed files with 95 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotSwiftUI/Modules/Room/Composer/Model/ComposerModels.swift
+10
View File
@@ -95,3 +95,13 @@ extension FormatType {
}
}
}
enum ComposerViewAction {
case cancel
}
enum ComposerViewModelResult {
case cancel
}
RiotSwiftUI/Modules/Room/Composer/Model/ComposerViewState.swift
+22
View File
@@ -19,4 +19,26 @@ import Foundation
struct ComposerViewState: BindableState {
var eventSenderDisplayName: String?
var sendMode: RoomInputToolbarViewSendMode = .send
var shouldDisplayContext: Bool {
return sendMode == .edit || sendMode == .reply
}
var contextDescription: String? {
switch sendMode {
case .reply:
guard let eventSenderDisplayName = eventSenderDisplayName else { return nil }
return VectorL10n.roomMessageReplyingTo(eventSenderDisplayName)
case .edit: return VectorL10n.roomMessageEditing
default: return nil
}
}
var contextImageName: String? {
switch sendMode {
case .edit: return Asset.Images.inputEditIcon.name
case .reply: return Asset.Images.inputEditIcon.name
default: return nil
}
}
}
RiotSwiftUI/Modules/Room/Composer/View/Composer.swift
+47 -26
View File
@@ -30,6 +30,7 @@ struct Composer: View {
@State private var showSendButton = false
private let horizontalPadding: CGFloat = 12
private let borderHeight: CGFloat = 44
private let minTextViewHeight: CGFloat = 20
private var verticalPadding: CGFloat {
@@ -50,31 +51,53 @@ struct Composer: View {
VStack {
let rect = RoundedRectangle(cornerRadius: borderHeight / 2)
// TODO: Fix maximise animation bugs before re-enabling
// ZStack(alignment: .topTrailing) {
WysiwygComposerView(
content: wysiwygViewModel.content,
replaceText: wysiwygViewModel.replaceText,
select: wysiwygViewModel.select,
didUpdateText: wysiwygViewModel.didUpdateText
)
.textColor(theme.colors.primaryContent)
.frame(height: wysiwygViewModel.idealHeight)
.padding(.horizontal, 12)
.onAppear {
wysiwygViewModel.setup()
// ZStack(alignment: .topTrailing) {
VStack {
if viewModel.viewState.shouldDisplayContext {
HStack {
if let imageName = viewModel.viewState.contextImageName {
Image(imageName)
.foregroundColor(theme.colors.secondaryContent)
}
if let contextDescription = viewModel.viewState.contextDescription {
Text(contextDescription)
.foregroundColor(theme.colors.secondaryContent)
}
Spacer()
Button {
viewModel.send(viewAction: .cancel)
} label: {
Image(Asset.Images.inputCloseIcon.name)
.foregroundColor(theme.colors.secondaryContent)
}
}
.padding(.horizontal, horizontalPadding)
}
WysiwygComposerView(
content: wysiwygViewModel.content,
replaceText: wysiwygViewModel.replaceText,
select: wysiwygViewModel.select,
didUpdateText: wysiwygViewModel.didUpdateText
)
.textColor(theme.colors.primaryContent)
.frame(height: wysiwygViewModel.idealHeight)
.padding(.horizontal, horizontalPadding)
.onAppear {
wysiwygViewModel.setup()
}
// Button {
// withAnimation(.easeInOut(duration: 0.25)) {
// viewModel.maximised.toggle()
// }
// } label: {
// Image(viewModel.maximised ? Asset.Images.minimiseComposer.name : Asset.Images.maximiseComposer.name)
// .foregroundColor(theme.colors.tertiaryContent)
// }
// .padding(.top, 4)
// .padding(.trailing, 12)
// }
.padding(.vertical, verticalPadding)
}
// Button {
// withAnimation(.easeInOut(duration: 0.25)) {
// viewModel.maximised.toggle()
// }
// } label: {
// Image(viewModel.maximised ? Asset.Images.minimiseComposer.name : Asset.Images.maximiseComposer.name)
// .foregroundColor(theme.colors.tertiaryContent)
// }
// .padding(.top, 4)
// .padding(.trailing, 12)
// }
.padding(.vertical, verticalPadding)
.clipShape(rect)
.overlay(rect.stroke(theme.colors.quinaryContent, lineWidth: 2))
.padding(.horizontal, 12)
@@ -137,8 +160,6 @@ struct Composer_Previews: PreviewProvider {
}
}
enum ComposerViewAction {}
enum ComposerCreateActionListViewAction {
case selectAction(ComposerCreateAction)
}
RiotSwiftUI/Modules/Room/Composer/ViewModel/ComposerViewModel.swift
+15
View File
@@ -19,6 +19,14 @@ import SwiftUI
typealias ComposerViewModelType = StateStoreViewModel<ComposerViewState, ComposerViewAction>
class ComposerViewModel: ComposerViewModelType, ComposerViewModelProtocol {
// MARK: - Properties
// MARK: Private
// MARK: Public
var callback: ((ComposerViewModelResult) -> Void)?
// MARK: - Public
func setSendMode(_ sendMode: RoomInputToolbarViewSendMode) {
state.sendMode = sendMode
}
@@ -26,4 +34,11 @@ class ComposerViewModel: ComposerViewModelType, ComposerViewModelProtocol {
func setEventSenderDisplayName(_ eventSenderDisplayName: String?) {
state.eventSenderDisplayName = eventSenderDisplayName
}
override func process(viewAction: ComposerViewAction) {
switch viewAction {
case .cancel:
callback?(.cancel)
}
}
}
RiotSwiftUI/Modules/Room/Composer/ViewModel/ComposerViewModelProtocol.swift
+1
View File
@@ -18,6 +18,7 @@ import Foundation
protocol ComposerViewModelProtocol {
var context: ComposerViewModelType.Context { get }
var callback: ((ComposerViewModelResult) -> Void)? { get set }
func setSendMode(_ sendMode: RoomInputToolbarViewSendMode)
func setEventSenderDisplayName(_ eventSenderDisplayName: String?)