From 1851a35e10274a88feafd0262e2c7cfdc1c763fd Mon Sep 17 00:00:00 2001 From: Ushie Date: Wed, 5 Feb 2025 19:04:36 +0300 Subject: [PATCH] Revert api_source to api_url --- .../screen/settings/AdvancedSettingsScreen.kt | 14 +- app/src/main/res/values/strings.xml | 162 ++++++++++++------ 2 files changed, 116 insertions(+), 60 deletions(-) diff --git a/app/src/main/java/app/revanced/manager/ui/screen/settings/AdvancedSettingsScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/settings/AdvancedSettingsScreen.kt index e1098ae5..5debca50 100644 --- a/app/src/main/java/app/revanced/manager/ui/screen/settings/AdvancedSettingsScreen.kt +++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/AdvancedSettingsScreen.kt @@ -122,7 +122,7 @@ fun AdvancedSettingsScreen( GroupHeader(stringResource(R.string.manager)) SettingsListItem( - headlineContent = stringResource(R.string.api_source), + headlineContent = stringResource(R.string.api_url), supportingContent = apiUrl, modifier = Modifier.clickable { showApiUrlDialog = true @@ -222,7 +222,7 @@ private fun APIUrlDialog(currentUrl: String, defaultUrl: String, onSubmit: (Stri onSubmit(url) } ) { - Text(stringResource(R.string.api_source_dialog_save)) + Text(stringResource(R.string.api_url_dialog_save)) } }, dismissButton = { @@ -235,7 +235,7 @@ private fun APIUrlDialog(currentUrl: String, defaultUrl: String, onSubmit: (Stri }, title = { Text( - text = stringResource(R.string.api_source_dialog_title), + text = stringResource(R.string.api_url_dialog_title), style = MaterialTheme.typography.headlineSmall.copy(textAlign = TextAlign.Center), color = MaterialTheme.colorScheme.onSurface, ) @@ -245,12 +245,12 @@ private fun APIUrlDialog(currentUrl: String, defaultUrl: String, onSubmit: (Stri verticalArrangement = Arrangement.spacedBy(16.dp) ) { Text( - text = stringResource(R.string.api_source_dialog_description), + text = stringResource(R.string.api_url_dialog_description), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant ) Text( - text = stringResource(R.string.api_source_dialog_warning), + text = stringResource(R.string.api_url_dialog_warning), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.error ) @@ -258,10 +258,10 @@ private fun APIUrlDialog(currentUrl: String, defaultUrl: String, onSubmit: (Stri modifier = Modifier.fillMaxWidth(), value = url, onValueChange = { url = it }, - label = { Text(stringResource(R.string.api_source)) }, + label = { Text(stringResource(R.string.api_url)) }, trailingIcon = { IconButton(onClick = { url = defaultUrl }) { - Icon(Icons.Outlined.Restore, stringResource(R.string.api_source_dialog_reset)) + Icon(Icons.Outlined.Restore, stringResource(R.string.api_url_dialog_reset)) } } ) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ccdb591d..3683d08d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -8,7 +8,8 @@ ReVanced Patcher ReVanced Manager plugin host - Used to control access to ReVanced Manager plugins. Only ReVanced Manager has this. + Used to control access to ReVanced Manager + plugins. Only ReVanced Manager has this. Copied! Copy to clipboard @@ -18,8 +19,10 @@ Select an app %1$d/%2$d selected - New downloader plugins available. Click here to configure them. - Patching on this device architecture is unsupported and will most likely fail. + New downloader plugins available. Click here + to configure them. + Patching on this device architecture is + unsupported and will most likely fail. Import Import patch bundle @@ -38,15 +41,20 @@ Unnamed Android 11 bug - The app installation permission must be granted ahead of time to avoid a bug in the Android 11 system that will negatively affect the user experience. + The app installation permission must be granted + ahead of time to avoid a bug in the Android 11 system that will negatively affect the user + experience. Any available version Select source Auto - Use all installed downloaders to find a suitable APK file + Use all installed downloaders to find a + suitable APK file No plugins available - Mounted apps cannot be patched again without root access - Version %s does not match the suggested version + Mounted apps cannot be patched again + without root access + Version %s does not + match the suggested version Start patching the application Patch selection and options @@ -62,7 +70,8 @@ Could not import legacy settings Configure updates - Do you want ReVanced Manager to periodically check for updates for the following components? + Do you want ReVanced Manager to periodically + check for updates for the following components? ReVanced Manager ReVanced Patches These settings can be changed later. @@ -84,7 +93,8 @@ About Open source licenses - View all the libraries used to make this application + View all the libraries used to make this + application Contributors View the contributors of ReVanced @@ -94,14 +104,19 @@ Choose between light, dark, and system provided mode Safeguards Allow unsupported compatibility - Permit apps and patches to be mixed in unsupported state - Selecting incompatible patches can result in a broken app.\n\nAllow anyways? + Permit apps and patches to be mixed in + unsupported state + Selecting incompatible patches can result + in a broken app.\n\nAllow anyways? Allow changing patch selection - Permit selecting or deselecting patches from default - Changing the selection of patches may cause unexpected issues.\n\nAllow anyways? + Permit selecting or deselecting patches + from default + Changing the selection of patches may + cause unexpected issues.\n\nAllow anyways? Allow universal patch Permit selecting app\'s generic patch - Universal patch are not as well tested as those that target specific apps.\n\nAllow anyways? + Universal patch are not as well tested + as those that target specific apps.\n\nAllow anyways? Backup Restore Keystore @@ -109,7 +124,8 @@ Patch options Restore keystore from external source Enter keystore credentials - You\'ll need enter the keystore’s credentials to restore it. + You\'ll need enter the keystore’s credentials + to restore it. Username (Alias) Password Import @@ -121,19 +137,23 @@ Regeneration Replace current keystore with new one The keystore has been successfully replaced - Export app’s patch selections into usable file + Export app’s patch selections into usable + file Could not import patch selection: %s Patch selection successfully restored - Import app’s patch selections from external source + Import app’s patch selections from external + source Could not backup patch selection: %s Patch selection successfully restored Reset patch selection Reset the stored patch selection Patch selection successfully reset Reset for app - Use the default patch options configuration for a single app + Use the default patch options + configuration for a single app Reset for bundle - Use the default patch options configuration for all patches in a bundle + Use the default patch options + configuration for all patches in a bundle Use the default patch options configuration Plugins Trusted @@ -177,17 +197,20 @@ Run patcher in another process Faster and allows patcher to use more memory Patcher process memory limit - The max amount of memory that the patcher process can use (in megabytes) + The max amount of memory that the + patcher process can use (in megabytes) Export debug logs Failed to read logs (exit code %d) Failed to export logs Exported logs - API Source - Set custom API Source - Set the API Source of ReVanced Manager. ReVanced Manager uses the API to download patches and updates. - ReVanced Manager connects to the API to download patches and updates. Make sure that you trust it. - Set - Reset API Source + API Source + Set custom API Source + Set the API Source of ReVanced Manager. ReVanced + Manager uses the API to download patches and updates. + ReVanced Manager connects to the API to download patches + and updates. Make sure that you trust it. + Set + Reset API Source Testing Disable all safeguards Device @@ -218,22 +241,32 @@ %s selected Incompatible patches Universal patches - Patch selection and options has been reset to recommended defaults + Patch selection and options has been reset to + recommended defaults Patch options have been reset Non suggested version - The version of the app you have selected does not match the suggested version.\nPlease use the suggested version: %s\n\nTo continue anyway, disable \"Require suggested app version\" in the advanced settings. + The version of the app you have + selected does not match the suggested version.\nPlease use the suggested version: %s\n\nTo + continue anyway, disable \"Require suggested app version\" in the advanced settings. Stop using defaults? - It is recommended to use the default patch selection and options. Changing them may result in unexpected issues.\n\nYou need to turn on \"Allow changing patch selection\" in the advanced settings before toggling patches. - Universal patches have a more generalized use and do not work as reliably as patches that target specific apps. You may encounter issues while using them.\n\nThis warning can be disabled in the advanced settings. + It is recommended to use the default patch + selection and options. Changing them may result in unexpected issues.\n\nYou need to turn on + \"Allow changing patch selection\" in the advanced settings before toggling patches. + Universal patches have a more generalized use + and do not work as reliably as patches that target specific apps. You may encounter issues + while using them.\n\nThis warning can be disabled in the advanced settings. This version Any app Unsupported Search patches - This patch is not compatible with the selected app version (%1$s).\n\nIt only supports the following version(s): %2$s. + This patch is not compatible with the selected app version + (%1$s).\n\nIt only supports the following version(s): %2$s. Continue with this version? - Not all patches support this version (%s). Do you want to continue anyway? + Not all patches support this version (%s). Do you want to + continue anyway? Download application? - The app you selected isn\'t installed. Do you want to download it? + The app you selected isn\'t installed. Do you want to download + it? Failed to load APK Loading… Not installed @@ -263,7 +296,8 @@ Downloader did not find the app Downloader error: %s No plugins installed. - No trusted plugins available for use. Check your settings. + No trusted plugins available for use. Check your + settings. Already patched Filter @@ -291,7 +325,8 @@ APK Saved Failed to sign APK: %s Save logs - User interaction is required in order to proceed with this plugin. + User interaction is required in order to proceed with + this plugin. Select installation type Preparing @@ -333,13 +368,17 @@ Successfully updated %s No update available for %s Auto update - Automatically update this bundle when ReVanced starts + Automatically update this bundle when ReVanced + starts View patches Any version Any package About ReVanced Manager - ReVanced Manager is an application designed to work with ReVanced Patcher, which allows for long-lasting patches to be created for Android apps. The patching system is designed to automatically work with new versions of apps with minimal maintenance. + ReVanced Manager is an application designed to work + with ReVanced Patcher, which allows for long-lasting patches to be created for Android apps. + The patching system is designed to automatically work with new versions of apps with minimal + maintenance. An update is available Current version: %s New version: %s @@ -347,12 +386,15 @@ Update installed Failed to install update Check for update - Automatically check for new version when the app launched + Automatically check for new version when the + app launched View changelogs Loading changelog Failed to download changelog: %s Check out the latest changes in this update - Battery optimizations must be turned off in order for ReVanced Manager to work correctly in the background. Click here to turn off optimizations. + Battery optimizations must be turned off in + order for ReVanced Manager to work correctly in the background. Click here to turn off + optimizations. Installing update… Downloading update… Failed to download update: %s @@ -361,7 +403,8 @@ Save (%1$s) Update Empty - Tap on Update when prompted. \n ReVanced Manager will close when updating. + Tap on Update when prompted. \n ReVanced Manager will + close when updating. No changelogs found Just now %sm ago @@ -377,18 +420,22 @@ No update available Checking for updates… Not now - A new version of ReVanced Manager (%s) is available. + A new version of ReVanced Manager (%s) is + available. Failed to download update: %s Download - You are currently on a metered connection, and data charges from your service provider may apply.\n\nDo you still want to continue? + You are currently on a metered connection, and data + charges from your service provider may apply.\n\nDo you still want to continue? Download update? No contributors found Select Select or deselect all Add new bundle Add a new bundle from a URL or storage - Import local files from your storage, does not automatically update - Import remote files from a URL, can automatically update + Import local files from your storage, does not + automatically update + Import remote files from a URL, can automatically + update Recommended Installation failed @@ -399,13 +446,20 @@ Installation invalid Not enough storage Installation timed out - The installation failed due to an unknown reason. Try again? - The installation was cancelled manually. Try again? - The installation was blocked. Review your device security settings and try again. - The installation was prevented by an existing installation of the app. Uninstall the installed app and try again? - The app is incompatible with this device. Use an APK that is supported by this device and try again. - The app is invalid. Uninstall the app and try again? - The app could not be installed due to insufficient storage. Free up some space and try again. + The installation failed due to an unknown reason. + Try again? + The installation was cancelled manually. Try + again? + The installation was blocked. Review your device + security settings and try again. + The installation was prevented by an existing + installation of the app. Uninstall the installed app and try again? + The app is incompatible with this device. + Use an APK that is supported by this device and try again. + The app is invalid. Uninstall the app and try + again? + The app could not be installed due to + insufficient storage. Free up some space and try again. The installation took too long. Try again? Reinstall Show @@ -416,12 +470,14 @@ Add patch bundle Bundle URL Auto update - These patches are not compatible with the selected app version (%1$s).\n\nClick on the patches to see more details. + These patches are not compatible with the selected app + version (%1$s).\n\nClick on the patches to see more details. Unsupported patch Any Never show again Show update message on launch - Shows a popup notification whenever there is a new update available on launch. + Shows a popup notification + whenever there is a new update available on launch. Failed to import keystore Export \ No newline at end of file