Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-26 20:55:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix clipping and padding on about sheet.

Browse Source
This commit is contained in:
Alex Hart
2024-01-10 17:01:56 -04:00
parent af10b0e4f6
commit 64dbb77e63
1 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheet.kt
View File

@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
@@ -153,7 +154,7 @@ private fun AboutSheetContent(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 32.dp)
.padding(top = 20.dp, bottom = 8.dp)
.padding(top = 20.dp, bottom = 14.dp)
)
val context = LocalContext.current
@@ -186,9 +187,8 @@ private fun AboutSheetContent(
startIcon = painterResource(id = R.drawable.symbol_connections_24),
text = stringResource(id = R.string.AboutSheet__signal_connection),
endIcon = painterResource(id = R.drawable.symbol_chevron_right_compact_bold_16),
modifier = Modifier
.fillMaxWidth()
.clickable(onClick = onClickSignalConnections)
modifier = Modifier.align(alignment = Alignment.Start),
onClick = onClickSignalConnections
)
}
@@ -233,7 +233,7 @@ private fun AboutSheetContent(
)
}
Spacer(modifier = Modifier.size(32.dp))
Spacer(modifier = Modifier.size(26.dp))
}
}
@@ -256,7 +256,8 @@ private fun AboutRow(
startIcon: Painter,
text: String,
modifier: Modifier = Modifier,
endIcon: Painter? = null
endIcon: Painter? = null,
onClick: (() -> Unit)? = null
) {
AboutRow(
startIcon = startIcon,
@@ -267,7 +268,8 @@ private fun AboutRow(
)
},
modifier = modifier,
endIcon = endIcon
endIcon = endIcon,
onClick = onClick
)
}
@@ -276,13 +278,28 @@ private fun AboutRow(
startIcon: Painter,
text: @Composable () -> Unit,
modifier: Modifier = Modifier,
endIcon: Painter? = null
endIcon: Painter? = null,
onClick: (() -> Unit)? = null
) {
val padHorizontal = if (onClick != null) 19.dp else 32.dp
val padVertical = if (onClick != null) 4.dp else 6.dp
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = modifier
.padding(horizontal = 32.dp)
.padding(top = 12.dp)
.padding(horizontal = padHorizontal)
.padding(vertical = padVertical)
.let {
if (onClick != null) {
it
.clip(RoundedCornerShape(16.dp))
.clickable(onClick = onClick)
.padding(top = 2.dp, bottom = 2.dp, start = 13.dp, end = 8.dp)
} else {
it
}
}
) {
Icon(
painter = startIcon,