From 198aba7cea7bc02c2d3914e02c3513c71b6238e7 Mon Sep 17 00:00:00 2001 From: Yu Jin Date: Fri, 11 Oct 2024 00:26:17 +0900 Subject: [PATCH 1/2] chore: change package name --- app/src/main/AndroidManifest.xml | 36 +++++++++---------- .../com/eatssu/android/base/BaseActivity.kt | 8 ++--- .../{util => data/db}/MySharedPreferences.kt | 2 +- .../android/data/dto/response/MealResponse.kt | 2 +- .../dto/response/MealReviewInfoResponse.kt | 2 +- .../data/dto/response/MenuOfMealResponse.kt | 2 +- .../android/data/dto/response/MenuResponse.kt | 2 +- .../dto/response/MenuReviewInfoResponse.kt | 2 +- .../data/dto/response/MyReviewResponse.kt | 2 +- .../data/dto/response/ReviewListResponse.kt | 2 +- .../FirebaseRemoteConfigRepository.kt | 2 +- .../data/repository/ImageRepositoryImpl.kt | 3 +- .../data/repository/OauthRepositoryImpl.kt | 3 +- .../data/repository/ReportRepositoryImpl.kt | 3 +- .../data/repository/ReviewRepository.kt | 2 +- .../data/repository/UserRepositoryImpl.kt | 3 +- .../java/com/eatssu/android/di/DataModule.kt | 6 ++-- .../com/eatssu/android/di/NetworkModule.kt | 6 ++-- .../android/di/network/TokenInterceptor.kt | 12 +++---- .../{data => domain}/model/AndroidMessage.kt | 2 +- .../{data => domain}/model/CalendarData.kt | 2 +- .../android/{data => domain}/model/Menu.kt | 2 +- .../{data => domain}/model/MenuMini.kt | 2 +- .../{data => domain}/model/RestaurantInfo.kt | 2 +- .../android/{data => domain}/model/Review.kt | 2 +- .../{data => domain}/model/ReviewInfo.kt | 2 +- .../android/{data => domain}/model/Section.kt | 2 +- .../repository/ImageRepository.kt | 2 +- .../repository/OauthRepository.kt | 2 +- .../repository/ReportRepository.kt | 2 +- .../repository/UserRepository.kt | 2 +- .../{data => domain}/service/ImageService.kt | 2 +- .../{data => domain}/service/MealService.kt | 2 +- .../{data => domain}/service/MenuService.kt | 2 +- .../{data => domain}/service/OauthService.kt | 2 +- .../{data => domain}/service/ReportService.kt | 2 +- .../{data => domain}/service/ReviewService.kt | 10 ++++-- .../{data => domain}/service/UserService.kt | 8 +++-- .../{data => domain}/usecase/AlarmUsecase.kt | 2 +- .../usecase/GetAccessTokenUseCase.kt | 4 +-- .../GetDailyNotificationStatusUseCase.kt | 2 +- .../usecase/GetMyReviewsUseCase.kt | 4 +-- .../usecase/GetRefreshTokenUseCase.kt | 4 +-- .../usecase/GetUserEmailUseCase.kt | 4 +-- .../usecase/GetUserInfoUseCase.kt | 4 +-- .../usecase/GetUserNameUseCase.kt | 4 +-- .../{data => domain}/usecase/LoginUseCase.kt | 4 +-- .../{data => domain}/usecase/LogoutUseCase.kt | 4 +-- .../usecase/PostReportUseCase.kt | 4 +-- .../usecase/ReissueTokenUseCase.kt | 4 +-- .../usecase/SetAccessTokenUseCase.kt | 4 +-- .../SetDailyNotificationStatusUseCase.kt | 2 +- .../usecase/SetRefreshTokenUseCase.kt | 4 +-- .../usecase/SetUserEmailUseCase.kt | 4 +-- .../usecase/SetUserNameUseCase.kt | 6 ++-- .../usecase/SignOutUseCase.kt | 4 +-- .../usecase/ValidateUserNameUseCase.kt | 4 +-- .../common/AndroidMessageDialogActivity.kt | 2 +- .../common/ForceUpdateActivity.kt | 2 +- .../common/VersionViewModel.kt | 2 +- .../common/VersionViewModelFactory.kt | 2 +- .../info/InfoBottomSheetFragment.kt | 2 +- .../info/InfoViewModel.kt | 4 +-- .../login/IntroActivity.kt | 4 +-- .../login/IntroViewModel.kt | 4 +-- .../login/LoginActivity.kt | 4 +-- .../login/LoginViewModel.kt | 10 +++--- .../login/UserApiClient.kt | 2 +- .../{ui => presentation}/main/MainActivity.kt | 14 ++++---- .../main/MainViewModel.kt | 4 +-- .../main/ViewPager2Adapter.kt | 4 +-- .../main/calendar/CalendarAdapter.kt | 2 +- .../main/calendar/CalendarViewHolder.kt | 6 +--- .../main/calendar/CalendarViewModel.kt | 2 +- .../main/menu/MenuAdapter.kt | 6 ++-- .../main/menu/MenuFragment.kt | 12 +++---- .../main/menu/MenuSubAdapter.kt | 6 ++-- .../main/menu/MenuViewModel.kt | 8 ++--- .../main/menu/MenuViewModelFactory.kt | 6 ++-- .../mypage/DeveloperActivity.kt | 2 +- .../mypage/MyPageActivity.kt | 10 +++--- .../mypage/MyPageViewModel.kt | 18 +++++----- .../mypage/SignOutActivity.kt | 2 +- .../mypage/SignOutViewModel.kt | 12 +++---- .../mypage/myreview/MyReviewAdapter.kt | 8 ++--- .../mypage/myreview/MyReviewListActivity.kt | 4 +-- .../mypage/myreview/MyReviewViewModel.kt | 6 ++-- .../mypage/terms/WebViewActivity.kt | 2 +- .../usernamechange/UserNameChangeActivity.kt | 2 +- .../usernamechange/UserNameChangeViewModel.kt | 8 ++--- .../review/delete/DeleteViewModel.kt | 4 +-- .../review/delete/MyReviewDialogActivity.kt | 4 +-- .../review/list/ReviewActivity.kt | 10 +++--- .../review/list/ReviewAdapter.kt | 8 ++--- .../review/list/ReviewViewModel.kt | 8 ++--- .../review/list/ReviewViewModelFactory.kt | 4 +-- .../review/modify/ModifyReviewActivity.kt | 2 +- .../review/modify/ModifyViewModel.kt | 4 +-- .../report/OthersReviewDialogActivity.kt | 2 +- .../review/report/ReportActivity.kt | 2 +- .../review/report/ReportViewModel.kt | 6 ++-- .../review/write/ImageViewModel.kt | 4 +-- .../review/write/ImageViewModelFactory.kt | 4 +-- .../review/write/ReviewWriteRateActivity.kt | 6 ++-- .../review/write/ReviewWriteViewModel.kt | 4 +-- .../write/ReviewWriteViewModelFactory.kt | 4 +-- .../write/menu/ReviewWriteMenuActivity.kt | 6 ++-- .../write/menu/VariableMenuModelFactory.kt | 4 +-- .../write/menu/VariableMenuPickAdapter.kt | 4 +-- .../write/menu/VariableMenuViewModel.kt | 6 ++-- .../android/util/NotificationReceiver.kt | 2 +- .../com/eatssu/android/util/RetrofitImpl.kt | 3 +- .../main/res/layout/activity_developer.xml | 2 +- app/src/main/res/layout/activity_fix_menu.xml | 2 +- app/src/main/res/layout/activity_info.xml | 2 +- app/src/main/res/layout/activity_intro.xml | 2 +- app/src/main/res/layout/activity_login.xml | 2 +- app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/layout/activity_my_page.xml | 2 +- .../res/layout/activity_my_review_dialog.xml | 2 +- .../res/layout/activity_my_review_list.xml | 2 +- .../layout/activity_others_review_dialog.xml | 2 +- app/src/main/res/layout/activity_report.xml | 2 +- app/src/main/res/layout/activity_review.xml | 4 +-- .../res/layout/activity_review_write_menu.xml | 2 +- .../res/layout/activity_review_write_rate.xml | 4 +-- app/src/main/res/layout/activity_sign_out.xml | 2 +- .../res/layout/activity_user_name_change.xml | 2 +- app/src/main/res/layout/activity_webview.xml | 2 +- 129 files changed, 278 insertions(+), 267 deletions(-) rename app/src/main/java/com/eatssu/android/{util => data/db}/MySharedPreferences.kt (99%) rename app/src/main/java/com/eatssu/android/{data => domain}/model/AndroidMessage.kt (66%) rename app/src/main/java/com/eatssu/android/{data => domain}/model/CalendarData.kt (72%) rename app/src/main/java/com/eatssu/android/{data => domain}/model/Menu.kt (71%) rename app/src/main/java/com/eatssu/android/{data => domain}/model/MenuMini.kt (61%) rename app/src/main/java/com/eatssu/android/{data => domain}/model/RestaurantInfo.kt (84%) rename app/src/main/java/com/eatssu/android/{data => domain}/model/Review.kt (87%) rename app/src/main/java/com/eatssu/android/{data => domain}/model/ReviewInfo.kt (86%) rename app/src/main/java/com/eatssu/android/{data => domain}/model/Section.kt (86%) rename app/src/main/java/com/eatssu/android/{data => domain}/repository/ImageRepository.kt (80%) rename app/src/main/java/com/eatssu/android/{data => domain}/repository/OauthRepository.kt (90%) rename app/src/main/java/com/eatssu/android/{data => domain}/repository/ReportRepository.kt (85%) rename app/src/main/java/com/eatssu/android/{data => domain}/repository/UserRepository.kt (93%) rename app/src/main/java/com/eatssu/android/{data => domain}/service/ImageService.kt (91%) rename app/src/main/java/com/eatssu/android/{data => domain}/service/MealService.kt (94%) rename app/src/main/java/com/eatssu/android/{data => domain}/service/MenuService.kt (90%) rename app/src/main/java/com/eatssu/android/{data => domain}/service/OauthService.kt (94%) rename app/src/main/java/com/eatssu/android/{data => domain}/service/ReportService.kt (88%) rename app/src/main/java/com/eatssu/android/{data => domain}/service/ReviewService.kt (90%) rename app/src/main/java/com/eatssu/android/{data => domain}/service/UserService.kt (83%) rename app/src/main/java/com/eatssu/android/{data => domain}/usecase/AlarmUsecase.kt (97%) rename app/src/main/java/com/eatssu/android/{data => domain}/usecase/GetAccessTokenUseCase.kt (77%) rename app/src/main/java/com/eatssu/android/{data => domain}/usecase/GetDailyNotificationStatusUseCase.kt (89%) rename app/src/main/java/com/eatssu/android/{data => domain}/usecase/GetMyReviewsUseCase.kt (79%) rename app/src/main/java/com/eatssu/android/{data => domain}/usecase/GetRefreshTokenUseCase.kt (80%) rename app/src/main/java/com/eatssu/android/{data => domain}/usecase/GetUserEmailUseCase.kt (77%) rename app/src/main/java/com/eatssu/android/{data => domain}/usecase/GetUserInfoUseCase.kt (78%) rename app/src/main/java/com/eatssu/android/{data => domain}/usecase/GetUserNameUseCase.kt (80%) rename app/src/main/java/com/eatssu/android/{data => domain}/usecase/LoginUseCase.kt (81%) rename app/src/main/java/com/eatssu/android/{data => domain}/usecase/LogoutUseCase.kt (76%) rename app/src/main/java/com/eatssu/android/{data => domain}/usecase/PostReportUseCase.kt (79%) rename app/src/main/java/com/eatssu/android/{data => domain}/usecase/ReissueTokenUseCase.kt (80%) rename app/src/main/java/com/eatssu/android/{data => domain}/usecase/SetAccessTokenUseCase.kt (81%) rename app/src/main/java/com/eatssu/android/{data => domain}/usecase/SetDailyNotificationStatusUseCase.kt (89%) rename app/src/main/java/com/eatssu/android/{data => domain}/usecase/SetRefreshTokenUseCase.kt (81%) rename app/src/main/java/com/eatssu/android/{data => domain}/usecase/SetUserEmailUseCase.kt (77%) rename app/src/main/java/com/eatssu/android/{data => domain}/usecase/SetUserNameUseCase.kt (82%) rename app/src/main/java/com/eatssu/android/{data => domain}/usecase/SignOutUseCase.kt (75%) rename app/src/main/java/com/eatssu/android/{data => domain}/usecase/ValidateUserNameUseCase.kt (77%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/common/AndroidMessageDialogActivity.kt (95%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/common/ForceUpdateActivity.kt (97%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/common/VersionViewModel.kt (96%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/common/VersionViewModelFactory.kt (92%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/info/InfoBottomSheetFragment.kt (98%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/info/InfoViewModel.kt (93%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/login/IntroActivity.kt (94%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/login/IntroViewModel.kt (91%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/login/LoginActivity.kt (97%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/login/LoginViewModel.kt (89%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/login/UserApiClient.kt (98%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/main/MainActivity.kt (94%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/main/MainViewModel.kt (96%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/main/ViewPager2Adapter.kt (94%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/main/calendar/CalendarAdapter.kt (98%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/main/calendar/CalendarViewHolder.kt (84%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/main/calendar/CalendarViewModel.kt (89%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/main/menu/MenuAdapter.kt (93%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/main/menu/MenuFragment.kt (96%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/main/menu/MenuSubAdapter.kt (93%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/main/menu/MenuViewModel.kt (97%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/main/menu/MenuViewModelFactory.kt (78%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/mypage/DeveloperActivity.kt (91%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/mypage/MyPageActivity.kt (96%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/mypage/MyPageViewModel.kt (91%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/mypage/SignOutActivity.kt (98%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/mypage/SignOutViewModel.kt (87%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/mypage/myreview/MyReviewAdapter.kt (92%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/mypage/myreview/MyReviewListActivity.kt (95%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/mypage/myreview/MyReviewViewModel.kt (92%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/mypage/terms/WebViewActivity.kt (96%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/mypage/usernamechange/UserNameChangeActivity.kt (98%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/mypage/usernamechange/UserNameChangeViewModel.kt (92%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/review/delete/DeleteViewModel.kt (94%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/review/delete/MyReviewDialogActivity.kt (95%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/review/list/ReviewActivity.kt (95%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/review/list/ReviewAdapter.kt (95%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/review/list/ReviewViewModel.kt (97%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/review/list/ReviewViewModelFactory.kt (83%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/review/modify/ModifyReviewActivity.kt (98%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/review/modify/ModifyViewModel.kt (96%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/review/report/OthersReviewDialogActivity.kt (95%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/review/report/ReportActivity.kt (98%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/review/report/ReportViewModel.kt (89%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/review/write/ImageViewModel.kt (97%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/review/write/ImageViewModelFactory.kt (82%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/review/write/ReviewWriteRateActivity.kt (98%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/review/write/ReviewWriteViewModel.kt (97%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/review/write/ReviewWriteViewModelFactory.kt (82%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/review/write/menu/ReviewWriteMenuActivity.kt (94%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/review/write/menu/VariableMenuModelFactory.kt (82%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/review/write/menu/VariableMenuPickAdapter.kt (94%) rename app/src/main/java/com/eatssu/android/{ui => presentation}/review/write/menu/VariableMenuViewModel.kt (93%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ce54b951..f2e5ae2b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -52,17 +52,17 @@ @@ -71,31 +71,31 @@ ) : diff --git a/app/src/main/java/com/eatssu/android/ui/mypage/myreview/MyReviewListActivity.kt b/app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewListActivity.kt similarity index 95% rename from app/src/main/java/com/eatssu/android/ui/mypage/myreview/MyReviewListActivity.kt rename to app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewListActivity.kt index ff730a59..90f811ee 100644 --- a/app/src/main/java/com/eatssu/android/ui/mypage/myreview/MyReviewListActivity.kt +++ b/app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewListActivity.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.ui.mypage.myreview +package com.eatssu.android.presentation.mypage.myreview import android.os.Bundle import android.view.View @@ -6,7 +6,7 @@ import androidx.activity.viewModels import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager import com.eatssu.android.base.BaseActivity -import com.eatssu.android.data.model.Review +import com.eatssu.android.domain.model.Review import com.eatssu.android.databinding.ActivityMyReviewListBinding import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.collectLatest diff --git a/app/src/main/java/com/eatssu/android/ui/mypage/myreview/MyReviewViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewViewModel.kt similarity index 92% rename from app/src/main/java/com/eatssu/android/ui/mypage/myreview/MyReviewViewModel.kt rename to app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewViewModel.kt index 9f846bd7..9b02450f 100644 --- a/app/src/main/java/com/eatssu/android/ui/mypage/myreview/MyReviewViewModel.kt +++ b/app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewViewModel.kt @@ -1,11 +1,11 @@ -package com.eatssu.android.ui.mypage.myreview +package com.eatssu.android.presentation.mypage.myreview import android.util.Log import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.eatssu.android.data.dto.response.toReviewList -import com.eatssu.android.data.model.Review -import com.eatssu.android.data.usecase.GetMyReviewsUseCase +import com.eatssu.android.domain.model.Review +import com.eatssu.android.domain.usecase.GetMyReviewsUseCase import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/app/src/main/java/com/eatssu/android/ui/mypage/terms/WebViewActivity.kt b/app/src/main/java/com/eatssu/android/presentation/mypage/terms/WebViewActivity.kt similarity index 96% rename from app/src/main/java/com/eatssu/android/ui/mypage/terms/WebViewActivity.kt rename to app/src/main/java/com/eatssu/android/presentation/mypage/terms/WebViewActivity.kt index da3ed88e..dd98f5a2 100644 --- a/app/src/main/java/com/eatssu/android/ui/mypage/terms/WebViewActivity.kt +++ b/app/src/main/java/com/eatssu/android/presentation/mypage/terms/WebViewActivity.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.ui.mypage.terms +package com.eatssu.android.presentation.mypage.terms import android.os.Bundle import android.util.Log diff --git a/app/src/main/java/com/eatssu/android/ui/mypage/usernamechange/UserNameChangeActivity.kt b/app/src/main/java/com/eatssu/android/presentation/mypage/usernamechange/UserNameChangeActivity.kt similarity index 98% rename from app/src/main/java/com/eatssu/android/ui/mypage/usernamechange/UserNameChangeActivity.kt rename to app/src/main/java/com/eatssu/android/presentation/mypage/usernamechange/UserNameChangeActivity.kt index 2412f989..5c5d20de 100644 --- a/app/src/main/java/com/eatssu/android/ui/mypage/usernamechange/UserNameChangeActivity.kt +++ b/app/src/main/java/com/eatssu/android/presentation/mypage/usernamechange/UserNameChangeActivity.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.ui.mypage.usernamechange +package com.eatssu.android.presentation.mypage.usernamechange import android.os.Bundle import android.text.Editable diff --git a/app/src/main/java/com/eatssu/android/ui/mypage/usernamechange/UserNameChangeViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/mypage/usernamechange/UserNameChangeViewModel.kt similarity index 92% rename from app/src/main/java/com/eatssu/android/ui/mypage/usernamechange/UserNameChangeViewModel.kt rename to app/src/main/java/com/eatssu/android/presentation/mypage/usernamechange/UserNameChangeViewModel.kt index 9ea99a02..695e449f 100644 --- a/app/src/main/java/com/eatssu/android/ui/mypage/usernamechange/UserNameChangeViewModel.kt +++ b/app/src/main/java/com/eatssu/android/presentation/mypage/usernamechange/UserNameChangeViewModel.kt @@ -1,11 +1,11 @@ -package com.eatssu.android.ui.mypage.usernamechange +package com.eatssu.android.presentation.mypage.usernamechange import android.util.Log import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.eatssu.android.data.usecase.GetUserNameUseCase -import com.eatssu.android.data.usecase.SetUserNameUseCase -import com.eatssu.android.data.usecase.ValidateUserNameUseCase +import com.eatssu.android.domain.usecase.GetUserNameUseCase +import com.eatssu.android.domain.usecase.SetUserNameUseCase +import com.eatssu.android.domain.usecase.ValidateUserNameUseCase import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/app/src/main/java/com/eatssu/android/ui/review/delete/DeleteViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/review/delete/DeleteViewModel.kt similarity index 94% rename from app/src/main/java/com/eatssu/android/ui/review/delete/DeleteViewModel.kt rename to app/src/main/java/com/eatssu/android/presentation/review/delete/DeleteViewModel.kt index 140585e5..4095fb51 100644 --- a/app/src/main/java/com/eatssu/android/ui/review/delete/DeleteViewModel.kt +++ b/app/src/main/java/com/eatssu/android/presentation/review/delete/DeleteViewModel.kt @@ -1,11 +1,11 @@ -package com.eatssu.android.ui.review.delete +package com.eatssu.android.presentation.review.delete import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.eatssu.android.base.BaseResponse -import com.eatssu.android.data.service.ReviewService +import com.eatssu.android.domain.service.ReviewService import com.eatssu.android.util.RetrofitImpl import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/eatssu/android/ui/review/delete/MyReviewDialogActivity.kt b/app/src/main/java/com/eatssu/android/presentation/review/delete/MyReviewDialogActivity.kt similarity index 95% rename from app/src/main/java/com/eatssu/android/ui/review/delete/MyReviewDialogActivity.kt rename to app/src/main/java/com/eatssu/android/presentation/review/delete/MyReviewDialogActivity.kt index 514450da..5e7917e0 100644 --- a/app/src/main/java/com/eatssu/android/ui/review/delete/MyReviewDialogActivity.kt +++ b/app/src/main/java/com/eatssu/android/presentation/review/delete/MyReviewDialogActivity.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.ui.review.delete +package com.eatssu.android.presentation.review.delete import android.content.Intent import android.os.Bundle @@ -9,7 +9,7 @@ import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProvider import com.eatssu.android.databinding.ActivityMyReviewDialogBinding -import com.eatssu.android.ui.review.modify.ModifyReviewActivity +import com.eatssu.android.presentation.review.modify.ModifyReviewActivity class MyReviewDialogActivity : AppCompatActivity() { private lateinit var binding: ActivityMyReviewDialogBinding diff --git a/app/src/main/java/com/eatssu/android/ui/review/list/ReviewActivity.kt b/app/src/main/java/com/eatssu/android/presentation/review/list/ReviewActivity.kt similarity index 95% rename from app/src/main/java/com/eatssu/android/ui/review/list/ReviewActivity.kt rename to app/src/main/java/com/eatssu/android/presentation/review/list/ReviewActivity.kt index 06b0f04e..11b85436 100644 --- a/app/src/main/java/com/eatssu/android/ui/review/list/ReviewActivity.kt +++ b/app/src/main/java/com/eatssu/android/presentation/review/list/ReviewActivity.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.ui.review.list +package com.eatssu.android.presentation.review.list import android.app.AlertDialog import android.content.Intent @@ -12,11 +12,11 @@ import androidx.recyclerview.widget.LinearLayoutManager import com.eatssu.android.base.BaseActivity import com.eatssu.android.data.enums.MenuType import com.eatssu.android.data.repository.ReviewRepository -import com.eatssu.android.data.service.ReviewService import com.eatssu.android.databinding.ActivityReviewBinding -import com.eatssu.android.ui.review.delete.DeleteViewModel -import com.eatssu.android.ui.review.write.ReviewWriteRateActivity -import com.eatssu.android.ui.review.write.menu.ReviewWriteMenuActivity +import com.eatssu.android.domain.service.ReviewService +import com.eatssu.android.presentation.review.delete.DeleteViewModel +import com.eatssu.android.presentation.review.write.ReviewWriteRateActivity +import com.eatssu.android.presentation.review.write.menu.ReviewWriteMenuActivity import com.eatssu.android.util.RetrofitImpl.retrofit import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.collectLatest diff --git a/app/src/main/java/com/eatssu/android/ui/review/list/ReviewAdapter.kt b/app/src/main/java/com/eatssu/android/presentation/review/list/ReviewAdapter.kt similarity index 95% rename from app/src/main/java/com/eatssu/android/ui/review/list/ReviewAdapter.kt rename to app/src/main/java/com/eatssu/android/presentation/review/list/ReviewAdapter.kt index 09548ac7..11273ba5 100644 --- a/app/src/main/java/com/eatssu/android/ui/review/list/ReviewAdapter.kt +++ b/app/src/main/java/com/eatssu/android/presentation/review/list/ReviewAdapter.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.ui.review.list +package com.eatssu.android.presentation.review.list import android.content.Context import android.content.Intent @@ -13,10 +13,10 @@ import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide import com.eatssu.android.R -import com.eatssu.android.data.model.Review +import com.eatssu.android.domain.model.Review import com.eatssu.android.databinding.ItemReviewBinding -import com.eatssu.android.ui.review.modify.ModifyReviewActivity -import com.eatssu.android.ui.review.report.ReportActivity +import com.eatssu.android.presentation.review.modify.ModifyReviewActivity +import com.eatssu.android.presentation.review.report.ReportActivity class ReviewAdapter( diff --git a/app/src/main/java/com/eatssu/android/ui/review/list/ReviewViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/review/list/ReviewViewModel.kt similarity index 97% rename from app/src/main/java/com/eatssu/android/ui/review/list/ReviewViewModel.kt rename to app/src/main/java/com/eatssu/android/presentation/review/list/ReviewViewModel.kt index 36a4d80d..f6b74ec5 100644 --- a/app/src/main/java/com/eatssu/android/ui/review/list/ReviewViewModel.kt +++ b/app/src/main/java/com/eatssu/android/presentation/review/list/ReviewViewModel.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.ui.review.list +package com.eatssu.android.presentation.review.list import android.util.Log import androidx.lifecycle.ViewModel @@ -10,9 +10,9 @@ import com.eatssu.android.data.dto.response.GetReviewListResponse import com.eatssu.android.data.dto.response.asReviewInfo import com.eatssu.android.data.dto.response.toReviewList import com.eatssu.android.data.enums.MenuType -import com.eatssu.android.data.model.Review -import com.eatssu.android.data.model.ReviewInfo -import com.eatssu.android.data.service.ReviewService +import com.eatssu.android.domain.model.Review +import com.eatssu.android.domain.model.ReviewInfo +import com.eatssu.android.domain.service.ReviewService import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/app/src/main/java/com/eatssu/android/ui/review/list/ReviewViewModelFactory.kt b/app/src/main/java/com/eatssu/android/presentation/review/list/ReviewViewModelFactory.kt similarity index 83% rename from app/src/main/java/com/eatssu/android/ui/review/list/ReviewViewModelFactory.kt rename to app/src/main/java/com/eatssu/android/presentation/review/list/ReviewViewModelFactory.kt index 9f2544de..0d61152e 100644 --- a/app/src/main/java/com/eatssu/android/ui/review/list/ReviewViewModelFactory.kt +++ b/app/src/main/java/com/eatssu/android/presentation/review/list/ReviewViewModelFactory.kt @@ -1,8 +1,8 @@ -package com.eatssu.android.ui.review.list +package com.eatssu.android.presentation.review.list import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import com.eatssu.android.data.service.ReviewService +import com.eatssu.android.domain.service.ReviewService class ReviewViewModelFactory( private val reviewService: ReviewService, diff --git a/app/src/main/java/com/eatssu/android/ui/review/modify/ModifyReviewActivity.kt b/app/src/main/java/com/eatssu/android/presentation/review/modify/ModifyReviewActivity.kt similarity index 98% rename from app/src/main/java/com/eatssu/android/ui/review/modify/ModifyReviewActivity.kt rename to app/src/main/java/com/eatssu/android/presentation/review/modify/ModifyReviewActivity.kt index 104edc80..2d3a9b96 100644 --- a/app/src/main/java/com/eatssu/android/ui/review/modify/ModifyReviewActivity.kt +++ b/app/src/main/java/com/eatssu/android/presentation/review/modify/ModifyReviewActivity.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.ui.review.modify +package com.eatssu.android.presentation.review.modify import android.os.Bundle import android.util.Log diff --git a/app/src/main/java/com/eatssu/android/ui/review/modify/ModifyViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/review/modify/ModifyViewModel.kt similarity index 96% rename from app/src/main/java/com/eatssu/android/ui/review/modify/ModifyViewModel.kt rename to app/src/main/java/com/eatssu/android/presentation/review/modify/ModifyViewModel.kt index 9ed7c85e..1f5bab2b 100644 --- a/app/src/main/java/com/eatssu/android/ui/review/modify/ModifyViewModel.kt +++ b/app/src/main/java/com/eatssu/android/presentation/review/modify/ModifyViewModel.kt @@ -1,10 +1,10 @@ -package com.eatssu.android.ui.review.modify +package com.eatssu.android.presentation.review.modify import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.eatssu.android.base.BaseResponse import com.eatssu.android.data.dto.request.ModifyReviewRequest -import com.eatssu.android.data.service.ReviewService +import com.eatssu.android.domain.service.ReviewService import com.eatssu.android.util.RetrofitImpl import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/com/eatssu/android/ui/review/report/OthersReviewDialogActivity.kt b/app/src/main/java/com/eatssu/android/presentation/review/report/OthersReviewDialogActivity.kt similarity index 95% rename from app/src/main/java/com/eatssu/android/ui/review/report/OthersReviewDialogActivity.kt rename to app/src/main/java/com/eatssu/android/presentation/review/report/OthersReviewDialogActivity.kt index a9e15406..112322fc 100644 --- a/app/src/main/java/com/eatssu/android/ui/review/report/OthersReviewDialogActivity.kt +++ b/app/src/main/java/com/eatssu/android/presentation/review/report/OthersReviewDialogActivity.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.ui.review.report +package com.eatssu.android.presentation.review.report import android.content.Intent import android.os.Bundle diff --git a/app/src/main/java/com/eatssu/android/ui/review/report/ReportActivity.kt b/app/src/main/java/com/eatssu/android/presentation/review/report/ReportActivity.kt similarity index 98% rename from app/src/main/java/com/eatssu/android/ui/review/report/ReportActivity.kt rename to app/src/main/java/com/eatssu/android/presentation/review/report/ReportActivity.kt index 94b278cd..00d93337 100644 --- a/app/src/main/java/com/eatssu/android/ui/review/report/ReportActivity.kt +++ b/app/src/main/java/com/eatssu/android/presentation/review/report/ReportActivity.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.ui.review.report +package com.eatssu.android.presentation.review.report import android.os.Bundle import android.text.Editable diff --git a/app/src/main/java/com/eatssu/android/ui/review/report/ReportViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/review/report/ReportViewModel.kt similarity index 89% rename from app/src/main/java/com/eatssu/android/ui/review/report/ReportViewModel.kt rename to app/src/main/java/com/eatssu/android/presentation/review/report/ReportViewModel.kt index 870395b1..26e750cb 100644 --- a/app/src/main/java/com/eatssu/android/ui/review/report/ReportViewModel.kt +++ b/app/src/main/java/com/eatssu/android/presentation/review/report/ReportViewModel.kt @@ -1,11 +1,11 @@ -package com.eatssu.android.ui.review.report +package com.eatssu.android.presentation.review.report import android.util.Log import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.eatssu.android.data.dto.request.ReportRequest -import com.eatssu.android.data.usecase.PostReportUseCase -import com.eatssu.android.ui.mypage.usernamechange.UserNameChangeViewModel.Companion.TAG +import com.eatssu.android.domain.usecase.PostReportUseCase +import com.eatssu.android.presentation.mypage.usernamechange.UserNameChangeViewModel.Companion.TAG import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/app/src/main/java/com/eatssu/android/ui/review/write/ImageViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/review/write/ImageViewModel.kt similarity index 97% rename from app/src/main/java/com/eatssu/android/ui/review/write/ImageViewModel.kt rename to app/src/main/java/com/eatssu/android/presentation/review/write/ImageViewModel.kt index 2f1ccf9e..7aa7a79a 100644 --- a/app/src/main/java/com/eatssu/android/ui/review/write/ImageViewModel.kt +++ b/app/src/main/java/com/eatssu/android/presentation/review/write/ImageViewModel.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.ui.review.write +package com.eatssu.android.presentation.review.write import android.util.Log import androidx.lifecycle.LiveData @@ -6,7 +6,7 @@ import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import com.eatssu.android.base.BaseResponse import com.eatssu.android.data.dto.response.ImageResponse -import com.eatssu.android.data.service.ImageService +import com.eatssu.android.domain.service.ImageService import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/app/src/main/java/com/eatssu/android/ui/review/write/ImageViewModelFactory.kt b/app/src/main/java/com/eatssu/android/presentation/review/write/ImageViewModelFactory.kt similarity index 82% rename from app/src/main/java/com/eatssu/android/ui/review/write/ImageViewModelFactory.kt rename to app/src/main/java/com/eatssu/android/presentation/review/write/ImageViewModelFactory.kt index 38e7c67c..2da6e4ed 100644 --- a/app/src/main/java/com/eatssu/android/ui/review/write/ImageViewModelFactory.kt +++ b/app/src/main/java/com/eatssu/android/presentation/review/write/ImageViewModelFactory.kt @@ -1,8 +1,8 @@ -package com.eatssu.android.ui.review.write +package com.eatssu.android.presentation.review.write import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import com.eatssu.android.data.service.ImageService +import com.eatssu.android.domain.service.ImageService class ImageViewModelFactory(private val imageService: ImageService) : ViewModelProvider.Factory { diff --git a/app/src/main/java/com/eatssu/android/ui/review/write/ReviewWriteRateActivity.kt b/app/src/main/java/com/eatssu/android/presentation/review/write/ReviewWriteRateActivity.kt similarity index 98% rename from app/src/main/java/com/eatssu/android/ui/review/write/ReviewWriteRateActivity.kt rename to app/src/main/java/com/eatssu/android/presentation/review/write/ReviewWriteRateActivity.kt index ef5899cf..293e29b3 100644 --- a/app/src/main/java/com/eatssu/android/ui/review/write/ReviewWriteRateActivity.kt +++ b/app/src/main/java/com/eatssu/android/presentation/review/write/ReviewWriteRateActivity.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.ui.review.write +package com.eatssu.android.presentation.review.write import android.Manifest import android.content.Intent @@ -20,9 +20,9 @@ import androidx.lifecycle.lifecycleScope import com.bumptech.glide.Glide import com.bumptech.glide.request.RequestOptions import com.eatssu.android.base.BaseActivity -import com.eatssu.android.data.service.ImageService -import com.eatssu.android.data.service.ReviewService import com.eatssu.android.databinding.ActivityReviewWriteRateBinding +import com.eatssu.android.domain.service.ImageService +import com.eatssu.android.domain.service.ReviewService import com.eatssu.android.util.RetrofitImpl.mRetrofit import com.eatssu.android.util.RetrofitImpl.retrofit import com.eatssu.android.util.extension.showToast diff --git a/app/src/main/java/com/eatssu/android/ui/review/write/ReviewWriteViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/review/write/ReviewWriteViewModel.kt similarity index 97% rename from app/src/main/java/com/eatssu/android/ui/review/write/ReviewWriteViewModel.kt rename to app/src/main/java/com/eatssu/android/presentation/review/write/ReviewWriteViewModel.kt index eb619c59..6ae31eb3 100644 --- a/app/src/main/java/com/eatssu/android/ui/review/write/ReviewWriteViewModel.kt +++ b/app/src/main/java/com/eatssu/android/presentation/review/write/ReviewWriteViewModel.kt @@ -1,11 +1,11 @@ -package com.eatssu.android.ui.review.write +package com.eatssu.android.presentation.review.write import android.util.Log import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.eatssu.android.base.BaseResponse import com.eatssu.android.data.dto.request.WriteReviewRequest -import com.eatssu.android.data.service.ReviewService +import com.eatssu.android.domain.service.ReviewService import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/app/src/main/java/com/eatssu/android/ui/review/write/ReviewWriteViewModelFactory.kt b/app/src/main/java/com/eatssu/android/presentation/review/write/ReviewWriteViewModelFactory.kt similarity index 82% rename from app/src/main/java/com/eatssu/android/ui/review/write/ReviewWriteViewModelFactory.kt rename to app/src/main/java/com/eatssu/android/presentation/review/write/ReviewWriteViewModelFactory.kt index 40a55abc..2bb67c8a 100644 --- a/app/src/main/java/com/eatssu/android/ui/review/write/ReviewWriteViewModelFactory.kt +++ b/app/src/main/java/com/eatssu/android/presentation/review/write/ReviewWriteViewModelFactory.kt @@ -1,8 +1,8 @@ -package com.eatssu.android.ui.review.write +package com.eatssu.android.presentation.review.write import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import com.eatssu.android.data.service.ReviewService +import com.eatssu.android.domain.service.ReviewService class ReviewWriteViewModelFactory(private val reviewService: ReviewService) : ViewModelProvider.Factory { diff --git a/app/src/main/java/com/eatssu/android/ui/review/write/menu/ReviewWriteMenuActivity.kt b/app/src/main/java/com/eatssu/android/presentation/review/write/menu/ReviewWriteMenuActivity.kt similarity index 94% rename from app/src/main/java/com/eatssu/android/ui/review/write/menu/ReviewWriteMenuActivity.kt rename to app/src/main/java/com/eatssu/android/presentation/review/write/menu/ReviewWriteMenuActivity.kt index 74b50dac..18db2ae4 100644 --- a/app/src/main/java/com/eatssu/android/ui/review/write/menu/ReviewWriteMenuActivity.kt +++ b/app/src/main/java/com/eatssu/android/presentation/review/write/menu/ReviewWriteMenuActivity.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.ui.review.write.menu +package com.eatssu.android.presentation.review.write.menu import android.content.Intent import android.os.Build @@ -9,9 +9,9 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager import com.eatssu.android.base.BaseActivity -import com.eatssu.android.data.service.MealService import com.eatssu.android.databinding.ActivityReviewWriteMenuBinding -import com.eatssu.android.ui.review.write.ReviewWriteRateActivity +import com.eatssu.android.domain.service.MealService +import com.eatssu.android.presentation.review.write.ReviewWriteRateActivity import com.eatssu.android.util.RetrofitImpl.retrofit import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/eatssu/android/ui/review/write/menu/VariableMenuModelFactory.kt b/app/src/main/java/com/eatssu/android/presentation/review/write/menu/VariableMenuModelFactory.kt similarity index 82% rename from app/src/main/java/com/eatssu/android/ui/review/write/menu/VariableMenuModelFactory.kt rename to app/src/main/java/com/eatssu/android/presentation/review/write/menu/VariableMenuModelFactory.kt index b0724249..204764b2 100644 --- a/app/src/main/java/com/eatssu/android/ui/review/write/menu/VariableMenuModelFactory.kt +++ b/app/src/main/java/com/eatssu/android/presentation/review/write/menu/VariableMenuModelFactory.kt @@ -1,8 +1,8 @@ -package com.eatssu.android.ui.review.write.menu +package com.eatssu.android.presentation.review.write.menu import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import com.eatssu.android.data.service.MealService +import com.eatssu.android.domain.service.MealService class VariableMenuModelFactory(private val mealService: MealService) : ViewModelProvider.Factory { diff --git a/app/src/main/java/com/eatssu/android/ui/review/write/menu/VariableMenuPickAdapter.kt b/app/src/main/java/com/eatssu/android/presentation/review/write/menu/VariableMenuPickAdapter.kt similarity index 94% rename from app/src/main/java/com/eatssu/android/ui/review/write/menu/VariableMenuPickAdapter.kt rename to app/src/main/java/com/eatssu/android/presentation/review/write/menu/VariableMenuPickAdapter.kt index 93eb9309..a40d2f36 100644 --- a/app/src/main/java/com/eatssu/android/ui/review/write/menu/VariableMenuPickAdapter.kt +++ b/app/src/main/java/com/eatssu/android/presentation/review/write/menu/VariableMenuPickAdapter.kt @@ -1,9 +1,9 @@ -package com.eatssu.android.ui.review.write.menu +package com.eatssu.android.presentation.review.write.menu import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.eatssu.android.data.model.MenuMini +import com.eatssu.android.domain.model.MenuMini import com.eatssu.android.databinding.ItemMenuPickBinding class VariableMenuPickAdapter(private val menuList: List) : diff --git a/app/src/main/java/com/eatssu/android/ui/review/write/menu/VariableMenuViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/review/write/menu/VariableMenuViewModel.kt similarity index 93% rename from app/src/main/java/com/eatssu/android/ui/review/write/menu/VariableMenuViewModel.kt rename to app/src/main/java/com/eatssu/android/presentation/review/write/menu/VariableMenuViewModel.kt index d13842d0..9dfa0aa1 100644 --- a/app/src/main/java/com/eatssu/android/ui/review/write/menu/VariableMenuViewModel.kt +++ b/app/src/main/java/com/eatssu/android/presentation/review/write/menu/VariableMenuViewModel.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.ui.review.write.menu +package com.eatssu.android.presentation.review.write.menu import android.util.Log @@ -7,8 +7,8 @@ import androidx.lifecycle.viewModelScope import com.eatssu.android.base.BaseResponse import com.eatssu.android.data.dto.response.MenuOfMealResponse import com.eatssu.android.data.dto.response.asMenuOfMeal -import com.eatssu.android.data.model.MenuMini -import com.eatssu.android.data.service.MealService +import com.eatssu.android.domain.model.MenuMini +import com.eatssu.android.domain.service.MealService import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/app/src/main/java/com/eatssu/android/util/NotificationReceiver.kt b/app/src/main/java/com/eatssu/android/util/NotificationReceiver.kt index 3d40135d..6ec0d6dd 100644 --- a/app/src/main/java/com/eatssu/android/util/NotificationReceiver.kt +++ b/app/src/main/java/com/eatssu/android/util/NotificationReceiver.kt @@ -9,7 +9,7 @@ import android.content.Intent import android.os.Build import androidx.core.app.NotificationCompat import com.eatssu.android.R -import com.eatssu.android.ui.main.MainActivity +import com.eatssu.android.presentation.main.MainActivity class NotificationReceiver : BroadcastReceiver() { diff --git a/app/src/main/java/com/eatssu/android/util/RetrofitImpl.kt b/app/src/main/java/com/eatssu/android/util/RetrofitImpl.kt index c010dd80..39fbae87 100644 --- a/app/src/main/java/com/eatssu/android/util/RetrofitImpl.kt +++ b/app/src/main/java/com/eatssu/android/util/RetrofitImpl.kt @@ -11,9 +11,10 @@ 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.db.MySharedPreferences 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/app/src/main/res/layout/activity_developer.xml b/app/src/main/res/layout/activity_developer.xml index 06a7e6eb..362d871a 100644 --- a/app/src/main/res/layout/activity_developer.xml +++ b/app/src/main/res/layout/activity_developer.xml @@ -5,7 +5,7 @@ android:id="@+id/main" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ui.mypage.DeveloperActivity"> + tools:context=".presentation.mypage.DeveloperActivity"> + tools:context=".presentation.review.modify.ModifyReviewActivity"> + tools:context=".presentation.info.InfoActivity"> + tools:context=".presentation.login.IntroActivity"> + tools:context=".presentation.login.LoginActivity"> + tools:context=".presentation.main.MainActivity"> + tools:context=".presentation.mypage.MyPageActivity"> + tools:context=".presentation.review.delete.MyReviewDialogActivity"> + tools:context=".presentation.review.list.ReviewActivity"> + tools:context=".presentation.review.report.OthersReviewDialogActivity"> + tools:context=".presentation.review.report.ReportActivity"> + type="com.eatssu.android.presentation.review.list.ReviewViewModel" /> + tools:context=".presentation.review.list.ReviewActivity"> + tools:context=".presentation.review.write.menu.ReviewWriteMenuActivity"> + type="com.eatssu.android.presentation.review.write.UploadReviewViewModel" /> + tools:context=".presentation.review.write.ReviewWriteRateActivity"> + tools:context=".presentation.mypage.SignOutActivity"> + tools:context=".presentation.mypage.usernamechange.UserNameChangeActivity"> + tools:context=".presentation.mypage.terms.WebViewActivity"> Date: Tue, 15 Oct 2024 14:37:10 +0900 Subject: [PATCH 2/2] clean --- .../android/data/dto/request/ChangePwRequest.kt | 5 ----- .../com/eatssu/android/domain/model/CalendarData.kt | 6 ------ .../android/presentation/info/InfoViewModel.kt | 12 ++++-------- 3 files changed, 4 insertions(+), 19 deletions(-) delete mode 100644 app/src/main/java/com/eatssu/android/data/dto/request/ChangePwRequest.kt delete mode 100644 app/src/main/java/com/eatssu/android/domain/model/CalendarData.kt 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 deleted file mode 100644 index b32d49b5..00000000 --- a/app/src/main/java/com/eatssu/android/data/dto/request/ChangePwRequest.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.eatssu.android.data.dto.request - -data class ChangePwRequest( - val pwd: String, -) \ No newline at end of file diff --git a/app/src/main/java/com/eatssu/android/domain/model/CalendarData.kt b/app/src/main/java/com/eatssu/android/domain/model/CalendarData.kt deleted file mode 100644 index fe9f6e25..00000000 --- a/app/src/main/java/com/eatssu/android/domain/model/CalendarData.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.eatssu.android.domain.model - -data class CalendarData( - var cl_date: String = "", // 날짜 - var cl_day: String = "" // 요일 -) diff --git a/app/src/main/java/com/eatssu/android/presentation/info/InfoViewModel.kt b/app/src/main/java/com/eatssu/android/presentation/info/InfoViewModel.kt index 771140e2..de61f088 100644 --- a/app/src/main/java/com/eatssu/android/presentation/info/InfoViewModel.kt +++ b/app/src/main/java/com/eatssu/android/presentation/info/InfoViewModel.kt @@ -1,38 +1,34 @@ package com.eatssu.android.presentation.info -import android.util.Log import androidx.lifecycle.ViewModel import com.eatssu.android.data.enums.Restaurant -import com.eatssu.android.domain.model.RestaurantInfo import com.eatssu.android.data.repository.FirebaseRemoteConfigRepository +import com.eatssu.android.domain.model.RestaurantInfo import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow +import timber.log.Timber import javax.inject.Inject @HiltViewModel class InfoViewModel @Inject constructor( - private val firebaseRemoteConfigRepository: FirebaseRemoteConfigRepository + firebaseRemoteConfigRepository: FirebaseRemoteConfigRepository ) : ViewModel() { - // StateFlow to hold restaurant info list private val _infoList = MutableStateFlow>(emptyList()) val infoList: StateFlow> = _infoList.asStateFlow() - // Map to hold restaurant info private val restaurantInfoMap: MutableMap = mutableMapOf() init { - // Load cafeteria info from repository and update the StateFlow _infoList.value = firebaseRemoteConfigRepository.getCafeteriaInfo() - Log.d("InfoViewModel", _infoList.value.toString()) + Timber.d(_infoList.value.toString()) _infoList.value.forEach { restaurantInfo -> restaurantInfoMap[restaurantInfo.enum] = restaurantInfo } } - // Helper function to get restaurant details fun getRestaurantInfo(restaurant: Restaurant): RestaurantInfo? { return restaurantInfoMap[restaurant] }