[Fix/#133] 굿즈 카테고리 QA 이슈 반영

Author: doyeon0307

app/src/main/java/com/poti/android/presentation/history/participant/component/HistoryDepositBottomSheet.kt

@@ -2,7 +2,10 @@ package com.poti.android.presentation.history.participant.component
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.isImeVisible
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.rememberModalBottomSheetState
@@ -14,14 +17,17 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import com.poti.android.R
+import com.poti.android.core.common.util.screenWidthDp
 import com.poti.android.core.designsystem.component.bottomsheet.PotiBottomSheet
 import com.poti.android.core.designsystem.component.field.PotiShortTextField
 import com.poti.android.core.designsystem.theme.PotiTheme
 
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
 @Composable
 fun HistoryDepositBottomSheet(
     onDismissRequest: () -> Unit,
@@ -30,25 +36,32 @@ fun HistoryDepositBottomSheet(
 ) {
     var depositor by remember { mutableStateOf("") }
     var depositTime by remember { mutableStateOf("") }
+    val isKeyboardVisible = WindowInsets.isImeVisible
+    val bottomPadding = remember(isKeyboardVisible) {
+        if (isKeyboardVisible) 60.dp else 226.dp
+    }
+    val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
 
     PotiBottomSheet(
         modifier = modifier,
         onDismissRequest = onDismissRequest,
-        sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true),
+        sheetState = sheetState,
         text = stringResource(R.string.history_deposit_bottomsheet_button),
         onClick = { onConfirmClick(depositor, depositTime) },
-        content = {
-            BottomSheetContent(
-                depositor = depositor,
-                onDepositorChanged = { depositor = it },
-                depositTime = depositTime,
-                onDepositTimeChanged = { depositTime = it },
-                modifier = modifier
-                    .padding(horizontal = 16.dp),
-            )
-        },
         enabled = depositor.isNotBlank() && depositTime.isNotBlank(),
-    )
+    ) {
+        BottomSheetContent(
+            depositor = depositor,
+            onDepositorChanged = { depositor = it },
+            depositTime = depositTime,
+            onDepositTimeChanged = { depositTime = it },
+            bottomPadding = bottomPadding,
+            modifier = Modifier
+                .padding(
+                    horizontal = screenWidthDp(16.dp),
+                ),
+        )
+    }
 }
 
 @Composable
@@ -57,6 +70,7 @@ private fun BottomSheetContent(
     onDepositorChanged: (String) -> Unit,
     depositTime: String,
     onDepositTimeChanged: (String) -> Unit,
+    bottomPadding: Dp,
     modifier: Modifier = Modifier,
 ) {
     Column(
@@ -75,7 +89,8 @@ private fun BottomSheetContent(
             onValueChanged = onDepositTimeChanged,
             placeholder = stringResource(R.string.history_deposit_bottomsheet_deposit_time_placeholder),
             label = stringResource(R.string.history_deposit_bottomsheet_deposit_time_label),
-            modifier = Modifier.padding(bottom = 226.dp),
+            keyboardType = KeyboardType.Number,
+            modifier = Modifier.padding(bottom = bottomPadding),
         )
     }
 }

app/src/main/java/com/poti/android/presentation/party/home/HomeViewModel.kt

@@ -1,6 +1,7 @@
 package com.poti.android.presentation.party.home
 
 import com.poti.android.core.base.BaseViewModel
+import com.poti.android.core.common.extension.getSuccessDataOrNull
 import com.poti.android.core.common.state.ApiState
 import com.poti.android.domain.repository.HomeRepository
 import com.poti.android.presentation.party.home.model.HomeUiEffect
@@ -19,7 +20,7 @@ class HomeViewModel @Inject constructor(
     override fun processIntent(intent: HomeUiIntent) {
         when (intent) {
             HomeUiIntent.OnFloatingClick -> sendEffect(NavigateToPartyCreate)
-            is HomeUiIntent.OnMyArtistCategoryClick -> sendEffect(NavigateToMyArtistCategory(intent.artistId))
+            is HomeUiIntent.OnMyArtistCategoryClick -> sendEffect(NavigateToMyArtistCategory(if (uiState.value.artistIdToNull) null else intent.artistId))
             is HomeUiIntent.OnProductCardClick -> sendEffect(NavigateToGoodsPartyList(intent.artistId, intent.title))
             HomeUiIntent.LoadHomeContent -> loadHomeContent()
             HomeUiIntent.OnOtherProductCategoryClick -> sendEffect(NavigateToOtherProductCategory)
@@ -36,6 +37,7 @@ class HomeViewModel @Inject constructor(
                 updateState {
                     copy(homeContentLoadState = ApiState.Success(homeContent))
                 }
+                validateArtistId()
             }
             .onFailure { throwable ->
                 updateState {
@@ -45,4 +47,16 @@ class HomeViewModel @Inject constructor(
                 }
             }
     }
+
+    private fun validateArtistId() {
+        uiState.value.homeContentLoadState.getSuccessDataOrNull()?.let { content ->
+            val diff = content.myGroupItems.any { item ->
+                item.artistId != content.myGroupItems.first().artistId
+            }
+
+            if (diff) {
+                updateState { copy(artistIdToNull = true) }
+            }
+        }
+    }
 }

app/src/main/java/com/poti/android/presentation/party/home/model/Contracts.kt

@@ -8,6 +8,7 @@ import com.poti.android.domain.model.home.HomeContent
 
 data class HomeUiState(
     val homeContentLoadState: ApiState<HomeContent> = ApiState.Loading,
+    val artistIdToNull: Boolean = false,
 ) : UiState
 
 sealed interface HomeUiIntent : UiIntent {

app/src/main/java/com/poti/android/presentation/party/product/productcategory/ProductCategoryScreen.kt

@@ -3,7 +3,9 @@ package com.poti.android.presentation.party.product.productcategory
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.foundation.lazy.LazyColumn
@@ -56,6 +58,7 @@ fun ProductCategoryRoute(
     uiState.productCategoryLoadState.onSuccess { goodsCategory ->
         ProductCategoryScreen(
             title = if (viewModel.isMyArtist) stringResource(R.string.home_recommend_goods, goodsCategory.nickname) else stringResource(R.string.home_other_goods),
+            isMyArtsit = viewModel.isMyArtist,
             productCategory = goodsCategory,
             selectedSortType = uiState.selectedSortType,
             isSortBottomSheetVisible = uiState.isSortBottomSheetVisible,
@@ -73,6 +76,7 @@ fun ProductCategoryRoute(
 @Composable
 private fun ProductCategoryScreen(
     title: String,
+    isMyArtsit: Boolean,
     productCategory: ProductCategory,
     selectedSortType: ProductSortType,
     isSortBottomSheetVisible: Boolean,
@@ -110,13 +114,17 @@ private fun ProductCategoryScreen(
                 ),
             ) {
                 item {
-                    PotiSmallButton(
-                        text = stringResource(selectedSortType.displayRes),
-                        onClick = onSortFilterClick,
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .wrapContentWidth(Alignment.End),
-                    )
+                    if (isMyArtsit) {
+                        PotiSmallButton(
+                            text = stringResource(selectedSortType.displayRes),
+                            onClick = onSortFilterClick,
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .wrapContentWidth(Alignment.End),
+                        )
+                    } else {
+                        Spacer(Modifier.height(12.dp))
+                    }
                 }
 
                 items(productCategory.groupItems) { groupItem ->
@@ -154,6 +162,7 @@ private fun ProductCategoryScreenPreview() {
     PotiTheme {
         ProductCategoryScreen(
             title = "",
+            isMyArtsit = false,
             productCategory = dummyProductCategory,
             selectedSortType = ProductSortType.LATEST,
             isSortBottomSheetVisible = false,

app/src/main/java/com/poti/android/presentation/party/product/productcategory/model/Contracts.kt

@@ -9,7 +9,7 @@ import com.poti.android.domain.model.party.ProductCategory
 data class ProductCategoryUiState(
     val productCategoryLoadState: ApiState<ProductCategory> = ApiState.Loading,
     val isSortBottomSheetVisible: Boolean = false,
-    val selectedSortType: ProductSortType = ProductSortType.LATEST,
+    val selectedSortType: ProductSortType = ProductSortType.HOT,
 ) : UiState
 
 sealed interface ProductCategoryUiIntent : UiIntent {