app: ui: library: Fix toggling view type on old layout style

DD3Boh · May 16, 2024 · 7c18775 · 7c18775
1 parent 2664139
commit 7c18775
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/app/src/main/java/com/dd3boh/outertune/ui/screens/library/LibraryAlbumsScreen.kt b/app/src/main/java/com/dd3boh/outertune/ui/screens/library/LibraryAlbumsScreen.kt
@@ -61,10 +61,10 @@ fun LibraryAlbumsScreen(
     var filter by rememberEnumPreference(AlbumFilterKey, AlbumFilter.LIKED)
     libraryFilterContent?.let { filter = AlbumFilter.LIKED }
 
-    val viewTypeLocal by rememberEnumPreference(AlbumViewTypeKey, LibraryViewType.GRID)
+    var viewTypeLocal by rememberEnumPreference(AlbumViewTypeKey, LibraryViewType.GRID)
     val libraryViewType by rememberEnumPreference(LibraryViewTypeKey, LibraryViewType.GRID)
 
-    var viewType = if (libraryFilterContent != null) libraryViewType else viewTypeLocal
+    val viewType = if (libraryFilterContent != null) libraryViewType else viewTypeLocal
 
     val (sortType, onSortTypeChange) = rememberEnumPreference(AlbumSortTypeKey, AlbumSortType.CREATE_DATE)
     val (sortDescending, onSortDescendingChange) = rememberPreference(AlbumSortDescendingKey, true)
@@ -89,13 +89,13 @@ fun LibraryAlbumsScreen(
 
             IconButton(
                 onClick = {
-                    viewType = viewType.toggle()
+                    viewTypeLocal = viewTypeLocal.toggle()
                 },
                 modifier = Modifier.padding(end = 6.dp)
             ) {
                 Icon(
                     imageVector =
-                        when (viewType) {
+                        when (viewTypeLocal) {
                             LibraryViewType.LIST -> Icons.AutoMirrored.Rounded.List
                             LibraryViewType.GRID -> Icons.Rounded.GridView
                         },

diff --git a/app/src/main/java/com/dd3boh/outertune/ui/screens/library/LibraryArtistsScreen.kt b/app/src/main/java/com/dd3boh/outertune/ui/screens/library/LibraryArtistsScreen.kt
@@ -66,10 +66,10 @@ fun LibraryArtistsScreen(
     var filter by rememberEnumPreference(ArtistFilterKey, ArtistFilter.LIKED)
     libraryFilterContent?.let { filter = ArtistFilter.LIKED }
 
-    val viewTypeLocal by rememberEnumPreference(ArtistViewTypeKey, LibraryViewType.GRID)
+    var viewTypeLocal by rememberEnumPreference(ArtistViewTypeKey, LibraryViewType.GRID)
     val libraryViewType by rememberEnumPreference(LibraryViewTypeKey, LibraryViewType.GRID)
 
-    var viewType = if (libraryFilterContent != null) libraryViewType else viewTypeLocal
+    val viewType = if (libraryFilterContent != null) libraryViewType else viewTypeLocal
 
     val (sortType, onSortTypeChange) = rememberEnumPreference(ArtistSortTypeKey, ArtistSortType.CREATE_DATE)
     val (sortDescending, onSortDescendingChange) = rememberPreference(ArtistSortDescendingKey, true)
@@ -93,13 +93,13 @@ fun LibraryArtistsScreen(
 
             IconButton(
                 onClick = {
-                    viewType = viewType.toggle()
+                    viewTypeLocal = viewTypeLocal.toggle()
                 },
                 modifier = Modifier.padding(end = 6.dp)
             ) {
                 Icon(
                     imageVector =
-                    when (viewType) {
+                    when (viewTypeLocal) {
                         LibraryViewType.LIST -> Icons.AutoMirrored.Rounded.List
                         LibraryViewType.GRID -> Icons.Rounded.GridView
                     },

diff --git a/app/src/main/java/com/dd3boh/outertune/ui/screens/library/LibraryPlaylistsScreen.kt b/app/src/main/java/com/dd3boh/outertune/ui/screens/library/LibraryPlaylistsScreen.kt
@@ -85,10 +85,10 @@ fun LibraryPlaylistsScreen(
 
     val coroutineScope = rememberCoroutineScope()
 
-    val viewTypeLocal by rememberEnumPreference(PlaylistViewTypeKey, LibraryViewType.GRID)
+    var viewTypeLocal by rememberEnumPreference(PlaylistViewTypeKey, LibraryViewType.GRID)
     val libraryViewType by rememberEnumPreference(LibraryViewTypeKey, LibraryViewType.GRID)
 
-    var viewType = if (libraryFilterContent != null) libraryViewType else viewTypeLocal
+    val viewType = if (libraryFilterContent != null) libraryViewType else viewTypeLocal
 
     val (sortType, onSortTypeChange) = rememberEnumPreference(PlaylistSortTypeKey, PlaylistSortType.CREATE_DATE)
     val (sortDescending, onSortDescendingChange) = rememberPreference(PlaylistSortDescendingKey, true)
@@ -160,13 +160,13 @@ fun LibraryPlaylistsScreen(
             if (libraryFilterContent == null) {
                 IconButton(
                     onClick = {
-                        viewType = viewType.toggle()
+                        viewTypeLocal = viewTypeLocal.toggle()
                     },
                     modifier = Modifier.padding(start = 6.dp, end = 6.dp)
                 ) {
                     Icon(
                         imageVector =
-                        when (viewType) {
+                        when (viewTypeLocal) {
                             LibraryViewType.LIST -> Icons.AutoMirrored.Rounded.List
                             LibraryViewType.GRID -> Icons.Rounded.GridView
                         },