style: Apply Spotless Format

Team-B1ND · Aug 28, 2024 · 111f3a3 · 111f3a3
1 parent 855171d
commit 111f3a3
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 17 deletions.
diff --git a/dodam-student/src/main/kotlin/com/b1nd/dodam/student/DodamApp.kt b/dodam-student/src/main/kotlin/com/b1nd/dodam/student/DodamApp.kt
@@ -36,6 +36,8 @@ import com.b1nd.dodam.bus.navigation.navigateToBus
 import com.b1nd.dodam.dds.component.DodamErrorToast
 import com.b1nd.dodam.dds.component.DodamSuccessToast
 import com.b1nd.dodam.dds.component.DodamWarningToast
+import com.b1nd.dodam.login.navigation.loginScreen
+import com.b1nd.dodam.login.navigation.navigationToLogin
 import com.b1nd.dodam.onboarding.navigation.ONBOARDING_ROUTE
 import com.b1nd.dodam.onboarding.navigation.navigateToOnboarding
 import com.b1nd.dodam.onboarding.navigation.onboardingScreen
@@ -56,8 +58,6 @@ import com.google.firebase.analytics.FirebaseAnalytics
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import com.b1nd.dodam.login.navigation.loginScreen
-import com.b1nd.dodam.login.navigation.navigationToLogin
 
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
 @ExperimentalFoundationApi

diff --git a/dodam-student/src/main/kotlin/com/b1nd/dodam/student/util/DodamApplication.kt b/dodam-student/src/main/kotlin/com/b1nd/dodam/student/util/DodamApplication.kt
@@ -18,6 +18,7 @@ import com.b1nd.dodam.data.point.di.pointRepositoryModule
 import com.b1nd.dodam.data.schedule.di.scheduleRepositoryModule
 import com.b1nd.dodam.datastore.di.dataStoreModule
 import com.b1nd.dodam.keystore.keystoreManagerModule
+import com.b1nd.dodam.login.di.loginViewModelModule
 import com.b1nd.dodam.member.di.memberDataSourceModule
 import com.b1nd.dodam.member.di.memberRepositoryModule
 import com.b1nd.dodam.network.banner.di.bannerDataSourceModule
@@ -37,7 +38,6 @@ import com.b1nd.dodam.student.point.di.pointViewModelModule
 import com.b1nd.dodam.wakeupsong.di.wakeupSongDataSourceModule
 import com.b1nd.dodam.wakeupsong.di.wakeupSongRepositoryModule
 import com.b1nd.dodam.wakeupsong.di.wakeupSongViewModelModule
-import com.b1nd.dodam.login.di.loginViewModelModule
 import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
 import org.koin.core.context.startKoin

diff --git a/dodam-teacher-android/src/commonMain/kotlin/com/b1nd/dodam/teacher/DodamTeacherApp.kt b/dodam-teacher-android/src/commonMain/kotlin/com/b1nd/dodam/teacher/DodamTeacherApp.kt
@@ -5,10 +5,10 @@ import androidx.compose.runtime.Composable
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.rememberNavController
 import com.b1nd.dodam.designsystem.DodamTheme
-import com.b1nd.dodam.onboarding.navigation.ONBOARDING_ROUTE
-import com.b1nd.dodam.onboarding.navigation.onboardingScreen
 import com.b1nd.dodam.login.navigation.loginScreen
 import com.b1nd.dodam.login.navigation.navigationToLogin
+import com.b1nd.dodam.onboarding.navigation.ONBOARDING_ROUTE
+import com.b1nd.dodam.onboarding.navigation.onboardingScreen
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable

diff --git a/dodam-teacher-android/src/commonMain/kotlin/com/b1nd/dodam/teacher/Koin.kt b/dodam-teacher-android/src/commonMain/kotlin/com/b1nd/dodam/teacher/Koin.kt
@@ -3,9 +3,9 @@ package com.b1nd.dodam.teacher
 import com.b1nd.dodam.common.network.di.dispatchersModule
 import com.b1nd.dodam.data.login.di.loginRepositoryModule
 import com.b1nd.dodam.datastore.di.dataStoreModule
+import com.b1nd.dodam.login.di.loginViewModelModule
 import com.b1nd.dodam.network.core.di.networkCoreModule
 import com.b1nd.dodam.network.login.di.loginDataSourceModule
-import com.b1nd.dodam.login.di.loginViewModelModule
 import org.koin.core.KoinApplication
 import org.koin.core.context.startKoin
 

diff --git a/feature/login/src/commonMain/kotlin/com/b1nd/dodam/login/LoginScreen.kt b/feature/login/src/commonMain/kotlin/com/b1nd/dodam/login/LoginScreen.kt
@@ -36,19 +36,14 @@ import com.b1nd.dodam.designsystem.component.DodamDialog
 import com.b1nd.dodam.designsystem.component.DodamTextField
 import com.b1nd.dodam.designsystem.component.DodamTopAppBar
 import com.b1nd.dodam.designsystem.component.TopAppBarType
-import kotlinx.coroutines.launch
 import com.b1nd.dodam.login.viewmodel.Event
 import com.b1nd.dodam.login.viewmodel.LoginViewModel
+import kotlinx.coroutines.launch
 import org.koin.compose.viewmodel.koinViewModel
 
 @ExperimentalMaterial3Api
 @Composable
-internal fun LoginScreen(
-    viewModel: LoginViewModel = koinViewModel(),
-    onBackClick: () -> Unit,
-    navigateToMain: () -> Unit,
-    role: String
-) {
+internal fun LoginScreen(viewModel: LoginViewModel = koinViewModel(), onBackClick: () -> Unit, navigateToMain: () -> Unit, role: String) {
     val uiState by viewModel.uiState.collectAsState()
 
     var idError by remember { mutableStateOf("") }
@@ -169,7 +164,7 @@ private fun LoginScreen(
         topBar = {
             DodamTopAppBar(
                 title = "아이디와 비밀번호를\n" +
-                        "입력해주세요",
+                    "입력해주세요",
                 onBackClick = onBackClick,
                 type = TopAppBarType.Medium,
             )
@@ -195,7 +190,7 @@ private fun LoginScreen(
                 onClickRemoveRequest = onIdCancel,
                 keyboardOptions = KeyboardOptions(imeAction = ImeAction.Next),
                 singleLine = true,
-                supportText = if (idError.isNotBlank()) idError else  "" ,
+                supportText = if (idError.isNotBlank()) idError else "",
 
             )
 
@@ -213,7 +208,7 @@ private fun LoginScreen(
                 onClickRemoveRequest = onPwCancel,
                 keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
                 singleLine = true,
-                supportText = if (pwError.isNotBlank()) pwError else ""
+                supportText = if (pwError.isNotBlank()) pwError else "",
             )
             Row(
                 modifier = Modifier

diff --git a/feature/login/src/commonMain/kotlin/com/b1nd/dodam/login/viewmodel/LoginViewModel.kt b/feature/login/src/commonMain/kotlin/com/b1nd/dodam/login/viewmodel/LoginViewModel.kt
@@ -8,13 +8,13 @@ import com.b1nd.dodam.common.exception.UnauthorizedException
 import com.b1nd.dodam.common.result.Result
 import com.b1nd.dodam.data.login.repository.LoginRepository
 import com.b1nd.dodam.datastore.repository.DataStoreRepository
+import com.b1nd.dodam.login.model.LoginUiState
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import com.b1nd.dodam.login.model.LoginUiState
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject