[Refactor] Clean Architecture 기반 패키지 구조로 변경 data/domain/presentation (#…

…240) * package: data/domain * package: presentation
EAT-SSU · Dec 15, 2024 · cecd09b · cecd09b
1 parent a8e9122
commit cecd09b
Show file tree

Hide file tree

Showing 139 changed files with 356 additions and 357 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -43,7 +43,7 @@
         tools:targetApi="31">
 
         <receiver
-            android:name=".util.NotificationReceiver"
+            android:name=".alarm.NotificationReceiver"
             android:enabled="true"
             android:exported="false">
             <intent-filter>
@@ -52,17 +52,17 @@
         </receiver>
 
         <activity
-            android:name=".ui.mypage.DeveloperActivity"
+            android:name=".presentation.mypage.DeveloperActivity"
             android:exported="false" />
         <activity
-            android:name=".ui.mypage.SignOutActivity"
+            android:name=".presentation.mypage.SignOutActivity"
             android:exported="false"
             android:windowSoftInputMode="adjustResize" />
         <activity
-            android:name=".ui.mypage.terms.WebViewActivity"
+            android:name=".presentation.mypage.terms.WebViewActivity"
             android:exported="false" />
         <activity
-            android:name=".ui.login.IntroActivity"
+            android:name=".presentation.login.IntroActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -71,31 +71,31 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".ui.review.write.ReviewWriteRateActivity"
+            android:name=".presentation.review.write.ReviewWriteRateActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".ui.review.write.menu.ReviewWriteMenuActivity"
+            android:name=".presentation.review.write.menu.ReviewWriteMenuActivity"
             android:exported="false" />
         <activity
-            android:name=".ui.login.LoginActivity"
+            android:name=".presentation.login.LoginActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".ui.common.AndroidMessageDialogActivity"
+            android:name=".presentation.common.AndroidMessageDialogActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".ui.common.ForceUpdateDialogActivity"
+            android:name=".presentation.common.ForceUpdateDialogActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
@@ -116,74 +116,74 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".base.BaseActivity"
+            android:name=".presentation.base.BaseActivity"
             android:exported="false">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".ui.mypage.usernamechange.UserNameChangeActivity"
+            android:name=".presentation.mypage.usernamechange.UserNameChangeActivity"
             android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".ui.mypage.myreview.MyReviewListActivity"
+            android:name=".presentation.mypage.myreview.MyReviewListActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".ui.review.list.ReviewActivity"
+            android:name=".presentation.review.list.ReviewActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".ui.mypage.MyPageActivity"
+            android:name=".presentation.mypage.MyPageActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
 
         <activity
-            android:name=".ui.main.MainActivity"
+            android:name=".presentation.main.MainActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".ui.review.report.OthersReviewDialogActivity"
+            android:name=".presentation.review.report.OthersReviewDialogActivity"
             android:exported="true"
             android:theme="@style/Theme.MyDialog">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".ui.review.delete.MyReviewDialogActivity"
+            android:name=".presentation.review.delete.MyReviewDialogActivity"
             android:exported="true"
             android:theme="@style/Theme.MyDialog">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".ui.review.report.ReportActivity"
+            android:name=".presentation.review.report.ReportActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".ui.review.modify.ModifyReviewActivity"
+            android:name=".presentation.review.modify.ModifyReviewActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"

diff --git a/...tssu/android/util/NotificationReceiver.kt → ...ssu/android/alarm/NotificationReceiver.kt b/...tssu/android/util/NotificationReceiver.kt → ...ssu/android/alarm/NotificationReceiver.kt
@@ -1,4 +1,4 @@
-package com.eatssu.android.util
+package com.eatssu.android.alarm
 
 import android.app.NotificationChannel
 import android.app.NotificationManager
@@ -10,7 +10,7 @@ import android.os.Build
 import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
 import com.eatssu.android.R
-import com.eatssu.android.ui.main.MainActivity
+import com.eatssu.android.presentation.main.MainActivity
 import java.time.DayOfWeek
 import java.time.LocalDateTime
 

diff --git a/...atssu/android/util/MySharedPreferences.kt → ...atssu/android/data/MySharedPreferences.kt b/...atssu/android/util/MySharedPreferences.kt → ...atssu/android/data/MySharedPreferences.kt
@@ -1,4 +1,4 @@
-package com.eatssu.android.util
+package com.eatssu.android.data
 
 
 import android.content.Context

diff --git a/...a/com/eatssu/android/util/RetrofitImpl.kt → ...a/com/eatssu/android/data/RetrofitImpl.kt b/...a/com/eatssu/android/util/RetrofitImpl.kt → ...a/com/eatssu/android/data/RetrofitImpl.kt
@@ -1,4 +1,4 @@
-package com.eatssu.android.util
+package com.eatssu.android.data
 
 import android.content.Context
 import android.content.Intent
@@ -10,10 +10,10 @@ import android.widget.Toast
 import com.eatssu.android.App
 import com.eatssu.android.BuildConfig
 import com.eatssu.android.BuildConfig.BASE_URL
-import com.eatssu.android.base.BaseResponse
+import com.eatssu.android.data.dto.response.BaseResponse
 import com.eatssu.android.data.dto.response.TokenResponse
 import com.eatssu.android.di.network.TokenInterceptor
-import com.eatssu.android.ui.login.LoginActivity
+import com.eatssu.android.presentation.login.LoginActivity
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import kotlinx.coroutines.runBlocking

diff --git a/...a/com/eatssu/android/base/BaseResponse.kt → ...android/data/dto/response/BaseResponse.kt b/...a/com/eatssu/android/base/BaseResponse.kt → ...android/data/dto/response/BaseResponse.kt
@@ -1,4 +1,4 @@
-package com.eatssu.android.base
+package com.eatssu.android.data.dto.response
 
 import com.google.gson.annotations.SerializedName
 

diff --git a/app/src/main/java/com/eatssu/android/data/dto/response/MealResponse.kt b/app/src/main/java/com/eatssu/android/data/dto/response/MealResponse.kt
@@ -1,6 +1,6 @@
 package com.eatssu.android.data.dto.response
 
-import com.eatssu.android.data.model.Menu
+import com.eatssu.android.domain.model.Menu
 import com.google.gson.annotations.SerializedName
 
 data class GetMealResponse(

diff --git a/app/src/main/java/com/eatssu/android/data/dto/response/MealReviewInfoResponse.kt b/app/src/main/java/com/eatssu/android/data/dto/response/MealReviewInfoResponse.kt
@@ -1,6 +1,6 @@
 package com.eatssu.android.data.dto.response
 
-import com.eatssu.android.data.model.ReviewInfo
+import com.eatssu.android.domain.model.ReviewInfo
 import com.google.gson.annotations.SerializedName
 
 data class GetMealReviewInfoResponse(

diff --git a/app/src/main/java/com/eatssu/android/data/dto/response/MenuOfMealResponse.kt b/app/src/main/java/com/eatssu/android/data/dto/response/MenuOfMealResponse.kt
@@ -1,6 +1,6 @@
 package com.eatssu.android.data.dto.response
 
-import com.eatssu.android.data.model.MenuMini
+import com.eatssu.android.domain.model.MenuMini
 import com.google.gson.annotations.SerializedName
 
 data class MenuOfMealResponse(

diff --git a/app/src/main/java/com/eatssu/android/data/dto/response/MenuResponse.kt b/app/src/main/java/com/eatssu/android/data/dto/response/MenuResponse.kt
@@ -1,7 +1,7 @@
 package com.eatssu.android.data.dto.response
 
 import android.util.Log
-import com.eatssu.android.data.model.Menu
+import com.eatssu.android.domain.model.Menu
 import com.google.gson.annotations.SerializedName
 
 

diff --git a/app/src/main/java/com/eatssu/android/data/dto/response/MenuReviewInfoResponse.kt b/app/src/main/java/com/eatssu/android/data/dto/response/MenuReviewInfoResponse.kt
@@ -1,6 +1,6 @@
 package com.eatssu.android.data.dto.response
 
-import com.eatssu.android.data.model.ReviewInfo
+import com.eatssu.android.domain.model.ReviewInfo
 import com.google.gson.annotations.SerializedName
 
 data class GetMenuReviewInfoResponse(

diff --git a/app/src/main/java/com/eatssu/android/data/dto/response/MyReviewResponse.kt b/app/src/main/java/com/eatssu/android/data/dto/response/MyReviewResponse.kt
@@ -1,6 +1,6 @@
 package com.eatssu.android.data.dto.response
 
-import com.eatssu.android.data.model.Review
+import com.eatssu.android.domain.model.Review
 import com.google.gson.annotations.SerializedName
 
 data class MyReviewResponse(

diff --git a/app/src/main/java/com/eatssu/android/data/dto/response/ReviewListResponse.kt b/app/src/main/java/com/eatssu/android/data/dto/response/ReviewListResponse.kt
@@ -1,6 +1,6 @@
 package com.eatssu.android.data.dto.response
 
-import com.eatssu.android.data.model.Review
+import com.eatssu.android.domain.model.Review
 import com.google.gson.annotations.SerializedName
 
 data class GetReviewListResponse(

diff --git a/app/src/main/java/com/eatssu/android/data/repository/FirebaseRemoteConfigRepository.kt b/app/src/main/java/com/eatssu/android/data/repository/FirebaseRemoteConfigRepository.kt
@@ -2,7 +2,7 @@ package com.eatssu.android.data.repository
 
 import com.eatssu.android.R
 import com.eatssu.android.data.enums.Restaurant
-import com.eatssu.android.data.model.RestaurantInfo
+import com.eatssu.android.domain.model.RestaurantInfo
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings
 import org.json.JSONArray

diff --git a/app/src/main/java/com/eatssu/android/data/repository/MealRepositoryImpl.kt b/app/src/main/java/com/eatssu/android/data/repository/MealRepositoryImpl.kt
@@ -1,8 +1,9 @@
 package com.eatssu.android.data.repository
 
-import com.eatssu.android.base.BaseResponse
+import com.eatssu.android.data.dto.response.BaseResponse
 import com.eatssu.android.data.dto.response.MenuOfMealResponse
 import com.eatssu.android.data.service.MealService
+import com.eatssu.android.domain.repository.MealRepository
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import javax.inject.Inject

diff --git a/app/src/main/java/com/eatssu/android/data/repository/OauthRepositoryImpl.kt b/app/src/main/java/com/eatssu/android/data/repository/OauthRepositoryImpl.kt
@@ -1,9 +1,10 @@
 package com.eatssu.android.data.repository
 
-import com.eatssu.android.base.BaseResponse
 import com.eatssu.android.data.dto.request.LoginWithKakaoRequest
+import com.eatssu.android.data.dto.response.BaseResponse
 import com.eatssu.android.data.dto.response.TokenResponse
 import com.eatssu.android.data.service.OauthService
+import com.eatssu.android.domain.repository.OauthRepository
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import javax.inject.Inject

diff --git a/app/src/main/java/com/eatssu/android/data/repository/ReportRepositoryImpl.kt b/app/src/main/java/com/eatssu/android/data/repository/ReportRepositoryImpl.kt
@@ -1,8 +1,9 @@
 package com.eatssu.android.data.repository
 
-import com.eatssu.android.base.BaseResponse
 import com.eatssu.android.data.dto.request.ReportRequest
+import com.eatssu.android.data.dto.response.BaseResponse
 import com.eatssu.android.data.service.ReportService
+import com.eatssu.android.domain.repository.ReportRepository
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import javax.inject.Inject

diff --git a/app/src/main/java/com/eatssu/android/data/repository/ReviewRepositoryImpl.kt b/app/src/main/java/com/eatssu/android/data/repository/ReviewRepositoryImpl.kt
@@ -1,13 +1,14 @@
 package com.eatssu.android.data.repository
 
-import com.eatssu.android.base.BaseResponse
 import com.eatssu.android.data.dto.request.ModifyReviewRequest
 import com.eatssu.android.data.dto.request.WriteReviewRequest
+import com.eatssu.android.data.dto.response.BaseResponse
 import com.eatssu.android.data.dto.response.GetMealReviewInfoResponse
 import com.eatssu.android.data.dto.response.GetMenuReviewInfoResponse
 import com.eatssu.android.data.dto.response.GetReviewListResponse
 import com.eatssu.android.data.dto.response.ImageResponse
 import com.eatssu.android.data.service.ReviewService
+import com.eatssu.android.domain.repository.ReviewRepository
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import okhttp3.MultipartBody

diff --git a/app/src/main/java/com/eatssu/android/data/repository/UserRepositoryImpl.kt b/app/src/main/java/com/eatssu/android/data/repository/UserRepositoryImpl.kt
@@ -1,10 +1,11 @@
 package com.eatssu.android.data.repository
 
-import com.eatssu.android.base.BaseResponse
 import com.eatssu.android.data.dto.request.ChangeNicknameRequest
+import com.eatssu.android.data.dto.response.BaseResponse
 import com.eatssu.android.data.dto.response.MyInfoResponse
 import com.eatssu.android.data.dto.response.MyReviewResponse
 import com.eatssu.android.data.service.UserService
+import com.eatssu.android.domain.repository.UserRepository
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import javax.inject.Inject

diff --git a/app/src/main/java/com/eatssu/android/data/service/MealService.kt b/app/src/main/java/com/eatssu/android/data/service/MealService.kt
@@ -1,6 +1,6 @@
 package com.eatssu.android.data.service
 
-import com.eatssu.android.base.BaseResponse
+import com.eatssu.android.data.dto.response.BaseResponse
 import com.eatssu.android.data.dto.response.GetMealResponse
 import com.eatssu.android.data.dto.response.MenuOfMealResponse
 import retrofit2.Call

diff --git a/app/src/main/java/com/eatssu/android/data/service/MenuService.kt b/app/src/main/java/com/eatssu/android/data/service/MenuService.kt
@@ -1,6 +1,6 @@
 package com.eatssu.android.data.service
 
-import com.eatssu.android.base.BaseResponse
+import com.eatssu.android.data.dto.response.BaseResponse
 import com.eatssu.android.data.dto.response.GetFixedMenuResponse
 import retrofit2.Call
 import retrofit2.http.GET

diff --git a/app/src/main/java/com/eatssu/android/data/service/OauthService.kt b/app/src/main/java/com/eatssu/android/data/service/OauthService.kt
@@ -1,7 +1,7 @@
 package com.eatssu.android.data.service
 
-import com.eatssu.android.base.BaseResponse
 import com.eatssu.android.data.dto.request.LoginWithKakaoRequest
+import com.eatssu.android.data.dto.response.BaseResponse
 import com.eatssu.android.data.dto.response.TokenResponse
 import retrofit2.http.Body
 import retrofit2.http.Header

diff --git a/app/src/main/java/com/eatssu/android/data/service/ReportService.kt b/app/src/main/java/com/eatssu/android/data/service/ReportService.kt
@@ -1,7 +1,7 @@
 package com.eatssu.android.data.service
 
-import com.eatssu.android.base.BaseResponse
 import com.eatssu.android.data.dto.request.ReportRequest
+import com.eatssu.android.data.dto.response.BaseResponse
 import retrofit2.http.Body
 import retrofit2.http.POST
 

diff --git a/app/src/main/java/com/eatssu/android/data/service/ReviewService.kt b/app/src/main/java/com/eatssu/android/data/service/ReviewService.kt
@@ -1,9 +1,9 @@
 package com.eatssu.android.data.service
 
 
-import com.eatssu.android.base.BaseResponse
 import com.eatssu.android.data.dto.request.ModifyReviewRequest
 import com.eatssu.android.data.dto.request.WriteReviewRequest
+import com.eatssu.android.data.dto.response.BaseResponse
 import com.eatssu.android.data.dto.response.GetMealReviewInfoResponse
 import com.eatssu.android.data.dto.response.GetMenuReviewInfoResponse
 import com.eatssu.android.data.dto.response.GetReviewListResponse

diff --git a/app/src/main/java/com/eatssu/android/data/service/UserService.kt b/app/src/main/java/com/eatssu/android/data/service/UserService.kt
@@ -1,10 +1,14 @@
 package com.eatssu.android.data.service
 
-import com.eatssu.android.base.BaseResponse
 import com.eatssu.android.data.dto.request.ChangeNicknameRequest
+import com.eatssu.android.data.dto.response.BaseResponse
 import com.eatssu.android.data.dto.response.MyInfoResponse
 import com.eatssu.android.data.dto.response.MyReviewResponse
-import retrofit2.http.*
+import retrofit2.http.Body
+import retrofit2.http.DELETE
+import retrofit2.http.GET
+import retrofit2.http.PATCH
+import retrofit2.http.Query
 
 interface UserService {