diff --git a/app/src/main/java/info/plateaukao/einkbro/view/dialog/compose/ActionModeView.kt b/app/src/main/java/info/plateaukao/einkbro/view/dialog/compose/ActionModeView.kt index 6352effe..2cd2efe0 100644 --- a/app/src/main/java/info/plateaukao/einkbro/view/dialog/compose/ActionModeView.kt +++ b/app/src/main/java/info/plateaukao/einkbro/view/dialog/compose/ActionModeView.kt @@ -32,6 +32,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.AbstractComposeView import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.google.accompanist.drawablepainter.rememberDrawablePainter @@ -168,3 +169,16 @@ fun ActionMenuItem( } } } + +@Preview +@Composable +fun PreviewActionMenuItem() { + MyTheme { + ActionMenuItem( + title = "Title", + iconDrawable = null, + onClicked = {}, + onLongClicked = {}, + ) + } +} diff --git a/app/src/main/java/info/plateaukao/einkbro/view/dialog/compose/MenuDialogFragment.kt b/app/src/main/java/info/plateaukao/einkbro/view/dialog/compose/MenuDialogFragment.kt index d3fb531b..25c78d4e 100644 --- a/app/src/main/java/info/plateaukao/einkbro/view/dialog/compose/MenuDialogFragment.kt +++ b/app/src/main/java/info/plateaukao/einkbro/view/dialog/compose/MenuDialogFragment.kt @@ -8,6 +8,7 @@ import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.interaction.collectIsPressedAsState import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.IntrinsicSize import androidx.compose.foundation.layout.Row @@ -466,17 +467,24 @@ fun MenuItem( ) } } - Text( + Box( modifier = Modifier .fillMaxWidth() - .offset(y = if (showIcon) (-5).dp else 0.dp), - text = stringResource(id = titleResId), - textAlign = TextAlign.Center, - maxLines = 2, - lineHeight = if (!showIcon) 20.sp else 12.sp, - fontSize = fontSize, - color = MaterialTheme.colors.onBackground - ) + .height(40.dp), + contentAlignment = Alignment.Center + ) { + Text( + modifier = Modifier + .fillMaxWidth() + .offset(y = if (showIcon) (-5).dp else 10.dp), + text = stringResource(id = titleResId), + textAlign = TextAlign.Center, + maxLines = 2, + lineHeight = if (!showIcon) 20.sp else 12.sp, + fontSize = fontSize, + color = MaterialTheme.colors.onBackground + ) + } } } diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index fddd5682..86fc8d06 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -402,13 +402,6 @@ Google: Вся страница Papago: В Режиме Разделённой Панели Google: На Месте - Обновить конфигурацию AdBlock - Запустить обновление сайтов AdBlock - URL списка AdBlock - Если вы хотите использовать другую конфигурацию AdBlock, отредактируйте данный URL - Автообновление AdBlock - Автоматически обновлять конфигурацию AdBlock каждую неделю - AdBlock обновлён! Резервная копия успешно создана! Показывать окно ошибок SSL Показывать окно ошибки, когда что-то идёт не так с SSL diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3f3d7db8..2bd2fac7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -156,7 +156,7 @@ Right Left Center - Don't Show + Don\'t Show Custom What should be shown at the start of the \"Overview\"? (start page, your bookmarks...) @@ -337,7 +337,7 @@ Receive data Copy link Load non-active tabs - If tab is not activated, still load it's content in background + If tab is not activated, still load it\'s content in background The certificate of the site is not trusted. Proceed anyway? Search Table of Contents