From 9fbd2027912d3f6d0db24abff7bd22dc5f2ce087 Mon Sep 17 00:00:00 2001 From: validcube Date: Thu, 4 Jul 2024 23:19:52 +0700 Subject: [PATCH 1/8] chore: Add Preview to API URL Dialog --- .../manager/ui/screen/settings/AdvancedSettingsScreen.kt | 7 +++++++ 1 file changed, 7 insertions(+) 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 3817bd12eb..a018a46f7a 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 @@ -29,6 +29,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.core.content.getSystemService import androidx.lifecycle.viewModelScope @@ -164,6 +165,12 @@ fun AdvancedSettingsScreen( } } +@Preview +@Composable +private fun APIUrlDialogPreview() { + APIUrlDialog("https://example.com", {}) +} + @Composable private fun APIUrlDialog(currentUrl: String, onSubmit: (String?) -> Unit) { var url by rememberSaveable(currentUrl) { mutableStateOf(currentUrl) } From a70601f6c204bd02e01596be84ba23fa5e6d18e3 Mon Sep 17 00:00:00 2001 From: validcube Date: Thu, 4 Jul 2024 23:21:02 +0700 Subject: [PATCH 2/8] feat: API URL Dialog v2 --- .../manager/ui/screen/settings/AdvancedSettingsScreen.kt | 4 ++-- app/src/main/res/values/strings.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 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 a018a46f7a..60c9282b05 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 @@ -10,7 +10,7 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Http +import androidx.compose.material.icons.outlined.Api import androidx.compose.material3.AlertDialog import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon @@ -192,7 +192,7 @@ private fun APIUrlDialog(currentUrl: String, onSubmit: (String?) -> Unit) { } }, icon = { - Icon(Icons.Outlined.Http, null) + Icon(Icons.Outlined.Api, null) }, title = { Text( diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4fd92ba93e..e9cb5c34dd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -148,8 +148,8 @@ Exported logs API URL Set custom API URL - You may have issues with features when using a custom API URL. - Only use API\'s you trust! + This will change the default API\'s link to alternative link, by default we recommend that you use the provided URL to the API. + We do not operate or verify any alternative APIs, only use API that you trust. Set Device Android version From a822c25a3565bf22d27dc515b217315a3966448d Mon Sep 17 00:00:00 2001 From: Pun Butrach Date: Sun, 7 Jul 2024 15:45:17 +0700 Subject: [PATCH 3/8] refactor: Use proper wording for the dialog Co-authored-by: oSumAtrIX --- app/src/main/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e9cb5c34dd..e8adc58846 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -148,8 +148,8 @@ Exported logs API URL Set custom API URL - This will change the default API\'s link to alternative link, by default we recommend that you use the provided URL to the API. - We do not operate or verify any alternative APIs, only use API that you trust. + Set the API URL 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 Device Android version From bd453b57235ba05d087f50a07a3b0f9273f08cc2 Mon Sep 17 00:00:00 2001 From: validcube Date: Sun, 7 Jul 2024 16:04:30 +0700 Subject: [PATCH 4/8] feat: Improve description of the API URL settings --- .../manager/ui/screen/settings/AdvancedSettingsScreen.kt | 2 +- app/src/main/res/values/strings.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 60c9282b05..2c7108784b 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 @@ -83,7 +83,7 @@ fun AdvancedSettingsScreen( } SettingsListItem( headlineContent = stringResource(R.string.api_url), - supportingContent = apiUrl, + supportingContent = stringResource(R.string.api_url_description), modifier = Modifier.clickable { showApiUrlDialog = true } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e8adc58846..cab8c22ed8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -147,6 +147,7 @@ Failed to export logs Exported logs API URL + ReVanced Manager uses the API to download patches and updates. Set custom API URL Set the API URL 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. From 9fd8971c75ba3f4ad633e07814221f497078d1eb Mon Sep 17 00:00:00 2001 From: validcube Date: Sun, 7 Jul 2024 16:04:58 +0700 Subject: [PATCH 5/8] refactor: Slight lambda moment --- .../manager/ui/screen/settings/AdvancedSettingsScreen.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2c7108784b..277ca29b37 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 @@ -168,7 +168,7 @@ fun AdvancedSettingsScreen( @Preview @Composable private fun APIUrlDialogPreview() { - APIUrlDialog("https://example.com", {}) + APIUrlDialog("https://example.com") {} } @Composable From 2e04b3c92fc23444c9025d3000c2e7e42fa6bb13 Mon Sep 17 00:00:00 2001 From: validcube Date: Sun, 7 Jul 2024 16:09:35 +0700 Subject: [PATCH 6/8] refactor: Wording moment --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cab8c22ed8..6f07ff75cf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -147,7 +147,7 @@ Failed to export logs Exported logs API URL - ReVanced Manager uses the API to download patches and updates. + The API uses to download necessary files. Set custom API URL Set the API URL 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. From fc16689bff56a9aa23e69fd629c8ab089cdfa3d0 Mon Sep 17 00:00:00 2001 From: Pun Butrach Date: Thu, 11 Jul 2024 06:03:42 +0700 Subject: [PATCH 7/8] refactor: Use correct verb Co-authored-by: Ushie --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6f07ff75cf..55dc891210 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -147,7 +147,7 @@ Failed to export logs Exported logs API URL - The API uses to download necessary files. + The API used to download necessary files. Set custom API URL Set the API URL 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. From 64c8f8f3249b06a99711e6167c6038d130d50756 Mon Sep 17 00:00:00 2001 From: Ushie Date: Thu, 18 Jul 2024 04:21:18 +0300 Subject: [PATCH 8/8] chore: Remove unneeded `@Preview` --- .../manager/ui/screen/settings/AdvancedSettingsScreen.kt | 7 ------- 1 file changed, 7 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 b31d663a2a..4c3be2a400 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 @@ -29,7 +29,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign -import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.core.content.getSystemService import androidx.lifecycle.viewModelScope @@ -163,12 +162,6 @@ fun AdvancedSettingsScreen( } } -@Preview -@Composable -private fun APIUrlDialogPreview() { - APIUrlDialog("https://example.com") {} -} - @Composable private fun APIUrlDialog(currentUrl: String, onSubmit: (String?) -> Unit) { var url by rememberSaveable(currentUrl) { mutableStateOf(currentUrl) }