[7주차/필수] Repository 활용_xml

app/build.gradle

@@ -3,6 +3,9 @@ plugins {
     id 'org.jetbrains.kotlin.android'
     id 'kotlin-parcelize'
     id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.0'
+    id 'com.google.dagger.hilt.android'
+    id 'kotlin-android'
+    id 'kotlin-kapt'
 }
 
 Properties properties = new Properties()
@@ -74,4 +77,7 @@ dependencies {
     implementation("com.squareup.okhttp3:logging-interceptor")
 
     implementation ("com.github.bumptech.glide:glide:4.16.0")
+
+    implementation 'com.google.dagger:hilt-android:2.51'
+    kapt 'com.google.dagger:hilt-compiler:2.51.1'
 }

app/src/main/AndroidManifest.xml

@@ -5,6 +5,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
+        android:name=".NowSopt"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -17,10 +18,10 @@
         android:windowSoftInputMode="adjustResize"
         tools:targetApi="31">
         <activity
-            android:name=".ui.changePwd.ChangePwdActivity"
+            android:name=".presentation.changePwd.ChangePwdActivity"
             android:exported="false" />
         <activity
-            android:name=".ui.login.LoginActivity"
+            android:name=".presentation.login.LoginActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -29,10 +30,10 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".ui.signUp.SignUpActivity"
+            android:name=".presentation.signUp.SignUpActivity"
             android:exported="false" />
         <activity
-            android:name=".ui.main.MainActivity"
+            android:name=".presentation.main.MainActivity"
             android:exported="false"></activity>
     </application>
 

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

@@ -0,0 +1,21 @@
+package com.sopt.now
+
+import android.app.Application
+import android.content.Context
+import androidx.appcompat.app.AppCompatDelegate
+import dagger.hilt.android.HiltAndroidApp
+
+@HiltAndroidApp
+class NowSopt : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        appContext = applicationContext
+
+        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
+    }
+
+    companion object {
+        lateinit var appContext: Context
+            private set
+    }
+}

app/src/main/java/com/sopt/now/data/datasource/AuthDataSource.kt

@@ -0,0 +1,14 @@
+package com.sopt.now.data.datasource
+
+import com.sopt.now.data.dto.request.RequestLoginDto
+import com.sopt.now.data.dto.request.RequestSignUpDto
+import com.sopt.now.data.dto.response.ResponseLoginDto
+import com.sopt.now.data.dto.response.ResponseSignUpDto
+import retrofit2.Response
+import javax.inject.Singleton
+
+@Singleton
+interface AuthDataSource {
+    suspend fun signUp(request: RequestSignUpDto): Response<ResponseSignUpDto>
+    suspend fun login(request: RequestLoginDto): Response<ResponseLoginDto>
+}

app/src/main/java/com/sopt/now/data/datasource/FriendDataSource.kt

@@ -0,0 +1,10 @@
+package com.sopt.now.data.datasource
+
+import com.sopt.now.data.dto.response.ResponseFriendsDto
+import retrofit2.Response
+import javax.inject.Singleton
+
+@Singleton
+interface FriendDataSource {
+    suspend fun getFriends(page: Int): Response<ResponseFriendsDto>
+}

app/src/main/java/com/sopt/now/data/datasource/UserDataSource.kt

@@ -0,0 +1,13 @@
+package com.sopt.now.data.datasource
+
+import com.sopt.now.data.dto.request.RequestChangePwdDto
+import com.sopt.now.data.dto.response.ResponseChangePwdDto
+import com.sopt.now.data.dto.response.ResponseUserInfoDto
+import retrofit2.Response
+import javax.inject.Singleton
+
+@Singleton
+interface UserDataSource {
+    suspend fun getUserInfo(userId: Int): Response<ResponseUserInfoDto>
+    suspend fun changeUserPwd(userId: Int, pwd: RequestChangePwdDto): Response<ResponseChangePwdDto>
+}

app/src/main/java/com/sopt/now/data/datasourceImpl/AuthDataSourceImpl.kt

@@ -0,0 +1,24 @@
+package com.sopt.now.data.datasourceImpl
+
+import com.sopt.now.data.datasource.AuthDataSource
+import com.sopt.now.data.dto.request.RequestLoginDto
+import com.sopt.now.data.dto.request.RequestSignUpDto
+import com.sopt.now.data.dto.response.ResponseLoginDto
+import com.sopt.now.data.dto.response.ResponseSignUpDto
+import com.sopt.now.data.service.AuthService
+import retrofit2.Response
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AuthDataSourceImpl @Inject constructor(
+    private val authService: AuthService
+) : AuthDataSource {
+    override suspend fun signUp(request: RequestSignUpDto): Response<ResponseSignUpDto> {
+        return authService.signUp(request)
+    }
+
+    override suspend fun login(request: RequestLoginDto): Response<ResponseLoginDto> {
+        return authService.login(request)
+    }
+}

app/src/main/java/com/sopt/now/data/datasourceImpl/FriendDataSourceImpl.kt

@@ -0,0 +1,17 @@
+package com.sopt.now.data.datasourceImpl
+
+import com.sopt.now.data.datasource.FriendDataSource
+import com.sopt.now.data.dto.response.ResponseFriendsDto
+import com.sopt.now.data.service.FriendService
+import retrofit2.Response
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class FriendDataSourceImpl @Inject constructor(
+    private val friendService: FriendService
+) : FriendDataSource {
+    override suspend fun getFriends(page: Int): Response<ResponseFriendsDto> {
+        return friendService.getFriends(page)
+    }
+}

app/src/main/java/com/sopt/now/data/datasourceImpl/UserDataSourceImpl.kt

@@ -0,0 +1,26 @@
+package com.sopt.now.data.datasourceImpl
+
+import com.sopt.now.data.datasource.UserDataSource
+import com.sopt.now.data.dto.request.RequestChangePwdDto
+import com.sopt.now.data.dto.response.ResponseChangePwdDto
+import com.sopt.now.data.dto.response.ResponseUserInfoDto
+import com.sopt.now.data.service.UserService
+import retrofit2.Response
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class UserDataSourceImpl @Inject constructor(
+    private val userService: UserService
+) : UserDataSource {
+    override suspend fun getUserInfo(userId: Int): Response<ResponseUserInfoDto> {
+        return userService.getUserInfo(userId)
+    }
+
+    override suspend fun changeUserPwd(
+        userId: Int,
+        pwd: RequestChangePwdDto
+    ): Response<ResponseChangePwdDto> {
+        return userService.changeUserPwd(userId, pwd)
+    }
+}

app/src/main/java/com/sopt/now/data/di/DataModule.kt

@@ -0,0 +1,73 @@
+package com.sopt.now.data.di
+
+import com.sopt.now.data.datasource.AuthDataSource
+import com.sopt.now.data.datasource.FriendDataSource
+import com.sopt.now.data.datasource.UserDataSource
+import com.sopt.now.data.datasourceImpl.AuthDataSourceImpl
+import com.sopt.now.data.datasourceImpl.FriendDataSourceImpl
+import com.sopt.now.data.datasourceImpl.UserDataSourceImpl
+import com.sopt.now.data.repositoryImpl.AuthRepositoryImpl
+import com.sopt.now.data.repositoryImpl.FriendRepositoryImpl
+import com.sopt.now.data.repositoryImpl.UserRepositoryImpl
+import com.sopt.now.data.service.AuthService
+import com.sopt.now.data.service.FriendService
+import com.sopt.now.data.service.UserService
+import com.sopt.now.domain.repository.AuthRepository
+import com.sopt.now.domain.repository.FriendRepository
+import com.sopt.now.domain.repository.UserRepository
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object DataModule {
+    @Singleton
+    @Provides
+    fun provideAuthDataSource(
+        authService: AuthService
+    ): AuthDataSource {
+        return AuthDataSourceImpl(authService)
+    }
+
+    @Singleton
+    @Provides
+    fun provideAuthRepository(
+        authDataSource: AuthDataSource
+    ): AuthRepository {
+        return AuthRepositoryImpl(authDataSource)
+    }
+    @Singleton
+    @Provides
+    fun provideUserDataSource(
+        userService: UserService
+    ): UserDataSource {
+        return UserDataSourceImpl(userService)
+    }
+
+    @Singleton
+    @Provides
+    fun provideUserRepository(
+        userDataSource: UserDataSource
+    ): UserRepository {
+        return UserRepositoryImpl(userDataSource)
+    }
+
+    @Singleton
+    @Provides
+    fun provideFriendDataSource(
+        friendService: FriendService
+    ): FriendDataSource {
+        return FriendDataSourceImpl(friendService)
+    }
+
+    @Singleton
+    @Provides
+    fun provideFriendRepository(
+        friendDataSource: FriendDataSource
+    ): FriendRepository {
+        return FriendRepositoryImpl(friendDataSource)
+    }
+}

app/src/main/java/com/sopt/now/data/di/NetworkModule.kt

@@ -0,0 +1,67 @@
+package com.sopt.now.data.di
+
+import android.util.Log
+import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
+import com.sopt.now.BuildConfig.AUTH_BASE_URL
+import com.sopt.now.BuildConfig.FRIEND_BASE_URL
+import com.sopt.now.data.service.AuthService
+import com.sopt.now.data.service.FriendService
+import com.sopt.now.data.service.UserService
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import kotlinx.serialization.json.Json
+import okhttp3.Interceptor
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
+import retrofit2.Retrofit
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object NetworkModule {
+    private const val CONTENT_TYPE = "application/json"
+    private val json: Json = Json {
+        ignoreUnknownKeys = true
+    }
+
+    private fun getLogOkHttpClient(): Interceptor {
+        val loggingInterceptor = HttpLoggingInterceptor { message ->
+            Log.d("OkHttp", message)
+        }
+        loggingInterceptor.level = HttpLoggingInterceptor.Level.BODY
+        return loggingInterceptor
+    }
+
+    private val okHttpClient = OkHttpClient.Builder()
+        .addInterceptor(getLogOkHttpClient())
+        .build()
+
+    @Singleton
+    @Provides
+    fun provideRetrofit(): Retrofit.Builder {
+        return Retrofit.Builder()
+            .addConverterFactory(json.asConverterFactory(CONTENT_TYPE.toMediaType()))
+            .client(okHttpClient)
+    }
+
+    @Singleton
+    @Provides
+    fun provideAuthService(retrofit: Retrofit.Builder): AuthService {
+        return retrofit.baseUrl(AUTH_BASE_URL).build().create(AuthService::class.java)
+    }
+
+    @Singleton
+    @Provides
+    fun provideUserService(retrofit: Retrofit.Builder): UserService {
+        return retrofit.baseUrl(AUTH_BASE_URL).build().create(UserService::class.java)
+    }
+
+    @Singleton
+    @Provides
+    fun provideFriendService(retrofit: Retrofit.Builder): FriendService {
+        return retrofit.baseUrl(FRIEND_BASE_URL).build().create(FriendService::class.java)
+    }
+}

app/src/main/java/com/sopt/now/remote/request/RequestChangePwdDto.kt → app/src/main/java/com/sopt/now/data/dto/request/RequestChangePwdDto.kt

@@ -1,4 +1,4 @@
-package com.sopt.now.remote.request
+package com.sopt.now.data.dto.request
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/com/sopt/now/remote/request/RequestLoginDto.kt → app/src/main/java/com/sopt/now/data/dto/request/RequestLoginDto.kt

@@ -1,4 +1,4 @@
-package com.sopt.now.remote.request
+package com.sopt.now.data.dto.request
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/com/sopt/now/remote/request/RequestSignUpDto.kt → app/src/main/java/com/sopt/now/data/dto/request/RequestSignUpDto.kt

@@ -1,4 +1,4 @@
-package com.sopt.now.remote.request
+package com.sopt.now.data.dto.request
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/com/sopt/now/remote/response/ResponseChangePwdDto.kt → app/src/main/java/com/sopt/now/data/dto/response/ResponseChangePwdDto.kt

@@ -1,4 +1,4 @@
-package com.sopt.now.remote.response
+package com.sopt.now.data.dto.response
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/com/sopt/now/remote/response/ResponseFriendsDto.kt → app/src/main/java/com/sopt/now/data/dto/response/ResponseFriendsDto.kt

@@ -1,5 +1,6 @@
-package com.sopt.now.remote.response
+package com.sopt.now.data.dto.response
 
+import com.sopt.now.domain.entity.FriendEntity
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -14,24 +15,10 @@ data class ResponseFriendsDto(
     @SerialName("total_pages")
     val totalPages: Int,
     @SerialName("data")
-    val `data`: List<Data>,
+    val `data`: List<FriendEntity>,
     @SerialName("support")
     val support: Support
 ) {
-    @Serializable
-    data class Data(
-        @SerialName("id")
-        val id: Int,
-        @SerialName("email")
-        val email: String,
-        @SerialName("first_name")
-        val firstName: String,
-        @SerialName("last_name")
-        val lastName: String,
-        @SerialName("avatar")
-        val avatar: String
-    )
-
     @Serializable
     data class Support(
         @SerialName("url")

app/src/main/java/com/sopt/now/remote/response/ResponseLoginDto.kt → app/src/main/java/com/sopt/now/data/dto/response/ResponseLoginDto.kt

@@ -1,4 +1,4 @@
-package com.sopt.now.remote.response
+package com.sopt.now.data.dto.response
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable