Merge pull request #73 from YAPP-Github/epic/moneymong-231-소속가입-미구현-기능-개발

Epic/moneymong 231 소속가입 미구현 기능 개발

Author: eunseo0105

feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/join/AgencyCompleteScreen.kt

@@ -22,6 +22,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
+import com.moneymong.moneymong.common.ui.noRippleClickable
 import com.moneymong.moneymong.design_system.theme.Black
 import com.moneymong.moneymong.design_system.theme.Heading1
 import com.moneymong.moneymong.design_system.theme.MMHorizontalSpacing
@@ -70,7 +71,7 @@ fun AgencyCompleteScreen(
                 Icon(
                     painterResource(id = R.drawable.ic_close_default),
                     modifier = Modifier
-                        .clickable {
+                        .noRippleClickable {
                             navigateToSearch()
                         },
                     contentDescription = null

feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/join/AgencyJoinScreen.kt

@@ -27,8 +27,10 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
+import com.moneymong.moneymong.common.ui.noRippleClickable
 import com.moneymong.moneymong.design_system.R
 import com.moneymong.moneymong.design_system.component.snackbar.MDSSnackbarHost
+import com.moneymong.moneymong.design_system.error.ErrorDialog
 import com.moneymong.moneymong.design_system.theme.Black
 import com.moneymong.moneymong.design_system.theme.Gray10
 import com.moneymong.moneymong.design_system.theme.Heading3
@@ -47,6 +49,7 @@ fun AgencyJoinScreen(
     agencyId: Long
 ) {
     val state = viewModel.collectAsState().value
+
     Scaffold(
         modifier = modifier
             .fillMaxSize()
@@ -64,7 +67,7 @@ fun AgencyJoinScreen(
                 Icon(
                     modifier = Modifier
                         .size(24.dp)
-                        .clickable {
+                        .noRippleClickable {
                             navigateUp()
                         },
                     painter = painterResource(id = R.drawable.ic_close_default),
@@ -79,7 +82,8 @@ fun AgencyJoinScreen(
                 agencyId = agencyId,
                 state = state,
                 viewModel = viewModel,
-                navigateToComplete = navigateToComplete
+                navigateToComplete = navigateToComplete,
+                navigateUp = navigateUp
             )
         }
     )
@@ -91,11 +95,24 @@ private fun JoinContent(
     agencyId: Long,
     state: AgencyJoinState,
     viewModel: AgencyJoinViewModel,
-    navigateToComplete: () -> Unit
+    navigateToComplete: () -> Unit,
+    navigateUp: () -> Unit
 ) {
     val snackbarHostState = remember { SnackbarHostState() }
     val focusRequesters = remember { List(6) { FocusRequester() } }
 
+    if (state.visiblePopUpError) {
+        ErrorDialog(
+            message = state.errorPopUpMessage,
+            onConfirm = {
+                viewModel.visiblePopUpErrorChanged(false)
+                viewModel.onIsErrorChanged(false)
+                viewModel.resetNumbers()
+                navigateUp()
+            }
+        )
+    }
+
     LaunchedEffect(key1 = state.isError) {
         Log.d("launch", state.isError.toString())
         if (state.isError) {

feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/join/AgencyJoinState.kt

@@ -5,5 +5,7 @@ import com.moneymong.moneymong.common.base.State
 data class AgencyJoinState (
     val isError : Boolean = false,
     val numbers : List<String> = listOf("", "", "", "", "" , ""),
-    val codeAccess : Boolean = false
+    val codeAccess : Boolean = false,
+    val visiblePopUpError : Boolean = false,
+    val errorPopUpMessage : String = ""
 ) : State

feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/join/AgencyJoinViewModel.kt

@@ -19,7 +19,7 @@ class AgencyJoinViewModel @Inject constructor(
 ) : BaseViewModel<AgencyJoinState, AgencyJoinSideEffect>(AgencyJoinState()) {
 
     fun agencyCodeNumbers(agencyId: Long) = intent {
-        val codeNumbers =  state.numbers.joinToString(separator = "")
+        val codeNumbers = state.numbers.joinToString(separator = "")
         viewModelScope.launch {
             useCase.invoke(agencyId, AgencyJoinParam(codeNumbers))
                 .onSuccess {
@@ -40,7 +40,12 @@ class AgencyJoinViewModel @Inject constructor(
                     }
                 }
                 .onFailure {
-                    //TODO - 에러화면
+                    reduce {
+                        state.copy(
+                            visiblePopUpError = true,
+                            errorPopUpMessage = it.message.toString()
+                        )
+                    }
 
                 }
         }
@@ -60,13 +65,11 @@ class AgencyJoinViewModel @Inject constructor(
         val newNumbers = state.numbers.toMutableList().apply {
             this[index] = value
         }
-        Log.d("newNumbers", newNumbers.toString())
         reduce {
             state.copy(
                 numbers = newNumbers
             )
         }
-        Log.d("numbers", state.numbers.joinToString(separator = ""))
     }
 
     fun resetNumbers() = intent {
@@ -76,4 +79,12 @@ class AgencyJoinViewModel @Inject constructor(
             )
         }
     }
+
+    fun visiblePopUpErrorChanged(visibleError: Boolean) = intent {
+        reduce {
+            state.copy(
+                visiblePopUpError = visibleError,
+            )
+        }
+    }
 }