[chore] 코딩 컨벤션 반영

YAPP-Github · Jul 15, 2024 · 58e9c05 · 58e9c05
1 parent 69a57ca
commit 58e9c05
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 35 deletions.
diff --git a/app/src/main/java/pokitmons/pokit/MainActivity.kt b/app/src/main/java/pokitmons/pokit/MainActivity.kt
@@ -4,11 +4,7 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import pokitmons.pokit.core.ui.theme.PokitTheme
-import pokitmons.pokit.keyword.KeywordScreen
 import pokitmons.pokit.navigation.LoginNavHost
-import pokitmons.pokit.nickname.InputNicknameScreen
-import pokitmons.pokit.success.SignUpSuccessScreen
-import pokitmons.pokit.terms.TermsOfServiceScreen
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {

diff --git a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/button/PokitLoginButton.kt b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/button/PokitLoginButton.kt
@@ -30,7 +30,7 @@ fun PokitLoginButton(
     modifier: Modifier = Modifier,
     onClick: () -> Unit,
     loginType: PokitLoginButtonType,
-    text: String
+    text: String,
 ) {
     val loginResource: PokitLoginResource = getLoginResource(loginType)
 
@@ -76,14 +76,14 @@ private fun getLoginResource(loginType: PokitLoginButtonType): PokitLoginResourc
             iconTintColor = Color.White,
             textColor = Color.White,
             backgroundColor = Gray700,
-            borderColor = Gray700,
+            borderColor = Gray700
         )
 
         PokitLoginButtonType.GOOGLE -> PokitLoginResource(
             iconResourceId = R.drawable.icon_24_google,
             textColor = Gray900,
             backgroundColor = Color.White,
-            borderColor = Gray200,
+            borderColor = Gray200
         )
     }
 }
diff --git a/feature/login/src/main/java/pokitmons/pokit/keyword/KeywordScreen.kt b/feature/login/src/main/java/pokitmons/pokit/keyword/KeywordScreen.kt
@@ -16,18 +16,18 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import pokitmons.pokit.core.ui.R as Ui
 import pokitmons.pokit.core.ui.components.atom.button.PokitButton
 import pokitmons.pokit.core.ui.components.atom.button.attributes.PokitButtonSize
 import pokitmons.pokit.core.ui.components.atom.chip.PokitChip
 import pokitmons.pokit.core.ui.components.atom.chip.attributes.PokitChipSize
 import pokitmons.pokit.core.ui.theme.PokitTheme
+import pokitmons.pokit.core.ui.R as Ui
 import pokitmons.pokit.login.R as LoginStringResource
 
 @Composable
 fun KeywordScreen(
-    onNavigateToSignUpScreen:() -> Unit,
-    popBackStack:() -> Unit
+    onNavigateToSignUpScreen: () -> Unit,
+    popBackStack: () -> Unit,
 ) {
     Box(
         modifier = Modifier
@@ -65,7 +65,7 @@ fun KeywordScreen(
                     stringResource(id = LoginStringResource.string.self_development),
                     stringResource(id = LoginStringResource.string.humor),
                     stringResource(id = LoginStringResource.string.music),
-                    stringResource(id = LoginStringResource.string.job_info),
+                    stringResource(id = LoginStringResource.string.job_info)
                 ).chunked(3)
 
                 Row {

diff --git a/feature/login/src/main/java/pokitmons/pokit/login/LoginScreen.kt b/feature/login/src/main/java/pokitmons/pokit/login/LoginScreen.kt
@@ -31,25 +31,25 @@ fun LoginScreen(
     // TODO 서버 api 개발완료 후 viewmodel 연동 및 아키텍처 구축
     Box(
         modifier = Modifier
-            .fillMaxSize(),
+            .fillMaxSize()
     ) {
         Column(
             modifier = Modifier
                 .align(Alignment.BottomCenter)
-                .padding(start = 20.dp, end = 20.dp, bottom = 32.dp),
+                .padding(start = 20.dp, end = 20.dp, bottom = 32.dp)
         ) {
             PokitLoginButton(
                 loginType = PokitLoginButtonType.APPLE,
                 text = stringResource(id = R.string.apple_login),
-                onClick = { onNavigateToMainScreen() },
+                onClick = { onNavigateToMainScreen() }
             )
 
             Spacer(modifier = Modifier.height(8.dp))
 
             PokitLoginButton(
                 loginType = PokitLoginButtonType.GOOGLE,
                 text = stringResource(id = R.string.google_login),
-                onClick = { onNavigateToTermsOfServiceScreen() },
+                onClick = { onNavigateToTermsOfServiceScreen() }
             )
         }
     }

diff --git a/feature/login/src/main/java/pokitmons/pokit/navigation/LoginNavHost.kt b/feature/login/src/main/java/pokitmons/pokit/navigation/LoginNavHost.kt
@@ -20,7 +20,7 @@ fun LoginNavHost() {
         composable(route = LoginRoute.LoginScreen.name) {
             LoginScreen(
                 onNavigateToTermsOfServiceScreen = { navController.navigate(route = LoginRoute.TermsOfServiceScreen.name) },
-                onNavigateToMainScreen = {  }, // TODO 메인 화면 구현후 수정
+                onNavigateToMainScreen = { } // TODO 메인 화면 구현후 수정
             )
         }
 
@@ -47,7 +47,7 @@ fun LoginNavHost() {
 
         composable(route = LoginRoute.SignUpSuccessScreen.name) {
             SignUpSuccessScreen(
-                onNavigateToMainScreen = {  }, // TODO 메인 화면 구현후 수정
+                onNavigateToMainScreen = { } // TODO 메인 화면 구현후 수정
             )
         }
     }

diff --git a/feature/login/src/main/java/pokitmons/pokit/nickname/InputNicknameScreen.kt b/feature/login/src/main/java/pokitmons/pokit/nickname/InputNicknameScreen.kt
@@ -31,14 +31,15 @@ private const val NICKNAME_MIN_LENGTH = 1 // TODO 매직넘버를 포함하는
 @Composable
 fun InputNicknameScreen(
     onNavigateToKeywordScreen: () -> Unit,
-    popBackStack: () -> Unit
+    popBackStack: () -> Unit,
 ) {
     val inputNicknameViewModel: InputNicknameViewModel = viewModel() // TODO hiltViewModel 마이그레이션 예정
     val inputNicknameState by inputNicknameViewModel.inputNicknameState.collectAsState()
 
-    Box(modifier = Modifier
-        .padding(start = 20.dp, end = 20.dp, top = 20.dp, bottom = 28.dp)
-        .fillMaxSize()
+    Box(
+        modifier = Modifier
+            .padding(start = 20.dp, end = 20.dp, top = 20.dp, bottom = 28.dp)
+            .fillMaxSize()
     ) {
         Column() {
             Icon(
@@ -74,7 +75,7 @@ fun InputNicknameScreen(
                     if (text.length <= NICKNAME_MAX_LENGTH) {
                         inputNicknameViewModel.inputText(text)
                     }
-                },
+                }
             )
         }
 

diff --git a/feature/login/src/main/java/pokitmons/pokit/success/SignUpSuccessScreen.kt b/feature/login/src/main/java/pokitmons/pokit/success/SignUpSuccessScreen.kt
@@ -26,14 +26,13 @@ import pokitmons.pokit.login.R
 
 @Composable
 fun SignUpSuccessScreen(
-    onNavigateToMainScreen: () -> Unit
+    onNavigateToMainScreen: () -> Unit,
 ) {
     Box(
         modifier = Modifier
             .padding(all = 20.dp)
             .padding(bottom = 8.dp)
     ) {
-
         Icon(
             painter = painterResource(id = pokitmons.pokit.core.ui.R.drawable.icon_24_arrow_left),
             contentDescription = null
@@ -45,16 +44,14 @@ fun SignUpSuccessScreen(
                 .offset(y = (-110).dp),
             verticalArrangement = Arrangement.Center,
             horizontalAlignment = Alignment.CenterHorizontally
-        )
-        {
+        ) {
             Image(
                 painter = painterResource(id = R.drawable.ic_launcher_foreground),
                 contentDescription = "회원가입 완료 이미지"
             )
 
             Spacer(modifier = Modifier.height(28.dp))
 
-
             Text(
                 style = PokitTheme.typography.title1,
                 text = stringResource(id = R.string.sign_up_success)
@@ -76,6 +73,7 @@ fun SignUpSuccessScreen(
             text = stringResource(id = R.string.next),
             icon = null,
             size = PokitButtonSize.LARGE,
-            onClick = { onNavigateToMainScreen() })
+            onClick = { onNavigateToMainScreen() }
+        )
     }
 }
diff --git a/feature/login/src/main/java/pokitmons/pokit/terms/TermsCheckBoxItem.kt b/feature/login/src/main/java/pokitmons/pokit/terms/TermsCheckBoxItem.kt
@@ -19,9 +19,9 @@ import pokitmons.pokit.core.ui.theme.PokitTheme
 fun TermsCheckBoxItem(
     text: String,
     isChecked: Boolean,
-    click:() -> Unit
+    click: () -> Unit,
 ) {
-    Box(modifier = Modifier.fillMaxWidth(),) {
+    Box(modifier = Modifier.fillMaxWidth()) {
         Row(verticalAlignment = Alignment.CenterVertically) {
             PokitCheckbox(
                 checked = isChecked,

diff --git a/feature/login/src/main/java/pokitmons/pokit/terms/TermsOfServiceScreen.kt b/feature/login/src/main/java/pokitmons/pokit/terms/TermsOfServiceScreen.kt
@@ -32,21 +32,21 @@ import pokitmons.pokit.login.R
 @Composable
 fun TermsOfServiceScreen(
     onNavigateToInputNicknameScreen: () -> Unit,
-    popBackStack:() -> Unit,
+    popBackStack: () -> Unit,
 ) {
     val termsViewModel: TermsViewModel = viewModel() // TODO hiltViewModel 마이그레이션 예정
     val termsState by termsViewModel.termsState.collectAsState()
 
     Box(
         modifier = Modifier
             .fillMaxSize()
-            .padding(start = 20.dp, end = 20.dp, top = 20.dp, bottom = 28.dp),
+            .padding(start = 20.dp, end = 20.dp, top = 20.dp, bottom = 28.dp)
     ) {
         Column {
             Icon(
                 painter = painterResource(id = pokitmons.pokit.core.ui.R.drawable.icon_24_arrow_left),
                 contentDescription = "뒤로가기",
-                modifier = Modifier.clickable { popBackStack() },
+                modifier = Modifier.clickable { popBackStack() }
             )
 
             Spacer(modifier = Modifier.height(32.dp))
@@ -74,7 +74,7 @@ fun TermsOfServiceScreen(
                 PokitCheckbox(
                     style = PokitCheckboxStyle.STROKE,
                     checked = termsState.isAllChecked,
-                    onClick = { termsViewModel.checkAllTerms() },
+                    onClick = { termsViewModel.checkAllTerms() }
                 )
                 Text(
                     modifier = Modifier.padding(start = 16.dp),

diff --git a/feature/login/src/main/java/pokitmons/pokit/terms/TermsState.kt b/feature/login/src/main/java/pokitmons/pokit/terms/TermsState.kt
@@ -4,5 +4,5 @@ data class TermsState(
     val isAllChecked: Boolean = false,
     val isPersonalDataChecked: Boolean = false,
     val isServiceChecked: Boolean = false,
-    val isMarketingChecked: Boolean = false
+    val isMarketingChecked: Boolean = false,
 )