Skip to content

Commit a30ff45

Browse files
authored
refactor: Rename settings screens for consistency (#2547)
1 parent eb03daa commit a30ff45

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

β€Žapp/src/main/java/app/revanced/manager/MainActivity.ktβ€Ž

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ import app.revanced.manager.ui.screen.SettingsScreen
4444
import app.revanced.manager.ui.screen.UpdateScreen
4545
import app.revanced.manager.ui.screen.settings.AboutSettingsScreen
4646
import app.revanced.manager.ui.screen.settings.AdvancedSettingsScreen
47-
import app.revanced.manager.ui.screen.settings.ContributorScreen
48-
import app.revanced.manager.ui.screen.settings.DeveloperOptionsScreen
47+
import app.revanced.manager.ui.screen.settings.ContributorSettingsScreen
48+
import app.revanced.manager.ui.screen.settings.DeveloperSettingsScreen
4949
import app.revanced.manager.ui.screen.settings.DownloadsSettingsScreen
5050
import app.revanced.manager.ui.screen.settings.GeneralSettingsScreen
5151
import app.revanced.manager.ui.screen.settings.ImportExportSettingsScreen
52-
import app.revanced.manager.ui.screen.settings.LicensesScreen
53-
import app.revanced.manager.ui.screen.settings.update.ChangelogsScreen
52+
import app.revanced.manager.ui.screen.settings.LicensesSettingsScreen
53+
import app.revanced.manager.ui.screen.settings.update.ChangelogsSettingsScreen
5454
import app.revanced.manager.ui.screen.settings.update.UpdatesSettingsScreen
5555
import app.revanced.manager.ui.theme.ReVancedManagerTheme
5656
import app.revanced.manager.ui.theme.Theme
@@ -277,8 +277,8 @@ private fun ReVancedManager(vm: MainViewModel) {
277277
AdvancedSettingsScreen(onBackClick = navController::popBackStack)
278278
}
279279

280-
composable<Settings.DeveloperOptions> {
281-
DeveloperOptionsScreen(onBackClick = navController::popBackStack)
280+
composable<Settings.Developer> {
281+
DeveloperSettingsScreen(onBackClick = navController::popBackStack)
282282
}
283283

284284
composable<Settings.Updates> {
@@ -305,15 +305,15 @@ private fun ReVancedManager(vm: MainViewModel) {
305305
}
306306

307307
composable<Settings.Changelogs> {
308-
ChangelogsScreen(onBackClick = navController::popBackStack)
308+
ChangelogsSettingsScreen(onBackClick = navController::popBackStack)
309309
}
310310

311311
composable<Settings.Contributors> {
312-
ContributorScreen(onBackClick = navController::popBackStack)
312+
ContributorSettingsScreen(onBackClick = navController::popBackStack)
313313
}
314314

315315
composable<Settings.Licenses> {
316-
LicensesScreen(onBackClick = navController::popBackStack)
316+
LicensesSettingsScreen(onBackClick = navController::popBackStack)
317317
}
318318

319319
}

β€Žapp/src/main/java/app/revanced/manager/ui/model/navigation/Nav.ktβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,5 +92,5 @@ object Settings {
9292
data object Licenses : Destination
9393

9494
@Serializable
95-
data object DeveloperOptions : Destination
95+
data object Developer : Destination
9696
}

β€Žapp/src/main/java/app/revanced/manager/ui/screen/SettingsScreen.ktβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ private val settingsSections = listOf(
4545
R.string.developer_options,
4646
R.string.developer_options_description,
4747
Icons.Outlined.Code
48-
) to Settings.DeveloperOptions,
48+
) to Settings.Developer,
4949
Triple(
5050
R.string.about,
5151
R.string.app_name,
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ import org.koin.androidx.compose.koinViewModel
5151

5252
@OptIn(ExperimentalMaterial3Api::class)
5353
@Composable
54-
fun ContributorScreen(
54+
fun ContributorSettingsScreen(
5555
onBackClick: () -> Unit,
5656
viewModel: ContributorViewModel = koinViewModel()
5757
) {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import org.koin.androidx.compose.koinViewModel
2020

2121
@OptIn(ExperimentalMaterial3Api::class)
2222
@Composable
23-
fun DeveloperOptionsScreen(
23+
fun DeveloperSettingsScreen(
2424
onBackClick: () -> Unit,
2525
vm: DeveloperOptionsViewModel = koinViewModel()
2626
) {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import com.mikepenz.aboutlibraries.ui.compose.LibraryDefaults
1818

1919
@OptIn(ExperimentalMaterial3Api::class)
2020
@Composable
21-
fun LicensesScreen(
21+
fun LicensesSettingsScreen(
2222
onBackClick: () -> Unit,
2323
) {
2424
AppScaffold(
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import org.koin.androidx.compose.koinViewModel
2727

2828
@OptIn(ExperimentalMaterial3Api::class)
2929
@Composable
30-
fun ChangelogsScreen(
30+
fun ChangelogsSettingsScreen(
3131
onBackClick: () -> Unit,
3232
vm: ChangelogsViewModel = koinViewModel()
3333
) {

0 commit comments

Comments
Β (0)