[Fix/#99] 등록 뷰 UI 이슈

Author: doyeon0307

app/src/main/java/com/poti/android/core/designsystem/component/field/PotiBasicField.kt

@@ -48,6 +48,7 @@ internal fun PotiBasicField(
     trailingIcon: (@Composable () -> Unit)? = null,
     enabled: Boolean = true,
     visualTransformation: VisualTransformation? = null,
+    neverCoverField: Boolean = false,
 ) {
     var isFocused by remember { mutableStateOf(false) }
     val requester = remember {
@@ -107,7 +108,7 @@ internal fun PotiBasicField(
                         )
                     }
 
-                    if (singleLine && !isFocused && value.isNotEmpty()) {
+                    if (!neverCoverField && singleLine && !isFocused && value.isNotEmpty()) {
                         Text(
                             text = value,
                             modifier = Modifier

app/src/main/java/com/poti/android/core/designsystem/component/field/PotiMenuItem.kt

@@ -12,6 +12,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
@@ -59,6 +60,7 @@ fun PotiMenuItem(
             )
             .padding(horizontal = 16.dp, vertical = 15.dp),
         horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically,
     ) {
         Text(
             text = option,

app/src/main/java/com/poti/android/core/designsystem/component/field/PotiShortTextField.kt

@@ -53,6 +53,7 @@ fun PotiShortTextField(
     focusRequester: FocusRequester? = null,
     onFocusChanged: ((Boolean) -> Unit)? = null,
     visualTransformation: VisualTransformation? = null,
+    neverCoverField: Boolean = false,
 ) {
     var isFocused by remember { mutableStateOf(false) }
 
@@ -98,6 +99,7 @@ fun PotiShortTextField(
             singleLine = true,
             trailingIcon = trailingIcon,
             visualTransformation = visualTransformation,
+            neverCoverField = neverCoverField,
         )
 
         if (error.isNotBlank()) {

app/src/main/java/com/poti/android/presentation/party/create/PartyArtistSelectScreen.kt

@@ -24,6 +24,7 @@ import com.poti.android.core.designsystem.component.navigation.PotiHeaderPage
 import com.poti.android.core.designsystem.theme.PotiTheme
 import com.poti.android.domain.model.artist.ArtistSearchResult
 import com.poti.android.presentation.party.create.component.CreateDropdownField
+import com.poti.android.presentation.party.create.component.ViewType
 import com.poti.android.presentation.party.create.model.CreateUiEffect
 import com.poti.android.presentation.party.create.model.CreateUiIntent
 import com.poti.android.presentation.party.create.model.CreateUiState
@@ -47,8 +48,8 @@ fun PartyArtistSelectRoute(
         uiState = uiState,
         onSearchKeywordChange = { viewModel.processIntent(CreateUiIntent.OnArtistSearchKeywordChange(it)) },
         onArtistSelect = { viewModel.processIntent(CreateUiIntent.OnArtistSelect(it)) },
-        onConfirmClick = { viewModel.processIntent(CreateUiIntent.OnBackClick) },
-        onPopBackStack = { viewModel.processIntent(CreateUiIntent.OnBackClick) },
+        onConfirmClick = { viewModel.processIntent(CreateUiIntent.OnBackToCreate) },
+        onPopBackStack = { viewModel.processIntent(CreateUiIntent.OnBackToCreate) },
         modifier = modifier,
     )
 }
@@ -77,6 +78,7 @@ private fun PartyArtistSelectScreen(
                 .padding(innerPadding),
         ) {
             CreateDropdownField(
+                viewType = ViewType.ARTSIT_SELECT,
                 value = uiState.artistSearchKeyword,
                 onValueChanged = onSearchKeywordChange,
                 searchResults = uiState.artistSearchResultsState.getSuccessDataOrNull() ?: emptyList(),

app/src/main/java/com/poti/android/presentation/party/create/PartyCreateScreen.kt

@@ -25,7 +25,6 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.lifecycle.viewmodel.compose.viewModel
 import com.poti.android.R
 import com.poti.android.core.common.extension.getSuccessDataOrNull
 import com.poti.android.core.common.extension.noRippleClickable
@@ -48,13 +47,15 @@ import com.poti.android.presentation.party.create.component.CreateDropdownField
 import com.poti.android.presentation.party.create.component.CreateMemberSetting
 import com.poti.android.presentation.party.create.component.CreatePhotoUpload
 import com.poti.android.presentation.party.create.component.SellerNotice
+import com.poti.android.presentation.party.create.component.ViewType
 import com.poti.android.presentation.party.create.model.CreateUiEffect
 import com.poti.android.presentation.party.create.model.CreateUiIntent
 import com.poti.android.presentation.party.create.model.CreateUiIntent.*
 import com.poti.android.presentation.party.create.model.CreateUiState
 import com.poti.android.presentation.party.create.model.FieldError
 import com.poti.android.presentation.party.create.model.MemberSettingStatus
-import com.poti.android.presentation.party.util.toImageInfosForPresigned
+import com.poti.android.presentation.party.create.util.DateTransformation
+import com.poti.android.presentation.party.create.util.toImageInfosForPresigned
 import kotlinx.collections.immutable.persistentListOf
 
 @Composable
@@ -77,6 +78,10 @@ fun PartyCreateRoute(
         }
     }
 
+    LaunchedEffect(Unit) {
+        viewModel.processIntent(CreateUiIntent.InitializeScreen)
+    }
+
     HandleSideEffects(viewModel.sideEffect) { effect ->
         when (effect) {
             CreateUiEffect.NavigateToBack -> {
@@ -118,7 +123,6 @@ fun PartyCreateRoute(
             subBtnText = R.string.action_button_select_all,
             onSubBtnClick = {
                 viewModel.processIntent(CreateUiIntent.OnAllMemberSelect)
-                showBottomSheet = false
             },
             subEnabled = true,
             members = uiState.sheetDisplayMemberNames,
@@ -177,6 +181,7 @@ private fun PartyCreateScreen(
     modifier: Modifier = Modifier,
 ) {
     val listState = rememberLazyListState()
+    val dateTransformation = remember { DateTransformation() }
 
     LaunchedEffect(
         uiState.imageError,
@@ -212,6 +217,12 @@ private fun PartyCreateScreen(
                 onNavigationClick = onBackClick,
             )
         },
+        bottomBar = {
+            PotiBottomButton(
+                text = stringResource(R.string.create_btn_create),
+                onClick = onCreateBtnClick,
+            )
+        },
     ) { innerPadding ->
         LazyColumn(
             state = listState,
@@ -267,6 +278,7 @@ private fun PartyCreateScreen(
 
             item {
                 CreateDropdownField(
+                    viewType = ViewType.CREATE_PARTY,
                     value = uiState.productName,
                     onValueChanged = onProductChanged,
                     searchResults = uiState.productSearchResultsState.getSuccessDataOrNull() ?: emptyList(),
@@ -292,6 +304,8 @@ private fun PartyCreateScreen(
                     error = uiState.deadlineError?.let { stringResource(it.message) } ?: "",
                     keyboardType = KeyboardType.Number,
                     imeAction = ImeAction.Next,
+                    visualTransformation = dateTransformation,
+                    neverCoverField = true,
                 )
             }
 
@@ -318,7 +332,7 @@ private fun PartyCreateScreen(
                         .padding(bottom = 28.dp),
                     label = stringResource(R.string.create_label_account_number),
                     error = uiState.accountNumberError?.let { stringResource(it.message) } ?: "",
-                    keyboardType = KeyboardType.Text,
+                    keyboardType = KeyboardType.Number,
                     imeAction = ImeAction.Next,
                 )
             }
@@ -342,6 +356,7 @@ private fun PartyCreateScreen(
                 )
 
                 CreateMemberSetting(
+                    neverShowHint = uiState.neverShowHint,
                     status = uiState.memberSettingStatus,
                     selectedMembersOption = uiState.editOptionDisplayMembers,
                     onPriceChange = onMemberPriceChanged,
@@ -370,11 +385,6 @@ private fun PartyCreateScreen(
                     modifier = Modifier
                         .padding(bottom = 40.dp),
                 )
-
-                PotiBottomButton(
-                    text = stringResource(R.string.create_btn_create),
-                    onClick = onCreateBtnClick,
-                )
             }
         }
     }

app/src/main/java/com/poti/android/presentation/party/create/PartyCreateViewModel.kt

@@ -1,5 +1,6 @@
 package com.poti.android.presentation.party.create
 
+import androidx.core.text.isDigitsOnly
 import androidx.lifecycle.viewModelScope
 import com.poti.android.core.base.BaseViewModel
 import com.poti.android.core.common.state.ApiState
@@ -17,6 +18,9 @@ import com.poti.android.presentation.party.create.model.CreateUiIntent
 import com.poti.android.presentation.party.create.model.CreateUiState
 import com.poti.android.presentation.party.create.model.FieldError
 import com.poti.android.presentation.party.create.model.MemberSettingStatus
+import com.poti.android.presentation.party.create.util.isTodayOrAfter
+import com.poti.android.presentation.party.create.util.toDashedDate
+import com.poti.android.presentation.party.create.util.toDateOrNull
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toPersistentList
@@ -48,10 +52,15 @@ class PartyCreateViewModel @Inject constructor(
 
     override fun processIntent(intent: CreateUiIntent) {
         when (intent) {
+            CreateUiIntent.InitializeScreen -> initializeDeliveryOptions()
+
+            CreateUiIntent.CleanScreen -> updateState { CreateUiState() }
+
             CreateUiIntent.OnBackClick -> {
                 if (uiState.value.isDirty) {
                     sendEffect(CreateUiEffect.ShowDialog)
                 } else {
+                    updateState { CreateUiState() }
                     sendEffect(CreateUiEffect.NavigateToBack)
                 }
             }
@@ -61,11 +70,14 @@ class PartyCreateViewModel @Inject constructor(
                 sendEffect(CreateUiEffect.NavigateToBack)
             }
 
+            is CreateUiIntent.OnBackToCreate -> sendEffect(CreateUiEffect.NavigateToBack)
+
             is CreateUiIntent.OnImagesChanged -> {
                 updateState {
                     copy(
                         isDirty = true,
                         selectedImages = intent.uris.toPersistentList(),
+                        imageError = if (intent.uris.isNotEmpty()) null else this.imageError,
                     )
                 }
             }
@@ -158,10 +170,6 @@ class PartyCreateViewModel @Inject constructor(
     }
 
     init {
-        viewModelScope.launch {
-            initializeDeliveryOptions()
-        }
-
         viewModelScope.launch {
             artistSearchKeywordForDebounce
                 .debounce(500)
@@ -183,23 +191,25 @@ class PartyCreateViewModel @Inject constructor(
         }
     }
 
-    private suspend fun initializeDeliveryOptions() {
-        getDeliveryOptionsUseCase()
-            .onSuccess { result ->
-                updateState {
-                    copy(
-                        deliveryOptionsState = ApiState.Success(result.toPersistentList()),
-                        editableDeliveryOptions = result.toPersistentList(),
-                        selectedDeliveryIds = this.selectedDeliveryIds + result.first().deliveryId,
-                    )
-                }
-            }.onFailure { e ->
-                updateState {
-                    copy(
-                        deliveryOptionsState = ApiState.Failure(e.message ?: "get delivery fail"),
-                    )
+    private fun initializeDeliveryOptions() {
+        viewModelScope.launch {
+            getDeliveryOptionsUseCase()
+                .onSuccess { result ->
+                    updateState {
+                        copy(
+                            deliveryOptionsState = ApiState.Success(result.toPersistentList()),
+                            editableDeliveryOptions = result.toPersistentList(),
+                            selectedDeliveryIds = this.selectedDeliveryIds + result.first().deliveryId,
+                        )
+                    }
+                }.onFailure { e ->
+                    updateState {
+                        copy(
+                            deliveryOptionsState = ApiState.Failure(e.message ?: "get delivery fail"),
+                        )
+                    }
                 }
-            }
+        }
     }
 
     private fun handleAccountNumberChange(newValue: String) {
@@ -221,6 +231,7 @@ class PartyCreateViewModel @Inject constructor(
                     val selectedMemberIds = getAllMemberIdSet(members)
 
                     updateState {
+                        val errorBefore = this.memberSettingStatus == MemberSettingStatus.ERROR_NO_PRICE || this.memberSettingStatus == MemberSettingStatus.ERROR_NO_MEMBER
                         copy(
                             isDirty = true,
                             selectedArtist = newArtist,
@@ -230,6 +241,7 @@ class PartyCreateViewModel @Inject constructor(
                             editableMemberOptions = members.toPersistentList(),
                             selectedMemberIds = selectedMemberIds,
                             memberSettingStatus = MemberSettingStatus.IN_PROGRESS,
+                            neverShowHint = errorBefore,
                         )
                     }
                 }
@@ -321,6 +333,8 @@ class PartyCreateViewModel @Inject constructor(
     }
 
     private fun handleDeadlineChange(newValue: String) {
+        if (!newValue.isDigitsOnly() || newValue.length > 8) return
+
         updateState {
             copy(
                 isDirty = true,
@@ -415,10 +429,10 @@ class PartyCreateViewModel @Inject constructor(
     }
 
     private fun handleAllMemberSelect() {
-        val newIndices = if (uiState.value.sheetDisplayMemberIndices.isEmpty()) {
-            uiState.value.editableMemberOptions.indices.toSet()
-        } else {
+        val newIndices = if (uiState.value.sheetDisplayMemberIndices.size == uiState.value.editableMemberOptions.size) {
             setOf()
+        } else {
+            uiState.value.editableMemberOptions.indices.toSet()
         }
 
         updateState {
@@ -463,7 +477,15 @@ class PartyCreateViewModel @Inject constructor(
         val imageError = if (uiState.value.selectedImages.isEmpty()) FieldError.IMAGE_EMPTY_ERROR else null
         val artistError = if (uiState.value.selectedArtist == null) FieldError.ARTIST_EMPTY_ERROR else null
         val productError = if (uiState.value.productName.isBlank()) FieldError.PRODUCT_EMPTY_ERROR else null
-        val deadlineError = if (uiState.value.deadline.isBlank()) FieldError.DEADLINE_EMPTY_ERROR else null
+        val deadlineError = when (val date = uiState.value.deadline.toDateOrNull()) {
+            null -> if (uiState.value.deadline.isBlank()) {
+                FieldError.DEADLINE_EMPTY_ERROR
+            } else {
+                FieldError.DEADLINE_INVALID_ERROR
+            }
+
+            else -> if (!date.isTodayOrAfter()) FieldError.DEADLINE_PAST_ERROR else null
+        }
         val descriptionError = if (uiState.value.description.isBlank()) FieldError.DESCRIPTION_ERROR else null
         val accountNumberError = if (uiState.value.accountNumber.isBlank()) FieldError.ACCOUNT_NUMBER_ERROR else null
         val bankError = if (uiState.value.bank.isBlank()) FieldError.BANK_ERROR else null
@@ -493,6 +515,7 @@ class PartyCreateViewModel @Inject constructor(
                     accountNumberError = accountNumberError,
                     bankError = bankError,
                     memberSettingStatus = currentSettingStatus,
+                    neverShowHint = if (hasMemberOptionError) true else this.neverShowHint,
                 )
             }
         }
@@ -507,7 +530,7 @@ class PartyCreateViewModel @Inject constructor(
             artistId = uiState.value.selectedArtist?.artistId ?: 0L,
             product = uiState.value.productName,
             description = uiState.value.description,
-            deadline = uiState.value.deadline,
+            deadline = uiState.value.deadline.toDashedDate(),
             bank = uiState.value.bank,
             accountNumber = uiState.value.accountNumber,
             imageUrls = urls,
@@ -540,6 +563,7 @@ class PartyCreateViewModel @Inject constructor(
                     copy(createPartyState = ApiState.Success(partyId))
                 }
                 sendEffect(CreateUiEffect.NavigateToDetail(partyId))
+                updateState { CreateUiState() }
             }
             .onFailure {
                 updateState {