Revert "Refactor/package (#230)" (#231)

This reverts commit 734620d.
EAT-SSU · Oct 18, 2024 · 1f4a727 · 1f4a727
1 parent 734620d
commit 1f4a727
Show file tree

Hide file tree

Showing 130 changed files with 284 additions and 280 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -52,17 +52,17 @@
         </receiver>
 
         <activity
-            android:name=".presentation.mypage.DeveloperActivity"
+            android:name=".ui.mypage.DeveloperActivity"
             android:exported="false" />
         <activity
-            android:name=".presentation.mypage.SignOutActivity"
+            android:name=".ui.mypage.SignOutActivity"
             android:exported="false"
             android:windowSoftInputMode="adjustResize" />
         <activity
-            android:name=".presentation.mypage.terms.WebViewActivity"
+            android:name=".ui.mypage.terms.WebViewActivity"
             android:exported="false" />
         <activity
-            android:name=".presentation.login.IntroActivity"
+            android:name=".ui.login.IntroActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -71,31 +71,31 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".presentation.review.write.ReviewWriteRateActivity"
+            android:name=".ui.review.write.ReviewWriteRateActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".presentation.review.write.menu.ReviewWriteMenuActivity"
+            android:name=".ui.review.write.menu.ReviewWriteMenuActivity"
             android:exported="false" />
         <activity
-            android:name=".presentation.login.LoginActivity"
+            android:name=".ui.login.LoginActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".presentation.common.AndroidMessageDialogActivity"
+            android:name=".ui.common.AndroidMessageDialogActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".presentation.common.ForceUpdateDialogActivity"
+            android:name=".ui.common.ForceUpdateDialogActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
@@ -123,67 +123,67 @@
                 android:value="" />
         </activity>
         <activity
-            android:name=".presentation.mypage.usernamechange.UserNameChangeActivity"
+            android:name=".ui.mypage.usernamechange.UserNameChangeActivity"
             android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".presentation.mypage.myreview.MyReviewListActivity"
+            android:name=".ui.mypage.myreview.MyReviewListActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".presentation.review.list.ReviewActivity"
+            android:name=".ui.review.list.ReviewActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".presentation.mypage.MyPageActivity"
+            android:name=".ui.mypage.MyPageActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
 
         <activity
-            android:name=".presentation.main.MainActivity"
+            android:name=".ui.main.MainActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".presentation.review.report.OthersReviewDialogActivity"
+            android:name=".ui.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=".presentation.review.delete.MyReviewDialogActivity"
+            android:name=".ui.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=".presentation.review.report.ReportActivity"
+            android:name=".ui.review.report.ReportActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".presentation.review.modify.ModifyReviewActivity"
+            android:name=".ui.review.modify.ModifyReviewActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"

diff --git a/app/src/main/java/com/eatssu/android/base/BaseActivity.kt b/app/src/main/java/com/eatssu/android/base/BaseActivity.kt
@@ -16,10 +16,10 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.viewbinding.ViewBinding
 import com.eatssu.android.R
 import com.eatssu.android.data.repository.FirebaseRemoteConfigRepository
-import com.eatssu.android.presentation.common.AndroidMessageDialogActivity
-import com.eatssu.android.presentation.common.ForceUpdateDialogActivity
-import com.eatssu.android.presentation.common.VersionViewModel
-import com.eatssu.android.presentation.common.VersionViewModelFactory
+import com.eatssu.android.ui.common.AndroidMessageDialogActivity
+import com.eatssu.android.ui.common.ForceUpdateDialogActivity
+import com.eatssu.android.ui.common.VersionViewModel
+import com.eatssu.android.ui.common.VersionViewModelFactory
 import com.eatssu.android.util.NetworkConnection
 import com.google.android.material.card.MaterialCardView
 

diff --git a/app/src/main/java/com/eatssu/android/data/dto/request/ChangePwRequest.kt b/app/src/main/java/com/eatssu/android/data/dto/request/ChangePwRequest.kt
@@ -0,0 +1,5 @@
+package com.eatssu.android.data.dto.request
+
+data class ChangePwRequest(
+    val pwd: String,
+)
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.domain.model.Menu
+import com.eatssu.android.data.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.domain.model.ReviewInfo
+import com.eatssu.android.data.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.domain.model.MenuMini
+import com.eatssu.android.data.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.domain.model.Menu
+import com.eatssu.android.data.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.domain.model.ReviewInfo
+import com.eatssu.android.data.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.domain.model.Review
+import com.eatssu.android.data.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.domain.model.Review
+import com.eatssu.android.data.model.Review
 import com.google.gson.annotations.SerializedName
 
 data class GetReviewListResponse(

diff --git a/...su/android/domain/model/AndroidMessage.kt → ...tssu/android/data/model/AndroidMessage.kt b/...su/android/domain/model/AndroidMessage.kt → ...tssu/android/data/model/AndroidMessage.kt
@@ -1,4 +1,4 @@
-package com.eatssu.android.domain.model
+package com.eatssu.android.data.model
 
 data class AndroidMessage(
     val dialog: Boolean,

diff --git a/app/src/main/java/com/eatssu/android/data/model/CalendarData.kt b/app/src/main/java/com/eatssu/android/data/model/CalendarData.kt
@@ -0,0 +1,6 @@
+package com.eatssu.android.data.model
+
+data class CalendarData(
+    var cl_date: String = "", // 날짜
+    var cl_day: String = "" // 요일
+)
diff --git a/...a/com/eatssu/android/domain/model/Menu.kt → ...ava/com/eatssu/android/data/model/Menu.kt b/...a/com/eatssu/android/domain/model/Menu.kt → ...ava/com/eatssu/android/data/model/Menu.kt
@@ -1,4 +1,4 @@
-package com.eatssu.android.domain.model
+package com.eatssu.android.data.model
 
 data class Menu(
     val id: Long,

diff --git a/...m/eatssu/android/domain/model/MenuMini.kt → ...com/eatssu/android/data/model/MenuMini.kt b/...m/eatssu/android/domain/model/MenuMini.kt → ...com/eatssu/android/data/model/MenuMini.kt
@@ -1,4 +1,4 @@
-package com.eatssu.android.domain.model
+package com.eatssu.android.data.model
 
 data class MenuMini(
     val id: Long,

diff --git a/...su/android/domain/model/RestaurantInfo.kt → ...tssu/android/data/model/RestaurantInfo.kt b/...su/android/domain/model/RestaurantInfo.kt → ...tssu/android/data/model/RestaurantInfo.kt
@@ -1,4 +1,4 @@
-package com.eatssu.android.domain.model
+package com.eatssu.android.data.model
 
 import com.eatssu.android.data.enums.Restaurant
 

diff --git a/...com/eatssu/android/domain/model/Review.kt → ...a/com/eatssu/android/data/model/Review.kt b/...com/eatssu/android/domain/model/Review.kt → ...a/com/eatssu/android/data/model/Review.kt
@@ -1,4 +1,4 @@
-package com.eatssu.android.domain.model
+package com.eatssu.android.data.model
 
 data class Review(
     val isWriter: Boolean,

diff --git a/...eatssu/android/domain/model/ReviewInfo.kt → ...m/eatssu/android/data/model/ReviewInfo.kt b/...eatssu/android/domain/model/ReviewInfo.kt → ...m/eatssu/android/data/model/ReviewInfo.kt
@@ -1,4 +1,4 @@
-package com.eatssu.android.domain.model
+package com.eatssu.android.data.model
 
 data class ReviewInfo(
     var name: String,

diff --git a/...om/eatssu/android/domain/model/Section.kt → .../com/eatssu/android/data/model/Section.kt b/...om/eatssu/android/domain/model/Section.kt → .../com/eatssu/android/data/model/Section.kt
@@ -1,4 +1,4 @@
-package com.eatssu.android.domain.model
+package com.eatssu.android.data.model
 
 import com.eatssu.android.data.enums.MenuType
 import com.eatssu.android.data.enums.Restaurant

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.domain.model.RestaurantInfo
+import com.eatssu.android.data.model.RestaurantInfo
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings
 import org.json.JSONArray

diff --git a/...roid/domain/repository/ImageRepository.kt → ...ndroid/data/repository/ImageRepository.kt b/...roid/domain/repository/ImageRepository.kt → ...ndroid/data/repository/ImageRepository.kt
@@ -1,4 +1,4 @@
-package com.eatssu.android.domain.repository
+package com.eatssu.android.data.repository
 
 
 interface ImageRepository {

diff --git a/app/src/main/java/com/eatssu/android/data/repository/ImageRepositoryImpl.kt b/app/src/main/java/com/eatssu/android/data/repository/ImageRepositoryImpl.kt
@@ -1,7 +1,6 @@
 package com.eatssu.android.data.repository
 
-import com.eatssu.android.domain.repository.ImageRepository
-import com.eatssu.android.domain.service.ImageService
+import com.eatssu.android.data.service.ImageService
 import javax.inject.Inject
 
 class ImageRepositoryImpl @Inject constructor(private val imageService: ImageService) :

diff --git a/...roid/domain/repository/OauthRepository.kt → ...ndroid/data/repository/OauthRepository.kt b/...roid/domain/repository/OauthRepository.kt → ...ndroid/data/repository/OauthRepository.kt
@@ -1,4 +1,4 @@
-package com.eatssu.android.domain.repository
+package com.eatssu.android.data.repository
 
 import com.eatssu.android.base.BaseResponse
 import com.eatssu.android.data.dto.request.LoginWithKakaoRequest

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
@@ -3,8 +3,7 @@ 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.TokenResponse
-import com.eatssu.android.domain.repository.OauthRepository
-import com.eatssu.android.domain.service.OauthService
+import com.eatssu.android.data.service.OauthService
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import javax.inject.Inject

diff --git a/...oid/domain/repository/ReportRepository.kt → ...droid/data/repository/ReportRepository.kt b/...oid/domain/repository/ReportRepository.kt → ...droid/data/repository/ReportRepository.kt
@@ -1,4 +1,4 @@
-package com.eatssu.android.domain.repository
+package com.eatssu.android.data.repository
 
 import com.eatssu.android.base.BaseResponse
 import com.eatssu.android.data.dto.request.ReportRequest

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
@@ -2,8 +2,7 @@ package com.eatssu.android.data.repository
 
 import com.eatssu.android.base.BaseResponse
 import com.eatssu.android.data.dto.request.ReportRequest
-import com.eatssu.android.domain.repository.ReportRepository
-import com.eatssu.android.domain.service.ReportService
+import com.eatssu.android.data.service.ReportService
 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/ReviewRepository.kt b/app/src/main/java/com/eatssu/android/data/repository/ReviewRepository.kt
@@ -1,6 +1,6 @@
 package com.eatssu.android.data.repository
 
-import com.eatssu.android.domain.service.ReviewService
+import com.eatssu.android.data.service.ReviewService
 
 class ReviewRepository(private val reviewService: ReviewService) {
 

diff --git a/...droid/domain/repository/UserRepository.kt → ...android/data/repository/UserRepository.kt b/...droid/domain/repository/UserRepository.kt → ...android/data/repository/UserRepository.kt
@@ -1,4 +1,4 @@
-package com.eatssu.android.domain.repository
+package com.eatssu.android.data.repository
 
 import com.eatssu.android.base.BaseResponse
 import com.eatssu.android.data.dto.request.ChangeNicknameRequest

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
@@ -4,8 +4,7 @@ import com.eatssu.android.base.BaseResponse
 import com.eatssu.android.data.dto.request.ChangeNicknameRequest
 import com.eatssu.android.data.dto.response.MyInfoResponse
 import com.eatssu.android.data.dto.response.MyReviewResponse
-import com.eatssu.android.domain.repository.UserRepository
-import com.eatssu.android.domain.service.UserService
+import com.eatssu.android.data.service.UserService
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import javax.inject.Inject

diff --git a/...su/android/domain/service/ImageService.kt → ...tssu/android/data/service/ImageService.kt b/...su/android/domain/service/ImageService.kt → ...tssu/android/data/service/ImageService.kt
@@ -1,4 +1,4 @@
-package com.eatssu.android.domain.service
+package com.eatssu.android.data.service
 
 import com.eatssu.android.base.BaseResponse
 import com.eatssu.android.data.dto.response.ImageResponse

diff --git a/...ssu/android/domain/service/MealService.kt → ...atssu/android/data/service/MealService.kt b/...ssu/android/domain/service/MealService.kt → ...atssu/android/data/service/MealService.kt
@@ -1,4 +1,4 @@
-package com.eatssu.android.domain.service
+package com.eatssu.android.data.service
 
 import com.eatssu.android.base.BaseResponse
 import com.eatssu.android.data.dto.response.GetMealResponse

diff --git a/...ssu/android/domain/service/MenuService.kt → ...atssu/android/data/service/MenuService.kt b/...ssu/android/domain/service/MenuService.kt → ...atssu/android/data/service/MenuService.kt
@@ -1,4 +1,4 @@
-package com.eatssu.android.domain.service
+package com.eatssu.android.data.service
 
 import com.eatssu.android.base.BaseResponse
 import com.eatssu.android.data.dto.response.GetFixedMenuResponse

diff --git a/...su/android/domain/service/OauthService.kt → ...tssu/android/data/service/OauthService.kt b/...su/android/domain/service/OauthService.kt → ...tssu/android/data/service/OauthService.kt
@@ -1,4 +1,4 @@
-package com.eatssu.android.domain.service
+package com.eatssu.android.data.service
 
 import com.eatssu.android.base.BaseResponse
 import com.eatssu.android.data.dto.request.LoginWithKakaoRequest

diff --git a/...u/android/domain/service/ReportService.kt → ...ssu/android/data/service/ReportService.kt b/...u/android/domain/service/ReportService.kt → ...ssu/android/data/service/ReportService.kt
@@ -1,4 +1,4 @@
-package com.eatssu.android.domain.service
+package com.eatssu.android.data.service
 
 import com.eatssu.android.base.BaseResponse
 import com.eatssu.android.data.dto.request.ReportRequest

diff --git a/...u/android/domain/service/ReviewService.kt → ...ssu/android/data/service/ReviewService.kt b/...u/android/domain/service/ReviewService.kt → ...ssu/android/data/service/ReviewService.kt
@@ -1,4 +1,4 @@
-package com.eatssu.android.domain.service
+package com.eatssu.android.data.service
 
 
 import com.eatssu.android.base.BaseResponse
@@ -8,13 +8,7 @@ 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 retrofit2.Call
-import retrofit2.http.Body
-import retrofit2.http.DELETE
-import retrofit2.http.GET
-import retrofit2.http.PATCH
-import retrofit2.http.POST
-import retrofit2.http.Path
-import retrofit2.http.Query
+import retrofit2.http.*
 
 
 interface ReviewService {