[refactor] 이름 및 패키지 정리, Type-Safe Navigation 적용

app/build.gradle.kts

@@ -14,6 +14,7 @@ plugins {
     alias(libs.plugins.ksp)
     alias(libs.plugins.hilt)
     alias(libs.plugins.google.services)
+    alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.firebase.crashlytics)
 }
 
@@ -117,6 +118,7 @@ dependencies {
     androidTestImplementation(libs.androidx.ui.test.junit4)
     debugImplementation(libs.androidx.ui.tooling)
     debugImplementation(libs.androidx.ui.test.manifest)
+    implementation(libs.kotlinx.immutable)
 
     // Hilt
     implementation(libs.hilt.android)
@@ -150,4 +152,7 @@ dependencies {
     // Paging
     implementation(libs.androidx.paging.runtime)
     implementation(libs.androidx.paging.compose.android)
+
+    // Serialization
+    implementation(libs.kotlinx.serialization.json)
 }

app/src/main/java/com/squirtles/musicroad/picklist/PickListScreen.kt → app/src/main/java/com/squirtles/musicroad/common/picklist/PickListScreenContents.kt

@@ -1,4 +1,4 @@
-package com.squirtles.musicroad.picklist
+package com.squirtles.musicroad.common.picklist
 
 import android.content.res.Configuration
 import androidx.compose.foundation.background
@@ -20,7 +20,6 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -33,8 +32,6 @@ import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.wear.compose.material.CircularProgressIndicator
 import com.squirtles.domain.model.Order
 import com.squirtles.domain.model.Pick
@@ -44,29 +41,39 @@ import com.squirtles.musicroad.common.Constants.DEFAULT_PADDING
 import com.squirtles.musicroad.common.CountText
 import com.squirtles.musicroad.common.DefaultTopAppBar
 import com.squirtles.musicroad.common.VerticalSpacer
+import com.squirtles.musicroad.common.picklist.components.DeleteSelectedPickDialog
+import com.squirtles.musicroad.common.picklist.components.EditModeAction
+import com.squirtles.musicroad.common.picklist.components.EditModeBottomButton
+import com.squirtles.musicroad.common.picklist.components.OrderBottomSheet
+import com.squirtles.musicroad.common.picklist.components.PickItem
 import com.squirtles.musicroad.ui.theme.Primary
 import com.squirtles.musicroad.ui.theme.White
 
 @Composable
-fun PickListScreen(
+fun PickListScreenContents(
     userId: String,
+    showOrderBottomSheet: Boolean,
+    selectedPicksId: Set<String>,
     pickListType: PickListType,
+    uiState: PickListUiState,
     onBackClick: () -> Unit,
     onItemClick: (String) -> Unit,
-    pickListViewModel: PickListViewModel = hiltViewModel()
+    setListOrder: (Order) -> Unit,
+    setOrderBottomSheetVisibility: (Boolean) -> Unit,
+    selectAllPicks: () -> Unit,
+    deselectAllPicks: () -> Unit,
+    toggleSelectedPick: (String) -> Unit,
+    deleteSelectedPicks: (String) -> Unit
 ) {
     val isLandscape = LocalConfiguration.current.orientation == Configuration.ORIENTATION_LANDSCAPE
-    val uiState by pickListViewModel.pickListUiState.collectAsStateWithLifecycle()
-    val selectedPicksId by pickListViewModel.selectedPicksId.collectAsStateWithLifecycle()
 
     var isEditMode by rememberSaveable { mutableStateOf(false) }
-    var showOrderBottomSheet by rememberSaveable { mutableStateOf(false) }
     var isDeletePickDialogVisible by rememberSaveable { mutableStateOf(false) }
 
     val deactivateEditMode = remember {
         {
             isEditMode = false
-            pickListViewModel.deselectAllPicks()
+            deselectAllPicks()
         }
     }
     val showDeletePickDialog = remember {
@@ -75,13 +82,6 @@ fun PickListScreen(
         }
     }
 
-    LaunchedEffect(Unit) {
-        when (pickListType) {
-            PickListType.FAVORITE -> pickListViewModel.fetchFavoritePicks(userId)
-            PickListType.CREATED -> pickListViewModel.fetchMyPicks(userId)
-        }
-    }
-
     Scaffold(
         topBar = {
             DefaultTopAppBar(
@@ -98,8 +98,8 @@ fun PickListScreen(
                         enabled = uiState is PickListUiState.Success,
                         isSelectedEmpty = selectedPicksId.isEmpty(),
                         activateEditMode = { isEditMode = true },
-                        selectAllPicks = { pickListViewModel.selectAllPicks() },
-                        deselectAllPicks = { pickListViewModel.deselectAllPicks() },
+                        selectAllPicks = { selectAllPicks() },
+                        deselectAllPicks = { deselectAllPicks() },
                     )
                 }
             )
@@ -123,8 +123,8 @@ fun PickListScreen(
                 }
 
                 is PickListUiState.Success -> {
-                    val pickList = (uiState as PickListUiState.Success).pickList
-                    val order = (uiState as PickListUiState.Success).order
+                    val pickList = uiState.pickList
+                    val order = uiState.order
 
                     Column(
                         modifier = Modifier.fillMaxSize()
@@ -138,9 +138,11 @@ fun PickListScreen(
                             pickList = pickList,
                             selectedPicksId = selectedPicksId,
                             order = order,
-                            onOrderClick = { showOrderBottomSheet = true },
+                            onOrderClick = {
+                                setOrderBottomSheetVisibility(true)
+                            },
                             onItemClick = onItemClick,
-                            onEditModeItemClick = { pickListViewModel.toggleSelectedPick(it) },
+                            onEditModeItemClick = toggleSelectedPick,
                         )
 
                         if (isEditMode) {
@@ -170,10 +172,8 @@ fun PickListScreen(
         OrderBottomSheet(
             isFavoritePicks = pickListType == PickListType.FAVORITE,
             currentOrder = (uiState as PickListUiState.Success).order,
-            onDismissRequest = { showOrderBottomSheet = false },
-            onOrderClick = { order ->
-                pickListViewModel.setListOrder(pickListType, order)
-            },
+            onDismissRequest = { setOrderBottomSheetVisibility(false) },
+            onOrderClick = setListOrder,
         )
     }
 
@@ -185,7 +185,7 @@ fun PickListScreen(
             onDeletePickClick = {
                 isEditMode = false
                 isDeletePickDialogVisible = false
-                pickListViewModel.deleteSelectedPicks(pickListType)
+                deleteSelectedPicks(userId)
             },
         )
     }

app/src/main/java/com/squirtles/musicroad/picklist/PickListType.kt → app/src/main/java/com/squirtles/musicroad/common/picklist/PickListType.kt

@@ -1,4 +1,4 @@
-package com.squirtles.musicroad.picklist
+package com.squirtles.musicroad.common.picklist
 
 enum class PickListType {
     FAVORITE, CREATED

app/src/main/java/com/squirtles/musicroad/picklist/PickListUiState.kt → app/src/main/java/com/squirtles/musicroad/common/picklist/PickListUiState.kt

@@ -1,4 +1,4 @@
-package com.squirtles.musicroad.picklist
+package com.squirtles.musicroad.common.picklist
 
 import com.squirtles.domain.model.Order
 import com.squirtles.domain.model.Pick

app/src/main/java/com/squirtles/musicroad/common/picklist/PickListViewModel.kt

@@ -0,0 +1,101 @@
+package com.squirtles.musicroad.common.picklist
+
+import android.util.Log
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.squirtles.domain.model.Order
+import com.squirtles.domain.model.Pick
+import com.squirtles.domain.usecase.picklist.DeletePickListUseCaseInterface
+import com.squirtles.domain.usecase.picklist.FetchPickListUseCaseInterface
+import com.squirtles.domain.usecase.picklist.GetPickListOrderUseCaseInterface
+import com.squirtles.domain.usecase.picklist.SavePickListOrderUseCaseInterface
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+
+abstract class PickListViewModel(
+    val fetchPickListUseCase: FetchPickListUseCaseInterface,
+    val getPickListOrderUseCase: GetPickListOrderUseCaseInterface,
+    val savePickListOrderUseCase: SavePickListOrderUseCaseInterface,
+    val removePickUseCase: DeletePickListUseCaseInterface
+) : ViewModel() {
+
+    private var pickList: List<Pick> = emptyList()
+
+    private val _pickListUiState = MutableStateFlow<PickListUiState>(PickListUiState.Loading)
+    val pickListUiState = _pickListUiState.asStateFlow()
+
+    private val _selectedPicksId = MutableStateFlow<Set<String>>(emptySet())
+    val selectedPicksId = _selectedPicksId.asStateFlow()
+
+    fun fetchPickList(userId: String) {
+        viewModelScope.launch {
+            fetchPickListUseCase(userId)
+                .onSuccess { picks ->
+                    pickList = picks
+                    sortPickList(getPickListOrderUseCase())
+                }
+                .onFailure {
+                    _pickListUiState.emit(PickListUiState.Error)
+                }
+        }
+    }
+
+    private fun sortPickList(order: Order) {
+        _pickListUiState.value = PickListUiState.Success(
+            pickList = pickList.setOrderedList(order),
+            order = order
+        )
+    }
+
+    fun setListOrder(order: Order) {
+        viewModelScope.launch {
+            savePickListOrderUseCase(order)
+            sortPickList(order)
+        }
+    }
+
+    fun toggleSelectedPick(pickId: String) {
+        val curSelectedPicksId = _selectedPicksId.value
+        _selectedPicksId.value =
+            if (curSelectedPicksId.contains(pickId)) curSelectedPicksId - pickId else curSelectedPicksId + pickId
+    }
+
+    fun selectAllPicks() {
+        _selectedPicksId.value = pickList.map { it.id }.toSet()
+    }
+
+    fun deselectAllPicks() {
+        _selectedPicksId.value = emptySet()
+    }
+
+    fun deleteSelectedPicks(userId: String) {
+        viewModelScope.launch {
+            _pickListUiState.value = PickListUiState.Loading
+
+            val deleteJobList = _selectedPicksId.value.map { pickId ->
+                async { removePickUseCase(pickId, userId) }
+            }.awaitAll()
+
+            deselectAllPicks()
+
+            if (deleteJobList.all { it.isSuccess }) {
+                fetchPickList(userId)
+            } else {
+                _pickListUiState.value = PickListUiState.Error
+                Log.e("PickListViewModel", "[픽 목록] 다중 삭제 오류")
+            }
+        }
+    }
+
+    private fun List<Pick>.setOrderedList(order: Order): List<Pick> {
+        return if (pickList.isEmpty()) this
+        else when (order) {
+            Order.LATEST -> this
+            Order.OLDEST -> this.reversed()
+            Order.FAVORITE_DESC -> this.sortedByDescending { it.favoriteCount }
+        }
+    }
+}

app/src/main/java/com/squirtles/musicroad/picklist/DeleteSelectedPickDialog.kt → app/src/main/java/com/squirtles/musicroad/common/picklist/components/DeleteSelectedPickDialog.kt

@@ -1,4 +1,4 @@
-package com.squirtles.musicroad.picklist
+package com.squirtles.musicroad.common.picklist.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
@@ -7,6 +7,7 @@ import com.squirtles.musicroad.R
 import com.squirtles.musicroad.common.DialogTextButton
 import com.squirtles.musicroad.common.HorizontalSpacer
 import com.squirtles.musicroad.common.MessageAlertDialog
+import com.squirtles.musicroad.common.picklist.PickListType
 import com.squirtles.musicroad.ui.theme.Primary
 
 @Composable

app/src/main/java/com/squirtles/musicroad/picklist/EditModeAction.kt → app/src/main/java/com/squirtles/musicroad/common/picklist/components/EditModeAction.kt

@@ -1,4 +1,4 @@
-package com.squirtles.musicroad.picklist
+package com.squirtles.musicroad.common.picklist.components
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Edit

app/src/main/java/com/squirtles/musicroad/picklist/EditModeBottomButton.kt → app/src/main/java/com/squirtles/musicroad/common/picklist/components/EditModeBottomButton.kt

@@ -1,4 +1,4 @@
-package com.squirtles.musicroad.picklist
+package com.squirtles.musicroad.common.picklist.components
 
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxHeight

app/src/main/java/com/squirtles/musicroad/picklist/OrderBottomSheet.kt → app/src/main/java/com/squirtles/musicroad/common/picklist/components/OrderBottomSheet.kt

@@ -1,4 +1,4 @@
-package com.squirtles.musicroad.picklist
+package com.squirtles.musicroad.common.picklist.components
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement

app/src/main/java/com/squirtles/musicroad/picklist/PickItem.kt → app/src/main/java/com/squirtles/musicroad/common/picklist/components/PickItem.kt

@@ -1,4 +1,4 @@
-package com.squirtles.musicroad.picklist
+package com.squirtles.musicroad.common.picklist.components
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -66,7 +66,10 @@ internal fun PickItem(
         verticalAlignment = Alignment.CenterVertically
     ) {
         AlbumImage(
-            imageUrl = song.getImageUrlWithSize(Constants.REQUEST_IMAGE_SIZE_DEFAULT),
+            imageUrl = song.getImageUrlWithSize(
+                Constants.REQUEST_IMAGE_SIZE_DEFAULT.width,
+                Constants.REQUEST_IMAGE_SIZE_DEFAULT.height
+            ),
             modifier = Modifier
                 .size(64.dp)
                 .clip(RoundedCornerShape(8.dp))

app/src/main/java/com/squirtles/musicroad/create/CreatePickScreen.kt

@@ -54,6 +54,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.core.graphics.toColorInt
 import androidx.core.view.WindowInsetsControllerCompat
+import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.squirtles.domain.model.Song
 import com.squirtles.musicroad.R
@@ -66,11 +67,12 @@ import com.squirtles.musicroad.ui.theme.White
 
 @Composable
 fun CreatePickScreen(
-    createPickViewModel: CreatePickViewModel,
+    song: Song,
     onBackClick: () -> Unit,
     onCreateClick: (String) -> Unit,
+    createPickViewModel: CreatePickViewModel = hiltViewModel(),
 ) {
-    val song = createPickViewModel.selectedSong ?: DEFAULT_SONG
+
     val comment = createPickViewModel.comment.collectAsStateWithLifecycle()
     val uiState by createPickViewModel.createPickUiState.collectAsStateWithLifecycle()
     var showCreateIndicator by rememberSaveable { mutableStateOf(false) }
@@ -217,7 +219,7 @@ private fun CreatePickContent(
         )
 
         AlbumImage(
-            imageUrl = song.getImageUrlWithSize(RequestImageSize),
+            imageUrl = song.getImageUrlWithSize(RequestImageSize.width, RequestImageSize.height),
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(horizontal = 30.dp)