Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: scrollable dialogs [WPB-1681] #2554

Merged
merged 1 commit into from
Dec 28, 2023
Merged

feat: scrollable dialogs [WPB-1681] #2554

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
35 changes: 21 additions & 14 deletions app/src/main/kotlin/com/wire/android/ui/common/WireDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
Expand Down Expand Up @@ -198,21 +199,27 @@ private fun WireDialogContent(
}
}
text?.let {
ClickableText(
text = text,
style = MaterialTheme.wireTypography.body01,
modifier = Modifier.padding(
top = MaterialTheme.wireDimensions.dialogTextsSpacing,
bottom = MaterialTheme.wireDimensions.dialogTextsSpacing,
),
onClick = { offset ->
text.getStringAnnotations(
tag = MarkdownConstants.TAG_URL,
start = offset,
end = offset,
).firstOrNull()?.let { result -> uriHandler.openUri(result.item) }
LazyColumn(modifier = Modifier
.weight(1f, fill = false)
.fillMaxWidth()) {
item {
ClickableText(
text = text,
style = MaterialTheme.wireTypography.body01,
modifier = Modifier.padding(
top = MaterialTheme.wireDimensions.dialogTextsSpacing,
bottom = MaterialTheme.wireDimensions.dialogTextsSpacing,
),
onClick = { offset ->
text.getStringAnnotations(
tag = MarkdownConstants.TAG_URL,
start = offset,
end = offset,
).firstOrNull()?.let { result -> uriHandler.openUri(result.item) }
}
)
}
)
}
}
content?.let {
Box {
Expand Down