Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HI-JIN2 merged 2 commits into from
Nov 18, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96d17ac
package: data/domain
HI-JIN2 Nov 18, 2024
7056aa2
package: presentation
HI-JIN2 Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
tools:targetApi="31">

<receiver
android:name=".util.NotificationReceiver"
android:name=".alarm.NotificationReceiver"
android:enabled="true"
android:exported="false">
<intent-filter>
Expand All @@ -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" />
Expand All @@ -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"
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions ...tssu/android/util/NotificationReceiver.kt → ...ssu/android/alarm/NotificationReceiver.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eatssu.android.util
package com.eatssu.android.alarm

import android.app.NotificationChannel
import android.app.NotificationManager
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion ...atssu/android/util/MySharedPreferences.kt → ...atssu/android/data/MySharedPreferences.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eatssu.android.util
package com.eatssu.android.data


import android.content.Context
Expand Down
6 changes: 3 additions & 3 deletions ...a/com/eatssu/android/util/RetrofitImpl.kt → ...a/com/eatssu/android/data/RetrofitImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eatssu.android.util
package com.eatssu.android.data

import android.content.Context
import android.content.Intent
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...a/com/eatssu/android/base/BaseResponse.kt → ...android/data/dto/response/BaseResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eatssu.android.base
package com.eatssu.android.data.dto.response

import com.google.gson.annotations.SerializedName

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/eatssu/android/data/dto/response/MealResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/eatssu/android/data/dto/response/MealReviewInfoResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/eatssu/android/data/dto/response/MenuOfMealResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/eatssu/android/data/dto/response/MenuResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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


Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/eatssu/android/data/dto/response/MenuReviewInfoResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/eatssu/android/data/dto/response/MyReviewResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/eatssu/android/data/dto/response/ReviewListResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/eatssu/android/data/repository/FirebaseRemoteConfigRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/eatssu/android/data/repository/MealRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/eatssu/android/data/repository/OauthRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/eatssu/android/data/repository/ReportRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/eatssu/android/data/repository/ReviewRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/eatssu/android/data/repository/UserRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/eatssu/android/data/service/MealService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/eatssu/android/data/service/MenuService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/eatssu/android/data/service/OauthService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/eatssu/android/data/service/ReportService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/eatssu/android/data/service/ReviewService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 6 additions & 2 deletions app/src/main/java/com/eatssu/android/data/service/UserService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
Loading
Loading