Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow scrolling in restore confirmation dialog

Browse Source 
Fixes #9460

(cherry picked from commit 2f5eb73d294fc99c3d8a5ace9812e90a3cb1c2d0)
This commit is contained in:
arkon 2023-05-06 12:18:52 -04:00 committed by Jobobby04
parent c2e35a7806
commit 1234081cef
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt
View File

@ -10,11 +10,14 @@ import androidx.activity.result.contract.ActivityResultContracts
import androidx.annotation.StringRes import androidx.annotation.StringRes
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.AlertDialog import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Checkbox import androidx.compose.material3.Checkbox
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
@ -259,18 +262,30 @@ object SettingsBackupScreen : SearchableSettings {
onDismissRequest = onDismissRequest, onDismissRequest = onDismissRequest,
title = { Text(text = stringResource(R.string.pref_restore_backup)) }, title = { Text(text = stringResource(R.string.pref_restore_backup)) },
text = { text = {
val msg = buildString { Column(
append(stringResource(R.string.backup_restore_content_full)) modifier = Modifier.verticalScroll(rememberScrollState()),
if (err.sources.isNotEmpty()) { ) {
append("\n\n").append(stringResource(R.string.backup_restore_missing_sources)) val msg = buildString {
err.sources.joinTo(this, separator = "\n- ", prefix = "\n- ") append(stringResource(R.string.backup_restore_content_full))
} if (err.sources.isNotEmpty()) {
if (err.trackers.isNotEmpty()) { append("\n\n").append(stringResource(R.string.backup_restore_missing_sources))
append("\n\n").append(stringResource(R.string.backup_restore_missing_trackers)) err.sources.joinTo(
err.trackers.joinTo(this, separator = "\n- ", prefix = "\n- ") this,
separator = "\n- ",
prefix = "\n- ",
)
}
if (err.trackers.isNotEmpty()) {
append("\n\n").append(stringResource(R.string.backup_restore_missing_trackers))
err.trackers.joinTo(
this,
separator = "\n- ",
prefix = "\n- ",
)
}
} }
Text(text = msg)
} }
Text(text = msg)
}, },
confirmButton = { confirmButton = {
TextButton( TextButton(
@ -331,7 +346,7 @@ object SettingsBackupScreen : SearchableSettings {
} }
@Composable @Composable
fun getAutomaticBackupGroup( private fun getAutomaticBackupGroup(
backupPreferences: BackupPreferences, backupPreferences: BackupPreferences,
): Preference.PreferenceGroup { ): Preference.PreferenceGroup {
val context = LocalContext.current val context = LocalContext.current
@ -406,7 +421,7 @@ private data class MissingRestoreComponents(
val trackers: List<String>, val trackers: List<String>,
) )
data class InvalidRestore( private data class InvalidRestore(
val uri: Uri, val uri: Uri,
val message: String, val message: String,
) )