mirror of
https://github.com/oxen-io/session-android.git
synced 2024-11-30 13:35:18 +00:00
Use Dimensions in AppBar
This commit is contained in:
parent
3a75f2a303
commit
e2eea61c68
@ -18,4 +18,5 @@ data class Dimensions(
|
||||
val marginMedium: Dp = 32.dp,
|
||||
val marginLarge: Dp = 64.dp,
|
||||
val dividerIndent: Dp = 80.dp,
|
||||
val appBarHeight: Dp = 64.dp
|
||||
)
|
||||
|
@ -14,11 +14,11 @@ import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.tooling.preview.Preview
|
||||
import androidx.compose.ui.tooling.preview.PreviewParameter
|
||||
import androidx.compose.ui.unit.dp
|
||||
import network.loki.messenger.R
|
||||
import org.thoughtcrime.securesms.ui.color.Colors
|
||||
import org.thoughtcrime.securesms.ui.LocalDimensions
|
||||
import org.thoughtcrime.securesms.ui.PreviewTheme
|
||||
import org.thoughtcrime.securesms.ui.SessionColorsParameterProvider
|
||||
import org.thoughtcrime.securesms.ui.color.Colors
|
||||
import org.thoughtcrime.securesms.ui.h4
|
||||
|
||||
@Preview
|
||||
@ -33,8 +33,8 @@ fun AppBarPreview(
|
||||
|
||||
@Composable
|
||||
fun AppBar(title: String, onClose: () -> Unit = {}, onBack: (() -> Unit)? = null) {
|
||||
Row(modifier = Modifier.height(64.dp), verticalAlignment = Alignment.CenterVertically) {
|
||||
Box(contentAlignment = Alignment.Center, modifier = Modifier.size(64.dp)) {
|
||||
Row(modifier = Modifier.height(LocalDimensions.current.appBarHeight), verticalAlignment = Alignment.CenterVertically) {
|
||||
Box(contentAlignment = Alignment.Center, modifier = Modifier.size(LocalDimensions.current.appBarHeight)) {
|
||||
onBack?.let {
|
||||
IconButton(onClick = it) {
|
||||
Icon(painter = painterResource(id = R.drawable.ic_prev), contentDescription = "back")
|
||||
@ -44,7 +44,7 @@ fun AppBar(title: String, onClose: () -> Unit = {}, onBack: (() -> Unit)? = null
|
||||
Spacer(modifier = Modifier.weight(1f))
|
||||
Text(text = title, style = h4)
|
||||
Spacer(modifier = Modifier.weight(1f))
|
||||
Box(contentAlignment = Alignment.Center, modifier = Modifier.size(64.dp)) {
|
||||
Box(contentAlignment = Alignment.Center, modifier = Modifier.size(LocalDimensions.current.appBarHeight)) {
|
||||
IconButton(onClick = onClose) {
|
||||
Icon(painter = painterResource(id = R.drawable.ic_x), contentDescription = "close")
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user