Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-05-08 09:18:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adjust DefaultBanner padding values.

Browse Source
This commit is contained in:
Nicholas Tinsley
2024-08-16 11:50:25 -04:00
committed by mtang-signal
parent 8d38f6f5e7
commit 112473bc5c
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/banner/BannerManager.kt
+1 -4
View File
@@ -6,11 +6,8 @@
package org.thoughtcrime.securesms.banner package org.thoughtcrime.securesms.banner
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.padding
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.ComposeView
import androidx.compose.ui.platform.ViewCompositionStrategy import androidx.compose.ui.platform.ViewCompositionStrategy
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.combine
@@ -45,7 +42,7 @@ class BannerManager(allFlows: Iterable<Flow<Banner>>) {
val state = combinedFlow.collectAsStateWithLifecycle(initialValue = emptyList()) val state = combinedFlow.collectAsStateWithLifecycle(initialValue = emptyList())
state.value.firstOrNull()?.let { state.value.firstOrNull()?.let {
Box(modifier = Modifier.padding(8.dp)) { Box {
it.DisplayBanner() it.DisplayBanner()
} }
} }
app/src/main/java/org/thoughtcrime/securesms/banner/ui/compose/DefaultBanner.kt
+17 -13
View File
@@ -53,6 +53,7 @@ fun DefaultBanner(
) { ) {
Box( Box(
modifier = Modifier modifier = Modifier
.padding(horizontal = 12.dp, vertical = 8.dp)
.background( .background(
color = when (importance) { color = when (importance) {
Importance.NORMAL -> MaterialTheme.colorScheme.surface Importance.NORMAL -> MaterialTheme.colorScheme.surface
@@ -74,8 +75,8 @@ fun DefaultBanner(
Row(modifier = Modifier.fillMaxWidth()) { Row(modifier = Modifier.fillMaxWidth()) {
Column( Column(
modifier = Modifier modifier = Modifier
.padding(12.dp)
.weight(1f) .weight(1f)
.padding(start = 16.dp, top = 16.dp)
) { ) {
if (title.isNotNullOrBlank()) { if (title.isNotNullOrBlank()) {
Text( Text(
@@ -123,24 +124,27 @@ fun DefaultBanner(
} }
} }
if (onDismissListener != null) { Box(modifier = Modifier.size(48.dp)) {
IconButton( if (onDismissListener != null) {
onClick = { IconButton(
onHideListener?.invoke() onClick = {
onDismissListener() onHideListener?.invoke()
}, onDismissListener()
modifier = Modifier.size(48.dp) },
) { modifier = Modifier.size(48.dp)
Icon( ) {
painter = painterResource(id = R.drawable.symbol_x_24), Icon(
contentDescription = stringResource(id = R.string.InviteActivity_cancel) painter = painterResource(id = R.drawable.symbol_x_24),
) contentDescription = stringResource(id = R.string.InviteActivity_cancel)
)
}
} }
} }
} }
Row( Row(
horizontalArrangement = Arrangement.End, horizontalArrangement = Arrangement.End,
modifier = Modifier.fillMaxWidth() modifier = Modifier.fillMaxWidth()
.padding(end = 8.dp)
) { ) {
for (action in actions) { for (action in actions) {
TextButton(onClick = action.onClick) { TextButton(onClick = action.onClick) {