From 4217e3ed1cd356a4a0ff8752018052852e2bbd64 Mon Sep 17 00:00:00 2001
From: LEE YOU BIN <youbeene3409@naver.com>
Date: Wed, 10 Jul 2024 07:17:43 +0900
Subject: [PATCH] =?UTF-8?q?[FEAT/#27]=20BaseResponse=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/terning/data/dto/BaseResponse.kt     |  6 ++----
 .../feature/onboarding/signin/SignInRoute.kt      | 15 +--------------
 .../signup/component/SignUpBottomSheet.kt         |  3 +--
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/data/src/main/java/com/terning/data/dto/BaseResponse.kt b/data/src/main/java/com/terning/data/dto/BaseResponse.kt
index 0de489ff1..a47d7bce9 100644
--- a/data/src/main/java/com/terning/data/dto/BaseResponse.kt
+++ b/data/src/main/java/com/terning/data/dto/BaseResponse.kt
@@ -7,10 +7,8 @@ import kotlinx.serialization.Serializable
 data class BaseResponse<T>(
     @SerialName("status")
     val status: Int,
-    @SerialName("code")
-    val code: String,
     @SerialName("message")
     val message: String,
-    @SerialName("data")
-    val data: T,
+    @SerialName("result")
+    val result: T,
 )
diff --git a/feature/src/main/java/com/terning/feature/onboarding/signin/SignInRoute.kt b/feature/src/main/java/com/terning/feature/onboarding/signin/SignInRoute.kt
index 0354262a4..c1c6a22c7 100644
--- a/feature/src/main/java/com/terning/feature/onboarding/signin/SignInRoute.kt
+++ b/feature/src/main/java/com/terning/feature/onboarding/signin/SignInRoute.kt
@@ -9,9 +9,6 @@ import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 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.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -29,7 +26,6 @@ import com.terning.core.extension.toast
 import com.terning.feature.R
 import com.terning.feature.home.navigation.navigateHome
 import com.terning.feature.onboarding.signin.component.KakaoButton
-import com.terning.feature.onboarding.signup.component.SignUpBottomSheet
 
 @Composable
 fun SignInRoute(
@@ -60,7 +56,6 @@ fun SignInScreen(
     modifier: Modifier = Modifier,
     onSignInClick: () -> Unit = {},
 ) {
-    var showBottomSheet by remember { mutableStateOf(false) }
 
     Column(
         modifier = modifier
@@ -77,18 +72,10 @@ fun SignInScreen(
         KakaoButton(
             title = stringResource(id = R.string.sign_in_kakao_button),
             onSignInClick = {
-                //onSignInClick()
-                showBottomSheet = true
+                onSignInClick()
             },
             modifier = modifier.padding(horizontal = 20.dp)
         )
-
-        if (showBottomSheet) {
-            SignUpBottomSheet(
-                onDismiss = { showBottomSheet = false },
-                onStartDialog = { showBottomSheet = false },
-            )
-        }
     }
 }
 
diff --git a/feature/src/main/java/com/terning/feature/onboarding/signup/component/SignUpBottomSheet.kt b/feature/src/main/java/com/terning/feature/onboarding/signup/component/SignUpBottomSheet.kt
index 9c38c6f95..1cd62a4be 100644
--- a/feature/src/main/java/com/terning/feature/onboarding/signup/component/SignUpBottomSheet.kt
+++ b/feature/src/main/java/com/terning/feature/onboarding/signup/component/SignUpBottomSheet.kt
@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
@@ -54,7 +53,7 @@ fun SignUpBottomSheet(
                     onButtonClick = { onStartDialog() },
                     modifier = modifier.padding(horizontal = 24.dp)
                 )
-                Spacer(modifier = modifier.padding(bottom = 36.dp))
+                Spacer(modifier = modifier.padding(bottom = 15.dp))
             }
         },
         onDismissRequest = { onDismiss() }