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

Remove remaining usages of platform-provided strings

Browse Source 
(cherry picked from commit 5619a4c0d995774a4ba4e4030f639a62a708b771)
This commit is contained in:
arkon 2023-10-14 11:11:05 -04:00 committed by Jobobby04
parent 6b34266032
commit 868a27110a
19 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceDialogs.kt
View File

@ -61,7 +61,7 @@ fun SavedSearchDeleteDialog(
onDismissRequest = onDismissRequest,
confirmButton = {
TextButton(onClick = onDismissRequest) {
Text(text = stringResource(android.R.string.cancel))
Text(text = stringResource(R.string.action_cancel))
}
},
dismissButton = {

2
app/src/main/java/eu/kanade/presentation/browse/components/MigrationExitDialog.kt
View File

@ -21,7 +21,7 @@ fun MigrationExitDialog(
},
dismissButton = {
TextButton(onClick = onDismissRequest) {
Text(text = stringResource(android.R.string.cancel))
Text(text = stringResource(R.string.action_cancel))
}
},
title = {

2
app/src/main/java/eu/kanade/presentation/browse/components/MigrationMangaDialog.kt
View File

@ -34,7 +34,7 @@ fun MigrationMangaDialog(
},
dismissButton = {
TextButton(onClick = onDismissRequest) {
Text(text = stringResource(android.R.string.cancel))
Text(text = stringResource(R.string.action_cancel))
}
},
text = {

4
app/src/main/java/eu/kanade/presentation/browse/components/SourceFeedDialogs.kt
View File

@ -22,7 +22,7 @@ fun SourceFeedAddDialog(
},
dismissButton = {
TextButton(onClick = onDismissRequest) {
Text(text = stringResource(android.R.string.cancel))
Text(text = stringResource(R.string.action_cancel))
}
},
title = {
@ -48,7 +48,7 @@ fun SourceFeedDeleteDialog(
},
dismissButton = {
TextButton(onClick = onDismissRequest) {
Text(text = stringResource(android.R.string.cancel))
Text(text = stringResource(R.string.action_cancel))
}
},
title = {

2
app/src/main/java/eu/kanade/presentation/library/components/SyncFavoritesConfirmDialog.kt
View File

@ -22,7 +22,7 @@ fun SyncFavoritesConfirmDialog(
},
dismissButton = {
TextButton(onClick = onDismissRequest) {
Text(text = stringResource(android.R.string.cancel))
Text(text = stringResource(R.string.action_cancel))
}
},
title = {

2
app/src/main/java/eu/kanade/presentation/manga/ChapterSettingsDialog.kt
View File

@ -242,7 +242,7 @@ private fun SetAsDefaultDialog(
},
dismissButton = {
TextButton(onClick = onDismissRequest) {
Text(text = stringResource(android.R.string.cancel))
Text(text = stringResource(R.string.action_cancel))
}
},
confirmButton = {

2
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt
View File

@ -542,7 +542,7 @@ object SettingsAdvancedScreen : SearchableSettings {
},
dismissButton = {
TextButton(onClick = onDismissRequest) {
Text(text = stringResource(android.R.string.cancel))
Text(text = stringResource(R.string.action_cancel))
}
},
)

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

@ -250,7 +250,7 @@ object SettingsBackupScreen : SearchableSettings {
onDismissRequest()
},
) {
Text(text = stringResource(android.R.string.copy))
Text(text = stringResource(R.string.action_copy_to_clipboard))
}
},
confirmButton = {

8
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsEhScreen.kt
View File

@ -308,7 +308,7 @@ object SettingsEhScreen : SearchableSettings {
},
dismissButton = {
TextButton(onClick = onDismissRequest) {
Text(text = stringResource(android.R.string.cancel))
Text(text = stringResource(R.string.action_cancel))
}
},
title = {
@ -593,7 +593,7 @@ object SettingsEhScreen : SearchableSettings {
},
dismissButton = {
TextButton(onClick = onDismissRequest) {
Text(text = stringResource(android.R.string.cancel))
Text(text = stringResource(R.string.action_cancel))
}
},
)
@ -759,7 +759,7 @@ object SettingsEhScreen : SearchableSettings {
},
dismissButton = {
TextButton(onClick = onDismissRequest) {
Text(text = stringResource(android.R.string.cancel))
Text(text = stringResource(R.string.action_cancel))
}
},
)
@ -889,7 +889,7 @@ object SettingsEhScreen : SearchableSettings {
},
dismissButton = {
TextButton(onClick = onDismissRequest) {
Text(text = stringResource(android.R.string.cancel))
Text(text = stringResource(R.string.action_cancel))
}
},
properties = DialogProperties(

4
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMangadexScreen.kt
View File

@ -93,7 +93,7 @@ object SettingsMangadexScreen : SearchableSettings {
},
dismissButton = {
TextButton(onClick = onDismissRequest) {
Text(text = stringResource(android.R.string.cancel))
Text(text = stringResource(R.string.action_cancel))
}
},
)
@ -238,7 +238,7 @@ object SettingsMangadexScreen : SearchableSettings {
},
dismissButton = {
TextButton(onClick = onDismissRequest) {
Text(text = stringResource(android.R.string.cancel))
Text(text = stringResource(R.string.action_cancel))
}
},
)

4
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSecurityScreen.kt
View File

@ -274,7 +274,7 @@ object SettingsSecurityScreen : SearchableSettings {
},
dismissButton = {
TextButton(onClick = onDismissRequest) {
Text(text = stringResource(android.R.string.cancel))
Text(text = stringResource(R.string.action_cancel))
}
},
)
@ -349,7 +349,7 @@ object SettingsSecurityScreen : SearchableSettings {
},
dismissButton = {
TextButton(onClick = onDismissRequest) {
Text(text = stringResource(android.R.string.cancel))
Text(text = stringResource(R.string.action_cancel))
}
},
)

2
app/src/main/java/eu/kanade/presentation/more/settings/screen/about/WhatsNewDialog.kt
View File

@ -39,7 +39,7 @@ fun WhatsNewDialog(onDismissRequest: () -> Unit) {
onDismissRequest = onDismissRequest,
confirmButton = {
TextButton(onClick = onDismissRequest) {
Text(text = stringResource(android.R.string.cancel))
Text(text = stringResource(R.string.action_cancel))
}
},
title = {

4
app/src/main/java/eu/kanade/presentation/track/TrackInfoDialogSelector.kt
View File

@ -171,7 +171,7 @@ fun TrackDateSelector(
Spacer(modifier = Modifier.weight(1f))
}
TextButton(onClick = onDismissRequest) {
Text(text = stringResource(android.R.string.cancel))
Text(text = stringResource(R.string.action_cancel))
}
TextButton(onClick = { onConfirm(pickerState.selectedDateMillis!!) }) {
Text(text = stringResource(R.string.action_ok))
@ -209,7 +209,7 @@ private fun BaseSelector(
Spacer(modifier = Modifier.weight(1f))
}
TextButton(onClick = onDismissRequest) {
Text(text = stringResource(android.R.string.cancel))
Text(text = stringResource(R.string.action_cancel))
}
TextButton(onClick = onConfirm) {
Text(text = stringResource(R.string.action_ok))

4
app/src/main/java/eu/kanade/presentation/webview/EhLoginWebViewScreen.kt
View File

@ -139,7 +139,7 @@ fun EhLoginWebViewScreen(
horizontalArrangement = Arrangement.SpaceBetween,
) {
Button(onClick = onUp, Modifier.weight(0.5F)) {
Text(text = stringResource(android.R.string.cancel))
Text(text = stringResource(R.string.action_cancel))
}
Button(onClick = { showAdvancedOptions = true }, Modifier.weight(0.5F)) {
Text(text = stringResource(R.string.pref_category_advanced))
@ -194,7 +194,7 @@ fun EhLoginWebViewScreen(
Text(text = stringResource(R.string.custom_igneous_cookie))
}
Button(onClick = { showAdvancedOptions = false }, Modifier.fillMaxWidth()) {
Text(text = stringResource(android.R.string.cancel))
Text(text = stringResource(R.string.action_cancel))
}
}
}

4
app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt
View File

@ -88,7 +88,7 @@ fun EditMangaDialog(
},
dismissButton = {
TextButton(onClick = onDismissRequest) {
Text(stringResource(android.R.string.cancel))
Text(stringResource(R.string.action_cancel))
}
},
text = {
@ -240,7 +240,7 @@ private fun ChipGroup.setChips(items: List<String>, scope: CoroutineScope) {
.setPositiveButton(R.string.action_ok) { _, _ ->
if (newTag != null) setChips(items + listOfNotNull(newTag), scope)
}
.setNegativeButton(android.R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
}
}

2
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
View File

@ -451,7 +451,7 @@ class MangaScreen(
dialog.dismiss()
openMangaInWebView(navigator, mergedManga[index], sources[index] as? HttpSource)
}
.setNegativeButton(android.R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
}

8
app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsDialog.kt
View File

@ -91,7 +91,7 @@ class EditMergedSettingsState(
onDeleteClick(mergeMangaReference)
onDismissRequest()
}
.setNegativeButton(android.R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
}
@ -102,7 +102,7 @@ class EditMergedSettingsState(
.setPositiveButton(R.string.action_ok) { _, _ ->
toggleChapterUpdates(position)
}
.setNegativeButton(android.R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
}
@ -130,7 +130,7 @@ class EditMergedSettingsState(
.setPositiveButton(R.string.action_ok) { _, _ ->
toggleChapterDownloads(position)
}
.setNegativeButton(android.R.string.cancel, null)
.setNegativeButton(R.string.action_cancel, null)
.show()
}
@ -177,7 +177,7 @@ fun EditMergedSettingsDialog(
},
dismissButton = {
TextButton(onClick = onDismissRequest) {
Text(stringResource(android.R.string.cancel))
Text(stringResource(R.string.action_cancel))
}
},
text = {

2
app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackInfoDialog.kt
View File

@ -593,7 +593,7 @@ private data class TrackDateRemoverScreen(
horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.small, Alignment.End),
) {
TextButton(onClick = navigator::pop) {
Text(text = stringResource(android.R.string.cancel))
Text(text = stringResource(R.string.action_cancel))
}
FilledTonalButton(
onClick = {

2
app/src/main/java/exh/pagepreview/components/PagePreviewScreen.kt
View File

@ -141,7 +141,7 @@ fun PagePreviewPageDialog(
},
dismissButton = {
TextButton(onClick = onDismissPageDialog) {
Text(stringResource(android.R.string.cancel))
Text(stringResource(R.string.action_cancel))
}
},
title = {