refactor: 유튜브 브랜딩 가이드에 따른 플레이리스트 추출 버튼 이미지 변경 (#439)

* refactor: 플레이리스트 추출 아이콘 변경 * feat: 플레이리스트로 추출할 음악이 하나도 선택되어있지 않은 경우 플레이리스트 추출 버튼을 클릭할 수 없다. * refactor: 변수명을 수정한다. * refactor: 변수명을 수정한다. * refactor: 선택된 적이 있다는 것을 나타내는 변수명으로 수정한다. * refactor: 선택된 적이 있다는 것을 나타내는 변수명을 수정한다.
woowacourse-teams · Nov 23, 2023 · e953027 · e953027
1 parent 9c9abd6
commit e953027
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 12 deletions.
diff --git a/...d/app/src/main/java/com/digginroom/digginroom/feature/scrap/activity/ScrapListActivity.kt b/...d/app/src/main/java/com/digginroom/digginroom/feature/scrap/activity/ScrapListActivity.kt
@@ -82,6 +82,13 @@ class ScrapListActivity : AppCompatActivity() {
                     SocialLogin.Google.getIntent(this)
                 )
 
+                is ScrapUiState.Selection -> {
+                    binding.scrapIbExtractPlaylist.isEnabled = it.isExtractionAvailable
+                    binding.adapter?.submitList(
+                        scrapViewModel.uiState.value?.rooms
+                    )
+                }
+
                 else -> binding.adapter?.submitList(
                     scrapViewModel.uiState.value?.rooms
                 )
@@ -96,6 +103,7 @@ class ScrapListActivity : AppCompatActivity() {
                     it.expectedTime
                 )
                 is ScrapUiEvent.DisAllowedExtraction -> getString(R.string.scrap_disallowed_extracting_playlist)
+
                 is ScrapUiEvent.FailedSelection -> getString(R.string.scrap_maximum_selection).format(
                     it.maximum
                 )

diff --git a/android/app/src/main/java/com/digginroom/digginroom/feature/scrap/viewmodel/ScrapUiState.kt b/android/app/src/main/java/com/digginroom/digginroom/feature/scrap/viewmodel/ScrapUiState.kt
@@ -20,7 +20,8 @@ sealed interface ScrapUiState {
 
     data class Selection(
         override val onSelect: (position: Int) -> Unit,
-        override val rooms: List<ScrappedRoomModel>
+        override val rooms: List<ScrappedRoomModel>,
+        val isExtractionAvailable: Boolean
     ) : ScrapUiState
 
     data class PlaylistExtraction(

diff --git a/...oid/app/src/main/java/com/digginroom/digginroom/feature/scrap/viewmodel/ScrapViewModel.kt b/...oid/app/src/main/java/com/digginroom/digginroom/feature/scrap/viewmodel/ScrapViewModel.kt
@@ -66,7 +66,8 @@ class ScrapViewModel @Keep constructor(
                     } else {
                         _uiState.value = ScrapUiState.Selection(
                             onSelect = ::switchSelection,
-                            rooms = rooms.value.map { it.toModel(selectable = true) }
+                            rooms = rooms.value.map { it.toModel(selectable = true) },
+                            isExtractionAvailable = rooms.hasSelected
                         )
                     }
                 } else {
@@ -82,7 +83,8 @@ class ScrapViewModel @Keep constructor(
         }
         _uiState.value = ScrapUiState.Selection(
             onSelect = ::switchSelection,
-            rooms = rooms.value.map { it.toModel(selectable = true) }
+            rooms = rooms.value.map { it.toModel(selectable = true) },
+            isExtractionAvailable = rooms.hasSelected
         )
     }
 

diff --git a/android/app/src/main/res/drawable/ic_extract_playlist.png b/android/app/src/main/res/drawable/ic_extract_playlist.png
diff --git a/android/app/src/main/res/drawable/ic_extract_playlist.xml b/android/app/src/main/res/drawable/ic_extract_playlist.xml
diff --git a/android/app/src/main/res/layout/activity_scrap.xml b/android/app/src/main/res/layout/activity_scrap.xml
@@ -88,15 +88,15 @@
 
         <ImageButton
             android:id="@+id/scrap_ib_extract_playlist"
-            android:layout_width="60dp"
-            android:layout_height="60dp"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
             android:layout_marginEnd="20dp"
             android:layout_marginBottom="20dp"
             android:background="?attr/selectableItemBackground"
             android:elevation="1dp"
             android:onClick="@{() -> viewModel.startPlaylistExtraction()}"
-            android:scaleType="centerInside"
-            android:src="@drawable/ic_playlist"
+            android:scaleType="fitXY"
+            android:src="@drawable/ic_extract_playlist"
             android:visibility="@{viewModel.uiState instanceof ScrapUiState.Selection ? View.VISIBLE : View.GONE}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />

diff --git a/android/domain/src/main/java/com/digginroom/digginroom/model/room/scrap/ScrappedRooms.kt b/android/domain/src/main/java/com/digginroom/digginroom/model/room/scrap/ScrappedRooms.kt
@@ -9,6 +9,9 @@ class ScrappedRooms(
     val value: List<ScrappedRoom>
         get() = _value
 
+    val hasSelected: Boolean
+        get() = _value.any { it.isSelected }
+
     val selectedId: List<String>
         get() = _value.filter {
             it.isSelected