From d7c0913277a39b8e8a7df6150276ffc4884d159a Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 14 May 2025 19:34:05 +0200 Subject: [PATCH] refactor: Rename settings screens for consistency (#2547) --- .../java/app/revanced/manager/MainActivity.kt | 18 +++++++++--------- .../manager/ui/model/navigation/Nav.kt | 2 +- .../manager/ui/screen/SettingsScreen.kt | 2 +- ...rScreen.kt => ContributorSettingsScreen.kt} | 2 +- ...onsScreen.kt => DeveloperSettingsScreen.kt} | 2 +- ...nsesScreen.kt => LicensesSettingsScreen.kt} | 2 +- ...gsScreen.kt => ChangelogsSettingsScreen.kt} | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) rename app/src/main/java/app/revanced/manager/ui/screen/settings/{ContributorScreen.kt => ContributorSettingsScreen.kt} (99%) rename app/src/main/java/app/revanced/manager/ui/screen/settings/{DeveloperOptionsScreen.kt => DeveloperSettingsScreen.kt} (98%) rename app/src/main/java/app/revanced/manager/ui/screen/settings/{LicensesScreen.kt => LicensesSettingsScreen.kt} (98%) rename app/src/main/java/app/revanced/manager/ui/screen/settings/update/{ChangelogsScreen.kt => ChangelogsSettingsScreen.kt} (98%) diff --git a/app/src/main/java/app/revanced/manager/MainActivity.kt b/app/src/main/java/app/revanced/manager/MainActivity.kt index 0f0ac772..4135bc22 100644 --- a/app/src/main/java/app/revanced/manager/MainActivity.kt +++ b/app/src/main/java/app/revanced/manager/MainActivity.kt @@ -44,13 +44,13 @@ import app.revanced.manager.ui.screen.SettingsScreen import app.revanced.manager.ui.screen.UpdateScreen import app.revanced.manager.ui.screen.settings.AboutSettingsScreen import app.revanced.manager.ui.screen.settings.AdvancedSettingsScreen -import app.revanced.manager.ui.screen.settings.ContributorScreen -import app.revanced.manager.ui.screen.settings.DeveloperOptionsScreen +import app.revanced.manager.ui.screen.settings.ContributorSettingsScreen +import app.revanced.manager.ui.screen.settings.DeveloperSettingsScreen import app.revanced.manager.ui.screen.settings.DownloadsSettingsScreen import app.revanced.manager.ui.screen.settings.GeneralSettingsScreen import app.revanced.manager.ui.screen.settings.ImportExportSettingsScreen -import app.revanced.manager.ui.screen.settings.LicensesScreen -import app.revanced.manager.ui.screen.settings.update.ChangelogsScreen +import app.revanced.manager.ui.screen.settings.LicensesSettingsScreen +import app.revanced.manager.ui.screen.settings.update.ChangelogsSettingsScreen import app.revanced.manager.ui.screen.settings.update.UpdatesSettingsScreen import app.revanced.manager.ui.theme.ReVancedManagerTheme import app.revanced.manager.ui.theme.Theme @@ -277,8 +277,8 @@ private fun ReVancedManager(vm: MainViewModel) { AdvancedSettingsScreen(onBackClick = navController::popBackStack) } - composable { - DeveloperOptionsScreen(onBackClick = navController::popBackStack) + composable { + DeveloperSettingsScreen(onBackClick = navController::popBackStack) } composable { @@ -305,15 +305,15 @@ private fun ReVancedManager(vm: MainViewModel) { } composable { - ChangelogsScreen(onBackClick = navController::popBackStack) + ChangelogsSettingsScreen(onBackClick = navController::popBackStack) } composable { - ContributorScreen(onBackClick = navController::popBackStack) + ContributorSettingsScreen(onBackClick = navController::popBackStack) } composable { - LicensesScreen(onBackClick = navController::popBackStack) + LicensesSettingsScreen(onBackClick = navController::popBackStack) } } diff --git a/app/src/main/java/app/revanced/manager/ui/model/navigation/Nav.kt b/app/src/main/java/app/revanced/manager/ui/model/navigation/Nav.kt index c4063ebb..910b8345 100644 --- a/app/src/main/java/app/revanced/manager/ui/model/navigation/Nav.kt +++ b/app/src/main/java/app/revanced/manager/ui/model/navigation/Nav.kt @@ -92,5 +92,5 @@ object Settings { data object Licenses : Destination @Serializable - data object DeveloperOptions : Destination + data object Developer : Destination } \ No newline at end of file diff --git a/app/src/main/java/app/revanced/manager/ui/screen/SettingsScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/SettingsScreen.kt index acab88d9..b6fa2d33 100644 --- a/app/src/main/java/app/revanced/manager/ui/screen/SettingsScreen.kt +++ b/app/src/main/java/app/revanced/manager/ui/screen/SettingsScreen.kt @@ -45,7 +45,7 @@ private val settingsSections = listOf( R.string.developer_options, R.string.developer_options_description, Icons.Outlined.Code - ) to Settings.DeveloperOptions, + ) to Settings.Developer, Triple( R.string.about, R.string.app_name, diff --git a/app/src/main/java/app/revanced/manager/ui/screen/settings/ContributorScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/settings/ContributorSettingsScreen.kt similarity index 99% rename from app/src/main/java/app/revanced/manager/ui/screen/settings/ContributorScreen.kt rename to app/src/main/java/app/revanced/manager/ui/screen/settings/ContributorSettingsScreen.kt index 27e89649..4c41876d 100644 --- a/app/src/main/java/app/revanced/manager/ui/screen/settings/ContributorScreen.kt +++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/ContributorSettingsScreen.kt @@ -51,7 +51,7 @@ import org.koin.androidx.compose.koinViewModel @OptIn(ExperimentalMaterial3Api::class) @Composable -fun ContributorScreen( +fun ContributorSettingsScreen( onBackClick: () -> Unit, viewModel: ContributorViewModel = koinViewModel() ) { diff --git a/app/src/main/java/app/revanced/manager/ui/screen/settings/DeveloperOptionsScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/settings/DeveloperSettingsScreen.kt similarity index 98% rename from app/src/main/java/app/revanced/manager/ui/screen/settings/DeveloperOptionsScreen.kt rename to app/src/main/java/app/revanced/manager/ui/screen/settings/DeveloperSettingsScreen.kt index 40a1e937..6139ced7 100644 --- a/app/src/main/java/app/revanced/manager/ui/screen/settings/DeveloperOptionsScreen.kt +++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/DeveloperSettingsScreen.kt @@ -20,7 +20,7 @@ import org.koin.androidx.compose.koinViewModel @OptIn(ExperimentalMaterial3Api::class) @Composable -fun DeveloperOptionsScreen( +fun DeveloperSettingsScreen( onBackClick: () -> Unit, vm: DeveloperOptionsViewModel = koinViewModel() ) { diff --git a/app/src/main/java/app/revanced/manager/ui/screen/settings/LicensesScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/settings/LicensesSettingsScreen.kt similarity index 98% rename from app/src/main/java/app/revanced/manager/ui/screen/settings/LicensesScreen.kt rename to app/src/main/java/app/revanced/manager/ui/screen/settings/LicensesSettingsScreen.kt index 76e2e964..5c2042b3 100644 --- a/app/src/main/java/app/revanced/manager/ui/screen/settings/LicensesScreen.kt +++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/LicensesSettingsScreen.kt @@ -18,7 +18,7 @@ import com.mikepenz.aboutlibraries.ui.compose.LibraryDefaults @OptIn(ExperimentalMaterial3Api::class) @Composable -fun LicensesScreen( +fun LicensesSettingsScreen( onBackClick: () -> Unit, ) { AppScaffold( diff --git a/app/src/main/java/app/revanced/manager/ui/screen/settings/update/ChangelogsScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/settings/update/ChangelogsSettingsScreen.kt similarity index 98% rename from app/src/main/java/app/revanced/manager/ui/screen/settings/update/ChangelogsScreen.kt rename to app/src/main/java/app/revanced/manager/ui/screen/settings/update/ChangelogsSettingsScreen.kt index 6808d231..2bf62b66 100644 --- a/app/src/main/java/app/revanced/manager/ui/screen/settings/update/ChangelogsScreen.kt +++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/update/ChangelogsSettingsScreen.kt @@ -27,7 +27,7 @@ import org.koin.androidx.compose.koinViewModel @OptIn(ExperimentalMaterial3Api::class) @Composable -fun ChangelogsScreen( +fun ChangelogsSettingsScreen( onBackClick: () -> Unit, vm: ChangelogsViewModel = koinViewModel() ) {