Skip to content

Commit

Permalink
[chore] #72 ktlint 체크
Browse files Browse the repository at this point in the history
  • Loading branch information
@HAJIEUN02
HAJIEUN02 committed Jan 24, 2025
1 parent 8a81351 commit 83adc60
Show file tree
Hide file tree
Showing 21 changed files with 775 additions and 769 deletions.
207 changes: 105 additions & 102 deletions app/src/main/java/org/android/bbangzip/data/repositoryImpl/local/UserLocalRepositoryImpl.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,130 +10,133 @@ import timber.log.Timber
import javax.inject.Inject

class UserLocalRepositoryImpl
@Inject
constructor(
private val userDataSource: UserLocalDataSource,
) : UserLocalRepository {
override val userPreferenceFlow: Flow<UserPreferences> = userDataSource.userPreferencesFlow

override suspend fun setAccessToken(accessToken: String) {
userDataSource.updateUserPreferences { userData ->
userData
.toBuilder()
.setAccessToken(accessToken)
.build()
}
}

override suspend fun clearAccessToken() {
userDataSource.updateUserPreferences { userData ->
val cleared =
@Inject
constructor(
private val userDataSource: UserLocalDataSource,
) : UserLocalRepository {
override val userPreferenceFlow: Flow<UserPreferences> = userDataSource.userPreferencesFlow

override suspend fun setAccessToken(accessToken: String) {
userDataSource.updateUserPreferences { userData ->
userData
.toBuilder()
.clearAccessToken()
.setAccessToken(accessToken)
.build()
Timber.d("[데이터스토어] -> $cleared")

cleared
}
}
}

override suspend fun setRefreshToken(refreshToken: String) {
userDataSource.updateUserPreferences { userData ->
userData
.toBuilder()
.setRefreshToken(refreshToken)
.build()
override suspend fun clearAccessToken() {
userDataSource.updateUserPreferences { userData ->
val cleared =
userData
.toBuilder()
.clearAccessToken()
.build()
Timber.d("[데이터스토어] -> $cleared")

cleared
}
}
}

override suspend fun clearRefreshToken() {
userDataSource.updateUserPreferences { userData ->
userData
.toBuilder()
.clearRefreshToken()
.build()
override suspend fun setRefreshToken(refreshToken: String) {
userDataSource.updateUserPreferences { userData ->
userData
.toBuilder()
.setRefreshToken(refreshToken)
.build()
}
}
}

override suspend fun setIsLogin(isLogin: Boolean) {
userDataSource.updateUserPreferences { userData ->
userData
.toBuilder()
.setIsLogin(isLogin)
.build()
override suspend fun clearRefreshToken() {
userDataSource.updateUserPreferences { userData ->
userData
.toBuilder()
.clearRefreshToken()
.build()
}
}
}

override suspend fun setIsOnboardingCompleted(isOnboardingCompleted: Boolean) {
userDataSource.updateUserPreferences { userData ->
userData
.toBuilder()
.setIsOnboardingCompleted(isOnboardingCompleted)
.build()
override suspend fun setIsLogin(isLogin: Boolean) {
userDataSource.updateUserPreferences { userData ->
userData
.toBuilder()
.setIsLogin(isLogin)
.build()
}
}
}

override suspend fun setOnboardingInfo(
userName: String,
year: Int,
semester: String,
subject: String,
) {
userDataSource.updateUserPreferences { userData ->
val onboardingInfo =
OnboardingInfo.newBuilder()
.setUserName(userName)
.setYear(year)
.setSemester(semester)
.setSubjectName(subject)
override suspend fun setIsOnboardingCompleted(isOnboardingCompleted: Boolean) {
userDataSource.updateUserPreferences { userData ->
userData
.toBuilder()
.setIsOnboardingCompleted(isOnboardingCompleted)
.build()

userData
.toBuilder()
.setOnboardingInfo(onboardingInfo)
.build()
}
}
}

override suspend fun clearOnboardingInfo() {
userDataSource.updateUserPreferences { userData ->
userData
.toBuilder()
.clearOnboardingInfo()
.build()
}
}
override suspend fun setOnboardingInfo(
userName: String,
year: Int,
semester: String,
subject: String,
) {
userDataSource.updateUserPreferences { userData ->
val onboardingInfo =
OnboardingInfo.newBuilder()
.setUserName(userName)
.setYear(year)
.setSemester(semester)
.setSubjectName(subject)
.build()

override suspend fun setIsBadgeAvailable(isBadgeAvailable: Boolean) {
userDataSource.updateUserPreferences { userData ->
userData.toBuilder()
.setIsBadgeAvailable(isBadgeAvailable)
.build()
userData
.toBuilder()
.setOnboardingInfo(onboardingInfo)
.build()
}
}
}

override suspend fun setIsOnOnboardingDone(isOnboardingDone: Boolean) {
userDataSource.updateUserPreferences { userData ->
userData.toBuilder()
.setIsOnboardingDone(isOnboardingDone)
.build()
override suspend fun clearOnboardingInfo() {
userDataSource.updateUserPreferences { userData ->
userData
.toBuilder()
.clearOnboardingInfo()
.build()
}
}
}

override suspend fun setBadgeInfo(badgeName: String, badgeImage: String, hashTags: List<String>) {
userDataSource.updateUserPreferences { userData ->
val badgeInfo = BadgeInfo.newBuilder()
.setBadgeName(badgeName)
.setBadgeImage(badgeImage)
.addAllHashTags(hashTags)
.build()

userData.toBuilder()
.addBadges(badgeInfo)
.build()
override suspend fun setIsBadgeAvailable(isBadgeAvailable: Boolean) {
userDataSource.updateUserPreferences { userData ->
userData.toBuilder()
.setIsBadgeAvailable(isBadgeAvailable)
.build()
}
}

override suspend fun setIsOnOnboardingDone(isOnboardingDone: Boolean) {
userDataSource.updateUserPreferences { userData ->
userData.toBuilder()
.setIsOnboardingDone(isOnboardingDone)
.build()
}
}

override suspend fun setBadgeInfo(
badgeName: String,
badgeImage: String,
hashTags: List<String>,
) {
userDataSource.updateUserPreferences { userData ->
val badgeInfo =
BadgeInfo.newBuilder()
.setBadgeName(badgeName)
.setBadgeImage(badgeImage)
.addAllHashTags(hashTags)
.build()

userData.toBuilder()
.addBadges(badgeInfo)
.build()
}
}
}
}
11 changes: 6 additions & 5 deletions app/src/main/java/org/android/bbangzip/domain/model/BadgeCardListEntity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ data class BadgeCardEntity(
val badgeName: String,
val hashTags: List<String>,
) {
fun toBadge() = Badge(
badgeName = badgeName,
badgeImg = badgeImage,
hashTags = hashTags
)
fun toBadge() =
Badge(
badgeName = badgeName,
badgeImg = badgeImage,
hashTags = hashTags,
)
}
3 changes: 1 addition & 2 deletions app/src/main/java/org/android/bbangzip/domain/repository/local/UserLocalRepository.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package org.android.bbangzip.domain.repository.local

import kotlinx.coroutines.flow.Flow
import org.android.bbangzip.UserPreferences
import org.android.bbangzip.presentation.model.Badge

interface UserLocalRepository {
val userPreferenceFlow: Flow<UserPreferences>
Expand Down Expand Up @@ -35,6 +34,6 @@ interface UserLocalRepository {
suspend fun setBadgeInfo(
badgeName: String,
badgeImage: String,
hashTags: List<String>
hashTags: List<String>,
)
}
7 changes: 4 additions & 3 deletions ...va/org/android/bbangzip/presentation/component/bottomsheet/BbangZipGetBadgeBottomSheet.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,10 @@ private fun BadgeDetailContent(
.crossfade(enable = true)
.build(),
contentDescription = null,
modifier = Modifier
.clip(shape = RoundedCornerShape(48.dp))
.align(Alignment.CenterHorizontally),
modifier =
Modifier
.clip(shape = RoundedCornerShape(48.dp))
.align(Alignment.CenterHorizontally),
)

Spacer(modifier = Modifier.height(8.dp))
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/android/bbangzip/presentation/ui/navigator/MainNavHost.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@ fun MainNavHost(

onboardingNavGraph(
navigateToOnboardingEnd = { navigator.navigateToOnboardingEnd() },
popBackStack = { navigator.popBackStackIfNotSubject() }
popBackStack = { navigator.popBackStackIfNotSubject() },
)

onboardingEndNavGraph(
navigateToSubject = { navigator.navigateToSubject() },
popBackStack = { navigator.popBackStackIfNotSubject() }
popBackStack = { navigator.popBackStackIfNotSubject() },
)

todoAddNavGraph(
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/android/bbangzip/presentation/ui/navigator/MainNavigator.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class MainNavigator(
inclusive = true
}
launchSingleTop = true
}
},
)
}

Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/org/android/bbangzip/presentation/ui/onboarding/OnboardingContract.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ class OnboardingContract {

data object OnClickBackBtn : OnboardingEvent

data object OnClickBackFromEndBtn : OnboardingEvent

data object OnClickNextBtn : OnboardingEvent

data object OnClickOnboardingNextBtn : OnboardingEvent
Expand Down
Loading

0 comments on commit 83adc60

Please sign in to comment.