Merge pull request #102 from swingmx/migrate-to-version-catalogs

Deprecate `FoldersAndTracks` in favor of Paginated Version

Author: Ericgacoki

app/src/main/java/com/android/swingmusic/presentation/activity/MainActivity.kt

@@ -5,7 +5,6 @@ import android.content.ComponentName
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.ExperimentalAnimationApi
@@ -52,7 +51,7 @@ import com.android.swingmusic.auth.presentation.screen.destinations.LoginWithQrC
 import com.android.swingmusic.auth.presentation.screen.destinations.LoginWithUsernameScreenDestination
 import com.android.swingmusic.auth.presentation.viewmodel.AuthViewModel
 import com.android.swingmusic.folder.presentation.event.FolderUiEvent
-import com.android.swingmusic.folder.presentation.screen.destinations.FoldersAndTracksPaginatedScreenDestination
+import com.android.swingmusic.folder.presentation.screen.destinations.FoldersAndTracksScreenDestination
 import com.android.swingmusic.folder.presentation.viewmodel.FoldersViewModel
 import com.android.swingmusic.player.presentation.screen.MiniPlayer
 import com.android.swingmusic.player.presentation.screen.destinations.NowPlayingScreenDestination
@@ -113,7 +112,6 @@ class MainActivity : ComponentActivity() {
     @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
     @OptIn(ExperimentalAnimationApi::class)
     override fun onCreate(savedInstanceState: Bundle?) {
-        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
 
         if (BuildConfig.DEBUG && Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
@@ -153,7 +151,7 @@ class MainActivity : ComponentActivity() {
             // Map of BottomNavItem to their route prefixes
             val bottomNavRoutePrefixes = mapOf(
                 // BottomNavItem.Home to listOf(HomeDestination.route),
-                BottomNavItem.Folder to listOf(FoldersAndTracksPaginatedScreenDestination.route),
+                BottomNavItem.Folder to listOf(FoldersAndTracksScreenDestination.route),
                 BottomNavItem.Album to listOf(
                     AllAlbumScreenDestination.route,
                     AlbumWithInfoScreenDestination.route
@@ -241,7 +239,7 @@ class MainActivity : ComponentActivity() {
                                                     }
 
                                                     // refresh folders starting from $home
-                                                    if (item.destination.route == FoldersAndTracksPaginatedScreenDestination.route) {
+                                                    if (item.destination.route == FoldersAndTracksScreenDestination.route) {
                                                         foldersViewModel.onFolderUiEvent(
                                                             FolderUiEvent.OnClickNavPath(
                                                                 folder = foldersViewModel.homeDir

app/src/main/java/com/android/swingmusic/presentation/navigator/BottomNavItem.kt

@@ -3,20 +3,20 @@ package com.android.swingmusic.presentation.navigator
 import androidx.annotation.DrawableRes
 import com.android.swingmusic.album.presentation.screen.destinations.AllAlbumScreenDestination
 import com.android.swingmusic.artist.presentation.screen.destinations.AllArtistsScreenDestination
-import com.android.swingmusic.folder.presentation.screen.destinations.FoldersAndTracksPaginatedScreenDestination
+import com.android.swingmusic.folder.presentation.screen.destinations.FoldersAndTracksScreenDestination
 import com.android.swingmusic.search.presentation.screen.destinations.SearchScreenDestination
 import com.ramcosta.composedestinations.spec.DestinationSpec
 import com.android.swingmusic.uicomponent.R as UiComponent
 
 sealed class BottomNavItem(
     var title: String,
-    @DrawableRes var icon: Int,
+    @param:DrawableRes var icon: Int,
     var destination: DestinationSpec<*>
 ) {
     data object Folder : BottomNavItem(
         title = "Folders",
         icon = UiComponent.drawable.folder_filled,
-        destination = FoldersAndTracksPaginatedScreenDestination
+        destination = FoldersAndTracksScreenDestination
     )
 
     data object Album : BottomNavItem(

app/src/main/java/com/android/swingmusic/presentation/navigator/CoreNavigator.kt

@@ -7,7 +7,7 @@ import com.android.swingmusic.artist.presentation.screen.destinations.ViewAllScr
 import com.android.swingmusic.auth.presentation.screen.destinations.LoginWithQrCodeDestination
 import com.android.swingmusic.auth.presentation.screen.destinations.LoginWithUsernameScreenDestination
 import com.android.swingmusic.common.presentation.navigator.CommonNavigator
-import com.android.swingmusic.folder.presentation.screen.destinations.FoldersAndTracksPaginatedScreenDestination
+import com.android.swingmusic.folder.presentation.screen.destinations.FoldersAndTracksScreenDestination
 import com.android.swingmusic.home.presentation.destinations.HomeDestination
 import com.android.swingmusic.player.presentation.screen.destinations.QueueScreenDestination
 import com.android.swingmusic.search.presentation.screen.destinations.ViewAllSearchResultsDestination
@@ -62,7 +62,7 @@ class CoreNavigator(
 
     // Todo: Remove this after adding home content
     override fun gotoFolders() {
-        val targetDestination = FoldersAndTracksPaginatedScreenDestination()
+        val targetDestination = FoldersAndTracksScreenDestination()
 
         navController.navigate(targetDestination) {
             launchSingleTop = true
@@ -140,7 +140,7 @@ class CoreNavigator(
     }
 
     override fun gotoSourceFolder(name: String, path: String) {
-        val targetDestination = FoldersAndTracksPaginatedScreenDestination(name, path)
+        val targetDestination = FoldersAndTracksScreenDestination(name, path)
         navController.navigate(targetDestination) {
             launchSingleTop = true
         }

app/src/main/java/com/android/swingmusic/presentation/navigator/NavGraphs.kt

@@ -7,7 +7,7 @@ import com.android.swingmusic.artist.presentation.screen.destinations.ArtistInfo
 import com.android.swingmusic.artist.presentation.screen.destinations.ViewAllScreenOnArtistDestination
 import com.android.swingmusic.auth.presentation.screen.destinations.LoginWithQrCodeDestination
 import com.android.swingmusic.auth.presentation.screen.destinations.LoginWithUsernameScreenDestination
-import com.android.swingmusic.folder.presentation.screen.destinations.FoldersAndTracksPaginatedScreenDestination
+import com.android.swingmusic.folder.presentation.screen.destinations.FoldersAndTracksScreenDestination
 import com.android.swingmusic.home.presentation.destinations.HomeDestination
 import com.android.swingmusic.player.presentation.screen.destinations.NowPlayingScreenDestination
 import com.android.swingmusic.player.presentation.screen.destinations.QueueScreenDestination
@@ -23,7 +23,7 @@ object NavGraphs {
 
         // TODO: Use Home instead of Folder as the startRoute
         override val startRoute: Route =
-            if (isUserLoggedIn) FoldersAndTracksPaginatedScreenDestination else LoginWithQrCodeDestination
+            if (isUserLoggedIn) FoldersAndTracksScreenDestination else LoginWithQrCodeDestination
 
         override val destinationsByRoute: Map<String, DestinationSpec<*>>
             get() {
@@ -35,7 +35,7 @@ object NavGraphs {
                 val pastAuthDestSpec = listOf(
                     // shown on bottom nav
                     HomeDestination,
-                    FoldersAndTracksPaginatedScreenDestination,
+                    FoldersAndTracksScreenDestination,
                     AllAlbumScreenDestination,
                     AllArtistsScreenDestination,
                     SearchScreenDestination,

…tion/screen/FoldersAndTracksPaginated.kt …/presentation/screen/FoldersAndTracks.ktfeature/folder/src/main/java/com/android/swingmusic/folder/presentation/screen/FoldersAndTracksPaginated.kt renamed to feature/folder/src/main/java/com/android/swingmusic/folder/presentation/screen/FoldersAndTracks.kt feature/folder/src/main/java/com/android/swingmusic/folder/presentation/screen/FoldersAndTracksPaginated.kt renamed to feature/folder/src/main/java/com/android/swingmusic/folder/presentation/screen/FoldersAndTracks.kt

@@ -14,7 +14,6 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyRow
-import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material.icons.Icons
@@ -34,7 +33,6 @@ import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
 import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -52,19 +50,16 @@ import androidx.paging.compose.collectAsLazyPagingItems
 import com.android.swingmusic.album.presentation.event.AlbumWithInfoUiEvent
 import com.android.swingmusic.album.presentation.viewmodel.AlbumWithInfoViewModel
 import com.android.swingmusic.common.presentation.navigator.CommonNavigator
-import com.android.swingmusic.core.data.util.Resource
 import com.android.swingmusic.core.domain.model.BottomSheetItemModel
 import com.android.swingmusic.core.domain.model.Folder
 import com.android.swingmusic.core.domain.model.Track
 import com.android.swingmusic.core.domain.util.BottomSheetAction
 import com.android.swingmusic.core.domain.util.PlaybackState
 import com.android.swingmusic.core.domain.util.QueueSource
 import com.android.swingmusic.folder.presentation.event.FolderUiEvent
-import com.android.swingmusic.folder.presentation.state.FoldersWithPagingTracksState
 import com.android.swingmusic.folder.presentation.state.FoldersContentPagingState
 import com.android.swingmusic.folder.presentation.model.FolderContentItem
 import com.android.swingmusic.folder.presentation.viewmodel.FoldersViewModel
-import com.android.swingmusic.player.presentation.event.PlayerUiEvent
 import com.android.swingmusic.player.presentation.event.QueueEvent
 import com.android.swingmusic.player.presentation.viewmodel.MediaControllerViewModel
 import com.android.swingmusic.uicomponent.R
@@ -73,12 +68,11 @@ import com.android.swingmusic.uicomponent.presentation.component.FolderItem
 import com.android.swingmusic.uicomponent.presentation.component.PathIndicatorItem
 import com.android.swingmusic.uicomponent.presentation.component.TrackItem
 import com.ramcosta.composedestinations.annotation.Destination
-import kotlinx.coroutines.launch
 import java.util.Locale
 
 @OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class)
 @Composable
-private fun FoldersAndTracksPaginated(
+private fun FoldersAndTracks(
     currentFolder: Folder,
     homeDir: Folder,
     foldersContentPagingState: FoldersContentPagingState,
@@ -483,7 +477,7 @@ private fun FoldersAndTracksPaginated(
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
 @Destination
 @Composable
-fun FoldersAndTracksPaginatedScreen(
+fun FoldersAndTracksScreen(
     foldersViewModel: FoldersViewModel,
     albumWithInfoViewModel: AlbumWithInfoViewModel = hiltViewModel(),
     mediaControllerViewModel: MediaControllerViewModel,
@@ -559,7 +553,7 @@ fun FoldersAndTracksPaginatedScreen(
         }
     }
 
-    FoldersAndTracksPaginated(
+    FoldersAndTracks(
         currentFolder = currentFolder,
         homeDir = homeDir,
         foldersContentPagingState = foldersViewModel.foldersContentPaging.value,