From 0708640ad4084a33aa4dea7cbdf4a2baeabb61e8 Mon Sep 17 00:00:00 2001 From: pylixonly <82711525+pylixonly@users.noreply.github.com> Date: Mon, 14 Jul 2025 16:10:23 +0800 Subject: [PATCH] refactor(l10n): Unhardcode values and use proper name --- .../download/DownloadDiscordRNABaseStep.kt | 2 +- .../download/DownloadDiscordRNALangStep.kt | 2 +- .../download/DownloadDiscordRNALibStep.kt | 2 +- .../DownloadDiscordRNAResourcesStep.kt | 2 +- .../download/DownloadWintryXposedStep.kt | 2 +- .../steps/install/InjectWintryXposedStep.kt | 2 +- .../steps/prepare/FetchDiscordRNAStep.kt | 2 +- .../home/components/InstalledItemCard.kt | 2 +- .../screens/patchopts/PatchOptionsScreen.kt | 10 ++++---- .../manager/ui/util/DiscordVersion.kt | 2 +- app/src/main/res/values/strings.xml | 24 +++++++++++-------- 11 files changed, 28 insertions(+), 24 deletions(-) diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordRNABaseStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordRNABaseStep.kt index bc3b528..2b26ce5 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordRNABaseStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordRNABaseStep.kt @@ -11,6 +11,6 @@ class DownloadDiscordRNABaseStep : DownloadDiscordRNAStep() { override val targetUrl get() = "$BASE_URL/tracker/download/$version/base" override val targetFile get() = paths.discordApkVersionCache(version).resolve("base.apk") - override val localizedName = R.string.downloading_base_apk + override val localizedName = R.string.patch_step_dl_baseapk } diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordRNALangStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordRNALangStep.kt index 8c15f3c..8b15be3 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordRNALangStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordRNALangStep.kt @@ -12,5 +12,5 @@ class DownloadDiscordRNALangStep : DownloadDiscordRNAStep() { override val targetUrl get() = "$BASE_URL/tracker/download/$version/config.en" override val targetFile get() = paths.discordApkVersionCache(version).resolve("config.en.apk") - override val localizedName = R.string.download_libs_apk + override val localizedName = R.string.patch_step_dl_libapk } diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordRNALibStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordRNALibStep.kt index 7242f36..56ddb87 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordRNALibStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordRNALibStep.kt @@ -13,5 +13,5 @@ class DownloadDiscordRNALibStep : DownloadDiscordRNAStep() { override val targetUrl get() = "$BASE_URL/tracker/download/$version/config.$arch" override val targetFile get() = paths.discordApkVersionCache(version).resolve("config.$arch.apk") - override val localizedName = R.string.downloading_libs_apk + override val localizedName = R.string.patch_step_dl_libapk } diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordRNAResourcesStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordRNAResourcesStep.kt index eb6572a..91eee2d 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordRNAResourcesStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadDiscordRNAResourcesStep.kt @@ -11,5 +11,5 @@ class DownloadDiscordRNAResourcesStep : DownloadDiscordRNAStep() { override val targetUrl get() = "$BASE_URL/tracker/download/$version/config.xxhdpi" override val targetFile get() = paths.discordApkVersionCache(version).resolve("config.xxhdpi.apk") - override val localizedName = R.string.downloading_resources_apk + override val localizedName = R.string.patch_step_dl_resapk } diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadWintryXposedStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadWintryXposedStep.kt index f35931f..eafb448 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadWintryXposedStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/download/DownloadWintryXposedStep.kt @@ -13,7 +13,7 @@ class DownloadWintryXposedStep : DownloadStep() { private val paths: PathManager by inject() private val wintryGithubService: WintryGithubService by inject() - override val localizedName = R.string.downloading_wintryxposed + override val localizedName = R.string.patch_step_dl_wtxposed override val targetFile get() = paths.cachedWintryXposed(targetVersion) override lateinit var targetUrl: String diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/install/InjectWintryXposedStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/install/InjectWintryXposedStep.kt index 8b38e97..10f028c 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/install/InjectWintryXposedStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/install/InjectWintryXposedStep.kt @@ -16,7 +16,7 @@ import java.io.File class InjectWintryXposedStep : Step() { override val group: StepGroup = StepGroup.Install - override val localizedName: Int = R.string.injecting_wintryxposed_with_lspatch + override val localizedName: Int = R.string.patch_step_inject_wintry suspend fun patch( container: StepRunner, diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/prepare/FetchDiscordRNAStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/prepare/FetchDiscordRNAStep.kt index 6ad533a..f8d5ee3 100644 --- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/prepare/FetchDiscordRNAStep.kt +++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/prepare/FetchDiscordRNAStep.kt @@ -16,7 +16,7 @@ class FetchDiscordRNAStep(val options: PatchOptions) : Step(), KoinComponent { private val rnaTrackerService: RNATrackerService by inject() override val group: StepGroup = StepGroup.Prepare - override val localizedName: Int = R.string.fetching_latest_discord_info + override val localizedName: Int = R.string.patch_step_fetch_rna var targetVersion by Delegates.notNull() private set diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/home/components/InstalledItemCard.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/home/components/InstalledItemCard.kt index ecf81ca..6107099 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/home/components/InstalledItemCard.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/home/components/InstalledItemCard.kt @@ -99,7 +99,7 @@ fun InstalledItemCard( if (data.isUpToDate != false) SegmentedButton( icon = painterResource(R.drawable.ic_refresh), - text = stringResource(R.string.reinstall), + text = stringResource(R.string.action_reinstall), onClick = onUpdate, ) else { diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patchopts/PatchOptionsScreen.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patchopts/PatchOptionsScreen.kt index c34c786..1d26b05 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patchopts/PatchOptionsScreen.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patchopts/PatchOptionsScreen.kt @@ -251,9 +251,9 @@ fun PatchOptionsScreenContent( } SelectPatchOption( - icon = painterResource(R.drawable.ic_app_shortcut), - name = "Preferred version", - description = "Choose which release channel or input a custom version code to use for installation.", + icon = painterResource(R.drawable.ic_code), + name = stringResource(R.string.patchopts_verchannel_title), + description = stringResource(R.string.patchopts_verchannel_desc), options = VersionPreference.entries.map { it.name }, selectedOption = versionPreference.name, onOptionSelected = { selected -> @@ -266,8 +266,8 @@ fun PatchOptionsScreenContent( label = "Custom version code option visibility" ) { TextPatchOption( - name = "Custom version code", - description = "Input a custom version code to use for installation.", + name = stringResource(R.string.patchopts_vercode_title), + description = stringResource(R.string.patchopts_vercode_desc), value = customVersionCode, valueIsError = customVersionCodeIsError, valueIsDefault = customVersionCode == PatchOptions.Default.customVersionCode, diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/util/DiscordVersion.kt b/app/src/main/kotlin/com/aliucord/manager/ui/util/DiscordVersion.kt index 7ce4df9..6e486dd 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/util/DiscordVersion.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/util/DiscordVersion.kt @@ -48,7 +48,7 @@ sealed interface DiscordVersion : Comparable, Parcelable { @Composable fun toDisplayName() = when (this) { is Error -> stringResource(R.string.version_load_fail) - is Invalid -> stringResource(R.string.invalid_version_code_format) + is Invalid -> stringResource(R.string.version_invalid_code) is None -> stringResource(R.string.version_none) is Existing -> when (type) { Type.STABLE -> stringResource(R.string.version_stable) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 35009bd..f3f8cb9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -34,6 +34,7 @@ Exit Anyways Open Info Reset to default + Reinstall Grant Permissions In order for Aliucord Manager to function, file permissions are required. Since shared data is stored in ~/Aliucord, permissions are required in order to access it. @@ -89,6 +90,8 @@ Alpha Unknown Failed to retrieve version + Invalid version code format + Saved to %s Failed to save %s @@ -116,6 +119,7 @@ Patch APK Install APK + Fetching latest Discord info Fetching target Discord version Checking for newer installations Restoring from cache @@ -137,6 +141,12 @@ Installing APK Cleaning up + Downloading base APK + Downloading libs apk + Downloading resources apk + Injecting WintryXposed with LSPatch + Downloading WintryXposed + Queued Ongoing Skipped @@ -174,6 +184,10 @@ Basic Advanced The selected icon options are invalid! + Version channel + Select the release channel to install from, or choose \'Custom\' to enter a specific version code. + Custom Version Code + Manually enter a Discord version code to fetch and install. Icon Replacement Old Discord @@ -246,14 +260,4 @@ There was an attempt to make Aliucord run on iOS… veeeee 😭 - Download libs apk - Downloading base APK - Downloading libs apk - Downloading resources apk - Injecting WintryXposed with LSPatch - Downloading WintryXposed - Version Code - Fetching latest Discord info - Invalid version code format - Reinstall