[chore] #43 ktlint 적용

SOPT-all · Jan 19, 2025 · a612f22 · a612f22
1 parent 9d9fa90
commit a612f22
Show file tree

Hide file tree

Showing 20 changed files with 322 additions and 294 deletions.
diff --git a/app/src/main/java/org/android/bbangzip/data/repositoryImpl/UserRepositoryImpl.kt b/app/src/main/java/org/android/bbangzip/data/repositoryImpl/UserRepositoryImpl.kt
@@ -8,46 +8,46 @@ import org.android.bbangzip.domain.repository.local.UserRepository
 import javax.inject.Inject
 
 class UserRepositoryImpl
-@Inject
-constructor(
-    private val userDataSource: UserLocalDataSource,
-) : UserRepository {
-    override val userPreferenceFlow: Flow<UserPreferences> = userDataSource.userPreferencesFlow
+    @Inject
+    constructor(
+        private val userDataSource: UserLocalDataSource,
+    ) : UserRepository {
+        override val userPreferenceFlow: Flow<UserPreferences> = userDataSource.userPreferencesFlow
 
-    override suspend fun setUserData(accessToken: String) {
-        userDataSource.updateUserPreferences { userData ->
-            userData
-                .toBuilder()
-                .setAccessToken(accessToken)
-                .build()
+        override suspend fun setUserData(accessToken: String) {
+            userDataSource.updateUserPreferences { userData ->
+                userData
+                    .toBuilder()
+                    .setAccessToken(accessToken)
+                    .build()
+            }
         }
-    }
 
-    override suspend fun clearUserData() {
-        userDataSource.updateUserPreferences { userData ->
-            userData
-                .toBuilder()
-                .clearAccessToken()
-                .clearOnboardingInfo()
-                .build()
+        override suspend fun clearUserData() {
+            userDataSource.updateUserPreferences { userData ->
+                userData
+                    .toBuilder()
+                    .clearAccessToken()
+                    .clearOnboardingInfo()
+                    .build()
+            }
         }
-    }
 
-    override suspend fun setOnboardingInfo(onboardingInfo: OnboardingInfo) {
-        userDataSource.updateUserPreferences { userData ->
-            userData
-                .toBuilder()
-                .setOnboardingInfo(onboardingInfo)
-                .build()
+        override suspend fun setOnboardingInfo(onboardingInfo: OnboardingInfo) {
+            userDataSource.updateUserPreferences { userData ->
+                userData
+                    .toBuilder()
+                    .setOnboardingInfo(onboardingInfo)
+                    .build()
+            }
         }
-    }
 
-    override suspend fun clearOnboardingInfo() {
-        userDataSource.updateUserPreferences { userData ->
-            userData
-                .toBuilder()
-                .clearOnboardingInfo()
-                .build()
+        override suspend fun clearOnboardingInfo() {
+            userDataSource.updateUserPreferences { userData ->
+                userData
+                    .toBuilder()
+                    .clearOnboardingInfo()
+                    .build()
+            }
         }
     }
-}
diff --git a/...ain/java/org/android/bbangzip/presentation/component/progressbar/OnboardingProgressBar.kt b/...ain/java/org/android/bbangzip/presentation/component/progressbar/OnboardingProgressBar.kt
@@ -52,6 +52,7 @@ fun OnboardingProgressBar(
     Spacer(modifier = Modifier.height(8.dp))
 
     BbangZipBasicProgressBar(
+        modifier = modifier,
         progress = progress,
         backgroundColor = BbangZipTheme.colors.fillStrong_68645E_16,
     )

diff --git a/...main/java/org/android/bbangzip/presentation/component/textfield/BbangZipBasicTextField.kt b/...main/java/org/android/bbangzip/presentation/component/textfield/BbangZipBasicTextField.kt
@@ -60,13 +60,14 @@ fun BbangZipBasicTextField(
     onDeleteButtonClick: () -> Unit = { },
     keyboardOptions: KeyboardOptions = KeyboardOptions.Default.copy(imeAction = ImeAction.Default),
     focusManager: FocusManager,
-    keyboardActions: KeyboardActions = KeyboardActions(
-        onDone = {
-            val trimmedValue = value.trim()
-            onValueChange(trimmedValue)
-            focusManager.clearFocus(force = true)
-        }
-    ),
+    keyboardActions: KeyboardActions =
+        KeyboardActions(
+            onDone = {
+                val trimmedValue = value.trim()
+                onValueChange(trimmedValue)
+                focusManager.clearFocus(force = true)
+            },
+        ),
 ) {
     var isFocused by remember { mutableStateOf(false) }
     val focusRequester = remember { FocusRequester() }

diff --git a/...in/java/org/android/bbangzip/presentation/component/wheelpicker/BbangZipSemesterPicker.kt b/...in/java/org/android/bbangzip/presentation/component/wheelpicker/BbangZipSemesterPicker.kt
@@ -54,7 +54,7 @@ fun BbangZipSemesterPicker(
             startIndex = startYear,
             onItemChanged = { selectedYear ->
                 yearPickerState = selectedYear
-            }
+            },
         )
 
         BbangZipPicker(
@@ -63,7 +63,7 @@ fun BbangZipSemesterPicker(
             startIndex = startSemester ?: 0,
             onItemChanged = { selectedSemester ->
                 semesterPickerState = selectedSemester
-            }
+            },
         )
     }
 }

diff --git a/app/src/main/java/org/android/bbangzip/presentation/model/OnboardingInfo.kt b/app/src/main/java/org/android/bbangzip/presentation/model/OnboardingInfo.kt
@@ -8,5 +8,5 @@ data class OnboardingInfo(
     val userName: String?,
     val year: Int,
     val semester: String?,
-    val subjectName: String?
+    val subjectName: String?,
 ) : Parcelable
diff --git a/app/src/main/java/org/android/bbangzip/presentation/type/OnboardingType.kt b/app/src/main/java/org/android/bbangzip/presentation/type/OnboardingType.kt
@@ -8,13 +8,13 @@ enum class OnboardingType(
     @StringRes val description: Int? = null,
     @StringRes val placeholder: Int? = null,
     @StringRes val guideline: Int? = null,
-    @StringRes val success: Int? = null
+    @StringRes val success: Int? = null,
 ) {
     FIRST(
         title = R.string.onboarding_first_title,
         placeholder = R.string.onboarding_name_placeholder,
         guideline = R.string.onboarding_name_description,
-        success = R.string.onboarding_name_success
+        success = R.string.onboarding_name_success,
     ),
     SECOND(
         title = R.string.onboarding_second_title,
@@ -25,6 +25,6 @@ enum class OnboardingType(
         description = R.string.onboarding_third_description,
         placeholder = R.string.onboarding_subject_placeholder,
         guideline = R.string.onboarding_subject_description,
-        success = R.string.onboarding_subject_success
+        success = R.string.onboarding_subject_success,
     ),
 }
diff --git a/app/src/main/java/org/android/bbangzip/presentation/ui/friend/FriendScreen.kt b/app/src/main/java/org/android/bbangzip/presentation/ui/friend/FriendScreen.kt
@@ -25,32 +25,32 @@ fun FriendScreen(
     val focusManager = LocalFocusManager.current
 
     var text by remember { mutableStateOf("") }
-    var validationState by remember { mutableStateOf<BbangZipTextFieldInputState>(BbangZipTextFieldInputState.Empty) }
+    var validationState by remember { mutableStateOf<BbangZipTextFieldInputState>(BbangZipTextFieldInputState.Default) }
 
     var text2 by remember { mutableStateOf("") }
     var validationState2 by remember {
         mutableStateOf<BbangZipTextFieldInputState>(
-            BbangZipTextFieldInputState.Empty,
+            BbangZipTextFieldInputState.Default,
         )
     }
 
     fun validateText(text: String) {
         validationState =
             when {
-                text.isEmpty() -> BbangZipTextFieldInputState.Empty
+                text.isEmpty() -> BbangZipTextFieldInputState.Default
                 text.length == 1 -> BbangZipTextFieldInputState.Typing
-                text.length == 3 -> BbangZipTextFieldInputState.Complete
-                text.length > 5 -> BbangZipTextFieldInputState.Error
+                text.length == 3 -> BbangZipTextFieldInputState.Field
+                text.length > 5 -> BbangZipTextFieldInputState.Placeholder
                 else -> BbangZipTextFieldInputState.Field
             }
     }
 
     fun validate2Text(text: String) {
         validationState2 =
             when {
-                text.isEmpty() -> BbangZipTextFieldInputState.Empty
+                text.isEmpty() -> BbangZipTextFieldInputState.Default
                 text.length == 1 -> BbangZipTextFieldInputState.Typing
-                5 < text.length -> BbangZipTextFieldInputState.Error
+                5 < text.length -> BbangZipTextFieldInputState.Placeholder
                 else -> BbangZipTextFieldInputState.Field
             }
     }
@@ -73,12 +73,13 @@ fun FriendScreen(
                 validateText(text = newValue)
             },
             onFocusChange = {
-                if (validationState == BbangZipTextFieldInputState.Empty) validationState = BbangZipTextFieldInputState.Typing else Unit
+                if (validationState == BbangZipTextFieldInputState.Default) validationState = BbangZipTextFieldInputState.Typing else Unit
             },
             onDeleteButtonClick = {
                 text = ""
-                validationState = BbangZipTextFieldInputState.Empty
+                validationState = BbangZipTextFieldInputState.Default
             },
+            focusManager = LocalFocusManager.current,
         )
 
         Row {
@@ -90,7 +91,7 @@ fun FriendScreen(
                 value = text2,
                 bbangZipTextFieldInputState = validationState2,
                 onFocusChange = {
-                    if (validationState2 == BbangZipTextFieldInputState.Empty) validationState2 = BbangZipTextFieldInputState.Typing else Unit
+                    if (validationState2 == BbangZipTextFieldInputState.Default) validationState2 = BbangZipTextFieldInputState.Typing else Unit
                 },
                 onValueChange = { newValue ->
                     text2 = newValue
@@ -106,7 +107,7 @@ fun FriendScreen(
                 value = text2,
                 bbangZipTextFieldInputState = validationState2,
                 onFocusChange = {
-                    if (validationState2 == BbangZipTextFieldInputState.Empty) validationState2 = BbangZipTextFieldInputState.Typing else Unit
+                    if (validationState2 == BbangZipTextFieldInputState.Default) validationState2 = BbangZipTextFieldInputState.Typing else Unit
                 },
                 onValueChange = { newValue ->
                     text2 = newValue

diff --git a/app/src/main/java/org/android/bbangzip/presentation/ui/navigator/MainNavHost.kt b/app/src/main/java/org/android/bbangzip/presentation/ui/navigator/MainNavHost.kt
@@ -49,16 +49,15 @@ fun MainNavHost(
             )
 
             onboardingStartNavGraph(
-                navigateToOnboarding = { navigator.navHostController.navigateOnboarding() }
+                navigateToOnboarding = { navigator.navHostController.navigateOnboarding() },
             )
 
             onboardingNavGraph(
-                navigateToOnboardingEnd = { navigator.navHostController.navigateOnboardingEnd() }
+                navigateToOnboardingEnd = { navigator.navHostController.navigateOnboardingEnd() },
             )
 
             onboardingEndNavGraph(
-                navigateToSubject = { navigator.navHostController.navigateSubject() }
-
+                navigateToSubject = { navigator.navHostController.navigateSubject() },
             )
 
             friendNavGraph()

diff --git a/app/src/main/java/org/android/bbangzip/presentation/ui/navigator/MainNavigator.kt b/app/src/main/java/org/android/bbangzip/presentation/ui/navigator/MainNavigator.kt
@@ -9,7 +9,6 @@ import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navOptions
 import org.android.bbangzip.presentation.model.BottomNavigationRoute
-import org.android.bbangzip.presentation.model.OnboardingInfo
 import org.android.bbangzip.presentation.model.Route
 import org.android.bbangzip.presentation.type.BottomNavigationType
 import org.android.bbangzip.presentation.ui.friend.navigateFriend

diff --git a/app/src/main/java/org/android/bbangzip/presentation/ui/onboarding/OnboardingContract.kt b/app/src/main/java/org/android/bbangzip/presentation/ui/onboarding/OnboardingContract.kt
@@ -20,45 +20,70 @@ class OnboardingContract {
         val userNameFocusedState: Boolean = false,
         val semesterPickerState: Boolean = true,
         val subjectNameTextFieldState: BbangZipTextFieldInputState = BbangZipTextFieldInputState.Default,
-        val subjectNameFocusedState: Boolean = false
+        val subjectNameFocusedState: Boolean = false,
     ) : BaseContract.State, Parcelable {
         override fun toParcelable(): Parcelable = this
     }
 
     sealed interface OnboardingEvent : BaseContract.Event {
         data class OnChangeUserName(val userName: String) : OnboardingEvent
+
         data class OnChangeUserNameFocused(val isFocused: Boolean) : OnboardingEvent
+
         data class OnChangeSemester(val semester: Semester) : OnboardingEvent
+
         data class OnChangeSubject(val subject: String) : OnboardingEvent
+
         data class OnChangeSubjectFocused(val isFocused: Boolean) : OnboardingEvent
+
         data class OnChangeCurrentPage(val currentPage: Int) : OnboardingEvent
+
         data object OnClickDeleteUserName : OnboardingEvent
+
         data object OnClickDeleteSubject : OnboardingEvent
+
         data object OnClickBackBtn : OnboardingEvent
+
         data object OnClickNextBtn : OnboardingEvent
+
         data object OnClickFinishBtn : OnboardingEvent
     }
 
     sealed interface OnboardingReduce : BaseContract.Reduce {
         data class UpdateState(val state: OnboardingState) : OnboardingReduce
+
         data class UpdateUserName(val userName: String) : OnboardingReduce
+
         data class UpdateUserNameFocused(val isFocused: Boolean) : OnboardingReduce
+
         data object DeleteUserName : OnboardingReduce
+
         data class UpdateSemester(val semester: Semester) : OnboardingReduce
+
         data class UpdateSubject(val subject: String) : OnboardingReduce
+
         data class UpdateSubjectFocused(val isFocused: Boolean) : OnboardingReduce
+
         data object DeleteSubject : OnboardingReduce
+
         data class UpdateCurrentPage(val nextPage: Int) : OnboardingReduce
-        data class UpdateUserNameTextFieldSate(val userName: String): OnboardingReduce
-        data class UpdateSubjectNameTextFieldSate(val subject: String): OnboardingReduce
-        data object UpdateButtonEnabled: OnboardingReduce
+
+        data class UpdateUserNameTextFieldSate(val userName: String) : OnboardingReduce
+
+        data class UpdateSubjectNameTextFieldSate(val subject: String) : OnboardingReduce
+
+        data object UpdateButtonEnabled : OnboardingReduce
     }
 
     sealed interface OnboardingSideEffect : BaseContract.SideEffect {
         data object PopBackStack : OnboardingSideEffect
+
         data object NavigateToOnboardingStart : OnboardingSideEffect
+
         data object NavigateToOnboarding : OnboardingSideEffect
+
         data object NavigateToOnboardingEnd : OnboardingSideEffect
+
         data object NavigateToSubject : OnboardingSideEffect
     }
 }