From 25ef40608b1202c77c757aad7216a184103df39c Mon Sep 17 00:00:00 2001 From: yangsooplus Date: Thu, 4 Jan 2024 02:26:01 +0900 Subject: [PATCH] =?UTF-8?q?chore:=20detekt=20=EC=88=98=EC=A0=95=EC=82=AC?= =?UTF-8?q?=ED=95=AD=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 2 +- data/src/main/java/com/susu/data/di/ServiceModule.kt | 4 ++-- .../main/java/com/susu/data/network/service/SignUpService.kt | 2 +- .../main/java/com/susu/data/network/service/TokenService.kt | 2 +- .../main/java/com/susu/data/network/service/UserService.kt | 2 +- .../java/com/susu/domain/usecase/CheckCanRegisterUseCase.kt | 2 +- domain/src/main/java/com/susu/domain/usecase/SignUpUseCase.kt | 4 ++-- .../src/main/java/com/susu/feature/loginsignup/VoteScreen.kt | 2 +- .../src/main/java/com/susu/feature/mypage/MyPageScreen.kt | 4 +--- .../com/susu/feature/mypage/navigation/MyPageNavigation.kt | 2 +- .../com/susu/feature/navigator/initialization/MainContract.kt | 2 +- 11 files changed, 13 insertions(+), 15 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b66e7b2c..05c612d7 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -38,5 +38,5 @@ dependencies { @Suppress fun getApiKey(propertyKey: String): String { - return gradleLocalProperties(rootDir).getProperty(propertyKey) + return gradleLocalProperties(rootDir).getProperty(propertyKey) ?: "default" } diff --git a/data/src/main/java/com/susu/data/di/ServiceModule.kt b/data/src/main/java/com/susu/data/di/ServiceModule.kt index eb343916..1cdb22a4 100644 --- a/data/src/main/java/com/susu/data/di/ServiceModule.kt +++ b/data/src/main/java/com/susu/data/di/ServiceModule.kt @@ -1,8 +1,8 @@ package com.susu.data.di -import com.susu.data.network.service.UserService -import com.susu.data.network.service.TokenService import com.susu.data.network.service.SignUpService +import com.susu.data.network.service.TokenService +import com.susu.data.network.service.UserService import dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/data/src/main/java/com/susu/data/network/service/SignUpService.kt b/data/src/main/java/com/susu/data/network/service/SignUpService.kt index 44c717fc..32f9a9ff 100644 --- a/data/src/main/java/com/susu/data/network/service/SignUpService.kt +++ b/data/src/main/java/com/susu/data/network/service/SignUpService.kt @@ -1,7 +1,7 @@ package com.susu.data.network.service -import com.susu.data.model.response.TokenResponse import com.susu.data.model.request.UserRequest +import com.susu.data.model.response.TokenResponse import com.susu.data.model.response.ValidRegisterResponse import retrofit2.http.Body import retrofit2.http.GET diff --git a/data/src/main/java/com/susu/data/network/service/TokenService.kt b/data/src/main/java/com/susu/data/network/service/TokenService.kt index b3ba04a8..3f8a3a35 100644 --- a/data/src/main/java/com/susu/data/network/service/TokenService.kt +++ b/data/src/main/java/com/susu/data/network/service/TokenService.kt @@ -1,7 +1,7 @@ package com.susu.data.network.service -import com.susu.data.model.response.TokenResponse import com.susu.data.model.request.RefreshTokenRequest +import com.susu.data.model.response.TokenResponse import retrofit2.Response import retrofit2.http.Body import retrofit2.http.POST diff --git a/data/src/main/java/com/susu/data/network/service/UserService.kt b/data/src/main/java/com/susu/data/network/service/UserService.kt index 7b147de2..87628a5e 100644 --- a/data/src/main/java/com/susu/data/network/service/UserService.kt +++ b/data/src/main/java/com/susu/data/network/service/UserService.kt @@ -1,7 +1,7 @@ package com.susu.data.network.service -import com.susu.data.model.response.TokenResponse import com.susu.data.model.request.AccessTokenRequest +import com.susu.data.model.response.TokenResponse import retrofit2.Response import retrofit2.http.Body import retrofit2.http.POST diff --git a/domain/src/main/java/com/susu/domain/usecase/CheckCanRegisterUseCase.kt b/domain/src/main/java/com/susu/domain/usecase/CheckCanRegisterUseCase.kt index 8f189a6d..51f6cdcb 100644 --- a/domain/src/main/java/com/susu/domain/usecase/CheckCanRegisterUseCase.kt +++ b/domain/src/main/java/com/susu/domain/usecase/CheckCanRegisterUseCase.kt @@ -5,7 +5,7 @@ import com.susu.domain.repository.SignUpRepository import javax.inject.Inject class CheckCanRegisterUseCase @Inject constructor( - private val signUpRepository: SignUpRepository + private val signUpRepository: SignUpRepository, ) { suspend operator fun invoke(oauthAccessToken: String) = runCatchingIgnoreCancelled { signUpRepository.canRegister(oauthAccessToken = oauthAccessToken) diff --git a/domain/src/main/java/com/susu/domain/usecase/SignUpUseCase.kt b/domain/src/main/java/com/susu/domain/usecase/SignUpUseCase.kt index 1507f990..64acbab2 100644 --- a/domain/src/main/java/com/susu/domain/usecase/SignUpUseCase.kt +++ b/domain/src/main/java/com/susu/domain/usecase/SignUpUseCase.kt @@ -12,10 +12,10 @@ class SignUpUseCase @Inject constructor( ) { suspend operator fun invoke( oauthAccessToken: String, - user: User + user: User, ) = runCatchingIgnoreCancelled { tokenRepository.saveTokens( - token = signUpRepository.signUp(oauthAccessToken = oauthAccessToken, user = user) + token = signUpRepository.signUp(oauthAccessToken = oauthAccessToken, user = user), ) } } diff --git a/feature/loginsignup/src/main/java/com/susu/feature/loginsignup/VoteScreen.kt b/feature/loginsignup/src/main/java/com/susu/feature/loginsignup/VoteScreen.kt index d0bed1d9..2efe9e74 100644 --- a/feature/loginsignup/src/main/java/com/susu/feature/loginsignup/VoteScreen.kt +++ b/feature/loginsignup/src/main/java/com/susu/feature/loginsignup/VoteScreen.kt @@ -6,7 +6,7 @@ import androidx.compose.runtime.Composable @Composable fun VoteScreen( - navigateToLogin: () -> Unit + navigateToLogin: () -> Unit, ) { Button(onClick = navigateToLogin) { Text("대충 회원가입 투표") diff --git a/feature/mypage/src/main/java/com/susu/feature/mypage/MyPageScreen.kt b/feature/mypage/src/main/java/com/susu/feature/mypage/MyPageScreen.kt index ca19fa4b..ffd7443a 100644 --- a/feature/mypage/src/main/java/com/susu/feature/mypage/MyPageScreen.kt +++ b/feature/mypage/src/main/java/com/susu/feature/mypage/MyPageScreen.kt @@ -2,12 +2,10 @@ package com.susu.feature.mypage import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues -import androidx.compose.foundation.layout.padding import androidx.compose.material3.Button import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect -import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel @@ -24,7 +22,7 @@ fun MyPageScreen( when (sideEffect) { MyPageContract.MyPageEffect.NavigateToLogin -> navigateToLogin() is MyPageContract.MyPageEffect.ShowToast -> { - //TODO: UI 작업 시 에러 메세지 표시 + // TODO: UI 작업 시 에러 메세지 표시 navigateToLogin() } } diff --git a/feature/mypage/src/main/java/com/susu/feature/mypage/navigation/MyPageNavigation.kt b/feature/mypage/src/main/java/com/susu/feature/mypage/navigation/MyPageNavigation.kt index 4767c9f7..cb28fa4b 100644 --- a/feature/mypage/src/main/java/com/susu/feature/mypage/navigation/MyPageNavigation.kt +++ b/feature/mypage/src/main/java/com/susu/feature/mypage/navigation/MyPageNavigation.kt @@ -13,7 +13,7 @@ fun NavController.navigateMyPage(navOptions: NavOptions) { fun NavGraphBuilder.myPageNavGraph( padding: PaddingValues, - navigateToLogin: () -> Unit + navigateToLogin: () -> Unit, ) { composable(route = MyPageRoute.route) { MyPageScreen(padding, navigateToLogin = navigateToLogin) diff --git a/feature/navigator/src/main/java/com/susu/feature/navigator/initialization/MainContract.kt b/feature/navigator/src/main/java/com/susu/feature/navigator/initialization/MainContract.kt index c21df4f3..8e7dd616 100644 --- a/feature/navigator/src/main/java/com/susu/feature/navigator/initialization/MainContract.kt +++ b/feature/navigator/src/main/java/com/susu/feature/navigator/initialization/MainContract.kt @@ -7,6 +7,6 @@ sealed interface MainContract { object MainEffect : SideEffect data class MainState( val isLoading: Boolean = true, - val initialRoute: InitialRoute = InitialRoute.NONE + val initialRoute: InitialRoute = InitialRoute.NONE, ) : UiState }