IntenseFinance/simplex-chat
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mobile: group welcome message to fill max width (#2480)

Browse Source 
* mobile: group welcome message to fill max width

* not limiting preview height

* min height, no scroll

---------

Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
This commit is contained in:
spaced4ndy 2023-05-23 14:31:43 +04:00 committed by GitHub
parent dc73bb3caf
commit f4861482f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/android/app/src/main/java/chat/simplex/app/views/chat/group/WelcomeMessageView.kt
View File

@ -114,12 +114,8 @@ private fun GroupWelcomeLayout(
@Composable @Composable
private fun TextPreview(text: String, linkMode: SimplexLinkMode, markdown: Boolean = true) { private fun TextPreview(text: String, linkMode: SimplexLinkMode, markdown: Boolean = true) {
Column( Column {
Modifier.height(140.dp) SelectionContainer(Modifier.fillMaxWidth()) {
) {
SelectionContainer(
Modifier.verticalScroll(rememberScrollState())
) {
MarkdownText( MarkdownText(
text, text,
formattedText = if (markdown) remember(text) { parseToMarkdown(text) } else null, formattedText = if (markdown) remember(text) { parseToMarkdown(text) } else null,

9
apps/ios/Shared/Views/Chat/Group/GroupWelcomeView.swift
View File

@ -53,10 +53,10 @@ struct GroupWelcomeView: View {
} }
private func textPreview() -> some View { private func textPreview() -> some View {
ScrollView { messageText(welcomeText, parseSimpleXMarkdown(welcomeText), nil)
messageText(welcomeText, parseSimpleXMarkdown(welcomeText), nil) .allowsHitTesting(false)
.allowsHitTesting(false) .frame(minHeight: 140, alignment: .topLeading)
} .frame(maxWidth: .infinity, alignment: .leading)
} }
private func editorView() -> some View { private func editorView() -> some View {
@ -80,7 +80,6 @@ struct GroupWelcomeView: View {
} }
} else { } else {
textPreview() textPreview()
.frame(height: 140, alignment: .topLeading)
} }
Button { Button {