Merge branch 'frontend' - updating split and testing

nalgnaohel · Dec 14, 2024 · 948d289 · 948d289
2 parents 43e4a56 + 9fdca81
commit 948d289
Show file tree

Hide file tree

Showing 9 changed files with 285 additions and 47 deletions.
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git a/app/src/main/java/com/example/harmonyhub/HarmonyHubApp.kt b/app/src/main/java/com/example/harmonyhub/HarmonyHubApp.kt
@@ -59,6 +59,8 @@ import com.example.harmonyhub.ui.library.AlbumScreen
 import com.example.harmonyhub.ui.library.ArtistScreen
 import com.example.harmonyhub.ui.library.ChartsScreen
 import com.example.harmonyhub.ui.library.PlaylistSongListScreen
+import com.example.harmonyhub.ui.library.SelectionScreen
+import com.example.harmonyhub.ui.library.SplitMusicScreen
 import com.example.harmonyhub.ui.play.NowPlayingBar
 import com.example.harmonyhub.ui.play.PlayScreen
 import com.example.harmonyhub.ui.profile.FavoriteFriendScreen
@@ -93,7 +95,8 @@ enum class HarmonyHubScreen(@StringRes val title: Int, val icon: ImageVector) {
     ),
     Friends(title = R.string.friends, icon = Icons.Default.AccountBox),
     Album(title = R.string.album, icon = Icons.Default.AccountBox),
-    FavoriteFriend(title = R.string.favorite, icon = Icons.Default.AccountBox)
+    FavoriteFriend(title = R.string.favorite, icon = Icons.Default.AccountBox),
+    Selection(title = R.string.favorite, icon = Icons.Default.AccountBox)
 }
 
 object CurrentSong {
@@ -144,16 +147,16 @@ fun HarmonyHubApp(
             ) {
                 Column {
                     // Kiểm tra nếu CurrentSong.currentSong không null
-                    CurrentSong.currentSong?.let { currentSong ->
-                        NowPlayingBar(
-                            song = currentSong,
-                            isPlaying = true,
-                            onPlayPauseClick = { /* Handle play/pause logic */ },
-                            onNextClick = { /* Handle next song logic */ },
-                            onPreviousClick = { /* Handle previous song logic */ },
-                            onBarClick = { /* Handle bar click logic */ }
-                        )
-                    }
+//                    CurrentSong.currentSong?.let { currentSong ->
+//                        NowPlayingBar(
+//                            song = currentSong,
+//                            isPlaying = true,
+//                            onPlayPauseClick = { /* Handle play/pause logic */ },
+//                            onNextClick = { /* Handle next song logic */ },
+//                            onPreviousClick = { /* Handle previous song logic */ },
+//                            onBarClick = { /* Handle bar click logic */ }
+//                        )
+//                    }
                     BottomNavigationBar(navController = navController)
                 }
             }
@@ -275,8 +278,8 @@ fun HarmonyHubApp(
                                     authenticationMainViewModel.signOut()
                                     navController.navigate(HarmonyHubScreen.Login.name)
                                 },
-                                onSettingsButtonClicked = {
-                                    navController.navigate(HarmonyHubScreen.Settings.name)
+                                onSplitButtonClicked = {
+                                    navController.navigate(HarmonyHubScreen.Selection.name)
                                 },
                                 onPlaySongClicked = {
                                     navController.navigate(HarmonyHubScreen.Play.name)
@@ -490,6 +493,9 @@ fun HarmonyHubApp(
                         onBackButtonClicked = { navController.popBackStack() }
                     )
                 }
+                composable(route = HarmonyHubScreen.Selection.name) {
+                    Nav5(navController)
+                }
 
             }
         }
@@ -626,8 +632,8 @@ fun Nav3(
                     authenticationMainViewModel.signOut()
                     parentNavController.navigate(HarmonyHubScreen.Login.name)
                 },
-                onSettingsButtonClicked = {
-                    parentNavController.navigate(HarmonyHubScreen.Settings.name)
+                onSplitButtonClicked = {
+                    parentNavController.navigate(HarmonyHubScreen.Selection.name)
                 },
                 navController = navController
             )
@@ -722,7 +728,39 @@ fun Nav3(
         }
     }
 }
-
+@Composable
+fun Nav5(
+    parentNavController: NavHostController
+) {
+    val navController = rememberNavController()
+    NavHost(navController = navController, startDestination = HarmonyHubScreen.Selection.name) {
+        composable(route = HarmonyHubScreen.Selection.name) {
+            SelectionScreen(
+                navController,
+                onBackButtonClicked = {parentNavController.popBackStack()}
+            )
+        }
+        composable(
+            route = "SplitMusic?url1={selectedUrls[0]}&url2={selectedUrls[1]}",
+            arguments = listOf(
+                navArgument(name = "selectedUrls[0]") {
+                    type = NavType.StringType
+                    nullable = true
+                },
+                navArgument(name = "selectedUrls[1]") {
+                    type = NavType.StringType
+                    nullable = true
+                }
+            )
+        ) { backStackEntry ->
+            SplitMusicScreen(
+                url1 = backStackEntry.arguments?.getString("selectedUrls[0]"),
+                url2 = backStackEntry.arguments?.getString("selectedUrls[1]"),
+                onBackButtonClicked = {navController.popBackStack()}
+            )
+        }
+    }
+}
 //@OptIn(ExperimentalMaterial3Api::class)
 //@Composable
 //fun HarmonyHubAppbar(

diff --git a/app/src/main/java/com/example/harmonyhub/MainActivity.kt b/app/src/main/java/com/example/harmonyhub/MainActivity.kt
@@ -6,6 +6,7 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.core.view.WindowCompat
+import com.example.harmonyhub.ui.library.SelectionScreen
 import com.example.harmonyhub.ui.theme.HarmonyHubTheme
 import dagger.hilt.android.AndroidEntryPoint
 

diff --git a/app/src/main/java/com/example/harmonyhub/ui/components/NavigationDrawer.kt b/app/src/main/java/com/example/harmonyhub/ui/components/NavigationDrawer.kt
@@ -19,6 +19,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ExitToApp
 import androidx.compose.material.icons.filled.AccountCircle
+import androidx.compose.material.icons.filled.Build
 import androidx.compose.material.icons.filled.ExitToApp
 import androidx.compose.material.icons.filled.Settings
 import androidx.compose.material3.DrawerValue
@@ -50,7 +51,7 @@ import java.time.format.TextStyle
 @Composable
 fun AppScaffoldWithDrawer(
     onProfileClicked: () -> Unit,
-    onSettingsClicked: () -> Unit,
+    onSplitClicked: () -> Unit,
     onLogoutClicked: () -> Unit,
     content: @Composable (onOpenDrawer: () -> Unit) -> Unit
 ) {
@@ -72,9 +73,9 @@ fun AppScaffoldWithDrawer(
                         scope.launch { drawerState.close() }
                         onProfileClicked()
                     },
-                    onSettingsClicked = {
+                    onSplitClicked = {
                         scope.launch { drawerState.close() }
-                        onSettingsClicked()
+                        onSplitClicked()
                     },
                     onLogoutClicked = {
                         scope.launch { drawerState.close() }
@@ -93,7 +94,7 @@ fun AppScaffoldWithDrawer(
 @Composable
 fun DrawerContent(
     onProfileClicked: () -> Unit,
-    onSettingsClicked: () -> Unit,
+    onSplitClicked: () -> Unit,
     onLogoutClicked: () -> Unit,
     userDataViewModel: UserDataViewModel = hiltViewModel()
 ) {
@@ -166,17 +167,17 @@ fun DrawerContent(
         }
 
         TextButton(
-            onClick = onSettingsClicked
+            onClick = onSplitClicked
         ) {
             Row {
                 Icon(
-                    imageVector = Icons.Default.Settings,
-                    contentDescription = "Settings",
+                    imageVector = Icons.Default.Build,
+                    contentDescription = "Split",
                     tint = Color.White
                 )
                 Spacer(modifier = Modifier.width(16.dp))
                 Text(
-                    text = "Cài đặt",
+                    text = "Tách nhạc",
                     style = androidx.compose.ui.text.TextStyle(
                         fontFamily = NotoSans,
                         fontWeight = FontWeight.Bold,

diff --git a/app/src/main/java/com/example/harmonyhub/ui/home/HomeScreen.kt b/app/src/main/java/com/example/harmonyhub/ui/home/HomeScreen.kt
@@ -100,7 +100,7 @@ fun HomeScreen(
     onLibraryButtonClicked: () -> Unit,
     onProfileButtonClicked: () -> Unit,
     onLogoutButtonClicked: () -> Unit,
-    onSettingsButtonClicked: () -> Unit,
+    onSplitButtonClicked: () -> Unit,
     modifier: Modifier = Modifier,
     viewModel: HomeViewModel = viewModel(factory = HomeViewModel.Factory),
     userDataViewModel: UserDataViewModel = hiltViewModel(),
@@ -128,7 +128,7 @@ fun HomeScreen(
                 onLibraryButtonClicked,
                 onProfileButtonClicked,
                 onLogoutButtonClicked,
-                onSettingsButtonClicked,
+                onSplitButtonClicked,
                 modifier,
                 username.value.toString(),
                 popularItems,
@@ -146,15 +146,15 @@ fun MainHomeScreen(
     onLibraryButtonClicked: () -> Unit,
     onProfileButtonClicked: () -> Unit,
     onLogoutButtonClicked: () -> Unit,
-    onSettingsButtonClicked: () -> Unit,
+    onSplitButtonClicked: () -> Unit,
     modifier: Modifier = Modifier,
     nameUser : String,
     resPopularItem: ResponseHomeScreenData
 ) {
     //Main UI
     AppScaffoldWithDrawer(
         onProfileClicked = onProfileButtonClicked,
-        onSettingsClicked = onSettingsButtonClicked,
+        onSplitClicked = onSplitButtonClicked,
         onLogoutClicked = onLogoutButtonClicked
     ) { onOpenDrawer ->
         Column(
@@ -190,7 +190,7 @@ fun MainHomeScreen(
                     )
                 }
                 Row {
-                    IconButton(onClick = { onSettingsButtonClicked() }) {
+                    IconButton(onClick = { onSplitButtonClicked() }) {
                         Icon(
                             imageVector = Icons.Default.Settings,
                             contentDescription = "Settings",

diff --git a/app/src/main/java/com/example/harmonyhub/ui/library/LibraryScreen.kt b/app/src/main/java/com/example/harmonyhub/ui/library/LibraryScreen.kt
@@ -81,7 +81,7 @@ fun LibraryScreen(
     onPlaylistButtonClicked: () -> Unit,
     onArtistsFollowingButtonClicked: () -> Unit,
     onLogoutButtonClicked: () -> Unit,
-    onSettingsButtonClicked: () -> Unit,
+    onSplitButtonClicked: () -> Unit,
     favoriteSongsViewModel: FavoriteSongsViewModel = hiltViewModel(),
     userViewModel: UserDataViewModel = hiltViewModel(),
     onAddToPlaylistClicked: () -> Unit,
@@ -118,7 +118,7 @@ fun LibraryScreen(
 
     AppScaffoldWithDrawer(
         onProfileClicked = onProfileButtonClicked,
-        onSettingsClicked = onSettingsButtonClicked,
+        onSplitClicked =  onSplitButtonClicked,
         onLogoutClicked = onLogoutButtonClicked
     ) { onOpenDrawer ->
         Column(