From f792186d0a347d543cf015420ea9aa4dbca24cc3 Mon Sep 17 00:00:00 2001 From: vfsfitvnm Date: Sun, 12 Jun 2022 12:21:10 +0200 Subject: [PATCH] Rename routes in settings --- .../vimusic/ui/screens/SettingsScreen.kt | 18 +++++++++--------- .../vimusic/ui/screens/settings/routes.kt | 12 ++++++------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/SettingsScreen.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/SettingsScreen.kt index 65fca9d..8f36956 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/SettingsScreen.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/SettingsScreen.kt @@ -30,11 +30,11 @@ import it.vfsfitvnm.vimusic.utils.* fun SettingsScreen() { val albumRoute = rememberPlaylistOrAlbumRoute() val artistRoute = rememberArtistRoute() - val appearanceRoute = rememberAppearanceRoute() + val appearanceSettingsRoute = rememberAppearanceSettingsRoute() val playerSettingsRoute = rememberPlayerSettingsRoute() - val notificationRoute = rememberNotificationRoute() + val notificationSettingsRoute = rememberNotificationSettingsRoute() val backupAndRestoreRoute = rememberBackupAndRestoreRoute() - val otherRoute = rememberOtherRoute() + val otherSettingsRoute = rememberOtherSettingsRoute() val aboutRoute = rememberAboutRoute() val scrollState = rememberScrollState() @@ -64,7 +64,7 @@ fun SettingsScreen() { ) } - appearanceRoute { + appearanceSettingsRoute { AppearanceScreen() } @@ -72,7 +72,7 @@ fun SettingsScreen() { PlayerSettingsScreen() } - notificationRoute { + notificationSettingsRoute { NotificationScreen() } @@ -80,7 +80,7 @@ fun SettingsScreen() { BackupAndRestoreScreen() } - otherRoute { + otherSettingsRoute { OtherScreen() } @@ -182,7 +182,7 @@ fun SettingsScreen() { icon = R.drawable.color_palette, title = "Appearance", description = "Change the colors and shapes of the app", - route = appearanceRoute, + route = appearanceSettingsRoute, ) Entry( @@ -198,7 +198,7 @@ fun SettingsScreen() { icon = R.drawable.notifications, title = "Notification", description = "Customize the notification appearance", - route = notificationRoute + route = notificationSettingsRoute ) Entry( @@ -214,7 +214,7 @@ fun SettingsScreen() { icon = R.drawable.shapes, title = "Other", description = "Advanced options", - route = otherRoute + route = otherSettingsRoute ) Entry( diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/settings/routes.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/settings/routes.kt index 2bd4475..702d53b 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/settings/routes.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/settings/routes.kt @@ -5,9 +5,9 @@ import androidx.compose.runtime.remember import it.vfsfitvnm.route.Route0 @Composable -fun rememberAppearanceRoute(): Route0 { +fun rememberAppearanceSettingsRoute(): Route0 { return remember { - Route0("AppearanceRoute") + Route0("AppearanceSettingsRoute") } } @@ -19,9 +19,9 @@ fun rememberPlayerSettingsRoute(): Route0 { } @Composable -fun rememberNotificationRoute(): Route0 { +fun rememberNotificationSettingsRoute(): Route0 { return remember { - Route0("NotificationRoute") + Route0("NotificationSettingsRoute") } } @@ -33,9 +33,9 @@ fun rememberBackupAndRestoreRoute(): Route0 { } @Composable -fun rememberOtherRoute(): Route0 { +fun rememberOtherSettingsRoute(): Route0 { return remember { - Route0("OtherRoute") + Route0("OtherSettingsRoute") } }