Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Improve custom API URL dialog #2033

Merged
merged 9 commits into from
Jul 18, 2024
Merged

feat: Improve custom API URL dialog #2033

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9fbd202
chore: Add Preview to API URL Dialog
validcube Jul 4, 2024
a70601f
feat: API URL Dialog v2
validcube Jul 4, 2024
a822c25
refactor: Use proper wording for the dialog
validcube Jul 7, 2024
bd453b5
feat: Improve description of the API URL settings
validcube Jul 7, 2024
9fd8971
refactor: Slight lambda moment
validcube Jul 7, 2024
2e04b3c
refactor: Wording moment
validcube Jul 7, 2024
fc16689
refactor: Use correct verb
validcube Jul 10, 2024
9b8bee4
🔮 Merge repository updated to latest snapshot!
validcube Jul 14, 2024
64c8f8f
chore: Remove unneeded `@Preview`
Ushie Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion app/src/main/java/app/revanced/manager/ui/screen/settings/AdvancedSettingsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -85,7 +86,7 @@ fun AdvancedSettingsScreen(
}
SettingsListItem(
headlineContent = stringResource(R.string.api_url),
supportingContent = apiUrl,
supportingContent = stringResource(R.string.api_url_description),
modifier = Modifier.clickable {
showApiUrlDialog = true
}
Expand Down Expand Up @@ -162,6 +163,12 @@ fun AdvancedSettingsScreen(
}
}

@Preview
@Composable
private fun APIUrlDialogPreview() {
APIUrlDialog("https://example.com") {}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this not be the default API by default?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any value is fine here since this is only shown to developer using Android Studio or any IDE that support rendering a composable.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess using default api makes more sense then

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This section is only to preview the design of the composable, it can be removed from this PR with no consequence

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not talking specifically about the section but the text shown in the section. So then either removing or using the default api here works

}

@Composable
private fun APIUrlDialog(currentUrl: String, onSubmit: (String?) -> Unit) {
var url by rememberSaveable(currentUrl) { mutableStateOf(currentUrl) }
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,10 @@
<string name="debug_logs_export_failed">Failed to export logs</string>
<string name="debug_logs_export_success">Exported logs</string>
<string name="api_url">API URL</string>
<string name="api_url_description">The API used to download necessary files.</string>
<string name="api_url_dialog_title">Set custom API URL</string>
<string name="api_url_dialog_description">You may have issues with features when using a custom API URL.</string>
<string name="api_url_dialog_warning">Only use API\'s you trust!</string>
<string name="api_url_dialog_description">Set the API URL of ReVanced Manager. ReVanced Manager uses the API to download patches and updates.</string>
<string name="api_url_dialog_warning">ReVanced Manager connects to the API to download patches and updates. Make sure that you trust it.</string>
<string name="api_url_dialog_save">Set</string>
<string name="device">Device</string>
<string name="device_android_version">Android version</string>
Expand Down