Merge pull request #69 from swingmx/search

`:search` Add View More on Search Results

Author: Ericgacoki

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

@@ -51,7 +51,7 @@ import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import com.android.swingmusic.album.presentation.screen.destinations.AllAlbumScreenDestination
 import com.android.swingmusic.artist.presentation.screen.destinations.AllArtistsScreenDestination
-import com.android.swingmusic.artist.presentation.screen.destinations.ViewAllScreenDestination
+import com.android.swingmusic.artist.presentation.screen.destinations.ViewAllScreenOnArtistDestination
 import com.android.swingmusic.artist.presentation.viewmodel.ArtistInfoViewModel
 import com.android.swingmusic.auth.data.workmanager.scheduleTokenRefreshWork
 import com.android.swingmusic.auth.presentation.screen.destinations.LoginWithQrCodeDestination
@@ -64,8 +64,15 @@ import com.android.swingmusic.player.presentation.screen.MiniPlayer
 import com.android.swingmusic.player.presentation.screen.destinations.NowPlayingScreenDestination
 import com.android.swingmusic.player.presentation.screen.destinations.QueueScreenDestination
 import com.android.swingmusic.player.presentation.viewmodel.MediaControllerViewModel
-import com.android.swingmusic.presentation.navigator.*
+import com.android.swingmusic.presentation.navigator.BottomNavItem
+import com.android.swingmusic.presentation.navigator.CoreNavigator
+import com.android.swingmusic.presentation.navigator.NavGraphs
+import com.android.swingmusic.presentation.navigator.scaleInEnterTransition
+import com.android.swingmusic.presentation.navigator.scaleInPopEnterTransition
+import com.android.swingmusic.presentation.navigator.scaleOutExitTransition
+import com.android.swingmusic.presentation.navigator.scaleOutPopExitTransition
 import com.android.swingmusic.search.presentation.screen.destinations.SearchScreenDestination
+import com.android.swingmusic.search.presentation.screen.destinations.ViewAllSearchResultsDestination
 import com.android.swingmusic.service.PlaybackService
 import com.android.swingmusic.service.SessionTokenManager
 import com.android.swingmusic.uicomponent.presentation.theme.SwingMusicTheme
@@ -176,10 +183,18 @@ class MainActivity : ComponentActivity() {
                                     "player/${QueueScreenDestination.route}",
 
                                     // Hide mini player in view all screen
-                                    "player/${ViewAllScreenDestination.route}",
-                                    "folder/${ViewAllScreenDestination.route}",
-                                    "album/${ViewAllScreenDestination.route}",
-                                    "artist/${ViewAllScreenDestination.route}",
+                                    "player/${ViewAllScreenOnArtistDestination.route}",
+                                    "folder/${ViewAllScreenOnArtistDestination.route}",
+                                    "album/${ViewAllScreenOnArtistDestination.route}",
+                                    "artist/${ViewAllScreenOnArtistDestination.route}",
+                                    "search/${ViewAllScreenOnArtistDestination.route}",
+
+                                    "player/${ViewAllSearchResultsDestination.route}",
+                                    "folder/${ViewAllSearchResultsDestination.route}",
+                                    "album/${ViewAllSearchResultsDestination.route}",
+                                    "artist/${ViewAllSearchResultsDestination.route}",
+                                    "search/${ViewAllSearchResultsDestination.route}",
+                                    "search/${ViewAllSearchResultsDestination.route}",
 
                                     // Hide mini player in queue screen
                                     "folder/${QueueScreenDestination.route}",

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

@@ -4,14 +4,15 @@ import androidx.navigation.NavController
 import androidx.navigation.NavOptionsBuilder
 import com.android.swingmusic.album.presentation.screen.destinations.AlbumWithInfoScreenDestination
 import com.android.swingmusic.artist.presentation.screen.destinations.ArtistInfoScreenDestination
-import com.android.swingmusic.artist.presentation.screen.destinations.ViewAllScreenDestination
+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.auth.presentation.viewmodel.AuthViewModel
 import com.android.swingmusic.common.presentation.navigator.CommonNavigator
 import com.android.swingmusic.folder.presentation.screen.destinations.FoldersAndTracksScreenDestination
 import com.android.swingmusic.player.presentation.screen.destinations.QueueScreenDestination
 import com.android.swingmusic.player.presentation.viewmodel.MediaControllerViewModel
+import com.android.swingmusic.search.presentation.screen.destinations.ViewAllSearchResultsDestination
 import com.ramcosta.composedestinations.dynamic.within
 import com.ramcosta.composedestinations.navigation.navigate
 import com.ramcosta.composedestinations.spec.NavGraphSpec
@@ -157,14 +158,36 @@ class CoreNavigator(
         }
     }
 
-    override fun gotoViewAllScreen(
+    override fun gotoViewAllOnArtistScreen(
         viewAllType: String,
         artistName: String,
         baseUrl: String
     ) {
         val currentDestination = navController.currentDestination?.route
         val targetDestination =
-            ViewAllScreenDestination(viewAllType, artistName, baseUrl)
+            ViewAllScreenOnArtistDestination(viewAllType, artistName, baseUrl)
+
+        if (currentDestination != targetDestination.route) {
+            navController.navigate(
+                targetDestination within navGraph,
+                fun NavOptionsBuilder.() {
+                    launchSingleTop = true
+                    restoreState = true
+                }
+            )
+        }
+    }
+
+    override fun gotoViewAllSearchResultsScreen(
+        viewAllType: String,
+        searchParams: String
+    ) {
+        val currentDestination = navController.currentDestination?.route
+        val targetDestination =
+            ViewAllSearchResultsDestination(
+                searchParams = searchParams,
+                viewAllType = viewAllType
+            )
 
         if (currentDestination != targetDestination.route) {
             navController.navigate(

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

@@ -4,14 +4,15 @@ import com.android.swingmusic.album.presentation.screen.destinations.AlbumWithIn
 import com.android.swingmusic.album.presentation.screen.destinations.AllAlbumScreenDestination
 import com.android.swingmusic.artist.presentation.screen.destinations.AllArtistsScreenDestination
 import com.android.swingmusic.artist.presentation.screen.destinations.ArtistInfoScreenDestination
-import com.android.swingmusic.artist.presentation.screen.destinations.ViewAllScreenDestination
+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.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
 import com.android.swingmusic.search.presentation.screen.destinations.SearchScreenDestination
+import com.android.swingmusic.search.presentation.screen.destinations.ViewAllSearchResultsDestination
 import com.ramcosta.composedestinations.dynamic.routedIn
 import com.ramcosta.composedestinations.spec.DestinationSpec
 import com.ramcosta.composedestinations.spec.NavGraphSpec
@@ -53,8 +54,9 @@ object NavGraphs {
                 ArtistInfoScreenDestination,
                 QueueScreenDestination,
                 NowPlayingScreenDestination,
-                ViewAllScreenDestination,
-                SearchScreenDestination
+                ViewAllScreenOnArtistDestination,
+                SearchScreenDestination,
+                ViewAllSearchResultsDestination
             ).routedIn(this).associateBy { it.route }
     }
 
@@ -68,10 +70,11 @@ object NavGraphs {
                 NowPlayingScreenDestination,
                 QueueScreenDestination,
                 ArtistInfoScreenDestination,
-                ViewAllScreenDestination,
+                ViewAllScreenOnArtistDestination,
                 AlbumWithInfoScreenDestination,
                 FoldersAndTracksScreenDestination,
-                SearchScreenDestination
+                SearchScreenDestination,
+                ViewAllSearchResultsDestination
             ).routedIn(this).associateBy { it.route }
     }
 
@@ -85,11 +88,12 @@ object NavGraphs {
                 AllArtistsScreenDestination,
                 ArtistInfoScreenDestination,
                 AlbumWithInfoScreenDestination,
-                ViewAllScreenDestination,
+                ViewAllScreenOnArtistDestination,
                 NowPlayingScreenDestination,
                 QueueScreenDestination,
                 FoldersAndTracksScreenDestination,
-                SearchScreenDestination
+                SearchScreenDestination,
+                ViewAllSearchResultsDestination
             ).routedIn(this).associateBy { it.route }
     }
 
@@ -103,11 +107,12 @@ object NavGraphs {
                 AllAlbumScreenDestination,
                 AlbumWithInfoScreenDestination,
                 ArtistInfoScreenDestination,
-                ViewAllScreenDestination,
+                ViewAllScreenOnArtistDestination,
                 NowPlayingScreenDestination,
                 QueueScreenDestination,
                 FoldersAndTracksScreenDestination,
-                SearchScreenDestination
+                SearchScreenDestination,
+                ViewAllSearchResultsDestination
             ).routedIn(this).associateBy { it.route }
     }
 
@@ -119,10 +124,11 @@ object NavGraphs {
         override val destinationsByRoute: Map<String, DestinationSpec<*>> =
             listOf<DestinationSpec<*>>(
                 SearchScreenDestination,
+                ViewAllSearchResultsDestination,
                 AllAlbumScreenDestination,
                 AlbumWithInfoScreenDestination,
                 ArtistInfoScreenDestination,
-                ViewAllScreenDestination,
+                ViewAllScreenOnArtistDestination,
                 NowPlayingScreenDestination,
                 QueueScreenDestination,
                 FoldersAndTracksScreenDestination

app/src/main/res/values/colors.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <color name="splash_background">#262626</color>
     <color name="purple_200">#FFBB86FC</color>
     <color name="purple_500">#FF6200EE</color>
     <color name="purple_700">#FF3700B3</color>

app/src/main/res/values/themes.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Theme.SwingMusic" parent="android:Theme.Material.Light.NoActionBar" />
+    <style name="Theme.SwingMusic" parent="android:Theme.Material.Light.NoActionBar">
+        <item name="android:windowBackground">@color/splash_background</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
 </resources>

core/src/main/java/com/android/swingmusic/core/data/dto/ArtistResultDto.kt

@@ -7,5 +7,5 @@ data class ArtistsSearchResultDto(
     @SerializedName("more")
     val more: Boolean?,
     @SerializedName("results")
-    val resultDto: List<ArtistResultDto>?
+    val resultDto: List<ArtistDto>?
 )

core/src/main/java/com/android/swingmusic/core/data/dto/ArtistsSearchResultDto.kt

@@ -11,7 +11,6 @@ import com.android.swingmusic.core.data.dto.AllArtistsDto
 import com.android.swingmusic.core.data.dto.ArtistDto
 import com.android.swingmusic.core.data.dto.ArtistExpandedDto
 import com.android.swingmusic.core.data.dto.ArtistInfoDto
-import com.android.swingmusic.core.data.dto.ArtistResultDto
 import com.android.swingmusic.core.data.dto.ArtistsSearchResultDto
 import com.android.swingmusic.core.data.dto.DirDto
 import com.android.swingmusic.core.data.dto.DirListDto
@@ -313,21 +312,10 @@ object Map {
         )
     }
 
-    private fun ArtistResultDto.toArtist(): Artist {
-        return Artist(
-            artistHash = artisthash ?: "",
-            colors = listOf(color ?: "#FFFFFF"),
-            createdDate = createdDate?.toDouble() ?: 0.0,
-            helpText = "",
-            image = image ?: "",
-            name = name ?: "Unknown Artist"
-        )
-    }
-
     fun ArtistsSearchResultDto.toArtistsSearchResult(): ArtistsSearchResult {
         return ArtistsSearchResult(
             more = more ?: false,
-            results = resultDto?.map { it.toArtist() } ?: emptyList()
+            result = resultDto?.map { it.toArtist() } ?: emptyList()
         )
     }
 
@@ -361,7 +349,7 @@ object Map {
     fun TracksSearchResultDto.toTracksSearchResult(): TracksSearchResult {
         return TracksSearchResult(
             more = more ?: false,
-            results = results?.map { it.toTrackResults() } ?: emptyList()
+            result = results?.map { it.toTrackResults() } ?: emptyList()
         )
     }
 

core/src/main/java/com/android/swingmusic/core/data/mapper/Mapper.kt

@@ -2,5 +2,5 @@ package com.android.swingmusic.core.domain.model
 
 data class ArtistsSearchResult(
     val more: Boolean,
-    val results: List<Artist>
+    val result: List<Artist>
 )

core/src/main/java/com/android/swingmusic/core/domain/model/ArtistsSearchResult.kt

@@ -2,5 +2,5 @@ package com.android.swingmusic.core.domain.model
 
 data class TracksSearchResult(
     val more: Boolean,
-    val results: List<Track>
+    val result: List<Track>
 )