[리팩토링] 과제 리팩토링 - 아키텍처 + 힐트 적용

app/build.gradle

@@ -2,6 +2,8 @@ plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
     id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.0'
+    id 'kotlin-kapt'
+    id 'dagger.hilt.android.plugin'
 }
 
 Properties properties = new Properties()
@@ -82,4 +84,11 @@ dependencies {
     // define any required OkHttp artifacts without version
     implementation("com.squareup.okhttp3:okhttp")
     implementation("com.squareup.okhttp3:logging-interceptor")
+
+    // hilt
+    implementation 'com.google.dagger:hilt-android:2.51'
+    kapt 'com.google.dagger:hilt-compiler:2.51.1'
+    implementation 'androidx.hilt:hilt-navigation-compose:1.2.0'
+
+    implementation("io.coil-kt:coil-compose:2.4.0")
 }

app/src/main/AndroidManifest.xml

@@ -3,8 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
-
     <application
+        android:name=".NowSoptApplication"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -16,7 +16,12 @@
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
         <activity
-            android:name=".LoginActivity"
+            android:name=".presentation.ui.login.LoginActivity"
+            android:exported="false"
+            android:label="@string/app_name"
+            android:theme="@style/Theme.NOWSOPTAndroid"></activity>
+        <activity
+            android:name=".presentation.ui.MainActivity"
             android:exported="true"
             android:label="@string/app_name"
             android:theme="@style/Theme.NOWSOPTAndroid">
@@ -27,12 +32,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".MainActivity"
-            android:exported="false"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.NOWSOPTAndroid"></activity>
-        <activity
-            android:name=".SignupActivity"
+            android:name=".presentation.ui.signup.SignupActivity"
             android:exported="false"
             android:label="@string/app_name"
             android:theme="@style/Theme.NOWSOPTAndroid"></activity>

app/src/main/java/com/sopt/now/compose/NowSoptApplication.kt

@@ -0,0 +1,11 @@
+package com.sopt.now.compose
+
+import android.app.Application
+import dagger.hilt.android.HiltAndroidApp
+
+@HiltAndroidApp
+class NowSoptApplication: Application() {
+    override fun onCreate() {
+        super.onCreate()
+    }
+}

app/src/main/java/com/sopt/now/compose/data/ApiFactory.kt

@@ -3,6 +3,8 @@ package com.sopt.now.compose.data
 import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
 import com.sopt.now.compose.BuildConfig.AUTH_BASE_URL
 import com.sopt.now.compose.BuildConfig.USER_API_URL
+import com.sopt.now.compose.data.service.AuthService
+import com.sopt.now.compose.data.service.FriendService
 import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
 import retrofit2.Retrofit
@@ -19,5 +21,5 @@ object ApiFactory {
 
 object ServicePool {
     val authService = ApiFactory.create<AuthService, String>(AUTH_BASE_URL)
-    val userService = ApiFactory.create<AuthService, String>(USER_API_URL)
+    val friendService = ApiFactory.create<FriendService, String>(USER_API_URL)
 }

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

@@ -0,0 +1,14 @@
+package com.sopt.now.compose.data.datasource
+
+import com.sopt.now.compose.data.model.request.RequestLoginDto
+import com.sopt.now.compose.data.model.request.RequestSignupDto
+import com.sopt.now.compose.data.model.response.ResponseUserInfoDto
+import com.sopt.now.compose.util.BaseResponse
+
+interface AuthRemoteDataSource {
+    suspend fun signup(requestSignupDto: RequestSignupDto): BaseResponse<Unit>
+
+    suspend fun login(requestLoginDto: RequestLoginDto): String?
+
+    suspend fun getUserInfo(memberId: String): BaseResponse<ResponseUserInfoDto>
+}

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

@@ -0,0 +1,7 @@
+package com.sopt.now.compose.data.datasource
+
+import com.sopt.now.compose.data.model.response.ResponseFriendsDto
+
+interface FriendRemoteDataSource {
+    suspend fun getFriendsList(page: Int): ResponseFriendsDto
+}

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

@@ -0,0 +1,25 @@
+package com.sopt.now.compose.data.datasourceImpl
+
+import com.sopt.now.compose.data.ServicePool
+import com.sopt.now.compose.data.datasource.AuthRemoteDataSource
+import com.sopt.now.compose.data.model.request.RequestLoginDto
+import com.sopt.now.compose.data.model.request.RequestSignupDto
+import com.sopt.now.compose.data.model.response.ResponseUserInfoDto
+import com.sopt.now.compose.util.BaseResponse
+
+class AuthRemoteDatasourceImpl : AuthRemoteDataSource {
+    private val authService = ServicePool.authService
+
+    override suspend fun signup(requestSignupDto: RequestSignupDto): BaseResponse<Unit> =
+        authService.signup(requestSignupDto)
+
+    override suspend fun login(requestLoginDto: RequestLoginDto): String? =
+        authService.login(requestLoginDto).headers()[LOCATION]
+
+    override suspend fun getUserInfo(memberId: String): BaseResponse<ResponseUserInfoDto> =
+        authService.getUserInfo(memberId = memberId)
+
+    companion object {
+        const val LOCATION = "location"
+    }
+}

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

@@ -0,0 +1,13 @@
+package com.sopt.now.compose.data.datasourceImpl
+
+import com.sopt.now.compose.data.datasource.FriendRemoteDataSource
+import com.sopt.now.compose.data.model.response.ResponseFriendsDto
+import com.sopt.now.compose.data.service.FriendService
+import javax.inject.Inject
+
+class FriendRemoteDatasourceImpl @Inject constructor(
+    private val friendService: FriendService
+) : FriendRemoteDataSource {
+    override suspend fun getFriendsList(page: Int): ResponseFriendsDto =
+        friendService.getFriendsList(page = page)
+}

app/src/main/java/com/sopt/now/compose/data/DTO/request/RequestLoginDto.kt → app/src/main/java/com/sopt/now/compose/data/model/request/RequestLoginDto.kt

@@ -1,4 +1,4 @@
-package com.sopt.now.compose.data.DTO.request
+package com.sopt.now.compose.data.model.request
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/com/sopt/now/compose/data/DTO/request/RequestSignupDto.kt → app/src/main/java/com/sopt/now/compose/data/model/request/RequestSignupDto.kt

@@ -1,4 +1,4 @@
-package com.sopt.now.compose.data.DTO.request
+package com.sopt.now.compose.data.model.request
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable