feature/signup: 번호 인증시 reCapcha가 나오지 않도록 수정

.gitignore

@@ -29,4 +29,5 @@ core/model/build/kotlin/compileDebugKotlin/cacheable/
 core/designsystem/build/kotlin/compileDebugKotlin/cacheable/
 core/designsystem/build/outputs/aar/
 core/model/build/outputs/aar/
-core/designsystem/build/tmp/kotlin-classes/debug/META-INF
+core/designsystem/build/tmp/kotlin-classes/debug/META-INF
+core/designsystem/build/tmp

app/google-services.json

@@ -7,7 +7,7 @@
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:260494595521:android:4082b77d97edb83f428b40",
+        "mobilesdk_app_id": "1:260494595521:android:43c64ea8b41b8833428b40",
         "android_client_info": {
           "package_name": "com.kusitms.connectdog"
         }
@@ -23,6 +23,25 @@
           "other_platform_oauth_client": []
         }
       }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:260494595521:android:a5be6ee857dccfc3428b40",
+        "android_client_info": {
+          "package_name": "com.kusitms.connectdog.feature.main"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyDqQ5mEJVaoopO1yxSahoDXJ4D6EvUf15U"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
     }
   ],
   "configuration_version": "1"

core/data/src/main/java/com/kusitms/connectdog/core/data/mapper/ReviewMapper.kt

@@ -30,6 +30,7 @@ fun ReviewDetailResponse.toData(): Review {
         location = "$departureLoc → $arrivalLoc",
         organization = intermediaryName,
         content = content,
-        intermediaryId = intermediaryId
+        intermediaryId = intermediaryId,
+        postMainImage = postMainImage
     )
 }

core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/counters.tab

@@ -1,2 +1,2 @@
-12
+11
 0

core/model/src/main/java/com/kusitms/connectdog/core/model/Review.kt

@@ -10,5 +10,6 @@ data class Review(
     val organization: String,
     val content: String,
     val contentImages: List<String>?,
-    val intermediaryId: Long? = null
+    val intermediaryId: Long? = null,
+    val postMainImage: String = ""
 )

feature/main/google-services.json

@@ -5,6 +5,25 @@
     "storage_bucket": "connectdog-8ace1.appspot.com"
   },
   "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:260494595521:android:ddc97a53f6eb3fae428b40",
+        "android_client_info": {
+          "package_name": "com.kusitms.connectdog"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyDqQ5mEJVaoopO1yxSahoDXJ4D6EvUf15U"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    },
     {
       "client_info": {
         "mobilesdk_app_id": "1:260494595521:android:a5be6ee857dccfc3428b40",

feature/signup/src/main/java/com/kusitms/connectdog/signup/navigation/SignUpNavigation.kt

@@ -7,13 +7,13 @@ import androidx.navigation.NavType
 import androidx.navigation.compose.composable
 import androidx.navigation.navArgument
 import com.kusitms.connectdog.core.util.UserType
+import com.kusitms.connectdog.signup.screen.common.CertificationScreen
 import com.kusitms.connectdog.signup.screen.common.CompleteSignUpScreen
 import com.kusitms.connectdog.signup.screen.common.RegisterEmailScreen
 import com.kusitms.connectdog.signup.screen.common.RegisterPasswordScreen
 import com.kusitms.connectdog.signup.screen.common.SignUpRoute
 import com.kusitms.connectdog.signup.screen.intermediator.IntermediatorInformationScreen
 import com.kusitms.connectdog.signup.screen.intermediator.IntermediatorProfileScreen
-import com.kusitms.connectdog.signup.screen.volunteer.CertificationScreen
 import com.kusitms.connectdog.signup.screen.volunteer.SelectProfileImageScreen
 import com.kusitms.connectdog.signup.screen.volunteer.VolunteerProfileScreen
 import com.kusitms.connectdog.signup.viewmodel.SignUpViewModel

feature/signup/src/main/java/com/kusitms/connectdog/signup/screen/volunteer/CeritificationScreen.kt → feature/signup/src/main/java/com/kusitms/connectdog/signup/screen/common/CeritificationScreen.kt

@@ -1,7 +1,6 @@
-package com.kusitms.connectdog.signup.screen.volunteer
+package com.kusitms.connectdog.signup.screen.common
 
 import android.annotation.SuppressLint
-import android.util.Log
 import android.widget.Toast
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -93,7 +92,6 @@ private fun Content(
     val context = LocalContext.current
     val isSendNumber by remember { viewModel.isSendNumber }.collectAsState()
     val isCertified by remember { viewModel.isCertified }.collectAsState()
-//    val isDuplicatePhoneNumber = signUpViewModel.isDuplicatePhoneNumber.collectAsState()
 
     LaunchedEffect(key1 = signUpViewModel) {
         signUpViewModel.isDuplicatePhoneNumber.collect {
@@ -139,13 +137,15 @@ private fun Content(
             buttonLabel = "인증 요청",
             keyboardType = KeyboardType.Number,
             padding = 5,
-            onTextChanged = { viewModel.updatePhoneNumber(it) },
+            onTextChanged = { if (it.length <= 11) viewModel.updatePhoneNumber(it) },
             onClick = {
                 if (viewModel.phoneNumber.isEmpty()) {
                     Toast.makeText(context, "휴대폰 번호를 입력해주세요", Toast.LENGTH_SHORT).show()
-                } else {
+                } else if (viewModel.phoneNumber.length == 11) {
                     signUpViewModel.checkIsDuplicatePhoneNumber(userType, viewModel.phoneNumber)
                     viewModel.updateIsSendNumber(true)
+                } else {
+                    Toast.makeText(context, "올바른 휴대폰 번호를 입력해주세요", Toast.LENGTH_SHORT).show()
                 }
             }
         )
@@ -159,22 +159,19 @@ private fun Content(
             buttonLabel = "인증 확인",
             keyboardType = KeyboardType.Number,
             padding = 5,
-            onTextChanged = { viewModel.updateCertificationNumber(it) },
+            onTextChanged = { if (it.length <= 6) viewModel.updateCertificationNumber(it) },
             onClick = {
-                Log.d("send", isSendNumber.toString())
-                viewModel.updateIsCertified(true)
-//                if (!isSendNumber) {
-//                    Toast.makeText(context, "먼저 인증번호를 전송해주세요", Toast.LENGTH_SHORT).show()
-//                } else {
-//                    if (viewModel.certificationNumber.isEmpty()) {
-//                        Toast.makeText(context, "인증 번호를 입력해주세요", Toast.LENGTH_SHORT).show()
-//                    } else {
-//                        onVerifyCodeClick(it) {
-//                            viewModel.updateIsCertified(it)
-//                            Log.d("casz", isCertified.toString())
-//                        }
-//                    }
-//                }
+                if (!isSendNumber) {
+                    Toast.makeText(context, "먼저 인증번호를 전송해주세요", Toast.LENGTH_SHORT).show()
+                } else {
+                    if (viewModel.certificationNumber.isEmpty()) {
+                        Toast.makeText(context, "인증 번호를 입력해주세요", Toast.LENGTH_SHORT).show()
+                    } else if (viewModel.certificationNumber.length == 6) {
+                        onVerifyCodeClick(it) { viewModel.updateIsCertified(it) }
+                    } else {
+                        Toast.makeText(context, "인증 번호는 6자리로 입력해주세요", Toast.LENGTH_SHORT).show()
+                    }
+                }
             }
         )
         Spacer(modifier = Modifier.weight(1f))