From b863acabf326b07c6c12d1375124c09353ec765a Mon Sep 17 00:00:00 2001 From: Secozzi Date: Tue, 14 May 2024 10:22:47 +0200 Subject: [PATCH] =?UTF-8?q?Fix=20#126:=20Inconsistent=20button=20height=20?= =?UTF-8?q?with=20some=20languages=20in=20"Data=20and=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … storage" (#202) * replace the windowInsetsPadding for navigationBarsPadding + statusBarsPadding * Fixing bug in the MultiChoiceSegmentedButtonRow * Rollback file Co-authored-by: Theodoro Loureiro mota <9647399+theolm@users.noreply.github.com> --- .../presentation/more/settings/screen/SettingsDataScreen.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDataScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDataScreen.kt index 85b5178aa..7c0c9c7c2 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDataScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDataScreen.kt @@ -7,8 +7,11 @@ import android.net.Uri import androidx.activity.compose.ManagedActivityResultLauncher import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.foundation.layout.IntrinsicSize import androidx.compose.foundation.layout.RowScope +import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.outlined.HelpOutline @@ -191,9 +194,11 @@ object SettingsDataScreen : SearchableSettings { MultiChoiceSegmentedButtonRow( modifier = Modifier .fillMaxWidth() + .height(intrinsicSize = IntrinsicSize.Min) .padding(horizontal = PrefsHorizontalPadding), ) { SegmentedButton( + modifier = Modifier.fillMaxHeight(), checked = false, onCheckedChange = { navigator.push(CreateBackupScreen()) }, shape = SegmentedButtonDefaults.itemShape(0, 2), @@ -201,6 +206,7 @@ object SettingsDataScreen : SearchableSettings { Text(stringResource(MR.strings.pref_create_backup)) } SegmentedButton( + modifier = Modifier.fillMaxHeight(), checked = false, onCheckedChange = { if (!BackupRestoreJob.isRunning(context)) {