[Fix#60] 비공개 테스트 4차 업데이트

domain/src/main/java/com/acon/acon/domain/model/spot/SpotListRequest.kt

@@ -9,7 +9,7 @@ import com.acon.acon.domain.type.SpotType
 data class Condition(
     val spotType: SpotType?,
     val filterList: List<Filter>?,
-    val walkingTime: Int,
+    val walkingTime: Int?,
     val priceRange: Int?
 ) {
 

feature/profile/src/main/java/com/acon/acon/feature/profile/composable/component/ProfilePhotoBox.kt

@@ -17,6 +17,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.vectorResource
+import coil3.compose.AsyncImage
 import coil3.compose.rememberAsyncImagePainter
 import com.acon.acon.core.designsystem.noRippleClickable
 import com.acon.acon.feature.profile.R
@@ -52,12 +53,13 @@ fun ProfilePhotoBox(
                         )
                     }
 
-                    else -> {
-                        Icon(
+                    photoUri.startsWith("https://") -> {
+                        AsyncImage(
+                            model = photoUri,
+                            contentDescription = "선택한 프로필 사진",
                             modifier = Modifier.fillMaxSize(),
-                            imageVector = ImageVector.vectorResource(R.drawable.img_profile_basic_80),
-                            contentDescription = "Profile Image",
-                            tint = Color.Unspecified,
+                            contentScale = ContentScale.Crop,
+                            alignment = Alignment.Center
                         )
                     }
                 }

feature/profile/src/main/java/com/acon/acon/feature/profile/composable/screen/profile/composable/ProfileScreen.kt

@@ -60,6 +60,7 @@ fun ProfileScreen(
 
     val snackBarText = stringResource(R.string.snackbar_profile_save_success)
     val success = stringResource(R.string.success)
+
     LaunchedEffect(profileUpdateResult) {
         if (profileUpdateResult == success) {
             snackbarHostState.showSnackbar(snackBarText)
@@ -100,7 +101,7 @@ fun ProfileScreen(
                     modifier = Modifier
                         .padding(vertical = 32.dp)
                 ) {
-                    if (state.profileImage.isNotEmpty()) {
+                    if (state.profileImage.isEmpty()) {
                         Image(
                             imageVector = ImageVector.vectorResource(com.acon.acon.core.designsystem.R.drawable.ic_default_profile_40),
                             contentDescription = stringResource(R.string.content_description_default_profile_image),

feature/profile/src/main/java/com/acon/acon/feature/profile/composable/screen/profileMod/ProfileModViewModel.kt

@@ -100,24 +100,27 @@ class ProfileModViewModel @Inject constructor(
         val filteredText = text.filter { it.isAllowedChar() }
 
         var nicknameCount = 0
+        var limitedText = ""
         for (char in filteredText) {
-            nicknameCount += if (char.isKorean()) 2 else 1
-            if (nicknameCount > 16) break
+            val weight = if (char.isKorean()) 2 else 1
+            if (nicknameCount + weight > 16) break
+            limitedText += char
+            nicknameCount += weight
         }
 
         val updatedNicknameStatus = when {
-            filteredText.isEmpty() -> NicknameStatus.Empty
+            text.isEmpty() -> NicknameStatus.Empty
             else -> NicknameStatus.Typing
         }
 
         val updatedFieldStatus = when {
-            filteredText.isEmpty() -> TextFieldStatus.Empty
+            text.isEmpty() -> TextFieldStatus.Empty
             else -> state.nickNameFieldStatus
         }
 
         reduce {
             state.copy(
-                nickNameState = filteredText,
+                nickNameState = limitedText,
                 nicknameCount = nicknameCount,
                 nicknameStatus = updatedNicknameStatus,
                 nickNameFieldStatus = updatedFieldStatus
@@ -134,23 +137,23 @@ class ProfileModViewModel @Inject constructor(
 
             val errors = mutableListOf<NicknameErrorType>()
 
-            if (filteredText.any { it in "!@#$%^&*()-=+[]{};:'\",<>/?\\|" }) {
+            if (text.any { it in "!@#$%^&*()-=+[]{};:'\",<>/?\\|" }) {
                 errors.add(NicknameErrorType.InvalidChar)
             }
 
             val allowedChars = (33..126).map { it.toChar() } +
                     ('가'..'힣') + ('ㄱ'..'ㅎ') + ('ㅏ'..'ㅣ')
-            if (filteredText.any { it !in allowedChars }) {
+            if (text.any { it !in allowedChars }) {
                 errors.add(NicknameErrorType.InvalidLang)
             }
 
-            validateNickname(nickname = filteredText, errors = errors)
+            validateNickname(nickname = limitedText, errors = errors)
 
             intent {
                 reduce {
                     state.copy(
                         nicknameStatus = when {
-                            filteredText.isBlank() -> NicknameStatus.Empty
+                            limitedText.isBlank() -> NicknameStatus.Empty
                             errors.isNotEmpty() -> NicknameStatus.Error(errors)
                             else -> NicknameStatus.Valid
                         }

feature/profile/src/main/java/com/acon/acon/feature/profile/composable/screen/profileMod/composable/ProfileModScreen.kt

@@ -68,6 +68,7 @@ import com.acon.acon.feature.profile.composable.utils.BirthdayTransformation
 import com.acon.acon.feature.profile.composable.utils.isAllowedChar
 import com.acon.acon.feature.profile.composable.utils.isKorean
 import org.orbitmvi.orbit.compose.collectAsState
+import org.orbitmvi.orbit.compose.collectSideEffect
 
 @Composable
 fun ProfileModScreenContainer(
@@ -82,42 +83,39 @@ fun ProfileModScreenContainer(
     val context = LocalContext.current
 
     LaunchedEffect(selectedPhotoId) {
-        selectedPhotoId.let {
-            viewModel.updateProfileImage(selectedPhotoId)
-        }
+        viewModel.updateProfileImage(selectedPhotoId)
     }
 
-    LaunchedEffect(Unit) {
-        viewModel.container.sideEffectFlow.collect { effect ->
-            when (effect) {
-                is ProfileModSideEffect.NavigateToSettings -> {
-                    val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
-                        data = Uri.fromParts("package", effect.packageName, null)
-                    }
-                    context.startActivity(intent)
-                }
 
-                is ProfileModSideEffect.NavigateBack -> {
-                    backToProfile()
+    viewModel.collectSideEffect { effect ->
+        when (effect) {
+            is ProfileModSideEffect.NavigateToSettings -> {
+                val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
+                    data = Uri.fromParts("package", effect.packageName, null)
                 }
+                context.startActivity(intent)
+            }
 
-                is ProfileModSideEffect.NavigateToCustomGallery -> {
-                    onNavigateToCustomGallery()
-                }
+            is ProfileModSideEffect.NavigateBack -> {
+                backToProfile()
+            }
 
-                is ProfileModSideEffect.UpdateProfileImage -> {
-                    selectedPhotoId.let {
-                        viewModel.updateProfileImage(selectedPhotoId)
-                    }
-                }
+            is ProfileModSideEffect.NavigateToCustomGallery -> {
+                onNavigateToCustomGallery()
+            }
 
-                is ProfileModSideEffect.NavigateToProfileSuccess -> {
-                    onNavigateToProfile(ProfileUpdateResult.SUCCESS)
+            is ProfileModSideEffect.UpdateProfileImage -> {
+                selectedPhotoId.let {
+                    viewModel.updateProfileImage(selectedPhotoId)
                 }
+            }
 
-                is ProfileModSideEffect.NavigateToProfileFailed -> {
-                    onNavigateToProfile(ProfileUpdateResult.FAILURE)
-                }
+            is ProfileModSideEffect.NavigateToProfileSuccess -> {
+                onNavigateToProfile(ProfileUpdateResult.SUCCESS)
+            }
+
+            is ProfileModSideEffect.NavigateToProfileFailed -> {
+                onNavigateToProfile(ProfileUpdateResult.FAILURE)
             }
         }
     }
@@ -326,22 +324,23 @@ fun ProfileModScreen(
                         onTextChanged = { fieldValue ->
                             val inputText = fieldValue.text
                             var count = 0
+                            var textLimit = false
 
-                            val validText = buildString {
+                            val displayText = buildString {
                                 for (char in inputText) {
-                                    if (!char.isAllowedChar()) continue
                                     val weight = if (char.isKorean()) 2 else 1
-                                    if (count + weight > 16) break
-                                    append(char)
-                                    count += weight
+                                    if (count + weight > 16) {
+                                        textLimit = true
+                                        break
+                                    }
+                                    if (char.isAllowedChar()) {
+                                        append(char)
+                                        count += weight
+                                    }
                                 }
                             }
-
-                            if (validText.length < inputText.length) {
-                                // 초과된 입력이므로 무시하고 아무것도 하지 않음 (16자 이상은 입력 무시(불가능))
-                            } else {
-                                // 정상적인 입력만 가능
-                                nicknameText = fieldValue
+                            if (!textLimit || displayText.length <= nicknameText.text.length) {
+                                nicknameText = fieldValue.copy(text = displayText)
                                 onNicknameChanged(inputText)
                             }
                         },
@@ -486,9 +485,11 @@ fun ProfileModScreen(
                 enabledTextColor = AconTheme.color.White,
                 onClick = onSaveClicked,
                 isEnabled = (state.nicknameStatus == NicknameStatus.Valid) &&
-                        (state.birthdayStatus != BirthdayStatus.Invalid("정확한 생년월일을 입력해주세요")) &&
-                        ((state.nickNameState != state.originalNickname || state.birthdayState != state.originalBirthday || state.selectedPhotoUri != state.originalPhotoUri)
-                                && state.birthdayState.isNotEmpty())
+                        (
+                                (state.nickNameState != state.originalNickname) ||
+                                        (state.birthdayState != state.originalBirthday && state.birthdayStatus == BirthdayStatus.Valid) ||
+                                        (state.selectedPhotoUri != state.originalPhotoUri)
+                                )
             )
         }
     }

feature/spot/src/main/java/com/acon/acon/feature/spot/screen/spotlist/SpotListViewModel.kt

@@ -50,7 +50,7 @@ class SpotListViewModel @Inject constructor(
     fun googleLogin(socialRepository: SocialRepository, location: Location) = intent {
         socialRepository.googleLogin()
             .onSuccess {
-                if(it.hasVerifiedArea) {
+                if (it.hasVerifiedArea) {
                     fetchSpots(location)
                 } else {
                     postSideEffect(SpotListSideEffect.NavigateToAreaVerification)
@@ -72,7 +72,8 @@ class SpotListViewModel @Inject constructor(
             spotRepository.fetchSpotList(
                 latitude = location.latitude,
                 longitude = location.longitude,
-                condition = Condition.Default,
+                condition = (state as? SpotListUiState.Success)?.currentCondition?.toCondition()
+                    ?: Condition.Default,
             )
         }
 
@@ -92,10 +93,18 @@ class SpotListViewModel @Inject constructor(
         spotListResult.reduceResult(
             syntax = this,
             onSuccess = {
-                SpotListUiState.Success(
+                (state as? SpotListUiState.Success)?.copy(
                     spotList = it,
+                    isRefreshing = false,
+                    userType = userType.value,
                     legalAddressName = legalArea.area,
+                    isFilteredResultFetching = it.isEmpty()
+                ) ?: SpotListUiState.Success(
+                    spotList = it,
+                    isRefreshing = false,
                     userType = userType.value,
+                    legalAddressName = legalArea.area,
+                    isFilteredResultFetching = it.isEmpty()
                 )
             }, onFailure = {
                 when (it) {