lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add cancel button to backup and restore sheets

Browse Source
This commit is contained in:
MM20 2022-06-10 20:23:57 +02:00
parent 716a6e7af7
commit 02d45a63fc
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ui/src/main/java/de/mm20/launcher2/ui/common/RestoreBackupSheet.kt
View File

@ -14,11 +14,8 @@ import androidx.compose.runtime.livedata.observeAsState
import androidx.compose.ui.Alignment
import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel
import de.mm20.launcher2.backup.BackupCompatibility
@ -59,14 +56,23 @@ fun RestoreBackupSheet(
onClick = { viewModel.restore() }) {
Text(stringResource(R.string.preference_restore))
}
} else if (state == RestoreBackupState.InvalidFile || state == RestoreBackupState.Restored) {
} else if (state == RestoreBackupState.InvalidFile || state == RestoreBackupState.Restored || state == RestoreBackupState.Ready) {
OutlinedButton(
onClick = onDismissRequest
) {
Text(stringResource(R.string.close))
}
}
}
},
dismissButton = if (state == RestoreBackupState.Ready && compatibility != BackupCompatibility.Incompatible) {
{
OutlinedButton(
onClick = onDismissRequest
) {
Text(stringResource(android.R.string.cancel))
}
}
} else null
) {
when (state) {
RestoreBackupState.Parsing -> {

9
ui/src/main/java/de/mm20/launcher2/ui/settings/backup/CreateBackupSheet.kt
View File

@ -74,7 +74,14 @@ fun CreateBackupSheet(
Text(stringResource(R.string.close))
}
}
}
},
dismissButton = if (state == CreateBackupState.Ready) {{
OutlinedButton(
onClick = onDismissRequest
) {
Text(stringResource(android.R.string.cancel))
}
}} else null
) {
when (state) {
CreateBackupState.Ready -> {