* replace the windowInsetsPadding for navigationBarsPadding + statusBarsPadding * Fixing bug in the MultiChoiceSegmentedButtonRow * Rollback file (cherry picked from commit 1dd130df9ee389fbacb200ee7a13b6d625b372fc)
This commit is contained in:
parent
df4eb4ebfc
commit
20da43ca58
1 changed files with 6 additions and 0 deletions
|
|
@ -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)) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue