feat : 최근 재생 노래 클릭시 최근 재생 노래 실행

boostcampwm2023 · Dec 7, 2023 · e84a543 · e84a543
1 parent f076280
commit e84a543
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/android/feature/home/src/main/java/com/ohdodok/catchytape/feature/home/HomeFragment.kt b/android/feature/home/src/main/java/com/ohdodok/catchytape/feature/home/HomeFragment.kt
@@ -34,7 +34,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(R.layout.fragment_home) {
         )
         observeEvents()
         viewModel.fetchUploadedMusics()
-        viewModel.fetchRecentPlayedMusics()
+        viewModel.fetchRecentlyPlayedMusics()
         setupButtons()
     }
 
@@ -61,10 +61,6 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(R.layout.fragment_home) {
                     .build()
             findNavController().navigate(request)
         }
-
-        binding.ivRecentlyPlayedSong.setOnClickListener {
-            findNavController().navigateToPlayerScreen()
-        }
     }
 }
 

diff --git a/android/feature/home/src/main/java/com/ohdodok/catchytape/feature/home/HomeViewModel.kt b/android/feature/home/src/main/java/com/ohdodok/catchytape/feature/home/HomeViewModel.kt
@@ -64,7 +64,7 @@ class HomeViewModel @Inject constructor(
             }.launchIn(viewModelScopeWithExceptionHandler)
     }
 
-    fun fetchRecentPlayedMusics() {
+    fun fetchRecentlyPlayedMusics() {
         playlistRepository.getRecentPlaylist()
             .onEach { musics ->
                 _uiState.update {
@@ -73,6 +73,13 @@ class HomeViewModel @Inject constructor(
             }.launchIn(viewModelScopeWithExceptionHandler)
     }
 
+    fun playRecentlyPlayedMusic() {
+        currentPlaylistUseCase.playMusics(uiState.value.recentlyPlayedMusics.first(), uiState.value.recentlyPlayedMusics)
+        viewModelScope.launch {
+            _events.emit(HomeEvent.NavigateToPlayerScreen)
+        }
+    }
+
     override fun onClick(music: Music) {
         currentPlaylistUseCase.playMusics(music, uiState.value.recentlyUploadedMusics)
         viewModelScope.launch {

diff --git a/android/feature/home/src/main/res/layout/fragment_home.xml b/android/feature/home/src/main/res/layout/fragment_home.xml
@@ -57,6 +57,8 @@
                 android:layout_width="0dp"
                 android:layout_height="0dp"
                 android:layout_marginTop="@dimen/small"
+                android:clickable="@{viewModel.uiState.firstRecentlyPlayedMusicImageUrl == null ? false : true}"
+                android:onClick="@{() -> viewModel.playRecentlyPlayedMusic()}"
                 app:imgUrl="@{viewModel.uiState.firstRecentlyPlayedMusicImageUrl}"
                 app:layout_constraintDimensionRatio="1:1"
                 app:layout_constraintEnd_toEndOf="@id/tv_recently_played_song"

diff --git a/android/feature/playlist/src/main/res/layout/fragment_playlist_detail.xml b/android/feature/playlist/src/main/res/layout/fragment_playlist_detail.xml
@@ -76,6 +76,7 @@
             android:background="@drawable/btn_circle_background"
             android:contentDescription="@string/play"
             android:src="@drawable/ic_play"
+            app:tint="@color/surface"
             android:onClick="@{() -> viewModel.playFromFirst()}"
             app:layout_constraintBottom_toTopOf="@id/rv_playlist"
             app:layout_constraintEnd_toEndOf="parent"