Merge branch 'develop' of https://github.com/pknu-wap/WAPP into featu…

…re/jaino/#117

app/src/main/java/com/wap/wapp/navigation/WappNavHost.kt

@@ -77,7 +77,11 @@ fun WappNavHost(
             navigateToSignUp = navController::navigateToSignUp,
         )
         signUpScreen(
-            navigateToNotice = navController::navigateToNotice,
+            navigateToNotice = {
+                navController.navigateToNotice(
+                    navOptions { popUpTo(navController.graph.id) { inclusive = true } },
+                )
+            },
             navigateToSignIn = navController::navigateToSignIn,
         )
         noticeScreen()

core/data/src/main/java/com/wap/wapp/core/data/repository/auth/AuthRepository.kt

@@ -6,4 +6,6 @@ interface AuthRepository {
     suspend fun deleteUser(): Result<Unit>
 
     suspend fun isUserSignIn(): Result<Boolean>
+
+    suspend fun checkMemberCode(code: String): Result<Boolean>
 }

core/data/src/main/java/com/wap/wapp/core/data/repository/auth/AuthRepositoryImpl.kt

@@ -11,4 +11,7 @@ class AuthRepositoryImpl @Inject constructor(
     override suspend fun deleteUser(): Result<Unit> = authDataSource.deleteUser()
 
     override suspend fun isUserSignIn(): Result<Boolean> = authDataSource.isUserSignIn()
+
+    override suspend fun checkMemberCode(code: String): Result<Boolean> =
+        authDataSource.checkMemberCode(code)
 }

core/data/src/main/java/com/wap/wapp/core/data/repository/management/ManagementRepository.kt

@@ -5,7 +5,7 @@ interface ManagementRepository {
 
     suspend fun postManager(userId: String): Result<Unit>
 
-    suspend fun getManagementCode(code: String): Result<Boolean>
+    suspend fun checkManagementCode(code: String): Result<Boolean>
 
     suspend fun deleteManager(userId: String): Result<Unit>
 }

core/data/src/main/java/com/wap/wapp/core/data/repository/management/ManagementRepositoryImpl.kt

@@ -12,8 +12,8 @@ class ManagementRepositoryImpl @Inject constructor(
     override suspend fun postManager(userId: String): Result<Unit> =
         managementDataSource.postManager(userId)
 
-    override suspend fun getManagementCode(code: String): Result<Boolean> =
-        managementDataSource.getManagementCode(code)
+    override suspend fun checkManagementCode(code: String): Result<Boolean> =
+        managementDataSource.checkManagementCode(code)
 
     override suspend fun deleteManager(userId: String): Result<Unit> =
         managementDataSource.deleteManager(userId)

core/designsystem/src/main/java/com/wap/designsystem/Color.kt

@@ -13,6 +13,7 @@ val Gray95 = Color(0xFF959595)
 val Gray82 = Color(0xFF828282)
 val Gray7C = Color(0xFF7C7C7C)
 val Gray4A = Color(0xFF49494A)
+val Black20 = Color(0xFF202022)
 val Black25 = Color(0xFF252424)
 val Black42 = Color(0xFF424242)
 val Black = Color(0xFF000000)
@@ -36,6 +37,7 @@ class WappColor(
     white: Color = Color(0xFFFFFFFF),
     black: Color = Color(0xFF000000),
     backgroundBlack: Color = Color(0xFF131313),
+    black20: Color = Color(0xFF202022),
     black25: Color = Color(0xFF252424),
     black42: Color = Color(0xFF424242),
     gray95: Color = Color(0xFF959595),
@@ -62,6 +64,8 @@ class WappColor(
         private set
     var backgroundBlack by mutableStateOf(backgroundBlack)
         private set
+    var black20 by mutableStateOf(black20)
+        private set
     var black25 by mutableStateOf(black25)
         private set
     var black42 by mutableStateOf(black42)

core/designsystem/src/main/java/com/wap/designsystem/component/Button.kt

@@ -28,7 +28,7 @@ fun WappButton(
         onClick = { onClick() },
         enabled = isEnabled,
         colors = ButtonDefaults.buttonColors(
-            contentColor = WappTheme.colors.black,
+            contentColor = WappTheme.colors.white,
             containerColor = WappTheme.colors.yellow34,
             disabledContentColor = WappTheme.colors.white,
             disabledContainerColor = WappTheme.colors.grayA2,

core/domain/src/main/java/com/wap/wapp/core/domain/usecase/auth/CheckMemberCodeUseCase.kt

@@ -0,0 +1,21 @@
+package com.wap.wapp.core.domain.usecase.auth
+
+import com.wap.wapp.core.data.repository.auth.AuthRepository
+import com.wap.wapp.core.domain.model.CodeValidation
+import javax.inject.Inject
+
+class CheckMemberCodeUseCase @Inject constructor(
+    private val authRepository: AuthRepository,
+) {
+    suspend operator fun invoke(code: String): Result<CodeValidation> = runCatching {
+        authRepository.checkMemberCode(code).fold(
+            onSuccess = { isValid ->
+                if (isValid) {
+                    return@fold CodeValidation.VALID
+                }
+                CodeValidation.INVALID
+            },
+            onFailure = { CodeValidation.INVALID },
+        )
+    }
+}

core/domain/src/main/java/com/wap/wapp/core/domain/usecase/management/ValidateManagementCodeUseCase.kt → core/domain/src/main/java/com/wap/wapp/core/domain/usecase/management/CheckManagementCodeUseCase.kt

@@ -7,12 +7,12 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class ValidateManagementCodeUseCase @Inject constructor(
+class CheckManagementCodeUseCase @Inject constructor(
     private val managementRepository: ManagementRepository,
     private val userRepository: UserRepository,
 ) {
     suspend operator fun invoke(code: String): Result<CodeValidation> = runCatching {
-        managementRepository.getManagementCode(code)
+        managementRepository.checkManagementCode(code)
             .onSuccess { isValid ->
                 if (isValid.not()) { // 코드가 틀렸을 경우
                     return@runCatching CodeValidation.INVALID

core/model/src/main/java/com/wap/wapp/core/model/survey/Survey.kt

@@ -27,20 +27,20 @@ data class Survey(
             return "방금"
         } else if (duration.toMinutes() < 60) {
             val leftMinutes = duration.toMinutes().toString()
-            return leftMinutes + "분 전 작성"
+            return leftMinutes + "분 전"
         }
 
         if (duration.toHours() < 24) {
             val leftHours = duration.toHours().toString()
-            return leftHours + "시간 전 작성"
+            return leftHours + "시간 전"
         }
 
         if (duration.toDays() < 31) {
             val leftDays = duration.toDays().toString()
-            return leftDays + "일 전 작성"
+            return leftDays + "일 전"
         }
 
-        return surveyedAt.format(yyyyMMddFormatter) + " 작성"
+        return surveyedAt.format(yyyyMMddFormatter)
     }
 
     companion object {

core/network/src/main/java/com/wap/wapp/core/network/source/auth/AuthDataSource.kt

@@ -6,4 +6,6 @@ interface AuthDataSource {
     suspend fun deleteUser(): Result<Unit>
 
     suspend fun isUserSignIn(): Result<Boolean>
+
+    suspend fun checkMemberCode(code: String): Result<Boolean>
 }

core/network/src/main/java/com/wap/wapp/core/network/source/auth/AuthDataSourceImpl.kt

@@ -2,13 +2,16 @@ package com.wap.wapp.core.network.source.auth
 
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.auth.FirebaseAuth.AuthStateListener
+import com.google.firebase.firestore.FirebaseFirestore
+import com.wap.wapp.core.network.constant.CODES_COLLECTION
 import com.wap.wapp.core.network.utils.await
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.suspendCancellableCoroutine
 import javax.inject.Inject
 
 class AuthDataSourceImpl @Inject constructor(
     private val firebaseAuth: FirebaseAuth,
+    private val firebaseFirestore: FirebaseFirestore,
 ) : AuthDataSource {
     override suspend fun signOut(): Result<Unit> = runCatching {
         firebaseAuth.signOut()
@@ -45,4 +48,13 @@ class AuthDataSourceImpl @Inject constructor(
             }
         }
     }
+
+    override suspend fun checkMemberCode(code: String): Result<Boolean> = runCatching {
+        val result = firebaseFirestore.collection(CODES_COLLECTION)
+            .whereEqualTo("user", code)
+            .get()
+            .await()
+
+        result.isEmpty.not()
+    }
 }

core/network/src/main/java/com/wap/wapp/core/network/source/management/ManagementDataSource.kt

@@ -5,7 +5,7 @@ interface ManagementDataSource {
 
     suspend fun postManager(userId: String): Result<Unit>
 
-    suspend fun getManagementCode(code: String): Result<Boolean>
+    suspend fun checkManagementCode(code: String): Result<Boolean>
 
     suspend fun deleteManager(userId: String): Result<Unit>
 }

core/network/src/main/java/com/wap/wapp/core/network/source/management/ManagementDataSourceImpl.kt

@@ -29,7 +29,7 @@ class ManagementDataSourceImpl @Inject constructor(
             .await()
     }
 
-    override suspend fun getManagementCode(code: String): Result<Boolean> = runCatching {
+    override suspend fun checkManagementCode(code: String): Result<Boolean> = runCatching {
         val result = firebaseFirestore.collection(CODES_COLLECTION)
             .whereEqualTo("management", code)
             .get()

feature/auth/src/main/java/com/wap/wapp/feature/auth/signin/SignInContent.kt

@@ -32,12 +32,13 @@ import com.wap.wapp.feature.auth.R.string
 internal fun SignInContent(
     openSignInSheet: () -> Unit,
     navigateToNotice: () -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     val scrollState = rememberScrollState()
 
     Column(
         verticalArrangement = Arrangement.Center,
-        modifier = Modifier
+        modifier = modifier
             .fillMaxSize()
             .padding(horizontal = 16.dp)
             .verticalScroll(scrollState),

feature/auth/src/main/java/com/wap/wapp/feature/auth/signin/SignInScreen.kt

@@ -197,6 +197,7 @@ internal fun SignInScreen(
                 }
             },
             navigateToNotice = { navigateToNotice() },
+            modifier = Modifier.addFocusCleaner(focusManager),
         )
     }
 }

feature/auth/src/main/java/com/wap/wapp/feature/auth/signup/SignUpScreen.kt

@@ -22,7 +22,10 @@ import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
@@ -34,6 +37,7 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.wap.designsystem.WappTheme
 import com.wap.designsystem.component.WappSubTopBar
 import com.wap.designsystem.modifier.addFocusCleaner
@@ -43,6 +47,7 @@ import com.wap.wapp.feature.auth.R.drawable.ic_card
 import com.wap.wapp.feature.auth.R.drawable.ic_door
 import com.wap.wapp.feature.auth.R.string
 import com.wap.wapp.feature.auth.signup.SignUpViewModel.SignUpEvent
+import com.wap.wapp.feature.auth.signup.validation.CodeValidationDialog
 import kotlinx.coroutines.flow.collectLatest
 
 @Composable
@@ -68,11 +73,18 @@ internal fun SignUpScreen(
     val snackBarHostState = remember { SnackbarHostState() }
     val keyboardController = LocalSoftwareKeyboardController.current
     val focusManager = LocalFocusManager.current
+    var showCodeValidationDialog by remember { mutableStateOf(false) }
 
     LaunchedEffect(true) {
         viewModel.signUpEventFlow.collectLatest {
             when (it) {
-                is SignUpEvent.Success -> navigateToNotice()
+                is SignUpEvent.SignUpSuccess -> navigateToNotice()
+
+                is SignUpEvent.ValidateUserInformationSuccess -> {
+                    showCodeValidationDialog = true
+                }
+
+                is SignUpEvent.CheckMemberCodeSuccess -> viewModel.postUserProfile()
 
                 is SignUpEvent.Failure ->
                     snackBarHostState.showSnackbar(message = it.throwable.toSupportingText())
@@ -92,6 +104,20 @@ internal fun SignUpScreen(
                 .addFocusCleaner(focusManager)
                 .padding(paddingValue),
         ) {
+            if (showCodeValidationDialog) {
+                CodeValidationDialog(
+                    code = viewModel.memberCode.collectAsStateWithLifecycle().value,
+                    setValidationCode = viewModel::setWapMemberCode,
+                    onConfirmRequest = viewModel::checkMemberCode,
+                    onDismissRequest = { showCodeValidationDialog = false },
+                    isError = viewModel.isError.collectAsStateWithLifecycle().value,
+                    supportingText =
+                    stringResource(
+                        viewModel.errorSupportingText.collectAsStateWithLifecycle().value,
+                    ),
+                )
+            }
+
             WappSubTopBar(
                 modifier = Modifier
                     .fillMaxWidth()
@@ -189,7 +215,7 @@ internal fun SignUpScreen(
                     Spacer(modifier = Modifier.weight(1f))
 
                     Button(
-                        onClick = { viewModel.postUserProfile() },
+                        onClick = { viewModel.validateUserInformation() },
                         modifier = Modifier
                             .fillMaxWidth()
                             .height(48.dp),