Feat/week xml07

app/build.gradle

@@ -4,6 +4,7 @@ plugins {
     id 'kotlin-parcelize'
     id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.0' // build.gradle project에서 확인 가능
     id 'kotlin-kapt'
+    id 'com.google.dagger.hilt.android'
 }
 
 // plugin{}과 andriod{} 사이
@@ -43,6 +44,9 @@ android {
         viewBinding true
         buildConfig true // build 할 때 buildConfig 파일이 만들어짐 -> 망치 이미지(build) 누르기!!
     }
+    kapt {
+        correctErrorTypes true
+    }
 }
 
 dependencies {
@@ -75,14 +79,13 @@ dependencies {
     implementation("com.squareup.okhttp3:okhttp")
     implementation("com.squareup.okhttp3:logging-interceptor")
 
-    // dagger hilt
-    implementation "com.google.dagger:hilt-android:2.48.1"
-    kapt "com.google.dagger:hilt-compiler:2.48.1"
-
     // viewmodel_ktx
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"
 
     // coroutine
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9'
 
+    // dagger hilt
+    implementation "com.google.dagger:hilt-android:2.51"
+    kapt "com.google.dagger:hilt-compiler:2.51"
 }

app/src/main/java/com/sopt/now/ApplicationClass.kt

@@ -3,7 +3,9 @@ package com.sopt.now
 import android.app.Application
 import com.sopt.now.ApplicationClass.SharedPreferences.editor
 import com.sopt.now.ApplicationClass.SharedPreferences.sSharedPreferences
+import dagger.hilt.android.HiltAndroidApp
 
+@HiltAndroidApp
 class ApplicationClass: Application() {
     object SharedPreferences {
         lateinit var sSharedPreferences: android.content.SharedPreferences

app/src/main/java/com/sopt/now/data/AuthRepositoryImpl.kt

@@ -0,0 +1,20 @@
+package com.sopt.now.data
+
+import com.sopt.now.datasource.AuthService
+import com.sopt.now.model.login.RequestLoginDto
+import com.sopt.now.model.signup.RequestSignUpDto
+import com.sopt.now.repository.AuthRepository
+import com.sopt.now.utils.BaseResponse
+import retrofit2.Response
+
+class AuthRepositoryImpl(
+    private val authService: AuthService
+): AuthRepository {
+    override suspend fun loginUser(data: RequestLoginDto): Response<BaseResponse<Unit>> {
+        return authService.login(data)
+    }
+
+    override suspend fun signupUser(data: RequestSignUpDto): Response<BaseResponse<Unit>> {
+        return authService.signUp(data)
+    }
+}

app/src/main/java/com/sopt/now/data/MyPageRepositoryImpl.kt

@@ -0,0 +1,16 @@
+package com.sopt.now.data
+
+import com.sopt.now.datasource.InfoService
+import com.sopt.now.model.info.UserInfo
+import com.sopt.now.repository.MyPageRepository
+import com.sopt.now.utils.BaseResponse
+import retrofit2.Response
+
+class MyPageRepositoryImpl(
+    private val infoService: InfoService
+) : MyPageRepository {
+    override suspend fun getUserInfo(): Response<BaseResponse<UserInfo>> {
+        return infoService.getUserInfo()
+    }
+
+}

app/src/main/java/com/sopt/now/presentation/auth/login/LoginActivity.kt

@@ -2,7 +2,6 @@ package com.sopt.now.presentation.auth.login
 
 import android.content.Intent
 import android.os.Bundle
-import android.util.Log
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.flowWithLifecycle
@@ -15,12 +14,14 @@ import com.sopt.now.presentation.main.MainActivity
 import com.sopt.now.utils.Constants.Companion.MEMBER_ID
 import com.sopt.now.utils.UiState
 import com.sopt.now.utils.showToast
+import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 
+@AndroidEntryPoint
 class LoginActivity : AppCompatActivity() {
     private lateinit var binding: ActivityLoginBinding
-    private val loginViewModel by viewModels<LoginViewModel>()
+    private val loginViewModel: LoginViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

app/src/main/java/com/sopt/now/presentation/auth/login/LoginViewModel.kt

@@ -1,30 +1,33 @@
 package com.sopt.now.presentation.auth.login
 
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.sopt.now.ApplicationClass.SharedPreferences.editor
 import com.sopt.now.model.login.RequestLoginDto
+import com.sopt.now.repository.AuthRepository
 import com.sopt.now.utils.Constants.Companion.MEMBER_ID
 import com.sopt.now.utils.NetworkUtil
-import com.sopt.now.utils.ServicePool.loginService
 import com.sopt.now.utils.UiState
+import dagger.hilt.android.HiltAndroidApp
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
+import javax.inject.Inject
 
-class LoginViewModel : ViewModel() {
+@HiltViewModel
+class LoginViewModel @Inject constructor(
+    private val authRepository: AuthRepository
+) : ViewModel() {
     private val _state = MutableStateFlow<UiState<Unit>>(UiState.LOADING)
     val state get() = _state.asStateFlow()
 
     fun postLogin(data: RequestLoginDto) {
         viewModelScope.launch(Dispatchers.IO) {
             _state.value = UiState.LOADING
             runCatching {
-                loginService.login(data)
+                authRepository.loginUser(data)
             }.onSuccess {
                 if (it.isSuccessful) {
                     editor.putString(MEMBER_ID, it.headers()["location"])
@@ -33,12 +36,14 @@ class LoginViewModel : ViewModel() {
                     _state.value = UiState.SUCCESS(null)
                 } else {
                     _state.value = UiState.FAILURE(
-                        it.errorBody()?.let { e -> NetworkUtil.getErrorResponse(e)?.message }.toString()
+                        it.errorBody()?.let { e -> NetworkUtil.getErrorResponse(e)?.message }
+                            .toString()
                     )
                 }
             }.onFailure {
                 it.printStackTrace()
             }
+
         }
     }
 }

app/src/main/java/com/sopt/now/presentation/auth/signup/SignUpViewModel.kt

@@ -1,28 +1,30 @@
 package com.sopt.now.presentation.auth.signup
 
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.sopt.now.model.signup.RequestSignUpDto
+import com.sopt.now.repository.AuthRepository
 import com.sopt.now.utils.NetworkUtil
-import com.sopt.now.utils.ServicePool.authService
 import com.sopt.now.utils.UiState
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
+import javax.inject.Inject
 
-class SignUpViewModel : ViewModel() {
+@HiltViewModel
+class SignUpViewModel @Inject constructor(
+    private val authRepository: AuthRepository
+) : ViewModel() {
     private val _state = MutableStateFlow<UiState<Unit>>(UiState.LOADING)
-    val state = _state.asStateFlow()
+    val state get() = _state.asStateFlow()
 
     fun signUp(data: RequestSignUpDto) {
         viewModelScope.launch(Dispatchers.IO) {
             _state.value = UiState.LOADING
             runCatching {
-                authService.signUp(data)
+                authRepository.signupUser(data)
             }.onSuccess {
                 if (it.isSuccessful) _state.value = UiState.SUCCESS(null)
                 else {

app/src/main/java/com/sopt/now/presentation/auth/signup/SignupActivity.kt

@@ -10,12 +10,14 @@ import com.sopt.now.databinding.ActivitySignupBinding
 import com.sopt.now.model.signup.RequestSignUpDto
 import com.sopt.now.utils.UiState
 import com.sopt.now.utils.showToast
+import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 
+@AndroidEntryPoint
 class SignupActivity : AppCompatActivity() {
     private lateinit var binding: ActivitySignupBinding
-    private val signUpViewModel by viewModels<SignUpViewModel>()
+    private val signUpViewModel: SignUpViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

app/src/main/java/com/sopt/now/presentation/main/MainActivity.kt

@@ -8,8 +8,9 @@ import com.sopt.now.databinding.ActivityMainBinding
 import com.sopt.now.presentation.main.home.HomeFragment
 import com.sopt.now.presentation.main.mypage.MyPageFragment
 import com.sopt.now.presentation.main.search.SearchFragment
+import dagger.hilt.android.AndroidEntryPoint
 
-
+@AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
     private lateinit var binding: ActivityMainBinding
 

app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt

@@ -12,13 +12,15 @@ import com.sopt.now.databinding.FragmentMypageBinding
 import com.sopt.now.model.info.UserInfo
 import com.sopt.now.utils.UiState
 import com.sopt.now.utils.showToast
+import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 
+@AndroidEntryPoint
 class MyPageFragment : Fragment() {
     private var _binding: FragmentMypageBinding? = null
     private val binding get() = requireNotNull(_binding)
-    private val myPageViewModel by viewModels<MyPageViewModel>()
+    private val myPageViewModel: MyPageViewModel by viewModels()
 
     override fun onCreateView(
         inflater: LayoutInflater,

app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageViewModel.kt

@@ -1,28 +1,30 @@
 package com.sopt.now.presentation.main.mypage
 
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.sopt.now.model.info.UserInfo
+import com.sopt.now.repository.MyPageRepository
 import com.sopt.now.utils.NetworkUtil
-import com.sopt.now.utils.ServicePool.infoService
 import com.sopt.now.utils.UiState
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
+import javax.inject.Inject
 
-class MyPageViewModel : ViewModel() {
+@HiltViewModel
+class MyPageViewModel @Inject constructor(
+    private val myPageRepository: MyPageRepository
+) : ViewModel() {
     private val _state = MutableStateFlow<UiState<UserInfo>>(UiState.LOADING)
     val state get() = _state.asStateFlow()
 
     fun getUserInfo() {
         _state.value = UiState.LOADING
         viewModelScope.launch(Dispatchers.IO) {
             runCatching {
-                infoService.getUserInfo()
+                myPageRepository.getUserInfo()
             }.onSuccess {
                 if (it.isSuccessful) {
                     _state.value = UiState.SUCCESS(

app/src/main/java/com/sopt/now/repository/AuthRepository.kt

@@ -0,0 +1,12 @@
+package com.sopt.now.repository
+
+import com.sopt.now.model.login.RequestLoginDto
+import com.sopt.now.model.signup.RequestSignUpDto
+import com.sopt.now.utils.BaseResponse
+import retrofit2.Response
+
+interface AuthRepository {
+    suspend fun loginUser(data: RequestLoginDto): Response<BaseResponse<Unit>>
+
+    suspend fun signupUser(data: RequestSignUpDto): Response<BaseResponse<Unit>>
+}

app/src/main/java/com/sopt/now/repository/MyPageRepository.kt

@@ -0,0 +1,9 @@
+package com.sopt.now.repository
+
+import com.sopt.now.model.info.UserInfo
+import com.sopt.now.utils.BaseResponse
+import retrofit2.Response
+
+interface MyPageRepository {
+    suspend fun getUserInfo(): Response<BaseResponse<UserInfo>>
+}

app/src/main/java/com/sopt/now/utils/ApiFactory.kt

@@ -5,13 +5,19 @@ import com.sopt.now.BuildConfig
 import com.sopt.now.datasource.AuthService
 import com.sopt.now.datasource.InfoService
 import com.sopt.now.utils.ApiFactory.create
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
 import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import java.util.concurrent.TimeUnit
 
+@Module
+@InstallIn(SingletonComponent::class)
 object ApiFactory {
     private const val BASE_URL: String = BuildConfig.AUTH_BASE_URL
 
@@ -30,12 +36,16 @@ object ApiFactory {
             .build()
     }
 
+    @Provides
+    fun provideAuthService(): AuthService {
+        return retrofit.create(AuthService::class.java)
+    }
+
+    @Provides
+    fun provideInfoService(): InfoService {
+        return retrofit.create(InfoService::class.java)
+    }
+
     inline fun <reified T> create(): T =
         retrofit.create(T::class.java) // create를 통해서 retrofit 구현체 생성
 }
-
-object ServicePool {
-    val authService: AuthService by lazy { create<AuthService>() }
-    val loginService: AuthService by lazy { create<AuthService>() }
-    val infoService: InfoService by lazy { create<InfoService>() }
-}

app/src/main/java/com/sopt/now/utils/AuthModule.kt

@@ -0,0 +1,26 @@
+package com.sopt.now.utils
+
+import com.sopt.now.data.AuthRepositoryImpl
+import com.sopt.now.data.MyPageRepositoryImpl
+import com.sopt.now.datasource.AuthService
+import com.sopt.now.datasource.InfoService
+import com.sopt.now.repository.AuthRepository
+import com.sopt.now.repository.MyPageRepository
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+object AuthModule {
+    @Provides
+    fun provideAuthRepository(authService: AuthService): AuthRepository {
+        return AuthRepositoryImpl(authService)
+    }
+
+    @Provides
+    fun provideMyPageRepository(infoService: InfoService): MyPageRepository {
+        return MyPageRepositoryImpl(infoService)
+    }
+}

build.gradle

@@ -3,4 +3,5 @@ plugins {
     id 'com.android.application' version '8.3.1' apply false
     id 'com.android.library' version '8.3.1' apply false
     id 'org.jetbrains.kotlin.android' version '1.9.0' apply false
+    id 'com.google.dagger.hilt.android' version '2.51.1' apply false
 }