mirror of
https://github.com/revanced/revanced-manager.git
synced 2025-06-03 00:19:26 +02:00
refactor: Rename settings screens for consistency (#2547)
This commit is contained in:
parent
18199bb968
commit
d7c0913277
@ -44,13 +44,13 @@ import app.revanced.manager.ui.screen.SettingsScreen
|
|||||||
import app.revanced.manager.ui.screen.UpdateScreen
|
import app.revanced.manager.ui.screen.UpdateScreen
|
||||||
import app.revanced.manager.ui.screen.settings.AboutSettingsScreen
|
import app.revanced.manager.ui.screen.settings.AboutSettingsScreen
|
||||||
import app.revanced.manager.ui.screen.settings.AdvancedSettingsScreen
|
import app.revanced.manager.ui.screen.settings.AdvancedSettingsScreen
|
||||||
import app.revanced.manager.ui.screen.settings.ContributorScreen
|
import app.revanced.manager.ui.screen.settings.ContributorSettingsScreen
|
||||||
import app.revanced.manager.ui.screen.settings.DeveloperOptionsScreen
|
import app.revanced.manager.ui.screen.settings.DeveloperSettingsScreen
|
||||||
import app.revanced.manager.ui.screen.settings.DownloadsSettingsScreen
|
import app.revanced.manager.ui.screen.settings.DownloadsSettingsScreen
|
||||||
import app.revanced.manager.ui.screen.settings.GeneralSettingsScreen
|
import app.revanced.manager.ui.screen.settings.GeneralSettingsScreen
|
||||||
import app.revanced.manager.ui.screen.settings.ImportExportSettingsScreen
|
import app.revanced.manager.ui.screen.settings.ImportExportSettingsScreen
|
||||||
import app.revanced.manager.ui.screen.settings.LicensesScreen
|
import app.revanced.manager.ui.screen.settings.LicensesSettingsScreen
|
||||||
import app.revanced.manager.ui.screen.settings.update.ChangelogsScreen
|
import app.revanced.manager.ui.screen.settings.update.ChangelogsSettingsScreen
|
||||||
import app.revanced.manager.ui.screen.settings.update.UpdatesSettingsScreen
|
import app.revanced.manager.ui.screen.settings.update.UpdatesSettingsScreen
|
||||||
import app.revanced.manager.ui.theme.ReVancedManagerTheme
|
import app.revanced.manager.ui.theme.ReVancedManagerTheme
|
||||||
import app.revanced.manager.ui.theme.Theme
|
import app.revanced.manager.ui.theme.Theme
|
||||||
@ -277,8 +277,8 @@ private fun ReVancedManager(vm: MainViewModel) {
|
|||||||
AdvancedSettingsScreen(onBackClick = navController::popBackStack)
|
AdvancedSettingsScreen(onBackClick = navController::popBackStack)
|
||||||
}
|
}
|
||||||
|
|
||||||
composable<Settings.DeveloperOptions> {
|
composable<Settings.Developer> {
|
||||||
DeveloperOptionsScreen(onBackClick = navController::popBackStack)
|
DeveloperSettingsScreen(onBackClick = navController::popBackStack)
|
||||||
}
|
}
|
||||||
|
|
||||||
composable<Settings.Updates> {
|
composable<Settings.Updates> {
|
||||||
@ -305,15 +305,15 @@ private fun ReVancedManager(vm: MainViewModel) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
composable<Settings.Changelogs> {
|
composable<Settings.Changelogs> {
|
||||||
ChangelogsScreen(onBackClick = navController::popBackStack)
|
ChangelogsSettingsScreen(onBackClick = navController::popBackStack)
|
||||||
}
|
}
|
||||||
|
|
||||||
composable<Settings.Contributors> {
|
composable<Settings.Contributors> {
|
||||||
ContributorScreen(onBackClick = navController::popBackStack)
|
ContributorSettingsScreen(onBackClick = navController::popBackStack)
|
||||||
}
|
}
|
||||||
|
|
||||||
composable<Settings.Licenses> {
|
composable<Settings.Licenses> {
|
||||||
LicensesScreen(onBackClick = navController::popBackStack)
|
LicensesSettingsScreen(onBackClick = navController::popBackStack)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -92,5 +92,5 @@ object Settings {
|
|||||||
data object Licenses : Destination
|
data object Licenses : Destination
|
||||||
|
|
||||||
@Serializable
|
@Serializable
|
||||||
data object DeveloperOptions : Destination
|
data object Developer : Destination
|
||||||
}
|
}
|
@ -45,7 +45,7 @@ private val settingsSections = listOf(
|
|||||||
R.string.developer_options,
|
R.string.developer_options,
|
||||||
R.string.developer_options_description,
|
R.string.developer_options_description,
|
||||||
Icons.Outlined.Code
|
Icons.Outlined.Code
|
||||||
) to Settings.DeveloperOptions,
|
) to Settings.Developer,
|
||||||
Triple(
|
Triple(
|
||||||
R.string.about,
|
R.string.about,
|
||||||
R.string.app_name,
|
R.string.app_name,
|
||||||
|
@ -51,7 +51,7 @@ import org.koin.androidx.compose.koinViewModel
|
|||||||
|
|
||||||
@OptIn(ExperimentalMaterial3Api::class)
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
@Composable
|
@Composable
|
||||||
fun ContributorScreen(
|
fun ContributorSettingsScreen(
|
||||||
onBackClick: () -> Unit,
|
onBackClick: () -> Unit,
|
||||||
viewModel: ContributorViewModel = koinViewModel()
|
viewModel: ContributorViewModel = koinViewModel()
|
||||||
) {
|
) {
|
@ -20,7 +20,7 @@ import org.koin.androidx.compose.koinViewModel
|
|||||||
|
|
||||||
@OptIn(ExperimentalMaterial3Api::class)
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
@Composable
|
@Composable
|
||||||
fun DeveloperOptionsScreen(
|
fun DeveloperSettingsScreen(
|
||||||
onBackClick: () -> Unit,
|
onBackClick: () -> Unit,
|
||||||
vm: DeveloperOptionsViewModel = koinViewModel()
|
vm: DeveloperOptionsViewModel = koinViewModel()
|
||||||
) {
|
) {
|
@ -18,7 +18,7 @@ import com.mikepenz.aboutlibraries.ui.compose.LibraryDefaults
|
|||||||
|
|
||||||
@OptIn(ExperimentalMaterial3Api::class)
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
@Composable
|
@Composable
|
||||||
fun LicensesScreen(
|
fun LicensesSettingsScreen(
|
||||||
onBackClick: () -> Unit,
|
onBackClick: () -> Unit,
|
||||||
) {
|
) {
|
||||||
AppScaffold(
|
AppScaffold(
|
@ -27,7 +27,7 @@ import org.koin.androidx.compose.koinViewModel
|
|||||||
|
|
||||||
@OptIn(ExperimentalMaterial3Api::class)
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
@Composable
|
@Composable
|
||||||
fun ChangelogsScreen(
|
fun ChangelogsSettingsScreen(
|
||||||
onBackClick: () -> Unit,
|
onBackClick: () -> Unit,
|
||||||
vm: ChangelogsViewModel = koinViewModel()
|
vm: ChangelogsViewModel = koinViewModel()
|
||||||
) {
|
) {
|
Loading…
x
Reference in New Issue
Block a user