diff --git a/app/src/main/java/com/example/harmonyhub/HarmonyHubApp.kt b/app/src/main/java/com/example/harmonyhub/HarmonyHubApp.kt index 88641df..5acef14 100644 --- a/app/src/main/java/com/example/harmonyhub/HarmonyHubApp.kt +++ b/app/src/main/java/com/example/harmonyhub/HarmonyHubApp.kt @@ -120,7 +120,8 @@ fun HarmonyHubApp( HarmonyHubScreen.Profile, HarmonyHubScreen.Settings, HarmonyHubScreen.Play, - HarmonyHubScreen.Friends + HarmonyHubScreen.Friends, + HarmonyHubScreen.AddToPlaylistFromSong ) ) { Column { @@ -352,8 +353,8 @@ fun HarmonyHubApp( Friend("Minh", "minh@gmail.com", R.drawable.hip) ), onBackButtonClicked = { navController.popBackStack() }, - onAddButtonClicked = { }, - onUnfriendClicked = { } + onAddButtonClicked = { }, + onUnfriendClicked = { } ) } diff --git a/app/src/main/java/com/example/harmonyhub/ui/profile/FriendsScreen.kt b/app/src/main/java/com/example/harmonyhub/ui/profile/FriendsScreen.kt index 485fe9f..d5252dd 100644 --- a/app/src/main/java/com/example/harmonyhub/ui/profile/FriendsScreen.kt +++ b/app/src/main/java/com/example/harmonyhub/ui/profile/FriendsScreen.kt @@ -36,11 +36,13 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.platform.LocalFocusManager +import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import coil.compose.rememberAsyncImagePainter +import com.example.harmonyhub.R import com.example.harmonyhub.ui.components.Friend import com.example.harmonyhub.ui.components.FriendCard import com.example.harmonyhub.ui.components.contains @@ -259,7 +261,7 @@ fun FriendsScreen( BottomSheetContent( onDismiss = { isBottomSheetVisible = false }, selectedFriend = selectedFriend, - onUnfriendClicked = onUnfriendClicked + onWatchPlaylistClicked = onUnfriendClicked ) } } @@ -269,7 +271,7 @@ fun FriendsScreen( private fun BottomSheetContent( onDismiss: () -> Unit, selectedFriend: Friend?, - onUnfriendClicked: () -> Unit + onWatchPlaylistClicked: () -> Unit ) { Column( modifier = Modifier @@ -316,18 +318,18 @@ private fun BottomSheetContent( .fillMaxWidth() .clickable { onDismiss() - onUnfriendClicked() + onWatchPlaylistClicked() } ) { Icon( - imageVector = Icons.Default.Clear, - contentDescription = "Unfriend", - tint = Color.Gray, + painter = painterResource(R.drawable.queue_music), + contentDescription = "Watch Playlist", + tint = Color.LightGray, modifier = Modifier.size(25.dp) ) Spacer(modifier = Modifier.width(16.dp)) Text( - "Hủy kết bạn", + "Xem playlist", modifier = Modifier.padding(vertical = 8.dp), fontFamily = NotoSans, fontSize = 16.sp )