mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-09-20 00:35:47 +01:00
Add some padding to the two-factor context menu.
This commit is contained in:
committed by
Cody Henthorne
parent
545069f2c5
commit
56b4829b8b
@@ -56,6 +56,7 @@ object DropdownMenus {
|
||||
controller: MenuController = remember { MenuController() },
|
||||
offsetX: Dp = dimensionResource(id = R.dimen.gutter),
|
||||
offsetY: Dp = 0.dp,
|
||||
contentPadding: PaddingValues = PaddingValues(0.dp),
|
||||
content: @Composable ColumnScope.(MenuController) -> Unit
|
||||
) {
|
||||
Menu(
|
||||
@@ -64,6 +65,7 @@ object DropdownMenus {
|
||||
modifier = modifier,
|
||||
offsetX = offsetX,
|
||||
offsetY = offsetY,
|
||||
contentPadding = contentPadding,
|
||||
content = { content(controller) }
|
||||
)
|
||||
}
|
||||
@@ -79,6 +81,7 @@ object DropdownMenus {
|
||||
modifier: Modifier = Modifier,
|
||||
offsetX: Dp = dimensionResource(id = R.dimen.gutter),
|
||||
offsetY: Dp = 0.dp,
|
||||
contentPadding: PaddingValues = PaddingValues(0.dp),
|
||||
content: @Composable ColumnScope.() -> Unit
|
||||
) {
|
||||
MaterialTheme(shapes = MaterialTheme.shapes.copy(extraSmall = RoundedCornerShape(18.dp))) {
|
||||
@@ -93,6 +96,7 @@ object DropdownMenus {
|
||||
modifier = modifier
|
||||
.background(SignalTheme.colors.colorSurface2)
|
||||
.widthIn(min = 220.dp)
|
||||
.padding(contentPadding)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
+5
-1
@@ -13,6 +13,7 @@ import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.PaddingValues
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.padding
|
||||
@@ -415,7 +416,10 @@ private fun SetUpTwoFactorRow(
|
||||
modifier = Modifier.testTag(AccountSettingsTestTags.ROW_SET_UP_TWO_FACTOR)
|
||||
)
|
||||
|
||||
DropdownMenus.Menu(controller = menuController) { controller ->
|
||||
DropdownMenus.Menu(
|
||||
controller = menuController,
|
||||
contentPadding = PaddingValues(vertical = 12.dp)
|
||||
) { controller ->
|
||||
DropdownMenus.Item(
|
||||
leadingIconResId = CoreUiR.drawable.symbol_device_phone_24,
|
||||
text = {
|
||||
|
||||
Reference in New Issue
Block a user