diff --git a/app/build.gradle b/app/build.gradle index 4bfc1b20..5d40b4d8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,11 +18,11 @@ properties.load(project.rootProject.file('local.properties').newDataInputStream( android { - namespace 'sopt.mottivoo' + namespace 'sopt.motivoo' compileSdk 34 defaultConfig { - applicationId "sopt.mottivoo" + applicationId "sopt.motivoo" minSdk 24 targetSdk 34 versionCode 1 diff --git a/app/src/androidTest/java/sopt/mottivoo/ExampleInstrumentedTest.kt b/app/src/androidTest/java/sopt/motivoo/ExampleInstrumentedTest.kt similarity index 98% rename from app/src/androidTest/java/sopt/mottivoo/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/sopt/motivoo/ExampleInstrumentedTest.kt index 57c3aa5f..ea2bad3b 100644 --- a/app/src/androidTest/java/sopt/mottivoo/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/sopt/motivoo/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo +package sopt.motivoo import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry diff --git a/app/src/main/java/sopt/mottivoo/MotivooApplication.kt b/app/src/main/java/sopt/motivoo/MotivooApplication.kt similarity index 95% rename from app/src/main/java/sopt/mottivoo/MotivooApplication.kt rename to app/src/main/java/sopt/motivoo/MotivooApplication.kt index 7f9836fe..e7b3e1fb 100644 --- a/app/src/main/java/sopt/mottivoo/MotivooApplication.kt +++ b/app/src/main/java/sopt/motivoo/MotivooApplication.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo +package sopt.motivoo import android.app.Application import androidx.appcompat.app.AppCompatDelegate diff --git a/app/src/main/java/sopt/mottivoo/data/datasource/local/MotivooStorageImpl.kt b/app/src/main/java/sopt/motivoo/data/datasource/local/MotivooStorageImpl.kt similarity index 97% rename from app/src/main/java/sopt/mottivoo/data/datasource/local/MotivooStorageImpl.kt rename to app/src/main/java/sopt/motivoo/data/datasource/local/MotivooStorageImpl.kt index 8f2d64e8..f00d5140 100644 --- a/app/src/main/java/sopt/mottivoo/data/datasource/local/MotivooStorageImpl.kt +++ b/app/src/main/java/sopt/motivoo/data/datasource/local/MotivooStorageImpl.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.data.datasource.local +package sopt.motivoo.data.datasource.local import android.content.Context import androidx.core.content.edit @@ -6,7 +6,7 @@ import androidx.security.crypto.EncryptedSharedPreferences import androidx.security.crypto.MasterKey import com.google.firebase.BuildConfig import dagger.hilt.android.qualifiers.ApplicationContext -import sopt.mottivoo.domain.entity.MotivooStorage +import sopt.motivoo.domain.entity.MotivooStorage import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/sopt/mottivoo/data/datasource/local/StepCountLocalDataSource.kt b/app/src/main/java/sopt/motivoo/data/datasource/local/StepCountLocalDataSource.kt similarity index 93% rename from app/src/main/java/sopt/mottivoo/data/datasource/local/StepCountLocalDataSource.kt rename to app/src/main/java/sopt/motivoo/data/datasource/local/StepCountLocalDataSource.kt index e6a96ebc..84a9c629 100644 --- a/app/src/main/java/sopt/mottivoo/data/datasource/local/StepCountLocalDataSource.kt +++ b/app/src/main/java/sopt/motivoo/data/datasource/local/StepCountLocalDataSource.kt @@ -1,11 +1,11 @@ -package sopt.mottivoo.data.datasource.local +package sopt.motivoo.data.datasource.local import androidx.datastore.core.DataStore import androidx.datastore.preferences.core.Preferences import androidx.datastore.preferences.core.edit import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map -import sopt.mottivoo.di.PreferencesKeys +import sopt.motivoo.di.PreferencesKeys import javax.inject.Inject class StepCountLocalDataSource @Inject constructor( diff --git a/app/src/main/java/sopt/mottivoo/data/datasource/local/UserLocalDataSource.kt b/app/src/main/java/sopt/motivoo/data/datasource/local/UserLocalDataSource.kt similarity index 90% rename from app/src/main/java/sopt/mottivoo/data/datasource/local/UserLocalDataSource.kt rename to app/src/main/java/sopt/motivoo/data/datasource/local/UserLocalDataSource.kt index 39de4058..17d55f51 100644 --- a/app/src/main/java/sopt/mottivoo/data/datasource/local/UserLocalDataSource.kt +++ b/app/src/main/java/sopt/motivoo/data/datasource/local/UserLocalDataSource.kt @@ -1,11 +1,11 @@ -package sopt.mottivoo.data.datasource.local +package sopt.motivoo.data.datasource.local import androidx.datastore.core.DataStore import androidx.datastore.preferences.core.Preferences import androidx.datastore.preferences.core.edit import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map -import sopt.mottivoo.di.PreferencesKeys +import sopt.motivoo.di.PreferencesKeys import javax.inject.Inject class UserLocalDataSource @Inject constructor( diff --git a/app/src/main/java/sopt/mottivoo/data/datasource/remote/AuthDataSource.kt b/app/src/main/java/sopt/motivoo/data/datasource/remote/AuthDataSource.kt similarity index 55% rename from app/src/main/java/sopt/mottivoo/data/datasource/remote/AuthDataSource.kt rename to app/src/main/java/sopt/motivoo/data/datasource/remote/AuthDataSource.kt index 93929cc5..25e6c3a6 100644 --- a/app/src/main/java/sopt/mottivoo/data/datasource/remote/AuthDataSource.kt +++ b/app/src/main/java/sopt/motivoo/data/datasource/remote/AuthDataSource.kt @@ -1,10 +1,10 @@ -package sopt.mottivoo.data.datasource.remote +package sopt.motivoo.data.datasource.remote -import sopt.mottivoo.data.model.request.auth.RequestLoginDto -import sopt.mottivoo.data.model.response.auth.ResponseLoginDto -import sopt.mottivoo.data.model.response.auth.ResponseLogoutDto -import sopt.mottivoo.data.model.response.auth.ResponseWithDrawDto -import sopt.mottivoo.data.service.AuthService +import sopt.motivoo.data.model.request.auth.RequestLoginDto +import sopt.motivoo.data.model.response.auth.ResponseLoginDto +import sopt.motivoo.data.model.response.auth.ResponseLogoutDto +import sopt.motivoo.data.model.response.auth.ResponseWithDrawDto +import sopt.motivoo.data.service.AuthService import javax.inject.Inject class AuthDataSource @Inject constructor( diff --git a/app/src/main/java/sopt/mottivoo/data/datasource/remote/DummyDataSource.kt b/app/src/main/java/sopt/motivoo/data/datasource/remote/DummyDataSource.kt similarity index 55% rename from app/src/main/java/sopt/mottivoo/data/datasource/remote/DummyDataSource.kt rename to app/src/main/java/sopt/motivoo/data/datasource/remote/DummyDataSource.kt index f8334396..a0d80093 100644 --- a/app/src/main/java/sopt/mottivoo/data/datasource/remote/DummyDataSource.kt +++ b/app/src/main/java/sopt/motivoo/data/datasource/remote/DummyDataSource.kt @@ -1,8 +1,8 @@ -package sopt.mottivoo.data.datasource.remote +package sopt.motivoo.data.datasource.remote -import sopt.mottivoo.data.model.request.DummyRequestData -import sopt.mottivoo.data.model.response.DummyResponseData -import sopt.mottivoo.data.service.DummyService +import sopt.motivoo.data.model.request.DummyRequestData +import sopt.motivoo.data.model.response.DummyResponseData +import sopt.motivoo.data.service.DummyService import javax.inject.Inject class DummyDataSource @Inject constructor( diff --git a/app/src/main/java/sopt/mottivoo/data/datasource/remote/HomeDataSource.kt b/app/src/main/java/sopt/motivoo/data/datasource/remote/HomeDataSource.kt similarity index 64% rename from app/src/main/java/sopt/mottivoo/data/datasource/remote/HomeDataSource.kt rename to app/src/main/java/sopt/motivoo/data/datasource/remote/HomeDataSource.kt index ad625551..587824f5 100644 --- a/app/src/main/java/sopt/mottivoo/data/datasource/remote/HomeDataSource.kt +++ b/app/src/main/java/sopt/motivoo/data/datasource/remote/HomeDataSource.kt @@ -1,13 +1,13 @@ -package sopt.mottivoo.data.datasource.remote +package sopt.motivoo.data.datasource.remote import okhttp3.RequestBody -import sopt.mottivoo.data.model.request.home.RequestMissionImageFileDto -import sopt.mottivoo.data.model.request.home.RequestMissionTodayDto -import sopt.mottivoo.data.model.response.home.ResponseHomeDto -import sopt.mottivoo.data.model.response.home.ResponseMissionChoiceDto -import sopt.mottivoo.data.model.response.home.ResponseMissionImageDto -import sopt.mottivoo.data.model.response.home.ResponseMissionTodayDto -import sopt.mottivoo.data.service.HomeService +import sopt.motivoo.data.model.request.home.RequestMissionImageFileDto +import sopt.motivoo.data.model.request.home.RequestMissionTodayDto +import sopt.motivoo.data.model.response.home.ResponseHomeDto +import sopt.motivoo.data.model.response.home.ResponseMissionChoiceDto +import sopt.motivoo.data.model.response.home.ResponseMissionImageDto +import sopt.motivoo.data.model.response.home.ResponseMissionTodayDto +import sopt.motivoo.data.service.HomeService import javax.inject.Inject class HomeDataSource @Inject constructor( diff --git a/app/src/main/java/sopt/mottivoo/data/datasource/remote/OnboardingDataSource.kt b/app/src/main/java/sopt/motivoo/data/datasource/remote/OnboardingDataSource.kt similarity index 58% rename from app/src/main/java/sopt/mottivoo/data/datasource/remote/OnboardingDataSource.kt rename to app/src/main/java/sopt/motivoo/data/datasource/remote/OnboardingDataSource.kt index 26752def..14f334b0 100644 --- a/app/src/main/java/sopt/mottivoo/data/datasource/remote/OnboardingDataSource.kt +++ b/app/src/main/java/sopt/motivoo/data/datasource/remote/OnboardingDataSource.kt @@ -1,12 +1,12 @@ -package sopt.mottivoo.data.datasource.remote +package sopt.motivoo.data.datasource.remote -import sopt.mottivoo.data.model.request.onboarding.RequestOnboardingDto -import sopt.mottivoo.data.model.request.onboarding.RequestPostInviteCodeDto -import sopt.mottivoo.data.model.response.onboarding.ResponseGetInviteCodeDto -import sopt.mottivoo.data.model.response.onboarding.ResponseGetMatchedResultDto -import sopt.mottivoo.data.model.response.onboarding.ResponseOnboardingDto -import sopt.mottivoo.data.model.response.onboarding.ResponsePostInviteCodeDto -import sopt.mottivoo.data.service.OnboardingService +import sopt.motivoo.data.model.request.onboarding.RequestOnboardingDto +import sopt.motivoo.data.model.request.onboarding.RequestPostInviteCodeDto +import sopt.motivoo.data.model.response.onboarding.ResponseGetInviteCodeDto +import sopt.motivoo.data.model.response.onboarding.ResponseGetMatchedResultDto +import sopt.motivoo.data.model.response.onboarding.ResponseOnboardingDto +import sopt.motivoo.data.model.response.onboarding.ResponsePostInviteCodeDto +import sopt.motivoo.data.service.OnboardingService import javax.inject.Inject class OnboardingDataSource @Inject constructor( diff --git a/app/src/main/java/sopt/mottivoo/data/datasource/remote/intercepter/AuthInterceptor.kt b/app/src/main/java/sopt/motivoo/data/datasource/remote/intercepter/AuthInterceptor.kt similarity index 90% rename from app/src/main/java/sopt/mottivoo/data/datasource/remote/intercepter/AuthInterceptor.kt rename to app/src/main/java/sopt/motivoo/data/datasource/remote/intercepter/AuthInterceptor.kt index 06453c14..beb5acfd 100644 --- a/app/src/main/java/sopt/mottivoo/data/datasource/remote/intercepter/AuthInterceptor.kt +++ b/app/src/main/java/sopt/motivoo/data/datasource/remote/intercepter/AuthInterceptor.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.data.datasource.remote.intercepter +package sopt.motivoo.data.datasource.remote.intercepter import kotlinx.serialization.decodeFromString import kotlinx.serialization.json.Json @@ -7,10 +7,10 @@ import okhttp3.MediaType.Companion.toMediaType import okhttp3.Request import okhttp3.RequestBody.Companion.toRequestBody import okhttp3.Response -import sopt.mottivoo.BuildConfig -import sopt.mottivoo.data.datasource.remote.listener.AuthTokenRefreshListener -import sopt.mottivoo.data.model.response.auth.ResponseReissueDto -import sopt.mottivoo.domain.entity.MotivooStorage +import sopt.motivoo.BuildConfig +import sopt.motivoo.data.datasource.remote.listener.AuthTokenRefreshListener +import sopt.motivoo.data.model.response.auth.ResponseReissueDto +import sopt.motivoo.domain.entity.MotivooStorage import javax.inject.Inject class AuthInterceptor @Inject constructor( diff --git a/app/src/main/java/sopt/mottivoo/data/datasource/remote/intercepter/ErrorInterceptor.kt b/app/src/main/java/sopt/motivoo/data/datasource/remote/intercepter/ErrorInterceptor.kt similarity index 85% rename from app/src/main/java/sopt/mottivoo/data/datasource/remote/intercepter/ErrorInterceptor.kt rename to app/src/main/java/sopt/motivoo/data/datasource/remote/intercepter/ErrorInterceptor.kt index 3683d779..175010ad 100644 --- a/app/src/main/java/sopt/mottivoo/data/datasource/remote/intercepter/ErrorInterceptor.kt +++ b/app/src/main/java/sopt/motivoo/data/datasource/remote/intercepter/ErrorInterceptor.kt @@ -1,8 +1,8 @@ -package sopt.mottivoo.data.datasource.remote.intercepter +package sopt.motivoo.data.datasource.remote.intercepter import okhttp3.Interceptor import okhttp3.Response -import sopt.mottivoo.data.datasource.remote.listener.NetworkErrorListener +import sopt.motivoo.data.datasource.remote.listener.NetworkErrorListener import javax.inject.Inject class ErrorInterceptor @Inject constructor( diff --git a/app/src/main/java/sopt/mottivoo/data/datasource/remote/listener/AuthTokenRefreshListener.kt b/app/src/main/java/sopt/motivoo/data/datasource/remote/listener/AuthTokenRefreshListener.kt similarity index 76% rename from app/src/main/java/sopt/mottivoo/data/datasource/remote/listener/AuthTokenRefreshListener.kt rename to app/src/main/java/sopt/motivoo/data/datasource/remote/listener/AuthTokenRefreshListener.kt index 7293d9d8..68de4d6e 100644 --- a/app/src/main/java/sopt/mottivoo/data/datasource/remote/listener/AuthTokenRefreshListener.kt +++ b/app/src/main/java/sopt/motivoo/data/datasource/remote/listener/AuthTokenRefreshListener.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.data.datasource.remote.listener +package sopt.motivoo.data.datasource.remote.listener interface AuthTokenRefreshListener { fun onTokenRefreshFailed() diff --git a/app/src/main/java/sopt/mottivoo/data/datasource/remote/listener/AuthTokenRefreshListenerImpl.kt b/app/src/main/java/sopt/motivoo/data/datasource/remote/listener/AuthTokenRefreshListenerImpl.kt similarity index 90% rename from app/src/main/java/sopt/mottivoo/data/datasource/remote/listener/AuthTokenRefreshListenerImpl.kt rename to app/src/main/java/sopt/motivoo/data/datasource/remote/listener/AuthTokenRefreshListenerImpl.kt index 422044f6..a28b49dc 100644 --- a/app/src/main/java/sopt/mottivoo/data/datasource/remote/listener/AuthTokenRefreshListenerImpl.kt +++ b/app/src/main/java/sopt/motivoo/data/datasource/remote/listener/AuthTokenRefreshListenerImpl.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.data.datasource.remote.listener +package sopt.motivoo.data.datasource.remote.listener import javax.inject.Inject diff --git a/app/src/main/java/sopt/mottivoo/data/datasource/remote/listener/NetworkErrorListener.kt b/app/src/main/java/sopt/motivoo/data/datasource/remote/listener/NetworkErrorListener.kt similarity index 74% rename from app/src/main/java/sopt/mottivoo/data/datasource/remote/listener/NetworkErrorListener.kt rename to app/src/main/java/sopt/motivoo/data/datasource/remote/listener/NetworkErrorListener.kt index 41188085..af8e49d0 100644 --- a/app/src/main/java/sopt/mottivoo/data/datasource/remote/listener/NetworkErrorListener.kt +++ b/app/src/main/java/sopt/motivoo/data/datasource/remote/listener/NetworkErrorListener.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.data.datasource.remote.listener +package sopt.motivoo.data.datasource.remote.listener interface NetworkErrorListener { fun onApiCallFailed() diff --git a/app/src/main/java/sopt/mottivoo/data/datasource/remote/listener/NetworkErrorListenerImpl.kt b/app/src/main/java/sopt/motivoo/data/datasource/remote/listener/NetworkErrorListenerImpl.kt similarity index 89% rename from app/src/main/java/sopt/mottivoo/data/datasource/remote/listener/NetworkErrorListenerImpl.kt rename to app/src/main/java/sopt/motivoo/data/datasource/remote/listener/NetworkErrorListenerImpl.kt index 1516b2a0..f1fc4138 100644 --- a/app/src/main/java/sopt/mottivoo/data/datasource/remote/listener/NetworkErrorListenerImpl.kt +++ b/app/src/main/java/sopt/motivoo/data/datasource/remote/listener/NetworkErrorListenerImpl.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.data.datasource.remote.listener +package sopt.motivoo.data.datasource.remote.listener import javax.inject.Inject diff --git a/app/src/main/java/sopt/mottivoo/data/error/UserErrorHandlerImpl.kt b/app/src/main/java/sopt/motivoo/data/error/UserErrorHandlerImpl.kt similarity index 81% rename from app/src/main/java/sopt/mottivoo/data/error/UserErrorHandlerImpl.kt rename to app/src/main/java/sopt/motivoo/data/error/UserErrorHandlerImpl.kt index 1cd727d0..8a9c6ed5 100644 --- a/app/src/main/java/sopt/mottivoo/data/error/UserErrorHandlerImpl.kt +++ b/app/src/main/java/sopt/motivoo/data/error/UserErrorHandlerImpl.kt @@ -1,8 +1,8 @@ -package sopt.mottivoo.data.error +package sopt.motivoo.data.error import retrofit2.HttpException -import sopt.mottivoo.domain.entity.error.ResponseHandler -import sopt.mottivoo.domain.error.UserErrorHandler +import sopt.motivoo.domain.entity.error.ResponseHandler +import sopt.motivoo.domain.error.UserErrorHandler import javax.inject.Inject class UserErrorHandlerImpl @Inject constructor() : UserErrorHandler { diff --git a/app/src/main/java/sopt/mottivoo/data/model/request/DummyRequestData.kt b/app/src/main/java/sopt/motivoo/data/model/request/DummyRequestData.kt similarity index 84% rename from app/src/main/java/sopt/mottivoo/data/model/request/DummyRequestData.kt rename to app/src/main/java/sopt/motivoo/data/model/request/DummyRequestData.kt index 76111cc7..ddeb2a71 100644 --- a/app/src/main/java/sopt/mottivoo/data/model/request/DummyRequestData.kt +++ b/app/src/main/java/sopt/motivoo/data/model/request/DummyRequestData.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.data.model.request +package sopt.motivoo.data.model.request import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/sopt/mottivoo/data/model/request/auth/RequestLoginDto.kt b/app/src/main/java/sopt/motivoo/data/model/request/auth/RequestLoginDto.kt similarity index 84% rename from app/src/main/java/sopt/mottivoo/data/model/request/auth/RequestLoginDto.kt rename to app/src/main/java/sopt/motivoo/data/model/request/auth/RequestLoginDto.kt index 780c8d99..6ae4a64f 100644 --- a/app/src/main/java/sopt/mottivoo/data/model/request/auth/RequestLoginDto.kt +++ b/app/src/main/java/sopt/motivoo/data/model/request/auth/RequestLoginDto.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.data.model.request.auth +package sopt.motivoo.data.model.request.auth import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/sopt/mottivoo/data/model/request/home/RequestMissionImageFileDto.kt b/app/src/main/java/sopt/motivoo/data/model/request/home/RequestMissionImageFileDto.kt similarity index 80% rename from app/src/main/java/sopt/mottivoo/data/model/request/home/RequestMissionImageFileDto.kt rename to app/src/main/java/sopt/motivoo/data/model/request/home/RequestMissionImageFileDto.kt index 6b083e67..ca20b8a0 100644 --- a/app/src/main/java/sopt/mottivoo/data/model/request/home/RequestMissionImageFileDto.kt +++ b/app/src/main/java/sopt/motivoo/data/model/request/home/RequestMissionImageFileDto.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.data.model.request.home +package sopt.motivoo.data.model.request.home import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/sopt/mottivoo/data/model/request/home/RequestMissionTodayDto.kt b/app/src/main/java/sopt/motivoo/data/model/request/home/RequestMissionTodayDto.kt similarity index 80% rename from app/src/main/java/sopt/mottivoo/data/model/request/home/RequestMissionTodayDto.kt rename to app/src/main/java/sopt/motivoo/data/model/request/home/RequestMissionTodayDto.kt index dd2b38ea..191d000f 100644 --- a/app/src/main/java/sopt/mottivoo/data/model/request/home/RequestMissionTodayDto.kt +++ b/app/src/main/java/sopt/motivoo/data/model/request/home/RequestMissionTodayDto.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.data.model.request.home +package sopt.motivoo.data.model.request.home import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/sopt/mottivoo/data/model/request/onboarding/RequestOnboardingDto.kt b/app/src/main/java/sopt/motivoo/data/model/request/onboarding/RequestOnboardingDto.kt similarity index 91% rename from app/src/main/java/sopt/mottivoo/data/model/request/onboarding/RequestOnboardingDto.kt rename to app/src/main/java/sopt/motivoo/data/model/request/onboarding/RequestOnboardingDto.kt index e0a61f18..16db4e84 100644 --- a/app/src/main/java/sopt/mottivoo/data/model/request/onboarding/RequestOnboardingDto.kt +++ b/app/src/main/java/sopt/motivoo/data/model/request/onboarding/RequestOnboardingDto.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.data.model.request.onboarding +package sopt.motivoo.data.model.request.onboarding import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/sopt/mottivoo/data/model/request/onboarding/RequestPostInviteCodeDto.kt b/app/src/main/java/sopt/motivoo/data/model/request/onboarding/RequestPostInviteCodeDto.kt similarity index 78% rename from app/src/main/java/sopt/mottivoo/data/model/request/onboarding/RequestPostInviteCodeDto.kt rename to app/src/main/java/sopt/motivoo/data/model/request/onboarding/RequestPostInviteCodeDto.kt index 44db11fa..f7dd735b 100644 --- a/app/src/main/java/sopt/mottivoo/data/model/request/onboarding/RequestPostInviteCodeDto.kt +++ b/app/src/main/java/sopt/motivoo/data/model/request/onboarding/RequestPostInviteCodeDto.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.data.model.request.onboarding +package sopt.motivoo.data.model.request.onboarding import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/sopt/mottivoo/data/model/response/DummyResponseData.kt b/app/src/main/java/sopt/motivoo/data/model/response/DummyResponseData.kt similarity index 84% rename from app/src/main/java/sopt/mottivoo/data/model/response/DummyResponseData.kt rename to app/src/main/java/sopt/motivoo/data/model/response/DummyResponseData.kt index 93857ead..69c5baeb 100644 --- a/app/src/main/java/sopt/mottivoo/data/model/response/DummyResponseData.kt +++ b/app/src/main/java/sopt/motivoo/data/model/response/DummyResponseData.kt @@ -1,7 +1,7 @@ -package sopt.mottivoo.data.model.response +package sopt.motivoo.data.model.response import kotlinx.serialization.Serializable -import sopt.mottivoo.domain.entity.dummy.DummyInfoList +import sopt.motivoo.domain.entity.dummy.DummyInfoList @Serializable data class DummyResponseData( diff --git a/app/src/main/java/sopt/mottivoo/data/model/response/ResponseExerciseDto.kt b/app/src/main/java/sopt/motivoo/data/model/response/ResponseExerciseDto.kt similarity index 93% rename from app/src/main/java/sopt/mottivoo/data/model/response/ResponseExerciseDto.kt rename to app/src/main/java/sopt/motivoo/data/model/response/ResponseExerciseDto.kt index 98880808..7744e48b 100644 --- a/app/src/main/java/sopt/mottivoo/data/model/response/ResponseExerciseDto.kt +++ b/app/src/main/java/sopt/motivoo/data/model/response/ResponseExerciseDto.kt @@ -1,10 +1,10 @@ -package sopt.mottivoo.data.model.response +package sopt.motivoo.data.model.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable -import sopt.mottivoo.domain.entity.exercise.ExerciseData -import sopt.mottivoo.domain.entity.exercise.ExerciseData.ExerciseItemInfo -import sopt.mottivoo.util.extension.prettyString +import sopt.motivoo.domain.entity.exercise.ExerciseData +import sopt.motivoo.domain.entity.exercise.ExerciseData.ExerciseItemInfo +import sopt.motivoo.util.extension.prettyString import java.time.LocalDate @Serializable diff --git a/app/src/main/java/sopt/mottivoo/data/model/response/ResponseMyExerciseInfoDto.kt b/app/src/main/java/sopt/motivoo/data/model/response/ResponseMyExerciseInfoDto.kt similarity index 94% rename from app/src/main/java/sopt/mottivoo/data/model/response/ResponseMyExerciseInfoDto.kt rename to app/src/main/java/sopt/motivoo/data/model/response/ResponseMyExerciseInfoDto.kt index 6d86620d..8cbb1d35 100644 --- a/app/src/main/java/sopt/mottivoo/data/model/response/ResponseMyExerciseInfoDto.kt +++ b/app/src/main/java/sopt/motivoo/data/model/response/ResponseMyExerciseInfoDto.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.data.model.response +package sopt.motivoo.data.model.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/sopt/mottivoo/data/model/response/ResponseMyPageDto.kt b/app/src/main/java/sopt/motivoo/data/model/response/ResponseMyPageDto.kt similarity index 88% rename from app/src/main/java/sopt/mottivoo/data/model/response/ResponseMyPageDto.kt rename to app/src/main/java/sopt/motivoo/data/model/response/ResponseMyPageDto.kt index cad1d0a6..3cf62f10 100644 --- a/app/src/main/java/sopt/mottivoo/data/model/response/ResponseMyPageDto.kt +++ b/app/src/main/java/sopt/motivoo/data/model/response/ResponseMyPageDto.kt @@ -1,8 +1,8 @@ -package sopt.mottivoo.data.model.response +package sopt.motivoo.data.model.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable -import sopt.mottivoo.domain.entity.mypage.UserInfo +import sopt.motivoo.domain.entity.mypage.UserInfo @Serializable data class ResponseMyPageDto( diff --git a/app/src/main/java/sopt/mottivoo/data/model/response/auth/ResponseLoginDto.kt b/app/src/main/java/sopt/motivoo/data/model/response/auth/ResponseLoginDto.kt similarity index 92% rename from app/src/main/java/sopt/mottivoo/data/model/response/auth/ResponseLoginDto.kt rename to app/src/main/java/sopt/motivoo/data/model/response/auth/ResponseLoginDto.kt index 5d402c55..675d5965 100644 --- a/app/src/main/java/sopt/mottivoo/data/model/response/auth/ResponseLoginDto.kt +++ b/app/src/main/java/sopt/motivoo/data/model/response/auth/ResponseLoginDto.kt @@ -1,8 +1,8 @@ -package sopt.mottivoo.data.model.response.auth +package sopt.motivoo.data.model.response.auth import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable -import sopt.mottivoo.domain.entity.auth.LoginInfo +import sopt.motivoo.domain.entity.auth.LoginInfo @Serializable data class ResponseLoginDto( diff --git a/app/src/main/java/sopt/mottivoo/data/model/response/auth/ResponseLogoutDto.kt b/app/src/main/java/sopt/motivoo/data/model/response/auth/ResponseLogoutDto.kt similarity index 85% rename from app/src/main/java/sopt/mottivoo/data/model/response/auth/ResponseLogoutDto.kt rename to app/src/main/java/sopt/motivoo/data/model/response/auth/ResponseLogoutDto.kt index eede9021..719f70b4 100644 --- a/app/src/main/java/sopt/mottivoo/data/model/response/auth/ResponseLogoutDto.kt +++ b/app/src/main/java/sopt/motivoo/data/model/response/auth/ResponseLogoutDto.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.data.model.response.auth +package sopt.motivoo.data.model.response.auth import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/sopt/mottivoo/data/model/response/auth/ResponseReissueDto.kt b/app/src/main/java/sopt/motivoo/data/model/response/auth/ResponseReissueDto.kt similarity index 91% rename from app/src/main/java/sopt/mottivoo/data/model/response/auth/ResponseReissueDto.kt rename to app/src/main/java/sopt/motivoo/data/model/response/auth/ResponseReissueDto.kt index 2df55099..eeb16463 100644 --- a/app/src/main/java/sopt/mottivoo/data/model/response/auth/ResponseReissueDto.kt +++ b/app/src/main/java/sopt/motivoo/data/model/response/auth/ResponseReissueDto.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.data.model.response.auth +package sopt.motivoo.data.model.response.auth import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/sopt/mottivoo/data/model/response/auth/ResponseWithDrawDto.kt b/app/src/main/java/sopt/motivoo/data/model/response/auth/ResponseWithDrawDto.kt similarity index 85% rename from app/src/main/java/sopt/mottivoo/data/model/response/auth/ResponseWithDrawDto.kt rename to app/src/main/java/sopt/motivoo/data/model/response/auth/ResponseWithDrawDto.kt index fc9d181e..393dfc28 100644 --- a/app/src/main/java/sopt/mottivoo/data/model/response/auth/ResponseWithDrawDto.kt +++ b/app/src/main/java/sopt/motivoo/data/model/response/auth/ResponseWithDrawDto.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.data.model.response.auth +package sopt.motivoo.data.model.response.auth import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/sopt/mottivoo/data/model/response/home/ResponseHomeDto.kt b/app/src/main/java/sopt/motivoo/data/model/response/home/ResponseHomeDto.kt similarity index 94% rename from app/src/main/java/sopt/mottivoo/data/model/response/home/ResponseHomeDto.kt rename to app/src/main/java/sopt/motivoo/data/model/response/home/ResponseHomeDto.kt index 182145dd..2f0bc3f3 100644 --- a/app/src/main/java/sopt/mottivoo/data/model/response/home/ResponseHomeDto.kt +++ b/app/src/main/java/sopt/motivoo/data/model/response/home/ResponseHomeDto.kt @@ -1,8 +1,8 @@ -package sopt.mottivoo.data.model.response.home +package sopt.motivoo.data.model.response.home import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable -import sopt.mottivoo.domain.entity.home.HomeData +import sopt.motivoo.domain.entity.home.HomeData @Serializable data class ResponseHomeDto( diff --git a/app/src/main/java/sopt/mottivoo/data/model/response/home/ResponseMissionChoiceDto.kt b/app/src/main/java/sopt/motivoo/data/model/response/home/ResponseMissionChoiceDto.kt similarity index 91% rename from app/src/main/java/sopt/mottivoo/data/model/response/home/ResponseMissionChoiceDto.kt rename to app/src/main/java/sopt/motivoo/data/model/response/home/ResponseMissionChoiceDto.kt index ea06aca1..d9b9f060 100644 --- a/app/src/main/java/sopt/mottivoo/data/model/response/home/ResponseMissionChoiceDto.kt +++ b/app/src/main/java/sopt/motivoo/data/model/response/home/ResponseMissionChoiceDto.kt @@ -1,10 +1,10 @@ -package sopt.mottivoo.data.model.response.home +package sopt.motivoo.data.model.response.home import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable -import sopt.mottivoo.domain.entity.home.MissionChoiceData -import sopt.mottivoo.domain.entity.home.MissionChoiceListData -import sopt.mottivoo.domain.entity.home.TodayMissionData +import sopt.motivoo.domain.entity.home.MissionChoiceData +import sopt.motivoo.domain.entity.home.MissionChoiceListData +import sopt.motivoo.domain.entity.home.TodayMissionData @Serializable data class ResponseMissionChoiceDto( diff --git a/app/src/main/java/sopt/mottivoo/data/model/response/home/ResponseMissionImageDto.kt b/app/src/main/java/sopt/motivoo/data/model/response/home/ResponseMissionImageDto.kt similarity index 87% rename from app/src/main/java/sopt/mottivoo/data/model/response/home/ResponseMissionImageDto.kt rename to app/src/main/java/sopt/motivoo/data/model/response/home/ResponseMissionImageDto.kt index 5e266112..ffba7175 100644 --- a/app/src/main/java/sopt/mottivoo/data/model/response/home/ResponseMissionImageDto.kt +++ b/app/src/main/java/sopt/motivoo/data/model/response/home/ResponseMissionImageDto.kt @@ -1,8 +1,8 @@ -package sopt.mottivoo.data.model.response.home +package sopt.motivoo.data.model.response.home import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable -import sopt.mottivoo.domain.entity.home.MissionImageData +import sopt.motivoo.domain.entity.home.MissionImageData @Serializable data class ResponseMissionImageDto( diff --git a/app/src/main/java/sopt/mottivoo/data/model/response/home/ResponseMissionTodayDto.kt b/app/src/main/java/sopt/motivoo/data/model/response/home/ResponseMissionTodayDto.kt similarity index 85% rename from app/src/main/java/sopt/mottivoo/data/model/response/home/ResponseMissionTodayDto.kt rename to app/src/main/java/sopt/motivoo/data/model/response/home/ResponseMissionTodayDto.kt index c65b288a..1297b207 100644 --- a/app/src/main/java/sopt/mottivoo/data/model/response/home/ResponseMissionTodayDto.kt +++ b/app/src/main/java/sopt/motivoo/data/model/response/home/ResponseMissionTodayDto.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.data.model.response.home +package sopt.motivoo.data.model.response.home import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/sopt/mottivoo/data/model/response/onboarding/ResponseFinishedOnboardingDto.kt b/app/src/main/java/sopt/motivoo/data/model/response/onboarding/ResponseFinishedOnboardingDto.kt similarity index 89% rename from app/src/main/java/sopt/mottivoo/data/model/response/onboarding/ResponseFinishedOnboardingDto.kt rename to app/src/main/java/sopt/motivoo/data/model/response/onboarding/ResponseFinishedOnboardingDto.kt index 5c02a2fa..4de83da6 100644 --- a/app/src/main/java/sopt/mottivoo/data/model/response/onboarding/ResponseFinishedOnboardingDto.kt +++ b/app/src/main/java/sopt/motivoo/data/model/response/onboarding/ResponseFinishedOnboardingDto.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.data.model.response.onboarding +package sopt.motivoo.data.model.response.onboarding import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/sopt/mottivoo/data/model/response/onboarding/ResponseGetInviteCodeDto.kt b/app/src/main/java/sopt/motivoo/data/model/response/onboarding/ResponseGetInviteCodeDto.kt similarity index 85% rename from app/src/main/java/sopt/mottivoo/data/model/response/onboarding/ResponseGetInviteCodeDto.kt rename to app/src/main/java/sopt/motivoo/data/model/response/onboarding/ResponseGetInviteCodeDto.kt index ea0556f3..e3aef359 100644 --- a/app/src/main/java/sopt/mottivoo/data/model/response/onboarding/ResponseGetInviteCodeDto.kt +++ b/app/src/main/java/sopt/motivoo/data/model/response/onboarding/ResponseGetInviteCodeDto.kt @@ -1,8 +1,8 @@ -package sopt.mottivoo.data.model.response.onboarding +package sopt.motivoo.data.model.response.onboarding import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable -import sopt.mottivoo.domain.entity.onboarding.InviteCodeInfo +import sopt.motivoo.domain.entity.onboarding.InviteCodeInfo @Serializable data class ResponseGetInviteCodeDto( diff --git a/app/src/main/java/sopt/mottivoo/data/model/response/onboarding/ResponseGetMatchedResultDto.kt b/app/src/main/java/sopt/motivoo/data/model/response/onboarding/ResponseGetMatchedResultDto.kt similarity index 87% rename from app/src/main/java/sopt/mottivoo/data/model/response/onboarding/ResponseGetMatchedResultDto.kt rename to app/src/main/java/sopt/motivoo/data/model/response/onboarding/ResponseGetMatchedResultDto.kt index 459b9d4a..e6db9cdb 100644 --- a/app/src/main/java/sopt/mottivoo/data/model/response/onboarding/ResponseGetMatchedResultDto.kt +++ b/app/src/main/java/sopt/motivoo/data/model/response/onboarding/ResponseGetMatchedResultDto.kt @@ -1,8 +1,8 @@ -package sopt.mottivoo.data.model.response.onboarding +package sopt.motivoo.data.model.response.onboarding import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable -import sopt.mottivoo.domain.entity.onboarding.GetMatchedInfo +import sopt.motivoo.domain.entity.onboarding.GetMatchedInfo @Serializable data class ResponseGetMatchedResultDto( diff --git a/app/src/main/java/sopt/mottivoo/data/model/response/onboarding/ResponseOnboardingDto.kt b/app/src/main/java/sopt/motivoo/data/model/response/onboarding/ResponseOnboardingDto.kt similarity index 90% rename from app/src/main/java/sopt/mottivoo/data/model/response/onboarding/ResponseOnboardingDto.kt rename to app/src/main/java/sopt/motivoo/data/model/response/onboarding/ResponseOnboardingDto.kt index 8d5f0595..187daeb6 100644 --- a/app/src/main/java/sopt/mottivoo/data/model/response/onboarding/ResponseOnboardingDto.kt +++ b/app/src/main/java/sopt/motivoo/data/model/response/onboarding/ResponseOnboardingDto.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.data.model.response.onboarding +package sopt.motivoo.data.model.response.onboarding import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/sopt/mottivoo/data/model/response/onboarding/ResponsePostInviteCodeDto.kt b/app/src/main/java/sopt/motivoo/data/model/response/onboarding/ResponsePostInviteCodeDto.kt similarity index 86% rename from app/src/main/java/sopt/mottivoo/data/model/response/onboarding/ResponsePostInviteCodeDto.kt rename to app/src/main/java/sopt/motivoo/data/model/response/onboarding/ResponsePostInviteCodeDto.kt index f94ddd03..461f1fe9 100644 --- a/app/src/main/java/sopt/mottivoo/data/model/response/onboarding/ResponsePostInviteCodeDto.kt +++ b/app/src/main/java/sopt/motivoo/data/model/response/onboarding/ResponsePostInviteCodeDto.kt @@ -1,8 +1,8 @@ -package sopt.mottivoo.data.model.response.onboarding +package sopt.motivoo.data.model.response.onboarding import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable -import sopt.mottivoo.domain.entity.onboarding.MatchedInfo +import sopt.motivoo.domain.entity.onboarding.MatchedInfo @Serializable data class ResponsePostInviteCodeDto( diff --git a/app/src/main/java/sopt/mottivoo/data/repository/AuthRepositoryImpl.kt b/app/src/main/java/sopt/motivoo/data/repository/AuthRepositoryImpl.kt similarity index 59% rename from app/src/main/java/sopt/mottivoo/data/repository/AuthRepositoryImpl.kt rename to app/src/main/java/sopt/motivoo/data/repository/AuthRepositoryImpl.kt index baa20744..db29c24b 100644 --- a/app/src/main/java/sopt/mottivoo/data/repository/AuthRepositoryImpl.kt +++ b/app/src/main/java/sopt/motivoo/data/repository/AuthRepositoryImpl.kt @@ -1,11 +1,11 @@ -package sopt.mottivoo.data.repository +package sopt.motivoo.data.repository -import sopt.mottivoo.data.datasource.remote.AuthDataSource -import sopt.mottivoo.data.model.request.auth.RequestLoginDto -import sopt.mottivoo.data.model.response.auth.ResponseLogoutDto -import sopt.mottivoo.data.model.response.auth.ResponseWithDrawDto -import sopt.mottivoo.domain.entity.auth.LoginInfo -import sopt.mottivoo.domain.repository.AuthRepository +import sopt.motivoo.data.datasource.remote.AuthDataSource +import sopt.motivoo.data.model.request.auth.RequestLoginDto +import sopt.motivoo.data.model.response.auth.ResponseLogoutDto +import sopt.motivoo.data.model.response.auth.ResponseWithDrawDto +import sopt.motivoo.domain.entity.auth.LoginInfo +import sopt.motivoo.domain.repository.AuthRepository import javax.inject.Inject class AuthRepositoryImpl @Inject constructor( diff --git a/app/src/main/java/sopt/mottivoo/data/repository/DummyRepositoryImpl.kt b/app/src/main/java/sopt/motivoo/data/repository/DummyRepositoryImpl.kt similarity index 55% rename from app/src/main/java/sopt/mottivoo/data/repository/DummyRepositoryImpl.kt rename to app/src/main/java/sopt/motivoo/data/repository/DummyRepositoryImpl.kt index 35a602ab..e086fea1 100644 --- a/app/src/main/java/sopt/mottivoo/data/repository/DummyRepositoryImpl.kt +++ b/app/src/main/java/sopt/motivoo/data/repository/DummyRepositoryImpl.kt @@ -1,9 +1,9 @@ -package sopt.mottivoo.data.repository +package sopt.motivoo.data.repository -import sopt.mottivoo.data.datasource.remote.DummyDataSource -import sopt.mottivoo.data.model.request.DummyRequestData -import sopt.mottivoo.domain.entity.dummy.DummyInfoList -import sopt.mottivoo.domain.repository.DummyRepository +import sopt.motivoo.data.datasource.remote.DummyDataSource +import sopt.motivoo.data.model.request.DummyRequestData +import sopt.motivoo.domain.entity.dummy.DummyInfoList +import sopt.motivoo.domain.repository.DummyRepository import javax.inject.Inject class DummyRepositoryImpl @Inject constructor( diff --git a/app/src/main/java/sopt/mottivoo/data/repository/FirebaseRepositoryImpl.kt b/app/src/main/java/sopt/motivoo/data/repository/FirebaseRepositoryImpl.kt similarity index 91% rename from app/src/main/java/sopt/mottivoo/data/repository/FirebaseRepositoryImpl.kt rename to app/src/main/java/sopt/motivoo/data/repository/FirebaseRepositoryImpl.kt index be3ba822..1fdacdc2 100644 --- a/app/src/main/java/sopt/mottivoo/data/repository/FirebaseRepositoryImpl.kt +++ b/app/src/main/java/sopt/motivoo/data/repository/FirebaseRepositoryImpl.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.data.repository +package sopt.motivoo.data.repository import com.google.firebase.database.DataSnapshot import com.google.firebase.database.DatabaseError @@ -12,9 +12,9 @@ import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow import kotlinx.coroutines.tasks.await -import sopt.mottivoo.BuildConfig -import sopt.mottivoo.di.IoDispatcher -import sopt.mottivoo.domain.repository.FirebaseRepository +import sopt.motivoo.BuildConfig +import sopt.motivoo.di.IoDispatcher +import sopt.motivoo.domain.repository.FirebaseRepository import javax.inject.Inject class FirebaseRepositoryImpl @Inject constructor( diff --git a/app/src/main/java/sopt/mottivoo/data/repository/HomeRepositoryImpl.kt b/app/src/main/java/sopt/motivoo/data/repository/HomeRepositoryImpl.kt similarity index 79% rename from app/src/main/java/sopt/mottivoo/data/repository/HomeRepositoryImpl.kt rename to app/src/main/java/sopt/motivoo/data/repository/HomeRepositoryImpl.kt index 24f7a430..ad36fa32 100644 --- a/app/src/main/java/sopt/mottivoo/data/repository/HomeRepositoryImpl.kt +++ b/app/src/main/java/sopt/motivoo/data/repository/HomeRepositoryImpl.kt @@ -1,15 +1,15 @@ -package sopt.mottivoo.data.repository +package sopt.motivoo.data.repository import android.graphics.Bitmap import okhttp3.RequestBody.Companion.toRequestBody -import sopt.mottivoo.data.datasource.remote.HomeDataSource -import sopt.mottivoo.data.model.request.home.RequestMissionTodayDto -import sopt.mottivoo.domain.entity.error.ResponseHandler -import sopt.mottivoo.domain.entity.home.HomeData -import sopt.mottivoo.domain.entity.home.MissionChoiceData -import sopt.mottivoo.domain.entity.home.MissionImageData -import sopt.mottivoo.domain.error.UserErrorHandler -import sopt.mottivoo.domain.repository.HomeRepository +import sopt.motivoo.data.datasource.remote.HomeDataSource +import sopt.motivoo.data.model.request.home.RequestMissionTodayDto +import sopt.motivoo.domain.entity.error.ResponseHandler +import sopt.motivoo.domain.entity.home.HomeData +import sopt.motivoo.domain.entity.home.MissionChoiceData +import sopt.motivoo.domain.entity.home.MissionImageData +import sopt.motivoo.domain.error.UserErrorHandler +import sopt.motivoo.domain.repository.HomeRepository import java.io.ByteArrayOutputStream import javax.inject.Inject diff --git a/app/src/main/java/sopt/mottivoo/data/repository/NetworkRepositoryImpl.kt b/app/src/main/java/sopt/motivoo/data/repository/NetworkRepositoryImpl.kt similarity index 59% rename from app/src/main/java/sopt/mottivoo/data/repository/NetworkRepositoryImpl.kt rename to app/src/main/java/sopt/motivoo/data/repository/NetworkRepositoryImpl.kt index 7952cce7..124e486d 100644 --- a/app/src/main/java/sopt/mottivoo/data/repository/NetworkRepositoryImpl.kt +++ b/app/src/main/java/sopt/motivoo/data/repository/NetworkRepositoryImpl.kt @@ -1,7 +1,7 @@ -package sopt.mottivoo.data.repository +package sopt.motivoo.data.repository -import sopt.mottivoo.domain.repository.NetworkRepository -import sopt.mottivoo.util.NetworkState +import sopt.motivoo.domain.repository.NetworkRepository +import sopt.motivoo.util.NetworkState import javax.inject.Inject class NetworkRepositoryImpl @Inject constructor( diff --git a/app/src/main/java/sopt/mottivoo/data/repository/OnboardingRepositoryImpl.kt b/app/src/main/java/sopt/motivoo/data/repository/OnboardingRepositoryImpl.kt similarity index 62% rename from app/src/main/java/sopt/mottivoo/data/repository/OnboardingRepositoryImpl.kt rename to app/src/main/java/sopt/motivoo/data/repository/OnboardingRepositoryImpl.kt index 1338ea41..7f50274a 100644 --- a/app/src/main/java/sopt/mottivoo/data/repository/OnboardingRepositoryImpl.kt +++ b/app/src/main/java/sopt/motivoo/data/repository/OnboardingRepositoryImpl.kt @@ -1,13 +1,13 @@ -package sopt.mottivoo.data.repository +package sopt.motivoo.data.repository -import sopt.mottivoo.data.datasource.remote.OnboardingDataSource -import sopt.mottivoo.data.model.request.onboarding.RequestOnboardingDto -import sopt.mottivoo.data.model.request.onboarding.RequestPostInviteCodeDto -import sopt.mottivoo.data.model.response.onboarding.ResponseOnboardingDto -import sopt.mottivoo.domain.entity.onboarding.GetMatchedInfo -import sopt.mottivoo.domain.entity.onboarding.InviteCodeInfo -import sopt.mottivoo.domain.entity.onboarding.MatchedInfo -import sopt.mottivoo.domain.repository.OnboardingRepository +import sopt.motivoo.data.datasource.remote.OnboardingDataSource +import sopt.motivoo.data.model.request.onboarding.RequestOnboardingDto +import sopt.motivoo.data.model.request.onboarding.RequestPostInviteCodeDto +import sopt.motivoo.data.model.response.onboarding.ResponseOnboardingDto +import sopt.motivoo.domain.entity.onboarding.GetMatchedInfo +import sopt.motivoo.domain.entity.onboarding.InviteCodeInfo +import sopt.motivoo.domain.entity.onboarding.MatchedInfo +import sopt.motivoo.domain.repository.OnboardingRepository import javax.inject.Inject class OnboardingRepositoryImpl @Inject constructor( diff --git a/app/src/main/java/sopt/mottivoo/data/repository/StepCountRepositoryImpl.kt b/app/src/main/java/sopt/motivoo/data/repository/StepCountRepositoryImpl.kt similarity index 83% rename from app/src/main/java/sopt/mottivoo/data/repository/StepCountRepositoryImpl.kt rename to app/src/main/java/sopt/motivoo/data/repository/StepCountRepositoryImpl.kt index 08d201f4..4303c432 100644 --- a/app/src/main/java/sopt/mottivoo/data/repository/StepCountRepositoryImpl.kt +++ b/app/src/main/java/sopt/motivoo/data/repository/StepCountRepositoryImpl.kt @@ -1,9 +1,9 @@ -package sopt.mottivoo.data.repository +package sopt.motivoo.data.repository import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.first -import sopt.mottivoo.data.datasource.local.StepCountLocalDataSource -import sopt.mottivoo.domain.repository.StepCountRepository +import sopt.motivoo.data.datasource.local.StepCountLocalDataSource +import sopt.motivoo.domain.repository.StepCountRepository import javax.inject.Inject class StepCountRepositoryImpl @Inject constructor( diff --git a/app/src/main/java/sopt/mottivoo/data/repository/UserRepositoryImpl.kt b/app/src/main/java/sopt/motivoo/data/repository/UserRepositoryImpl.kt similarity index 75% rename from app/src/main/java/sopt/mottivoo/data/repository/UserRepositoryImpl.kt rename to app/src/main/java/sopt/motivoo/data/repository/UserRepositoryImpl.kt index 1fc7d9cf..9bc4842d 100644 --- a/app/src/main/java/sopt/mottivoo/data/repository/UserRepositoryImpl.kt +++ b/app/src/main/java/sopt/motivoo/data/repository/UserRepositoryImpl.kt @@ -1,8 +1,8 @@ -package sopt.mottivoo.data.repository +package sopt.motivoo.data.repository import kotlinx.coroutines.flow.first -import sopt.mottivoo.data.datasource.local.UserLocalDataSource -import sopt.mottivoo.domain.repository.UserRepository +import sopt.motivoo.data.datasource.local.UserLocalDataSource +import sopt.motivoo.domain.repository.UserRepository import javax.inject.Inject class UserRepositoryImpl @Inject constructor( diff --git a/app/src/main/java/sopt/mottivoo/data/service/AuthService.kt b/app/src/main/java/sopt/motivoo/data/service/AuthService.kt similarity index 57% rename from app/src/main/java/sopt/mottivoo/data/service/AuthService.kt rename to app/src/main/java/sopt/motivoo/data/service/AuthService.kt index f3fe0358..31df8485 100644 --- a/app/src/main/java/sopt/mottivoo/data/service/AuthService.kt +++ b/app/src/main/java/sopt/motivoo/data/service/AuthService.kt @@ -1,12 +1,12 @@ -package sopt.mottivoo.data.service +package sopt.motivoo.data.service import retrofit2.http.Body import retrofit2.http.DELETE import retrofit2.http.POST -import sopt.mottivoo.data.model.request.auth.RequestLoginDto -import sopt.mottivoo.data.model.response.auth.ResponseLoginDto -import sopt.mottivoo.data.model.response.auth.ResponseLogoutDto -import sopt.mottivoo.data.model.response.auth.ResponseWithDrawDto +import sopt.motivoo.data.model.request.auth.RequestLoginDto +import sopt.motivoo.data.model.response.auth.ResponseLoginDto +import sopt.motivoo.data.model.response.auth.ResponseLogoutDto +import sopt.motivoo.data.model.response.auth.ResponseWithDrawDto interface AuthService { @POST("oauth/login") diff --git a/app/src/main/java/sopt/mottivoo/data/service/DummyService.kt b/app/src/main/java/sopt/motivoo/data/service/DummyService.kt similarity index 56% rename from app/src/main/java/sopt/mottivoo/data/service/DummyService.kt rename to app/src/main/java/sopt/motivoo/data/service/DummyService.kt index b466a8c4..2a2b4849 100644 --- a/app/src/main/java/sopt/mottivoo/data/service/DummyService.kt +++ b/app/src/main/java/sopt/motivoo/data/service/DummyService.kt @@ -1,9 +1,9 @@ -package sopt.mottivoo.data.service +package sopt.motivoo.data.service import retrofit2.http.Body import retrofit2.http.POST -import sopt.mottivoo.data.model.request.DummyRequestData -import sopt.mottivoo.data.model.response.DummyResponseData +import sopt.motivoo.data.model.request.DummyRequestData +import sopt.motivoo.data.model.response.DummyResponseData interface DummyService { diff --git a/app/src/main/java/sopt/mottivoo/data/service/ExerciseService.kt b/app/src/main/java/sopt/motivoo/data/service/ExerciseService.kt similarity index 59% rename from app/src/main/java/sopt/mottivoo/data/service/ExerciseService.kt rename to app/src/main/java/sopt/motivoo/data/service/ExerciseService.kt index 0998b05c..7aba0fde 100644 --- a/app/src/main/java/sopt/mottivoo/data/service/ExerciseService.kt +++ b/app/src/main/java/sopt/motivoo/data/service/ExerciseService.kt @@ -1,7 +1,7 @@ -package sopt.mottivoo.data.service +package sopt.motivoo.data.service import retrofit2.http.GET -import sopt.mottivoo.data.model.response.ResponseExerciseDto +import sopt.motivoo.data.model.response.ResponseExerciseDto interface ExerciseService { @GET("/mission") diff --git a/app/src/main/java/sopt/mottivoo/data/service/HomeService.kt b/app/src/main/java/sopt/motivoo/data/service/HomeService.kt similarity index 69% rename from app/src/main/java/sopt/mottivoo/data/service/HomeService.kt rename to app/src/main/java/sopt/motivoo/data/service/HomeService.kt index d025b374..a40b0c39 100644 --- a/app/src/main/java/sopt/mottivoo/data/service/HomeService.kt +++ b/app/src/main/java/sopt/motivoo/data/service/HomeService.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.data.service +package sopt.motivoo.data.service import okhttp3.RequestBody import retrofit2.Response @@ -9,12 +9,12 @@ import retrofit2.http.POST import retrofit2.http.PUT import retrofit2.http.Path import retrofit2.http.Url -import sopt.mottivoo.data.model.request.home.RequestMissionImageFileDto -import sopt.mottivoo.data.model.request.home.RequestMissionTodayDto -import sopt.mottivoo.data.model.response.home.ResponseHomeDto -import sopt.mottivoo.data.model.response.home.ResponseMissionChoiceDto -import sopt.mottivoo.data.model.response.home.ResponseMissionImageDto -import sopt.mottivoo.data.model.response.home.ResponseMissionTodayDto +import sopt.motivoo.data.model.request.home.RequestMissionImageFileDto +import sopt.motivoo.data.model.request.home.RequestMissionTodayDto +import sopt.motivoo.data.model.response.home.ResponseHomeDto +import sopt.motivoo.data.model.response.home.ResponseMissionChoiceDto +import sopt.motivoo.data.model.response.home.ResponseMissionImageDto +import sopt.motivoo.data.model.response.home.ResponseMissionTodayDto interface HomeService { @GET("home") diff --git a/app/src/main/java/sopt/mottivoo/data/service/KakaoAuthService.kt b/app/src/main/java/sopt/motivoo/data/service/KakaoAuthService.kt similarity index 98% rename from app/src/main/java/sopt/mottivoo/data/service/KakaoAuthService.kt rename to app/src/main/java/sopt/motivoo/data/service/KakaoAuthService.kt index c5830cdc..957b4635 100644 --- a/app/src/main/java/sopt/mottivoo/data/service/KakaoAuthService.kt +++ b/app/src/main/java/sopt/motivoo/data/service/KakaoAuthService.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.data.service +package sopt.motivoo.data.service import android.content.Context import com.kakao.sdk.auth.model.OAuthToken diff --git a/app/src/main/java/sopt/mottivoo/data/service/MyExerciseInfoService.kt b/app/src/main/java/sopt/motivoo/data/service/MyExerciseInfoService.kt similarity index 60% rename from app/src/main/java/sopt/mottivoo/data/service/MyExerciseInfoService.kt rename to app/src/main/java/sopt/motivoo/data/service/MyExerciseInfoService.kt index bbd2e3b2..50e30d21 100644 --- a/app/src/main/java/sopt/mottivoo/data/service/MyExerciseInfoService.kt +++ b/app/src/main/java/sopt/motivoo/data/service/MyExerciseInfoService.kt @@ -1,7 +1,7 @@ -package sopt.mottivoo.data.service +package sopt.motivoo.data.service import retrofit2.http.GET -import sopt.mottivoo.data.model.response.ResponseMyExerciseInfoDto +import sopt.motivoo.data.model.response.ResponseMyExerciseInfoDto interface MyExerciseInfoService { @GET("/user/exercise") diff --git a/app/src/main/java/sopt/mottivoo/data/service/MyPageService.kt b/app/src/main/java/sopt/motivoo/data/service/MyPageService.kt similarity index 57% rename from app/src/main/java/sopt/mottivoo/data/service/MyPageService.kt rename to app/src/main/java/sopt/motivoo/data/service/MyPageService.kt index fe3014e9..c10491ba 100644 --- a/app/src/main/java/sopt/mottivoo/data/service/MyPageService.kt +++ b/app/src/main/java/sopt/motivoo/data/service/MyPageService.kt @@ -1,7 +1,7 @@ -package sopt.mottivoo.data.service +package sopt.motivoo.data.service import retrofit2.http.GET -import sopt.mottivoo.data.model.response.ResponseMyPageDto +import sopt.motivoo.data.model.response.ResponseMyPageDto interface MyPageService { @GET("/user/me") diff --git a/app/src/main/java/sopt/mottivoo/data/service/OnboardingService.kt b/app/src/main/java/sopt/motivoo/data/service/OnboardingService.kt similarity index 58% rename from app/src/main/java/sopt/mottivoo/data/service/OnboardingService.kt rename to app/src/main/java/sopt/motivoo/data/service/OnboardingService.kt index 4b5c4aba..53053de8 100644 --- a/app/src/main/java/sopt/mottivoo/data/service/OnboardingService.kt +++ b/app/src/main/java/sopt/motivoo/data/service/OnboardingService.kt @@ -1,15 +1,15 @@ -package sopt.mottivoo.data.service +package sopt.motivoo.data.service import retrofit2.http.Body import retrofit2.http.GET import retrofit2.http.PATCH import retrofit2.http.POST -import sopt.mottivoo.data.model.request.onboarding.RequestOnboardingDto -import sopt.mottivoo.data.model.request.onboarding.RequestPostInviteCodeDto -import sopt.mottivoo.data.model.response.onboarding.ResponseGetInviteCodeDto -import sopt.mottivoo.data.model.response.onboarding.ResponseGetMatchedResultDto -import sopt.mottivoo.data.model.response.onboarding.ResponseOnboardingDto -import sopt.mottivoo.data.model.response.onboarding.ResponsePostInviteCodeDto +import sopt.motivoo.data.model.request.onboarding.RequestOnboardingDto +import sopt.motivoo.data.model.request.onboarding.RequestPostInviteCodeDto +import sopt.motivoo.data.model.response.onboarding.ResponseGetInviteCodeDto +import sopt.motivoo.data.model.response.onboarding.ResponseGetMatchedResultDto +import sopt.motivoo.data.model.response.onboarding.ResponseOnboardingDto +import sopt.motivoo.data.model.response.onboarding.ResponsePostInviteCodeDto interface OnboardingService { @POST("user/exercise") diff --git a/app/src/main/java/sopt/mottivoo/di/CoroutineModule.kt b/app/src/main/java/sopt/motivoo/di/CoroutineModule.kt similarity index 93% rename from app/src/main/java/sopt/mottivoo/di/CoroutineModule.kt rename to app/src/main/java/sopt/motivoo/di/CoroutineModule.kt index 56dc6c70..21fba285 100644 --- a/app/src/main/java/sopt/mottivoo/di/CoroutineModule.kt +++ b/app/src/main/java/sopt/motivoo/di/CoroutineModule.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.di +package sopt.motivoo.di import dagger.Module import dagger.Provides diff --git a/app/src/main/java/sopt/mottivoo/di/DataStoreModule.kt b/app/src/main/java/sopt/motivoo/di/DataStoreModule.kt similarity index 98% rename from app/src/main/java/sopt/mottivoo/di/DataStoreModule.kt rename to app/src/main/java/sopt/motivoo/di/DataStoreModule.kt index 3c895b94..07a7d2d5 100644 --- a/app/src/main/java/sopt/mottivoo/di/DataStoreModule.kt +++ b/app/src/main/java/sopt/motivoo/di/DataStoreModule.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.di +package sopt.motivoo.di import android.content.Context import androidx.datastore.core.DataStore diff --git a/app/src/main/java/sopt/mottivoo/di/DispatcherModule.kt b/app/src/main/java/sopt/motivoo/di/DispatcherModule.kt similarity index 95% rename from app/src/main/java/sopt/mottivoo/di/DispatcherModule.kt rename to app/src/main/java/sopt/motivoo/di/DispatcherModule.kt index 6c0daa28..6e0eaf35 100644 --- a/app/src/main/java/sopt/mottivoo/di/DispatcherModule.kt +++ b/app/src/main/java/sopt/motivoo/di/DispatcherModule.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.di +package sopt.motivoo.di import dagger.Module import dagger.Provides diff --git a/app/src/main/java/sopt/mottivoo/di/FirebaseModule.kt b/app/src/main/java/sopt/motivoo/di/FirebaseModule.kt similarity index 94% rename from app/src/main/java/sopt/mottivoo/di/FirebaseModule.kt rename to app/src/main/java/sopt/motivoo/di/FirebaseModule.kt index bf2a5a35..26895652 100644 --- a/app/src/main/java/sopt/mottivoo/di/FirebaseModule.kt +++ b/app/src/main/java/sopt/motivoo/di/FirebaseModule.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.di +package sopt.motivoo.di import com.google.firebase.database.FirebaseDatabase import dagger.Module diff --git a/app/src/main/java/sopt/mottivoo/di/KakaoModule.kt b/app/src/main/java/sopt/motivoo/di/KakaoModule.kt similarity index 84% rename from app/src/main/java/sopt/mottivoo/di/KakaoModule.kt rename to app/src/main/java/sopt/motivoo/di/KakaoModule.kt index 402fa2cc..815b9b55 100644 --- a/app/src/main/java/sopt/mottivoo/di/KakaoModule.kt +++ b/app/src/main/java/sopt/motivoo/di/KakaoModule.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.di +package sopt.motivoo.di import android.content.Context import dagger.Module @@ -6,7 +6,7 @@ import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.android.components.ActivityComponent import dagger.hilt.android.qualifiers.ActivityContext -import sopt.mottivoo.data.service.KakaoAuthService +import sopt.motivoo.data.service.KakaoAuthService @Module @InstallIn(ActivityComponent::class) diff --git a/app/src/main/java/sopt/mottivoo/di/Logger.kt b/app/src/main/java/sopt/motivoo/di/Logger.kt similarity index 93% rename from app/src/main/java/sopt/mottivoo/di/Logger.kt rename to app/src/main/java/sopt/motivoo/di/Logger.kt index 380676e7..c98c61b5 100644 --- a/app/src/main/java/sopt/mottivoo/di/Logger.kt +++ b/app/src/main/java/sopt/motivoo/di/Logger.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.di +package sopt.motivoo.di import javax.inject.Qualifier diff --git a/app/src/main/java/sopt/mottivoo/di/NavigationModule.kt b/app/src/main/java/sopt/motivoo/di/NavigationModule.kt similarity index 76% rename from app/src/main/java/sopt/mottivoo/di/NavigationModule.kt rename to app/src/main/java/sopt/motivoo/di/NavigationModule.kt index 9620e8d7..8bb1e060 100644 --- a/app/src/main/java/sopt/mottivoo/di/NavigationModule.kt +++ b/app/src/main/java/sopt/motivoo/di/NavigationModule.kt @@ -1,11 +1,11 @@ -package sopt.mottivoo.di +package sopt.motivoo.di import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import sopt.mottivoo.domain.entity.MotivooStorage -import sopt.mottivoo.util.NavigationDecider +import sopt.motivoo.domain.entity.MotivooStorage +import sopt.motivoo.util.NavigationDecider import javax.inject.Singleton @Module diff --git a/app/src/main/java/sopt/mottivoo/di/NetworkModule.kt b/app/src/main/java/sopt/motivoo/di/NetworkModule.kt similarity index 87% rename from app/src/main/java/sopt/mottivoo/di/NetworkModule.kt rename to app/src/main/java/sopt/motivoo/di/NetworkModule.kt index aaaf00b6..3f74b694 100644 --- a/app/src/main/java/sopt/mottivoo/di/NetworkModule.kt +++ b/app/src/main/java/sopt/motivoo/di/NetworkModule.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.di +package sopt.motivoo.di import android.content.Context import dagger.Module @@ -6,7 +6,7 @@ import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent -import sopt.mottivoo.util.NetworkState +import sopt.motivoo.util.NetworkState import javax.inject.Singleton @Module diff --git a/app/src/main/java/sopt/mottivoo/di/RepositoryModule.kt b/app/src/main/java/sopt/motivoo/di/RepositoryModule.kt similarity index 61% rename from app/src/main/java/sopt/mottivoo/di/RepositoryModule.kt rename to app/src/main/java/sopt/motivoo/di/RepositoryModule.kt index 00ab0c3f..48ed054b 100644 --- a/app/src/main/java/sopt/mottivoo/di/RepositoryModule.kt +++ b/app/src/main/java/sopt/motivoo/di/RepositoryModule.kt @@ -1,27 +1,27 @@ -package sopt.mottivoo.di +package sopt.motivoo.di import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import sopt.mottivoo.data.error.UserErrorHandlerImpl -import sopt.mottivoo.data.repository.AuthRepositoryImpl -import sopt.mottivoo.data.repository.DummyRepositoryImpl -import sopt.mottivoo.data.repository.FirebaseRepositoryImpl -import sopt.mottivoo.data.repository.HomeRepositoryImpl -import sopt.mottivoo.data.repository.NetworkRepositoryImpl -import sopt.mottivoo.data.repository.OnboardingRepositoryImpl -import sopt.mottivoo.data.repository.StepCountRepositoryImpl -import sopt.mottivoo.data.repository.UserRepositoryImpl -import sopt.mottivoo.domain.error.UserErrorHandler -import sopt.mottivoo.domain.repository.AuthRepository -import sopt.mottivoo.domain.repository.DummyRepository -import sopt.mottivoo.domain.repository.FirebaseRepository -import sopt.mottivoo.domain.repository.HomeRepository -import sopt.mottivoo.domain.repository.NetworkRepository -import sopt.mottivoo.domain.repository.OnboardingRepository -import sopt.mottivoo.domain.repository.StepCountRepository -import sopt.mottivoo.domain.repository.UserRepository +import sopt.motivoo.data.error.UserErrorHandlerImpl +import sopt.motivoo.data.repository.AuthRepositoryImpl +import sopt.motivoo.data.repository.DummyRepositoryImpl +import sopt.motivoo.data.repository.FirebaseRepositoryImpl +import sopt.motivoo.data.repository.HomeRepositoryImpl +import sopt.motivoo.data.repository.NetworkRepositoryImpl +import sopt.motivoo.data.repository.OnboardingRepositoryImpl +import sopt.motivoo.data.repository.StepCountRepositoryImpl +import sopt.motivoo.data.repository.UserRepositoryImpl +import sopt.motivoo.domain.error.UserErrorHandler +import sopt.motivoo.domain.repository.AuthRepository +import sopt.motivoo.domain.repository.DummyRepository +import sopt.motivoo.domain.repository.FirebaseRepository +import sopt.motivoo.domain.repository.HomeRepository +import sopt.motivoo.domain.repository.NetworkRepository +import sopt.motivoo.domain.repository.OnboardingRepository +import sopt.motivoo.domain.repository.StepCountRepository +import sopt.motivoo.domain.repository.UserRepository import javax.inject.Singleton @Module diff --git a/app/src/main/java/sopt/mottivoo/di/RetrofitModule.kt b/app/src/main/java/sopt/motivoo/di/RetrofitModule.kt similarity index 82% rename from app/src/main/java/sopt/mottivoo/di/RetrofitModule.kt rename to app/src/main/java/sopt/motivoo/di/RetrofitModule.kt index 762aef95..f0baa582 100644 --- a/app/src/main/java/sopt/mottivoo/di/RetrofitModule.kt +++ b/app/src/main/java/sopt/motivoo/di/RetrofitModule.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.di +package sopt.motivoo.di import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory import dagger.Module @@ -11,14 +11,14 @@ import okhttp3.MediaType.Companion.toMediaType import okhttp3.OkHttpClient import okhttp3.logging.HttpLoggingInterceptor import retrofit2.Retrofit -import sopt.mottivoo.BuildConfig.BASE_URL -import sopt.mottivoo.BuildConfig.DEBUG -import sopt.mottivoo.data.datasource.remote.intercepter.AuthInterceptor -import sopt.mottivoo.data.datasource.remote.intercepter.ErrorInterceptor -import sopt.mottivoo.data.datasource.remote.listener.AuthTokenRefreshListener -import sopt.mottivoo.data.datasource.remote.listener.AuthTokenRefreshListenerImpl -import sopt.mottivoo.data.datasource.remote.listener.NetworkErrorListener -import sopt.mottivoo.data.datasource.remote.listener.NetworkErrorListenerImpl +import sopt.motivoo.BuildConfig.BASE_URL +import sopt.motivoo.BuildConfig.DEBUG +import sopt.motivoo.data.datasource.remote.intercepter.AuthInterceptor +import sopt.motivoo.data.datasource.remote.intercepter.ErrorInterceptor +import sopt.motivoo.data.datasource.remote.listener.AuthTokenRefreshListener +import sopt.motivoo.data.datasource.remote.listener.AuthTokenRefreshListenerImpl +import sopt.motivoo.data.datasource.remote.listener.NetworkErrorListener +import sopt.motivoo.data.datasource.remote.listener.NetworkErrorListenerImpl import java.util.concurrent.TimeUnit import javax.inject.Singleton diff --git a/app/src/main/java/sopt/mottivoo/di/ServiceModule.kt b/app/src/main/java/sopt/motivoo/di/ServiceModule.kt similarity index 75% rename from app/src/main/java/sopt/mottivoo/di/ServiceModule.kt rename to app/src/main/java/sopt/motivoo/di/ServiceModule.kt index 97deb15b..1f3db82f 100644 --- a/app/src/main/java/sopt/mottivoo/di/ServiceModule.kt +++ b/app/src/main/java/sopt/motivoo/di/ServiceModule.kt @@ -1,17 +1,17 @@ -package sopt.mottivoo.di +package sopt.motivoo.di import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent import retrofit2.Retrofit -import sopt.mottivoo.data.service.AuthService -import sopt.mottivoo.data.service.DummyService -import sopt.mottivoo.data.service.ExerciseService -import sopt.mottivoo.data.service.HomeService -import sopt.mottivoo.data.service.MyExerciseInfoService -import sopt.mottivoo.data.service.MyPageService -import sopt.mottivoo.data.service.OnboardingService +import sopt.motivoo.data.service.AuthService +import sopt.motivoo.data.service.DummyService +import sopt.motivoo.data.service.ExerciseService +import sopt.motivoo.data.service.HomeService +import sopt.motivoo.data.service.MyExerciseInfoService +import sopt.motivoo.data.service.MyPageService +import sopt.motivoo.data.service.OnboardingService import javax.inject.Singleton @Module diff --git a/app/src/main/java/sopt/mottivoo/di/StorageModule.kt b/app/src/main/java/sopt/motivoo/di/StorageModule.kt similarity index 77% rename from app/src/main/java/sopt/mottivoo/di/StorageModule.kt rename to app/src/main/java/sopt/motivoo/di/StorageModule.kt index 2b9635aa..14123053 100644 --- a/app/src/main/java/sopt/mottivoo/di/StorageModule.kt +++ b/app/src/main/java/sopt/motivoo/di/StorageModule.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.di +package sopt.motivoo.di import android.content.Context import dagger.Module @@ -6,8 +6,8 @@ import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent -import sopt.mottivoo.data.datasource.local.MotivooStorageImpl -import sopt.mottivoo.domain.entity.MotivooStorage +import sopt.motivoo.data.datasource.local.MotivooStorageImpl +import sopt.motivoo.domain.entity.MotivooStorage import javax.inject.Singleton @Module diff --git a/app/src/main/java/sopt/mottivoo/domain/entity/MotivooStorage.kt b/app/src/main/java/sopt/motivoo/domain/entity/MotivooStorage.kt similarity index 91% rename from app/src/main/java/sopt/mottivoo/domain/entity/MotivooStorage.kt rename to app/src/main/java/sopt/motivoo/domain/entity/MotivooStorage.kt index f49596b7..4341c37f 100644 --- a/app/src/main/java/sopt/mottivoo/domain/entity/MotivooStorage.kt +++ b/app/src/main/java/sopt/motivoo/domain/entity/MotivooStorage.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.domain.entity +package sopt.motivoo.domain.entity interface MotivooStorage { var accessToken: String diff --git a/app/src/main/java/sopt/mottivoo/domain/entity/MyExerciseInfo.kt b/app/src/main/java/sopt/motivoo/domain/entity/MyExerciseInfo.kt similarity index 84% rename from app/src/main/java/sopt/mottivoo/domain/entity/MyExerciseInfo.kt rename to app/src/main/java/sopt/motivoo/domain/entity/MyExerciseInfo.kt index dd0bc0e9..56dfcb7d 100644 --- a/app/src/main/java/sopt/mottivoo/domain/entity/MyExerciseInfo.kt +++ b/app/src/main/java/sopt/motivoo/domain/entity/MyExerciseInfo.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.domain.entity +package sopt.motivoo.domain.entity data class MyExerciseInfo( val isExercise: Boolean, diff --git a/app/src/main/java/sopt/mottivoo/domain/entity/auth/LoginInfo.kt b/app/src/main/java/sopt/motivoo/domain/entity/auth/LoginInfo.kt similarity index 82% rename from app/src/main/java/sopt/mottivoo/domain/entity/auth/LoginInfo.kt rename to app/src/main/java/sopt/motivoo/domain/entity/auth/LoginInfo.kt index d7c0ea4e..104c2c13 100644 --- a/app/src/main/java/sopt/mottivoo/domain/entity/auth/LoginInfo.kt +++ b/app/src/main/java/sopt/motivoo/domain/entity/auth/LoginInfo.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.domain.entity.auth +package sopt.motivoo.domain.entity.auth data class LoginInfo( val accessToken: String, diff --git a/app/src/main/java/sopt/mottivoo/domain/entity/dummy/DummyInfoList.kt b/app/src/main/java/sopt/motivoo/domain/entity/dummy/DummyInfoList.kt similarity index 80% rename from app/src/main/java/sopt/mottivoo/domain/entity/dummy/DummyInfoList.kt rename to app/src/main/java/sopt/motivoo/domain/entity/dummy/DummyInfoList.kt index 9a6e5c50..6e18de38 100644 --- a/app/src/main/java/sopt/mottivoo/domain/entity/dummy/DummyInfoList.kt +++ b/app/src/main/java/sopt/motivoo/domain/entity/dummy/DummyInfoList.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.domain.entity.dummy +package sopt.motivoo.domain.entity.dummy data class DummyInfoList( val dummyInfo: List, diff --git a/app/src/main/java/sopt/mottivoo/domain/entity/error/ResponseHandler.kt b/app/src/main/java/sopt/motivoo/domain/entity/error/ResponseHandler.kt similarity index 62% rename from app/src/main/java/sopt/mottivoo/domain/entity/error/ResponseHandler.kt rename to app/src/main/java/sopt/motivoo/domain/entity/error/ResponseHandler.kt index 8a6d1c9c..7579df21 100644 --- a/app/src/main/java/sopt/mottivoo/domain/entity/error/ResponseHandler.kt +++ b/app/src/main/java/sopt/motivoo/domain/entity/error/ResponseHandler.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.domain.entity.error +package sopt.motivoo.domain.entity.error data class ResponseHandler( val code: Int?, diff --git a/app/src/main/java/sopt/mottivoo/domain/entity/exercise/ExerciseData.kt b/app/src/main/java/sopt/motivoo/domain/entity/exercise/ExerciseData.kt similarity index 95% rename from app/src/main/java/sopt/mottivoo/domain/entity/exercise/ExerciseData.kt rename to app/src/main/java/sopt/motivoo/domain/entity/exercise/ExerciseData.kt index d6778d15..6dc3e5da 100644 --- a/app/src/main/java/sopt/mottivoo/domain/entity/exercise/ExerciseData.kt +++ b/app/src/main/java/sopt/motivoo/domain/entity/exercise/ExerciseData.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.domain.entity.exercise +package sopt.motivoo.domain.entity.exercise class ExerciseData( val userType: String, diff --git a/app/src/main/java/sopt/mottivoo/domain/entity/home/HomeData.kt b/app/src/main/java/sopt/motivoo/domain/entity/home/HomeData.kt similarity index 87% rename from app/src/main/java/sopt/mottivoo/domain/entity/home/HomeData.kt rename to app/src/main/java/sopt/motivoo/domain/entity/home/HomeData.kt index 74eddca5..13be2aef 100644 --- a/app/src/main/java/sopt/mottivoo/domain/entity/home/HomeData.kt +++ b/app/src/main/java/sopt/motivoo/domain/entity/home/HomeData.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.domain.entity.home +package sopt.motivoo.domain.entity.home data class HomeData( val userType: String, diff --git a/app/src/main/java/sopt/mottivoo/domain/entity/home/MissionChoiceData.kt b/app/src/main/java/sopt/motivoo/domain/entity/home/MissionChoiceData.kt similarity index 83% rename from app/src/main/java/sopt/mottivoo/domain/entity/home/MissionChoiceData.kt rename to app/src/main/java/sopt/motivoo/domain/entity/home/MissionChoiceData.kt index b32a0cda..759e5929 100644 --- a/app/src/main/java/sopt/mottivoo/domain/entity/home/MissionChoiceData.kt +++ b/app/src/main/java/sopt/motivoo/domain/entity/home/MissionChoiceData.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.domain.entity.home +package sopt.motivoo.domain.entity.home data class MissionChoiceData( val code: Int, diff --git a/app/src/main/java/sopt/mottivoo/domain/entity/home/MissionChoiceListData.kt b/app/src/main/java/sopt/motivoo/domain/entity/home/MissionChoiceListData.kt similarity index 75% rename from app/src/main/java/sopt/mottivoo/domain/entity/home/MissionChoiceListData.kt rename to app/src/main/java/sopt/motivoo/domain/entity/home/MissionChoiceListData.kt index 8fcd4367..84f95e9c 100644 --- a/app/src/main/java/sopt/mottivoo/domain/entity/home/MissionChoiceListData.kt +++ b/app/src/main/java/sopt/motivoo/domain/entity/home/MissionChoiceListData.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.domain.entity.home +package sopt.motivoo.domain.entity.home data class MissionChoiceListData( val missionId: Long, diff --git a/app/src/main/java/sopt/mottivoo/domain/entity/home/MissionImageData.kt b/app/src/main/java/sopt/motivoo/domain/entity/home/MissionImageData.kt similarity index 68% rename from app/src/main/java/sopt/mottivoo/domain/entity/home/MissionImageData.kt rename to app/src/main/java/sopt/motivoo/domain/entity/home/MissionImageData.kt index f68476d4..1ac6c1b5 100644 --- a/app/src/main/java/sopt/mottivoo/domain/entity/home/MissionImageData.kt +++ b/app/src/main/java/sopt/motivoo/domain/entity/home/MissionImageData.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.domain.entity.home +package sopt.motivoo.domain.entity.home data class MissionImageData( val imgPresignedUrl: String, diff --git a/app/src/main/java/sopt/mottivoo/domain/entity/home/TodayMissionData.kt b/app/src/main/java/sopt/motivoo/domain/entity/home/TodayMissionData.kt similarity index 81% rename from app/src/main/java/sopt/mottivoo/domain/entity/home/TodayMissionData.kt rename to app/src/main/java/sopt/motivoo/domain/entity/home/TodayMissionData.kt index 7c954c2c..1fe2d0ac 100644 --- a/app/src/main/java/sopt/mottivoo/domain/entity/home/TodayMissionData.kt +++ b/app/src/main/java/sopt/motivoo/domain/entity/home/TodayMissionData.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.domain.entity.home +package sopt.motivoo.domain.entity.home data class TodayMissionData( val missionContent: String = "", diff --git a/app/src/main/java/sopt/mottivoo/domain/entity/mypage/UserInfo.kt b/app/src/main/java/sopt/motivoo/domain/entity/mypage/UserInfo.kt similarity index 70% rename from app/src/main/java/sopt/mottivoo/domain/entity/mypage/UserInfo.kt rename to app/src/main/java/sopt/motivoo/domain/entity/mypage/UserInfo.kt index 4785aca1..e95ec653 100644 --- a/app/src/main/java/sopt/mottivoo/domain/entity/mypage/UserInfo.kt +++ b/app/src/main/java/sopt/motivoo/domain/entity/mypage/UserInfo.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.domain.entity.mypage +package sopt.motivoo.domain.entity.mypage data class UserInfo( val userNickname: String, diff --git a/app/src/main/java/sopt/mottivoo/domain/entity/onboarding/GetMatchedInfo.kt b/app/src/main/java/sopt/motivoo/domain/entity/onboarding/GetMatchedInfo.kt similarity index 69% rename from app/src/main/java/sopt/mottivoo/domain/entity/onboarding/GetMatchedInfo.kt rename to app/src/main/java/sopt/motivoo/domain/entity/onboarding/GetMatchedInfo.kt index 2f10dc40..a170e642 100644 --- a/app/src/main/java/sopt/mottivoo/domain/entity/onboarding/GetMatchedInfo.kt +++ b/app/src/main/java/sopt/motivoo/domain/entity/onboarding/GetMatchedInfo.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.domain.entity.onboarding +package sopt.motivoo.domain.entity.onboarding data class GetMatchedInfo( val userId: Int, diff --git a/app/src/main/java/sopt/mottivoo/domain/entity/onboarding/InviteCodeInfo.kt b/app/src/main/java/sopt/motivoo/domain/entity/onboarding/InviteCodeInfo.kt similarity index 55% rename from app/src/main/java/sopt/mottivoo/domain/entity/onboarding/InviteCodeInfo.kt rename to app/src/main/java/sopt/motivoo/domain/entity/onboarding/InviteCodeInfo.kt index 06860904..23516ad6 100644 --- a/app/src/main/java/sopt/mottivoo/domain/entity/onboarding/InviteCodeInfo.kt +++ b/app/src/main/java/sopt/motivoo/domain/entity/onboarding/InviteCodeInfo.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.domain.entity.onboarding +package sopt.motivoo.domain.entity.onboarding data class InviteCodeInfo( val inviteCode: String, diff --git a/app/src/main/java/sopt/mottivoo/domain/entity/onboarding/MatchedInfo.kt b/app/src/main/java/sopt/motivoo/domain/entity/onboarding/MatchedInfo.kt similarity index 53% rename from app/src/main/java/sopt/mottivoo/domain/entity/onboarding/MatchedInfo.kt rename to app/src/main/java/sopt/motivoo/domain/entity/onboarding/MatchedInfo.kt index cae0a361..0c3bedb2 100644 --- a/app/src/main/java/sopt/mottivoo/domain/entity/onboarding/MatchedInfo.kt +++ b/app/src/main/java/sopt/motivoo/domain/entity/onboarding/MatchedInfo.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.domain.entity.onboarding +package sopt.motivoo.domain.entity.onboarding data class MatchedInfo( val isMatched: Boolean, diff --git a/app/src/main/java/sopt/mottivoo/domain/error/UserErrorHandler.kt b/app/src/main/java/sopt/motivoo/domain/error/UserErrorHandler.kt similarity index 55% rename from app/src/main/java/sopt/mottivoo/domain/error/UserErrorHandler.kt rename to app/src/main/java/sopt/motivoo/domain/error/UserErrorHandler.kt index abbfb209..3349fc9b 100644 --- a/app/src/main/java/sopt/mottivoo/domain/error/UserErrorHandler.kt +++ b/app/src/main/java/sopt/motivoo/domain/error/UserErrorHandler.kt @@ -1,6 +1,6 @@ -package sopt.mottivoo.domain.error +package sopt.motivoo.domain.error -import sopt.mottivoo.domain.entity.error.ResponseHandler +import sopt.motivoo.domain.entity.error.ResponseHandler interface UserErrorHandler { fun handleUserError(throwable: Throwable?, data: T?): ResponseHandler diff --git a/app/src/main/java/sopt/motivoo/domain/repository/AuthRepository.kt b/app/src/main/java/sopt/motivoo/domain/repository/AuthRepository.kt new file mode 100644 index 00000000..0955ae60 --- /dev/null +++ b/app/src/main/java/sopt/motivoo/domain/repository/AuthRepository.kt @@ -0,0 +1,16 @@ +package sopt.motivoo.domain.repository + +import retrofit2.http.Body +import sopt.motivoo.data.model.request.auth.RequestLoginDto +import sopt.motivoo.data.model.response.auth.ResponseLogoutDto +import sopt.motivoo.data.model.response.auth.ResponseWithDrawDto +import sopt.motivoo.domain.entity.auth.LoginInfo + +interface AuthRepository { + + suspend fun postLogin(@Body requestLoginDto: RequestLoginDto): Result + + suspend fun postLogout(): Result + + suspend fun deleteWithDraw(): Result +} diff --git a/app/src/main/java/sopt/motivoo/domain/repository/DummyRepository.kt b/app/src/main/java/sopt/motivoo/domain/repository/DummyRepository.kt new file mode 100644 index 00000000..d66e5850 --- /dev/null +++ b/app/src/main/java/sopt/motivoo/domain/repository/DummyRepository.kt @@ -0,0 +1,9 @@ +package sopt.motivoo.domain.repository + +import sopt.motivoo.data.model.request.DummyRequestData +import sopt.motivoo.domain.entity.dummy.DummyInfoList + +interface DummyRepository { + + suspend fun postDummyData(dummyRequestData: DummyRequestData): Result +} diff --git a/app/src/main/java/sopt/mottivoo/domain/repository/FirebaseRepository.kt b/app/src/main/java/sopt/motivoo/domain/repository/FirebaseRepository.kt similarity index 85% rename from app/src/main/java/sopt/mottivoo/domain/repository/FirebaseRepository.kt rename to app/src/main/java/sopt/motivoo/domain/repository/FirebaseRepository.kt index b14300e6..65a71d9f 100644 --- a/app/src/main/java/sopt/mottivoo/domain/repository/FirebaseRepository.kt +++ b/app/src/main/java/sopt/motivoo/domain/repository/FirebaseRepository.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.domain.repository +package sopt.motivoo.domain.repository import kotlinx.coroutines.flow.Flow diff --git a/app/src/main/java/sopt/mottivoo/domain/repository/HomeRepository.kt b/app/src/main/java/sopt/motivoo/domain/repository/HomeRepository.kt similarity index 62% rename from app/src/main/java/sopt/mottivoo/domain/repository/HomeRepository.kt rename to app/src/main/java/sopt/motivoo/domain/repository/HomeRepository.kt index 07ad46b5..1ecdda9d 100644 --- a/app/src/main/java/sopt/mottivoo/domain/repository/HomeRepository.kt +++ b/app/src/main/java/sopt/motivoo/domain/repository/HomeRepository.kt @@ -1,10 +1,10 @@ -package sopt.mottivoo.domain.repository +package sopt.motivoo.domain.repository import android.graphics.Bitmap -import sopt.mottivoo.domain.entity.error.ResponseHandler -import sopt.mottivoo.domain.entity.home.HomeData -import sopt.mottivoo.domain.entity.home.MissionChoiceData -import sopt.mottivoo.domain.entity.home.MissionImageData +import sopt.motivoo.domain.entity.error.ResponseHandler +import sopt.motivoo.domain.entity.home.HomeData +import sopt.motivoo.domain.entity.home.MissionChoiceData +import sopt.motivoo.domain.entity.home.MissionImageData interface HomeRepository { suspend fun patchHome(): HomeData? diff --git a/app/src/main/java/sopt/motivoo/domain/repository/MyPageRepository.kt b/app/src/main/java/sopt/motivoo/domain/repository/MyPageRepository.kt new file mode 100644 index 00000000..1957e4b1 --- /dev/null +++ b/app/src/main/java/sopt/motivoo/domain/repository/MyPageRepository.kt @@ -0,0 +1,8 @@ +package sopt.motivoo.domain.repository + +import sopt.motivoo.data.model.response.ResponseMyPageDto + +interface MyPageRepository { + + suspend fun getUserInfo(): Result +} diff --git a/app/src/main/java/sopt/mottivoo/domain/repository/NetworkRepository.kt b/app/src/main/java/sopt/motivoo/domain/repository/NetworkRepository.kt similarity index 75% rename from app/src/main/java/sopt/mottivoo/domain/repository/NetworkRepository.kt rename to app/src/main/java/sopt/motivoo/domain/repository/NetworkRepository.kt index da97854c..db166d6b 100644 --- a/app/src/main/java/sopt/mottivoo/domain/repository/NetworkRepository.kt +++ b/app/src/main/java/sopt/motivoo/domain/repository/NetworkRepository.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.domain.repository +package sopt.motivoo.domain.repository import kotlinx.coroutines.flow.SharedFlow diff --git a/app/src/main/java/sopt/motivoo/domain/repository/OnboardingRepository.kt b/app/src/main/java/sopt/motivoo/domain/repository/OnboardingRepository.kt new file mode 100644 index 00000000..869a1224 --- /dev/null +++ b/app/src/main/java/sopt/motivoo/domain/repository/OnboardingRepository.kt @@ -0,0 +1,20 @@ +package sopt.motivoo.domain.repository + +import retrofit2.http.Body +import sopt.motivoo.data.model.request.onboarding.RequestOnboardingDto +import sopt.motivoo.data.model.request.onboarding.RequestPostInviteCodeDto +import sopt.motivoo.data.model.response.onboarding.ResponseOnboardingDto +import sopt.motivoo.domain.entity.onboarding.GetMatchedInfo +import sopt.motivoo.domain.entity.onboarding.InviteCodeInfo +import sopt.motivoo.domain.entity.onboarding.MatchedInfo + +interface OnboardingRepository { + + suspend fun postOnboardingInfo(@Body requestOnboardingDto: RequestOnboardingDto): Result + + suspend fun getInviteCode(): Result + + suspend fun patchInviteCode(requestPostInviteCodeDto: RequestPostInviteCodeDto): Result + + suspend fun getMatchedResult(): Result +} diff --git a/app/src/main/java/sopt/mottivoo/domain/repository/StepCountRepository.kt b/app/src/main/java/sopt/motivoo/domain/repository/StepCountRepository.kt similarity index 87% rename from app/src/main/java/sopt/mottivoo/domain/repository/StepCountRepository.kt rename to app/src/main/java/sopt/motivoo/domain/repository/StepCountRepository.kt index 740f9217..37a0f5aa 100644 --- a/app/src/main/java/sopt/mottivoo/domain/repository/StepCountRepository.kt +++ b/app/src/main/java/sopt/motivoo/domain/repository/StepCountRepository.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.domain.repository +package sopt.motivoo.domain.repository import kotlinx.coroutines.flow.Flow diff --git a/app/src/main/java/sopt/mottivoo/domain/repository/UserRepository.kt b/app/src/main/java/sopt/motivoo/domain/repository/UserRepository.kt similarity index 76% rename from app/src/main/java/sopt/mottivoo/domain/repository/UserRepository.kt rename to app/src/main/java/sopt/motivoo/domain/repository/UserRepository.kt index 8cf4a4d0..737e105e 100644 --- a/app/src/main/java/sopt/mottivoo/domain/repository/UserRepository.kt +++ b/app/src/main/java/sopt/motivoo/domain/repository/UserRepository.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.domain.repository +package sopt.motivoo.domain.repository interface UserRepository { suspend fun getUserId(): Int diff --git a/app/src/main/java/sopt/mottivoo/presentation/MainActivity.kt b/app/src/main/java/sopt/motivoo/presentation/MainActivity.kt similarity index 91% rename from app/src/main/java/sopt/mottivoo/presentation/MainActivity.kt rename to app/src/main/java/sopt/motivoo/presentation/MainActivity.kt index b01eda35..a77e5db3 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/MainActivity.kt +++ b/app/src/main/java/sopt/motivoo/presentation/MainActivity.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation +package sopt.motivoo.presentation import android.os.Bundle import android.view.MotionEvent @@ -23,22 +23,22 @@ import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch -import sopt.mottivoo.R -import sopt.mottivoo.data.datasource.remote.listener.AuthTokenRefreshListener -import sopt.mottivoo.data.datasource.remote.listener.NetworkErrorListener -import sopt.mottivoo.databinding.ActivityMainBinding -import sopt.mottivoo.presentation.onboarding.FrequencyQuestionFragmentDirections -import sopt.mottivoo.presentation.onboarding.OnboardingNavigationEvent -import sopt.mottivoo.presentation.onboarding.OnboardingViewModel -import sopt.mottivoo.presentation.onboarding.WhatActivityQuestionFragmentDirections -import sopt.mottivoo.presentation.onboarding.WhatExerciseQuestionFragmentDirections -import sopt.mottivoo.presentation.type.NavigationSourceType -import sopt.mottivoo.util.NetworkState -import sopt.mottivoo.util.extension.checkNetworkState -import sopt.mottivoo.util.extension.colorOf -import sopt.mottivoo.util.extension.hideKeyboard -import sopt.mottivoo.util.extension.setOnSingleClickListener -import sopt.mottivoo.util.findStartDestination +import sopt.motivoo.R +import sopt.motivoo.data.datasource.remote.listener.AuthTokenRefreshListener +import sopt.motivoo.data.datasource.remote.listener.NetworkErrorListener +import sopt.motivoo.databinding.ActivityMainBinding +import sopt.motivoo.presentation.onboarding.FrequencyQuestionFragmentDirections +import sopt.motivoo.presentation.onboarding.OnboardingNavigationEvent +import sopt.motivoo.presentation.onboarding.OnboardingViewModel +import sopt.motivoo.presentation.onboarding.WhatActivityQuestionFragmentDirections +import sopt.motivoo.presentation.onboarding.WhatExerciseQuestionFragmentDirections +import sopt.motivoo.presentation.type.NavigationSourceType +import sopt.motivoo.util.NetworkState +import sopt.motivoo.util.extension.checkNetworkState +import sopt.motivoo.util.extension.colorOf +import sopt.motivoo.util.extension.hideKeyboard +import sopt.motivoo.util.extension.setOnSingleClickListener +import sopt.motivoo.util.findStartDestination import javax.inject.Inject @AndroidEntryPoint diff --git a/app/src/main/java/sopt/mottivoo/presentation/MainViewModel.kt b/app/src/main/java/sopt/motivoo/presentation/MainViewModel.kt similarity index 79% rename from app/src/main/java/sopt/mottivoo/presentation/MainViewModel.kt rename to app/src/main/java/sopt/motivoo/presentation/MainViewModel.kt index 47efef19..97f3942a 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/MainViewModel.kt +++ b/app/src/main/java/sopt/motivoo/presentation/MainViewModel.kt @@ -1,9 +1,9 @@ -package sopt.mottivoo.presentation +package sopt.motivoo.presentation import androidx.lifecycle.ViewModel import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.SharedFlow -import sopt.mottivoo.domain.repository.NetworkRepository +import sopt.motivoo.domain.repository.NetworkRepository import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/sopt/mottivoo/presentation/NetworkErrorFragment.kt b/app/src/main/java/sopt/motivoo/presentation/NetworkErrorFragment.kt similarity index 80% rename from app/src/main/java/sopt/mottivoo/presentation/NetworkErrorFragment.kt rename to app/src/main/java/sopt/motivoo/presentation/NetworkErrorFragment.kt index 3d418055..5cf392b7 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/NetworkErrorFragment.kt +++ b/app/src/main/java/sopt/motivoo/presentation/NetworkErrorFragment.kt @@ -1,13 +1,13 @@ -package sopt.mottivoo.presentation +package sopt.motivoo.presentation import android.os.Bundle import android.view.View import androidx.activity.OnBackPressedCallback import androidx.navigation.fragment.findNavController -import sopt.mottivoo.R -import sopt.mottivoo.databinding.FragmentConnectionErrorBinding -import sopt.mottivoo.util.binding.BindingFragment -import sopt.mottivoo.util.extension.setOnSingleClickListener +import sopt.motivoo.R +import sopt.motivoo.databinding.FragmentConnectionErrorBinding +import sopt.motivoo.util.binding.BindingFragment +import sopt.motivoo.util.extension.setOnSingleClickListener class NetworkErrorFragment : BindingFragment(R.layout.fragment_connection_error) { diff --git a/app/src/main/java/sopt/mottivoo/presentation/SampleDesignActivity.kt b/app/src/main/java/sopt/motivoo/presentation/SampleDesignActivity.kt similarity index 94% rename from app/src/main/java/sopt/mottivoo/presentation/SampleDesignActivity.kt rename to app/src/main/java/sopt/motivoo/presentation/SampleDesignActivity.kt index ff9f10ec..b1f3e8e7 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/SampleDesignActivity.kt +++ b/app/src/main/java/sopt/motivoo/presentation/SampleDesignActivity.kt @@ -1,11 +1,11 @@ -package sopt.mottivoo.presentation +package sopt.motivoo.presentation import android.os.Bundle import android.widget.SeekBar import androidx.appcompat.app.AppCompatActivity import com.android.utils.Child import com.android.utils.Parent -import sopt.mottivoo.databinding.ActivitySampleBinding +import sopt.motivoo.databinding.ActivitySampleBinding class SampleDesignActivity : AppCompatActivity() { private lateinit var binding: ActivitySampleBinding diff --git a/app/src/main/java/sopt/mottivoo/presentation/WebViewFragment.kt b/app/src/main/java/sopt/motivoo/presentation/WebViewFragment.kt similarity index 82% rename from app/src/main/java/sopt/mottivoo/presentation/WebViewFragment.kt rename to app/src/main/java/sopt/motivoo/presentation/WebViewFragment.kt index 1edacab9..cde68fc9 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/WebViewFragment.kt +++ b/app/src/main/java/sopt/motivoo/presentation/WebViewFragment.kt @@ -1,10 +1,10 @@ -package sopt.mottivoo.presentation +package sopt.motivoo.presentation import android.os.Bundle import android.view.View -import sopt.mottivoo.R -import sopt.mottivoo.databinding.FragmentWebviewBinding -import sopt.mottivoo.util.binding.BindingFragment +import sopt.motivoo.R +import sopt.motivoo.databinding.FragmentWebviewBinding +import sopt.motivoo.util.binding.BindingFragment class WebViewFragment : BindingFragment(R.layout.fragment_webview) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { diff --git a/app/src/main/java/sopt/mottivoo/presentation/auth/AuthViewModel.kt b/app/src/main/java/sopt/motivoo/presentation/auth/AuthViewModel.kt similarity index 86% rename from app/src/main/java/sopt/mottivoo/presentation/auth/AuthViewModel.kt rename to app/src/main/java/sopt/motivoo/presentation/auth/AuthViewModel.kt index 097a288e..52f78212 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/auth/AuthViewModel.kt +++ b/app/src/main/java/sopt/motivoo/presentation/auth/AuthViewModel.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation.auth +package sopt.motivoo.presentation.auth import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope @@ -6,16 +6,16 @@ import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch -import sopt.mottivoo.data.model.request.auth.RequestLoginDto -import sopt.mottivoo.domain.entity.MotivooStorage -import sopt.mottivoo.domain.entity.auth.LoginInfo -import sopt.mottivoo.domain.repository.AuthRepository -import sopt.mottivoo.domain.repository.StepCountRepository -import sopt.mottivoo.domain.repository.UserRepository -import sopt.mottivoo.presentation.type.SocialType -import sopt.mottivoo.util.NavigationDecider -import sopt.mottivoo.util.NavigationEvent -import sopt.mottivoo.util.UiState +import sopt.motivoo.data.model.request.auth.RequestLoginDto +import sopt.motivoo.domain.entity.MotivooStorage +import sopt.motivoo.domain.entity.auth.LoginInfo +import sopt.motivoo.domain.repository.AuthRepository +import sopt.motivoo.domain.repository.StepCountRepository +import sopt.motivoo.domain.repository.UserRepository +import sopt.motivoo.presentation.type.SocialType +import sopt.motivoo.util.NavigationDecider +import sopt.motivoo.util.NavigationEvent +import sopt.motivoo.util.UiState import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/sopt/mottivoo/presentation/auth/LoginFragment.kt b/app/src/main/java/sopt/motivoo/presentation/auth/LoginFragment.kt similarity index 90% rename from app/src/main/java/sopt/mottivoo/presentation/auth/LoginFragment.kt rename to app/src/main/java/sopt/motivoo/presentation/auth/LoginFragment.kt index 04ccc483..f1b14aab 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/auth/LoginFragment.kt +++ b/app/src/main/java/sopt/motivoo/presentation/auth/LoginFragment.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation.auth +package sopt.motivoo.presentation.auth import android.os.Bundle import android.view.View @@ -15,15 +15,15 @@ import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch -import sopt.mottivoo.R -import sopt.mottivoo.data.service.KakaoAuthService -import sopt.mottivoo.databinding.FragmentLoginBinding -import sopt.mottivoo.domain.entity.MotivooStorage -import sopt.mottivoo.presentation.invitecode.GetInviteCodeFragment -import sopt.mottivoo.util.NavigationEvent -import sopt.mottivoo.util.UiState -import sopt.mottivoo.util.binding.BindingFragment -import sopt.mottivoo.util.extension.setOnSingleClickListener +import sopt.motivoo.R +import sopt.motivoo.data.service.KakaoAuthService +import sopt.motivoo.databinding.FragmentLoginBinding +import sopt.motivoo.domain.entity.MotivooStorage +import sopt.motivoo.presentation.invitecode.GetInviteCodeFragment +import sopt.motivoo.util.NavigationEvent +import sopt.motivoo.util.UiState +import sopt.motivoo.util.binding.BindingFragment +import sopt.motivoo.util.extension.setOnSingleClickListener import javax.inject.Inject @AndroidEntryPoint diff --git a/app/src/main/java/sopt/mottivoo/presentation/dummy/DummyFragment.kt b/app/src/main/java/sopt/motivoo/presentation/dummy/DummyFragment.kt similarity index 66% rename from app/src/main/java/sopt/mottivoo/presentation/dummy/DummyFragment.kt rename to app/src/main/java/sopt/motivoo/presentation/dummy/DummyFragment.kt index 1dbb3796..859783a5 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/dummy/DummyFragment.kt +++ b/app/src/main/java/sopt/motivoo/presentation/dummy/DummyFragment.kt @@ -1,11 +1,11 @@ -package sopt.mottivoo.presentation.dummy +package sopt.motivoo.presentation.dummy import android.os.Bundle import android.view.View import dagger.hilt.android.AndroidEntryPoint -import sopt.mottivoo.R -import sopt.mottivoo.databinding.FragmentDummyBinding -import sopt.mottivoo.util.binding.BindingFragment +import sopt.motivoo.R +import sopt.motivoo.databinding.FragmentDummyBinding +import sopt.motivoo.util.binding.BindingFragment @AndroidEntryPoint class DummyFragment : BindingFragment(R.layout.fragment_dummy) { diff --git a/app/src/main/java/sopt/mottivoo/presentation/dummy/DummyViewModel.kt b/app/src/main/java/sopt/motivoo/presentation/dummy/DummyViewModel.kt similarity index 66% rename from app/src/main/java/sopt/mottivoo/presentation/dummy/DummyViewModel.kt rename to app/src/main/java/sopt/motivoo/presentation/dummy/DummyViewModel.kt index 25994f60..1b2343e6 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/dummy/DummyViewModel.kt +++ b/app/src/main/java/sopt/motivoo/presentation/dummy/DummyViewModel.kt @@ -1,9 +1,9 @@ -package sopt.mottivoo.presentation.dummy +package sopt.motivoo.presentation.dummy import androidx.lifecycle.ViewModel import dagger.hilt.android.lifecycle.HiltViewModel -import sopt.mottivoo.domain.entity.MotivooStorage -import sopt.mottivoo.domain.repository.DummyRepository +import sopt.motivoo.domain.entity.MotivooStorage +import sopt.motivoo.domain.repository.DummyRepository import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/sopt/mottivoo/presentation/exercise/ExerciseAdapter.kt b/app/src/main/java/sopt/motivoo/presentation/exercise/ExerciseAdapter.kt similarity index 89% rename from app/src/main/java/sopt/mottivoo/presentation/exercise/ExerciseAdapter.kt rename to app/src/main/java/sopt/motivoo/presentation/exercise/ExerciseAdapter.kt index f1aae9ef..61cf6437 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/exercise/ExerciseAdapter.kt +++ b/app/src/main/java/sopt/motivoo/presentation/exercise/ExerciseAdapter.kt @@ -1,11 +1,11 @@ -package sopt.mottivoo.presentation.exercise +package sopt.motivoo.presentation.exercise import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import sopt.mottivoo.databinding.ItemExerciseBinding -import sopt.mottivoo.databinding.ItemExerciseNoticeBinding -import sopt.mottivoo.domain.entity.exercise.ExerciseData.ExerciseItemInfo +import sopt.motivoo.databinding.ItemExerciseBinding +import sopt.motivoo.databinding.ItemExerciseNoticeBinding +import sopt.motivoo.domain.entity.exercise.ExerciseData.ExerciseItemInfo class ExerciseAdapter(private val userType: String) : RecyclerView.Adapter() { diff --git a/app/src/main/java/sopt/mottivoo/presentation/exercise/ExerciseFragment.kt b/app/src/main/java/sopt/motivoo/presentation/exercise/ExerciseFragment.kt similarity index 92% rename from app/src/main/java/sopt/mottivoo/presentation/exercise/ExerciseFragment.kt rename to app/src/main/java/sopt/motivoo/presentation/exercise/ExerciseFragment.kt index 0d861f14..25505834 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/exercise/ExerciseFragment.kt +++ b/app/src/main/java/sopt/motivoo/presentation/exercise/ExerciseFragment.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation.exercise +package sopt.motivoo.presentation.exercise import android.os.Bundle import android.view.View @@ -6,11 +6,11 @@ import androidx.activity.OnBackPressedCallback import androidx.fragment.app.viewModels import androidx.navigation.fragment.findNavController import dagger.hilt.android.AndroidEntryPoint -import sopt.mottivoo.R -import sopt.mottivoo.databinding.FragmentExerciseBinding -import sopt.mottivoo.domain.entity.exercise.ExerciseData -import sopt.mottivoo.util.UiState -import sopt.mottivoo.util.binding.BindingFragment +import sopt.motivoo.R +import sopt.motivoo.databinding.FragmentExerciseBinding +import sopt.motivoo.domain.entity.exercise.ExerciseData +import sopt.motivoo.util.UiState +import sopt.motivoo.util.binding.BindingFragment import timber.log.Timber @AndroidEntryPoint diff --git a/app/src/main/java/sopt/mottivoo/presentation/exercise/ExerciseViewHolder.kt b/app/src/main/java/sopt/motivoo/presentation/exercise/ExerciseViewHolder.kt similarity index 95% rename from app/src/main/java/sopt/mottivoo/presentation/exercise/ExerciseViewHolder.kt rename to app/src/main/java/sopt/motivoo/presentation/exercise/ExerciseViewHolder.kt index b7c5fe8c..4952ab4e 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/exercise/ExerciseViewHolder.kt +++ b/app/src/main/java/sopt/motivoo/presentation/exercise/ExerciseViewHolder.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation.exercise +package sopt.motivoo.presentation.exercise import android.content.Context import android.view.View @@ -6,12 +6,12 @@ import androidx.core.content.ContextCompat import androidx.navigation.findNavController import androidx.recyclerview.widget.RecyclerView import coil.load -import sopt.mottivoo.R -import sopt.mottivoo.databinding.ItemExerciseBinding -import sopt.mottivoo.databinding.ItemExerciseNoticeBinding -import sopt.mottivoo.domain.entity.exercise.ExerciseData.ExerciseItemInfo -import sopt.mottivoo.presentation.exercise.ExerciseFragment.Companion.CHILD -import sopt.mottivoo.util.extension.prettyString +import sopt.motivoo.R +import sopt.motivoo.databinding.ItemExerciseBinding +import sopt.motivoo.databinding.ItemExerciseNoticeBinding +import sopt.motivoo.domain.entity.exercise.ExerciseData.ExerciseItemInfo +import sopt.motivoo.presentation.exercise.ExerciseFragment.Companion.CHILD +import sopt.motivoo.util.extension.prettyString import java.time.LocalDate class ExerciseEachDateInfoViewHolder( diff --git a/app/src/main/java/sopt/mottivoo/presentation/exercise/ExerciseViewModel.kt b/app/src/main/java/sopt/motivoo/presentation/exercise/ExerciseViewModel.kt similarity index 84% rename from app/src/main/java/sopt/mottivoo/presentation/exercise/ExerciseViewModel.kt rename to app/src/main/java/sopt/motivoo/presentation/exercise/ExerciseViewModel.kt index a856c9b2..121fa102 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/exercise/ExerciseViewModel.kt +++ b/app/src/main/java/sopt/motivoo/presentation/exercise/ExerciseViewModel.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation.exercise +package sopt.motivoo.presentation.exercise import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -6,9 +6,9 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.launch -import sopt.mottivoo.data.service.ExerciseService -import sopt.mottivoo.domain.entity.exercise.ExerciseData -import sopt.mottivoo.util.UiState +import sopt.motivoo.data.service.ExerciseService +import sopt.motivoo.domain.entity.exercise.ExerciseData +import sopt.motivoo.util.UiState import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/sopt/mottivoo/presentation/home/HomeFragment.kt b/app/src/main/java/sopt/motivoo/presentation/home/HomeFragment.kt similarity index 96% rename from app/src/main/java/sopt/mottivoo/presentation/home/HomeFragment.kt rename to app/src/main/java/sopt/motivoo/presentation/home/HomeFragment.kt index b3d9400b..82695f79 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/home/HomeFragment.kt +++ b/app/src/main/java/sopt/motivoo/presentation/home/HomeFragment.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation.home +package sopt.motivoo.presentation.home import android.Manifest import android.app.AlarmManager @@ -25,15 +25,15 @@ import com.android.utils.Child import com.android.utils.Parent import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.launch -import sopt.mottivoo.R -import sopt.mottivoo.databinding.FragmentHomeBinding -import sopt.mottivoo.presentation.home.service.StepCountService -import sopt.mottivoo.presentation.home.viewmodel.HomeViewModel -import sopt.mottivoo.util.Constants.USER_ID -import sopt.mottivoo.util.binding.BindingFragment -import sopt.mottivoo.util.extension.removeBlurEffect -import sopt.mottivoo.util.extension.showSnackbar -import sopt.mottivoo.util.extension.updateBlurEffect +import sopt.motivoo.R +import sopt.motivoo.databinding.FragmentHomeBinding +import sopt.motivoo.presentation.home.service.StepCountService +import sopt.motivoo.presentation.home.viewmodel.HomeViewModel +import sopt.motivoo.util.Constants.USER_ID +import sopt.motivoo.util.binding.BindingFragment +import sopt.motivoo.util.extension.removeBlurEffect +import sopt.motivoo.util.extension.showSnackbar +import sopt.motivoo.util.extension.updateBlurEffect import timber.log.Timber @AndroidEntryPoint diff --git a/app/src/main/java/sopt/mottivoo/presentation/home/HomeIntent.kt b/app/src/main/java/sopt/motivoo/presentation/home/HomeIntent.kt similarity index 75% rename from app/src/main/java/sopt/mottivoo/presentation/home/HomeIntent.kt rename to app/src/main/java/sopt/motivoo/presentation/home/HomeIntent.kt index d33ed14e..3e060529 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/home/HomeIntent.kt +++ b/app/src/main/java/sopt/motivoo/presentation/home/HomeIntent.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation.home +package sopt.motivoo.presentation.home sealed class HomeIntent { object FirstSelectMission : HomeIntent() diff --git a/app/src/main/java/sopt/mottivoo/presentation/home/HomePictureState.kt b/app/src/main/java/sopt/motivoo/presentation/home/HomePictureState.kt similarity index 92% rename from app/src/main/java/sopt/mottivoo/presentation/home/HomePictureState.kt rename to app/src/main/java/sopt/motivoo/presentation/home/HomePictureState.kt index ea0b3948..2de9222c 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/home/HomePictureState.kt +++ b/app/src/main/java/sopt/motivoo/presentation/home/HomePictureState.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation.home +package sopt.motivoo.presentation.home import android.graphics.Bitmap diff --git a/app/src/main/java/sopt/mottivoo/presentation/home/HomeState.kt b/app/src/main/java/sopt/motivoo/presentation/home/HomeState.kt similarity index 74% rename from app/src/main/java/sopt/mottivoo/presentation/home/HomeState.kt rename to app/src/main/java/sopt/motivoo/presentation/home/HomeState.kt index 314fc970..94328517 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/home/HomeState.kt +++ b/app/src/main/java/sopt/motivoo/presentation/home/HomeState.kt @@ -1,8 +1,8 @@ -package sopt.mottivoo.presentation.home +package sopt.motivoo.presentation.home -import sopt.mottivoo.domain.entity.home.HomeData -import sopt.mottivoo.domain.entity.home.MissionChoiceListData -import sopt.mottivoo.domain.entity.home.TodayMissionData +import sopt.motivoo.domain.entity.home.HomeData +import sopt.motivoo.domain.entity.home.MissionChoiceListData +import sopt.motivoo.domain.entity.home.TodayMissionData sealed class HomeState { object Idle : HomeState() diff --git a/app/src/main/java/sopt/mottivoo/presentation/home/bottomsheet/HomeBottomSheetFragment.kt b/app/src/main/java/sopt/motivoo/presentation/home/bottomsheet/HomeBottomSheetFragment.kt similarity index 94% rename from app/src/main/java/sopt/mottivoo/presentation/home/bottomsheet/HomeBottomSheetFragment.kt rename to app/src/main/java/sopt/motivoo/presentation/home/bottomsheet/HomeBottomSheetFragment.kt index 5aef544f..20e24969 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/home/bottomsheet/HomeBottomSheetFragment.kt +++ b/app/src/main/java/sopt/motivoo/presentation/home/bottomsheet/HomeBottomSheetFragment.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation.home.bottomsheet +package sopt.motivoo.presentation.home.bottomsheet import android.Manifest import android.app.Dialog @@ -23,13 +23,13 @@ import com.google.android.material.bottomsheet.BottomSheetDialogFragment import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch -import sopt.mottivoo.R -import sopt.mottivoo.databinding.BottomSheetHomeBinding -import sopt.mottivoo.presentation.home.HomePictureState -import sopt.mottivoo.presentation.home.viewmodel.HomeViewModel -import sopt.mottivoo.util.Constants.S3_BUCKET_NAME -import sopt.mottivoo.util.UriManager -import sopt.mottivoo.util.extension.createUriToBitmap +import sopt.motivoo.R +import sopt.motivoo.databinding.BottomSheetHomeBinding +import sopt.motivoo.presentation.home.HomePictureState +import sopt.motivoo.presentation.home.viewmodel.HomeViewModel +import sopt.motivoo.util.Constants.S3_BUCKET_NAME +import sopt.motivoo.util.UriManager +import sopt.motivoo.util.extension.createUriToBitmap @AndroidEntryPoint class HomeBottomSheetFragment : BottomSheetDialogFragment() { diff --git a/app/src/main/java/sopt/mottivoo/presentation/home/broadcastreceiver/BootCompletedReceiver.kt b/app/src/main/java/sopt/motivoo/presentation/home/broadcastreceiver/BootCompletedReceiver.kt similarity index 84% rename from app/src/main/java/sopt/mottivoo/presentation/home/broadcastreceiver/BootCompletedReceiver.kt rename to app/src/main/java/sopt/motivoo/presentation/home/broadcastreceiver/BootCompletedReceiver.kt index 182216bd..5f9d8880 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/home/broadcastreceiver/BootCompletedReceiver.kt +++ b/app/src/main/java/sopt/motivoo/presentation/home/broadcastreceiver/BootCompletedReceiver.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation.home.broadcastreceiver +package sopt.motivoo.presentation.home.broadcastreceiver import android.content.BroadcastReceiver import android.content.Context @@ -8,10 +8,10 @@ import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch -import sopt.mottivoo.di.DefaultDispatcher -import sopt.mottivoo.domain.repository.UserRepository -import sopt.mottivoo.presentation.home.service.StepCountService -import sopt.mottivoo.util.Constants.USER_ID +import sopt.motivoo.di.DefaultDispatcher +import sopt.motivoo.domain.repository.UserRepository +import sopt.motivoo.presentation.home.service.StepCountService +import sopt.motivoo.util.Constants.USER_ID import javax.inject.Inject @AndroidEntryPoint diff --git a/app/src/main/java/sopt/mottivoo/presentation/home/broadcastreceiver/HomeAlarmReceiver.kt b/app/src/main/java/sopt/motivoo/presentation/home/broadcastreceiver/HomeAlarmReceiver.kt similarity index 90% rename from app/src/main/java/sopt/mottivoo/presentation/home/broadcastreceiver/HomeAlarmReceiver.kt rename to app/src/main/java/sopt/motivoo/presentation/home/broadcastreceiver/HomeAlarmReceiver.kt index 9e5c64a2..650b703b 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/home/broadcastreceiver/HomeAlarmReceiver.kt +++ b/app/src/main/java/sopt/motivoo/presentation/home/broadcastreceiver/HomeAlarmReceiver.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation.home.broadcastreceiver +package sopt.motivoo.presentation.home.broadcastreceiver import android.app.AlarmManager import android.app.PendingIntent @@ -12,10 +12,10 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.cancel import kotlinx.coroutines.launch -import sopt.mottivoo.di.IoDispatcher -import sopt.mottivoo.domain.repository.StepCountRepository -import sopt.mottivoo.presentation.home.service.StepCountService -import sopt.mottivoo.presentation.home.service.StepCountService.Companion.STEP_COUNT_INIT_ACTION +import sopt.motivoo.di.IoDispatcher +import sopt.motivoo.domain.repository.StepCountRepository +import sopt.motivoo.presentation.home.service.StepCountService +import sopt.motivoo.presentation.home.service.StepCountService.Companion.STEP_COUNT_INIT_ACTION import java.util.Calendar import javax.inject.Inject diff --git a/app/src/main/java/sopt/mottivoo/presentation/home/dialog/HomeConfirmDialogFragment.kt b/app/src/main/java/sopt/motivoo/presentation/home/dialog/HomeConfirmDialogFragment.kt similarity index 75% rename from app/src/main/java/sopt/mottivoo/presentation/home/dialog/HomeConfirmDialogFragment.kt rename to app/src/main/java/sopt/motivoo/presentation/home/dialog/HomeConfirmDialogFragment.kt index 03b880c9..d060b608 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/home/dialog/HomeConfirmDialogFragment.kt +++ b/app/src/main/java/sopt/motivoo/presentation/home/dialog/HomeConfirmDialogFragment.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation.home.dialog +package sopt.motivoo.presentation.home.dialog import android.content.DialogInterface import android.net.Uri @@ -11,13 +11,13 @@ import coil.load import coil.size.Scale import coil.transform.RoundedCornersTransformation import dagger.hilt.android.AndroidEntryPoint -import sopt.mottivoo.R -import sopt.mottivoo.databinding.DialogHomeCofirmBinding -import sopt.mottivoo.presentation.home.HomeFragment.Companion.HOME_STATE_CONFIRM -import sopt.mottivoo.presentation.home.HomeFragment.Companion.HOME_STATE_CONFIRM_RESULT_OK -import sopt.mottivoo.presentation.home.viewmodel.HomeViewModel -import sopt.mottivoo.util.binding.BindingDialogFragment -import sopt.mottivoo.util.extension.px +import sopt.motivoo.R +import sopt.motivoo.databinding.DialogHomeCofirmBinding +import sopt.motivoo.presentation.home.HomeFragment.Companion.HOME_STATE_CONFIRM +import sopt.motivoo.presentation.home.HomeFragment.Companion.HOME_STATE_CONFIRM_RESULT_OK +import sopt.motivoo.presentation.home.viewmodel.HomeViewModel +import sopt.motivoo.util.binding.BindingDialogFragment +import sopt.motivoo.util.extension.px @AndroidEntryPoint class HomeConfirmDialogFragment : diff --git a/app/src/main/java/sopt/mottivoo/presentation/home/dialog/HomePhotoDialogFragment.kt b/app/src/main/java/sopt/motivoo/presentation/home/dialog/HomePhotoDialogFragment.kt similarity index 87% rename from app/src/main/java/sopt/mottivoo/presentation/home/dialog/HomePhotoDialogFragment.kt rename to app/src/main/java/sopt/motivoo/presentation/home/dialog/HomePhotoDialogFragment.kt index a21c686a..07cefae1 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/home/dialog/HomePhotoDialogFragment.kt +++ b/app/src/main/java/sopt/motivoo/presentation/home/dialog/HomePhotoDialogFragment.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation.home.dialog +package sopt.motivoo.presentation.home.dialog import android.net.Uri import android.os.Bundle @@ -13,13 +13,13 @@ import coil.load import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch -import sopt.mottivoo.R -import sopt.mottivoo.databinding.DialogHomePhotoBinding -import sopt.mottivoo.presentation.home.HomePictureState -import sopt.mottivoo.presentation.home.viewmodel.HomeViewModel -import sopt.mottivoo.util.Constants.S3_BUCKET_NAME -import sopt.mottivoo.util.binding.BindingDialogFragment -import sopt.mottivoo.util.extension.createUriToBitmap +import sopt.motivoo.R +import sopt.motivoo.databinding.DialogHomePhotoBinding +import sopt.motivoo.presentation.home.HomePictureState +import sopt.motivoo.presentation.home.viewmodel.HomeViewModel +import sopt.motivoo.util.Constants.S3_BUCKET_NAME +import sopt.motivoo.util.binding.BindingDialogFragment +import sopt.motivoo.util.extension.createUriToBitmap @AndroidEntryPoint class HomePhotoDialogFragment : diff --git a/app/src/main/java/sopt/mottivoo/presentation/home/service/StepCountService.kt b/app/src/main/java/sopt/motivoo/presentation/home/service/StepCountService.kt similarity index 93% rename from app/src/main/java/sopt/mottivoo/presentation/home/service/StepCountService.kt rename to app/src/main/java/sopt/motivoo/presentation/home/service/StepCountService.kt index f6b9b578..a9aa5ff1 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/home/service/StepCountService.kt +++ b/app/src/main/java/sopt/motivoo/presentation/home/service/StepCountService.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation.home.service +package sopt.motivoo.presentation.home.service import android.app.AlarmManager import android.app.NotificationChannel @@ -19,13 +19,13 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.launch -import sopt.mottivoo.R -import sopt.mottivoo.domain.repository.FirebaseRepository -import sopt.mottivoo.domain.repository.StepCountRepository -import sopt.mottivoo.presentation.home.broadcastreceiver.HomeAlarmReceiver -import sopt.mottivoo.presentation.home.broadcastreceiver.HomeAlarmReceiver.Companion.ALARM_INIT_OK -import sopt.mottivoo.util.Constants.USER_ID -import sopt.mottivoo.util.extension.sendNotification +import sopt.motivoo.R +import sopt.motivoo.domain.repository.FirebaseRepository +import sopt.motivoo.domain.repository.StepCountRepository +import sopt.motivoo.presentation.home.broadcastreceiver.HomeAlarmReceiver +import sopt.motivoo.presentation.home.broadcastreceiver.HomeAlarmReceiver.Companion.ALARM_INIT_OK +import sopt.motivoo.util.Constants.USER_ID +import sopt.motivoo.util.extension.sendNotification import java.util.Calendar import javax.inject.Inject diff --git a/app/src/main/java/sopt/mottivoo/presentation/home/viewmodel/HomeViewModel.kt b/app/src/main/java/sopt/motivoo/presentation/home/viewmodel/HomeViewModel.kt similarity index 94% rename from app/src/main/java/sopt/mottivoo/presentation/home/viewmodel/HomeViewModel.kt rename to app/src/main/java/sopt/motivoo/presentation/home/viewmodel/HomeViewModel.kt index cd1d25d7..58299a19 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/home/viewmodel/HomeViewModel.kt +++ b/app/src/main/java/sopt/motivoo/presentation/home/viewmodel/HomeViewModel.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation.home.viewmodel +package sopt.motivoo.presentation.home.viewmodel import android.graphics.Bitmap import androidx.lifecycle.LiveData @@ -13,15 +13,15 @@ import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch -import sopt.mottivoo.domain.entity.home.HomeData -import sopt.mottivoo.domain.entity.home.MissionChoiceData -import sopt.mottivoo.domain.repository.FirebaseRepository -import sopt.mottivoo.domain.repository.HomeRepository -import sopt.mottivoo.domain.repository.StepCountRepository -import sopt.mottivoo.domain.repository.UserRepository -import sopt.mottivoo.presentation.home.HomeIntent -import sopt.mottivoo.presentation.home.HomePictureState -import sopt.mottivoo.presentation.home.HomeState +import sopt.motivoo.domain.entity.home.HomeData +import sopt.motivoo.domain.entity.home.MissionChoiceData +import sopt.motivoo.domain.repository.FirebaseRepository +import sopt.motivoo.domain.repository.HomeRepository +import sopt.motivoo.domain.repository.StepCountRepository +import sopt.motivoo.domain.repository.UserRepository +import sopt.motivoo.presentation.home.HomeIntent +import sopt.motivoo.presentation.home.HomePictureState +import sopt.motivoo.presentation.home.HomeState import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/sopt/mottivoo/presentation/intro/PermissionFragment.kt b/app/src/main/java/sopt/motivoo/presentation/intro/PermissionFragment.kt similarity index 94% rename from app/src/main/java/sopt/mottivoo/presentation/intro/PermissionFragment.kt rename to app/src/main/java/sopt/motivoo/presentation/intro/PermissionFragment.kt index 0f2c2d4c..e488bdf9 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/intro/PermissionFragment.kt +++ b/app/src/main/java/sopt/motivoo/presentation/intro/PermissionFragment.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation.intro +package sopt.motivoo.presentation.intro import android.Manifest import android.content.pm.PackageManager @@ -9,10 +9,10 @@ import androidx.activity.result.contract.ActivityResultContracts import androidx.core.content.ContextCompat import androidx.navigation.fragment.findNavController import dagger.hilt.android.AndroidEntryPoint -import sopt.mottivoo.R -import sopt.mottivoo.databinding.FragmentPermissionBinding -import sopt.mottivoo.domain.entity.MotivooStorage -import sopt.mottivoo.util.binding.BindingFragment +import sopt.motivoo.R +import sopt.motivoo.databinding.FragmentPermissionBinding +import sopt.motivoo.domain.entity.MotivooStorage +import sopt.motivoo.util.binding.BindingFragment import timber.log.Timber import javax.inject.Inject diff --git a/app/src/main/java/sopt/mottivoo/presentation/intro/SplashFragment.kt b/app/src/main/java/sopt/motivoo/presentation/intro/SplashFragment.kt similarity index 90% rename from app/src/main/java/sopt/mottivoo/presentation/intro/SplashFragment.kt rename to app/src/main/java/sopt/motivoo/presentation/intro/SplashFragment.kt index 9592f6c9..bc74440f 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/intro/SplashFragment.kt +++ b/app/src/main/java/sopt/motivoo/presentation/intro/SplashFragment.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation.intro +package sopt.motivoo.presentation.intro import android.os.Bundle import android.view.View @@ -14,11 +14,11 @@ import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch -import sopt.mottivoo.R -import sopt.mottivoo.databinding.FragmentSplashBinding -import sopt.mottivoo.util.NavigationEvent -import sopt.mottivoo.util.binding.BindingFragment -import sopt.mottivoo.util.findStartDestination +import sopt.motivoo.R +import sopt.motivoo.databinding.FragmentSplashBinding +import sopt.motivoo.util.NavigationEvent +import sopt.motivoo.util.binding.BindingFragment +import sopt.motivoo.util.findStartDestination @AndroidEntryPoint class SplashFragment : BindingFragment(R.layout.fragment_splash) { diff --git a/app/src/main/java/sopt/mottivoo/presentation/intro/SplashViewModel.kt b/app/src/main/java/sopt/motivoo/presentation/intro/SplashViewModel.kt similarity index 84% rename from app/src/main/java/sopt/mottivoo/presentation/intro/SplashViewModel.kt rename to app/src/main/java/sopt/motivoo/presentation/intro/SplashViewModel.kt index d2ec8eea..5eb682a7 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/intro/SplashViewModel.kt +++ b/app/src/main/java/sopt/motivoo/presentation/intro/SplashViewModel.kt @@ -1,11 +1,11 @@ -package sopt.mottivoo.presentation.intro +package sopt.motivoo.presentation.intro import androidx.lifecycle.ViewModel import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow -import sopt.mottivoo.util.NavigationDecider -import sopt.mottivoo.util.NavigationEvent +import sopt.motivoo.util.NavigationDecider +import sopt.motivoo.util.NavigationEvent import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/sopt/mottivoo/presentation/intro/StartMotivooFragment.kt b/app/src/main/java/sopt/motivoo/presentation/intro/StartMotivooFragment.kt similarity index 84% rename from app/src/main/java/sopt/mottivoo/presentation/intro/StartMotivooFragment.kt rename to app/src/main/java/sopt/motivoo/presentation/intro/StartMotivooFragment.kt index 2f71f918..90aba1be 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/intro/StartMotivooFragment.kt +++ b/app/src/main/java/sopt/motivoo/presentation/intro/StartMotivooFragment.kt @@ -1,14 +1,14 @@ -package sopt.mottivoo.presentation.intro +package sopt.motivoo.presentation.intro import android.os.Bundle import android.view.View import androidx.activity.OnBackPressedCallback import androidx.navigation.fragment.findNavController import dagger.hilt.android.AndroidEntryPoint -import sopt.mottivoo.R -import sopt.mottivoo.databinding.FragmentStartMotivooBinding -import sopt.mottivoo.util.binding.BindingFragment -import sopt.mottivoo.util.extension.setOnSingleClickListener +import sopt.motivoo.R +import sopt.motivoo.databinding.FragmentStartMotivooBinding +import sopt.motivoo.util.binding.BindingFragment +import sopt.motivoo.util.extension.setOnSingleClickListener @AndroidEntryPoint class StartMotivooFragment : diff --git a/app/src/main/java/sopt/mottivoo/presentation/intro/TermsOfUseFragment.kt b/app/src/main/java/sopt/motivoo/presentation/intro/TermsOfUseFragment.kt similarity index 92% rename from app/src/main/java/sopt/mottivoo/presentation/intro/TermsOfUseFragment.kt rename to app/src/main/java/sopt/motivoo/presentation/intro/TermsOfUseFragment.kt index 37193c4a..4d3e0154 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/intro/TermsOfUseFragment.kt +++ b/app/src/main/java/sopt/motivoo/presentation/intro/TermsOfUseFragment.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation.intro +package sopt.motivoo.presentation.intro import android.os.Bundle import android.view.View @@ -7,11 +7,11 @@ import androidx.activity.OnBackPressedCallback import androidx.fragment.app.viewModels import androidx.navigation.fragment.findNavController import dagger.hilt.android.AndroidEntryPoint -import sopt.mottivoo.R -import sopt.mottivoo.databinding.FragmentTermsOfUseBinding -import sopt.mottivoo.domain.entity.MotivooStorage -import sopt.mottivoo.util.binding.BindingFragment -import sopt.mottivoo.util.extension.setOnSingleClickListener +import sopt.motivoo.R +import sopt.motivoo.databinding.FragmentTermsOfUseBinding +import sopt.motivoo.domain.entity.MotivooStorage +import sopt.motivoo.util.binding.BindingFragment +import sopt.motivoo.util.extension.setOnSingleClickListener import javax.inject.Inject @AndroidEntryPoint diff --git a/app/src/main/java/sopt/mottivoo/presentation/intro/TermsOfUseViewModel.kt b/app/src/main/java/sopt/motivoo/presentation/intro/TermsOfUseViewModel.kt similarity index 96% rename from app/src/main/java/sopt/mottivoo/presentation/intro/TermsOfUseViewModel.kt rename to app/src/main/java/sopt/motivoo/presentation/intro/TermsOfUseViewModel.kt index 3dcd2e83..38819939 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/intro/TermsOfUseViewModel.kt +++ b/app/src/main/java/sopt/motivoo/presentation/intro/TermsOfUseViewModel.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation.intro +package sopt.motivoo.presentation.intro import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope diff --git a/app/src/main/java/sopt/mottivoo/presentation/invitecode/GetInviteCodeFragment.kt b/app/src/main/java/sopt/motivoo/presentation/invitecode/GetInviteCodeFragment.kt similarity index 93% rename from app/src/main/java/sopt/mottivoo/presentation/invitecode/GetInviteCodeFragment.kt rename to app/src/main/java/sopt/motivoo/presentation/invitecode/GetInviteCodeFragment.kt index 6e4b5967..ed8099d9 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/invitecode/GetInviteCodeFragment.kt +++ b/app/src/main/java/sopt/motivoo/presentation/invitecode/GetInviteCodeFragment.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation.invitecode +package sopt.motivoo.presentation.invitecode import android.content.ClipData import android.content.ClipboardManager @@ -19,12 +19,12 @@ import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch -import sopt.mottivoo.R -import sopt.mottivoo.databinding.FragmentGetInviteCodeBinding -import sopt.mottivoo.domain.entity.MotivooStorage -import sopt.mottivoo.util.UiState -import sopt.mottivoo.util.binding.BindingFragment -import sopt.mottivoo.util.extension.setOnSingleClickListener +import sopt.motivoo.R +import sopt.motivoo.databinding.FragmentGetInviteCodeBinding +import sopt.motivoo.domain.entity.MotivooStorage +import sopt.motivoo.util.UiState +import sopt.motivoo.util.binding.BindingFragment +import sopt.motivoo.util.extension.setOnSingleClickListener import javax.inject.Inject @AndroidEntryPoint diff --git a/app/src/main/java/sopt/mottivoo/presentation/invitecode/GetInviteCodeViewModel.kt b/app/src/main/java/sopt/motivoo/presentation/invitecode/GetInviteCodeViewModel.kt similarity index 89% rename from app/src/main/java/sopt/mottivoo/presentation/invitecode/GetInviteCodeViewModel.kt rename to app/src/main/java/sopt/motivoo/presentation/invitecode/GetInviteCodeViewModel.kt index fab3232e..a31ee66f 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/invitecode/GetInviteCodeViewModel.kt +++ b/app/src/main/java/sopt/motivoo/presentation/invitecode/GetInviteCodeViewModel.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation.invitecode +package sopt.motivoo.presentation.invitecode import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope @@ -6,9 +6,9 @@ import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch -import sopt.mottivoo.domain.entity.MotivooStorage -import sopt.mottivoo.domain.repository.OnboardingRepository -import sopt.mottivoo.util.UiState +import sopt.motivoo.domain.entity.MotivooStorage +import sopt.motivoo.domain.repository.OnboardingRepository +import sopt.motivoo.util.UiState import timber.log.Timber import javax.inject.Inject diff --git a/app/src/main/java/sopt/mottivoo/presentation/invitecode/PostInviteCodeFragment.kt b/app/src/main/java/sopt/motivoo/presentation/invitecode/PostInviteCodeFragment.kt similarity index 89% rename from app/src/main/java/sopt/mottivoo/presentation/invitecode/PostInviteCodeFragment.kt rename to app/src/main/java/sopt/motivoo/presentation/invitecode/PostInviteCodeFragment.kt index fb82c77f..55f65a3f 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/invitecode/PostInviteCodeFragment.kt +++ b/app/src/main/java/sopt/motivoo/presentation/invitecode/PostInviteCodeFragment.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation.invitecode +package sopt.motivoo.presentation.invitecode import android.os.Bundle import android.view.View @@ -11,12 +11,12 @@ import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach -import sopt.mottivoo.R -import sopt.mottivoo.databinding.FragmentPostInviteCodeBinding -import sopt.mottivoo.util.UiState -import sopt.mottivoo.util.binding.BindingFragment -import sopt.mottivoo.util.extension.drawableOf -import sopt.mottivoo.util.extension.setOnSingleClickListener +import sopt.motivoo.R +import sopt.motivoo.databinding.FragmentPostInviteCodeBinding +import sopt.motivoo.util.UiState +import sopt.motivoo.util.binding.BindingFragment +import sopt.motivoo.util.extension.drawableOf +import sopt.motivoo.util.extension.setOnSingleClickListener @AndroidEntryPoint class PostInviteCodeFragment : diff --git a/app/src/main/java/sopt/mottivoo/presentation/invitecode/PostInviteCodeViewModel.kt b/app/src/main/java/sopt/motivoo/presentation/invitecode/PostInviteCodeViewModel.kt similarity index 85% rename from app/src/main/java/sopt/mottivoo/presentation/invitecode/PostInviteCodeViewModel.kt rename to app/src/main/java/sopt/motivoo/presentation/invitecode/PostInviteCodeViewModel.kt index 93c91c80..49a768e0 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/invitecode/PostInviteCodeViewModel.kt +++ b/app/src/main/java/sopt/motivoo/presentation/invitecode/PostInviteCodeViewModel.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation.invitecode +package sopt.motivoo.presentation.invitecode import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope @@ -10,10 +10,10 @@ import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch -import sopt.mottivoo.data.model.request.onboarding.RequestPostInviteCodeDto -import sopt.mottivoo.domain.entity.MotivooStorage -import sopt.mottivoo.domain.repository.OnboardingRepository -import sopt.mottivoo.util.UiState +import sopt.motivoo.data.model.request.onboarding.RequestPostInviteCodeDto +import sopt.motivoo.domain.entity.MotivooStorage +import sopt.motivoo.domain.repository.OnboardingRepository +import sopt.motivoo.util.UiState import timber.log.Timber import javax.inject.Inject diff --git a/app/src/main/java/sopt/mottivoo/presentation/my_exercise_info/MyExerciseInfoFragment.kt b/app/src/main/java/sopt/motivoo/presentation/my_exercise_info/MyExerciseInfoFragment.kt similarity index 89% rename from app/src/main/java/sopt/mottivoo/presentation/my_exercise_info/MyExerciseInfoFragment.kt rename to app/src/main/java/sopt/motivoo/presentation/my_exercise_info/MyExerciseInfoFragment.kt index 0ec963ce..3d64e017 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/my_exercise_info/MyExerciseInfoFragment.kt +++ b/app/src/main/java/sopt/motivoo/presentation/my_exercise_info/MyExerciseInfoFragment.kt @@ -1,13 +1,13 @@ -package sopt.mottivoo.presentation.my_exercise_info +package sopt.motivoo.presentation.my_exercise_info import android.os.Bundle import android.view.View import androidx.fragment.app.viewModels import androidx.navigation.fragment.findNavController import dagger.hilt.android.AndroidEntryPoint -import sopt.mottivoo.R -import sopt.mottivoo.databinding.FragmentMypageExerciseInfoBinding -import sopt.mottivoo.util.binding.BindingFragment +import sopt.motivoo.R +import sopt.motivoo.databinding.FragmentMypageExerciseInfoBinding +import sopt.motivoo.util.binding.BindingFragment @AndroidEntryPoint class MyExerciseInfoFragment : diff --git a/app/src/main/java/sopt/mottivoo/presentation/my_exercise_info/MyExerciseInfoViewModel.kt b/app/src/main/java/sopt/motivoo/presentation/my_exercise_info/MyExerciseInfoViewModel.kt similarity index 87% rename from app/src/main/java/sopt/mottivoo/presentation/my_exercise_info/MyExerciseInfoViewModel.kt rename to app/src/main/java/sopt/motivoo/presentation/my_exercise_info/MyExerciseInfoViewModel.kt index a106284e..523736e0 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/my_exercise_info/MyExerciseInfoViewModel.kt +++ b/app/src/main/java/sopt/motivoo/presentation/my_exercise_info/MyExerciseInfoViewModel.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation.my_exercise_info +package sopt.motivoo.presentation.my_exercise_info import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -6,8 +6,8 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.launch -import sopt.mottivoo.data.service.MyExerciseInfoService -import sopt.mottivoo.domain.entity.MyExerciseInfo +import sopt.motivoo.data.service.MyExerciseInfoService +import sopt.motivoo.domain.entity.MyExerciseInfo import timber.log.Timber import javax.inject.Inject diff --git a/app/src/main/java/sopt/mottivoo/presentation/mypage/MyInfoFragment.kt b/app/src/main/java/sopt/motivoo/presentation/mypage/MyInfoFragment.kt similarity index 88% rename from app/src/main/java/sopt/mottivoo/presentation/mypage/MyInfoFragment.kt rename to app/src/main/java/sopt/motivoo/presentation/mypage/MyInfoFragment.kt index 1c950796..dc24ff3a 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/mypage/MyInfoFragment.kt +++ b/app/src/main/java/sopt/motivoo/presentation/mypage/MyInfoFragment.kt @@ -1,12 +1,12 @@ -package sopt.mottivoo.presentation.mypage +package sopt.motivoo.presentation.mypage import android.os.Bundle import android.view.View import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs -import sopt.mottivoo.R -import sopt.mottivoo.databinding.FragmentMypageMyinfoBinding -import sopt.mottivoo.util.binding.BindingFragment +import sopt.motivoo.R +import sopt.motivoo.databinding.FragmentMypageMyinfoBinding +import sopt.motivoo.util.binding.BindingFragment class MyInfoFragment : BindingFragment(R.layout.fragment_mypage_myinfo) { diff --git a/app/src/main/java/sopt/mottivoo/presentation/mypage/MyLogoutFragment.kt b/app/src/main/java/sopt/motivoo/presentation/mypage/MyLogoutFragment.kt similarity index 78% rename from app/src/main/java/sopt/mottivoo/presentation/mypage/MyLogoutFragment.kt rename to app/src/main/java/sopt/motivoo/presentation/mypage/MyLogoutFragment.kt index 7212ec10..d27345c3 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/mypage/MyLogoutFragment.kt +++ b/app/src/main/java/sopt/motivoo/presentation/mypage/MyLogoutFragment.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation.mypage +package sopt.motivoo.presentation.mypage import android.os.Bundle import android.view.View @@ -9,14 +9,14 @@ import androidx.navigation.fragment.findNavController import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach -import sopt.mottivoo.R -import sopt.mottivoo.data.service.KakaoAuthService -import sopt.mottivoo.databinding.FragmentMypageLogoutBinding -import sopt.mottivoo.presentation.auth.AuthViewModel -import sopt.mottivoo.util.UiState -import sopt.mottivoo.util.binding.BindingDialogFragment -import sopt.mottivoo.util.extension.redirectToLogin -import sopt.mottivoo.util.extension.setOnSingleClickListener +import sopt.motivoo.R +import sopt.motivoo.data.service.KakaoAuthService +import sopt.motivoo.databinding.FragmentMypageLogoutBinding +import sopt.motivoo.presentation.auth.AuthViewModel +import sopt.motivoo.util.UiState +import sopt.motivoo.util.binding.BindingDialogFragment +import sopt.motivoo.util.extension.redirectToLogin +import sopt.motivoo.util.extension.setOnSingleClickListener import javax.inject.Inject @AndroidEntryPoint diff --git a/app/src/main/java/sopt/mottivoo/presentation/mypage/MyPageFragment.kt b/app/src/main/java/sopt/motivoo/presentation/mypage/MyPageFragment.kt similarity index 93% rename from app/src/main/java/sopt/mottivoo/presentation/mypage/MyPageFragment.kt rename to app/src/main/java/sopt/motivoo/presentation/mypage/MyPageFragment.kt index e5b6c608..7d6503de 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/mypage/MyPageFragment.kt +++ b/app/src/main/java/sopt/motivoo/presentation/mypage/MyPageFragment.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation.mypage +package sopt.motivoo.presentation.mypage import android.content.Intent import android.net.Uri @@ -11,13 +11,13 @@ import androidx.fragment.app.viewModels import androidx.navigation.fragment.findNavController import com.google.android.gms.oss.licenses.OssLicensesMenuActivity import dagger.hilt.android.AndroidEntryPoint -import sopt.mottivoo.BuildConfig -import sopt.mottivoo.R -import sopt.mottivoo.databinding.FragmentMypageBinding -import sopt.mottivoo.presentation.type.UserType -import sopt.mottivoo.util.UiState -import sopt.mottivoo.util.binding.BindingFragment -import sopt.mottivoo.util.extension.setVisible +import sopt.motivoo.BuildConfig +import sopt.motivoo.R +import sopt.motivoo.databinding.FragmentMypageBinding +import sopt.motivoo.presentation.type.UserType +import sopt.motivoo.util.UiState +import sopt.motivoo.util.binding.BindingFragment +import sopt.motivoo.util.extension.setVisible @AndroidEntryPoint class MyPageFragment : BindingFragment(R.layout.fragment_mypage) { diff --git a/app/src/main/java/sopt/mottivoo/presentation/mypage/MyPageViewModel.kt b/app/src/main/java/sopt/motivoo/presentation/mypage/MyPageViewModel.kt similarity index 83% rename from app/src/main/java/sopt/mottivoo/presentation/mypage/MyPageViewModel.kt rename to app/src/main/java/sopt/motivoo/presentation/mypage/MyPageViewModel.kt index e058a548..dd0754b1 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/mypage/MyPageViewModel.kt +++ b/app/src/main/java/sopt/motivoo/presentation/mypage/MyPageViewModel.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation.mypage +package sopt.motivoo.presentation.mypage import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -6,9 +6,9 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.launch -import sopt.mottivoo.data.service.MyPageService -import sopt.mottivoo.domain.entity.mypage.UserInfo -import sopt.mottivoo.util.UiState +import sopt.motivoo.data.service.MyPageService +import sopt.motivoo.domain.entity.mypage.UserInfo +import sopt.motivoo.util.UiState import timber.log.Timber import javax.inject.Inject diff --git a/app/src/main/java/sopt/mottivoo/presentation/mypage/MyServiceOutFragment.kt b/app/src/main/java/sopt/motivoo/presentation/mypage/MyServiceOutFragment.kt similarity index 81% rename from app/src/main/java/sopt/mottivoo/presentation/mypage/MyServiceOutFragment.kt rename to app/src/main/java/sopt/motivoo/presentation/mypage/MyServiceOutFragment.kt index 81dd5b16..31a18387 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/mypage/MyServiceOutFragment.kt +++ b/app/src/main/java/sopt/motivoo/presentation/mypage/MyServiceOutFragment.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation.mypage +package sopt.motivoo.presentation.mypage import android.content.Intent import android.os.Bundle @@ -10,14 +10,14 @@ import androidx.navigation.fragment.findNavController import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach -import sopt.mottivoo.R -import sopt.mottivoo.data.service.KakaoAuthService -import sopt.mottivoo.databinding.FragmentMypageServiceOutBinding -import sopt.mottivoo.presentation.auth.AuthViewModel -import sopt.mottivoo.presentation.home.service.StepCountService -import sopt.mottivoo.util.UiState -import sopt.mottivoo.util.binding.BindingDialogFragment -import sopt.mottivoo.util.extension.redirectToLogin +import sopt.motivoo.R +import sopt.motivoo.data.service.KakaoAuthService +import sopt.motivoo.databinding.FragmentMypageServiceOutBinding +import sopt.motivoo.presentation.auth.AuthViewModel +import sopt.motivoo.presentation.home.service.StepCountService +import sopt.motivoo.util.UiState +import sopt.motivoo.util.binding.BindingDialogFragment +import sopt.motivoo.util.extension.redirectToLogin import javax.inject.Inject @AndroidEntryPoint diff --git a/app/src/main/java/sopt/mottivoo/presentation/onboarding/AgeQuestionFragment.kt b/app/src/main/java/sopt/motivoo/presentation/onboarding/AgeQuestionFragment.kt similarity index 93% rename from app/src/main/java/sopt/mottivoo/presentation/onboarding/AgeQuestionFragment.kt rename to app/src/main/java/sopt/motivoo/presentation/onboarding/AgeQuestionFragment.kt index 208b4b31..34b96de7 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/onboarding/AgeQuestionFragment.kt +++ b/app/src/main/java/sopt/motivoo/presentation/onboarding/AgeQuestionFragment.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation.onboarding +package sopt.motivoo.presentation.onboarding import android.os.Bundle import android.transition.TransitionManager @@ -14,13 +14,13 @@ import androidx.navigation.fragment.findNavController import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach -import sopt.mottivoo.R -import sopt.mottivoo.databinding.FragmentAgeQusetionBinding -import sopt.mottivoo.util.binding.BindingFragment -import sopt.mottivoo.util.extension.drawableOf -import sopt.mottivoo.util.extension.px -import sopt.mottivoo.util.extension.setOnSingleClickListener -import sopt.mottivoo.util.extension.showKeyboard +import sopt.motivoo.R +import sopt.motivoo.databinding.FragmentAgeQusetionBinding +import sopt.motivoo.util.binding.BindingFragment +import sopt.motivoo.util.extension.drawableOf +import sopt.motivoo.util.extension.px +import sopt.motivoo.util.extension.setOnSingleClickListener +import sopt.motivoo.util.extension.showKeyboard class AgeQuestionFragment : BindingFragment(R.layout.fragment_age_qusetion) { diff --git a/app/src/main/java/sopt/mottivoo/presentation/onboarding/DoExerciseQuestionFragment.kt b/app/src/main/java/sopt/motivoo/presentation/onboarding/DoExerciseQuestionFragment.kt similarity index 73% rename from app/src/main/java/sopt/mottivoo/presentation/onboarding/DoExerciseQuestionFragment.kt rename to app/src/main/java/sopt/motivoo/presentation/onboarding/DoExerciseQuestionFragment.kt index d9db32d0..281f6570 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/onboarding/DoExerciseQuestionFragment.kt +++ b/app/src/main/java/sopt/motivoo/presentation/onboarding/DoExerciseQuestionFragment.kt @@ -1,11 +1,11 @@ -package sopt.mottivoo.presentation.onboarding +package sopt.motivoo.presentation.onboarding import android.os.Bundle import android.view.View import androidx.fragment.app.activityViewModels -import sopt.mottivoo.R -import sopt.mottivoo.databinding.FragmentDoExerciseQuestionBinding -import sopt.mottivoo.util.binding.BindingFragment +import sopt.motivoo.R +import sopt.motivoo.databinding.FragmentDoExerciseQuestionBinding +import sopt.motivoo.util.binding.BindingFragment class DoExerciseQuestionFragment : BindingFragment(R.layout.fragment_do_exercise_question) { diff --git a/app/src/main/java/sopt/mottivoo/presentation/onboarding/FrequencyQuestionFragment.kt b/app/src/main/java/sopt/motivoo/presentation/onboarding/FrequencyQuestionFragment.kt similarity index 79% rename from app/src/main/java/sopt/mottivoo/presentation/onboarding/FrequencyQuestionFragment.kt rename to app/src/main/java/sopt/motivoo/presentation/onboarding/FrequencyQuestionFragment.kt index d85526fa..0f205b93 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/onboarding/FrequencyQuestionFragment.kt +++ b/app/src/main/java/sopt/motivoo/presentation/onboarding/FrequencyQuestionFragment.kt @@ -1,13 +1,13 @@ -package sopt.mottivoo.presentation.onboarding +package sopt.motivoo.presentation.onboarding import android.os.Bundle import android.view.View import androidx.fragment.app.activityViewModels import androidx.navigation.fragment.navArgs -import sopt.mottivoo.R -import sopt.mottivoo.databinding.FragmentFrequencyQusetionBinding -import sopt.mottivoo.presentation.type.DoExerciseType -import sopt.mottivoo.util.binding.BindingFragment +import sopt.motivoo.R +import sopt.motivoo.databinding.FragmentFrequencyQusetionBinding +import sopt.motivoo.presentation.type.DoExerciseType +import sopt.motivoo.util.binding.BindingFragment class FrequencyQuestionFragment : BindingFragment(R.layout.fragment_frequency_qusetion) { diff --git a/app/src/main/java/sopt/mottivoo/presentation/onboarding/OnboardingViewModel.kt b/app/src/main/java/sopt/motivoo/presentation/onboarding/OnboardingViewModel.kt similarity index 91% rename from app/src/main/java/sopt/mottivoo/presentation/onboarding/OnboardingViewModel.kt rename to app/src/main/java/sopt/motivoo/presentation/onboarding/OnboardingViewModel.kt index 60d68ebb..e3319db5 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/onboarding/OnboardingViewModel.kt +++ b/app/src/main/java/sopt/motivoo/presentation/onboarding/OnboardingViewModel.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation.onboarding +package sopt.motivoo.presentation.onboarding import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel @@ -14,18 +14,18 @@ import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch -import sopt.mottivoo.data.model.request.onboarding.RequestOnboardingDto -import sopt.mottivoo.domain.entity.MotivooStorage -import sopt.mottivoo.domain.repository.OnboardingRepository -import sopt.mottivoo.presentation.type.DoExerciseType -import sopt.mottivoo.presentation.type.FrequencyType -import sopt.mottivoo.presentation.type.NavigationSourceType -import sopt.mottivoo.presentation.type.SoreSpotType -import sopt.mottivoo.presentation.type.TimeType -import sopt.mottivoo.presentation.type.UserType -import sopt.mottivoo.presentation.type.WhatActivityType -import sopt.mottivoo.presentation.type.WhatExerciseType -import sopt.mottivoo.util.UiState +import sopt.motivoo.data.model.request.onboarding.RequestOnboardingDto +import sopt.motivoo.domain.entity.MotivooStorage +import sopt.motivoo.domain.repository.OnboardingRepository +import sopt.motivoo.presentation.type.DoExerciseType +import sopt.motivoo.presentation.type.FrequencyType +import sopt.motivoo.presentation.type.NavigationSourceType +import sopt.motivoo.presentation.type.SoreSpotType +import sopt.motivoo.presentation.type.TimeType +import sopt.motivoo.presentation.type.UserType +import sopt.motivoo.presentation.type.WhatActivityType +import sopt.motivoo.presentation.type.WhatExerciseType +import sopt.motivoo.util.UiState import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/sopt/mottivoo/presentation/onboarding/SoreSpotQuestionFragment.kt b/app/src/main/java/sopt/motivoo/presentation/onboarding/SoreSpotQuestionFragment.kt similarity index 89% rename from app/src/main/java/sopt/mottivoo/presentation/onboarding/SoreSpotQuestionFragment.kt rename to app/src/main/java/sopt/motivoo/presentation/onboarding/SoreSpotQuestionFragment.kt index 6f4dbd39..84639cdd 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/onboarding/SoreSpotQuestionFragment.kt +++ b/app/src/main/java/sopt/motivoo/presentation/onboarding/SoreSpotQuestionFragment.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation.onboarding +package sopt.motivoo.presentation.onboarding import android.os.Bundle import android.view.View @@ -12,14 +12,14 @@ import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach -import sopt.mottivoo.R -import sopt.mottivoo.databinding.FragmentSoreSpotQusetionBinding -import sopt.mottivoo.domain.entity.MotivooStorage -import sopt.mottivoo.presentation.type.DoExerciseType -import sopt.mottivoo.util.UiState -import sopt.mottivoo.util.binding.BindingFragment -import sopt.mottivoo.util.extension.setOnSingleClickListener -import sopt.mottivoo.util.findStartDestination +import sopt.motivoo.R +import sopt.motivoo.databinding.FragmentSoreSpotQusetionBinding +import sopt.motivoo.domain.entity.MotivooStorage +import sopt.motivoo.presentation.type.DoExerciseType +import sopt.motivoo.util.UiState +import sopt.motivoo.util.binding.BindingFragment +import sopt.motivoo.util.extension.setOnSingleClickListener +import sopt.motivoo.util.findStartDestination import javax.inject.Inject @AndroidEntryPoint diff --git a/app/src/main/java/sopt/mottivoo/presentation/onboarding/TimeQuestionFragment.kt b/app/src/main/java/sopt/motivoo/presentation/onboarding/TimeQuestionFragment.kt similarity index 78% rename from app/src/main/java/sopt/mottivoo/presentation/onboarding/TimeQuestionFragment.kt rename to app/src/main/java/sopt/motivoo/presentation/onboarding/TimeQuestionFragment.kt index 40470386..20744d34 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/onboarding/TimeQuestionFragment.kt +++ b/app/src/main/java/sopt/motivoo/presentation/onboarding/TimeQuestionFragment.kt @@ -1,13 +1,13 @@ -package sopt.mottivoo.presentation.onboarding +package sopt.motivoo.presentation.onboarding import android.os.Bundle import android.view.View import androidx.fragment.app.activityViewModels import androidx.navigation.fragment.navArgs -import sopt.mottivoo.R -import sopt.mottivoo.databinding.FragmentTimeQusetionBinding -import sopt.mottivoo.presentation.type.DoExerciseType -import sopt.mottivoo.util.binding.BindingFragment +import sopt.motivoo.R +import sopt.motivoo.databinding.FragmentTimeQusetionBinding +import sopt.motivoo.presentation.type.DoExerciseType +import sopt.motivoo.util.binding.BindingFragment class TimeQuestionFragment : BindingFragment(R.layout.fragment_time_qusetion) { diff --git a/app/src/main/java/sopt/mottivoo/presentation/onboarding/WhatActivityQuestionFragment.kt b/app/src/main/java/sopt/motivoo/presentation/onboarding/WhatActivityQuestionFragment.kt similarity index 73% rename from app/src/main/java/sopt/mottivoo/presentation/onboarding/WhatActivityQuestionFragment.kt rename to app/src/main/java/sopt/motivoo/presentation/onboarding/WhatActivityQuestionFragment.kt index 45643354..149fb7a5 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/onboarding/WhatActivityQuestionFragment.kt +++ b/app/src/main/java/sopt/motivoo/presentation/onboarding/WhatActivityQuestionFragment.kt @@ -1,11 +1,11 @@ -package sopt.mottivoo.presentation.onboarding +package sopt.motivoo.presentation.onboarding import android.os.Bundle import android.view.View import androidx.fragment.app.activityViewModels -import sopt.mottivoo.R -import sopt.mottivoo.databinding.FragmentWhatActivityQuestionBinding -import sopt.mottivoo.util.binding.BindingFragment +import sopt.motivoo.R +import sopt.motivoo.databinding.FragmentWhatActivityQuestionBinding +import sopt.motivoo.util.binding.BindingFragment class WhatActivityQuestionFragment : BindingFragment(R.layout.fragment_what_activity_question) { diff --git a/app/src/main/java/sopt/mottivoo/presentation/onboarding/WhatExerciseQuestionFragment.kt b/app/src/main/java/sopt/motivoo/presentation/onboarding/WhatExerciseQuestionFragment.kt similarity index 73% rename from app/src/main/java/sopt/mottivoo/presentation/onboarding/WhatExerciseQuestionFragment.kt rename to app/src/main/java/sopt/motivoo/presentation/onboarding/WhatExerciseQuestionFragment.kt index 1077e21d..26ddb751 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/onboarding/WhatExerciseQuestionFragment.kt +++ b/app/src/main/java/sopt/motivoo/presentation/onboarding/WhatExerciseQuestionFragment.kt @@ -1,11 +1,11 @@ -package sopt.mottivoo.presentation.onboarding +package sopt.motivoo.presentation.onboarding import android.os.Bundle import android.view.View import androidx.fragment.app.activityViewModels -import sopt.mottivoo.R -import sopt.mottivoo.databinding.FragmentWhatExerciseQusetionBinding -import sopt.mottivoo.util.binding.BindingFragment +import sopt.motivoo.R +import sopt.motivoo.databinding.FragmentWhatExerciseQusetionBinding +import sopt.motivoo.util.binding.BindingFragment class WhatExerciseQuestionFragment : BindingFragment(R.layout.fragment_what_exercise_qusetion) { diff --git a/app/src/main/java/sopt/mottivoo/presentation/type/DoExerciseType.kt b/app/src/main/java/sopt/motivoo/presentation/type/DoExerciseType.kt similarity index 76% rename from app/src/main/java/sopt/mottivoo/presentation/type/DoExerciseType.kt rename to app/src/main/java/sopt/motivoo/presentation/type/DoExerciseType.kt index 3a8e72d4..61ebc827 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/type/DoExerciseType.kt +++ b/app/src/main/java/sopt/motivoo/presentation/type/DoExerciseType.kt @@ -1,7 +1,7 @@ -package sopt.mottivoo.presentation.type +package sopt.motivoo.presentation.type import androidx.annotation.StringRes -import sopt.mottivoo.R +import sopt.motivoo.R enum class DoExerciseType( @StringRes val titleRes: Int, diff --git a/app/src/main/java/sopt/mottivoo/presentation/type/FrequencyType.kt b/app/src/main/java/sopt/motivoo/presentation/type/FrequencyType.kt similarity index 84% rename from app/src/main/java/sopt/mottivoo/presentation/type/FrequencyType.kt rename to app/src/main/java/sopt/motivoo/presentation/type/FrequencyType.kt index 5f752ef4..870586f7 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/type/FrequencyType.kt +++ b/app/src/main/java/sopt/motivoo/presentation/type/FrequencyType.kt @@ -1,7 +1,7 @@ -package sopt.mottivoo.presentation.type +package sopt.motivoo.presentation.type import androidx.annotation.StringRes -import sopt.mottivoo.R +import sopt.motivoo.R enum class FrequencyType( @StringRes val titleRes: Int, diff --git a/app/src/main/java/sopt/mottivoo/presentation/type/NavigationSourceType.kt b/app/src/main/java/sopt/motivoo/presentation/type/NavigationSourceType.kt similarity index 64% rename from app/src/main/java/sopt/mottivoo/presentation/type/NavigationSourceType.kt rename to app/src/main/java/sopt/motivoo/presentation/type/NavigationSourceType.kt index 54f7281f..19cc0fca 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/type/NavigationSourceType.kt +++ b/app/src/main/java/sopt/motivoo/presentation/type/NavigationSourceType.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.presentation.type +package sopt.motivoo.presentation.type enum class NavigationSourceType { FROM_EXERCISE, diff --git a/app/src/main/java/sopt/motivoo/presentation/type/SocialType.kt b/app/src/main/java/sopt/motivoo/presentation/type/SocialType.kt new file mode 100644 index 00000000..d143e02e --- /dev/null +++ b/app/src/main/java/sopt/motivoo/presentation/type/SocialType.kt @@ -0,0 +1,5 @@ +package sopt.motivoo.presentation.type + +enum class SocialType { + kakao +} diff --git a/app/src/main/java/sopt/mottivoo/presentation/type/SoreSpotType.kt b/app/src/main/java/sopt/motivoo/presentation/type/SoreSpotType.kt similarity index 86% rename from app/src/main/java/sopt/mottivoo/presentation/type/SoreSpotType.kt rename to app/src/main/java/sopt/motivoo/presentation/type/SoreSpotType.kt index c8e1ae72..28b6ac39 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/type/SoreSpotType.kt +++ b/app/src/main/java/sopt/motivoo/presentation/type/SoreSpotType.kt @@ -1,7 +1,7 @@ -package sopt.mottivoo.presentation.type +package sopt.motivoo.presentation.type import androidx.annotation.StringRes -import sopt.mottivoo.R +import sopt.motivoo.R enum class SoreSpotType( @StringRes val titleRes: Int, diff --git a/app/src/main/java/sopt/mottivoo/presentation/type/TimeType.kt b/app/src/main/java/sopt/motivoo/presentation/type/TimeType.kt similarity index 83% rename from app/src/main/java/sopt/mottivoo/presentation/type/TimeType.kt rename to app/src/main/java/sopt/motivoo/presentation/type/TimeType.kt index 6ebb9063..a1721e9d 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/type/TimeType.kt +++ b/app/src/main/java/sopt/motivoo/presentation/type/TimeType.kt @@ -1,7 +1,7 @@ -package sopt.mottivoo.presentation.type +package sopt.motivoo.presentation.type import androidx.annotation.StringRes -import sopt.mottivoo.R +import sopt.motivoo.R enum class TimeType( @StringRes val titleRes: Int, diff --git a/app/src/main/java/sopt/mottivoo/presentation/type/UserType.kt b/app/src/main/java/sopt/motivoo/presentation/type/UserType.kt similarity index 76% rename from app/src/main/java/sopt/mottivoo/presentation/type/UserType.kt rename to app/src/main/java/sopt/motivoo/presentation/type/UserType.kt index d8387132..31d08106 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/type/UserType.kt +++ b/app/src/main/java/sopt/motivoo/presentation/type/UserType.kt @@ -1,7 +1,7 @@ -package sopt.mottivoo.presentation.type +package sopt.motivoo.presentation.type import androidx.annotation.StringRes -import sopt.mottivoo.R +import sopt.motivoo.R enum class UserType( @StringRes val titleRes: Int, diff --git a/app/src/main/java/sopt/mottivoo/presentation/type/WhatActivityType.kt b/app/src/main/java/sopt/motivoo/presentation/type/WhatActivityType.kt similarity index 87% rename from app/src/main/java/sopt/mottivoo/presentation/type/WhatActivityType.kt rename to app/src/main/java/sopt/motivoo/presentation/type/WhatActivityType.kt index c9a0312d..8919b836 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/type/WhatActivityType.kt +++ b/app/src/main/java/sopt/motivoo/presentation/type/WhatActivityType.kt @@ -1,7 +1,7 @@ -package sopt.mottivoo.presentation.type +package sopt.motivoo.presentation.type import androidx.annotation.StringRes -import sopt.mottivoo.R +import sopt.motivoo.R enum class WhatActivityType( @StringRes val titleRes: Int, diff --git a/app/src/main/java/sopt/mottivoo/presentation/type/WhatExerciseType.kt b/app/src/main/java/sopt/motivoo/presentation/type/WhatExerciseType.kt similarity index 87% rename from app/src/main/java/sopt/mottivoo/presentation/type/WhatExerciseType.kt rename to app/src/main/java/sopt/motivoo/presentation/type/WhatExerciseType.kt index 3ab4753e..61a8f22c 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/type/WhatExerciseType.kt +++ b/app/src/main/java/sopt/motivoo/presentation/type/WhatExerciseType.kt @@ -1,7 +1,7 @@ -package sopt.mottivoo.presentation.type +package sopt.motivoo.presentation.type import androidx.annotation.StringRes -import sopt.mottivoo.R +import sopt.motivoo.R enum class WhatExerciseType( @StringRes val titleRes: Int, diff --git a/app/src/main/java/sopt/mottivoo/presentation/withdrawal/WithdrawalFragment.kt b/app/src/main/java/sopt/motivoo/presentation/withdrawal/WithdrawalFragment.kt similarity index 85% rename from app/src/main/java/sopt/mottivoo/presentation/withdrawal/WithdrawalFragment.kt rename to app/src/main/java/sopt/motivoo/presentation/withdrawal/WithdrawalFragment.kt index a6ab2103..e6aa6a28 100644 --- a/app/src/main/java/sopt/mottivoo/presentation/withdrawal/WithdrawalFragment.kt +++ b/app/src/main/java/sopt/motivoo/presentation/withdrawal/WithdrawalFragment.kt @@ -1,12 +1,12 @@ -package sopt.mottivoo.presentation.withdrawal +package sopt.motivoo.presentation.withdrawal import android.os.Bundle import android.view.View import androidx.activity.OnBackPressedCallback import androidx.navigation.fragment.findNavController -import sopt.mottivoo.R -import sopt.mottivoo.databinding.FragmentWithdrawalBinding -import sopt.mottivoo.util.binding.BindingFragment +import sopt.motivoo.R +import sopt.motivoo.databinding.FragmentWithdrawalBinding +import sopt.motivoo.util.binding.BindingFragment class WithdrawalFragment : BindingFragment(R.layout.fragment_withdrawal) { diff --git a/app/src/main/java/sopt/mottivoo/util/Constants.kt b/app/src/main/java/sopt/motivoo/util/Constants.kt similarity index 82% rename from app/src/main/java/sopt/mottivoo/util/Constants.kt rename to app/src/main/java/sopt/motivoo/util/Constants.kt index 44307938..80b2e4de 100644 --- a/app/src/main/java/sopt/mottivoo/util/Constants.kt +++ b/app/src/main/java/sopt/motivoo/util/Constants.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.util +package sopt.motivoo.util object Constants { const val USER_ID = "user_id" diff --git a/app/src/main/java/sopt/mottivoo/util/ContentUriRequestBody.kt b/app/src/main/java/sopt/motivoo/util/ContentUriRequestBody.kt similarity index 98% rename from app/src/main/java/sopt/mottivoo/util/ContentUriRequestBody.kt rename to app/src/main/java/sopt/motivoo/util/ContentUriRequestBody.kt index 21d09e7c..e02a6644 100644 --- a/app/src/main/java/sopt/mottivoo/util/ContentUriRequestBody.kt +++ b/app/src/main/java/sopt/motivoo/util/ContentUriRequestBody.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.util +package sopt.motivoo.util import android.content.Context import android.net.Uri diff --git a/app/src/main/java/sopt/mottivoo/util/Event.kt b/app/src/main/java/sopt/motivoo/util/Event.kt similarity index 92% rename from app/src/main/java/sopt/mottivoo/util/Event.kt rename to app/src/main/java/sopt/motivoo/util/Event.kt index e62b326e..51720fe6 100644 --- a/app/src/main/java/sopt/mottivoo/util/Event.kt +++ b/app/src/main/java/sopt/motivoo/util/Event.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.util +package sopt.motivoo.util open class Event(private val content: T) { var hasBeenHandled = false diff --git a/app/src/main/java/sopt/mottivoo/util/EventObserver.kt b/app/src/main/java/sopt/motivoo/util/EventObserver.kt similarity index 91% rename from app/src/main/java/sopt/mottivoo/util/EventObserver.kt rename to app/src/main/java/sopt/motivoo/util/EventObserver.kt index a0045f69..26fefe54 100644 --- a/app/src/main/java/sopt/mottivoo/util/EventObserver.kt +++ b/app/src/main/java/sopt/motivoo/util/EventObserver.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.util +package sopt.motivoo.util import androidx.lifecycle.Observer diff --git a/app/src/main/java/sopt/mottivoo/util/FindStartDestination.kt b/app/src/main/java/sopt/motivoo/util/FindStartDestination.kt similarity index 95% rename from app/src/main/java/sopt/mottivoo/util/FindStartDestination.kt rename to app/src/main/java/sopt/motivoo/util/FindStartDestination.kt index 5280f64d..ff970667 100644 --- a/app/src/main/java/sopt/mottivoo/util/FindStartDestination.kt +++ b/app/src/main/java/sopt/motivoo/util/FindStartDestination.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.util +package sopt.motivoo.util import androidx.navigation.NavController import androidx.navigation.NavDestination diff --git a/app/src/main/java/sopt/mottivoo/util/NavigationDecider.kt b/app/src/main/java/sopt/motivoo/util/NavigationDecider.kt similarity index 94% rename from app/src/main/java/sopt/mottivoo/util/NavigationDecider.kt rename to app/src/main/java/sopt/motivoo/util/NavigationDecider.kt index 039daec9..5ffb7a20 100644 --- a/app/src/main/java/sopt/mottivoo/util/NavigationDecider.kt +++ b/app/src/main/java/sopt/motivoo/util/NavigationDecider.kt @@ -1,6 +1,6 @@ -package sopt.mottivoo.util +package sopt.motivoo.util -import sopt.mottivoo.domain.entity.MotivooStorage +import sopt.motivoo.domain.entity.MotivooStorage import javax.inject.Inject class NavigationDecider @Inject constructor( diff --git a/app/src/main/java/sopt/mottivoo/util/NetworkState.kt b/app/src/main/java/sopt/motivoo/util/NetworkState.kt similarity index 98% rename from app/src/main/java/sopt/mottivoo/util/NetworkState.kt rename to app/src/main/java/sopt/motivoo/util/NetworkState.kt index 27840ab8..11c4a997 100644 --- a/app/src/main/java/sopt/mottivoo/util/NetworkState.kt +++ b/app/src/main/java/sopt/motivoo/util/NetworkState.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.util +package sopt.motivoo.util import android.content.Context import android.net.ConnectivityManager diff --git a/app/src/main/java/sopt/mottivoo/util/UiState.kt b/app/src/main/java/sopt/motivoo/util/UiState.kt similarity index 95% rename from app/src/main/java/sopt/mottivoo/util/UiState.kt rename to app/src/main/java/sopt/motivoo/util/UiState.kt index f90a3cc7..29a947d4 100644 --- a/app/src/main/java/sopt/mottivoo/util/UiState.kt +++ b/app/src/main/java/sopt/motivoo/util/UiState.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.util +package sopt.motivoo.util sealed interface UiState { object Empty : UiState diff --git a/app/src/main/java/sopt/mottivoo/util/UriManager.kt b/app/src/main/java/sopt/motivoo/util/UriManager.kt similarity index 97% rename from app/src/main/java/sopt/mottivoo/util/UriManager.kt rename to app/src/main/java/sopt/motivoo/util/UriManager.kt index fafdc374..686e6ac0 100644 --- a/app/src/main/java/sopt/mottivoo/util/UriManager.kt +++ b/app/src/main/java/sopt/motivoo/util/UriManager.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.util +package sopt.motivoo.util import android.content.ContentValues import android.content.Context diff --git a/app/src/main/java/sopt/mottivoo/util/binding/BindingAdapter.kt b/app/src/main/java/sopt/motivoo/util/binding/BindingAdapter.kt similarity index 95% rename from app/src/main/java/sopt/mottivoo/util/binding/BindingAdapter.kt rename to app/src/main/java/sopt/motivoo/util/binding/BindingAdapter.kt index e7c0568e..11544445 100644 --- a/app/src/main/java/sopt/mottivoo/util/binding/BindingAdapter.kt +++ b/app/src/main/java/sopt/motivoo/util/binding/BindingAdapter.kt @@ -1,11 +1,11 @@ -package sopt.mottivoo.util.binding +package sopt.motivoo.util.binding import android.view.View import androidx.core.content.ContextCompat import androidx.databinding.BindingAdapter import com.android.motivoo_design.MotivooOtherPieChart import com.android.motivoo_design.MotivooPieChart -import sopt.mottivoo.R +import sopt.motivoo.R object BindingAdapter { @JvmStatic diff --git a/app/src/main/java/sopt/mottivoo/util/binding/BindingBottomSheetDialogFragment.kt b/app/src/main/java/sopt/motivoo/util/binding/BindingBottomSheetDialogFragment.kt similarity index 94% rename from app/src/main/java/sopt/mottivoo/util/binding/BindingBottomSheetDialogFragment.kt rename to app/src/main/java/sopt/motivoo/util/binding/BindingBottomSheetDialogFragment.kt index 628c5efa..20f07677 100644 --- a/app/src/main/java/sopt/mottivoo/util/binding/BindingBottomSheetDialogFragment.kt +++ b/app/src/main/java/sopt/motivoo/util/binding/BindingBottomSheetDialogFragment.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.util.binding +package sopt.motivoo.util.binding import android.os.Bundle import android.view.LayoutInflater @@ -8,7 +8,7 @@ import androidx.annotation.LayoutRes import androidx.databinding.DataBindingUtil import androidx.databinding.ViewDataBinding import com.google.android.material.bottomsheet.BottomSheetDialogFragment -import sopt.mottivoo.R +import sopt.motivoo.R abstract class BindingBottomSheetDialogFragment(@LayoutRes private val layoutResId: Int) : BottomSheetDialogFragment() { diff --git a/app/src/main/java/sopt/mottivoo/util/binding/BindingDialogFragment.kt b/app/src/main/java/sopt/motivoo/util/binding/BindingDialogFragment.kt similarity index 96% rename from app/src/main/java/sopt/mottivoo/util/binding/BindingDialogFragment.kt rename to app/src/main/java/sopt/motivoo/util/binding/BindingDialogFragment.kt index 5dcd55d1..1755c12a 100644 --- a/app/src/main/java/sopt/mottivoo/util/binding/BindingDialogFragment.kt +++ b/app/src/main/java/sopt/motivoo/util/binding/BindingDialogFragment.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.util.binding +package sopt.motivoo.util.binding import android.graphics.Color import android.graphics.drawable.ColorDrawable @@ -10,7 +10,7 @@ import androidx.annotation.LayoutRes import androidx.databinding.DataBindingUtil import androidx.databinding.ViewDataBinding import androidx.fragment.app.DialogFragment -import sopt.mottivoo.R +import sopt.motivoo.R abstract class BindingDialogFragment( @LayoutRes private val layoutRes: Int, diff --git a/app/src/main/java/sopt/mottivoo/util/binding/BindingFragment.kt b/app/src/main/java/sopt/motivoo/util/binding/BindingFragment.kt similarity index 94% rename from app/src/main/java/sopt/mottivoo/util/binding/BindingFragment.kt rename to app/src/main/java/sopt/motivoo/util/binding/BindingFragment.kt index e0aff6f8..ec73d207 100644 --- a/app/src/main/java/sopt/mottivoo/util/binding/BindingFragment.kt +++ b/app/src/main/java/sopt/motivoo/util/binding/BindingFragment.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.util.binding +package sopt.motivoo.util.binding import android.os.Bundle import android.view.LayoutInflater @@ -8,7 +8,7 @@ import androidx.annotation.LayoutRes import androidx.databinding.DataBindingUtil import androidx.databinding.ViewDataBinding import androidx.fragment.app.Fragment -import sopt.mottivoo.R +import sopt.motivoo.R abstract class BindingFragment( @LayoutRes private val layoutRes: Int, diff --git a/app/src/main/java/sopt/mottivoo/util/extension/ActivityExt.kt b/app/src/main/java/sopt/motivoo/util/extension/ActivityExt.kt similarity index 87% rename from app/src/main/java/sopt/mottivoo/util/extension/ActivityExt.kt rename to app/src/main/java/sopt/motivoo/util/extension/ActivityExt.kt index 194862bf..b62c2cc2 100644 --- a/app/src/main/java/sopt/mottivoo/util/extension/ActivityExt.kt +++ b/app/src/main/java/sopt/motivoo/util/extension/ActivityExt.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.util.extension +package sopt.motivoo.util.extension import android.app.Activity import android.content.Intent diff --git a/app/src/main/java/sopt/mottivoo/util/extension/BlurEffectExtensions.kt b/app/src/main/java/sopt/motivoo/util/extension/BlurEffectExtensions.kt similarity index 94% rename from app/src/main/java/sopt/mottivoo/util/extension/BlurEffectExtensions.kt rename to app/src/main/java/sopt/motivoo/util/extension/BlurEffectExtensions.kt index 601df115..d560a907 100644 --- a/app/src/main/java/sopt/mottivoo/util/extension/BlurEffectExtensions.kt +++ b/app/src/main/java/sopt/motivoo/util/extension/BlurEffectExtensions.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.util.extension +package sopt.motivoo.util.extension import android.graphics.RenderEffect import android.graphics.Shader diff --git a/app/src/main/java/sopt/mottivoo/util/extension/ContextExt.kt b/app/src/main/java/sopt/motivoo/util/extension/ContextExt.kt similarity index 97% rename from app/src/main/java/sopt/mottivoo/util/extension/ContextExt.kt rename to app/src/main/java/sopt/motivoo/util/extension/ContextExt.kt index 9edf3d99..ef51fe4e 100644 --- a/app/src/main/java/sopt/mottivoo/util/extension/ContextExt.kt +++ b/app/src/main/java/sopt/motivoo/util/extension/ContextExt.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.util.extension +package sopt.motivoo.util.extension import android.app.Activity import android.app.Notification @@ -23,8 +23,8 @@ import androidx.core.content.ContextCompat import coil.Coil import coil.request.ImageRequest import com.google.android.material.snackbar.Snackbar -import sopt.mottivoo.R -import sopt.mottivoo.presentation.MainActivity +import sopt.motivoo.R +import sopt.motivoo.presentation.MainActivity private const val NOTIFICATION_ID = 0 diff --git a/app/src/main/java/sopt/mottivoo/util/extension/FontExt.kt b/app/src/main/java/sopt/motivoo/util/extension/FontExt.kt similarity index 76% rename from app/src/main/java/sopt/mottivoo/util/extension/FontExt.kt rename to app/src/main/java/sopt/motivoo/util/extension/FontExt.kt index 14c2a928..1a38e169 100644 --- a/app/src/main/java/sopt/mottivoo/util/extension/FontExt.kt +++ b/app/src/main/java/sopt/motivoo/util/extension/FontExt.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.util.extension +package sopt.motivoo.util.extension import android.content.res.Resources diff --git a/app/src/main/java/sopt/mottivoo/util/extension/ItemDiffCallback.kt b/app/src/main/java/sopt/motivoo/util/extension/ItemDiffCallback.kt similarity index 91% rename from app/src/main/java/sopt/mottivoo/util/extension/ItemDiffCallback.kt rename to app/src/main/java/sopt/motivoo/util/extension/ItemDiffCallback.kt index 738807c3..e1de404c 100644 --- a/app/src/main/java/sopt/mottivoo/util/extension/ItemDiffCallback.kt +++ b/app/src/main/java/sopt/motivoo/util/extension/ItemDiffCallback.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.util.extension +package sopt.motivoo.util.extension import androidx.recyclerview.widget.DiffUtil diff --git a/app/src/main/java/sopt/mottivoo/util/extension/LocalDate.kt b/app/src/main/java/sopt/motivoo/util/extension/LocalDate.kt similarity index 86% rename from app/src/main/java/sopt/mottivoo/util/extension/LocalDate.kt rename to app/src/main/java/sopt/motivoo/util/extension/LocalDate.kt index 0d20b1bc..61dbfa7b 100644 --- a/app/src/main/java/sopt/mottivoo/util/extension/LocalDate.kt +++ b/app/src/main/java/sopt/motivoo/util/extension/LocalDate.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.util.extension +package sopt.motivoo.util.extension import java.time.LocalDate diff --git a/app/src/main/java/sopt/mottivoo/util/extension/MediatorLiveDataExt.kt b/app/src/main/java/sopt/motivoo/util/extension/MediatorLiveDataExt.kt similarity index 88% rename from app/src/main/java/sopt/mottivoo/util/extension/MediatorLiveDataExt.kt rename to app/src/main/java/sopt/motivoo/util/extension/MediatorLiveDataExt.kt index 2ab9d0fc..d53f4d13 100644 --- a/app/src/main/java/sopt/mottivoo/util/extension/MediatorLiveDataExt.kt +++ b/app/src/main/java/sopt/motivoo/util/extension/MediatorLiveDataExt.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.util.extension +package sopt.motivoo.util.extension import androidx.lifecycle.MediatorLiveData import androidx.lifecycle.MutableLiveData diff --git a/app/src/main/java/sopt/mottivoo/util/extension/ParcelableExt.kt b/app/src/main/java/sopt/motivoo/util/extension/ParcelableExt.kt similarity index 93% rename from app/src/main/java/sopt/mottivoo/util/extension/ParcelableExt.kt rename to app/src/main/java/sopt/motivoo/util/extension/ParcelableExt.kt index 900622b7..e0b718e3 100644 --- a/app/src/main/java/sopt/mottivoo/util/extension/ParcelableExt.kt +++ b/app/src/main/java/sopt/motivoo/util/extension/ParcelableExt.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.util.extension +package sopt.motivoo.util.extension import android.content.Intent import android.os.Build diff --git a/app/src/main/java/sopt/mottivoo/util/extension/ViewExt.kt b/app/src/main/java/sopt/motivoo/util/extension/ViewExt.kt similarity index 92% rename from app/src/main/java/sopt/mottivoo/util/extension/ViewExt.kt rename to app/src/main/java/sopt/motivoo/util/extension/ViewExt.kt index 0712c391..f19a33b0 100644 --- a/app/src/main/java/sopt/mottivoo/util/extension/ViewExt.kt +++ b/app/src/main/java/sopt/motivoo/util/extension/ViewExt.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo.util.extension +package sopt.motivoo.util.extension import android.view.View diff --git a/app/src/main/java/sopt/mottivoo/domain/repository/AuthRepository.kt b/app/src/main/java/sopt/mottivoo/domain/repository/AuthRepository.kt deleted file mode 100644 index d0888522..00000000 --- a/app/src/main/java/sopt/mottivoo/domain/repository/AuthRepository.kt +++ /dev/null @@ -1,16 +0,0 @@ -package sopt.mottivoo.domain.repository - -import retrofit2.http.Body -import sopt.mottivoo.data.model.request.auth.RequestLoginDto -import sopt.mottivoo.data.model.response.auth.ResponseLogoutDto -import sopt.mottivoo.data.model.response.auth.ResponseWithDrawDto -import sopt.mottivoo.domain.entity.auth.LoginInfo - -interface AuthRepository { - - suspend fun postLogin(@Body requestLoginDto: RequestLoginDto): Result - - suspend fun postLogout(): Result - - suspend fun deleteWithDraw(): Result -} diff --git a/app/src/main/java/sopt/mottivoo/domain/repository/DummyRepository.kt b/app/src/main/java/sopt/mottivoo/domain/repository/DummyRepository.kt deleted file mode 100644 index f3cb3462..00000000 --- a/app/src/main/java/sopt/mottivoo/domain/repository/DummyRepository.kt +++ /dev/null @@ -1,9 +0,0 @@ -package sopt.mottivoo.domain.repository - -import sopt.mottivoo.data.model.request.DummyRequestData -import sopt.mottivoo.domain.entity.dummy.DummyInfoList - -interface DummyRepository { - - suspend fun postDummyData(dummyRequestData: DummyRequestData): Result -} diff --git a/app/src/main/java/sopt/mottivoo/domain/repository/MyPageRepository.kt b/app/src/main/java/sopt/mottivoo/domain/repository/MyPageRepository.kt deleted file mode 100644 index 8c3e9ddc..00000000 --- a/app/src/main/java/sopt/mottivoo/domain/repository/MyPageRepository.kt +++ /dev/null @@ -1,8 +0,0 @@ -package sopt.mottivoo.domain.repository - -import sopt.mottivoo.data.model.response.ResponseMyPageDto - -interface MyPageRepository { - - suspend fun getUserInfo(): Result -} diff --git a/app/src/main/java/sopt/mottivoo/domain/repository/OnboardingRepository.kt b/app/src/main/java/sopt/mottivoo/domain/repository/OnboardingRepository.kt deleted file mode 100644 index 5e8575c0..00000000 --- a/app/src/main/java/sopt/mottivoo/domain/repository/OnboardingRepository.kt +++ /dev/null @@ -1,20 +0,0 @@ -package sopt.mottivoo.domain.repository - -import retrofit2.http.Body -import sopt.mottivoo.data.model.request.onboarding.RequestOnboardingDto -import sopt.mottivoo.data.model.request.onboarding.RequestPostInviteCodeDto -import sopt.mottivoo.data.model.response.onboarding.ResponseOnboardingDto -import sopt.mottivoo.domain.entity.onboarding.GetMatchedInfo -import sopt.mottivoo.domain.entity.onboarding.InviteCodeInfo -import sopt.mottivoo.domain.entity.onboarding.MatchedInfo - -interface OnboardingRepository { - - suspend fun postOnboardingInfo(@Body requestOnboardingDto: RequestOnboardingDto): Result - - suspend fun getInviteCode(): Result - - suspend fun patchInviteCode(requestPostInviteCodeDto: RequestPostInviteCodeDto): Result - - suspend fun getMatchedResult(): Result -} diff --git a/app/src/main/java/sopt/mottivoo/presentation/type/SocialType.kt b/app/src/main/java/sopt/mottivoo/presentation/type/SocialType.kt deleted file mode 100644 index 8d7d61be..00000000 --- a/app/src/main/java/sopt/mottivoo/presentation/type/SocialType.kt +++ /dev/null @@ -1,5 +0,0 @@ -package sopt.mottivoo.presentation.type - -enum class SocialType { - kakao -} diff --git a/app/src/main/res/layout/fragment_age_qusetion.xml b/app/src/main/res/layout/fragment_age_qusetion.xml index 48522a03..74530e67 100644 --- a/app/src/main/res/layout/fragment_age_qusetion.xml +++ b/app/src/main/res/layout/fragment_age_qusetion.xml @@ -4,11 +4,11 @@ - + + type="sopt.motivoo.presentation.onboarding.OnboardingViewModel" /> diff --git a/app/src/main/res/layout/fragment_do_exercise_question.xml b/app/src/main/res/layout/fragment_do_exercise_question.xml index a1b8a74b..471487ce 100644 --- a/app/src/main/res/layout/fragment_do_exercise_question.xml +++ b/app/src/main/res/layout/fragment_do_exercise_question.xml @@ -4,11 +4,11 @@ - + + type="sopt.motivoo.presentation.onboarding.OnboardingViewModel" /> diff --git a/app/src/main/res/layout/fragment_frequency_qusetion.xml b/app/src/main/res/layout/fragment_frequency_qusetion.xml index 11e61612..6cec1014 100644 --- a/app/src/main/res/layout/fragment_frequency_qusetion.xml +++ b/app/src/main/res/layout/fragment_frequency_qusetion.xml @@ -4,11 +4,11 @@ - + + type="sopt.motivoo.presentation.onboarding.OnboardingViewModel" /> diff --git a/app/src/main/res/layout/fragment_get_invite_code.xml b/app/src/main/res/layout/fragment_get_invite_code.xml index b283d875..63cd4de6 100644 --- a/app/src/main/res/layout/fragment_get_invite_code.xml +++ b/app/src/main/res/layout/fragment_get_invite_code.xml @@ -7,7 +7,7 @@ + type="sopt.motivoo.presentation.invitecode.GetInviteCodeViewModel" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index cba22668..30281d62 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -9,7 +9,7 @@ + type="sopt.motivoo.presentation.home.viewmodel.HomeViewModel" /> + type="sopt.motivoo.presentation.invitecode.PostInviteCodeViewModel" /> diff --git a/app/src/main/res/layout/fragment_sore_spot_qusetion.xml b/app/src/main/res/layout/fragment_sore_spot_qusetion.xml index bac46f5e..3b187650 100644 --- a/app/src/main/res/layout/fragment_sore_spot_qusetion.xml +++ b/app/src/main/res/layout/fragment_sore_spot_qusetion.xml @@ -4,11 +4,11 @@ - + + type="sopt.motivoo.presentation.onboarding.OnboardingViewModel" /> diff --git a/app/src/main/res/layout/fragment_terms_of_use.xml b/app/src/main/res/layout/fragment_terms_of_use.xml index c4b7baf8..415ef251 100644 --- a/app/src/main/res/layout/fragment_terms_of_use.xml +++ b/app/src/main/res/layout/fragment_terms_of_use.xml @@ -6,7 +6,7 @@ + type="sopt.motivoo.presentation.intro.TermsOfUseViewModel" /> diff --git a/app/src/main/res/layout/fragment_time_qusetion.xml b/app/src/main/res/layout/fragment_time_qusetion.xml index f541e7a2..d195362c 100644 --- a/app/src/main/res/layout/fragment_time_qusetion.xml +++ b/app/src/main/res/layout/fragment_time_qusetion.xml @@ -4,11 +4,11 @@ - + + type="sopt.motivoo.presentation.onboarding.OnboardingViewModel" /> diff --git a/app/src/main/res/layout/fragment_what_activity_question.xml b/app/src/main/res/layout/fragment_what_activity_question.xml index c8a5bcea..12e46a3b 100644 --- a/app/src/main/res/layout/fragment_what_activity_question.xml +++ b/app/src/main/res/layout/fragment_what_activity_question.xml @@ -4,11 +4,11 @@ - + + type="sopt.motivoo.presentation.onboarding.OnboardingViewModel" /> diff --git a/app/src/main/res/layout/fragment_what_exercise_qusetion.xml b/app/src/main/res/layout/fragment_what_exercise_qusetion.xml index a77c601f..34ea6169 100644 --- a/app/src/main/res/layout/fragment_what_exercise_qusetion.xml +++ b/app/src/main/res/layout/fragment_what_exercise_qusetion.xml @@ -4,11 +4,11 @@ - + + type="sopt.motivoo.presentation.onboarding.OnboardingViewModel" /> diff --git a/app/src/main/res/layout/view_do_exercise_button.xml b/app/src/main/res/layout/view_do_exercise_button.xml index e2af0203..c1408c7d 100644 --- a/app/src/main/res/layout/view_do_exercise_button.xml +++ b/app/src/main/res/layout/view_do_exercise_button.xml @@ -7,7 +7,7 @@ + type="sopt.motivoo.presentation.type.DoExerciseType" /> + type="sopt.motivoo.presentation.type.FrequencyType" /> + type="sopt.motivoo.presentation.type.SoreSpotType" /> + type="sopt.motivoo.presentation.type.TimeType" /> + type="sopt.motivoo.presentation.type.UserType" /> + type="sopt.motivoo.presentation.type.WhatActivityType" /> + type="sopt.motivoo.presentation.type.WhatExerciseType" /> + app:argType="sopt.motivoo.presentation.type.DoExerciseType" /> + app:argType="sopt.motivoo.presentation.type.DoExerciseType" /> \ No newline at end of file diff --git a/app/src/test/java/sopt/mottivoo/ExampleUnitTest.kt b/app/src/test/java/sopt/motivoo/ExampleUnitTest.kt similarity index 93% rename from app/src/test/java/sopt/mottivoo/ExampleUnitTest.kt rename to app/src/test/java/sopt/motivoo/ExampleUnitTest.kt index e12396a7..0ae3c330 100644 --- a/app/src/test/java/sopt/mottivoo/ExampleUnitTest.kt +++ b/app/src/test/java/sopt/motivoo/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package sopt.mottivoo +package sopt.motivoo import org.junit.Assert.assertEquals import org.junit.Test