diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f2e5ae2b..ce54b951 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -52,17 +52,17 @@ @@ -71,31 +71,31 @@ >(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() - Timber.d(_infoList.value.toString()) + Log.d("InfoViewModel", _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] } diff --git a/app/src/main/java/com/eatssu/android/presentation/login/IntroActivity.kt b/app/src/main/java/com/eatssu/android/ui/login/IntroActivity.kt similarity index 94% rename from app/src/main/java/com/eatssu/android/presentation/login/IntroActivity.kt rename to app/src/main/java/com/eatssu/android/ui/login/IntroActivity.kt index 70a79451..58f41683 100644 --- a/app/src/main/java/com/eatssu/android/presentation/login/IntroActivity.kt +++ b/app/src/main/java/com/eatssu/android/ui/login/IntroActivity.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.presentation.login +package com.eatssu.android.ui.login import android.os.Bundle import android.os.Handler @@ -7,7 +7,7 @@ import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.lifecycleScope import com.eatssu.android.R -import com.eatssu.android.presentation.main.MainActivity +import com.eatssu.android.ui.main.MainActivity import com.eatssu.android.util.extension.startActivity import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.collectLatest diff --git a/app/src/main/java/com/eatssu/android/presentation/login/IntroViewModel.kt b/app/src/main/java/com/eatssu/android/ui/login/IntroViewModel.kt similarity index 91% rename from app/src/main/java/com/eatssu/android/presentation/login/IntroViewModel.kt rename to app/src/main/java/com/eatssu/android/ui/login/IntroViewModel.kt index 6d7f1c13..1556a1cd 100644 --- a/app/src/main/java/com/eatssu/android/presentation/login/IntroViewModel.kt +++ b/app/src/main/java/com/eatssu/android/ui/login/IntroViewModel.kt @@ -1,8 +1,8 @@ -package com.eatssu.android.presentation.login +package com.eatssu.android.ui.login import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.eatssu.android.domain.usecase.GetAccessTokenUseCase +import com.eatssu.android.data.usecase.GetAccessTokenUseCase 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/presentation/login/LoginActivity.kt b/app/src/main/java/com/eatssu/android/ui/login/LoginActivity.kt similarity index 97% rename from app/src/main/java/com/eatssu/android/presentation/login/LoginActivity.kt rename to app/src/main/java/com/eatssu/android/ui/login/LoginActivity.kt index c982e0a1..82cd2393 100644 --- a/app/src/main/java/com/eatssu/android/presentation/login/LoginActivity.kt +++ b/app/src/main/java/com/eatssu/android/ui/login/LoginActivity.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.presentation.login +package com.eatssu.android.ui.login import android.os.Bundle import android.view.View @@ -6,7 +6,7 @@ import androidx.activity.viewModels import androidx.lifecycle.lifecycleScope import com.eatssu.android.base.BaseActivity import com.eatssu.android.databinding.ActivityLoginBinding -import com.eatssu.android.presentation.main.MainActivity +import com.eatssu.android.ui.main.MainActivity import com.eatssu.android.util.extension.showToast import com.eatssu.android.util.extension.startActivity import com.kakao.sdk.common.model.ClientError diff --git a/app/src/main/java/com/eatssu/android/presentation/login/LoginViewModel.kt b/app/src/main/java/com/eatssu/android/ui/login/LoginViewModel.kt similarity index 89% rename from app/src/main/java/com/eatssu/android/presentation/login/LoginViewModel.kt rename to app/src/main/java/com/eatssu/android/ui/login/LoginViewModel.kt index 57a28e27..435399ec 100644 --- a/app/src/main/java/com/eatssu/android/presentation/login/LoginViewModel.kt +++ b/app/src/main/java/com/eatssu/android/ui/login/LoginViewModel.kt @@ -1,14 +1,14 @@ -package com.eatssu.android.presentation.login +package com.eatssu.android.ui.login import android.content.Context import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.eatssu.android.R import com.eatssu.android.data.dto.request.LoginWithKakaoRequest -import com.eatssu.android.domain.usecase.LoginUseCase -import com.eatssu.android.domain.usecase.SetAccessTokenUseCase -import com.eatssu.android.domain.usecase.SetRefreshTokenUseCase -import com.eatssu.android.domain.usecase.SetUserEmailUseCase +import com.eatssu.android.data.usecase.LoginUseCase +import com.eatssu.android.data.usecase.SetAccessTokenUseCase +import com.eatssu.android.data.usecase.SetRefreshTokenUseCase +import com.eatssu.android.data.usecase.SetUserEmailUseCase import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/com/eatssu/android/presentation/login/UserApiClient.kt b/app/src/main/java/com/eatssu/android/ui/login/UserApiClient.kt similarity index 98% rename from app/src/main/java/com/eatssu/android/presentation/login/UserApiClient.kt rename to app/src/main/java/com/eatssu/android/ui/login/UserApiClient.kt index d9f0c70c..9ea55ba1 100644 --- a/app/src/main/java/com/eatssu/android/presentation/login/UserApiClient.kt +++ b/app/src/main/java/com/eatssu/android/ui/login/UserApiClient.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.presentation.login +package com.eatssu.android.ui.login import android.content.Context import com.kakao.sdk.auth.model.OAuthToken diff --git a/app/src/main/java/com/eatssu/android/presentation/main/MainActivity.kt b/app/src/main/java/com/eatssu/android/ui/main/MainActivity.kt similarity index 94% rename from app/src/main/java/com/eatssu/android/presentation/main/MainActivity.kt rename to app/src/main/java/com/eatssu/android/ui/main/MainActivity.kt index d996d83b..a7d1ab43 100644 --- a/app/src/main/java/com/eatssu/android/presentation/main/MainActivity.kt +++ b/app/src/main/java/com/eatssu/android/ui/main/MainActivity.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.presentation.main +package com.eatssu.android.ui.main import android.annotation.SuppressLint import android.content.Intent @@ -21,12 +21,12 @@ import androidx.viewpager2.widget.ViewPager2 import com.eatssu.android.R import com.eatssu.android.base.BaseActivity import com.eatssu.android.databinding.ActivityMainBinding -import com.eatssu.android.presentation.main.calendar.CalendarAdapter -import com.eatssu.android.presentation.main.calendar.CalendarAdapter.OnItemListener -import com.eatssu.android.presentation.main.calendar.CalendarViewModel -import com.eatssu.android.presentation.mypage.MyPageActivity -import com.eatssu.android.presentation.mypage.MyPageViewModel -import com.eatssu.android.presentation.mypage.usernamechange.UserNameChangeActivity +import com.eatssu.android.ui.main.calendar.CalendarAdapter +import com.eatssu.android.ui.main.calendar.CalendarAdapter.OnItemListener +import com.eatssu.android.ui.main.calendar.CalendarViewModel +import com.eatssu.android.ui.mypage.MyPageActivity +import com.eatssu.android.ui.mypage.MyPageViewModel +import com.eatssu.android.ui.mypage.usernamechange.UserNameChangeActivity import com.eatssu.android.util.CalendarUtils import com.eatssu.android.util.CalendarUtils.daysInWeekArray import com.eatssu.android.util.CalendarUtils.monthYearFromDate diff --git a/app/src/main/java/com/eatssu/android/presentation/main/MainViewModel.kt b/app/src/main/java/com/eatssu/android/ui/main/MainViewModel.kt similarity index 96% rename from app/src/main/java/com/eatssu/android/presentation/main/MainViewModel.kt rename to app/src/main/java/com/eatssu/android/ui/main/MainViewModel.kt index 217923e3..07acdaad 100644 --- a/app/src/main/java/com/eatssu/android/presentation/main/MainViewModel.kt +++ b/app/src/main/java/com/eatssu/android/ui/main/MainViewModel.kt @@ -1,10 +1,10 @@ -package com.eatssu.android.presentation.main +package com.eatssu.android.ui.main import android.content.Context import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.eatssu.android.R -import com.eatssu.android.domain.usecase.GetUserInfoUseCase +import com.eatssu.android.data.usecase.GetUserInfoUseCase import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/com/eatssu/android/presentation/main/ViewPager2Adapter.kt b/app/src/main/java/com/eatssu/android/ui/main/ViewPager2Adapter.kt similarity index 94% rename from app/src/main/java/com/eatssu/android/presentation/main/ViewPager2Adapter.kt rename to app/src/main/java/com/eatssu/android/ui/main/ViewPager2Adapter.kt index 691b055c..32b390b6 100644 --- a/app/src/main/java/com/eatssu/android/presentation/main/ViewPager2Adapter.kt +++ b/app/src/main/java/com/eatssu/android/ui/main/ViewPager2Adapter.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.presentation.main +package com.eatssu.android.ui.main import android.os.Build import androidx.annotation.RequiresApi @@ -6,7 +6,7 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity import androidx.viewpager2.adapter.FragmentStateAdapter import com.eatssu.android.data.enums.Time -import com.eatssu.android.presentation.main.menu.MenuFragment +import com.eatssu.android.ui.main.menu.MenuFragment import java.time.LocalTime class ViewPager2Adapter(fragmentActivity: FragmentActivity) : diff --git a/app/src/main/java/com/eatssu/android/presentation/main/calendar/CalendarAdapter.kt b/app/src/main/java/com/eatssu/android/ui/main/calendar/CalendarAdapter.kt similarity index 98% rename from app/src/main/java/com/eatssu/android/presentation/main/calendar/CalendarAdapter.kt rename to app/src/main/java/com/eatssu/android/ui/main/calendar/CalendarAdapter.kt index 23fad653..372ad2b6 100644 --- a/app/src/main/java/com/eatssu/android/presentation/main/calendar/CalendarAdapter.kt +++ b/app/src/main/java/com/eatssu/android/ui/main/calendar/CalendarAdapter.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.presentation.main.calendar +package com.eatssu.android.ui.main.calendar import android.os.Build import android.view.LayoutInflater diff --git a/app/src/main/java/com/eatssu/android/presentation/main/calendar/CalendarViewHolder.kt b/app/src/main/java/com/eatssu/android/ui/main/calendar/CalendarViewHolder.kt similarity index 84% rename from app/src/main/java/com/eatssu/android/presentation/main/calendar/CalendarViewHolder.kt rename to app/src/main/java/com/eatssu/android/ui/main/calendar/CalendarViewHolder.kt index 96efac8a..d240f2f3 100644 --- a/app/src/main/java/com/eatssu/android/presentation/main/calendar/CalendarViewHolder.kt +++ b/app/src/main/java/com/eatssu/android/ui/main/calendar/CalendarViewHolder.kt @@ -1,10 +1,14 @@ -package com.eatssu.android.presentation.main.calendar +package com.eatssu.android.ui.main.calendar +import android.os.Build +import com.eatssu.android.R import android.view.View import android.widget.TextView +import androidx.annotation.RequiresApi import androidx.recyclerview.widget.RecyclerView import com.eatssu.android.databinding.ItemCalendarListBinding import java.time.LocalDate +import java.time.format.DateTimeFormatter class CalendarViewHolder internal constructor( binding: ItemCalendarListBinding, diff --git a/app/src/main/java/com/eatssu/android/presentation/main/calendar/CalendarViewModel.kt b/app/src/main/java/com/eatssu/android/ui/main/calendar/CalendarViewModel.kt similarity index 89% rename from app/src/main/java/com/eatssu/android/presentation/main/calendar/CalendarViewModel.kt rename to app/src/main/java/com/eatssu/android/ui/main/calendar/CalendarViewModel.kt index 6d6b910a..cf00070c 100644 --- a/app/src/main/java/com/eatssu/android/presentation/main/calendar/CalendarViewModel.kt +++ b/app/src/main/java/com/eatssu/android/ui/main/calendar/CalendarViewModel.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.presentation.main.calendar +package com.eatssu.android.ui.main.calendar import android.util.Log import androidx.lifecycle.LiveData diff --git a/app/src/main/java/com/eatssu/android/presentation/main/menu/MenuAdapter.kt b/app/src/main/java/com/eatssu/android/ui/main/menu/MenuAdapter.kt similarity index 93% rename from app/src/main/java/com/eatssu/android/presentation/main/menu/MenuAdapter.kt rename to app/src/main/java/com/eatssu/android/ui/main/menu/MenuAdapter.kt index cb4778a2..a7e0c34a 100644 --- a/app/src/main/java/com/eatssu/android/presentation/main/menu/MenuAdapter.kt +++ b/app/src/main/java/com/eatssu/android/ui/main/menu/MenuAdapter.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.presentation.main.menu +package com.eatssu.android.ui.main.menu import android.util.Log import android.view.LayoutInflater @@ -8,9 +8,9 @@ import androidx.fragment.app.FragmentManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.eatssu.android.R -import com.eatssu.android.domain.model.Section +import com.eatssu.android.data.model.Section import com.eatssu.android.databinding.ItemCafeteriaSectionBinding -import com.eatssu.android.presentation.info.InfoBottomSheetFragment +import com.eatssu.android.ui.info.InfoBottomSheetFragment class MenuAdapter( private val fragmentManager: FragmentManager, diff --git a/app/src/main/java/com/eatssu/android/presentation/main/menu/MenuFragment.kt b/app/src/main/java/com/eatssu/android/ui/main/menu/MenuFragment.kt similarity index 96% rename from app/src/main/java/com/eatssu/android/presentation/main/menu/MenuFragment.kt rename to app/src/main/java/com/eatssu/android/ui/main/menu/MenuFragment.kt index 8f5de1f3..09686888 100644 --- a/app/src/main/java/com/eatssu/android/presentation/main/menu/MenuFragment.kt +++ b/app/src/main/java/com/eatssu/android/ui/main/menu/MenuFragment.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.presentation.main.menu +package com.eatssu.android.ui.main.menu import android.os.Build import android.os.Bundle @@ -17,12 +17,12 @@ import com.eatssu.android.data.dto.response.mapTodayMenuResponseToMenu import com.eatssu.android.data.enums.MenuType import com.eatssu.android.data.enums.Restaurant import com.eatssu.android.data.enums.Time +import com.eatssu.android.data.model.Section +import com.eatssu.android.data.service.MealService +import com.eatssu.android.data.service.MenuService import com.eatssu.android.databinding.FragmentMenuBinding -import com.eatssu.android.domain.model.Section -import com.eatssu.android.domain.service.MealService -import com.eatssu.android.domain.service.MenuService -import com.eatssu.android.presentation.info.InfoViewModel -import com.eatssu.android.presentation.main.calendar.CalendarViewModel +import com.eatssu.android.ui.info.InfoViewModel +import com.eatssu.android.ui.main.calendar.CalendarViewModel import com.eatssu.android.util.RetrofitImpl import java.time.DayOfWeek import java.time.LocalDate diff --git a/app/src/main/java/com/eatssu/android/presentation/main/menu/MenuSubAdapter.kt b/app/src/main/java/com/eatssu/android/ui/main/menu/MenuSubAdapter.kt similarity index 93% rename from app/src/main/java/com/eatssu/android/presentation/main/menu/MenuSubAdapter.kt rename to app/src/main/java/com/eatssu/android/ui/main/menu/MenuSubAdapter.kt index c36fee86..fc58f6fd 100644 --- a/app/src/main/java/com/eatssu/android/presentation/main/menu/MenuSubAdapter.kt +++ b/app/src/main/java/com/eatssu/android/ui/main/menu/MenuSubAdapter.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.presentation.main.menu +package com.eatssu.android.ui.main.menu import android.content.Intent import android.util.Log @@ -7,9 +7,9 @@ import android.view.ViewGroup import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.eatssu.android.data.enums.MenuType -import com.eatssu.android.domain.model.Menu +import com.eatssu.android.data.model.Menu import com.eatssu.android.databinding.ItemMenuBinding -import com.eatssu.android.presentation.review.list.ReviewActivity +import com.eatssu.android.ui.review.list.ReviewActivity class MenuSubAdapter( diff --git a/app/src/main/java/com/eatssu/android/presentation/main/menu/MenuViewModel.kt b/app/src/main/java/com/eatssu/android/ui/main/menu/MenuViewModel.kt similarity index 97% rename from app/src/main/java/com/eatssu/android/presentation/main/menu/MenuViewModel.kt rename to app/src/main/java/com/eatssu/android/ui/main/menu/MenuViewModel.kt index 8ec2ef7a..8d2b47eb 100644 --- a/app/src/main/java/com/eatssu/android/presentation/main/menu/MenuViewModel.kt +++ b/app/src/main/java/com/eatssu/android/ui/main/menu/MenuViewModel.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.presentation.main.menu +package com.eatssu.android.ui.main.menu import android.util.Log import androidx.lifecycle.LiveData @@ -12,9 +12,9 @@ import com.eatssu.android.data.dto.response.MenuOfMealResponse import com.eatssu.android.data.dto.response.asMenuOfMeal import com.eatssu.android.data.enums.Restaurant import com.eatssu.android.data.enums.Time -import com.eatssu.android.domain.model.MenuMini -import com.eatssu.android.domain.service.MealService -import com.eatssu.android.domain.service.MenuService +import com.eatssu.android.data.model.MenuMini +import com.eatssu.android.data.service.MealService +import com.eatssu.android.data.service.MenuService 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/presentation/main/menu/MenuViewModelFactory.kt b/app/src/main/java/com/eatssu/android/ui/main/menu/MenuViewModelFactory.kt similarity index 78% rename from app/src/main/java/com/eatssu/android/presentation/main/menu/MenuViewModelFactory.kt rename to app/src/main/java/com/eatssu/android/ui/main/menu/MenuViewModelFactory.kt index eb9ad7ad..81c19c8a 100644 --- a/app/src/main/java/com/eatssu/android/presentation/main/menu/MenuViewModelFactory.kt +++ b/app/src/main/java/com/eatssu/android/ui/main/menu/MenuViewModelFactory.kt @@ -1,9 +1,9 @@ -package com.eatssu.android.presentation.main.menu +package com.eatssu.android.ui.main.menu import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import com.eatssu.android.domain.service.MealService -import com.eatssu.android.domain.service.MenuService +import com.eatssu.android.data.service.MealService +import com.eatssu.android.data.service.MenuService class MenuViewModelFactory( private val menuService: MenuService, diff --git a/app/src/main/java/com/eatssu/android/presentation/mypage/DeveloperActivity.kt b/app/src/main/java/com/eatssu/android/ui/mypage/DeveloperActivity.kt similarity index 91% rename from app/src/main/java/com/eatssu/android/presentation/mypage/DeveloperActivity.kt rename to app/src/main/java/com/eatssu/android/ui/mypage/DeveloperActivity.kt index 04e991ae..39688525 100644 --- a/app/src/main/java/com/eatssu/android/presentation/mypage/DeveloperActivity.kt +++ b/app/src/main/java/com/eatssu/android/ui/mypage/DeveloperActivity.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.presentation.mypage +package com.eatssu.android.ui.mypage import android.os.Bundle import com.eatssu.android.R diff --git a/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageActivity.kt b/app/src/main/java/com/eatssu/android/ui/mypage/MyPageActivity.kt similarity index 96% rename from app/src/main/java/com/eatssu/android/presentation/mypage/MyPageActivity.kt rename to app/src/main/java/com/eatssu/android/ui/mypage/MyPageActivity.kt index 42679403..4645b303 100644 --- a/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageActivity.kt +++ b/app/src/main/java/com/eatssu/android/ui/mypage/MyPageActivity.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.presentation.mypage +package com.eatssu.android.ui.mypage import android.app.Activity @@ -21,10 +21,10 @@ import androidx.lifecycle.repeatOnLifecycle import com.eatssu.android.R import com.eatssu.android.base.BaseActivity import com.eatssu.android.databinding.ActivityMyPageBinding -import com.eatssu.android.presentation.login.LoginActivity -import com.eatssu.android.presentation.mypage.myreview.MyReviewListActivity -import com.eatssu.android.presentation.mypage.terms.WebViewActivity -import com.eatssu.android.presentation.mypage.usernamechange.UserNameChangeActivity +import com.eatssu.android.ui.login.LoginActivity +import com.eatssu.android.ui.mypage.myreview.MyReviewListActivity +import com.eatssu.android.ui.mypage.terms.WebViewActivity +import com.eatssu.android.ui.mypage.usernamechange.UserNameChangeActivity import com.eatssu.android.util.extension.showToast import com.eatssu.android.util.extension.startActivity import dagger.hilt.android.AndroidEntryPoint diff --git a/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageViewModel.kt b/app/src/main/java/com/eatssu/android/ui/mypage/MyPageViewModel.kt similarity index 91% rename from app/src/main/java/com/eatssu/android/presentation/mypage/MyPageViewModel.kt rename to app/src/main/java/com/eatssu/android/ui/mypage/MyPageViewModel.kt index 06a35d89..923213e3 100644 --- a/app/src/main/java/com/eatssu/android/presentation/mypage/MyPageViewModel.kt +++ b/app/src/main/java/com/eatssu/android/ui/mypage/MyPageViewModel.kt @@ -1,18 +1,18 @@ -package com.eatssu.android.presentation.mypage +package com.eatssu.android.ui.mypage import android.util.Log import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.eatssu.android.BuildConfig import com.eatssu.android.data.repository.PreferencesRepository -import com.eatssu.android.domain.usecase.AlarmUseCase -import com.eatssu.android.domain.usecase.GetDailyNotificationStatusUseCase -import com.eatssu.android.domain.usecase.GetUserInfoUseCase -import com.eatssu.android.domain.usecase.LogoutUseCase -import com.eatssu.android.domain.usecase.SetAccessTokenUseCase -import com.eatssu.android.domain.usecase.SetDailyNotificationStatusUseCase -import com.eatssu.android.domain.usecase.SetRefreshTokenUseCase -import com.eatssu.android.domain.usecase.SignOutUseCase +import com.eatssu.android.data.usecase.AlarmUseCase +import com.eatssu.android.data.usecase.GetDailyNotificationStatusUseCase +import com.eatssu.android.data.usecase.GetUserInfoUseCase +import com.eatssu.android.data.usecase.LogoutUseCase +import com.eatssu.android.data.usecase.SetAccessTokenUseCase +import com.eatssu.android.data.usecase.SetDailyNotificationStatusUseCase +import com.eatssu.android.data.usecase.SetRefreshTokenUseCase +import com.eatssu.android.data.usecase.SignOutUseCase 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/presentation/mypage/SignOutActivity.kt b/app/src/main/java/com/eatssu/android/ui/mypage/SignOutActivity.kt similarity index 98% rename from app/src/main/java/com/eatssu/android/presentation/mypage/SignOutActivity.kt rename to app/src/main/java/com/eatssu/android/ui/mypage/SignOutActivity.kt index 28f74e85..883d54cd 100644 --- a/app/src/main/java/com/eatssu/android/presentation/mypage/SignOutActivity.kt +++ b/app/src/main/java/com/eatssu/android/ui/mypage/SignOutActivity.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.presentation.mypage +package com.eatssu.android.ui.mypage import android.os.Bundle import android.text.Editable diff --git a/app/src/main/java/com/eatssu/android/presentation/mypage/SignOutViewModel.kt b/app/src/main/java/com/eatssu/android/ui/mypage/SignOutViewModel.kt similarity index 87% rename from app/src/main/java/com/eatssu/android/presentation/mypage/SignOutViewModel.kt rename to app/src/main/java/com/eatssu/android/ui/mypage/SignOutViewModel.kt index 415ee54c..91c76fbe 100644 --- a/app/src/main/java/com/eatssu/android/presentation/mypage/SignOutViewModel.kt +++ b/app/src/main/java/com/eatssu/android/ui/mypage/SignOutViewModel.kt @@ -1,13 +1,13 @@ -package com.eatssu.android.presentation.mypage +package com.eatssu.android.ui.mypage import android.util.Log import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.eatssu.android.domain.usecase.GetUserInfoUseCase -import com.eatssu.android.domain.usecase.LogoutUseCase -import com.eatssu.android.domain.usecase.SetAccessTokenUseCase -import com.eatssu.android.domain.usecase.SetRefreshTokenUseCase -import com.eatssu.android.domain.usecase.SignOutUseCase +import com.eatssu.android.data.usecase.GetUserInfoUseCase +import com.eatssu.android.data.usecase.LogoutUseCase +import com.eatssu.android.data.usecase.SetAccessTokenUseCase +import com.eatssu.android.data.usecase.SetRefreshTokenUseCase +import com.eatssu.android.data.usecase.SignOutUseCase 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/presentation/mypage/myreview/MyReviewAdapter.kt b/app/src/main/java/com/eatssu/android/ui/mypage/myreview/MyReviewAdapter.kt similarity index 92% rename from app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewAdapter.kt rename to app/src/main/java/com/eatssu/android/ui/mypage/myreview/MyReviewAdapter.kt index 5bc25fac..ba10ef14 100644 --- a/app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewAdapter.kt +++ b/app/src/main/java/com/eatssu/android/ui/mypage/myreview/MyReviewAdapter.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.presentation.mypage.myreview +package com.eatssu.android.ui.mypage.myreview import android.content.Intent import android.util.Log @@ -9,10 +9,10 @@ import android.widget.ImageView import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.eatssu.android.domain.model.Review +import com.eatssu.android.data.model.Review import com.eatssu.android.databinding.ItemReviewBinding -import com.eatssu.android.presentation.review.delete.MyReviewDialogActivity -import com.eatssu.android.data.db.MySharedPreferences +import com.eatssu.android.ui.review.delete.MyReviewDialogActivity +import com.eatssu.android.util.MySharedPreferences class MyReviewAdapter(private val dataList: List) : diff --git a/app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewListActivity.kt b/app/src/main/java/com/eatssu/android/ui/mypage/myreview/MyReviewListActivity.kt similarity index 95% rename from app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewListActivity.kt rename to app/src/main/java/com/eatssu/android/ui/mypage/myreview/MyReviewListActivity.kt index 90f811ee..ff730a59 100644 --- a/app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewListActivity.kt +++ b/app/src/main/java/com/eatssu/android/ui/mypage/myreview/MyReviewListActivity.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.presentation.mypage.myreview +package com.eatssu.android.ui.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.domain.model.Review +import com.eatssu.android.data.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/presentation/mypage/myreview/MyReviewViewModel.kt b/app/src/main/java/com/eatssu/android/ui/mypage/myreview/MyReviewViewModel.kt similarity index 92% rename from app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewViewModel.kt rename to app/src/main/java/com/eatssu/android/ui/mypage/myreview/MyReviewViewModel.kt index 9b02450f..9f846bd7 100644 --- a/app/src/main/java/com/eatssu/android/presentation/mypage/myreview/MyReviewViewModel.kt +++ b/app/src/main/java/com/eatssu/android/ui/mypage/myreview/MyReviewViewModel.kt @@ -1,11 +1,11 @@ -package com.eatssu.android.presentation.mypage.myreview +package com.eatssu.android.ui.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.domain.model.Review -import com.eatssu.android.domain.usecase.GetMyReviewsUseCase +import com.eatssu.android.data.model.Review +import com.eatssu.android.data.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/presentation/mypage/terms/WebViewActivity.kt b/app/src/main/java/com/eatssu/android/ui/mypage/terms/WebViewActivity.kt similarity index 96% rename from app/src/main/java/com/eatssu/android/presentation/mypage/terms/WebViewActivity.kt rename to app/src/main/java/com/eatssu/android/ui/mypage/terms/WebViewActivity.kt index dd98f5a2..da3ed88e 100644 --- a/app/src/main/java/com/eatssu/android/presentation/mypage/terms/WebViewActivity.kt +++ b/app/src/main/java/com/eatssu/android/ui/mypage/terms/WebViewActivity.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.presentation.mypage.terms +package com.eatssu.android.ui.mypage.terms import android.os.Bundle import android.util.Log diff --git a/app/src/main/java/com/eatssu/android/presentation/mypage/usernamechange/UserNameChangeActivity.kt b/app/src/main/java/com/eatssu/android/ui/mypage/usernamechange/UserNameChangeActivity.kt similarity index 98% rename from app/src/main/java/com/eatssu/android/presentation/mypage/usernamechange/UserNameChangeActivity.kt rename to app/src/main/java/com/eatssu/android/ui/mypage/usernamechange/UserNameChangeActivity.kt index 5c5d20de..2412f989 100644 --- a/app/src/main/java/com/eatssu/android/presentation/mypage/usernamechange/UserNameChangeActivity.kt +++ b/app/src/main/java/com/eatssu/android/ui/mypage/usernamechange/UserNameChangeActivity.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.presentation.mypage.usernamechange +package com.eatssu.android.ui.mypage.usernamechange import android.os.Bundle import android.text.Editable diff --git a/app/src/main/java/com/eatssu/android/presentation/mypage/usernamechange/UserNameChangeViewModel.kt b/app/src/main/java/com/eatssu/android/ui/mypage/usernamechange/UserNameChangeViewModel.kt similarity index 92% rename from app/src/main/java/com/eatssu/android/presentation/mypage/usernamechange/UserNameChangeViewModel.kt rename to app/src/main/java/com/eatssu/android/ui/mypage/usernamechange/UserNameChangeViewModel.kt index 695e449f..9ea99a02 100644 --- a/app/src/main/java/com/eatssu/android/presentation/mypage/usernamechange/UserNameChangeViewModel.kt +++ b/app/src/main/java/com/eatssu/android/ui/mypage/usernamechange/UserNameChangeViewModel.kt @@ -1,11 +1,11 @@ -package com.eatssu.android.presentation.mypage.usernamechange +package com.eatssu.android.ui.mypage.usernamechange import android.util.Log import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.eatssu.android.domain.usecase.GetUserNameUseCase -import com.eatssu.android.domain.usecase.SetUserNameUseCase -import com.eatssu.android.domain.usecase.ValidateUserNameUseCase +import com.eatssu.android.data.usecase.GetUserNameUseCase +import com.eatssu.android.data.usecase.SetUserNameUseCase +import com.eatssu.android.data.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/presentation/review/delete/DeleteViewModel.kt b/app/src/main/java/com/eatssu/android/ui/review/delete/DeleteViewModel.kt similarity index 94% rename from app/src/main/java/com/eatssu/android/presentation/review/delete/DeleteViewModel.kt rename to app/src/main/java/com/eatssu/android/ui/review/delete/DeleteViewModel.kt index 4095fb51..140585e5 100644 --- a/app/src/main/java/com/eatssu/android/presentation/review/delete/DeleteViewModel.kt +++ b/app/src/main/java/com/eatssu/android/ui/review/delete/DeleteViewModel.kt @@ -1,11 +1,11 @@ -package com.eatssu.android.presentation.review.delete +package com.eatssu.android.ui.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.domain.service.ReviewService +import com.eatssu.android.data.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/presentation/review/delete/MyReviewDialogActivity.kt b/app/src/main/java/com/eatssu/android/ui/review/delete/MyReviewDialogActivity.kt similarity index 95% rename from app/src/main/java/com/eatssu/android/presentation/review/delete/MyReviewDialogActivity.kt rename to app/src/main/java/com/eatssu/android/ui/review/delete/MyReviewDialogActivity.kt index 5e7917e0..514450da 100644 --- a/app/src/main/java/com/eatssu/android/presentation/review/delete/MyReviewDialogActivity.kt +++ b/app/src/main/java/com/eatssu/android/ui/review/delete/MyReviewDialogActivity.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.presentation.review.delete +package com.eatssu.android.ui.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.presentation.review.modify.ModifyReviewActivity +import com.eatssu.android.ui.review.modify.ModifyReviewActivity class MyReviewDialogActivity : AppCompatActivity() { private lateinit var binding: ActivityMyReviewDialogBinding diff --git a/app/src/main/java/com/eatssu/android/presentation/review/list/ReviewActivity.kt b/app/src/main/java/com/eatssu/android/ui/review/list/ReviewActivity.kt similarity index 95% rename from app/src/main/java/com/eatssu/android/presentation/review/list/ReviewActivity.kt rename to app/src/main/java/com/eatssu/android/ui/review/list/ReviewActivity.kt index 11b85436..06b0f04e 100644 --- a/app/src/main/java/com/eatssu/android/presentation/review/list/ReviewActivity.kt +++ b/app/src/main/java/com/eatssu/android/ui/review/list/ReviewActivity.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.presentation.review.list +package com.eatssu.android.ui.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.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.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.util.RetrofitImpl.retrofit import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.collectLatest diff --git a/app/src/main/java/com/eatssu/android/presentation/review/list/ReviewAdapter.kt b/app/src/main/java/com/eatssu/android/ui/review/list/ReviewAdapter.kt similarity index 95% rename from app/src/main/java/com/eatssu/android/presentation/review/list/ReviewAdapter.kt rename to app/src/main/java/com/eatssu/android/ui/review/list/ReviewAdapter.kt index 11273ba5..09548ac7 100644 --- a/app/src/main/java/com/eatssu/android/presentation/review/list/ReviewAdapter.kt +++ b/app/src/main/java/com/eatssu/android/ui/review/list/ReviewAdapter.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.presentation.review.list +package com.eatssu.android.ui.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.domain.model.Review +import com.eatssu.android.data.model.Review import com.eatssu.android.databinding.ItemReviewBinding -import com.eatssu.android.presentation.review.modify.ModifyReviewActivity -import com.eatssu.android.presentation.review.report.ReportActivity +import com.eatssu.android.ui.review.modify.ModifyReviewActivity +import com.eatssu.android.ui.review.report.ReportActivity class ReviewAdapter( diff --git a/app/src/main/java/com/eatssu/android/presentation/review/list/ReviewViewModel.kt b/app/src/main/java/com/eatssu/android/ui/review/list/ReviewViewModel.kt similarity index 97% rename from app/src/main/java/com/eatssu/android/presentation/review/list/ReviewViewModel.kt rename to app/src/main/java/com/eatssu/android/ui/review/list/ReviewViewModel.kt index f6b74ec5..36a4d80d 100644 --- a/app/src/main/java/com/eatssu/android/presentation/review/list/ReviewViewModel.kt +++ b/app/src/main/java/com/eatssu/android/ui/review/list/ReviewViewModel.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.presentation.review.list +package com.eatssu.android.ui.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.domain.model.Review -import com.eatssu.android.domain.model.ReviewInfo -import com.eatssu.android.domain.service.ReviewService +import com.eatssu.android.data.model.Review +import com.eatssu.android.data.model.ReviewInfo +import com.eatssu.android.data.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/presentation/review/list/ReviewViewModelFactory.kt b/app/src/main/java/com/eatssu/android/ui/review/list/ReviewViewModelFactory.kt similarity index 83% rename from app/src/main/java/com/eatssu/android/presentation/review/list/ReviewViewModelFactory.kt rename to app/src/main/java/com/eatssu/android/ui/review/list/ReviewViewModelFactory.kt index 0d61152e..9f2544de 100644 --- a/app/src/main/java/com/eatssu/android/presentation/review/list/ReviewViewModelFactory.kt +++ b/app/src/main/java/com/eatssu/android/ui/review/list/ReviewViewModelFactory.kt @@ -1,8 +1,8 @@ -package com.eatssu.android.presentation.review.list +package com.eatssu.android.ui.review.list import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import com.eatssu.android.domain.service.ReviewService +import com.eatssu.android.data.service.ReviewService class ReviewViewModelFactory( private val reviewService: ReviewService, diff --git a/app/src/main/java/com/eatssu/android/presentation/review/modify/ModifyReviewActivity.kt b/app/src/main/java/com/eatssu/android/ui/review/modify/ModifyReviewActivity.kt similarity index 98% rename from app/src/main/java/com/eatssu/android/presentation/review/modify/ModifyReviewActivity.kt rename to app/src/main/java/com/eatssu/android/ui/review/modify/ModifyReviewActivity.kt index 2d3a9b96..104edc80 100644 --- a/app/src/main/java/com/eatssu/android/presentation/review/modify/ModifyReviewActivity.kt +++ b/app/src/main/java/com/eatssu/android/ui/review/modify/ModifyReviewActivity.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.presentation.review.modify +package com.eatssu.android.ui.review.modify import android.os.Bundle import android.util.Log diff --git a/app/src/main/java/com/eatssu/android/presentation/review/modify/ModifyViewModel.kt b/app/src/main/java/com/eatssu/android/ui/review/modify/ModifyViewModel.kt similarity index 96% rename from app/src/main/java/com/eatssu/android/presentation/review/modify/ModifyViewModel.kt rename to app/src/main/java/com/eatssu/android/ui/review/modify/ModifyViewModel.kt index 1f5bab2b..9ed7c85e 100644 --- a/app/src/main/java/com/eatssu/android/presentation/review/modify/ModifyViewModel.kt +++ b/app/src/main/java/com/eatssu/android/ui/review/modify/ModifyViewModel.kt @@ -1,10 +1,10 @@ -package com.eatssu.android.presentation.review.modify +package com.eatssu.android.ui.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.domain.service.ReviewService +import com.eatssu.android.data.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/presentation/review/report/OthersReviewDialogActivity.kt b/app/src/main/java/com/eatssu/android/ui/review/report/OthersReviewDialogActivity.kt similarity index 95% rename from app/src/main/java/com/eatssu/android/presentation/review/report/OthersReviewDialogActivity.kt rename to app/src/main/java/com/eatssu/android/ui/review/report/OthersReviewDialogActivity.kt index 112322fc..a9e15406 100644 --- a/app/src/main/java/com/eatssu/android/presentation/review/report/OthersReviewDialogActivity.kt +++ b/app/src/main/java/com/eatssu/android/ui/review/report/OthersReviewDialogActivity.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.presentation.review.report +package com.eatssu.android.ui.review.report import android.content.Intent import android.os.Bundle diff --git a/app/src/main/java/com/eatssu/android/presentation/review/report/ReportActivity.kt b/app/src/main/java/com/eatssu/android/ui/review/report/ReportActivity.kt similarity index 98% rename from app/src/main/java/com/eatssu/android/presentation/review/report/ReportActivity.kt rename to app/src/main/java/com/eatssu/android/ui/review/report/ReportActivity.kt index 00d93337..94b278cd 100644 --- a/app/src/main/java/com/eatssu/android/presentation/review/report/ReportActivity.kt +++ b/app/src/main/java/com/eatssu/android/ui/review/report/ReportActivity.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.presentation.review.report +package com.eatssu.android.ui.review.report import android.os.Bundle import android.text.Editable diff --git a/app/src/main/java/com/eatssu/android/presentation/review/report/ReportViewModel.kt b/app/src/main/java/com/eatssu/android/ui/review/report/ReportViewModel.kt similarity index 89% rename from app/src/main/java/com/eatssu/android/presentation/review/report/ReportViewModel.kt rename to app/src/main/java/com/eatssu/android/ui/review/report/ReportViewModel.kt index 26e750cb..870395b1 100644 --- a/app/src/main/java/com/eatssu/android/presentation/review/report/ReportViewModel.kt +++ b/app/src/main/java/com/eatssu/android/ui/review/report/ReportViewModel.kt @@ -1,11 +1,11 @@ -package com.eatssu.android.presentation.review.report +package com.eatssu.android.ui.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.domain.usecase.PostReportUseCase -import com.eatssu.android.presentation.mypage.usernamechange.UserNameChangeViewModel.Companion.TAG +import com.eatssu.android.data.usecase.PostReportUseCase +import com.eatssu.android.ui.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/presentation/review/write/ImageViewModel.kt b/app/src/main/java/com/eatssu/android/ui/review/write/ImageViewModel.kt similarity index 97% rename from app/src/main/java/com/eatssu/android/presentation/review/write/ImageViewModel.kt rename to app/src/main/java/com/eatssu/android/ui/review/write/ImageViewModel.kt index 7aa7a79a..2f1ccf9e 100644 --- a/app/src/main/java/com/eatssu/android/presentation/review/write/ImageViewModel.kt +++ b/app/src/main/java/com/eatssu/android/ui/review/write/ImageViewModel.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.presentation.review.write +package com.eatssu.android.ui.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.domain.service.ImageService +import com.eatssu.android.data.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/presentation/review/write/ImageViewModelFactory.kt b/app/src/main/java/com/eatssu/android/ui/review/write/ImageViewModelFactory.kt similarity index 82% rename from app/src/main/java/com/eatssu/android/presentation/review/write/ImageViewModelFactory.kt rename to app/src/main/java/com/eatssu/android/ui/review/write/ImageViewModelFactory.kt index 2da6e4ed..38e7c67c 100644 --- a/app/src/main/java/com/eatssu/android/presentation/review/write/ImageViewModelFactory.kt +++ b/app/src/main/java/com/eatssu/android/ui/review/write/ImageViewModelFactory.kt @@ -1,8 +1,8 @@ -package com.eatssu.android.presentation.review.write +package com.eatssu.android.ui.review.write import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import com.eatssu.android.domain.service.ImageService +import com.eatssu.android.data.service.ImageService class ImageViewModelFactory(private val imageService: ImageService) : ViewModelProvider.Factory { diff --git a/app/src/main/java/com/eatssu/android/presentation/review/write/ReviewWriteRateActivity.kt b/app/src/main/java/com/eatssu/android/ui/review/write/ReviewWriteRateActivity.kt similarity index 98% rename from app/src/main/java/com/eatssu/android/presentation/review/write/ReviewWriteRateActivity.kt rename to app/src/main/java/com/eatssu/android/ui/review/write/ReviewWriteRateActivity.kt index 293e29b3..ef5899cf 100644 --- a/app/src/main/java/com/eatssu/android/presentation/review/write/ReviewWriteRateActivity.kt +++ b/app/src/main/java/com/eatssu/android/ui/review/write/ReviewWriteRateActivity.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.presentation.review.write +package com.eatssu.android.ui.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/presentation/review/write/ReviewWriteViewModel.kt b/app/src/main/java/com/eatssu/android/ui/review/write/ReviewWriteViewModel.kt similarity index 97% rename from app/src/main/java/com/eatssu/android/presentation/review/write/ReviewWriteViewModel.kt rename to app/src/main/java/com/eatssu/android/ui/review/write/ReviewWriteViewModel.kt index 6ae31eb3..eb619c59 100644 --- a/app/src/main/java/com/eatssu/android/presentation/review/write/ReviewWriteViewModel.kt +++ b/app/src/main/java/com/eatssu/android/ui/review/write/ReviewWriteViewModel.kt @@ -1,11 +1,11 @@ -package com.eatssu.android.presentation.review.write +package com.eatssu.android.ui.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.domain.service.ReviewService +import com.eatssu.android.data.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/presentation/review/write/ReviewWriteViewModelFactory.kt b/app/src/main/java/com/eatssu/android/ui/review/write/ReviewWriteViewModelFactory.kt similarity index 82% rename from app/src/main/java/com/eatssu/android/presentation/review/write/ReviewWriteViewModelFactory.kt rename to app/src/main/java/com/eatssu/android/ui/review/write/ReviewWriteViewModelFactory.kt index 2bb67c8a..40a55abc 100644 --- a/app/src/main/java/com/eatssu/android/presentation/review/write/ReviewWriteViewModelFactory.kt +++ b/app/src/main/java/com/eatssu/android/ui/review/write/ReviewWriteViewModelFactory.kt @@ -1,8 +1,8 @@ -package com.eatssu.android.presentation.review.write +package com.eatssu.android.ui.review.write import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import com.eatssu.android.domain.service.ReviewService +import com.eatssu.android.data.service.ReviewService class ReviewWriteViewModelFactory(private val reviewService: ReviewService) : ViewModelProvider.Factory { diff --git a/app/src/main/java/com/eatssu/android/presentation/review/write/menu/ReviewWriteMenuActivity.kt b/app/src/main/java/com/eatssu/android/ui/review/write/menu/ReviewWriteMenuActivity.kt similarity index 94% rename from app/src/main/java/com/eatssu/android/presentation/review/write/menu/ReviewWriteMenuActivity.kt rename to app/src/main/java/com/eatssu/android/ui/review/write/menu/ReviewWriteMenuActivity.kt index 18db2ae4..74b50dac 100644 --- a/app/src/main/java/com/eatssu/android/presentation/review/write/menu/ReviewWriteMenuActivity.kt +++ b/app/src/main/java/com/eatssu/android/ui/review/write/menu/ReviewWriteMenuActivity.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.presentation.review.write.menu +package com.eatssu.android.ui.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.domain.service.MealService -import com.eatssu.android.presentation.review.write.ReviewWriteRateActivity +import com.eatssu.android.ui.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/presentation/review/write/menu/VariableMenuModelFactory.kt b/app/src/main/java/com/eatssu/android/ui/review/write/menu/VariableMenuModelFactory.kt similarity index 82% rename from app/src/main/java/com/eatssu/android/presentation/review/write/menu/VariableMenuModelFactory.kt rename to app/src/main/java/com/eatssu/android/ui/review/write/menu/VariableMenuModelFactory.kt index 204764b2..b0724249 100644 --- a/app/src/main/java/com/eatssu/android/presentation/review/write/menu/VariableMenuModelFactory.kt +++ b/app/src/main/java/com/eatssu/android/ui/review/write/menu/VariableMenuModelFactory.kt @@ -1,8 +1,8 @@ -package com.eatssu.android.presentation.review.write.menu +package com.eatssu.android.ui.review.write.menu import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import com.eatssu.android.domain.service.MealService +import com.eatssu.android.data.service.MealService class VariableMenuModelFactory(private val mealService: MealService) : ViewModelProvider.Factory { diff --git a/app/src/main/java/com/eatssu/android/presentation/review/write/menu/VariableMenuPickAdapter.kt b/app/src/main/java/com/eatssu/android/ui/review/write/menu/VariableMenuPickAdapter.kt similarity index 94% rename from app/src/main/java/com/eatssu/android/presentation/review/write/menu/VariableMenuPickAdapter.kt rename to app/src/main/java/com/eatssu/android/ui/review/write/menu/VariableMenuPickAdapter.kt index a40d2f36..93eb9309 100644 --- a/app/src/main/java/com/eatssu/android/presentation/review/write/menu/VariableMenuPickAdapter.kt +++ b/app/src/main/java/com/eatssu/android/ui/review/write/menu/VariableMenuPickAdapter.kt @@ -1,9 +1,9 @@ -package com.eatssu.android.presentation.review.write.menu +package com.eatssu.android.ui.review.write.menu import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.eatssu.android.domain.model.MenuMini +import com.eatssu.android.data.model.MenuMini import com.eatssu.android.databinding.ItemMenuPickBinding class VariableMenuPickAdapter(private val menuList: List) : diff --git a/app/src/main/java/com/eatssu/android/presentation/review/write/menu/VariableMenuViewModel.kt b/app/src/main/java/com/eatssu/android/ui/review/write/menu/VariableMenuViewModel.kt similarity index 93% rename from app/src/main/java/com/eatssu/android/presentation/review/write/menu/VariableMenuViewModel.kt rename to app/src/main/java/com/eatssu/android/ui/review/write/menu/VariableMenuViewModel.kt index 9dfa0aa1..d13842d0 100644 --- a/app/src/main/java/com/eatssu/android/presentation/review/write/menu/VariableMenuViewModel.kt +++ b/app/src/main/java/com/eatssu/android/ui/review/write/menu/VariableMenuViewModel.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.presentation.review.write.menu +package com.eatssu.android.ui.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.domain.model.MenuMini -import com.eatssu.android.domain.service.MealService +import com.eatssu.android.data.model.MenuMini +import com.eatssu.android.data.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/data/db/MySharedPreferences.kt b/app/src/main/java/com/eatssu/android/util/MySharedPreferences.kt similarity index 99% rename from app/src/main/java/com/eatssu/android/data/db/MySharedPreferences.kt rename to app/src/main/java/com/eatssu/android/util/MySharedPreferences.kt index 640f6bea..241f0de5 100644 --- a/app/src/main/java/com/eatssu/android/data/db/MySharedPreferences.kt +++ b/app/src/main/java/com/eatssu/android/util/MySharedPreferences.kt @@ -1,4 +1,4 @@ -package com.eatssu.android.data.db +package com.eatssu.android.util import android.content.Context 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 6ec0d6dd..3d40135d 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.presentation.main.MainActivity +import com.eatssu.android.ui.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 39fbae87..c010dd80 100644 --- a/app/src/main/java/com/eatssu/android/util/RetrofitImpl.kt +++ b/app/src/main/java/com/eatssu/android/util/RetrofitImpl.kt @@ -11,10 +11,9 @@ 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.presentation.login.LoginActivity +import com.eatssu.android.ui.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 362d871a..06a7e6eb 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=".presentation.mypage.DeveloperActivity"> + tools:context=".ui.mypage.DeveloperActivity"> + tools:context=".ui.review.modify.ModifyReviewActivity"> + tools:context=".ui.info.InfoActivity"> + tools:context=".ui.login.IntroActivity"> + tools:context=".ui.login.LoginActivity"> + tools:context=".ui.main.MainActivity"> + tools:context=".ui.mypage.MyPageActivity"> + tools:context=".ui.review.delete.MyReviewDialogActivity"> + tools:context=".ui.review.list.ReviewActivity"> + tools:context=".ui.review.report.OthersReviewDialogActivity"> + tools:context=".ui.review.report.ReportActivity"> + type="com.eatssu.android.ui.review.list.ReviewViewModel" /> + tools:context=".ui.review.list.ReviewActivity"> + tools:context=".ui.review.write.menu.ReviewWriteMenuActivity"> + type="com.eatssu.android.ui.review.write.UploadReviewViewModel" /> + tools:context=".ui.review.write.ReviewWriteRateActivity"> + tools:context=".ui.mypage.SignOutActivity"> + tools:context=".ui.mypage.usernamechange.UserNameChangeActivity"> + tools:context=".ui.mypage.terms.WebViewActivity">