mirror of
https://github.com/oxen-io/session-android.git
synced 2025-07-13 15:48:34 +00:00
Fixing UI issues found
This commit is contained in:
parent
a84ba25a79
commit
78110a48c6
@ -273,11 +273,11 @@ fun CellWithPaddingAndMargin(
|
|||||||
) {
|
) {
|
||||||
Box(
|
Box(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
|
.padding(horizontal = margin)
|
||||||
.background(color = LocalColors.current.backgroundSecondary,
|
.background(color = LocalColors.current.backgroundSecondary,
|
||||||
shape = MaterialTheme.shapes.small)
|
shape = MaterialTheme.shapes.small)
|
||||||
.wrapContentHeight()
|
.wrapContentHeight()
|
||||||
.fillMaxWidth()
|
.fillMaxWidth(),
|
||||||
.padding(horizontal = margin),
|
|
||||||
) {
|
) {
|
||||||
Box(Modifier.padding(padding)) { content() }
|
Box(Modifier.padding(padding)) { content() }
|
||||||
}
|
}
|
||||||
|
@ -35,7 +35,7 @@ interface ButtonType {
|
|||||||
@Composable
|
@Composable
|
||||||
override fun buttonColors() = ButtonDefaults.buttonColors(
|
override fun buttonColors() = ButtonDefaults.buttonColors(
|
||||||
contentColor = contentColor,
|
contentColor = contentColor,
|
||||||
containerColor = Color.Unspecified,
|
containerColor = Color.Transparent,
|
||||||
disabledContentColor = LocalColors.current.disabled,
|
disabledContentColor = LocalColors.current.disabled,
|
||||||
disabledContainerColor = Color.Transparent
|
disabledContainerColor = Color.Transparent
|
||||||
)
|
)
|
||||||
|
@ -77,7 +77,6 @@ fun MaybeScanQrCode(
|
|||||||
Box(
|
Box(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxSize()
|
.fillMaxSize()
|
||||||
.background(LocalColors.current.background)
|
|
||||||
) {
|
) {
|
||||||
LocalSoftwareKeyboardController.current?.hide()
|
LocalSoftwareKeyboardController.current?.hide()
|
||||||
|
|
||||||
@ -106,7 +105,6 @@ fun MaybeScanQrCode(
|
|||||||
} else {
|
} else {
|
||||||
Column(
|
Column(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.background(color = LocalColors.current.background)
|
|
||||||
.fillMaxSize()
|
.fillMaxSize()
|
||||||
.padding(LocalDimensions.current.xlargeSpacing),
|
.padding(LocalDimensions.current.xlargeSpacing),
|
||||||
horizontalAlignment = Alignment.CenterHorizontally
|
horizontalAlignment = Alignment.CenterHorizontally
|
||||||
|
Loading…
x
Reference in New Issue
Block a user