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

should now be aligned to the designs

Browse Source
This commit is contained in:
Mauro Romito
2022-10-12 14:26:38 +02:00
parent d08a1d17f5
commit b18810f196
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotSwiftUI/Modules/Room/Composer/View/Composer.swift
+8 -5
View File
@@ -36,6 +36,9 @@ struct Composer: View {
private var verticalPadding: CGFloat {
(borderHeight - minTextViewHeight) / 2
}
private var topPadding: CGFloat {
viewModel.viewState.shouldDisplayContext ? 0 : verticalPadding
}
private var cornerRadius: CGFloat {
viewModel.viewState.shouldDisplayContext ? 14 : borderHeight / 2
}
@@ -55,7 +58,7 @@ struct Composer: View {
let rect = RoundedRectangle(cornerRadius: cornerRadius)
// TODO: Fix maximise animation bugs before re-enabling
// ZStack(alignment: .topTrailing) {
VStack {
VStack(spacing: 12) {
if viewModel.viewState.shouldDisplayContext {
HStack {
if let imageName = viewModel.viewState.contextImageName {
@@ -64,7 +67,7 @@ struct Composer: View {
}
if let contextDescription = viewModel.viewState.contextDescription {
Text(contextDescription)
.font(.system(size: 12.0, weight: .medium))
.font(.system(size: 12, weight: .medium))
.foregroundColor(theme.colors.secondaryContent)
}
Spacer()
@@ -74,10 +77,9 @@ struct Composer: View {
Image(Asset.Images.inputCloseIcon.name)
.foregroundColor(theme.colors.tertiaryContent)
}
.frame(height: 30)
}
.padding(.top, 8)
.padding(.horizontal, horizontalPadding)
.padding(.bottom, -verticalPadding)
}
WysiwygComposerView(
content: wysiwygViewModel.content,
@@ -102,7 +104,8 @@ struct Composer: View {
// .padding(.top, 4)
// .padding(.trailing, 12)
// }
.padding(.vertical, verticalPadding)
.padding(.top, topPadding)
.padding(.bottom, verticalPadding)
}
.clipShape(rect)
.overlay(rect.stroke(theme.colors.quinaryContent, lineWidth: 2))