diff --git a/core/ui/src/main/java/org/signal/core/ui/compose/DropdownMenus.kt b/core/ui/src/main/java/org/signal/core/ui/compose/DropdownMenus.kt index b346f08090..1cdd316d4a 100644 --- a/core/ui/src/main/java/org/signal/core/ui/compose/DropdownMenus.kt +++ b/core/ui/src/main/java/org/signal/core/ui/compose/DropdownMenus.kt @@ -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) ) } } diff --git a/feature/app-settings/src/main/java/org/signal/appsettings/account/AccountSettingsScreen.kt b/feature/app-settings/src/main/java/org/signal/appsettings/account/AccountSettingsScreen.kt index 65b9d7f55f..45f8b93366 100644 --- a/feature/app-settings/src/main/java/org/signal/appsettings/account/AccountSettingsScreen.kt +++ b/feature/app-settings/src/main/java/org/signal/appsettings/account/AccountSettingsScreen.kt @@ -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 = {