Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Refactor/package #230

Merged
merged 2 commits into from
Oct 16, 2024
Merged

Refactor/package #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
198aba7
chore: change package name
HI-JIN2 Oct 10, 2024
93e97ef
clean
HI-JIN2 Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,17 @@
</receiver>

<activity
android:name=".ui.mypage.DeveloperActivity"
android:name=".presentation.mypage.DeveloperActivity"
android:exported="false" />
<activity
android:name=".ui.mypage.SignOutActivity"
android:name=".presentation.mypage.SignOutActivity"
android:exported="false"
android:windowSoftInputMode="adjustResize" />
<activity
android:name=".ui.mypage.terms.WebViewActivity"
android:name=".presentation.mypage.terms.WebViewActivity"
android:exported="false" />
<activity
android:name=".ui.login.IntroActivity"
android:name=".presentation.login.IntroActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand All @@ -71,31 +71,31 @@
</intent-filter>
</activity>
<activity
android:name=".ui.review.write.ReviewWriteRateActivity"
android:name=".presentation.review.write.ReviewWriteRateActivity"
android:exported="true">
<meta-data
android:name="android.app.lib_name"
android:value="" />
</activity>
<activity
android:name=".ui.review.write.menu.ReviewWriteMenuActivity"
android:name=".presentation.review.write.menu.ReviewWriteMenuActivity"
android:exported="false" />
<activity
android:name=".ui.login.LoginActivity"
android:name=".presentation.login.LoginActivity"
android:exported="true">
<meta-data
android:name="android.app.lib_name"
android:value="" />
</activity>
<activity
android:name=".ui.common.AndroidMessageDialogActivity"
android:name=".presentation.common.AndroidMessageDialogActivity"
android:exported="true">
<meta-data
android:name="android.app.lib_name"
android:value="" />
</activity>
<activity
android:name=".ui.common.ForceUpdateDialogActivity"
android:name=".presentation.common.ForceUpdateDialogActivity"
android:exported="true">
<meta-data
android:name="android.app.lib_name"
Expand Down Expand Up @@ -123,67 +123,67 @@
android:value="" />
</activity>
<activity
android:name=".ui.mypage.usernamechange.UserNameChangeActivity"
android:name=".presentation.mypage.usernamechange.UserNameChangeActivity"
android:exported="true"
android:windowSoftInputMode="adjustResize">
<meta-data
android:name="android.app.lib_name"
android:value="" />
</activity>
<activity
android:name=".ui.mypage.myreview.MyReviewListActivity"
android:name=".presentation.mypage.myreview.MyReviewListActivity"
android:exported="true">
<meta-data
android:name="android.app.lib_name"
android:value="" />
</activity>
<activity
android:name=".ui.review.list.ReviewActivity"
android:name=".presentation.review.list.ReviewActivity"
android:exported="true">
<meta-data
android:name="android.app.lib_name"
android:value="" />
</activity>
<activity
android:name=".ui.mypage.MyPageActivity"
android:name=".presentation.mypage.MyPageActivity"
android:exported="true">
<meta-data
android:name="android.app.lib_name"
android:value="" />
</activity>

<activity
android:name=".ui.main.MainActivity"
android:name=".presentation.main.MainActivity"
android:exported="true">
<meta-data
android:name="android.app.lib_name"
android:value="" />
</activity>
<activity
android:name=".ui.review.report.OthersReviewDialogActivity"
android:name=".presentation.review.report.OthersReviewDialogActivity"
android:exported="true"
android:theme="@style/Theme.MyDialog">
<meta-data
android:name="android.app.lib_name"
android:value="" />
</activity>
<activity
android:name=".ui.review.delete.MyReviewDialogActivity"
android:name=".presentation.review.delete.MyReviewDialogActivity"
android:exported="true"
android:theme="@style/Theme.MyDialog">
<meta-data
android:name="android.app.lib_name"
android:value="" />
</activity>
<activity
android:name=".ui.review.report.ReportActivity"
android:name=".presentation.review.report.ReportActivity"
android:exported="true">
<meta-data
android:name="android.app.lib_name"
android:value="" />
</activity>
<activity
android:name=".ui.review.modify.ModifyReviewActivity"
android:name=".presentation.review.modify.ModifyReviewActivity"
android:exported="true">
<meta-data
android:name="android.app.lib_name"
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/com/eatssu/android/base/BaseActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ import androidx.lifecycle.ViewModelProvider
import androidx.viewbinding.ViewBinding
import com.eatssu.android.R
import com.eatssu.android.data.repository.FirebaseRemoteConfigRepository
import com.eatssu.android.ui.common.AndroidMessageDialogActivity
import com.eatssu.android.ui.common.ForceUpdateDialogActivity
import com.eatssu.android.ui.common.VersionViewModel
import com.eatssu.android.ui.common.VersionViewModelFactory
import com.eatssu.android.presentation.common.AndroidMessageDialogActivity
import com.eatssu.android.presentation.common.ForceUpdateDialogActivity
import com.eatssu.android.presentation.common.VersionViewModel
import com.eatssu.android.presentation.common.VersionViewModelFactory
import com.eatssu.android.util.NetworkConnection
import com.google.android.material.card.MaterialCardView

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


import android.content.Context
Expand Down
5 changes: 0 additions & 5 deletions app/src/main/java/com/eatssu/android/data/dto/request/ChangePwRequest.kt
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion app/src/main/java/com/eatssu/android/data/dto/response/MealResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.eatssu.android.data.dto.response

import com.eatssu.android.data.model.Menu
import com.eatssu.android.domain.model.Menu
import com.google.gson.annotations.SerializedName

data class GetMealResponse(
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/eatssu/android/data/dto/response/MealReviewInfoResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.eatssu.android.data.dto.response

import com.eatssu.android.data.model.ReviewInfo
import com.eatssu.android.domain.model.ReviewInfo
import com.google.gson.annotations.SerializedName

data class GetMealReviewInfoResponse(
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/eatssu/android/data/dto/response/MenuOfMealResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.eatssu.android.data.dto.response

import com.eatssu.android.data.model.MenuMini
import com.eatssu.android.domain.model.MenuMini
import com.google.gson.annotations.SerializedName

data class MenuOfMealResponse(
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/eatssu/android/data/dto/response/MenuResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.eatssu.android.data.dto.response

import android.util.Log
import com.eatssu.android.data.model.Menu
import com.eatssu.android.domain.model.Menu
import com.google.gson.annotations.SerializedName


Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/eatssu/android/data/dto/response/MenuReviewInfoResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.eatssu.android.data.dto.response

import com.eatssu.android.data.model.ReviewInfo
import com.eatssu.android.domain.model.ReviewInfo
import com.google.gson.annotations.SerializedName

data class GetMenuReviewInfoResponse(
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/eatssu/android/data/dto/response/MyReviewResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.eatssu.android.data.dto.response

import com.eatssu.android.data.model.Review
import com.eatssu.android.domain.model.Review
import com.google.gson.annotations.SerializedName

data class MyReviewResponse(
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/eatssu/android/data/dto/response/ReviewListResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.eatssu.android.data.dto.response

import com.eatssu.android.data.model.Review
import com.eatssu.android.domain.model.Review
import com.google.gson.annotations.SerializedName

data class GetReviewListResponse(
Expand Down
6 changes: 0 additions & 6 deletions app/src/main/java/com/eatssu/android/data/model/CalendarData.kt
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion app/src/main/java/com/eatssu/android/data/repository/FirebaseRemoteConfigRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package com.eatssu.android.data.repository

import com.eatssu.android.R
import com.eatssu.android.data.enums.Restaurant
import com.eatssu.android.data.model.RestaurantInfo
import com.eatssu.android.domain.model.RestaurantInfo
import com.google.firebase.remoteconfig.FirebaseRemoteConfig
import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings
import org.json.JSONArray
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/eatssu/android/data/repository/ImageRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.eatssu.android.data.repository

import com.eatssu.android.data.service.ImageService
import com.eatssu.android.domain.repository.ImageRepository
import com.eatssu.android.domain.service.ImageService
import javax.inject.Inject

class ImageRepositoryImpl @Inject constructor(private val imageService: ImageService) :
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/eatssu/android/data/repository/OauthRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ package com.eatssu.android.data.repository
import com.eatssu.android.base.BaseResponse
import com.eatssu.android.data.dto.request.LoginWithKakaoRequest
import com.eatssu.android.data.dto.response.TokenResponse
import com.eatssu.android.data.service.OauthService
import com.eatssu.android.domain.repository.OauthRepository
import com.eatssu.android.domain.service.OauthService
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.flow
import javax.inject.Inject
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/eatssu/android/data/repository/ReportRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ package com.eatssu.android.data.repository

import com.eatssu.android.base.BaseResponse
import com.eatssu.android.data.dto.request.ReportRequest
import com.eatssu.android.data.service.ReportService
import com.eatssu.android.domain.repository.ReportRepository
import com.eatssu.android.domain.service.ReportService
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.flow
import javax.inject.Inject
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/eatssu/android/data/repository/ReviewRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.eatssu.android.data.repository

import com.eatssu.android.data.service.ReviewService
import com.eatssu.android.domain.service.ReviewService

class ReviewRepository(private val reviewService: ReviewService) {

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/eatssu/android/data/repository/UserRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import com.eatssu.android.base.BaseResponse
import com.eatssu.android.data.dto.request.ChangeNicknameRequest
import com.eatssu.android.data.dto.response.MyInfoResponse
import com.eatssu.android.data.dto.response.MyReviewResponse
import com.eatssu.android.data.service.UserService
import com.eatssu.android.domain.repository.UserRepository
import com.eatssu.android.domain.service.UserService
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.flow
import javax.inject.Inject
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/eatssu/android/di/DataModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.eatssu.android.di


import com.eatssu.android.data.repository.OauthRepository
import com.eatssu.android.domain.repository.OauthRepository
import com.eatssu.android.data.repository.OauthRepositoryImpl
import com.eatssu.android.data.repository.ReportRepository
import com.eatssu.android.domain.repository.ReportRepository
import com.eatssu.android.data.repository.ReportRepositoryImpl
import com.eatssu.android.data.repository.UserRepository
import com.eatssu.android.domain.repository.UserRepository
import com.eatssu.android.data.repository.UserRepositoryImpl
import dagger.Binds
import dagger.Module
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/eatssu/android/di/NetworkModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package com.eatssu.android.di

import com.eatssu.android.BuildConfig
import com.eatssu.android.BuildConfig.BASE_URL
import com.eatssu.android.data.service.OauthService
import com.eatssu.android.data.service.ReportService
import com.eatssu.android.data.service.UserService
import com.eatssu.android.di.network.TokenInterceptor
import com.eatssu.android.domain.service.OauthService
import com.eatssu.android.domain.service.ReportService
import com.eatssu.android.domain.service.UserService
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
Expand Down
12 changes: 6 additions & 6 deletions app/src/main/java/com/eatssu/android/di/network/TokenInterceptor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import android.widget.Toast
import com.eatssu.android.BuildConfig.BASE_URL
import com.eatssu.android.base.BaseResponse
import com.eatssu.android.data.dto.response.TokenResponse
import com.eatssu.android.data.usecase.GetAccessTokenUseCase
import com.eatssu.android.data.usecase.GetRefreshTokenUseCase
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.ui.login.LoginActivity
import com.eatssu.android.domain.usecase.GetAccessTokenUseCase
import com.eatssu.android.domain.usecase.GetRefreshTokenUseCase
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.presentation.login.LoginActivity
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
import dagger.hilt.android.qualifiers.ApplicationContext
Expand Down
2 changes: 1 addition & 1 deletion ...tssu/android/data/model/AndroidMessage.kt → ...su/android/domain/model/AndroidMessage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eatssu.android.data.model
package com.eatssu.android.domain.model

data class AndroidMessage(
val dialog: Boolean,
Expand Down
2 changes: 1 addition & 1 deletion ...ava/com/eatssu/android/data/model/Menu.kt → ...a/com/eatssu/android/domain/model/Menu.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eatssu.android.data.model
package com.eatssu.android.domain.model

data class Menu(
val id: Long,
Expand Down
2 changes: 1 addition & 1 deletion ...com/eatssu/android/data/model/MenuMini.kt → ...m/eatssu/android/domain/model/MenuMini.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eatssu.android.data.model
package com.eatssu.android.domain.model

data class MenuMini(
val id: Long,
Expand Down
2 changes: 1 addition & 1 deletion ...tssu/android/data/model/RestaurantInfo.kt → ...su/android/domain/model/RestaurantInfo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eatssu.android.data.model
package com.eatssu.android.domain.model

import com.eatssu.android.data.enums.Restaurant

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

data class Review(
val isWriter: Boolean,
Expand Down
2 changes: 1 addition & 1 deletion ...m/eatssu/android/data/model/ReviewInfo.kt → ...eatssu/android/domain/model/ReviewInfo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eatssu.android.data.model
package com.eatssu.android.domain.model

data class ReviewInfo(
var name: String,
Expand Down
2 changes: 1 addition & 1 deletion .../com/eatssu/android/data/model/Section.kt → ...om/eatssu/android/domain/model/Section.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eatssu.android.data.model
package com.eatssu.android.domain.model

import com.eatssu.android.data.enums.MenuType
import com.eatssu.android.data.enums.Restaurant
Expand Down
2 changes: 1 addition & 1 deletion ...ndroid/data/repository/ImageRepository.kt → ...roid/domain/repository/ImageRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eatssu.android.data.repository
package com.eatssu.android.domain.repository


interface ImageRepository {
Expand Down
2 changes: 1 addition & 1 deletion ...ndroid/data/repository/OauthRepository.kt → ...roid/domain/repository/OauthRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eatssu.android.data.repository
package com.eatssu.android.domain.repository

import com.eatssu.android.base.BaseResponse
import com.eatssu.android.data.dto.request.LoginWithKakaoRequest
Expand Down
2 changes: 1 addition & 1 deletion ...droid/data/repository/ReportRepository.kt → ...oid/domain/repository/ReportRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eatssu.android.data.repository
package com.eatssu.android.domain.repository

import com.eatssu.android.base.BaseResponse
import com.eatssu.android.data.dto.request.ReportRequest
Expand Down
2 changes: 1 addition & 1 deletion ...android/data/repository/UserRepository.kt → ...droid/domain/repository/UserRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eatssu.android.data.repository
package com.eatssu.android.domain.repository

import com.eatssu.android.base.BaseResponse
import com.eatssu.android.data.dto.request.ChangeNicknameRequest
Expand Down
Loading
Loading