nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Allows buttons in the New Post screen to scroll horizontally to partially fix https://github.com/vitorpamplona/amethyst/issues/723

Browse Source 
We are waiting the default scrollbar implementation from Jetpack Compose
This commit is contained in:
Vitor Pamplona
2024-02-02 17:39:48 -05:00
parent c78239a6b7
commit 3a2045eccc
1 changed files with 242 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt
+242 -108
View File
@@ -30,6 +30,7 @@ import android.widget.Toast
import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.Image import androidx.compose.foundation.Image
import androidx.compose.foundation.border import androidx.compose.foundation.border
import androidx.compose.foundation.horizontalScroll
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
@@ -304,25 +305,38 @@ fun NewPostView(
) { pad -> ) { pad ->
Surface( Surface(
modifier = modifier =
Modifier.padding( Modifier
start = Size10dp, .padding(
top = pad.calculateTopPadding(), start = Size10dp,
end = Size10dp, top = pad.calculateTopPadding(),
bottom = pad.calculateBottomPadding(), end = Size10dp,
) bottom = pad.calculateBottomPadding(),
)
.fillMaxSize(), .fillMaxSize(),
) { ) {
Column( Column(
modifier = Modifier.fillMaxWidth().fillMaxHeight(), modifier =
Modifier
.fillMaxWidth()
.fillMaxHeight(),
) { ) {
Column( Column(
modifier = Modifier.imePadding().weight(1f), modifier =
Modifier
.imePadding()
.weight(1f),
) { ) {
Row( Row(
modifier = Modifier.fillMaxWidth().weight(1f), modifier =
Modifier
.fillMaxWidth()
.weight(1f),
) { ) {
Column( Column(
modifier = Modifier.fillMaxWidth().verticalScroll(scrollState), modifier =
Modifier
.fillMaxWidth()
.verticalScroll(scrollState),
) { ) {
postViewModel.originalNote?.let { postViewModel.originalNote?.let {
Row(Modifier.heightIn(max = 200.dp)) { Row(Modifier.heightIn(max = 200.dp)) {
@@ -474,7 +488,8 @@ fun NewPostView(
contentDescription = myUrlPreview, contentDescription = myUrlPreview,
contentScale = ContentScale.FillWidth, contentScale = ContentScale.FillWidth,
modifier = modifier =
Modifier.padding(top = 4.dp) Modifier
.padding(top = 4.dp)
.fillMaxWidth() .fillMaxWidth()
.clip(shape = QuoteBorder) .clip(shape = QuoteBorder)
.border( .border(
@@ -529,61 +544,7 @@ fun NewPostView(
} }
} }
Row( BottomRowActions(postViewModel)
modifier = Modifier.fillMaxWidth().height(50.dp),
verticalAlignment = Alignment.CenterVertically,
) {
UploadFromGallery(
isUploading = postViewModel.isUploadingImage,
tint = MaterialTheme.colorScheme.onBackground,
modifier = Modifier,
) {
postViewModel.selectImage(it)
}
if (postViewModel.canUsePoll) {
// These should be hashtag recommendations the user selects in the future.
// val hashtag = stringResource(R.string.poll_hashtag)
// postViewModel.includePollHashtagInMessage(postViewModel.wantsPoll, hashtag)
AddPollButton(postViewModel.wantsPoll) {
postViewModel.wantsPoll = !postViewModel.wantsPoll
if (postViewModel.wantsPoll) {
postViewModel.wantsProduct = false
}
}
}
AddClassifiedsButton(postViewModel) {
postViewModel.wantsProduct = !postViewModel.wantsProduct
if (postViewModel.wantsProduct) {
postViewModel.wantsPoll = false
}
}
if (postViewModel.canAddInvoice) {
AddLnInvoiceButton(postViewModel.wantsInvoice) {
postViewModel.wantsInvoice = !postViewModel.wantsInvoice
}
}
if (postViewModel.canAddZapRaiser) {
AddZapraiserButton(postViewModel.wantsZapraiser) {
postViewModel.wantsZapraiser = !postViewModel.wantsZapraiser
}
}
MarkAsSensitive(postViewModel) {
postViewModel.wantsToMarkAsSensitive = !postViewModel.wantsToMarkAsSensitive
}
AddGeoHash(postViewModel) {
postViewModel.wantsToAddGeoHash = !postViewModel.wantsToAddGeoHash
}
ForwardZapTo(postViewModel) {
postViewModel.wantsForwardZapTo = !postViewModel.wantsForwardZapTo
}
}
} }
} }
} }
@@ -591,6 +552,71 @@ fun NewPostView(
} }
} }
@Composable
private fun BottomRowActions(postViewModel: NewPostViewModel) {
val scrollState = rememberScrollState()
Row(
modifier =
Modifier
.horizontalScroll(scrollState)
.fillMaxWidth()
.height(50.dp),
verticalAlignment = CenterVertically,
) {
UploadFromGallery(
isUploading = postViewModel.isUploadingImage,
tint = MaterialTheme.colorScheme.onBackground,
modifier = Modifier,
) {
postViewModel.selectImage(it)
}
if (postViewModel.canUsePoll) {
// These should be hashtag recommendations the user selects in the future.
// val hashtag = stringResource(R.string.poll_hashtag)
// postViewModel.includePollHashtagInMessage(postViewModel.wantsPoll, hashtag)
AddPollButton(postViewModel.wantsPoll) {
postViewModel.wantsPoll = !postViewModel.wantsPoll
if (postViewModel.wantsPoll) {
postViewModel.wantsProduct = false
}
}
}
AddClassifiedsButton(postViewModel) {
postViewModel.wantsProduct = !postViewModel.wantsProduct
if (postViewModel.wantsProduct) {
postViewModel.wantsPoll = false
}
}
if (postViewModel.canAddInvoice) {
AddLnInvoiceButton(postViewModel.wantsInvoice) {
postViewModel.wantsInvoice = !postViewModel.wantsInvoice
}
}
if (postViewModel.canAddZapRaiser) {
AddZapraiserButton(postViewModel.wantsZapraiser) {
postViewModel.wantsZapraiser = !postViewModel.wantsZapraiser
}
}
MarkAsSensitive(postViewModel) {
postViewModel.wantsToMarkAsSensitive = !postViewModel.wantsToMarkAsSensitive
}
AddGeoHash(postViewModel) {
postViewModel.wantsToAddGeoHash = !postViewModel.wantsToAddGeoHash
}
ForwardZapTo(postViewModel) {
postViewModel.wantsForwardZapTo = !postViewModel.wantsForwardZapTo
}
}
}
@Composable @Composable
private fun PollField(postViewModel: NewPostViewModel) { private fun PollField(postViewModel: NewPostViewModel) {
Column( Column(
@@ -644,7 +670,8 @@ private fun MessageField(postViewModel: NewPostViewModel) {
capitalization = KeyboardCapitalization.Sentences, capitalization = KeyboardCapitalization.Sentences,
), ),
modifier = modifier =
Modifier.fillMaxWidth() Modifier
.fillMaxWidth()
.border( .border(
width = 1.dp, width = 1.dp,
color = MaterialTheme.colorScheme.surface, color = MaterialTheme.colorScheme.surface,
@@ -684,21 +711,32 @@ fun ContentSensitivityExplainer(postViewModel: NewPostViewModel) {
) { ) {
Row( Row(
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.fillMaxWidth().padding(bottom = 10.dp), modifier =
Modifier
.fillMaxWidth()
.padding(bottom = 10.dp),
) { ) {
Box( Box(
Modifier.height(20.dp).width(25.dp), Modifier
.height(20.dp)
.width(25.dp),
) { ) {
Icon( Icon(
imageVector = Icons.Default.VisibilityOff, imageVector = Icons.Default.VisibilityOff,
contentDescription = stringResource(id = R.string.content_warning), contentDescription = stringResource(id = R.string.content_warning),
modifier = Modifier.size(18.dp).align(Alignment.BottomStart), modifier =
Modifier
.size(18.dp)
.align(Alignment.BottomStart),
tint = Color.Red, tint = Color.Red,
) )
Icon( Icon(
imageVector = Icons.Rounded.Warning, imageVector = Icons.Rounded.Warning,
contentDescription = stringResource(id = R.string.content_warning), contentDescription = stringResource(id = R.string.content_warning),
modifier = Modifier.size(10.dp).align(Alignment.TopEnd), modifier =
Modifier
.size(10.dp)
.align(Alignment.TopEnd),
tint = Color.Yellow, tint = Color.Yellow,
) )
} }
@@ -921,7 +959,10 @@ fun SellProduct(postViewModel: NewPostViewModel) {
placeholder = conditionTypes.filter { it.first == postViewModel.condition }.first().second, placeholder = conditionTypes.filter { it.first == postViewModel.condition }.first().second,
options = conditionOptions, options = conditionOptions,
onSelect = { postViewModel.condition = conditionTypes[it].first }, onSelect = { postViewModel.condition = conditionTypes[it].first },
modifier = Modifier.weight(1f).padding(end = 5.dp, bottom = 1.dp), modifier =
Modifier
.weight(1f)
.padding(end = 5.dp, bottom = 1.dp),
) { currentOption, modifier -> ) { currentOption, modifier ->
MyTextField( MyTextField(
value = TextFieldValue(currentOption), value = TextFieldValue(currentOption),
@@ -982,7 +1023,10 @@ fun SellProduct(postViewModel: NewPostViewModel) {
?: "", ?: "",
options = categoryOptions, options = categoryOptions,
onSelect = { postViewModel.category = TextFieldValue(categoryTypes[it].second) }, onSelect = { postViewModel.category = TextFieldValue(categoryTypes[it].second) },
modifier = Modifier.weight(1f).padding(end = 5.dp, bottom = 1.dp), modifier =
Modifier
.weight(1f)
.padding(end = 5.dp, bottom = 1.dp),
) { currentOption, modifier -> ) { currentOption, modifier ->
MyTextField( MyTextField(
value = TextFieldValue(currentOption), value = TextFieldValue(currentOption),
@@ -1047,21 +1091,32 @@ fun FowardZapTo(
) { ) {
Row( Row(
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.fillMaxWidth().padding(bottom = 10.dp), modifier =
Modifier
.fillMaxWidth()
.padding(bottom = 10.dp),
) { ) {
Box( Box(
Modifier.height(20.dp).width(25.dp), Modifier
.height(20.dp)
.width(25.dp),
) { ) {
Icon( Icon(
imageVector = Icons.Outlined.Bolt, imageVector = Icons.Outlined.Bolt,
contentDescription = stringResource(id = R.string.zaps), contentDescription = stringResource(id = R.string.zaps),
modifier = Modifier.size(20.dp).align(Alignment.CenterStart), modifier =
Modifier
.size(20.dp)
.align(Alignment.CenterStart),
tint = BitcoinOrange, tint = BitcoinOrange,
) )
Icon( Icon(
imageVector = Icons.Outlined.ArrowForwardIos, imageVector = Icons.Outlined.ArrowForwardIos,
contentDescription = stringResource(id = R.string.zaps), contentDescription = stringResource(id = R.string.zaps),
modifier = Modifier.size(13.dp).align(Alignment.CenterEnd), modifier =
Modifier
.size(13.dp)
.align(Alignment.CenterEnd),
tint = BitcoinOrange, tint = BitcoinOrange,
) )
} }
@@ -1161,10 +1216,15 @@ fun LocationAsHash(postViewModel: NewPostViewModel) {
) { ) {
Row( Row(
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.fillMaxWidth().padding(bottom = 10.dp), modifier =
Modifier
.fillMaxWidth()
.padding(bottom = 10.dp),
) { ) {
Box( Box(
Modifier.height(20.dp).width(20.dp), Modifier
.height(20.dp)
.width(20.dp),
) { ) {
Icon( Icon(
imageVector = Icons.Default.LocationOn, imageVector = Icons.Default.LocationOn,
@@ -1305,32 +1365,46 @@ private fun AddZapraiserButton(
onClick = { onClick() }, onClick = { onClick() },
) { ) {
Box( Box(
Modifier.height(20.dp).width(25.dp), Modifier
.height(20.dp)
.width(25.dp),
) { ) {
if (!isLnInvoiceActive) { if (!isLnInvoiceActive) {
Icon( Icon(
imageVector = Icons.Default.ShowChart, imageVector = Icons.Default.ShowChart,
null, null,
modifier = Modifier.size(20.dp).align(Alignment.TopStart), modifier =
Modifier
.size(20.dp)
.align(Alignment.TopStart),
tint = MaterialTheme.colorScheme.onBackground, tint = MaterialTheme.colorScheme.onBackground,
) )
Icon( Icon(
imageVector = Icons.Default.Bolt, imageVector = Icons.Default.Bolt,
contentDescription = stringResource(R.string.zaps), contentDescription = stringResource(R.string.zaps),
modifier = Modifier.size(13.dp).align(Alignment.BottomEnd), modifier =
Modifier
.size(13.dp)
.align(Alignment.BottomEnd),
tint = MaterialTheme.colorScheme.onBackground, tint = MaterialTheme.colorScheme.onBackground,
) )
} else { } else {
Icon( Icon(
imageVector = Icons.Default.ShowChart, imageVector = Icons.Default.ShowChart,
null, null,
modifier = Modifier.size(20.dp).align(Alignment.TopStart), modifier =
Modifier
.size(20.dp)
.align(Alignment.TopStart),
tint = BitcoinOrange, tint = BitcoinOrange,
) )
Icon( Icon(
imageVector = Icons.Default.Bolt, imageVector = Icons.Default.Bolt,
contentDescription = stringResource(R.string.zaps), contentDescription = stringResource(R.string.zaps),
modifier = Modifier.size(13.dp).align(Alignment.BottomEnd), modifier =
Modifier
.size(13.dp)
.align(Alignment.BottomEnd),
tint = BitcoinOrange, tint = BitcoinOrange,
) )
} }
@@ -1399,32 +1473,46 @@ private fun ForwardZapTo(
onClick = { onClick() }, onClick = { onClick() },
) { ) {
Box( Box(
Modifier.height(20.dp).width(25.dp), Modifier
.height(20.dp)
.width(25.dp),
) { ) {
if (!postViewModel.wantsForwardZapTo) { if (!postViewModel.wantsForwardZapTo) {
Icon( Icon(
imageVector = Icons.Default.Bolt, imageVector = Icons.Default.Bolt,
contentDescription = stringResource(R.string.zaps), contentDescription = stringResource(R.string.zaps),
modifier = Modifier.size(20.dp).align(Alignment.CenterStart), modifier =
Modifier
.size(20.dp)
.align(Alignment.CenterStart),
tint = MaterialTheme.colorScheme.onBackground, tint = MaterialTheme.colorScheme.onBackground,
) )
Icon( Icon(
imageVector = Icons.Default.ArrowForwardIos, imageVector = Icons.Default.ArrowForwardIos,
contentDescription = stringResource(R.string.zaps), contentDescription = stringResource(R.string.zaps),
modifier = Modifier.size(13.dp).align(Alignment.CenterEnd), modifier =
Modifier
.size(13.dp)
.align(Alignment.CenterEnd),
tint = MaterialTheme.colorScheme.onBackground, tint = MaterialTheme.colorScheme.onBackground,
) )
} else { } else {
Icon( Icon(
imageVector = Icons.Outlined.Bolt, imageVector = Icons.Outlined.Bolt,
contentDescription = stringResource(id = R.string.zaps), contentDescription = stringResource(id = R.string.zaps),
modifier = Modifier.size(20.dp).align(Alignment.CenterStart), modifier =
Modifier
.size(20.dp)
.align(Alignment.CenterStart),
tint = BitcoinOrange, tint = BitcoinOrange,
) )
Icon( Icon(
imageVector = Icons.Outlined.ArrowForwardIos, imageVector = Icons.Outlined.ArrowForwardIos,
contentDescription = stringResource(id = R.string.zaps), contentDescription = stringResource(id = R.string.zaps),
modifier = Modifier.size(13.dp).align(Alignment.CenterEnd), modifier =
Modifier
.size(13.dp)
.align(Alignment.CenterEnd),
tint = BitcoinOrange, tint = BitcoinOrange,
) )
} }
@@ -1467,32 +1555,46 @@ private fun MarkAsSensitive(
onClick = { onClick() }, onClick = { onClick() },
) { ) {
Box( Box(
Modifier.height(20.dp).width(23.dp), Modifier
.height(20.dp)
.width(23.dp),
) { ) {
if (!postViewModel.wantsToMarkAsSensitive) { if (!postViewModel.wantsToMarkAsSensitive) {
Icon( Icon(
imageVector = Icons.Default.Visibility, imageVector = Icons.Default.Visibility,
contentDescription = stringResource(R.string.content_warning), contentDescription = stringResource(R.string.content_warning),
modifier = Modifier.size(18.dp).align(Alignment.BottomStart), modifier =
Modifier
.size(18.dp)
.align(Alignment.BottomStart),
tint = MaterialTheme.colorScheme.onBackground, tint = MaterialTheme.colorScheme.onBackground,
) )
Icon( Icon(
imageVector = Icons.Rounded.Warning, imageVector = Icons.Rounded.Warning,
contentDescription = stringResource(R.string.content_warning), contentDescription = stringResource(R.string.content_warning),
modifier = Modifier.size(10.dp).align(Alignment.TopEnd), modifier =
Modifier
.size(10.dp)
.align(Alignment.TopEnd),
tint = MaterialTheme.colorScheme.onBackground, tint = MaterialTheme.colorScheme.onBackground,
) )
} else { } else {
Icon( Icon(
imageVector = Icons.Default.VisibilityOff, imageVector = Icons.Default.VisibilityOff,
contentDescription = stringResource(id = R.string.content_warning), contentDescription = stringResource(id = R.string.content_warning),
modifier = Modifier.size(18.dp).align(Alignment.BottomStart), modifier =
Modifier
.size(18.dp)
.align(Alignment.BottomStart),
tint = Color.Red, tint = Color.Red,
) )
Icon( Icon(
imageVector = Icons.Rounded.Warning, imageVector = Icons.Rounded.Warning,
contentDescription = stringResource(id = R.string.content_warning), contentDescription = stringResource(id = R.string.content_warning),
modifier = Modifier.size(10.dp).align(Alignment.TopEnd), modifier =
Modifier
.size(10.dp)
.align(Alignment.TopEnd),
tint = Color.Yellow, tint = Color.Yellow,
) )
} }
@@ -1601,7 +1703,8 @@ fun ImageVideoDescription(
Column( Column(
modifier = modifier =
Modifier.fillMaxWidth() Modifier
.fillMaxWidth()
.padding(start = 30.dp, end = 30.dp) .padding(start = 30.dp, end = 30.dp)
.clip(shape = QuoteBorder) .clip(shape = QuoteBorder)
.border( .border(
@@ -1611,11 +1714,17 @@ fun ImageVideoDescription(
), ),
) { ) {
Column( Column(
modifier = Modifier.fillMaxWidth().padding(30.dp), modifier =
Modifier
.fillMaxWidth()
.padding(30.dp),
) { ) {
Row( Row(
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.fillMaxWidth().padding(bottom = 10.dp), modifier =
Modifier
.fillMaxWidth()
.padding(bottom = 10.dp),
) { ) {
Text( Text(
text = text =
@@ -1633,13 +1742,17 @@ fun ImageVideoDescription(
fontSize = 20.sp, fontSize = 20.sp,
fontWeight = FontWeight.W500, fontWeight = FontWeight.W500,
modifier = modifier =
Modifier.padding(start = 10.dp) Modifier
.padding(start = 10.dp)
.weight(1.0f) .weight(1.0f)
.windowInsetsPadding(WindowInsets(0.dp, 0.dp, 0.dp, 0.dp)), .windowInsetsPadding(WindowInsets(0.dp, 0.dp, 0.dp, 0.dp)),
) )
IconButton( IconButton(
modifier = Modifier.size(30.dp).padding(end = 5.dp), modifier =
Modifier
.size(30.dp)
.padding(end = 5.dp),
onClick = onCancel, onClick = onCancel,
) { ) {
CancelIcon() CancelIcon()
@@ -1651,7 +1764,8 @@ fun ImageVideoDescription(
Row( Row(
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
modifier = modifier =
Modifier.fillMaxWidth() Modifier
.fillMaxWidth()
.padding(bottom = 10.dp) .padding(bottom = 10.dp)
.windowInsetsPadding(WindowInsets(0.dp, 0.dp, 0.dp, 0.dp)), .windowInsetsPadding(WindowInsets(0.dp, 0.dp, 0.dp, 0.dp)),
) { ) {
@@ -1661,7 +1775,8 @@ fun ImageVideoDescription(
contentDescription = uri.toString(), contentDescription = uri.toString(),
contentScale = ContentScale.FillWidth, contentScale = ContentScale.FillWidth,
modifier = modifier =
Modifier.padding(top = 4.dp) Modifier
.padding(top = 4.dp)
.fillMaxWidth() .fillMaxWidth()
.windowInsetsPadding(WindowInsets(0.dp, 0.dp, 0.dp, 0.dp)), .windowInsetsPadding(WindowInsets(0.dp, 0.dp, 0.dp, 0.dp)),
) )
@@ -1687,7 +1802,10 @@ fun ImageVideoDescription(
bitmap = it.asImageBitmap(), bitmap = it.asImageBitmap(),
contentDescription = "some useful description", contentDescription = "some useful description",
contentScale = ContentScale.FillWidth, contentScale = ContentScale.FillWidth,
modifier = Modifier.padding(top = 4.dp).fillMaxWidth(), modifier =
Modifier
.padding(top = 4.dp)
.fillMaxWidth(),
) )
} }
} else { } else {
@@ -1709,7 +1827,10 @@ fun ImageVideoDescription(
?: fileServers[0].server.name, ?: fileServers[0].server.name,
options = fileServerOptions, options = fileServerOptions,
onSelect = { selectedServer = fileServers[it] }, onSelect = { selectedServer = fileServers[it] },
modifier = Modifier.windowInsetsPadding(WindowInsets(0.dp, 0.dp, 0.dp, 0.dp)).weight(1f), modifier =
Modifier
.windowInsetsPadding(WindowInsets(0.dp, 0.dp, 0.dp, 0.dp))
.weight(1f),
) )
} }
@@ -1718,7 +1839,10 @@ fun ImageVideoDescription(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
) { ) {
SettingSwitchItem( SettingSwitchItem(
modifier = Modifier.fillMaxWidth().padding(vertical = 8.dp), modifier =
Modifier
.fillMaxWidth()
.padding(vertical = 8.dp),
checked = sensitiveContent, checked = sensitiveContent,
onCheckedChange = { sensitiveContent = it }, onCheckedChange = { sensitiveContent = it },
title = R.string.add_sensitive_content_label, title = R.string.add_sensitive_content_label,
@@ -1729,12 +1853,16 @@ fun ImageVideoDescription(
Row( Row(
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
modifier = modifier =
Modifier.fillMaxWidth().windowInsetsPadding(WindowInsets(0.dp, 0.dp, 0.dp, 0.dp)), Modifier
.fillMaxWidth()
.windowInsetsPadding(WindowInsets(0.dp, 0.dp, 0.dp, 0.dp)),
) { ) {
OutlinedTextField( OutlinedTextField(
label = { Text(text = stringResource(R.string.content_description)) }, label = { Text(text = stringResource(R.string.content_description)) },
modifier = modifier =
Modifier.fillMaxWidth().windowInsetsPadding(WindowInsets(0.dp, 0.dp, 0.dp, 0.dp)), Modifier
.fillMaxWidth()
.windowInsetsPadding(WindowInsets(0.dp, 0.dp, 0.dp, 0.dp)),
value = message, value = message,
onValueChange = { message = it }, onValueChange = { message = it },
placeholder = { placeholder = {
@@ -1751,7 +1879,10 @@ fun ImageVideoDescription(
} }
Button( Button(
modifier = Modifier.fillMaxWidth().padding(vertical = 10.dp), modifier =
Modifier
.fillMaxWidth()
.padding(vertical = 10.dp),
onClick = { onAdd(message, selectedServer, sensitiveContent) }, onClick = { onAdd(message, selectedServer, sensitiveContent) },
shape = QuoteBorder, shape = QuoteBorder,
colors = colors =
@@ -1767,7 +1898,10 @@ fun ImageVideoDescription(
@Composable @Composable
fun SettingSwitchItem( fun SettingSwitchItem(
modifier: Modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp), modifier: Modifier =
Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp, vertical = 8.dp),
checked: Boolean, checked: Boolean,
onCheckedChange: (Boolean) -> Unit, onCheckedChange: (Boolean) -> Unit,
title: Int, title: Int,