DROID-2014 Spaces | Fix | Fix text margins in space settings

This commit is contained in:
uburoiubu 2024-01-26 00:21:15 +01:00
parent 6669a0bfa2
commit f965e4aed3
No known key found for this signature in database
GPG Key ID: C8FB80E0A595FBB6
2 changed files with 9 additions and 4 deletions

View File

@ -22,6 +22,7 @@ import androidx.compose.ui.platform.ViewCompositionStrategy
import androidx.compose.ui.platform.rememberNestedScrollInteropConnection
import androidx.compose.ui.res.colorResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.fragment.app.viewModels
import androidx.lifecycle.compose.collectAsStateWithLifecycle
@ -277,9 +278,10 @@ fun SpaceSettingsScreen(
style = PreviewTitle2Regular,
maxLines = 2,
color = colorResource(id = R.color.text_primary),
overflow = TextOverflow.Ellipsis,
modifier = Modifier
.align(Alignment.BottomStart)
.padding(bottom = 12.dp)
.padding(bottom = 12.dp, end = 50.dp)
.noRippleClickable {
onSpaceIdClicked(spaceData.data.spaceId.orEmpty())
}
@ -290,7 +292,7 @@ fun SpaceSettingsScreen(
item {
Box(
modifier = Modifier
.height(72.dp)
.height(92.dp)
.padding(horizontal = 20.dp)
.fillMaxWidth()
) {
@ -304,8 +306,9 @@ fun SpaceSettingsScreen(
Text(
text = spaceData.data.createdBy ?: stringResource(id = R.string.unknown),
style = PreviewTitle2Regular,
maxLines = 1,
maxLines = 2,
color = colorResource(id = R.color.text_primary),
overflow = TextOverflow.Ellipsis,
modifier = Modifier
.align(Alignment.BottomStart)
.padding(bottom = 12.dp, end = 50.dp)
@ -364,6 +367,7 @@ fun SpaceSettingsScreen(
style = PreviewTitle2Regular,
maxLines = 2,
color = colorResource(id = R.color.text_primary),
overflow = TextOverflow.Ellipsis,
modifier = Modifier
.align(Alignment.BottomStart)
.padding(bottom = 12.dp, end = 50.dp)
@ -379,7 +383,7 @@ fun SpaceSettingsScreen(
Box(modifier = Modifier.height(78.dp)) {
ButtonWarning(
onClick = { onDeleteSpaceClicked() },
text = "Delete space",
text = stringResource(R.string.delete_space),
modifier = Modifier
.padding(start = 20.dp, end = 20.dp, bottom = 10.dp)
.fillMaxWidth()

View File

@ -59,6 +59,7 @@
<string name="space">Space</string>
<string name="space_name">Space name</string>
<string name="personal_space">Personal Space</string>
<string name="delete_space">Delete space</string>
<string name="you_can_store">You can store up to %1$s of your files on our encrypted backup node for free. If you reach the limit, files will be stored only locally.</string>
<string name="in_order_to_save">In order to save space on your local device, you can offload all your files to our encrypted backup node. The files will be loaded back when you open them.</string>
<string name="manage_files">Manage files</string>