[CHORE/#5] 코드 수정

teamterning · Jul 6, 2024 · 350c569 · 350c569
1 parent 8b3b34b
commit 350c569
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/feature/src/main/java/com/terning/feature/mock/MockRoute.kt b/feature/src/main/java/com/terning/feature/mock/MockRoute.kt
@@ -26,7 +26,7 @@ fun MockRoute(
     val context = LocalContext.current
     val lifecycleOwner = LocalLifecycleOwner.current
 
-    val state by viewModel.state.collectAsStateWithLifecycle(lifecycleOwner = LocalLifecycleOwner.current)
+    val state by viewModel.state.collectAsStateWithLifecycle(lifecycleOwner = lifecycleOwner)
 
     LaunchedEffect(key1 = true) {
         viewModel.getFriendsInfo(2)

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
@@ -21,6 +21,7 @@ import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.flowWithLifecycle
 import androidx.navigation.NavHostController
+import com.terning.core.designsystem.theme.TerningTheme
 import com.terning.core.extension.toast
 import com.terning.feature.R
 import com.terning.feature.first.navigation.navigateFirst
@@ -64,8 +65,7 @@ fun SignInScreen(
             painter = painterResource(id = R.drawable.img_terning_point),
             contentDescription = null,
             modifier = Modifier
-                .size(500.dp)
-                .aspectRatio(1f),
+                .size(500.dp),
         )
         KakaoButton(
             title = stringResource(id = R.string.sign_in_kakao_button),
@@ -78,5 +78,7 @@ fun SignInScreen(
 @Preview(showBackground = true)
 @Composable
 fun SignInScreenPreview() {
-    SignInScreen()
+    TerningTheme {
+        SignInScreen()
+    }
 }
diff --git a/feature/src/main/java/com/terning/feature/onboarding/signin/component/KakaoButton.kt b/feature/src/main/java/com/terning/feature/onboarding/signin/component/KakaoButton.kt
@@ -14,10 +14,10 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.terning.core.designsystem.theme.TerningTheme
 import com.terning.core.extension.noRippleClickable
 import com.terning.feature.R
 
-
 @Composable
 fun KakaoButton(
     title: String,
@@ -48,5 +48,10 @@ fun KakaoButton(
 @Preview(showBackground = true)
 @Composable
 fun KakaoButtonPreview() {
-    KakaoButton("카카오로 로그인하기", onSignInClick = {})
+    TerningTheme {
+        KakaoButton(
+            title = "카카오로 로그인하기",
+            onSignInClick = {}
+        )
+    }
 }