diff --git a/app/build.gradle b/app/build.gradle index 173c4b37..9a31f76d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,7 +10,7 @@ android { buildToolsVersion ConfigData.buildToolsVersion defaultConfig { - applicationId "com.scents.note" + applicationId "com.scentsnote.android" minSdkVersion ConfigData.minSdkVersion targetSdkVersion ConfigData.targetSdkVersion versionCode ConfigData.versionCode diff --git a/app/src/androidTest/java/com/scents/note/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/scentsnote/android/ExampleInstrumentedTest.kt similarity index 95% rename from app/src/androidTest/java/com/scents/note/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/com/scentsnote/android/ExampleInstrumentedTest.kt index 2928d0ee..cf6a6322 100644 --- a/app/src/androidTest/java/com/scents/note/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/com/scentsnote/android/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.scents.note +package com.scentsnote.android import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 diff --git a/app/src/androidTest/java/com/scents/note/data/remote/network/ScentsNoteServiceImplTest.kt b/app/src/androidTest/java/com/scentsnote/android/data/remote/network/ScentsNoteServiceImplTest.kt similarity index 98% rename from app/src/androidTest/java/com/scents/note/data/remote/network/ScentsNoteServiceImplTest.kt rename to app/src/androidTest/java/com/scentsnote/android/data/remote/network/ScentsNoteServiceImplTest.kt index 44bd9f0f..af5864db 100644 --- a/app/src/androidTest/java/com/scents/note/data/remote/network/ScentsNoteServiceImplTest.kt +++ b/app/src/androidTest/java/com/scentsnote/android/data/remote/network/ScentsNoteServiceImplTest.kt @@ -1,8 +1,8 @@ -package com.scents.note.data.remote.network +package com.scentsnote.android.data.remote.network import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry -import com.scents.note.data.vo.request.RequestLogin +import com.scentsnote.android.data.vo.request.RequestLogin import kotlinx.coroutines.runBlocking import org.junit.Assert import org.junit.Before diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fed98ad0..36c05b77 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,12 +1,12 @@ + package="com.scentsnote.android"> - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/scents/note/ScentsNoteApplication.kt b/app/src/main/java/com/scentsnote/android/ScentsNoteApplication.kt similarity index 85% rename from app/src/main/java/com/scents/note/ScentsNoteApplication.kt rename to app/src/main/java/com/scentsnote/android/ScentsNoteApplication.kt index 3aee5f5b..a084acd9 100644 --- a/app/src/main/java/com/scents/note/ScentsNoteApplication.kt +++ b/app/src/main/java/com/scentsnote/android/ScentsNoteApplication.kt @@ -1,9 +1,9 @@ -package com.scents.note +package com.scentsnote.android import android.app.Application import android.content.Context import androidx.appcompat.app.AppCompatDelegate -import com.scents.note.data.local.preference.SharedPreferencesManager +import com.scentsnote.android.data.local.preference.SharedPreferencesManager class ScentsNoteApplication : Application() { diff --git a/app/src/main/java/com/scents/note/data/local/preference/SharedPreferencesManager.kt b/app/src/main/java/com/scentsnote/android/data/local/preference/SharedPreferencesManager.kt similarity index 96% rename from app/src/main/java/com/scents/note/data/local/preference/SharedPreferencesManager.kt rename to app/src/main/java/com/scentsnote/android/data/local/preference/SharedPreferencesManager.kt index 382ebbc1..b55508c6 100644 --- a/app/src/main/java/com/scents/note/data/local/preference/SharedPreferencesManager.kt +++ b/app/src/main/java/com/scentsnote/android/data/local/preference/SharedPreferencesManager.kt @@ -1,10 +1,10 @@ -package com.scents.note.data.local.preference +package com.scentsnote.android.data.local.preference import android.content.Context import android.content.SharedPreferences import androidx.annotation.CallSuper import androidx.core.content.edit -import com.scents.note.ScentsNoteApplication +import com.scentsnote.android.ScentsNoteApplication class SharedPreferencesManager (context: Context){ private val sharedPreferences : SharedPreferences = context.getSharedPreferences(PREFERENCES_KEY, Context.MODE_PRIVATE) diff --git a/app/src/main/java/com/scents/note/data/remote/RemoteDataSource.kt b/app/src/main/java/com/scentsnote/android/data/remote/RemoteDataSource.kt similarity index 93% rename from app/src/main/java/com/scents/note/data/remote/RemoteDataSource.kt rename to app/src/main/java/com/scentsnote/android/data/remote/RemoteDataSource.kt index b6bd0238..ccbe1680 100644 --- a/app/src/main/java/com/scents/note/data/remote/RemoteDataSource.kt +++ b/app/src/main/java/com/scentsnote/android/data/remote/RemoteDataSource.kt @@ -1,7 +1,7 @@ -package com.scents.note.data.remote +package com.scentsnote.android.data.remote -import com.scents.note.data.vo.request.* -import com.scents.note.data.vo.response.* +import com.scentsnote.android.data.vo.request.* +import com.scentsnote.android.data.vo.response.* interface RemoteDataSource { suspend fun getValidateEmail(email : String): Boolean diff --git a/app/src/main/java/com/scents/note/data/remote/RemoteDataSourceImpl.kt b/app/src/main/java/com/scentsnote/android/data/remote/RemoteDataSourceImpl.kt similarity index 95% rename from app/src/main/java/com/scents/note/data/remote/RemoteDataSourceImpl.kt rename to app/src/main/java/com/scentsnote/android/data/remote/RemoteDataSourceImpl.kt index dd6f3f1a..9316315a 100644 --- a/app/src/main/java/com/scents/note/data/remote/RemoteDataSourceImpl.kt +++ b/app/src/main/java/com/scentsnote/android/data/remote/RemoteDataSourceImpl.kt @@ -1,9 +1,9 @@ -package com.scents.note.data.remote +package com.scentsnote.android.data.remote import android.util.Log -import com.scents.note.data.remote.network.ScentsNoteServiceImpl -import com.scents.note.data.vo.request.* -import com.scents.note.data.vo.response.* +import com.scentsnote.android.data.remote.network.ScentsNoteServiceImpl +import com.scentsnote.android.data.vo.request.* +import com.scentsnote.android.data.vo.response.* class RemoteDataSourceImpl : RemoteDataSource{ val api = ScentsNoteServiceImpl.service diff --git a/app/src/main/java/com/scents/note/data/remote/network/NetworkInterceptor.kt b/app/src/main/java/com/scentsnote/android/data/remote/network/NetworkInterceptor.kt similarity index 75% rename from app/src/main/java/com/scents/note/data/remote/network/NetworkInterceptor.kt rename to app/src/main/java/com/scentsnote/android/data/remote/network/NetworkInterceptor.kt index 1f3b4f02..a9222cc5 100644 --- a/app/src/main/java/com/scents/note/data/remote/network/NetworkInterceptor.kt +++ b/app/src/main/java/com/scentsnote/android/data/remote/network/NetworkInterceptor.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.remote.network +package com.scentsnote.android.data.remote.network //class NetworkInterceptor : Interceptor { // override fun intercept(chain: Interceptor.Chain): Response { diff --git a/app/src/main/java/com/scents/note/data/remote/network/ScentsNoteService.kt b/app/src/main/java/com/scentsnote/android/data/remote/network/ScentsNoteService.kt similarity index 97% rename from app/src/main/java/com/scents/note/data/remote/network/ScentsNoteService.kt rename to app/src/main/java/com/scentsnote/android/data/remote/network/ScentsNoteService.kt index c1829765..4be66c9e 100644 --- a/app/src/main/java/com/scents/note/data/remote/network/ScentsNoteService.kt +++ b/app/src/main/java/com/scentsnote/android/data/remote/network/ScentsNoteService.kt @@ -1,7 +1,7 @@ -package com.scents.note.data.remote.network +package com.scentsnote.android.data.remote.network -import com.scents.note.data.vo.request.* -import com.scents.note.data.vo.response.* +import com.scentsnote.android.data.vo.request.* +import com.scentsnote.android.data.vo.response.* import io.reactivex.Single import retrofit2.http.* diff --git a/app/src/main/java/com/scents/note/data/remote/network/ScentsNoteServiceImpl.kt b/app/src/main/java/com/scentsnote/android/data/remote/network/ScentsNoteServiceImpl.kt similarity index 93% rename from app/src/main/java/com/scents/note/data/remote/network/ScentsNoteServiceImpl.kt rename to app/src/main/java/com/scentsnote/android/data/remote/network/ScentsNoteServiceImpl.kt index 76416c21..5a561cc3 100644 --- a/app/src/main/java/com/scents/note/data/remote/network/ScentsNoteServiceImpl.kt +++ b/app/src/main/java/com/scentsnote/android/data/remote/network/ScentsNoteServiceImpl.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.remote.network +package com.scentsnote.android.data.remote.network import retrofit2.Retrofit import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory diff --git a/app/src/main/java/com/scents/note/data/repository/EditMyInfoRepository.kt b/app/src/main/java/com/scentsnote/android/data/repository/EditMyInfoRepository.kt similarity index 53% rename from app/src/main/java/com/scents/note/data/repository/EditMyInfoRepository.kt rename to app/src/main/java/com/scentsnote/android/data/repository/EditMyInfoRepository.kt index 76512a0a..b6a11c5a 100644 --- a/app/src/main/java/com/scents/note/data/repository/EditMyInfoRepository.kt +++ b/app/src/main/java/com/scentsnote/android/data/repository/EditMyInfoRepository.kt @@ -1,9 +1,9 @@ -package com.scents.note.data.repository +package com.scentsnote.android.data.repository -import com.scents.note.data.remote.RemoteDataSource -import com.scents.note.data.remote.RemoteDataSourceImpl -import com.scents.note.data.vo.request.RequestEditMyInfo -import com.scents.note.data.vo.request.RequestEditPassword +import com.scentsnote.android.data.remote.RemoteDataSource +import com.scentsnote.android.data.remote.RemoteDataSourceImpl +import com.scentsnote.android.data.vo.request.RequestEditMyInfo +import com.scentsnote.android.data.vo.request.RequestEditPassword class EditMyInfoRepository { val remoteDataSource: RemoteDataSource = RemoteDataSourceImpl() diff --git a/app/src/main/java/com/scents/note/data/repository/FilterRepository.kt b/app/src/main/java/com/scentsnote/android/data/repository/FilterRepository.kt similarity index 62% rename from app/src/main/java/com/scents/note/data/repository/FilterRepository.kt rename to app/src/main/java/com/scentsnote/android/data/repository/FilterRepository.kt index fb5f8516..4a06edd5 100644 --- a/app/src/main/java/com/scents/note/data/repository/FilterRepository.kt +++ b/app/src/main/java/com/scentsnote/android/data/repository/FilterRepository.kt @@ -1,7 +1,7 @@ -package com.scents.note.data.repository +package com.scentsnote.android.data.repository -import com.scents.note.data.remote.RemoteDataSource -import com.scents.note.data.remote.RemoteDataSourceImpl +import com.scentsnote.android.data.remote.RemoteDataSource +import com.scentsnote.android.data.remote.RemoteDataSourceImpl class FilterRepository { val remoteDataSource: RemoteDataSource = RemoteDataSourceImpl() diff --git a/app/src/main/java/com/scents/note/data/repository/HomeRepository.kt b/app/src/main/java/com/scentsnote/android/data/repository/HomeRepository.kt similarity index 69% rename from app/src/main/java/com/scents/note/data/repository/HomeRepository.kt rename to app/src/main/java/com/scentsnote/android/data/repository/HomeRepository.kt index 42e6bd45..97e7dfbf 100644 --- a/app/src/main/java/com/scents/note/data/repository/HomeRepository.kt +++ b/app/src/main/java/com/scentsnote/android/data/repository/HomeRepository.kt @@ -1,9 +1,9 @@ -package com.scents.note.data.repository +package com.scentsnote.android.data.repository -import com.scents.note.data.remote.RemoteDataSource -import com.scents.note.data.remote.RemoteDataSourceImpl -import com.scents.note.data.remote.network.ScentsNoteServiceImpl -import com.scents.note.data.vo.response.ResponseBase +import com.scentsnote.android.data.remote.RemoteDataSource +import com.scentsnote.android.data.remote.RemoteDataSourceImpl +import com.scentsnote.android.data.remote.network.ScentsNoteServiceImpl +import com.scentsnote.android.data.vo.response.ResponseBase import io.reactivex.Single class HomeRepository { diff --git a/app/src/main/java/com/scents/note/data/repository/MyRepository.kt b/app/src/main/java/com/scentsnote/android/data/repository/MyRepository.kt similarity index 62% rename from app/src/main/java/com/scents/note/data/repository/MyRepository.kt rename to app/src/main/java/com/scentsnote/android/data/repository/MyRepository.kt index 39619f37..272a0779 100644 --- a/app/src/main/java/com/scents/note/data/repository/MyRepository.kt +++ b/app/src/main/java/com/scentsnote/android/data/repository/MyRepository.kt @@ -1,7 +1,7 @@ -package com.scents.note.data.repository +package com.scentsnote.android.data.repository -import com.scents.note.data.remote.RemoteDataSource -import com.scents.note.data.remote.RemoteDataSourceImpl +import com.scentsnote.android.data.remote.RemoteDataSource +import com.scentsnote.android.data.remote.RemoteDataSourceImpl class MyRepository { val remoteDataSource: RemoteDataSource = RemoteDataSourceImpl() diff --git a/app/src/main/java/com/scents/note/data/repository/NoteRepository.kt b/app/src/main/java/com/scentsnote/android/data/repository/NoteRepository.kt similarity index 70% rename from app/src/main/java/com/scents/note/data/repository/NoteRepository.kt rename to app/src/main/java/com/scentsnote/android/data/repository/NoteRepository.kt index 1097cb4d..d6c17dec 100644 --- a/app/src/main/java/com/scents/note/data/repository/NoteRepository.kt +++ b/app/src/main/java/com/scentsnote/android/data/repository/NoteRepository.kt @@ -1,8 +1,8 @@ -package com.scents.note.data.repository +package com.scentsnote.android.data.repository -import com.scents.note.data.remote.RemoteDataSource -import com.scents.note.data.remote.RemoteDataSourceImpl -import com.scents.note.data.vo.request.RequestReview +import com.scentsnote.android.data.remote.RemoteDataSource +import com.scentsnote.android.data.remote.RemoteDataSourceImpl +import com.scentsnote.android.data.vo.request.RequestReview class NoteRepository { val remoteDataSource: RemoteDataSource = RemoteDataSourceImpl() diff --git a/app/src/main/java/com/scents/note/data/repository/PerfumeDetailRepository.kt b/app/src/main/java/com/scentsnote/android/data/repository/PerfumeDetailRepository.kt similarity index 64% rename from app/src/main/java/com/scents/note/data/repository/PerfumeDetailRepository.kt rename to app/src/main/java/com/scentsnote/android/data/repository/PerfumeDetailRepository.kt index 34f5b791..59bae687 100644 --- a/app/src/main/java/com/scents/note/data/repository/PerfumeDetailRepository.kt +++ b/app/src/main/java/com/scentsnote/android/data/repository/PerfumeDetailRepository.kt @@ -1,12 +1,12 @@ -package com.scents.note.data.repository +package com.scentsnote.android.data.repository -import com.scents.note.data.remote.RemoteDataSource -import com.scents.note.data.remote.RemoteDataSourceImpl -import com.scents.note.data.remote.network.ScentsNoteServiceImpl -import com.scents.note.data.vo.request.RequestReportReview -import com.scents.note.data.vo.response.ResponseBase -import com.scents.note.data.vo.response.ResponsePerfumeDetail -import com.scents.note.data.vo.response.ResponsePerfumeDetailWithReviews +import com.scentsnote.android.data.remote.RemoteDataSource +import com.scentsnote.android.data.remote.RemoteDataSourceImpl +import com.scentsnote.android.data.remote.network.ScentsNoteServiceImpl +import com.scentsnote.android.data.vo.request.RequestReportReview +import com.scentsnote.android.data.vo.response.ResponseBase +import com.scentsnote.android.data.vo.response.ResponsePerfumeDetail +import com.scentsnote.android.data.vo.response.ResponsePerfumeDetailWithReviews import io.reactivex.Single class PerfumeDetailRepository { diff --git a/app/src/main/java/com/scents/note/data/repository/SearchRepository.kt b/app/src/main/java/com/scentsnote/android/data/repository/SearchRepository.kt similarity index 53% rename from app/src/main/java/com/scents/note/data/repository/SearchRepository.kt rename to app/src/main/java/com/scentsnote/android/data/repository/SearchRepository.kt index e8e236b6..b6eba3d8 100644 --- a/app/src/main/java/com/scents/note/data/repository/SearchRepository.kt +++ b/app/src/main/java/com/scentsnote/android/data/repository/SearchRepository.kt @@ -1,10 +1,10 @@ -package com.scents.note.data.repository +package com.scentsnote.android.data.repository -import com.scents.note.data.remote.RemoteDataSource -import com.scents.note.data.remote.RemoteDataSourceImpl -import com.scents.note.data.remote.network.ScentsNoteServiceImpl -import com.scents.note.data.vo.request.RequestSearch -import com.scents.note.data.vo.response.ResponseBase +import com.scentsnote.android.data.remote.RemoteDataSource +import com.scentsnote.android.data.remote.RemoteDataSourceImpl +import com.scentsnote.android.data.remote.network.ScentsNoteServiceImpl +import com.scentsnote.android.data.vo.request.RequestSearch +import com.scentsnote.android.data.vo.response.ResponseBase import io.reactivex.Single class SearchRepository { diff --git a/app/src/main/java/com/scents/note/data/repository/SignRepository.kt b/app/src/main/java/com/scentsnote/android/data/repository/SignRepository.kt similarity index 62% rename from app/src/main/java/com/scents/note/data/repository/SignRepository.kt rename to app/src/main/java/com/scentsnote/android/data/repository/SignRepository.kt index 47a68ecc..a0f727d5 100644 --- a/app/src/main/java/com/scents/note/data/repository/SignRepository.kt +++ b/app/src/main/java/com/scentsnote/android/data/repository/SignRepository.kt @@ -1,9 +1,9 @@ -package com.scents.note.data.repository +package com.scentsnote.android.data.repository -import com.scents.note.data.remote.RemoteDataSource -import com.scents.note.data.remote.RemoteDataSourceImpl -import com.scents.note.data.vo.request.RequestLogin -import com.scents.note.data.vo.request.RequestRegister +import com.scentsnote.android.data.remote.RemoteDataSource +import com.scentsnote.android.data.remote.RemoteDataSourceImpl +import com.scentsnote.android.data.vo.request.RequestLogin +import com.scentsnote.android.data.vo.request.RequestRegister class SignRepository { val remoteDataSource: RemoteDataSource = RemoteDataSourceImpl() diff --git a/app/src/main/java/com/scents/note/data/repository/SplashRepository.kt b/app/src/main/java/com/scentsnote/android/data/repository/SplashRepository.kt similarity index 52% rename from app/src/main/java/com/scents/note/data/repository/SplashRepository.kt rename to app/src/main/java/com/scentsnote/android/data/repository/SplashRepository.kt index 4f96171b..d4c1725f 100644 --- a/app/src/main/java/com/scents/note/data/repository/SplashRepository.kt +++ b/app/src/main/java/com/scentsnote/android/data/repository/SplashRepository.kt @@ -1,7 +1,7 @@ -package com.scents.note.data.repository +package com.scentsnote.android.data.repository -import com.scents.note.data.remote.RemoteDataSource -import com.scents.note.data.remote.RemoteDataSourceImpl +import com.scentsnote.android.data.remote.RemoteDataSource +import com.scentsnote.android.data.remote.RemoteDataSourceImpl class SplashRepository { val remoteDataSource: RemoteDataSource = RemoteDataSourceImpl() diff --git a/app/src/main/java/com/scents/note/data/repository/SurveyRepository.kt b/app/src/main/java/com/scentsnote/android/data/repository/SurveyRepository.kt similarity index 61% rename from app/src/main/java/com/scents/note/data/repository/SurveyRepository.kt rename to app/src/main/java/com/scentsnote/android/data/repository/SurveyRepository.kt index 7aff7d89..ec5bd4a9 100644 --- a/app/src/main/java/com/scents/note/data/repository/SurveyRepository.kt +++ b/app/src/main/java/com/scentsnote/android/data/repository/SurveyRepository.kt @@ -1,9 +1,9 @@ -package com.scents.note.data.repository +package com.scentsnote.android.data.repository -import com.scents.note.ScentsNoteApplication -import com.scents.note.data.remote.RemoteDataSource -import com.scents.note.data.remote.RemoteDataSourceImpl -import com.scents.note.data.vo.request.RequestSurvey +import com.scentsnote.android.ScentsNoteApplication +import com.scentsnote.android.data.remote.RemoteDataSource +import com.scentsnote.android.data.remote.RemoteDataSourceImpl +import com.scentsnote.android.data.vo.request.RequestSurvey class SurveyRepository { val remoteDataSource: RemoteDataSource = RemoteDataSourceImpl() diff --git a/app/src/main/java/com/scents/note/data/vo/DetailNoteListData.kt b/app/src/main/java/com/scentsnote/android/data/vo/DetailNoteListData.kt similarity index 83% rename from app/src/main/java/com/scents/note/data/vo/DetailNoteListData.kt rename to app/src/main/java/com/scentsnote/android/data/vo/DetailNoteListData.kt index d176ec03..3a6b751d 100644 --- a/app/src/main/java/com/scents/note/data/vo/DetailNoteListData.kt +++ b/app/src/main/java/com/scentsnote/android/data/vo/DetailNoteListData.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.vo +package com.scentsnote.android.data.vo data class DetailNoteListData( val age: String, diff --git a/app/src/main/java/com/scents/note/data/vo/HomePerfumeListData.kt b/app/src/main/java/com/scentsnote/android/data/vo/HomePerfumeListData.kt similarity index 76% rename from app/src/main/java/com/scents/note/data/vo/HomePerfumeListData.kt rename to app/src/main/java/com/scentsnote/android/data/vo/HomePerfumeListData.kt index a3c2bdeb..2886351d 100644 --- a/app/src/main/java/com/scents/note/data/vo/HomePerfumeListData.kt +++ b/app/src/main/java/com/scentsnote/android/data/vo/HomePerfumeListData.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.vo +package com.scentsnote.android.data.vo data class HomePerfumeListData ( val image: String?, diff --git a/app/src/main/java/com/scents/note/data/vo/NewPerfumeListData.kt b/app/src/main/java/com/scentsnote/android/data/vo/NewPerfumeListData.kt similarity index 82% rename from app/src/main/java/com/scents/note/data/vo/NewPerfumeListData.kt rename to app/src/main/java/com/scentsnote/android/data/vo/NewPerfumeListData.kt index 168e3f83..55e024ff 100644 --- a/app/src/main/java/com/scents/note/data/vo/NewPerfumeListData.kt +++ b/app/src/main/java/com/scentsnote/android/data/vo/NewPerfumeListData.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.vo +package com.scentsnote.android.data.vo data class NewPerfumeListData( val status: Int, diff --git a/app/src/main/java/com/scents/note/data/vo/ParcelableWishList.kt b/app/src/main/java/com/scentsnote/android/data/vo/ParcelableWishList.kt similarity index 86% rename from app/src/main/java/com/scents/note/data/vo/ParcelableWishList.kt rename to app/src/main/java/com/scentsnote/android/data/vo/ParcelableWishList.kt index 6aced960..8f8eb452 100644 --- a/app/src/main/java/com/scents/note/data/vo/ParcelableWishList.kt +++ b/app/src/main/java/com/scentsnote/android/data/vo/ParcelableWishList.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.vo +package com.scentsnote.android.data.vo import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/app/src/main/java/com/scents/note/data/vo/PerfumeDetailData.kt b/app/src/main/java/com/scentsnote/android/data/vo/PerfumeDetailData.kt similarity index 76% rename from app/src/main/java/com/scents/note/data/vo/PerfumeDetailData.kt rename to app/src/main/java/com/scentsnote/android/data/vo/PerfumeDetailData.kt index 05fe84d4..57211849 100644 --- a/app/src/main/java/com/scents/note/data/vo/PerfumeDetailData.kt +++ b/app/src/main/java/com/scentsnote/android/data/vo/PerfumeDetailData.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.vo +package com.scentsnote.android.data.vo data class PerfumeDetailData( val image: List, diff --git a/app/src/main/java/com/scents/note/data/vo/RecommendPerfumeListData.kt b/app/src/main/java/com/scentsnote/android/data/vo/RecommendPerfumeListData.kt similarity index 78% rename from app/src/main/java/com/scents/note/data/vo/RecommendPerfumeListData.kt rename to app/src/main/java/com/scentsnote/android/data/vo/RecommendPerfumeListData.kt index 40a138ea..c166ea10 100644 --- a/app/src/main/java/com/scents/note/data/vo/RecommendPerfumeListData.kt +++ b/app/src/main/java/com/scentsnote/android/data/vo/RecommendPerfumeListData.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.vo +package com.scentsnote.android.data.vo data class RecommendPerfumeListData( val image: String?, diff --git a/app/src/main/java/com/scents/note/data/vo/RvCircleData.kt b/app/src/main/java/com/scentsnote/android/data/vo/RvCircleData.kt similarity index 76% rename from app/src/main/java/com/scents/note/data/vo/RvCircleData.kt rename to app/src/main/java/com/scentsnote/android/data/vo/RvCircleData.kt index 66c1860f..34d2c42a 100644 --- a/app/src/main/java/com/scents/note/data/vo/RvCircleData.kt +++ b/app/src/main/java/com/scentsnote/android/data/vo/RvCircleData.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.vo +package com.scentsnote.android.data.vo data class RvCircleData( val img:Int, diff --git a/app/src/main/java/com/scents/note/data/vo/request/RequestBase.kt b/app/src/main/java/com/scentsnote/android/data/vo/request/RequestBase.kt similarity index 62% rename from app/src/main/java/com/scents/note/data/vo/request/RequestBase.kt rename to app/src/main/java/com/scentsnote/android/data/vo/request/RequestBase.kt index 04ff0434..784232d7 100644 --- a/app/src/main/java/com/scents/note/data/vo/request/RequestBase.kt +++ b/app/src/main/java/com/scentsnote/android/data/vo/request/RequestBase.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.vo.request +package com.scentsnote.android.data.vo.request data class RequestBase ( val pagingSize : Int, diff --git a/app/src/main/java/com/scents/note/data/vo/request/RequestEditMyInfo.kt b/app/src/main/java/com/scentsnote/android/data/vo/request/RequestEditMyInfo.kt similarity index 73% rename from app/src/main/java/com/scents/note/data/vo/request/RequestEditMyInfo.kt rename to app/src/main/java/com/scentsnote/android/data/vo/request/RequestEditMyInfo.kt index a9c75741..51b06b84 100644 --- a/app/src/main/java/com/scents/note/data/vo/request/RequestEditMyInfo.kt +++ b/app/src/main/java/com/scentsnote/android/data/vo/request/RequestEditMyInfo.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.vo.request +package com.scentsnote.android.data.vo.request data class RequestEditMyInfo( val email : String, diff --git a/app/src/main/java/com/scents/note/data/vo/request/RequestEditPassword.kt b/app/src/main/java/com/scentsnote/android/data/vo/request/RequestEditPassword.kt similarity index 66% rename from app/src/main/java/com/scents/note/data/vo/request/RequestEditPassword.kt rename to app/src/main/java/com/scentsnote/android/data/vo/request/RequestEditPassword.kt index 1e7350b9..9cb056db 100644 --- a/app/src/main/java/com/scents/note/data/vo/request/RequestEditPassword.kt +++ b/app/src/main/java/com/scentsnote/android/data/vo/request/RequestEditPassword.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.vo.request +package com.scentsnote.android.data.vo.request data class RequestEditPassword( val prevPassword : String, diff --git a/app/src/main/java/com/scents/note/data/vo/request/RequestLogin.kt b/app/src/main/java/com/scentsnote/android/data/vo/request/RequestLogin.kt similarity index 62% rename from app/src/main/java/com/scents/note/data/vo/request/RequestLogin.kt rename to app/src/main/java/com/scentsnote/android/data/vo/request/RequestLogin.kt index 3aa71ae0..1fe76317 100644 --- a/app/src/main/java/com/scents/note/data/vo/request/RequestLogin.kt +++ b/app/src/main/java/com/scentsnote/android/data/vo/request/RequestLogin.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.vo.request +package com.scentsnote.android.data.vo.request data class RequestLogin( val email : String, diff --git a/app/src/main/java/com/scents/note/data/vo/request/RequestRegister.kt b/app/src/main/java/com/scentsnote/android/data/vo/request/RequestRegister.kt similarity index 76% rename from app/src/main/java/com/scents/note/data/vo/request/RequestRegister.kt rename to app/src/main/java/com/scentsnote/android/data/vo/request/RequestRegister.kt index d5c24368..d17164df 100644 --- a/app/src/main/java/com/scents/note/data/vo/request/RequestRegister.kt +++ b/app/src/main/java/com/scentsnote/android/data/vo/request/RequestRegister.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.vo.request +package com.scentsnote.android.data.vo.request data class RequestRegister( val email : String, diff --git a/app/src/main/java/com/scents/note/data/vo/request/RequestReportReview.kt b/app/src/main/java/com/scentsnote/android/data/vo/request/RequestReportReview.kt similarity index 55% rename from app/src/main/java/com/scents/note/data/vo/request/RequestReportReview.kt rename to app/src/main/java/com/scentsnote/android/data/vo/request/RequestReportReview.kt index d3140d08..e543f1fb 100644 --- a/app/src/main/java/com/scents/note/data/vo/request/RequestReportReview.kt +++ b/app/src/main/java/com/scentsnote/android/data/vo/request/RequestReportReview.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.vo.request +package com.scentsnote.android.data.vo.request data class RequestReportReview( val reason : String diff --git a/app/src/main/java/com/scents/note/data/vo/request/RequestReview.kt b/app/src/main/java/com/scentsnote/android/data/vo/request/RequestReview.kt similarity index 83% rename from app/src/main/java/com/scents/note/data/vo/request/RequestReview.kt rename to app/src/main/java/com/scentsnote/android/data/vo/request/RequestReview.kt index 55ba151b..91310d18 100644 --- a/app/src/main/java/com/scents/note/data/vo/request/RequestReview.kt +++ b/app/src/main/java/com/scentsnote/android/data/vo/request/RequestReview.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.vo.request +package com.scentsnote.android.data.vo.request data class RequestReview( val score : Float, diff --git a/app/src/main/java/com/scents/note/data/vo/request/RequestSearch.kt b/app/src/main/java/com/scentsnote/android/data/vo/request/RequestSearch.kt similarity index 83% rename from app/src/main/java/com/scents/note/data/vo/request/RequestSearch.kt rename to app/src/main/java/com/scentsnote/android/data/vo/request/RequestSearch.kt index 13abd3f9..700973a6 100644 --- a/app/src/main/java/com/scents/note/data/vo/request/RequestSearch.kt +++ b/app/src/main/java/com/scentsnote/android/data/vo/request/RequestSearch.kt @@ -1,7 +1,7 @@ -package com.scents.note.data.vo.request +package com.scentsnote.android.data.vo.request import android.os.Parcelable -import com.scents.note.data.vo.response.SeriesIngredients +import com.scentsnote.android.data.vo.response.SeriesIngredients import kotlinx.parcelize.Parcelize data class RequestSearch( diff --git a/app/src/main/java/com/scents/note/data/vo/request/RequestSurvey.kt b/app/src/main/java/com/scentsnote/android/data/vo/request/RequestSurvey.kt similarity index 75% rename from app/src/main/java/com/scents/note/data/vo/request/RequestSurvey.kt rename to app/src/main/java/com/scentsnote/android/data/vo/request/RequestSurvey.kt index e0d92be6..99cd1f0c 100644 --- a/app/src/main/java/com/scents/note/data/vo/request/RequestSurvey.kt +++ b/app/src/main/java/com/scentsnote/android/data/vo/request/RequestSurvey.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.vo.request +package com.scentsnote.android.data.vo.request data class RequestSurvey( val keywordList: MutableList?, diff --git a/app/src/main/java/com/scents/note/data/vo/response/ResponseBase.kt b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponseBase.kt similarity index 72% rename from app/src/main/java/com/scents/note/data/vo/response/ResponseBase.kt rename to app/src/main/java/com/scentsnote/android/data/vo/response/ResponseBase.kt index 57444c9e..d1e67327 100644 --- a/app/src/main/java/com/scents/note/data/vo/response/ResponseBase.kt +++ b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponseBase.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.vo.response +package com.scentsnote.android.data.vo.response data class ResponseBase( val message: String, diff --git a/app/src/main/java/com/scents/note/data/vo/response/ResponseBrand.kt b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponseBrand.kt similarity index 86% rename from app/src/main/java/com/scents/note/data/vo/response/ResponseBrand.kt rename to app/src/main/java/com/scentsnote/android/data/vo/response/ResponseBrand.kt index c7d10c1b..b73392fe 100644 --- a/app/src/main/java/com/scents/note/data/vo/response/ResponseBrand.kt +++ b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponseBrand.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.vo.response +package com.scentsnote.android.data.vo.response data class ResponseBrand( val count: Int, diff --git a/app/src/main/java/com/scents/note/data/vo/response/ResponseEditMyInfo.kt b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponseEditMyInfo.kt similarity index 76% rename from app/src/main/java/com/scents/note/data/vo/response/ResponseEditMyInfo.kt rename to app/src/main/java/com/scentsnote/android/data/vo/response/ResponseEditMyInfo.kt index 038590f6..b3d8458f 100644 --- a/app/src/main/java/com/scents/note/data/vo/response/ResponseEditMyInfo.kt +++ b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponseEditMyInfo.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.vo.response +package com.scentsnote.android.data.vo.response data class ResponseEditMyInfo( val userIdx : Int, diff --git a/app/src/main/java/com/scents/note/data/vo/response/ResponseHomePerfumeList.kt b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponseHomePerfumeList.kt similarity index 84% rename from app/src/main/java/com/scents/note/data/vo/response/ResponseHomePerfumeList.kt rename to app/src/main/java/com/scentsnote/android/data/vo/response/ResponseHomePerfumeList.kt index 983f4af8..23553e32 100644 --- a/app/src/main/java/com/scents/note/data/vo/response/ResponseHomePerfumeList.kt +++ b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponseHomePerfumeList.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.vo.response +package com.scentsnote.android.data.vo.response class ResponseHomePerfumeList ( val count : Int, diff --git a/app/src/main/java/com/scents/note/data/vo/response/ResponseKeyword.kt b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponseKeyword.kt similarity index 83% rename from app/src/main/java/com/scents/note/data/vo/response/ResponseKeyword.kt rename to app/src/main/java/com/scentsnote/android/data/vo/response/ResponseKeyword.kt index d6cd5632..5f76a193 100644 --- a/app/src/main/java/com/scents/note/data/vo/response/ResponseKeyword.kt +++ b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponseKeyword.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.vo.response +package com.scentsnote.android.data.vo.response data class ResponseKeyword( val count: Int, diff --git a/app/src/main/java/com/scents/note/data/vo/response/ResponseLogin.kt b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponseLogin.kt similarity index 78% rename from app/src/main/java/com/scents/note/data/vo/response/ResponseLogin.kt rename to app/src/main/java/com/scentsnote/android/data/vo/response/ResponseLogin.kt index c98cb8d8..a2708575 100644 --- a/app/src/main/java/com/scents/note/data/vo/response/ResponseLogin.kt +++ b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponseLogin.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.vo.response +package com.scentsnote.android.data.vo.response data class ResponseLogin( val userIdx : Int, diff --git a/app/src/main/java/com/scents/note/data/vo/response/ResponseMyPerfume.kt b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponseMyPerfume.kt similarity index 81% rename from app/src/main/java/com/scents/note/data/vo/response/ResponseMyPerfume.kt rename to app/src/main/java/com/scentsnote/android/data/vo/response/ResponseMyPerfume.kt index bac98679..735c1a8e 100644 --- a/app/src/main/java/com/scents/note/data/vo/response/ResponseMyPerfume.kt +++ b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponseMyPerfume.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.vo.response +package com.scentsnote.android.data.vo.response data class ResponseMyPerfume( val reviewIdx: Int, diff --git a/app/src/main/java/com/scents/note/data/vo/response/ResponseNewPerfumeList.kt b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponseNewPerfumeList.kt similarity index 84% rename from app/src/main/java/com/scents/note/data/vo/response/ResponseNewPerfumeList.kt rename to app/src/main/java/com/scentsnote/android/data/vo/response/ResponseNewPerfumeList.kt index 57c51947..e419c261 100644 --- a/app/src/main/java/com/scents/note/data/vo/response/ResponseNewPerfumeList.kt +++ b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponseNewPerfumeList.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.vo.response +package com.scentsnote.android.data.vo.response data class ResponseNewPerfumeList( val count : Int, diff --git a/app/src/main/java/com/scents/note/data/vo/response/ResponsePerfume.kt b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponsePerfume.kt similarity index 90% rename from app/src/main/java/com/scents/note/data/vo/response/ResponsePerfume.kt rename to app/src/main/java/com/scentsnote/android/data/vo/response/ResponsePerfume.kt index 567a06a4..98d9aa41 100644 --- a/app/src/main/java/com/scents/note/data/vo/response/ResponsePerfume.kt +++ b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponsePerfume.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.vo.response +package com.scentsnote.android.data.vo.response data class ResponsePerfume( val count: Int, diff --git a/app/src/main/java/com/scents/note/data/vo/response/ResponsePerfumeDetail.kt b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponsePerfumeDetail.kt similarity index 96% rename from app/src/main/java/com/scents/note/data/vo/response/ResponsePerfumeDetail.kt rename to app/src/main/java/com/scentsnote/android/data/vo/response/ResponsePerfumeDetail.kt index c94a0602..ba8846fa 100644 --- a/app/src/main/java/com/scents/note/data/vo/response/ResponsePerfumeDetail.kt +++ b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponsePerfumeDetail.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.vo.response +package com.scentsnote.android.data.vo.response data class ResponsePerfumeDetail( val message: String, diff --git a/app/src/main/java/com/scents/note/data/vo/response/ResponsePerfumeDetailWithReviews.kt b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponsePerfumeDetailWithReviews.kt similarity index 89% rename from app/src/main/java/com/scents/note/data/vo/response/ResponsePerfumeDetailWithReviews.kt rename to app/src/main/java/com/scentsnote/android/data/vo/response/ResponsePerfumeDetailWithReviews.kt index 377a354f..e3548304 100644 --- a/app/src/main/java/com/scents/note/data/vo/response/ResponsePerfumeDetailWithReviews.kt +++ b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponsePerfumeDetailWithReviews.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.vo.response +package com.scentsnote.android.data.vo.response data class ResponsePerfumeDetailWithReviews( val message: String, diff --git a/app/src/main/java/com/scents/note/data/vo/response/ResponseRecommendPerfumeList.kt b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponseRecommendPerfumeList.kt similarity index 86% rename from app/src/main/java/com/scents/note/data/vo/response/ResponseRecommendPerfumeList.kt rename to app/src/main/java/com/scentsnote/android/data/vo/response/ResponseRecommendPerfumeList.kt index aacd3a6e..fb2f0c4f 100644 --- a/app/src/main/java/com/scents/note/data/vo/response/ResponseRecommendPerfumeList.kt +++ b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponseRecommendPerfumeList.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.vo.response +package com.scentsnote.android.data.vo.response data class ResponseRecommendPerfumeList( val count : Int, diff --git a/app/src/main/java/com/scents/note/data/vo/response/ResponseRegister.kt b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponseRegister.kt similarity index 69% rename from app/src/main/java/com/scents/note/data/vo/response/ResponseRegister.kt rename to app/src/main/java/com/scentsnote/android/data/vo/response/ResponseRegister.kt index e851a6f4..86c0b597 100644 --- a/app/src/main/java/com/scents/note/data/vo/response/ResponseRegister.kt +++ b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponseRegister.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.vo.response +package com.scentsnote.android.data.vo.response data class ResponseRegister( val userIdx : Int, diff --git a/app/src/main/java/com/scents/note/data/vo/response/ResponseReview.kt b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponseReview.kt similarity index 93% rename from app/src/main/java/com/scents/note/data/vo/response/ResponseReview.kt rename to app/src/main/java/com/scentsnote/android/data/vo/response/ResponseReview.kt index 1bc98895..1ed89681 100644 --- a/app/src/main/java/com/scents/note/data/vo/response/ResponseReview.kt +++ b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponseReview.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.vo.response +package com.scentsnote.android.data.vo.response import com.google.gson.annotations.SerializedName diff --git a/app/src/main/java/com/scents/note/data/vo/response/ResponseReviewAdd.kt b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponseReviewAdd.kt similarity index 53% rename from app/src/main/java/com/scents/note/data/vo/response/ResponseReviewAdd.kt rename to app/src/main/java/com/scentsnote/android/data/vo/response/ResponseReviewAdd.kt index a129e7d4..7ee87860 100644 --- a/app/src/main/java/com/scents/note/data/vo/response/ResponseReviewAdd.kt +++ b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponseReviewAdd.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.vo.response +package com.scentsnote.android.data.vo.response data class ResponseReviewAdd( val reviewIdx : Int diff --git a/app/src/main/java/com/scents/note/data/vo/response/ResponseSeries.kt b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponseSeries.kt similarity index 93% rename from app/src/main/java/com/scents/note/data/vo/response/ResponseSeries.kt rename to app/src/main/java/com/scentsnote/android/data/vo/response/ResponseSeries.kt index 858728e1..48d67306 100644 --- a/app/src/main/java/com/scents/note/data/vo/response/ResponseSeries.kt +++ b/app/src/main/java/com/scentsnote/android/data/vo/response/ResponseSeries.kt @@ -1,4 +1,4 @@ -package com.scents.note.data.vo.response +package com.scentsnote.android.data.vo.response import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/app/src/main/java/com/scents/note/ui/ButtonActivity.kt b/app/src/main/java/com/scentsnote/android/ui/ButtonActivity.kt similarity index 78% rename from app/src/main/java/com/scents/note/ui/ButtonActivity.kt rename to app/src/main/java/com/scentsnote/android/ui/ButtonActivity.kt index 141acbc6..26ab6de3 100644 --- a/app/src/main/java/com/scents/note/ui/ButtonActivity.kt +++ b/app/src/main/java/com/scentsnote/android/ui/ButtonActivity.kt @@ -1,14 +1,14 @@ -package com.scents.note.ui +package com.scentsnote.android.ui import android.content.Intent import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil -import com.scents.note.R -import com.scents.note.databinding.ActivityButtonBinding -import com.scents.note.ui.detail.PerfumeDetailActivity -import com.scents.note.ui.note.NoteActivity -import com.scents.note.ui.signin.SignHomeActivity +import com.scentsnote.android.R +import com.scentsnote.android.databinding.ActivityButtonBinding +import com.scentsnote.android.ui.detail.PerfumeDetailActivity +import com.scentsnote.android.ui.note.NoteActivity +import com.scentsnote.android.ui.signin.SignHomeActivity class ButtonActivity : AppCompatActivity() { lateinit var binding: ActivityButtonBinding diff --git a/app/src/main/java/com/scents/note/ui/MainActivity.kt b/app/src/main/java/com/scentsnote/android/ui/MainActivity.kt similarity index 87% rename from app/src/main/java/com/scents/note/ui/MainActivity.kt rename to app/src/main/java/com/scentsnote/android/ui/MainActivity.kt index a30a3a21..09a16eb1 100644 --- a/app/src/main/java/com/scents/note/ui/MainActivity.kt +++ b/app/src/main/java/com/scentsnote/android/ui/MainActivity.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui +package com.scentsnote.android.ui import android.os.Bundle import android.util.Log @@ -9,14 +9,14 @@ import androidx.lifecycle.* import androidx.navigation.NavController import androidx.navigation.Navigation import androidx.navigation.ui.setupWithNavController -import com.scents.note.ScentsNoteApplication -import com.scents.note.R -import com.scents.note.data.vo.request.FilterInfoP -import com.scents.note.data.vo.request.SendFilter -import com.scents.note.databinding.ActivityMainBinding -import com.scents.note.ui.my.MyViewModel -import com.scents.note.ui.search.SearchViewModel -import com.scents.note.ui.search.SingleViewModelFactory +import com.scentsnote.android.ScentsNoteApplication +import com.scentsnote.android.R +import com.scentsnote.android.data.vo.request.FilterInfoP +import com.scentsnote.android.data.vo.request.SendFilter +import com.scentsnote.android.databinding.ActivityMainBinding +import com.scentsnote.android.ui.my.MyViewModel +import com.scentsnote.android.ui.search.SearchViewModel +import com.scentsnote.android.ui.search.SingleViewModelFactory import com.google.android.material.bottomnavigation.BottomNavigationView import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/scents/note/ui/detail/DetailImageAdapter.kt b/app/src/main/java/com/scentsnote/android/ui/detail/DetailImageAdapter.kt similarity index 92% rename from app/src/main/java/com/scents/note/ui/detail/DetailImageAdapter.kt rename to app/src/main/java/com/scentsnote/android/ui/detail/DetailImageAdapter.kt index cf7e3b4e..ee878671 100644 --- a/app/src/main/java/com/scents/note/ui/detail/DetailImageAdapter.kt +++ b/app/src/main/java/com/scentsnote/android/ui/detail/DetailImageAdapter.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.detail +package com.scentsnote.android.ui.detail import android.content.Context import android.util.Log @@ -6,8 +6,8 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.databinding.DataBindingUtil import androidx.recyclerview.widget.RecyclerView -import com.scents.note.R -import com.scents.note.databinding.RvItemDetailImageBinding +import com.scentsnote.android.R +import com.scentsnote.android.databinding.RvItemDetailImageBinding import com.bumptech.glide.Glide class DetailImageAdapter(val context: Context) : RecyclerView.Adapter() { diff --git a/app/src/main/java/com/scents/note/ui/detail/MeasuredViewPager.kt b/app/src/main/java/com/scentsnote/android/ui/detail/MeasuredViewPager.kt similarity index 97% rename from app/src/main/java/com/scents/note/ui/detail/MeasuredViewPager.kt rename to app/src/main/java/com/scentsnote/android/ui/detail/MeasuredViewPager.kt index f6155180..4d4d0f6f 100644 --- a/app/src/main/java/com/scents/note/ui/detail/MeasuredViewPager.kt +++ b/app/src/main/java/com/scentsnote/android/ui/detail/MeasuredViewPager.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.detail +package com.scentsnote.android.ui.detail import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/com/scents/note/ui/detail/PerfumeDetailActivity.kt b/app/src/main/java/com/scentsnote/android/ui/detail/PerfumeDetailActivity.kt similarity index 89% rename from app/src/main/java/com/scents/note/ui/detail/PerfumeDetailActivity.kt rename to app/src/main/java/com/scentsnote/android/ui/detail/PerfumeDetailActivity.kt index 33b19dea..50ef0833 100644 --- a/app/src/main/java/com/scents/note/ui/detail/PerfumeDetailActivity.kt +++ b/app/src/main/java/com/scentsnote/android/ui/detail/PerfumeDetailActivity.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.detail +package com.scentsnote.android.ui.detail import android.content.Intent import android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP @@ -8,16 +8,16 @@ import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil import androidx.lifecycle.Observer -import com.scents.note.ScentsNoteApplication -import com.scents.note.R -import com.scents.note.data.vo.ParcelableWishList -import com.scents.note.databinding.ActivityPerfumeDetailBinding -import com.scents.note.ui.detail.info.DetailInfoFragment -import com.scents.note.ui.detail.note.DetailNoteFragment -import com.scents.note.ui.note.NoteActivity -import com.scents.note.util.* +import com.scentsnote.android.ScentsNoteApplication +import com.scentsnote.android.R +import com.scentsnote.android.data.vo.ParcelableWishList +import com.scentsnote.android.databinding.ActivityPerfumeDetailBinding +import com.scentsnote.android.ui.detail.info.DetailInfoFragment +import com.scentsnote.android.ui.detail.note.DetailNoteFragment +import com.scentsnote.android.ui.note.NoteActivity +import com.scentsnote.android.util.* import com.bumptech.glide.Glide -import com.scents.note.util.BindingAdapter.setNoteBtnText +import com.scentsnote.android.util.BindingAdapter.setNoteBtnText class PerfumeDetailActivity : AppCompatActivity() { lateinit var binding: ActivityPerfumeDetailBinding diff --git a/app/src/main/java/com/scents/note/ui/detail/PerfumeDetailViewModel.kt b/app/src/main/java/com/scentsnote/android/ui/detail/PerfumeDetailViewModel.kt similarity index 94% rename from app/src/main/java/com/scents/note/ui/detail/PerfumeDetailViewModel.kt rename to app/src/main/java/com/scentsnote/android/ui/detail/PerfumeDetailViewModel.kt index e4e7fd43..89210363 100644 --- a/app/src/main/java/com/scents/note/ui/detail/PerfumeDetailViewModel.kt +++ b/app/src/main/java/com/scentsnote/android/ui/detail/PerfumeDetailViewModel.kt @@ -1,15 +1,15 @@ -package com.scents.note.ui.detail +package com.scentsnote.android.ui.detail import android.util.Log import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.scents.note.ScentsNoteApplication -import com.scents.note.data.repository.PerfumeDetailRepository -import com.scents.note.data.vo.request.RequestReportReview -import com.scents.note.data.vo.response.PerfumeDetail -import com.scents.note.data.vo.response.PerfumeDetailWithReviews +import com.scentsnote.android.ScentsNoteApplication +import com.scentsnote.android.data.repository.PerfumeDetailRepository +import com.scentsnote.android.data.vo.request.RequestReportReview +import com.scentsnote.android.data.vo.response.PerfumeDetail +import com.scentsnote.android.data.vo.response.PerfumeDetailWithReviews import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/com/scents/note/ui/detail/StickyScrollView.kt b/app/src/main/java/com/scentsnote/android/ui/detail/StickyScrollView.kt similarity index 98% rename from app/src/main/java/com/scents/note/ui/detail/StickyScrollView.kt rename to app/src/main/java/com/scentsnote/android/ui/detail/StickyScrollView.kt index da435713..645d7062 100644 --- a/app/src/main/java/com/scents/note/ui/detail/StickyScrollView.kt +++ b/app/src/main/java/com/scentsnote/android/ui/detail/StickyScrollView.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.detail +package com.scentsnote.android.ui.detail import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/com/scents/note/ui/detail/ViewPagerAdapter.kt b/app/src/main/java/com/scentsnote/android/ui/detail/ViewPagerAdapter.kt similarity index 91% rename from app/src/main/java/com/scents/note/ui/detail/ViewPagerAdapter.kt rename to app/src/main/java/com/scentsnote/android/ui/detail/ViewPagerAdapter.kt index 0f9b78f8..6db08303 100644 --- a/app/src/main/java/com/scents/note/ui/detail/ViewPagerAdapter.kt +++ b/app/src/main/java/com/scentsnote/android/ui/detail/ViewPagerAdapter.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.detail +package com.scentsnote.android.ui.detail import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager diff --git a/app/src/main/java/com/scents/note/ui/detail/info/DetailInfoFragment.kt b/app/src/main/java/com/scentsnote/android/ui/detail/info/DetailInfoFragment.kt similarity index 97% rename from app/src/main/java/com/scents/note/ui/detail/info/DetailInfoFragment.kt rename to app/src/main/java/com/scentsnote/android/ui/detail/info/DetailInfoFragment.kt index 96e3bd47..3b50e1cb 100644 --- a/app/src/main/java/com/scents/note/ui/detail/info/DetailInfoFragment.kt +++ b/app/src/main/java/com/scentsnote/android/ui/detail/info/DetailInfoFragment.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.detail.info +package com.scentsnote.android.ui.detail.info import android.content.Context import android.os.Bundle @@ -13,11 +13,11 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.fragment.app.viewModels import androidx.lifecycle.Observer -import com.scents.note.R -import com.scents.note.databinding.FragmentDetailInfoBinding -import com.scents.note.ui.detail.PerfumeDetailViewModel -import com.scents.note.ui.home.HomeViewModel -import com.scents.note.ui.home.adapter.PopularListAdapter +import com.scentsnote.android.R +import com.scentsnote.android.databinding.FragmentDetailInfoBinding +import com.scentsnote.android.ui.detail.PerfumeDetailViewModel +import com.scentsnote.android.ui.home.HomeViewModel +import com.scentsnote.android.ui.home.adapter.PopularListAdapter import com.github.mikephil.charting.animation.Easing import com.github.mikephil.charting.charts.PieChart import com.github.mikephil.charting.components.Legend diff --git a/app/src/main/java/com/scents/note/ui/detail/info/DetailKeywordAdapter.kt b/app/src/main/java/com/scentsnote/android/ui/detail/info/DetailKeywordAdapter.kt similarity index 91% rename from app/src/main/java/com/scents/note/ui/detail/info/DetailKeywordAdapter.kt rename to app/src/main/java/com/scentsnote/android/ui/detail/info/DetailKeywordAdapter.kt index 6b3c2723..ff209934 100644 --- a/app/src/main/java/com/scents/note/ui/detail/info/DetailKeywordAdapter.kt +++ b/app/src/main/java/com/scentsnote/android/ui/detail/info/DetailKeywordAdapter.kt @@ -1,11 +1,11 @@ -package com.scents.note.ui.detail.info +package com.scentsnote.android.ui.detail.info import android.view.LayoutInflater import android.view.ViewGroup import androidx.databinding.DataBindingUtil import androidx.recyclerview.widget.RecyclerView -import com.scents.note.R -import com.scents.note.databinding.RvItemDetailKeywordBinding +import com.scentsnote.android.R +import com.scentsnote.android.databinding.RvItemDetailKeywordBinding class DetailKeywordAdapter : RecyclerView.Adapter() { var data = mutableListOf() diff --git a/app/src/main/java/com/scents/note/ui/detail/info/HorizontalBarChartAdapter.kt b/app/src/main/java/com/scentsnote/android/ui/detail/info/HorizontalBarChartAdapter.kt similarity index 96% rename from app/src/main/java/com/scents/note/ui/detail/info/HorizontalBarChartAdapter.kt rename to app/src/main/java/com/scentsnote/android/ui/detail/info/HorizontalBarChartAdapter.kt index 57a08ff4..ca2d08b8 100644 --- a/app/src/main/java/com/scents/note/ui/detail/info/HorizontalBarChartAdapter.kt +++ b/app/src/main/java/com/scentsnote/android/ui/detail/info/HorizontalBarChartAdapter.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.detail.info +package com.scentsnote.android.ui.detail.info import android.content.Context import android.view.LayoutInflater @@ -6,8 +6,8 @@ import android.view.ViewGroup import androidx.core.content.ContextCompat import androidx.core.content.res.ResourcesCompat import androidx.recyclerview.widget.RecyclerView -import com.scents.note.R -import com.scents.note.databinding.RvItemDetailsInfoHorizontalBarChartBinding +import com.scentsnote.android.R +import com.scentsnote.android.databinding.RvItemDetailsInfoHorizontalBarChartBinding import com.github.mikephil.charting.charts.HorizontalBarChart import com.github.mikephil.charting.data.BarData import com.github.mikephil.charting.data.BarDataSet diff --git a/app/src/main/java/com/scents/note/ui/detail/info/PriceRvAdapter.kt b/app/src/main/java/com/scentsnote/android/ui/detail/info/PriceRvAdapter.kt similarity index 89% rename from app/src/main/java/com/scents/note/ui/detail/info/PriceRvAdapter.kt rename to app/src/main/java/com/scentsnote/android/ui/detail/info/PriceRvAdapter.kt index e8bc2aaa..1f18e148 100644 --- a/app/src/main/java/com/scents/note/ui/detail/info/PriceRvAdapter.kt +++ b/app/src/main/java/com/scentsnote/android/ui/detail/info/PriceRvAdapter.kt @@ -1,10 +1,10 @@ -package com.scents.note.ui.detail.info +package com.scentsnote.android.ui.detail.info import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.scents.note.R -import com.scents.note.databinding.RvItemDetailPriceBinding +import com.scentsnote.android.R +import com.scentsnote.android.databinding.RvItemDetailPriceBinding class PriceRvAdapter : RecyclerView.Adapter() { diff --git a/app/src/main/java/com/scents/note/ui/detail/note/DetailNoteAdapter.kt b/app/src/main/java/com/scentsnote/android/ui/detail/note/DetailNoteAdapter.kt similarity index 89% rename from app/src/main/java/com/scents/note/ui/detail/note/DetailNoteAdapter.kt rename to app/src/main/java/com/scentsnote/android/ui/detail/note/DetailNoteAdapter.kt index 5f918d5a..7860d410 100644 --- a/app/src/main/java/com/scents/note/ui/detail/note/DetailNoteAdapter.kt +++ b/app/src/main/java/com/scentsnote/android/ui/detail/note/DetailNoteAdapter.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.detail.note +package com.scentsnote.android.ui.detail.note import android.content.Context import android.os.Bundle @@ -6,13 +6,13 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.fragment.app.FragmentManager import androidx.recyclerview.widget.RecyclerView -import com.scents.note.ScentsNoteApplication -import com.scents.note.data.vo.response.PerfumeDetailWithReviews -import com.scents.note.databinding.RvItemDetailNoteBinding -import com.scents.note.databinding.RvItemDetailNoteReportBinding -import com.scents.note.ui.detail.PerfumeDetailViewModel -import com.scents.note.util.CommonDialog -import com.scents.note.util.ReportDialog +import com.scentsnote.android.ScentsNoteApplication +import com.scentsnote.android.data.vo.response.PerfumeDetailWithReviews +import com.scentsnote.android.databinding.RvItemDetailNoteBinding +import com.scentsnote.android.databinding.RvItemDetailNoteReportBinding +import com.scentsnote.android.ui.detail.PerfumeDetailViewModel +import com.scentsnote.android.util.CommonDialog +import com.scentsnote.android.util.ReportDialog class DetailNoteAdapter(private val context: Context, private val vm: PerfumeDetailViewModel, private val fragmentManager: FragmentManager, val perfumeIdx: Int, val clickBtnLike:(Int)->Unit) : RecyclerView.Adapter() { var data = mutableListOf() diff --git a/app/src/main/java/com/scents/note/ui/detail/note/DetailNoteFragment.kt b/app/src/main/java/com/scentsnote/android/ui/detail/note/DetailNoteFragment.kt similarity index 90% rename from app/src/main/java/com/scents/note/ui/detail/note/DetailNoteFragment.kt rename to app/src/main/java/com/scentsnote/android/ui/detail/note/DetailNoteFragment.kt index 89bac24b..c6d2f055 100644 --- a/app/src/main/java/com/scents/note/ui/detail/note/DetailNoteFragment.kt +++ b/app/src/main/java/com/scentsnote/android/ui/detail/note/DetailNoteFragment.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.detail.note +package com.scentsnote.android.ui.detail.note import android.os.Bundle import android.view.LayoutInflater @@ -8,9 +8,9 @@ import androidx.databinding.DataBindingUtil import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.lifecycle.Observer -import com.scents.note.R -import com.scents.note.databinding.FragmentDetailNoteBinding -import com.scents.note.ui.detail.PerfumeDetailViewModel +import com.scentsnote.android.R +import com.scentsnote.android.databinding.FragmentDetailNoteBinding +import com.scentsnote.android.ui.detail.PerfumeDetailViewModel class DetailNoteFragment(val perfumeIdx: Int) : Fragment() { diff --git a/app/src/main/java/com/scents/note/ui/filter/FilterActivity.kt b/app/src/main/java/com/scentsnote/android/ui/filter/FilterActivity.kt similarity index 88% rename from app/src/main/java/com/scents/note/ui/filter/FilterActivity.kt rename to app/src/main/java/com/scentsnote/android/ui/filter/FilterActivity.kt index 926ee703..b5e5ee70 100644 --- a/app/src/main/java/com/scents/note/ui/filter/FilterActivity.kt +++ b/app/src/main/java/com/scentsnote/android/ui/filter/FilterActivity.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.filter +package com.scentsnote.android.ui.filter import android.content.Intent import android.os.Bundle @@ -8,17 +8,17 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import androidx.databinding.DataBindingUtil import androidx.lifecycle.Observer -import com.scents.note.R -import com.scents.note.data.vo.request.SendFilter -import com.scents.note.databinding.ActivityFilterBinding -import com.scents.note.ui.MainActivity -import com.scents.note.ui.filter.brand.FilterBrandFragment -import com.scents.note.ui.filter.incense.FilterIncenseSeriesFragment -import com.scents.note.ui.filter.keyword.FilterKeywordFragment -import com.scents.note.ui.search.SearchHomeFragment.Companion.SEARCH_HOME -import com.scents.note.util.TabSelectedListener +import com.scentsnote.android.R +import com.scentsnote.android.data.vo.request.SendFilter +import com.scentsnote.android.databinding.ActivityFilterBinding +import com.scentsnote.android.ui.MainActivity +import com.scentsnote.android.ui.filter.brand.FilterBrandFragment +import com.scentsnote.android.ui.filter.incense.FilterIncenseSeriesFragment +import com.scentsnote.android.ui.filter.keyword.FilterKeywordFragment +import com.scentsnote.android.ui.search.SearchHomeFragment.Companion.SEARCH_HOME +import com.scentsnote.android.util.TabSelectedListener import com.google.android.material.badge.BadgeDrawable -import com.scents.note.util.changeTabsFont +import com.scentsnote.android.util.changeTabsFont class FilterActivity : AppCompatActivity() { private lateinit var binding: ActivityFilterBinding diff --git a/app/src/main/java/com/scents/note/ui/filter/FilterViewModel.kt b/app/src/main/java/com/scentsnote/android/ui/filter/FilterViewModel.kt similarity index 96% rename from app/src/main/java/com/scents/note/ui/filter/FilterViewModel.kt rename to app/src/main/java/com/scentsnote/android/ui/filter/FilterViewModel.kt index ccf6d458..8e8d9507 100644 --- a/app/src/main/java/com/scents/note/ui/filter/FilterViewModel.kt +++ b/app/src/main/java/com/scentsnote/android/ui/filter/FilterViewModel.kt @@ -1,17 +1,17 @@ -package com.scents.note.ui.filter +package com.scentsnote.android.ui.filter import android.util.Log import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.scents.note.data.repository.FilterRepository -import com.scents.note.data.vo.request.FilterInfoP -import com.scents.note.data.vo.request.SendFilter -import com.scents.note.data.vo.response.BrandInfo -import com.scents.note.data.vo.response.KeywordInfo -import com.scents.note.data.vo.response.SeriesInfo -import com.scents.note.data.vo.response.SeriesIngredients +import com.scentsnote.android.data.repository.FilterRepository +import com.scentsnote.android.data.vo.request.FilterInfoP +import com.scentsnote.android.data.vo.request.SendFilter +import com.scentsnote.android.data.vo.response.BrandInfo +import com.scentsnote.android.data.vo.response.KeywordInfo +import com.scentsnote.android.data.vo.response.SeriesInfo +import com.scentsnote.android.data.vo.response.SeriesIngredients import kotlinx.coroutines.launch import retrofit2.HttpException diff --git a/app/src/main/java/com/scents/note/ui/filter/FilterViewModelFactory.kt b/app/src/main/java/com/scentsnote/android/ui/filter/FilterViewModelFactory.kt similarity index 94% rename from app/src/main/java/com/scents/note/ui/filter/FilterViewModelFactory.kt rename to app/src/main/java/com/scentsnote/android/ui/filter/FilterViewModelFactory.kt index 728d08b7..f165a76b 100644 --- a/app/src/main/java/com/scents/note/ui/filter/FilterViewModelFactory.kt +++ b/app/src/main/java/com/scentsnote/android/ui/filter/FilterViewModelFactory.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.filter +package com.scentsnote.android.ui.filter import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider diff --git a/app/src/main/java/com/scents/note/ui/filter/Filterbinding.kt b/app/src/main/java/com/scentsnote/android/ui/filter/Filterbinding.kt similarity index 80% rename from app/src/main/java/com/scents/note/ui/filter/Filterbinding.kt rename to app/src/main/java/com/scentsnote/android/ui/filter/Filterbinding.kt index 47557553..9e6e625d 100644 --- a/app/src/main/java/com/scents/note/ui/filter/Filterbinding.kt +++ b/app/src/main/java/com/scentsnote/android/ui/filter/Filterbinding.kt @@ -1,17 +1,17 @@ -package com.scents.note.ui.filter +package com.scentsnote.android.ui.filter import android.util.Log import android.widget.TextView import androidx.core.content.ContextCompat import androidx.databinding.BindingAdapter import androidx.recyclerview.widget.RecyclerView -import com.scents.note.R -import com.scents.note.data.vo.response.BrandInfo -import com.scents.note.data.vo.response.SeriesInfo -import com.scents.note.data.vo.response.SeriesIngredients -import com.scents.note.ui.filter.brand.BrandRecyclerViewAdapter -import com.scents.note.ui.filter.incense.IngredientFlexboxAdapter -import com.scents.note.ui.filter.incense.SeriesIngredientsViewAdapter +import com.scentsnote.android.R +import com.scentsnote.android.data.vo.response.BrandInfo +import com.scentsnote.android.data.vo.response.SeriesInfo +import com.scentsnote.android.data.vo.response.SeriesIngredients +import com.scentsnote.android.ui.filter.brand.BrandRecyclerViewAdapter +import com.scentsnote.android.ui.filter.incense.IngredientFlexboxAdapter +import com.scentsnote.android.ui.filter.incense.SeriesIngredientsViewAdapter object FilterBinding { diff --git a/app/src/main/java/com/scents/note/ui/filter/ScentsNoteViewPagerAdapter.kt b/app/src/main/java/com/scentsnote/android/ui/filter/ScentsNoteViewPagerAdapter.kt similarity index 91% rename from app/src/main/java/com/scents/note/ui/filter/ScentsNoteViewPagerAdapter.kt rename to app/src/main/java/com/scentsnote/android/ui/filter/ScentsNoteViewPagerAdapter.kt index 6c5c97b3..3dd49ae5 100644 --- a/app/src/main/java/com/scents/note/ui/filter/ScentsNoteViewPagerAdapter.kt +++ b/app/src/main/java/com/scentsnote/android/ui/filter/ScentsNoteViewPagerAdapter.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.filter +package com.scentsnote.android.ui.filter import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager diff --git a/app/src/main/java/com/scents/note/ui/filter/brand/BrandRecyclerViewAdapter.kt b/app/src/main/java/com/scentsnote/android/ui/filter/brand/BrandRecyclerViewAdapter.kt similarity index 93% rename from app/src/main/java/com/scents/note/ui/filter/brand/BrandRecyclerViewAdapter.kt rename to app/src/main/java/com/scentsnote/android/ui/filter/brand/BrandRecyclerViewAdapter.kt index 533f63b8..00d183c1 100644 --- a/app/src/main/java/com/scents/note/ui/filter/brand/BrandRecyclerViewAdapter.kt +++ b/app/src/main/java/com/scentsnote/android/ui/filter/brand/BrandRecyclerViewAdapter.kt @@ -1,11 +1,11 @@ -package com.scents.note.ui.filter.brand +package com.scentsnote.android.ui.filter.brand import android.view.LayoutInflater import android.view.ViewGroup import android.widget.Toast import androidx.recyclerview.widget.RecyclerView -import com.scents.note.data.vo.response.BrandInfo -import com.scents.note.databinding.RvItemFilterBrandBinding +import com.scentsnote.android.data.vo.response.BrandInfo +import com.scentsnote.android.databinding.RvItemFilterBrandBinding class BrandRecyclerViewAdapter( val setSelectedBrand: (BrandInfo, Boolean) -> Unit, diff --git a/app/src/main/java/com/scents/note/ui/filter/brand/FilterBrandFragment.kt b/app/src/main/java/com/scentsnote/android/ui/filter/brand/FilterBrandFragment.kt similarity index 92% rename from app/src/main/java/com/scents/note/ui/filter/brand/FilterBrandFragment.kt rename to app/src/main/java/com/scentsnote/android/ui/filter/brand/FilterBrandFragment.kt index 9b7a58f1..c3a2d898 100644 --- a/app/src/main/java/com/scents/note/ui/filter/brand/FilterBrandFragment.kt +++ b/app/src/main/java/com/scentsnote/android/ui/filter/brand/FilterBrandFragment.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.filter.brand +package com.scentsnote.android.ui.filter.brand import android.content.Context import android.os.Bundle @@ -10,11 +10,11 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.lifecycle.Observer import androidx.recyclerview.widget.LinearLayoutManager -import com.scents.note.databinding.FragmentFilterBrandBinding -import com.scents.note.ui.filter.FilterViewModel -import com.scents.note.ui.filter.FilterViewModelFactory +import com.scentsnote.android.databinding.FragmentFilterBrandBinding +import com.scentsnote.android.ui.filter.FilterViewModel +import com.scentsnote.android.ui.filter.FilterViewModelFactory import com.google.android.material.tabs.TabLayout -import com.scents.note.util.changeTabsFont +import com.scentsnote.android.util.changeTabsFont class FilterBrandFragment : Fragment() { private val viewModel: FilterViewModel by activityViewModels() { diff --git a/app/src/main/java/com/scents/note/ui/filter/incense/FilterIncenseSeriesFragment.kt b/app/src/main/java/com/scentsnote/android/ui/filter/incense/FilterIncenseSeriesFragment.kt similarity index 88% rename from app/src/main/java/com/scents/note/ui/filter/incense/FilterIncenseSeriesFragment.kt rename to app/src/main/java/com/scentsnote/android/ui/filter/incense/FilterIncenseSeriesFragment.kt index daf22277..6f94b198 100644 --- a/app/src/main/java/com/scents/note/ui/filter/incense/FilterIncenseSeriesFragment.kt +++ b/app/src/main/java/com/scentsnote/android/ui/filter/incense/FilterIncenseSeriesFragment.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.filter.incense +package com.scentsnote.android.ui.filter.incense import android.os.Bundle import android.util.Log @@ -8,9 +8,9 @@ import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.lifecycle.Observer -import com.scents.note.databinding.FragmentFilterIncenseSeriesBinding -import com.scents.note.ui.filter.FilterViewModel -import com.scents.note.ui.filter.FilterViewModelFactory +import com.scentsnote.android.databinding.FragmentFilterIncenseSeriesBinding +import com.scentsnote.android.ui.filter.FilterViewModel +import com.scentsnote.android.ui.filter.FilterViewModelFactory class FilterIncenseSeriesFragment : Fragment() { private lateinit var binding: FragmentFilterIncenseSeriesBinding diff --git a/app/src/main/java/com/scents/note/ui/filter/incense/IngredientFlexboxAdapter.kt b/app/src/main/java/com/scentsnote/android/ui/filter/incense/IngredientFlexboxAdapter.kt similarity index 96% rename from app/src/main/java/com/scents/note/ui/filter/incense/IngredientFlexboxAdapter.kt rename to app/src/main/java/com/scentsnote/android/ui/filter/incense/IngredientFlexboxAdapter.kt index 7e5fc284..10e12e8b 100644 --- a/app/src/main/java/com/scents/note/ui/filter/incense/IngredientFlexboxAdapter.kt +++ b/app/src/main/java/com/scentsnote/android/ui/filter/incense/IngredientFlexboxAdapter.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.filter.incense +package com.scentsnote.android.ui.filter.incense import android.util.Log import android.view.LayoutInflater @@ -7,8 +7,8 @@ import android.widget.Toast import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import com.scents.note.data.vo.response.SeriesIngredients -import com.scents.note.databinding.RvItemSeriesIngredientsFilterBinding +import com.scentsnote.android.data.vo.response.SeriesIngredients +import com.scentsnote.android.databinding.RvItemSeriesIngredientsFilterBinding class IngredientFlexboxAdapter( val ingredientsList: MutableList, diff --git a/app/src/main/java/com/scents/note/ui/filter/incense/SeriesIngredientsViewAdapter.kt b/app/src/main/java/com/scentsnote/android/ui/filter/incense/SeriesIngredientsViewAdapter.kt similarity index 92% rename from app/src/main/java/com/scents/note/ui/filter/incense/SeriesIngredientsViewAdapter.kt rename to app/src/main/java/com/scentsnote/android/ui/filter/incense/SeriesIngredientsViewAdapter.kt index 23a0dc2f..40599bb8 100644 --- a/app/src/main/java/com/scents/note/ui/filter/incense/SeriesIngredientsViewAdapter.kt +++ b/app/src/main/java/com/scentsnote/android/ui/filter/incense/SeriesIngredientsViewAdapter.kt @@ -1,13 +1,13 @@ -package com.scents.note.ui.filter.incense +package com.scentsnote.android.ui.filter.incense import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.scents.note.data.vo.response.SeriesInfo -import com.scents.note.data.vo.response.SeriesIngredients -import com.scents.note.databinding.RvItemFilterSeriesBinding +import com.scentsnote.android.data.vo.response.SeriesInfo +import com.scentsnote.android.data.vo.response.SeriesIngredients +import com.scentsnote.android.databinding.RvItemFilterSeriesBinding import com.google.android.flexbox.AlignItems import com.google.android.flexbox.FlexDirection import com.google.android.flexbox.FlexWrap diff --git a/app/src/main/java/com/scents/note/ui/filter/keyword/FilterKeywordFragment.kt b/app/src/main/java/com/scentsnote/android/ui/filter/keyword/FilterKeywordFragment.kt similarity index 88% rename from app/src/main/java/com/scents/note/ui/filter/keyword/FilterKeywordFragment.kt rename to app/src/main/java/com/scentsnote/android/ui/filter/keyword/FilterKeywordFragment.kt index 5aedd78f..dcd1a0f1 100644 --- a/app/src/main/java/com/scents/note/ui/filter/keyword/FilterKeywordFragment.kt +++ b/app/src/main/java/com/scentsnote/android/ui/filter/keyword/FilterKeywordFragment.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.filter.keyword +package com.scentsnote.android.ui.filter.keyword import android.content.Context import android.os.Bundle @@ -8,10 +8,10 @@ import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.lifecycle.Observer -import com.scents.note.databinding.FragmentFilterKeywordBinding -import com.scents.note.ui.filter.FilterViewModel -import com.scents.note.ui.filter.FilterViewModelFactory -import com.scents.note.util.FlexboxRecyclerViewAdapter +import com.scentsnote.android.databinding.FragmentFilterKeywordBinding +import com.scentsnote.android.ui.filter.FilterViewModel +import com.scentsnote.android.ui.filter.FilterViewModelFactory +import com.scentsnote.android.util.FlexboxRecyclerViewAdapter import com.google.android.flexbox.AlignItems import com.google.android.flexbox.FlexDirection import com.google.android.flexbox.FlexWrap diff --git a/app/src/main/java/com/scents/note/ui/home/HomeBinding.kt b/app/src/main/java/com/scentsnote/android/ui/home/HomeBinding.kt similarity index 89% rename from app/src/main/java/com/scents/note/ui/home/HomeBinding.kt rename to app/src/main/java/com/scentsnote/android/ui/home/HomeBinding.kt index 28383920..ba41f652 100644 --- a/app/src/main/java/com/scents/note/ui/home/HomeBinding.kt +++ b/app/src/main/java/com/scentsnote/android/ui/home/HomeBinding.kt @@ -1,11 +1,11 @@ -package com.scents.note.ui.home +package com.scentsnote.android.ui.home import androidx.databinding.BindingAdapter import androidx.recyclerview.widget.RecyclerView import androidx.viewpager2.widget.ViewPager2 -import com.scents.note.data.vo.response.HomePerfumeItem -import com.scents.note.data.vo.response.RecommendPerfumeItem -import com.scents.note.ui.home.adapter.* +import com.scentsnote.android.data.vo.response.HomePerfumeItem +import com.scentsnote.android.data.vo.response.RecommendPerfumeItem +import com.scentsnote.android.ui.home.adapter.* object HomeBinding { @JvmStatic diff --git a/app/src/main/java/com/scents/note/ui/home/HomeFragment.kt b/app/src/main/java/com/scentsnote/android/ui/home/HomeFragment.kt similarity index 90% rename from app/src/main/java/com/scents/note/ui/home/HomeFragment.kt rename to app/src/main/java/com/scentsnote/android/ui/home/HomeFragment.kt index 01e21833..8d949c30 100644 --- a/app/src/main/java/com/scents/note/ui/home/HomeFragment.kt +++ b/app/src/main/java/com/scentsnote/android/ui/home/HomeFragment.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.home +package com.scentsnote.android.ui.home import android.annotation.SuppressLint import android.content.Intent @@ -9,13 +9,13 @@ import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.viewModels import androidx.lifecycle.lifecycleScope -import com.scents.note.ScentsNoteApplication -import com.scents.note.R -import com.scents.note.databinding.FragmentHomeBinding -import com.scents.note.ui.home.adapter.NewListAdapter -import com.scents.note.ui.home.adapter.PopularListAdapter -import com.scents.note.ui.home.adapter.RecentListAdapter -import com.scents.note.ui.home.adapter.RecommendListAdapter +import com.scentsnote.android.ScentsNoteApplication +import com.scentsnote.android.R +import com.scentsnote.android.databinding.FragmentHomeBinding +import com.scentsnote.android.ui.home.adapter.NewListAdapter +import com.scentsnote.android.ui.home.adapter.PopularListAdapter +import com.scentsnote.android.ui.home.adapter.RecentListAdapter +import com.scentsnote.android.ui.home.adapter.RecommendListAdapter import java.util.* diff --git a/app/src/main/java/com/scents/note/ui/home/HomeViewModel.kt b/app/src/main/java/com/scentsnote/android/ui/home/HomeViewModel.kt similarity index 93% rename from app/src/main/java/com/scents/note/ui/home/HomeViewModel.kt rename to app/src/main/java/com/scentsnote/android/ui/home/HomeViewModel.kt index 602a2265..0a28e412 100644 --- a/app/src/main/java/com/scents/note/ui/home/HomeViewModel.kt +++ b/app/src/main/java/com/scentsnote/android/ui/home/HomeViewModel.kt @@ -1,15 +1,15 @@ -package com.scents.note.ui.home +package com.scentsnote.android.ui.home import android.util.Log import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.scents.note.ScentsNoteApplication -import com.scents.note.data.repository.HomeRepository -import com.scents.note.data.vo.response.HomePerfumeItem -import com.scents.note.data.vo.response.PerfumeInfo -import com.scents.note.data.vo.response.RecommendPerfumeItem +import com.scentsnote.android.ScentsNoteApplication +import com.scentsnote.android.data.repository.HomeRepository +import com.scentsnote.android.data.vo.response.HomePerfumeItem +import com.scentsnote.android.data.vo.response.PerfumeInfo +import com.scentsnote.android.data.vo.response.RecommendPerfumeItem import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/com/scents/note/ui/home/MoreNewPerfumeActivity.kt b/app/src/main/java/com/scentsnote/android/ui/home/MoreNewPerfumeActivity.kt similarity index 82% rename from app/src/main/java/com/scents/note/ui/home/MoreNewPerfumeActivity.kt rename to app/src/main/java/com/scentsnote/android/ui/home/MoreNewPerfumeActivity.kt index bf6c9ea9..a8d2edc6 100644 --- a/app/src/main/java/com/scents/note/ui/home/MoreNewPerfumeActivity.kt +++ b/app/src/main/java/com/scentsnote/android/ui/home/MoreNewPerfumeActivity.kt @@ -1,13 +1,13 @@ -package com.scents.note.ui.home +package com.scentsnote.android.ui.home import android.os.Bundle import android.view.View import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil -import com.scents.note.R -import com.scents.note.databinding.ActivityMoreNewPerfumeBinding -import com.scents.note.ui.home.adapter.MoreNewListAdapter +import com.scentsnote.android.R +import com.scentsnote.android.databinding.ActivityMoreNewPerfumeBinding +import com.scentsnote.android.ui.home.adapter.MoreNewListAdapter class MoreNewPerfumeActivity : AppCompatActivity() { lateinit var binding: ActivityMoreNewPerfumeBinding diff --git a/app/src/main/java/com/scents/note/ui/home/adapter/HashTagAdapter.kt b/app/src/main/java/com/scentsnote/android/ui/home/adapter/HashTagAdapter.kt similarity index 87% rename from app/src/main/java/com/scents/note/ui/home/adapter/HashTagAdapter.kt rename to app/src/main/java/com/scentsnote/android/ui/home/adapter/HashTagAdapter.kt index f736eeab..3e905b1a 100644 --- a/app/src/main/java/com/scents/note/ui/home/adapter/HashTagAdapter.kt +++ b/app/src/main/java/com/scentsnote/android/ui/home/adapter/HashTagAdapter.kt @@ -1,11 +1,11 @@ -package com.scents.note.ui.home.adapter +package com.scentsnote.android.ui.home.adapter import android.view.LayoutInflater import android.view.ViewGroup import androidx.databinding.DataBindingUtil import androidx.recyclerview.widget.RecyclerView -import com.scents.note.R -import com.scents.note.databinding.RvItemHomeHashTagBinding +import com.scentsnote.android.R +import com.scentsnote.android.databinding.RvItemHomeHashTagBinding class HashTagAdapter : RecyclerView.Adapter() { var data = listOf() diff --git a/app/src/main/java/com/scents/note/ui/home/adapter/MoreNewListAdapter.kt b/app/src/main/java/com/scentsnote/android/ui/home/adapter/MoreNewListAdapter.kt similarity index 85% rename from app/src/main/java/com/scents/note/ui/home/adapter/MoreNewListAdapter.kt rename to app/src/main/java/com/scentsnote/android/ui/home/adapter/MoreNewListAdapter.kt index c6081840..88f68873 100644 --- a/app/src/main/java/com/scents/note/ui/home/adapter/MoreNewListAdapter.kt +++ b/app/src/main/java/com/scentsnote/android/ui/home/adapter/MoreNewListAdapter.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.home.adapter +package com.scentsnote.android.ui.home.adapter import android.content.Context import android.content.Intent @@ -8,12 +8,12 @@ import android.view.ViewGroup import androidx.databinding.DataBindingUtil import androidx.fragment.app.FragmentManager import androidx.recyclerview.widget.RecyclerView -import com.scents.note.ScentsNoteApplication -import com.scents.note.R -import com.scents.note.data.vo.response.HomePerfumeItem -import com.scents.note.databinding.RvItemHomeMoreNewBinding -import com.scents.note.ui.detail.PerfumeDetailActivity -import com.scents.note.util.createDialog +import com.scentsnote.android.ScentsNoteApplication +import com.scentsnote.android.R +import com.scentsnote.android.data.vo.response.HomePerfumeItem +import com.scentsnote.android.databinding.RvItemHomeMoreNewBinding +import com.scentsnote.android.ui.detail.PerfumeDetailActivity +import com.scentsnote.android.util.createDialog class MoreNewListAdapter(private val context: Context, private val fragmentManager: FragmentManager, val clickBtnLike:(Int)->Unit) : RecyclerView.Adapter() { var data = mutableListOf() diff --git a/app/src/main/java/com/scents/note/ui/home/adapter/NewListAdapter.kt b/app/src/main/java/com/scentsnote/android/ui/home/adapter/NewListAdapter.kt similarity index 84% rename from app/src/main/java/com/scents/note/ui/home/adapter/NewListAdapter.kt rename to app/src/main/java/com/scentsnote/android/ui/home/adapter/NewListAdapter.kt index 588c263b..14cfe3d3 100644 --- a/app/src/main/java/com/scents/note/ui/home/adapter/NewListAdapter.kt +++ b/app/src/main/java/com/scentsnote/android/ui/home/adapter/NewListAdapter.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.home.adapter +package com.scentsnote.android.ui.home.adapter import android.content.Context import android.content.Intent @@ -8,12 +8,12 @@ import android.view.ViewGroup import androidx.databinding.DataBindingUtil import androidx.fragment.app.FragmentManager import androidx.recyclerview.widget.RecyclerView -import com.scents.note.ScentsNoteApplication -import com.scents.note.R -import com.scents.note.data.vo.response.HomePerfumeItem -import com.scents.note.databinding.RvItemHomeNewBinding -import com.scents.note.ui.detail.PerfumeDetailActivity -import com.scents.note.util.createDialog +import com.scentsnote.android.ScentsNoteApplication +import com.scentsnote.android.R +import com.scentsnote.android.data.vo.response.HomePerfumeItem +import com.scentsnote.android.databinding.RvItemHomeNewBinding +import com.scentsnote.android.ui.detail.PerfumeDetailActivity +import com.scentsnote.android.util.createDialog class NewListAdapter(private val context: Context, private val fragmentManager: FragmentManager, val clickBtnLike:(Int)->Unit) : RecyclerView.Adapter() { var data = mutableListOf() diff --git a/app/src/main/java/com/scents/note/ui/home/adapter/PopularListAdapter.kt b/app/src/main/java/com/scentsnote/android/ui/home/adapter/PopularListAdapter.kt similarity index 85% rename from app/src/main/java/com/scents/note/ui/home/adapter/PopularListAdapter.kt rename to app/src/main/java/com/scentsnote/android/ui/home/adapter/PopularListAdapter.kt index 5d296323..dea7eb08 100644 --- a/app/src/main/java/com/scents/note/ui/home/adapter/PopularListAdapter.kt +++ b/app/src/main/java/com/scentsnote/android/ui/home/adapter/PopularListAdapter.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.home.adapter +package com.scentsnote.android.ui.home.adapter import android.content.Context import android.content.Intent @@ -8,12 +8,12 @@ import android.view.ViewGroup import androidx.databinding.DataBindingUtil import androidx.fragment.app.FragmentManager import androidx.recyclerview.widget.RecyclerView -import com.scents.note.ScentsNoteApplication -import com.scents.note.R -import com.scents.note.data.vo.response.HomePerfumeItem -import com.scents.note.databinding.RvItemHomePopularBinding -import com.scents.note.ui.detail.PerfumeDetailActivity -import com.scents.note.util.createDialog +import com.scentsnote.android.ScentsNoteApplication +import com.scentsnote.android.R +import com.scentsnote.android.data.vo.response.HomePerfumeItem +import com.scentsnote.android.databinding.RvItemHomePopularBinding +import com.scentsnote.android.ui.detail.PerfumeDetailActivity +import com.scentsnote.android.util.createDialog class PopularListAdapter(private val context: Context, private val fragmentManager: FragmentManager, val clickBtnLike:(Int)->Unit) : RecyclerView.Adapter() { var data = mutableListOf() diff --git a/app/src/main/java/com/scents/note/ui/home/adapter/RecentListAdapter.kt b/app/src/main/java/com/scentsnote/android/ui/home/adapter/RecentListAdapter.kt similarity index 85% rename from app/src/main/java/com/scents/note/ui/home/adapter/RecentListAdapter.kt rename to app/src/main/java/com/scentsnote/android/ui/home/adapter/RecentListAdapter.kt index 0e9bdded..44f9e17e 100644 --- a/app/src/main/java/com/scents/note/ui/home/adapter/RecentListAdapter.kt +++ b/app/src/main/java/com/scentsnote/android/ui/home/adapter/RecentListAdapter.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.home.adapter +package com.scentsnote.android.ui.home.adapter import android.content.Context import android.content.Intent @@ -8,12 +8,12 @@ import android.view.ViewGroup import androidx.databinding.DataBindingUtil import androidx.fragment.app.FragmentManager import androidx.recyclerview.widget.RecyclerView -import com.scents.note.ScentsNoteApplication -import com.scents.note.R -import com.scents.note.data.vo.response.HomePerfumeItem -import com.scents.note.databinding.RvItemHomeRecentBinding -import com.scents.note.ui.detail.PerfumeDetailActivity -import com.scents.note.util.createDialog +import com.scentsnote.android.ScentsNoteApplication +import com.scentsnote.android.R +import com.scentsnote.android.data.vo.response.HomePerfumeItem +import com.scentsnote.android.databinding.RvItemHomeRecentBinding +import com.scentsnote.android.ui.detail.PerfumeDetailActivity +import com.scentsnote.android.util.createDialog class RecentListAdapter(private val context: Context, private val fragmentManager: FragmentManager, val clickBtnLike:(Int)->Unit) : RecyclerView.Adapter() { var data = mutableListOf() diff --git a/app/src/main/java/com/scents/note/ui/home/adapter/RecommendListAdapter.kt b/app/src/main/java/com/scentsnote/android/ui/home/adapter/RecommendListAdapter.kt similarity index 88% rename from app/src/main/java/com/scents/note/ui/home/adapter/RecommendListAdapter.kt rename to app/src/main/java/com/scentsnote/android/ui/home/adapter/RecommendListAdapter.kt index d4e40327..21653d55 100644 --- a/app/src/main/java/com/scents/note/ui/home/adapter/RecommendListAdapter.kt +++ b/app/src/main/java/com/scentsnote/android/ui/home/adapter/RecommendListAdapter.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.home.adapter +package com.scentsnote.android.ui.home.adapter import android.content.Context import android.content.Intent @@ -7,10 +7,10 @@ import android.view.View import android.view.ViewGroup import androidx.databinding.DataBindingUtil import androidx.recyclerview.widget.RecyclerView -import com.scents.note.R -import com.scents.note.data.vo.response.RecommendPerfumeItem -import com.scents.note.databinding.RvItemHomeRecommendBinding -import com.scents.note.ui.detail.PerfumeDetailActivity +import com.scentsnote.android.R +import com.scentsnote.android.data.vo.response.RecommendPerfumeItem +import com.scentsnote.android.databinding.RvItemHomeRecommendBinding +import com.scentsnote.android.ui.detail.PerfumeDetailActivity class RecommendListAdapter(private val context: Context) : RecyclerView.Adapter() { diff --git a/app/src/main/java/com/scents/note/ui/my/MyBinding.kt b/app/src/main/java/com/scentsnote/android/ui/my/MyBinding.kt similarity index 74% rename from app/src/main/java/com/scents/note/ui/my/MyBinding.kt rename to app/src/main/java/com/scentsnote/android/ui/my/MyBinding.kt index 06e53a9e..06b9d46b 100644 --- a/app/src/main/java/com/scents/note/ui/my/MyBinding.kt +++ b/app/src/main/java/com/scentsnote/android/ui/my/MyBinding.kt @@ -1,12 +1,12 @@ -package com.scents.note.ui.my +package com.scentsnote.android.ui.my import android.util.Log import androidx.databinding.BindingAdapter import androidx.recyclerview.widget.RecyclerView -import com.scents.note.data.vo.response.PerfumeInfo -import com.scents.note.data.vo.response.ResponseMyPerfume -import com.scents.note.ui.my.myperfume.MyPerfumeRecyclerViewAdapter -import com.scents.note.ui.my.wishlist.WishListAdapter +import com.scentsnote.android.data.vo.response.PerfumeInfo +import com.scentsnote.android.data.vo.response.ResponseMyPerfume +import com.scentsnote.android.ui.my.myperfume.MyPerfumeRecyclerViewAdapter +import com.scentsnote.android.ui.my.wishlist.WishListAdapter object MyBinding { @JvmStatic diff --git a/app/src/main/java/com/scents/note/ui/my/MyFragment.kt b/app/src/main/java/com/scentsnote/android/ui/my/MyFragment.kt similarity index 87% rename from app/src/main/java/com/scents/note/ui/my/MyFragment.kt rename to app/src/main/java/com/scentsnote/android/ui/my/MyFragment.kt index f62c64cc..1e93f38b 100644 --- a/app/src/main/java/com/scents/note/ui/my/MyFragment.kt +++ b/app/src/main/java/com/scentsnote/android/ui/my/MyFragment.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.my +package com.scentsnote.android.ui.my import android.content.Context import android.content.Intent @@ -11,20 +11,20 @@ import android.widget.TextView import androidx.activity.OnBackPressedCallback import androidx.core.view.GravityCompat import androidx.fragment.app.Fragment -import com.scents.note.ScentsNoteApplication -import com.scents.note.R -import com.scents.note.databinding.FragmentMypageBinding -import com.scents.note.ui.MainActivity -import com.scents.note.ui.filter.ScentsNoteViewPagerAdapter -import com.scents.note.ui.my.myperfume.MyPerfumeFragment -import com.scents.note.ui.my.wishlist.WishListFragment -import com.scents.note.ui.setting.EditMyInfoActivity -import com.scents.note.ui.setting.EditPasswordActivity -import com.scents.note.ui.signin.SignHomeActivity -import com.scents.note.util.TabSelectedListener -import com.scents.note.util.changeTabsFont -import com.scents.note.util.refreshFragment -import com.scents.note.util.toastLong +import com.scentsnote.android.ScentsNoteApplication +import com.scentsnote.android.R +import com.scentsnote.android.databinding.FragmentMypageBinding +import com.scentsnote.android.ui.MainActivity +import com.scentsnote.android.ui.filter.ScentsNoteViewPagerAdapter +import com.scentsnote.android.ui.my.myperfume.MyPerfumeFragment +import com.scentsnote.android.ui.my.wishlist.WishListFragment +import com.scentsnote.android.ui.setting.EditMyInfoActivity +import com.scentsnote.android.ui.setting.EditPasswordActivity +import com.scentsnote.android.ui.signin.SignHomeActivity +import com.scentsnote.android.util.TabSelectedListener +import com.scentsnote.android.util.changeTabsFont +import com.scentsnote.android.util.refreshFragment +import com.scentsnote.android.util.toastLong class MyFragment : Fragment() { private lateinit var binding: FragmentMypageBinding diff --git a/app/src/main/java/com/scents/note/ui/my/MyInquiryActivity.kt b/app/src/main/java/com/scentsnote/android/ui/my/MyInquiryActivity.kt similarity index 90% rename from app/src/main/java/com/scents/note/ui/my/MyInquiryActivity.kt rename to app/src/main/java/com/scentsnote/android/ui/my/MyInquiryActivity.kt index 95e5cea5..065efbf8 100644 --- a/app/src/main/java/com/scents/note/ui/my/MyInquiryActivity.kt +++ b/app/src/main/java/com/scentsnote/android/ui/my/MyInquiryActivity.kt @@ -1,12 +1,12 @@ -package com.scents.note.ui.my +package com.scentsnote.android.ui.my import android.annotation.SuppressLint import android.os.Bundle import android.webkit.WebViewClient import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil -import com.scents.note.R -import com.scents.note.databinding.ActivityMyInquiryBinding +import com.scentsnote.android.R +import com.scentsnote.android.databinding.ActivityMyInquiryBinding class MyInquiryActivity : AppCompatActivity() { lateinit var binding: ActivityMyInquiryBinding diff --git a/app/src/main/java/com/scents/note/ui/my/MyViewModel.kt b/app/src/main/java/com/scentsnote/android/ui/my/MyViewModel.kt similarity index 84% rename from app/src/main/java/com/scents/note/ui/my/MyViewModel.kt rename to app/src/main/java/com/scentsnote/android/ui/my/MyViewModel.kt index f15a8e6d..00d2c75f 100644 --- a/app/src/main/java/com/scents/note/ui/my/MyViewModel.kt +++ b/app/src/main/java/com/scentsnote/android/ui/my/MyViewModel.kt @@ -1,14 +1,14 @@ -package com.scents.note.ui.my +package com.scentsnote.android.ui.my import android.util.Log import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.scents.note.ScentsNoteApplication -import com.scents.note.data.repository.MyRepository -import com.scents.note.data.vo.response.PerfumeInfo -import com.scents.note.data.vo.response.ResponseMyPerfume +import com.scentsnote.android.ScentsNoteApplication +import com.scentsnote.android.data.repository.MyRepository +import com.scentsnote.android.data.vo.response.PerfumeInfo +import com.scentsnote.android.data.vo.response.ResponseMyPerfume import kotlinx.coroutines.launch import retrofit2.HttpException diff --git a/app/src/main/java/com/scents/note/ui/my/myperfume/MyPerfumeFragment.kt b/app/src/main/java/com/scentsnote/android/ui/my/myperfume/MyPerfumeFragment.kt similarity index 91% rename from app/src/main/java/com/scents/note/ui/my/myperfume/MyPerfumeFragment.kt rename to app/src/main/java/com/scentsnote/android/ui/my/myperfume/MyPerfumeFragment.kt index ea933592..7eae82ff 100644 --- a/app/src/main/java/com/scents/note/ui/my/myperfume/MyPerfumeFragment.kt +++ b/app/src/main/java/com/scentsnote/android/ui/my/myperfume/MyPerfumeFragment.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.my.myperfume +package com.scentsnote.android.ui.my.myperfume import android.content.Intent import android.os.Bundle @@ -9,11 +9,11 @@ import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.lifecycle.Observer -import com.scents.note.ScentsNoteApplication -import com.scents.note.databinding.FragmentMyPerfumeBinding -import com.scents.note.databinding.LayoutPleaseLoginBinding -import com.scents.note.ui.my.MyViewModel -import com.scents.note.ui.signin.SignHomeActivity +import com.scentsnote.android.ScentsNoteApplication +import com.scentsnote.android.databinding.FragmentMyPerfumeBinding +import com.scentsnote.android.databinding.LayoutPleaseLoginBinding +import com.scentsnote.android.ui.my.MyViewModel +import com.scentsnote.android.ui.signin.SignHomeActivity class MyPerfumeFragment : Fragment() { diff --git a/app/src/main/java/com/scents/note/ui/my/myperfume/MyPerfumeRecyclerViewAdapter.kt b/app/src/main/java/com/scentsnote/android/ui/my/myperfume/MyPerfumeRecyclerViewAdapter.kt similarity index 85% rename from app/src/main/java/com/scents/note/ui/my/myperfume/MyPerfumeRecyclerViewAdapter.kt rename to app/src/main/java/com/scentsnote/android/ui/my/myperfume/MyPerfumeRecyclerViewAdapter.kt index bbd6ae26..41a54e6e 100644 --- a/app/src/main/java/com/scents/note/ui/my/myperfume/MyPerfumeRecyclerViewAdapter.kt +++ b/app/src/main/java/com/scentsnote/android/ui/my/myperfume/MyPerfumeRecyclerViewAdapter.kt @@ -1,14 +1,14 @@ -package com.scents.note.ui.my.myperfume +package com.scentsnote.android.ui.my.myperfume import android.content.Intent import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.scents.note.data.vo.ParcelableWishList -import com.scents.note.data.vo.response.ResponseMyPerfume -import com.scents.note.databinding.RvItemMyMyperfumeBinding -import com.scents.note.ui.note.NoteActivity +import com.scentsnote.android.data.vo.ParcelableWishList +import com.scentsnote.android.data.vo.response.ResponseMyPerfume +import com.scentsnote.android.databinding.RvItemMyMyperfumeBinding +import com.scentsnote.android.ui.note.NoteActivity class MyPerfumeRecyclerViewAdapter() : RecyclerView.Adapter() { var data = listOf() diff --git a/app/src/main/java/com/scents/note/ui/my/myperfume/ShelfRecyclerViewAdapter.kt b/app/src/main/java/com/scentsnote/android/ui/my/myperfume/ShelfRecyclerViewAdapter.kt similarity index 86% rename from app/src/main/java/com/scents/note/ui/my/myperfume/ShelfRecyclerViewAdapter.kt rename to app/src/main/java/com/scentsnote/android/ui/my/myperfume/ShelfRecyclerViewAdapter.kt index 13303130..6971f687 100644 --- a/app/src/main/java/com/scents/note/ui/my/myperfume/ShelfRecyclerViewAdapter.kt +++ b/app/src/main/java/com/scentsnote/android/ui/my/myperfume/ShelfRecyclerViewAdapter.kt @@ -1,10 +1,10 @@ -package com.scents.note.ui.my.myperfume +package com.scentsnote.android.ui.my.myperfume import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.scents.note.R -import com.scents.note.databinding.RvItemMyPerfuemBgShelfBinding +import com.scentsnote.android.R +import com.scentsnote.android.databinding.RvItemMyPerfuemBgShelfBinding class ShelfRecyclerViewAdapter(val count: Int?) : RecyclerView.Adapter() { diff --git a/app/src/main/java/com/scents/note/ui/my/wishlist/WishListAdapter.kt b/app/src/main/java/com/scentsnote/android/ui/my/wishlist/WishListAdapter.kt similarity index 84% rename from app/src/main/java/com/scents/note/ui/my/wishlist/WishListAdapter.kt rename to app/src/main/java/com/scentsnote/android/ui/my/wishlist/WishListAdapter.kt index c84be9aa..c50700ba 100644 --- a/app/src/main/java/com/scents/note/ui/my/wishlist/WishListAdapter.kt +++ b/app/src/main/java/com/scentsnote/android/ui/my/wishlist/WishListAdapter.kt @@ -1,14 +1,14 @@ -package com.scents.note.ui.my.wishlist +package com.scentsnote.android.ui.my.wishlist import android.content.Intent import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.scents.note.data.vo.ParcelableWishList -import com.scents.note.data.vo.response.PerfumeInfo -import com.scents.note.databinding.RvItemMyWishlistBinding -import com.scents.note.ui.note.NoteActivity +import com.scentsnote.android.data.vo.ParcelableWishList +import com.scentsnote.android.data.vo.response.PerfumeInfo +import com.scentsnote.android.databinding.RvItemMyWishlistBinding +import com.scentsnote.android.ui.note.NoteActivity class WishListAdapter (): RecyclerView.Adapter(){ diff --git a/app/src/main/java/com/scents/note/ui/my/wishlist/WishListFragment.kt b/app/src/main/java/com/scentsnote/android/ui/my/wishlist/WishListFragment.kt similarity index 89% rename from app/src/main/java/com/scents/note/ui/my/wishlist/WishListFragment.kt rename to app/src/main/java/com/scentsnote/android/ui/my/wishlist/WishListFragment.kt index 428a9891..904cd277 100644 --- a/app/src/main/java/com/scents/note/ui/my/wishlist/WishListFragment.kt +++ b/app/src/main/java/com/scentsnote/android/ui/my/wishlist/WishListFragment.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.my.wishlist +package com.scentsnote.android.ui.my.wishlist import android.content.Intent import android.os.Bundle @@ -8,11 +8,11 @@ import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.lifecycle.Observer -import com.scents.note.ScentsNoteApplication -import com.scents.note.databinding.FragmentWishListBinding -import com.scents.note.databinding.LayoutPleaseLoginBinding -import com.scents.note.ui.my.MyViewModel -import com.scents.note.ui.signin.SignHomeActivity +import com.scentsnote.android.ScentsNoteApplication +import com.scentsnote.android.databinding.FragmentWishListBinding +import com.scentsnote.android.databinding.LayoutPleaseLoginBinding +import com.scentsnote.android.ui.my.MyViewModel +import com.scentsnote.android.ui.signin.SignHomeActivity class WishListFragment : Fragment() { diff --git a/app/src/main/java/com/scents/note/ui/note/KeywordBottomSheetFragment.kt b/app/src/main/java/com/scentsnote/android/ui/note/KeywordBottomSheetFragment.kt similarity index 91% rename from app/src/main/java/com/scents/note/ui/note/KeywordBottomSheetFragment.kt rename to app/src/main/java/com/scentsnote/android/ui/note/KeywordBottomSheetFragment.kt index 1195cbf5..ea21838e 100644 --- a/app/src/main/java/com/scents/note/ui/note/KeywordBottomSheetFragment.kt +++ b/app/src/main/java/com/scentsnote/android/ui/note/KeywordBottomSheetFragment.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.note +package com.scentsnote.android.ui.note import android.content.Context import android.os.Bundle @@ -6,8 +6,8 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.activityViewModels -import com.scents.note.databinding.FragmentKeywordBottomSheetBinding -import com.scents.note.util.NoteKeywordAdapter +import com.scentsnote.android.databinding.FragmentKeywordBottomSheetBinding +import com.scentsnote.android.util.NoteKeywordAdapter import com.google.android.flexbox.AlignItems import com.google.android.flexbox.FlexDirection import com.google.android.flexbox.FlexWrap diff --git a/app/src/main/java/com/scents/note/ui/note/NoteActivity.kt b/app/src/main/java/com/scentsnote/android/ui/note/NoteActivity.kt similarity index 96% rename from app/src/main/java/com/scents/note/ui/note/NoteActivity.kt rename to app/src/main/java/com/scentsnote/android/ui/note/NoteActivity.kt index 945d7d37..517bab9a 100644 --- a/app/src/main/java/com/scents/note/ui/note/NoteActivity.kt +++ b/app/src/main/java/com/scentsnote/android/ui/note/NoteActivity.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.note +package com.scentsnote.android.ui.note import android.content.Intent import android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP @@ -12,11 +12,11 @@ import androidx.core.content.ContextCompat import androidx.databinding.DataBindingUtil import androidx.lifecycle.LiveData import androidx.lifecycle.Observer -import com.scents.note.R -import com.scents.note.data.vo.ParcelableWishList -import com.scents.note.databinding.ActivityNoteBinding -import com.scents.note.ui.detail.PerfumeDetailActivity -import com.scents.note.util.* +import com.scentsnote.android.R +import com.scentsnote.android.data.vo.ParcelableWishList +import com.scentsnote.android.databinding.ActivityNoteBinding +import com.scentsnote.android.ui.detail.PerfumeDetailActivity +import com.scentsnote.android.util.* import com.google.android.flexbox.AlignItems import com.google.android.flexbox.FlexDirection import com.google.android.flexbox.FlexWrap diff --git a/app/src/main/java/com/scents/note/ui/note/NoteBinding.kt b/app/src/main/java/com/scentsnote/android/ui/note/NoteBinding.kt similarity index 73% rename from app/src/main/java/com/scents/note/ui/note/NoteBinding.kt rename to app/src/main/java/com/scentsnote/android/ui/note/NoteBinding.kt index f91edda0..cde1674d 100644 --- a/app/src/main/java/com/scents/note/ui/note/NoteBinding.kt +++ b/app/src/main/java/com/scentsnote/android/ui/note/NoteBinding.kt @@ -1,9 +1,9 @@ -package com.scents.note.ui.note +package com.scentsnote.android.ui.note import androidx.databinding.BindingAdapter import androidx.recyclerview.widget.RecyclerView -import com.scents.note.data.vo.response.KeywordInfo -import com.scents.note.util.NoteKeywordAdapter +import com.scentsnote.android.data.vo.response.KeywordInfo +import com.scentsnote.android.util.NoteKeywordAdapter object NoteBinding { @JvmStatic diff --git a/app/src/main/java/com/scents/note/ui/note/NoteKeywordAdapter.kt b/app/src/main/java/com/scentsnote/android/ui/note/NoteKeywordAdapter.kt similarity index 95% rename from app/src/main/java/com/scents/note/ui/note/NoteKeywordAdapter.kt rename to app/src/main/java/com/scentsnote/android/ui/note/NoteKeywordAdapter.kt index da67c671..1fc15112 100644 --- a/app/src/main/java/com/scents/note/ui/note/NoteKeywordAdapter.kt +++ b/app/src/main/java/com/scentsnote/android/ui/note/NoteKeywordAdapter.kt @@ -1,4 +1,4 @@ -package com.scents.note.util +package com.scentsnote.android.util import android.view.LayoutInflater import android.view.ViewGroup @@ -8,9 +8,9 @@ import androidx.recyclerview.selection.SelectionTracker import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import com.scents.note.R -import com.scents.note.data.vo.response.KeywordInfo -import com.scents.note.databinding.RvItemFilterFlexboxBinding +import com.scentsnote.android.R +import com.scentsnote.android.data.vo.response.KeywordInfo +import com.scentsnote.android.databinding.RvItemFilterFlexboxBinding class NoteKeywordAdapter(private val type : Int, internal val select:(KeywordInfo, Boolean)->Unit) : ListAdapter( diff --git a/app/src/main/java/com/scents/note/ui/note/NoteViewModel.kt b/app/src/main/java/com/scentsnote/android/ui/note/NoteViewModel.kt similarity index 95% rename from app/src/main/java/com/scents/note/ui/note/NoteViewModel.kt rename to app/src/main/java/com/scentsnote/android/ui/note/NoteViewModel.kt index 9b96f8e4..5554c93a 100644 --- a/app/src/main/java/com/scents/note/ui/note/NoteViewModel.kt +++ b/app/src/main/java/com/scentsnote/android/ui/note/NoteViewModel.kt @@ -1,19 +1,19 @@ -package com.scents.note.ui.note +package com.scentsnote.android.ui.note import android.util.Log import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.scents.note.ScentsNoteApplication -import com.scents.note.data.repository.NoteRepository -import com.scents.note.data.repository.SurveyRepository -import com.scents.note.data.vo.request.RequestReview -import com.scents.note.data.vo.response.BrandItem -import com.scents.note.data.vo.response.KeywordInfo -import com.scents.note.data.vo.response.PerfumeItem -import com.scents.note.data.vo.response.ResponseReview -import com.scents.note.util.SingleLiveEvent +import com.scentsnote.android.ScentsNoteApplication +import com.scentsnote.android.data.repository.NoteRepository +import com.scentsnote.android.data.repository.SurveyRepository +import com.scentsnote.android.data.vo.request.RequestReview +import com.scentsnote.android.data.vo.response.BrandItem +import com.scentsnote.android.data.vo.response.KeywordInfo +import com.scentsnote.android.data.vo.response.PerfumeItem +import com.scentsnote.android.data.vo.response.ResponseReview +import com.scentsnote.android.util.SingleLiveEvent import kotlinx.coroutines.launch import retrofit2.HttpException diff --git a/app/src/main/java/com/scents/note/ui/search/DefaultPerfumeRecyclerViewAdapter.kt b/app/src/main/java/com/scentsnote/android/ui/search/DefaultPerfumeRecyclerViewAdapter.kt similarity index 86% rename from app/src/main/java/com/scents/note/ui/search/DefaultPerfumeRecyclerViewAdapter.kt rename to app/src/main/java/com/scentsnote/android/ui/search/DefaultPerfumeRecyclerViewAdapter.kt index bad825f1..4bc1e127 100644 --- a/app/src/main/java/com/scents/note/ui/search/DefaultPerfumeRecyclerViewAdapter.kt +++ b/app/src/main/java/com/scentsnote/android/ui/search/DefaultPerfumeRecyclerViewAdapter.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.search +package com.scentsnote.android.ui.search import android.content.Context import android.content.Intent @@ -7,11 +7,11 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.FragmentManager import androidx.recyclerview.widget.RecyclerView -import com.scents.note.ScentsNoteApplication -import com.scents.note.data.vo.response.PerfumeInfo -import com.scents.note.databinding.RvItemDefaultPerfumeBinding -import com.scents.note.ui.detail.PerfumeDetailActivity -import com.scents.note.util.createDialog +import com.scentsnote.android.ScentsNoteApplication +import com.scentsnote.android.data.vo.response.PerfumeInfo +import com.scentsnote.android.databinding.RvItemDefaultPerfumeBinding +import com.scentsnote.android.ui.detail.PerfumeDetailActivity +import com.scentsnote.android.util.createDialog class DefaultPerfumeRecyclerViewAdapter(val context: Context, val fragmentManager: FragmentManager, val clickBtnHeart:(Int)->Unit) : diff --git a/app/src/main/java/com/scents/note/ui/search/SearchBinding.kt b/app/src/main/java/com/scentsnote/android/ui/search/SearchBinding.kt similarity index 88% rename from app/src/main/java/com/scents/note/ui/search/SearchBinding.kt rename to app/src/main/java/com/scentsnote/android/ui/search/SearchBinding.kt index 870a0f75..11c731c2 100644 --- a/app/src/main/java/com/scents/note/ui/search/SearchBinding.kt +++ b/app/src/main/java/com/scentsnote/android/ui/search/SearchBinding.kt @@ -1,11 +1,11 @@ -package com.scents.note.ui.search +package com.scentsnote.android.ui.search import android.util.Log import android.widget.ImageView import androidx.databinding.BindingAdapter import androidx.recyclerview.widget.RecyclerView -import com.scents.note.data.vo.request.SendFilter -import com.scents.note.data.vo.response.PerfumeInfo +import com.scentsnote.android.data.vo.request.SendFilter +import com.scentsnote.android.data.vo.response.PerfumeInfo import com.bumptech.glide.Glide object SearchBinding { diff --git a/app/src/main/java/com/scents/note/ui/search/SearchResultFragment.kt b/app/src/main/java/com/scentsnote/android/ui/search/SearchResultFragment.kt similarity index 94% rename from app/src/main/java/com/scents/note/ui/search/SearchResultFragment.kt rename to app/src/main/java/com/scentsnote/android/ui/search/SearchResultFragment.kt index a0c76c0a..7dce322c 100644 --- a/app/src/main/java/com/scents/note/ui/search/SearchResultFragment.kt +++ b/app/src/main/java/com/scentsnote/android/ui/search/SearchResultFragment.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.search +package com.scentsnote.android.ui.search import android.content.Context import android.content.Intent @@ -12,9 +12,9 @@ import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import androidx.navigation.fragment.findNavController -import com.scents.note.databinding.FragmentSearchBinding -import com.scents.note.ui.MainActivity -import com.scents.note.ui.filter.FilterActivity +import com.scentsnote.android.databinding.FragmentSearchBinding +import com.scentsnote.android.ui.MainActivity +import com.scentsnote.android.ui.filter.FilterActivity class SearchResultFragment : Fragment() { diff --git a/app/src/main/java/com/scents/note/ui/search/SearchTextActivity.kt b/app/src/main/java/com/scentsnote/android/ui/search/SearchTextActivity.kt similarity index 84% rename from app/src/main/java/com/scents/note/ui/search/SearchTextActivity.kt rename to app/src/main/java/com/scentsnote/android/ui/search/SearchTextActivity.kt index e378e29f..f62c4f59 100644 --- a/app/src/main/java/com/scents/note/ui/search/SearchTextActivity.kt +++ b/app/src/main/java/com/scentsnote/android/ui/search/SearchTextActivity.kt @@ -1,12 +1,12 @@ -package com.scents.note.ui.search +package com.scentsnote.android.ui.search import android.content.Intent import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil -import com.scents.note.R -import com.scents.note.databinding.ActivitySearchTextBinding -import com.scents.note.ui.MainActivity +import com.scentsnote.android.R +import com.scentsnote.android.databinding.ActivitySearchTextBinding +import com.scentsnote.android.ui.MainActivity class SearchTextActivity : AppCompatActivity() { private lateinit var binding : ActivitySearchTextBinding diff --git a/app/src/main/java/com/scents/note/ui/search/SearchViewModel.kt b/app/src/main/java/com/scentsnote/android/ui/search/SearchViewModel.kt similarity index 92% rename from app/src/main/java/com/scents/note/ui/search/SearchViewModel.kt rename to app/src/main/java/com/scentsnote/android/ui/search/SearchViewModel.kt index 8fab5784..de970dcd 100644 --- a/app/src/main/java/com/scents/note/ui/search/SearchViewModel.kt +++ b/app/src/main/java/com/scentsnote/android/ui/search/SearchViewModel.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.search +package com.scentsnote.android.ui.search import android.content.Context import android.util.Log @@ -6,12 +6,12 @@ import android.widget.Toast import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.scents.note.ScentsNoteApplication -import com.scents.note.data.repository.SearchRepository -import com.scents.note.data.vo.request.FilterInfoP -import com.scents.note.data.vo.request.RequestSearch -import com.scents.note.data.vo.request.SendFilter -import com.scents.note.data.vo.response.PerfumeInfo +import com.scentsnote.android.ScentsNoteApplication +import com.scentsnote.android.data.repository.SearchRepository +import com.scentsnote.android.data.vo.request.FilterInfoP +import com.scentsnote.android.data.vo.request.RequestSearch +import com.scentsnote.android.data.vo.request.SendFilter +import com.scentsnote.android.data.vo.response.PerfumeInfo import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/com/scents/note/ui/search/SelectedFilterRecyclerViewAdapter.kt b/app/src/main/java/com/scentsnote/android/ui/search/SelectedFilterRecyclerViewAdapter.kt similarity index 86% rename from app/src/main/java/com/scents/note/ui/search/SelectedFilterRecyclerViewAdapter.kt rename to app/src/main/java/com/scentsnote/android/ui/search/SelectedFilterRecyclerViewAdapter.kt index 0b09ddbb..a0506e26 100644 --- a/app/src/main/java/com/scents/note/ui/search/SelectedFilterRecyclerViewAdapter.kt +++ b/app/src/main/java/com/scentsnote/android/ui/search/SelectedFilterRecyclerViewAdapter.kt @@ -1,12 +1,12 @@ -package com.scents.note.ui.search +package com.scentsnote.android.ui.search import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.scents.note.data.vo.request.FilterInfoP -import com.scents.note.data.vo.request.SendFilter -import com.scents.note.databinding.RvItemSearchFilterBinding +import com.scentsnote.android.data.vo.request.FilterInfoP +import com.scentsnote.android.data.vo.request.SendFilter +import com.scentsnote.android.databinding.RvItemSearchFilterBinding class SelectedFilterRecyclerViewAdapter(val btnCancel:(FilterInfoP?)->Unit) : RecyclerView.Adapter() { diff --git a/app/src/main/java/com/scents/note/ui/search/SerchHomeFragment.kt b/app/src/main/java/com/scentsnote/android/ui/search/SerchHomeFragment.kt similarity index 92% rename from app/src/main/java/com/scents/note/ui/search/SerchHomeFragment.kt rename to app/src/main/java/com/scentsnote/android/ui/search/SerchHomeFragment.kt index 7953d375..d6b6a3bb 100644 --- a/app/src/main/java/com/scents/note/ui/search/SerchHomeFragment.kt +++ b/app/src/main/java/com/scentsnote/android/ui/search/SerchHomeFragment.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.search +package com.scentsnote.android.ui.search import android.content.Context import android.content.Intent @@ -9,9 +9,9 @@ import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.lifecycle.lifecycleScope -import com.scents.note.ScentsNoteApplication -import com.scents.note.databinding.FragmentSearchBinding -import com.scents.note.ui.filter.FilterActivity +import com.scentsnote.android.ScentsNoteApplication +import com.scentsnote.android.databinding.FragmentSearchBinding +import com.scentsnote.android.ui.filter.FilterActivity class SearchHomeFragment : Fragment() { diff --git a/app/src/main/java/com/scents/note/ui/search/SingleViewModelFactory.kt b/app/src/main/java/com/scentsnote/android/ui/search/SingleViewModelFactory.kt similarity index 94% rename from app/src/main/java/com/scents/note/ui/search/SingleViewModelFactory.kt rename to app/src/main/java/com/scentsnote/android/ui/search/SingleViewModelFactory.kt index b63195e3..87a70b1c 100644 --- a/app/src/main/java/com/scents/note/ui/search/SingleViewModelFactory.kt +++ b/app/src/main/java/com/scentsnote/android/ui/search/SingleViewModelFactory.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.search +package com.scentsnote.android.ui.search import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider diff --git a/app/src/main/java/com/scents/note/ui/setting/EditMyInfoActivity.kt b/app/src/main/java/com/scentsnote/android/ui/setting/EditMyInfoActivity.kt similarity index 91% rename from app/src/main/java/com/scents/note/ui/setting/EditMyInfoActivity.kt rename to app/src/main/java/com/scentsnote/android/ui/setting/EditMyInfoActivity.kt index f2a25604..fee831fd 100644 --- a/app/src/main/java/com/scents/note/ui/setting/EditMyInfoActivity.kt +++ b/app/src/main/java/com/scentsnote/android/ui/setting/EditMyInfoActivity.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.setting +package com.scentsnote.android.ui.setting import android.os.Bundle import android.view.View @@ -8,11 +8,11 @@ import androidx.databinding.DataBindingUtil import androidx.fragment.app.DialogFragment import androidx.lifecycle.LiveData import androidx.lifecycle.Observer -import com.scents.note.R -import com.scents.note.databinding.ActivityMyInfoEditBinding -import com.scents.note.util.CommonDialog -import com.scents.note.util.YearPickerDialog -import com.scents.note.util.toast +import com.scentsnote.android.R +import com.scentsnote.android.databinding.ActivityMyInfoEditBinding +import com.scentsnote.android.util.CommonDialog +import com.scentsnote.android.util.YearPickerDialog +import com.scentsnote.android.util.toast class EditMyInfoActivity : AppCompatActivity() { private lateinit var binding : ActivityMyInfoEditBinding diff --git a/app/src/main/java/com/scents/note/ui/setting/EditMyInfoViewModel.kt b/app/src/main/java/com/scentsnote/android/ui/setting/EditMyInfoViewModel.kt similarity index 97% rename from app/src/main/java/com/scents/note/ui/setting/EditMyInfoViewModel.kt rename to app/src/main/java/com/scentsnote/android/ui/setting/EditMyInfoViewModel.kt index d7acf51c..b510a0ba 100644 --- a/app/src/main/java/com/scents/note/ui/setting/EditMyInfoViewModel.kt +++ b/app/src/main/java/com/scentsnote/android/ui/setting/EditMyInfoViewModel.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.setting +package com.scentsnote.android.ui.setting import android.os.Handler import android.util.Log @@ -6,12 +6,12 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.scents.note.ScentsNoteApplication -import com.scents.note.data.repository.EditMyInfoRepository -import com.scents.note.data.repository.SignRepository -import com.scents.note.data.vo.request.RequestEditMyInfo -import com.scents.note.data.vo.request.RequestEditPassword -import com.scents.note.util.SingleLiveEvent +import com.scentsnote.android.ScentsNoteApplication +import com.scentsnote.android.data.repository.EditMyInfoRepository +import com.scentsnote.android.data.repository.SignRepository +import com.scentsnote.android.data.vo.request.RequestEditMyInfo +import com.scentsnote.android.data.vo.request.RequestEditPassword +import com.scentsnote.android.util.SingleLiveEvent import kotlinx.coroutines.launch import retrofit2.HttpException import java.util.regex.Pattern diff --git a/app/src/main/java/com/scents/note/ui/setting/EditPasswordActivity.kt b/app/src/main/java/com/scentsnote/android/ui/setting/EditPasswordActivity.kt similarity index 93% rename from app/src/main/java/com/scents/note/ui/setting/EditPasswordActivity.kt rename to app/src/main/java/com/scentsnote/android/ui/setting/EditPasswordActivity.kt index 03373e06..7f0efb71 100644 --- a/app/src/main/java/com/scents/note/ui/setting/EditPasswordActivity.kt +++ b/app/src/main/java/com/scentsnote/android/ui/setting/EditPasswordActivity.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.setting +package com.scentsnote.android.ui.setting import android.os.Bundle import android.view.View @@ -6,13 +6,12 @@ import android.view.animation.AnimationUtils import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil -import androidx.lifecycle.LiveData import androidx.lifecycle.Observer -import com.scents.note.R -import com.scents.note.databinding.ActivityPasswordEditBinding -import com.scents.note.util.CommonDialog -import com.scents.note.util.setKeyboard -import com.scents.note.util.toast +import com.scentsnote.android.R +import com.scentsnote.android.databinding.ActivityPasswordEditBinding +import com.scentsnote.android.util.CommonDialog +import com.scentsnote.android.util.setKeyboard +import com.scentsnote.android.util.toast class EditPasswordActivity : AppCompatActivity() { lateinit var binding : ActivityPasswordEditBinding diff --git a/app/src/main/java/com/scents/note/ui/signin/SignHomeActivity.kt b/app/src/main/java/com/scentsnote/android/ui/signin/SignHomeActivity.kt similarity index 73% rename from app/src/main/java/com/scents/note/ui/signin/SignHomeActivity.kt rename to app/src/main/java/com/scentsnote/android/ui/signin/SignHomeActivity.kt index 0f981d2e..2b15659e 100644 --- a/app/src/main/java/com/scents/note/ui/signin/SignHomeActivity.kt +++ b/app/src/main/java/com/scentsnote/android/ui/signin/SignHomeActivity.kt @@ -1,13 +1,13 @@ -package com.scents.note.ui.signin +package com.scentsnote.android.ui.signin import android.os.Bundle import android.view.View import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil -import com.scents.note.R -import com.scents.note.databinding.ActivitySignHomeBinding -import com.scents.note.ui.signup.SignUpEmailActivity -import com.scents.note.util.startActivity +import com.scentsnote.android.R +import com.scentsnote.android.databinding.ActivitySignHomeBinding +import com.scentsnote.android.ui.signup.SignUpEmailActivity +import com.scentsnote.android.util.startActivity class SignHomeActivity : AppCompatActivity() { lateinit var binding: ActivitySignHomeBinding diff --git a/app/src/main/java/com/scents/note/ui/signin/SignInActivity.kt b/app/src/main/java/com/scentsnote/android/ui/signin/SignInActivity.kt similarity index 81% rename from app/src/main/java/com/scents/note/ui/signin/SignInActivity.kt rename to app/src/main/java/com/scentsnote/android/ui/signin/SignInActivity.kt index 3566bb85..7bd9bade 100644 --- a/app/src/main/java/com/scents/note/ui/signin/SignInActivity.kt +++ b/app/src/main/java/com/scentsnote/android/ui/signin/SignInActivity.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.signin +package com.scentsnote.android.ui.signin import android.os.Bundle import android.view.View @@ -6,12 +6,12 @@ import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil import androidx.lifecycle.Observer -import com.scents.note.R -import com.scents.note.databinding.ActivitySignInBinding -import com.scents.note.ui.MainActivity -import com.scents.note.ui.signup.SignUpEmailActivity -import com.scents.note.util.startActivity -import com.scents.note.util.startActivityWithFinish +import com.scentsnote.android.R +import com.scentsnote.android.databinding.ActivitySignInBinding +import com.scentsnote.android.ui.MainActivity +import com.scentsnote.android.ui.signup.SignUpEmailActivity +import com.scentsnote.android.util.startActivity +import com.scentsnote.android.util.startActivityWithFinish class SignInActivity : AppCompatActivity() { lateinit var binding: ActivitySignInBinding diff --git a/app/src/main/java/com/scents/note/ui/signin/SignInViewModel.kt b/app/src/main/java/com/scentsnote/android/ui/signin/SignInViewModel.kt similarity index 95% rename from app/src/main/java/com/scents/note/ui/signin/SignInViewModel.kt rename to app/src/main/java/com/scentsnote/android/ui/signin/SignInViewModel.kt index 86767471..b60b2920 100644 --- a/app/src/main/java/com/scents/note/ui/signin/SignInViewModel.kt +++ b/app/src/main/java/com/scentsnote/android/ui/signin/SignInViewModel.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.signin +package com.scentsnote.android.ui.signin import android.os.Handler import android.util.Log @@ -6,9 +6,9 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.scents.note.ScentsNoteApplication -import com.scents.note.data.repository.SignRepository -import com.scents.note.data.vo.request.RequestLogin +import com.scentsnote.android.ScentsNoteApplication +import com.scentsnote.android.data.repository.SignRepository +import com.scentsnote.android.data.vo.request.RequestLogin import kotlinx.coroutines.launch import retrofit2.HttpException diff --git a/app/src/main/java/com/scents/note/ui/signup/PrivacyPolicyActivity.kt b/app/src/main/java/com/scentsnote/android/ui/signup/PrivacyPolicyActivity.kt similarity index 87% rename from app/src/main/java/com/scents/note/ui/signup/PrivacyPolicyActivity.kt rename to app/src/main/java/com/scentsnote/android/ui/signup/PrivacyPolicyActivity.kt index 63adae9a..d80077aa 100644 --- a/app/src/main/java/com/scents/note/ui/signup/PrivacyPolicyActivity.kt +++ b/app/src/main/java/com/scentsnote/android/ui/signup/PrivacyPolicyActivity.kt @@ -1,10 +1,10 @@ -package com.scents.note.ui.signup +package com.scentsnote.android.ui.signup import android.os.Bundle import android.widget.ImageView import android.widget.TextView import androidx.appcompat.app.AppCompatActivity -import com.scents.note.R +import com.scentsnote.android.R class PrivacyPolicyActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/scents/note/ui/signup/SignUpAgeActivity.kt b/app/src/main/java/com/scentsnote/android/ui/signup/SignUpAgeActivity.kt similarity index 81% rename from app/src/main/java/com/scents/note/ui/signup/SignUpAgeActivity.kt rename to app/src/main/java/com/scentsnote/android/ui/signup/SignUpAgeActivity.kt index 5dcd8516..e06af340 100644 --- a/app/src/main/java/com/scents/note/ui/signup/SignUpAgeActivity.kt +++ b/app/src/main/java/com/scentsnote/android/ui/signup/SignUpAgeActivity.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.signup +package com.scentsnote.android.ui.signup import android.os.Bundle import android.view.View @@ -7,11 +7,11 @@ import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil import androidx.fragment.app.DialogFragment import androidx.lifecycle.Observer -import com.scents.note.R -import com.scents.note.databinding.ActivitySignUpAgeBinding -import com.scents.note.ui.survey.SurveyActivity -import com.scents.note.util.YearPickerDialog -import com.scents.note.util.startActivityWithFinish +import com.scentsnote.android.R +import com.scentsnote.android.databinding.ActivitySignUpAgeBinding +import com.scentsnote.android.ui.survey.SurveyActivity +import com.scentsnote.android.util.YearPickerDialog +import com.scentsnote.android.util.startActivityWithFinish class SignUpAgeActivity : AppCompatActivity() { lateinit var binding: ActivitySignUpAgeBinding diff --git a/app/src/main/java/com/scents/note/ui/signup/SignUpEmailActivity.kt b/app/src/main/java/com/scentsnote/android/ui/signup/SignUpEmailActivity.kt similarity index 91% rename from app/src/main/java/com/scents/note/ui/signup/SignUpEmailActivity.kt rename to app/src/main/java/com/scentsnote/android/ui/signup/SignUpEmailActivity.kt index ca208f4a..fd843c1b 100644 --- a/app/src/main/java/com/scents/note/ui/signup/SignUpEmailActivity.kt +++ b/app/src/main/java/com/scentsnote/android/ui/signup/SignUpEmailActivity.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.signup +package com.scentsnote.android.ui.signup import android.content.Intent import android.os.Bundle @@ -9,10 +9,10 @@ import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil import androidx.lifecycle.LiveData import androidx.lifecycle.Observer -import com.scents.note.R -import com.scents.note.databinding.ActivitySignUpEmailBinding -import com.scents.note.util.setKeyboard -import com.scents.note.util.startActivity +import com.scentsnote.android.R +import com.scentsnote.android.databinding.ActivitySignUpEmailBinding +import com.scentsnote.android.util.setKeyboard +import com.scentsnote.android.util.startActivity class SignUpEmailActivity : AppCompatActivity() { private lateinit var binding: ActivitySignUpEmailBinding diff --git a/app/src/main/java/com/scents/note/ui/signup/SignUpGenderActivity.kt b/app/src/main/java/com/scentsnote/android/ui/signup/SignUpGenderActivity.kt similarity index 81% rename from app/src/main/java/com/scents/note/ui/signup/SignUpGenderActivity.kt rename to app/src/main/java/com/scentsnote/android/ui/signup/SignUpGenderActivity.kt index d5d21b06..2a55af07 100644 --- a/app/src/main/java/com/scents/note/ui/signup/SignUpGenderActivity.kt +++ b/app/src/main/java/com/scentsnote/android/ui/signup/SignUpGenderActivity.kt @@ -1,13 +1,13 @@ -package com.scents.note.ui.signup +package com.scentsnote.android.ui.signup import android.os.Bundle import android.view.View import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil -import com.scents.note.R -import com.scents.note.databinding.ActivitySignUpGenderBinding -import com.scents.note.util.startActivity +import com.scentsnote.android.R +import com.scentsnote.android.databinding.ActivitySignUpGenderBinding +import com.scentsnote.android.util.startActivity class SignUpGenderActivity : AppCompatActivity() { lateinit var binding: ActivitySignUpGenderBinding diff --git a/app/src/main/java/com/scents/note/ui/signup/SignUpPasswordActivity.kt b/app/src/main/java/com/scentsnote/android/ui/signup/SignUpPasswordActivity.kt similarity index 89% rename from app/src/main/java/com/scents/note/ui/signup/SignUpPasswordActivity.kt rename to app/src/main/java/com/scentsnote/android/ui/signup/SignUpPasswordActivity.kt index 0d86363f..8cf04828 100644 --- a/app/src/main/java/com/scents/note/ui/signup/SignUpPasswordActivity.kt +++ b/app/src/main/java/com/scentsnote/android/ui/signup/SignUpPasswordActivity.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.signup +package com.scentsnote.android.ui.signup import android.os.Bundle import android.view.View @@ -7,10 +7,10 @@ import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil import androidx.lifecycle.Observer -import com.scents.note.R -import com.scents.note.databinding.ActivitySignUpPasswordBinding -import com.scents.note.util.setKeyboard -import com.scents.note.util.startActivity +import com.scentsnote.android.R +import com.scentsnote.android.databinding.ActivitySignUpPasswordBinding +import com.scentsnote.android.util.setKeyboard +import com.scentsnote.android.util.startActivity class SignUpPasswordActivity : AppCompatActivity() { lateinit var binding: ActivitySignUpPasswordBinding diff --git a/app/src/main/java/com/scents/note/ui/signup/SignUpViewModel.kt b/app/src/main/java/com/scentsnote/android/ui/signup/SignUpViewModel.kt similarity index 98% rename from app/src/main/java/com/scents/note/ui/signup/SignUpViewModel.kt rename to app/src/main/java/com/scentsnote/android/ui/signup/SignUpViewModel.kt index 3f37c857..2316d2b4 100644 --- a/app/src/main/java/com/scents/note/ui/signup/SignUpViewModel.kt +++ b/app/src/main/java/com/scentsnote/android/ui/signup/SignUpViewModel.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.signup +package com.scentsnote.android.ui.signup import android.os.Handler import android.util.Log @@ -6,9 +6,9 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.scents.note.ScentsNoteApplication -import com.scents.note.data.repository.SignRepository -import com.scents.note.data.vo.request.RequestRegister +import com.scentsnote.android.ScentsNoteApplication +import com.scentsnote.android.data.repository.SignRepository +import com.scentsnote.android.data.vo.request.RequestRegister import kotlinx.coroutines.launch import retrofit2.HttpException import java.util.regex.Pattern diff --git a/app/src/main/java/com/scents/note/ui/splash/SplashActivity.kt b/app/src/main/java/com/scentsnote/android/ui/splash/SplashActivity.kt similarity index 88% rename from app/src/main/java/com/scents/note/ui/splash/SplashActivity.kt rename to app/src/main/java/com/scentsnote/android/ui/splash/SplashActivity.kt index 97d09cb8..91c95f27 100644 --- a/app/src/main/java/com/scents/note/ui/splash/SplashActivity.kt +++ b/app/src/main/java/com/scentsnote/android/ui/splash/SplashActivity.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.splash +package com.scentsnote.android.ui.splash import android.content.Intent import android.net.Uri @@ -8,14 +8,14 @@ import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil import androidx.fragment.app.DialogFragment -import com.scents.note.ScentsNoteApplication -import com.scents.note.R -import com.scents.note.databinding.ActivitySplashBinding -import com.scents.note.ui.MainActivity -import com.scents.note.ui.survey.SurveyActivity -import com.scents.note.util.AppUpdateDialog -import com.scents.note.util.startActivityWithFinish -import com.scents.note.util.toast +import com.scentsnote.android.ScentsNoteApplication +import com.scentsnote.android.R +import com.scentsnote.android.databinding.ActivitySplashBinding +import com.scentsnote.android.ui.MainActivity +import com.scentsnote.android.ui.survey.SurveyActivity +import com.scentsnote.android.util.AppUpdateDialog +import com.scentsnote.android.util.startActivityWithFinish +import com.scentsnote.android.util.toast class SplashActivity : AppCompatActivity() { diff --git a/app/src/main/java/com/scents/note/ui/splash/SplashViewModel.kt b/app/src/main/java/com/scentsnote/android/ui/splash/SplashViewModel.kt similarity index 86% rename from app/src/main/java/com/scents/note/ui/splash/SplashViewModel.kt rename to app/src/main/java/com/scentsnote/android/ui/splash/SplashViewModel.kt index 0bfb3e81..abaeeb7c 100644 --- a/app/src/main/java/com/scents/note/ui/splash/SplashViewModel.kt +++ b/app/src/main/java/com/scentsnote/android/ui/splash/SplashViewModel.kt @@ -1,12 +1,12 @@ -package com.scents.note.ui.splash +package com.scentsnote.android.ui.splash import android.util.Log import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.scents.note.BuildConfig -import com.scents.note.data.repository.SplashRepository +import com.scentsnote.android.BuildConfig +import com.scentsnote.android.data.repository.SplashRepository import kotlinx.coroutines.launch import retrofit2.HttpException diff --git a/app/src/main/java/com/scents/note/ui/survey/CircleRecyclerViewAdapter.kt b/app/src/main/java/com/scentsnote/android/ui/survey/CircleRecyclerViewAdapter.kt similarity index 92% rename from app/src/main/java/com/scents/note/ui/survey/CircleRecyclerViewAdapter.kt rename to app/src/main/java/com/scentsnote/android/ui/survey/CircleRecyclerViewAdapter.kt index c1bbb2d5..04d0ff40 100644 --- a/app/src/main/java/com/scents/note/ui/survey/CircleRecyclerViewAdapter.kt +++ b/app/src/main/java/com/scentsnote/android/ui/survey/CircleRecyclerViewAdapter.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.survey +package com.scentsnote.android.ui.survey import android.util.Log import android.view.LayoutInflater @@ -6,11 +6,11 @@ import android.view.View import android.view.ViewGroup import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.scents.note.R -import com.scents.note.data.vo.response.PerfumeInfo -import com.scents.note.data.vo.response.SeriesInfo -import com.scents.note.databinding.RvItemSurveyCircleBinding -import com.scents.note.databinding.RvItemSurveySeriesBinding +import com.scentsnote.android.R +import com.scentsnote.android.data.vo.response.PerfumeInfo +import com.scentsnote.android.data.vo.response.SeriesInfo +import com.scentsnote.android.databinding.RvItemSurveyCircleBinding +import com.scentsnote.android.databinding.RvItemSurveySeriesBinding class CircleRecyclerViewAdapter(private val type:Int, val add:(Int)->Unit, val remove:(Int)->Unit):RecyclerView.Adapter(){ diff --git a/app/src/main/java/com/scents/note/ui/survey/SurveyActivity.kt b/app/src/main/java/com/scentsnote/android/ui/survey/SurveyActivity.kt similarity index 89% rename from app/src/main/java/com/scents/note/ui/survey/SurveyActivity.kt rename to app/src/main/java/com/scentsnote/android/ui/survey/SurveyActivity.kt index 3686b70b..0840b1cd 100644 --- a/app/src/main/java/com/scents/note/ui/survey/SurveyActivity.kt +++ b/app/src/main/java/com/scentsnote/android/ui/survey/SurveyActivity.kt @@ -1,15 +1,15 @@ -package com.scents.note.ui.survey +package com.scentsnote.android.ui.survey import android.os.Bundle import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil -import com.scents.note.ScentsNoteApplication -import com.scents.note.R -import com.scents.note.databinding.ActivitySurveyBinding -import com.scents.note.ui.MainActivity -import com.scents.note.ui.filter.ScentsNoteViewPagerAdapter -import com.scents.note.util.* +import com.scentsnote.android.ScentsNoteApplication +import com.scentsnote.android.R +import com.scentsnote.android.databinding.ActivitySurveyBinding +import com.scentsnote.android.ui.MainActivity +import com.scentsnote.android.ui.filter.ScentsNoteViewPagerAdapter +import com.scentsnote.android.util.* import java.util.* class SurveyActivity : AppCompatActivity() { diff --git a/app/src/main/java/com/scents/note/ui/survey/SurveyBinding.kt b/app/src/main/java/com/scentsnote/android/ui/survey/SurveyBinding.kt similarity index 81% rename from app/src/main/java/com/scents/note/ui/survey/SurveyBinding.kt rename to app/src/main/java/com/scentsnote/android/ui/survey/SurveyBinding.kt index 62aebe2a..2a6c0065 100644 --- a/app/src/main/java/com/scents/note/ui/survey/SurveyBinding.kt +++ b/app/src/main/java/com/scentsnote/android/ui/survey/SurveyBinding.kt @@ -1,12 +1,12 @@ -package com.scents.note.ui.survey +package com.scentsnote.android.ui.survey import android.util.Log import androidx.databinding.BindingAdapter import androidx.recyclerview.widget.RecyclerView -import com.scents.note.data.vo.response.KeywordInfo -import com.scents.note.data.vo.response.PerfumeInfo -import com.scents.note.data.vo.response.SeriesInfo -import com.scents.note.util.FlexboxRecyclerViewAdapter +import com.scentsnote.android.data.vo.response.KeywordInfo +import com.scentsnote.android.data.vo.response.PerfumeInfo +import com.scentsnote.android.data.vo.response.SeriesInfo +import com.scentsnote.android.util.FlexboxRecyclerViewAdapter object SurveyBinding { @JvmStatic diff --git a/app/src/main/java/com/scents/note/ui/survey/SurveyIncenseFragment.kt b/app/src/main/java/com/scentsnote/android/ui/survey/SurveyIncenseFragment.kt similarity index 92% rename from app/src/main/java/com/scents/note/ui/survey/SurveyIncenseFragment.kt rename to app/src/main/java/com/scentsnote/android/ui/survey/SurveyIncenseFragment.kt index 8fc9d340..0496f08a 100644 --- a/app/src/main/java/com/scents/note/ui/survey/SurveyIncenseFragment.kt +++ b/app/src/main/java/com/scentsnote/android/ui/survey/SurveyIncenseFragment.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.survey +package com.scentsnote.android.ui.survey import android.os.Bundle import android.view.LayoutInflater @@ -6,8 +6,8 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels -import com.scents.note.R -import com.scents.note.databinding.FragmentSurveyIncenseBinding +import com.scentsnote.android.R +import com.scentsnote.android.databinding.FragmentSurveyIncenseBinding class SurveyIncenseFragment : Fragment() { private lateinit var binding: FragmentSurveyIncenseBinding diff --git a/app/src/main/java/com/scents/note/ui/survey/SurveyKeywordFragment.kt b/app/src/main/java/com/scentsnote/android/ui/survey/SurveyKeywordFragment.kt similarity index 90% rename from app/src/main/java/com/scents/note/ui/survey/SurveyKeywordFragment.kt rename to app/src/main/java/com/scentsnote/android/ui/survey/SurveyKeywordFragment.kt index 1259f7f7..5e5a604b 100644 --- a/app/src/main/java/com/scents/note/ui/survey/SurveyKeywordFragment.kt +++ b/app/src/main/java/com/scentsnote/android/ui/survey/SurveyKeywordFragment.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.survey +package com.scentsnote.android.ui.survey import android.content.Context import android.os.Bundle @@ -7,9 +7,9 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels -import com.scents.note.R -import com.scents.note.databinding.FragmentSurveyKeywordBinding -import com.scents.note.util.FlexboxRecyclerViewAdapter +import com.scentsnote.android.R +import com.scentsnote.android.databinding.FragmentSurveyKeywordBinding +import com.scentsnote.android.util.FlexboxRecyclerViewAdapter import com.google.android.flexbox.AlignItems import com.google.android.flexbox.FlexDirection import com.google.android.flexbox.FlexWrap diff --git a/app/src/main/java/com/scents/note/ui/survey/SurveyPerfumeFragment.kt b/app/src/main/java/com/scentsnote/android/ui/survey/SurveyPerfumeFragment.kt similarity index 92% rename from app/src/main/java/com/scents/note/ui/survey/SurveyPerfumeFragment.kt rename to app/src/main/java/com/scentsnote/android/ui/survey/SurveyPerfumeFragment.kt index a81bedfe..132c5d31 100644 --- a/app/src/main/java/com/scents/note/ui/survey/SurveyPerfumeFragment.kt +++ b/app/src/main/java/com/scentsnote/android/ui/survey/SurveyPerfumeFragment.kt @@ -1,4 +1,4 @@ -package com.scents.note.ui.survey +package com.scentsnote.android.ui.survey import android.os.Bundle import android.view.LayoutInflater @@ -6,8 +6,8 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels -import com.scents.note.R -import com.scents.note.databinding.FragmentSurveyPerfumeBinding +import com.scentsnote.android.R +import com.scentsnote.android.databinding.FragmentSurveyPerfumeBinding class SurveyPerfumeFragment : Fragment() { private lateinit var binding: FragmentSurveyPerfumeBinding diff --git a/app/src/main/java/com/scents/note/ui/survey/SurveyViewModel.kt b/app/src/main/java/com/scentsnote/android/ui/survey/SurveyViewModel.kt similarity index 94% rename from app/src/main/java/com/scents/note/ui/survey/SurveyViewModel.kt rename to app/src/main/java/com/scentsnote/android/ui/survey/SurveyViewModel.kt index 0b9682ea..d6c6b9c8 100644 --- a/app/src/main/java/com/scents/note/ui/survey/SurveyViewModel.kt +++ b/app/src/main/java/com/scentsnote/android/ui/survey/SurveyViewModel.kt @@ -1,15 +1,15 @@ -package com.scents.note.ui.survey +package com.scentsnote.android.ui.survey import android.util.Log import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.scents.note.data.repository.SurveyRepository -import com.scents.note.data.vo.request.RequestSurvey -import com.scents.note.data.vo.response.KeywordInfo -import com.scents.note.data.vo.response.PerfumeInfo -import com.scents.note.data.vo.response.SeriesInfo +import com.scentsnote.android.data.repository.SurveyRepository +import com.scentsnote.android.data.vo.request.RequestSurvey +import com.scentsnote.android.data.vo.response.KeywordInfo +import com.scentsnote.android.data.vo.response.PerfumeInfo +import com.scentsnote.android.data.vo.response.SeriesInfo import kotlinx.coroutines.launch import retrofit2.HttpException diff --git a/app/src/main/java/com/scents/note/util/ActivityExtension.kt b/app/src/main/java/com/scentsnote/android/util/ActivityExtension.kt similarity index 96% rename from app/src/main/java/com/scents/note/util/ActivityExtension.kt rename to app/src/main/java/com/scentsnote/android/util/ActivityExtension.kt index 0df2dfed..626d693e 100644 --- a/app/src/main/java/com/scents/note/util/ActivityExtension.kt +++ b/app/src/main/java/com/scentsnote/android/util/ActivityExtension.kt @@ -1,4 +1,4 @@ -package com.scents.note.util +package com.scentsnote.android.util import android.content.Context import android.content.Intent diff --git a/app/src/main/java/com/scents/note/util/AppUpdateDialog.kt b/app/src/main/java/com/scentsnote/android/util/AppUpdateDialog.kt similarity index 94% rename from app/src/main/java/com/scents/note/util/AppUpdateDialog.kt rename to app/src/main/java/com/scentsnote/android/util/AppUpdateDialog.kt index b5e66755..745f38f9 100644 --- a/app/src/main/java/com/scents/note/util/AppUpdateDialog.kt +++ b/app/src/main/java/com/scentsnote/android/util/AppUpdateDialog.kt @@ -1,4 +1,4 @@ -package com.scents.note.util +package com.scentsnote.android.util import android.content.DialogInterface import android.os.Bundle @@ -6,7 +6,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.DialogFragment -import com.scents.note.databinding.DialogAppUpdateBinding +import com.scentsnote.android.databinding.DialogAppUpdateBinding class AppUpdateDialog: DialogFragment(), View.OnClickListener { lateinit var binding : DialogAppUpdateBinding diff --git a/app/src/main/java/com/scents/note/util/BindingAdapter.kt b/app/src/main/java/com/scentsnote/android/util/BindingAdapter.kt similarity index 98% rename from app/src/main/java/com/scents/note/util/BindingAdapter.kt rename to app/src/main/java/com/scentsnote/android/util/BindingAdapter.kt index c939c0f8..e58409ac 100644 --- a/app/src/main/java/com/scents/note/util/BindingAdapter.kt +++ b/app/src/main/java/com/scentsnote/android/util/BindingAdapter.kt @@ -1,4 +1,4 @@ -package com.scents.note.util +package com.scentsnote.android.util import android.annotation.SuppressLint import android.text.Editable @@ -13,8 +13,8 @@ import androidx.core.content.res.ResourcesCompat import androidx.databinding.BindingAdapter import androidx.databinding.InverseBindingAdapter import androidx.databinding.InverseBindingListener -import com.scents.note.ScentsNoteApplication -import com.scents.note.R +import com.scentsnote.android.ScentsNoteApplication +import com.scentsnote.android.R import com.bumptech.glide.Glide object BindingAdapter { diff --git a/app/src/main/java/com/scents/note/util/CommonDialog.kt b/app/src/main/java/com/scentsnote/android/util/CommonDialog.kt similarity index 95% rename from app/src/main/java/com/scents/note/util/CommonDialog.kt rename to app/src/main/java/com/scentsnote/android/util/CommonDialog.kt index 79d32224..67733587 100644 --- a/app/src/main/java/com/scents/note/util/CommonDialog.kt +++ b/app/src/main/java/com/scentsnote/android/util/CommonDialog.kt @@ -1,4 +1,4 @@ -package com.scents.note.util +package com.scentsnote.android.util import android.content.Intent import android.os.Bundle @@ -6,9 +6,9 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.DialogFragment -import com.scents.note.R -import com.scents.note.databinding.DialogCommonBinding -import com.scents.note.ui.signin.SignHomeActivity +import com.scentsnote.android.R +import com.scentsnote.android.databinding.DialogCommonBinding +import com.scentsnote.android.ui.signin.SignHomeActivity class CommonDialog : DialogFragment(), View.OnClickListener { lateinit var binding : DialogCommonBinding diff --git a/app/src/main/java/com/scents/note/util/Dialog.kt b/app/src/main/java/com/scentsnote/android/util/Dialog.kt similarity index 95% rename from app/src/main/java/com/scents/note/util/Dialog.kt rename to app/src/main/java/com/scentsnote/android/util/Dialog.kt index 9ca77a08..67e571e3 100644 --- a/app/src/main/java/com/scents/note/util/Dialog.kt +++ b/app/src/main/java/com/scentsnote/android/util/Dialog.kt @@ -1,11 +1,11 @@ -package com.scents.note.util +package com.scentsnote.android.util import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.view.Window import android.view.WindowManager import androidx.fragment.app.DialogFragment -import com.scents.note.R +import com.scentsnote.android.R fun DialogFragment.setDrawable(){ dialog?.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) diff --git a/app/src/main/java/com/scents/note/util/DialogExtension.kt b/app/src/main/java/com/scentsnote/android/util/DialogExtension.kt similarity index 96% rename from app/src/main/java/com/scents/note/util/DialogExtension.kt rename to app/src/main/java/com/scentsnote/android/util/DialogExtension.kt index 060d7ec6..1682cdba 100644 --- a/app/src/main/java/com/scents/note/util/DialogExtension.kt +++ b/app/src/main/java/com/scentsnote/android/util/DialogExtension.kt @@ -1,4 +1,4 @@ -package com.scents.note.util +package com.scentsnote.android.util import android.content.Context import android.os.Bundle diff --git a/app/src/main/java/com/scents/note/util/Ext.kt b/app/src/main/java/com/scentsnote/android/util/Ext.kt similarity index 53% rename from app/src/main/java/com/scents/note/util/Ext.kt rename to app/src/main/java/com/scentsnote/android/util/Ext.kt index 34bdd328..8512667b 100644 --- a/app/src/main/java/com/scents/note/util/Ext.kt +++ b/app/src/main/java/com/scentsnote/android/util/Ext.kt @@ -1,4 +1,4 @@ -package com.scents.note.util +package com.scentsnote.android.util fun getToken(): String { return "" diff --git a/app/src/main/java/com/scents/note/util/FlexboxRecyclerViewAdapter.kt b/app/src/main/java/com/scentsnote/android/util/FlexboxRecyclerViewAdapter.kt similarity index 95% rename from app/src/main/java/com/scents/note/util/FlexboxRecyclerViewAdapter.kt rename to app/src/main/java/com/scentsnote/android/util/FlexboxRecyclerViewAdapter.kt index 820b13f2..308023db 100644 --- a/app/src/main/java/com/scents/note/util/FlexboxRecyclerViewAdapter.kt +++ b/app/src/main/java/com/scentsnote/android/util/FlexboxRecyclerViewAdapter.kt @@ -1,4 +1,4 @@ -package com.scents.note.util +package com.scentsnote.android.util import android.view.LayoutInflater import android.view.ViewGroup @@ -7,8 +7,8 @@ import androidx.recyclerview.selection.ItemDetailsLookup import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import com.scents.note.data.vo.response.KeywordInfo -import com.scents.note.databinding.RvItemFilterFlexboxBinding +import com.scentsnote.android.data.vo.response.KeywordInfo +import com.scentsnote.android.databinding.RvItemFilterFlexboxBinding class FlexboxRecyclerViewAdapter(internal val select:(KeywordInfo, Boolean)->Unit, val countBadge:(Int,Boolean)->Unit) : ListAdapter( diff --git a/app/src/main/java/com/scents/note/util/Font.kt b/app/src/main/java/com/scentsnote/android/util/Font.kt similarity index 94% rename from app/src/main/java/com/scents/note/util/Font.kt rename to app/src/main/java/com/scentsnote/android/util/Font.kt index 1f66fb51..3577d420 100644 --- a/app/src/main/java/com/scents/note/util/Font.kt +++ b/app/src/main/java/com/scentsnote/android/util/Font.kt @@ -1,10 +1,10 @@ -package com.scents.note.util +package com.scentsnote.android.util import android.widget.CheckedTextView import android.widget.TextView import androidx.core.content.ContextCompat import androidx.core.content.res.ResourcesCompat -import com.scents.note.R +import com.scentsnote.android.R fun TextView.setTextNotoSansBold(isBold:Boolean){ this.typeface = ResourcesCompat.getFont(this.context, if(isBold) R.font.notosans_bold else R.font.notosans_regular) diff --git a/app/src/main/java/com/scents/note/util/FragmentExtension.kt b/app/src/main/java/com/scentsnote/android/util/FragmentExtension.kt similarity index 90% rename from app/src/main/java/com/scents/note/util/FragmentExtension.kt rename to app/src/main/java/com/scentsnote/android/util/FragmentExtension.kt index b9f29213..e094bfe1 100644 --- a/app/src/main/java/com/scents/note/util/FragmentExtension.kt +++ b/app/src/main/java/com/scentsnote/android/util/FragmentExtension.kt @@ -1,4 +1,4 @@ -package com.scents.note.util +package com.scentsnote.android.util import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager diff --git a/app/src/main/java/com/scents/note/util/NonSwipeViewPager.kt b/app/src/main/java/com/scentsnote/android/util/NonSwipeViewPager.kt similarity index 95% rename from app/src/main/java/com/scents/note/util/NonSwipeViewPager.kt rename to app/src/main/java/com/scentsnote/android/util/NonSwipeViewPager.kt index 9394bfac..50ecb64d 100644 --- a/app/src/main/java/com/scents/note/util/NonSwipeViewPager.kt +++ b/app/src/main/java/com/scentsnote/android/util/NonSwipeViewPager.kt @@ -1,4 +1,4 @@ -package com.scents.note.util +package com.scentsnote.android.util import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/com/scents/note/util/RecyclerViewEmptySupport.kt b/app/src/main/java/com/scentsnote/android/util/RecyclerViewEmptySupport.kt similarity index 97% rename from app/src/main/java/com/scents/note/util/RecyclerViewEmptySupport.kt rename to app/src/main/java/com/scentsnote/android/util/RecyclerViewEmptySupport.kt index b743be8e..874de636 100644 --- a/app/src/main/java/com/scents/note/util/RecyclerViewEmptySupport.kt +++ b/app/src/main/java/com/scentsnote/android/util/RecyclerViewEmptySupport.kt @@ -1,4 +1,4 @@ -package com.scents.note.util +package com.scentsnote.android.util import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/com/scents/note/util/ReportDialog.kt b/app/src/main/java/com/scentsnote/android/util/ReportDialog.kt similarity index 92% rename from app/src/main/java/com/scents/note/util/ReportDialog.kt rename to app/src/main/java/com/scentsnote/android/util/ReportDialog.kt index c2f9ee3a..aa3b83dc 100644 --- a/app/src/main/java/com/scents/note/util/ReportDialog.kt +++ b/app/src/main/java/com/scentsnote/android/util/ReportDialog.kt @@ -1,13 +1,13 @@ -package com.scents.note.util +package com.scentsnote.android.util import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.DialogFragment -import com.scents.note.R -import com.scents.note.databinding.DialogReviewReportBinding -import com.scents.note.ui.detail.PerfumeDetailViewModel +import com.scentsnote.android.R +import com.scentsnote.android.databinding.DialogReviewReportBinding +import com.scentsnote.android.ui.detail.PerfumeDetailViewModel class ReportDialog(val vm : PerfumeDetailViewModel) : DialogFragment(), View.OnClickListener { lateinit var binding : DialogReviewReportBinding diff --git a/app/src/main/java/com/scents/note/util/SeekBar.kt b/app/src/main/java/com/scentsnote/android/util/SeekBar.kt similarity index 92% rename from app/src/main/java/com/scents/note/util/SeekBar.kt rename to app/src/main/java/com/scentsnote/android/util/SeekBar.kt index 3e6de6be..93d20cc1 100644 --- a/app/src/main/java/com/scents/note/util/SeekBar.kt +++ b/app/src/main/java/com/scentsnote/android/util/SeekBar.kt @@ -1,11 +1,11 @@ -package com.scents.note.util +package com.scentsnote.android.util import android.content.Context import android.widget.SeekBar import android.widget.TextView import androidx.core.content.ContextCompat -import com.scents.note.R -import com.scents.note.ui.note.NoteViewModel +import com.scentsnote.android.R +import com.scentsnote.android.ui.note.NoteViewModel fun setSelectedSeekBarTxtBold(list: List, select: Int){ for(i in list.indices){ diff --git a/app/src/main/java/com/scents/note/util/SingleLiveEvent.kt b/app/src/main/java/com/scentsnote/android/util/SingleLiveEvent.kt similarity index 95% rename from app/src/main/java/com/scents/note/util/SingleLiveEvent.kt rename to app/src/main/java/com/scentsnote/android/util/SingleLiveEvent.kt index 7b4de485..6c784b71 100644 --- a/app/src/main/java/com/scents/note/util/SingleLiveEvent.kt +++ b/app/src/main/java/com/scentsnote/android/util/SingleLiveEvent.kt @@ -1,4 +1,4 @@ -package com.scents.note.util +package com.scentsnote.android.util import androidx.annotation.MainThread import androidx.lifecycle.LifecycleOwner diff --git a/app/src/main/java/com/scents/note/util/Tab.kt b/app/src/main/java/com/scentsnote/android/util/Tab.kt similarity index 96% rename from app/src/main/java/com/scents/note/util/Tab.kt rename to app/src/main/java/com/scentsnote/android/util/Tab.kt index 1a67b3c9..dd04565c 100644 --- a/app/src/main/java/com/scents/note/util/Tab.kt +++ b/app/src/main/java/com/scentsnote/android/util/Tab.kt @@ -1,4 +1,4 @@ -package com.scents.note.util +package com.scentsnote.android.util import android.view.ViewGroup import android.widget.TextView diff --git a/app/src/main/java/com/scents/note/util/TextWatcher.kt b/app/src/main/java/com/scentsnote/android/util/TextWatcher.kt similarity index 91% rename from app/src/main/java/com/scents/note/util/TextWatcher.kt rename to app/src/main/java/com/scentsnote/android/util/TextWatcher.kt index 16dd68eb..ca2ae2a7 100644 --- a/app/src/main/java/com/scents/note/util/TextWatcher.kt +++ b/app/src/main/java/com/scentsnote/android/util/TextWatcher.kt @@ -1,4 +1,4 @@ -package com.scents.note.util +package com.scentsnote.android.util import android.text.Editable import android.text.TextWatcher diff --git a/app/src/main/java/com/scents/note/util/Toast.kt b/app/src/main/java/com/scentsnote/android/util/Toast.kt similarity index 87% rename from app/src/main/java/com/scents/note/util/Toast.kt rename to app/src/main/java/com/scentsnote/android/util/Toast.kt index 52d2d47b..a75580b7 100644 --- a/app/src/main/java/com/scents/note/util/Toast.kt +++ b/app/src/main/java/com/scentsnote/android/util/Toast.kt @@ -1,4 +1,4 @@ -package com.scents.note.util +package com.scentsnote.android.util import android.content.Context import android.widget.Toast diff --git a/app/src/main/java/com/scents/note/util/YearPickerDialog.kt b/app/src/main/java/com/scentsnote/android/util/YearPickerDialog.kt similarity index 96% rename from app/src/main/java/com/scents/note/util/YearPickerDialog.kt rename to app/src/main/java/com/scentsnote/android/util/YearPickerDialog.kt index 5855b73c..18feef34 100644 --- a/app/src/main/java/com/scents/note/util/YearPickerDialog.kt +++ b/app/src/main/java/com/scentsnote/android/util/YearPickerDialog.kt @@ -1,4 +1,4 @@ -package com.scents.note.util +package com.scentsnote.android.util import android.content.res.Resources import android.graphics.Paint @@ -12,8 +12,8 @@ import android.view.ViewGroup import android.widget.EditText import android.widget.NumberPicker import androidx.fragment.app.DialogFragment -import com.scents.note.R -import com.scents.note.databinding.DialogYearPickerBinding +import com.scentsnote.android.R +import com.scentsnote.android.databinding.DialogYearPickerBinding import com.google.android.material.button.MaterialButton import java.util.* diff --git a/app/src/main/res/layout/activity_filter.xml b/app/src/main/res/layout/activity_filter.xml index 724b9177..0afd4da9 100644 --- a/app/src/main/res/layout/activity_filter.xml +++ b/app/src/main/res/layout/activity_filter.xml @@ -5,7 +5,7 @@ + type="com.scentsnote.android.ui.filter.FilterViewModel" /> - + type="com.scentsnote.android.ui.home.HomeViewModel" /> + type="com.scentsnote.android.ui.setting.EditMyInfoViewModel" /> + type="com.scentsnote.android.ui.note.NoteViewModel" /> + type="com.scentsnote.android.data.vo.ParcelableWishList" /> + type="com.scentsnote.android.ui.setting.EditMyInfoViewModel" /> + type="com.scentsnote.android.data.vo.response.PerfumeDetail" /> + type="com.scentsnote.android.ui.detail.PerfumeDetailViewModel" /> - - + app:layout_constraintTop_toBottomOf="@+id/tab_perfume_detail"> - + + type="com.scentsnote.android.ui.signin.SignInViewModel" /> + type="com.scentsnote.android.ui.signup.SignUpViewModel" /> + type="com.scentsnote.android.ui.signup.SignUpViewModel" /> + type="com.scentsnote.android.ui.signup.SignUpViewModel" /> + type="com.scentsnote.android.ui.signup.SignUpViewModel" /> + type="com.scentsnote.android.ui.survey.SurveyViewModel" /> + type="com.scentsnote.android.ui.detail.PerfumeDetailViewModel" /> + type="com.scentsnote.android.ui.detail.PerfumeDetailViewModel" /> + type="com.scentsnote.android.data.vo.response.PerfumeDetail" /> + type="com.scentsnote.android.ui.detail.PerfumeDetailViewModel" /> + type="com.scentsnote.android.ui.filter.FilterViewModel" /> + type="com.scentsnote.android.ui.filter.FilterViewModel" /> + type="com.scentsnote.android.ui.filter.FilterViewModel" /> + type="com.scentsnote.android.ui.home.HomeViewModel" /> + type="com.scentsnote.android.ui.note.NoteViewModel" /> + type="com.scentsnote.android.ui.my.MyViewModel" /> - - + diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml index 0810cf74..fd3563d0 100644 --- a/app/src/main/res/layout/fragment_search.xml +++ b/app/src/main/res/layout/fragment_search.xml @@ -5,7 +5,7 @@ + type="com.scentsnote.android.ui.search.SearchViewModel" /> + type="com.scentsnote.android.ui.survey.SurveyViewModel" /> - + type="com.scentsnote.android.ui.survey.SurveyViewModel" /> - + type="com.scentsnote.android.ui.survey.SurveyViewModel" /> - + type="com.scentsnote.android.ui.my.MyViewModel" /> + type="com.scentsnote.android.data.vo.response.PerfumeInfo"/> + type="com.scentsnote.android.data.vo.response.PerfumeDetailWithReviews" /> + type="com.scentsnote.android.data.vo.response.BrandInfo" /> + type="com.scentsnote.android.data.vo.response.KeywordInfo" /> + type="com.scentsnote.android.data.vo.response.SeriesInfo" /> + type="com.scentsnote.android.data.vo.response.HomePerfumeItem" /> + type="com.scentsnote.android.data.vo.response.HomePerfumeItem" /> + type="com.scentsnote.android.data.vo.response.HomePerfumeItem" /> + type="com.scentsnote.android.data.vo.response.HomePerfumeItem" /> + type="com.scentsnote.android.data.vo.response.RecommendPerfumeItem" /> + type="com.scentsnote.android.data.vo.response.ResponseMyPerfume" /> + type="com.scentsnote.android.data.vo.response.PerfumeInfo" /> + type="com.scentsnote.android.data.vo.request.FilterInfoP" /> + type="com.scentsnote.android.data.vo.response.SeriesIngredients" /> + type="com.scentsnote.android.data.vo.response.PerfumeInfo" /> + type="com.scentsnote.android.data.vo.response.SeriesInfo" /> @@ -23,7 +23,7 @@ \ No newline at end of file diff --git a/app/src/test/java/com/scents/note/ExampleUnitTest.kt b/app/src/test/java/com/scentsnote/android/ExampleUnitTest.kt similarity index 91% rename from app/src/test/java/com/scents/note/ExampleUnitTest.kt rename to app/src/test/java/com/scentsnote/android/ExampleUnitTest.kt index 003fcafa..d82d1540 100644 --- a/app/src/test/java/com/scents/note/ExampleUnitTest.kt +++ b/app/src/test/java/com/scentsnote/android/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package com.scents.note +package com.scentsnote.android import org.junit.Test diff --git a/scents-note-ui/src/androidTest/java/com/scents/scents_note_ui/ExampleInstrumentedTest.kt b/scents-note-ui/src/androidTest/java/com/scentsnote/scents_note_ui/ExampleInstrumentedTest.kt similarity index 94% rename from scents-note-ui/src/androidTest/java/com/scents/scents_note_ui/ExampleInstrumentedTest.kt rename to scents-note-ui/src/androidTest/java/com/scentsnote/scents_note_ui/ExampleInstrumentedTest.kt index 4ae4adf7..0fcb3d6e 100644 --- a/scents-note-ui/src/androidTest/java/com/scents/scents_note_ui/ExampleInstrumentedTest.kt +++ b/scents-note-ui/src/androidTest/java/com/scentsnote/scents_note_ui/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.scents.scents_note_ui +package com.scentsnote.scents_note_ui import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 diff --git a/scents-note-ui/src/main/AndroidManifest.xml b/scents-note-ui/src/main/AndroidManifest.xml index dfedab82..1035ac3f 100644 --- a/scents-note-ui/src/main/AndroidManifest.xml +++ b/scents-note-ui/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.scentsnote.scents_note_ui"> \ No newline at end of file diff --git a/scents-note-ui/src/main/java/com/scents/scents_note_ui/widget/SelectBox.kt b/scents-note-ui/src/main/java/com/scentsnote/scents_note_ui/widget/SelectBox.kt similarity index 96% rename from scents-note-ui/src/main/java/com/scents/scents_note_ui/widget/SelectBox.kt rename to scents-note-ui/src/main/java/com/scentsnote/scents_note_ui/widget/SelectBox.kt index e51ac396..338cfad7 100644 --- a/scents-note-ui/src/main/java/com/scents/scents_note_ui/widget/SelectBox.kt +++ b/scents-note-ui/src/main/java/com/scentsnote/scents_note_ui/widget/SelectBox.kt @@ -1,10 +1,10 @@ -package com.scents.scents_note_ui.widget +package com.scentsnote.scents_note_ui.widget import android.content.Context import android.graphics.Typeface import android.util.AttributeSet import android.widget.CompoundButton -import com.scents.scents_note_ui.R +import com.scentsnote.scents_note_ui.R class SelectBox @JvmOverloads constructor( context: Context, diff --git a/scents-note-ui/src/test/java/com/scents/scents_note_ui/ExampleUnitTest.kt b/scents-note-ui/src/test/java/com/scentsnote/scents_note_ui/ExampleUnitTest.kt similarity index 89% rename from scents-note-ui/src/test/java/com/scents/scents_note_ui/ExampleUnitTest.kt rename to scents-note-ui/src/test/java/com/scentsnote/scents_note_ui/ExampleUnitTest.kt index 4f9d3d8d..cdfdc118 100644 --- a/scents-note-ui/src/test/java/com/scents/scents_note_ui/ExampleUnitTest.kt +++ b/scents-note-ui/src/test/java/com/scentsnote/scents_note_ui/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package com.scents.scents_note_ui +package com.scentsnote.scents_note_ui import org.junit.Test diff --git a/scents_note_ui_sample/src/androidTest/java/com/scents/scents_note_ui_sample/ExampleInstrumentedTest.kt b/scents_note_ui_sample/src/androidTest/java/com/scentsnote/scents_note_ui_sample/ExampleInstrumentedTest.kt similarity index 93% rename from scents_note_ui_sample/src/androidTest/java/com/scents/scents_note_ui_sample/ExampleInstrumentedTest.kt rename to scents_note_ui_sample/src/androidTest/java/com/scentsnote/scents_note_ui_sample/ExampleInstrumentedTest.kt index c681b03e..829da187 100644 --- a/scents_note_ui_sample/src/androidTest/java/com/scents/scents_note_ui_sample/ExampleInstrumentedTest.kt +++ b/scents_note_ui_sample/src/androidTest/java/com/scentsnote/scents_note_ui_sample/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.scents.scents_note_ui_sample +package com.scentsnote.scents_note_ui_sample import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 diff --git a/scents_note_ui_sample/src/main/AndroidManifest.xml b/scents_note_ui_sample/src/main/AndroidManifest.xml index 532a322c..d0748818 100644 --- a/scents_note_ui_sample/src/main/AndroidManifest.xml +++ b/scents_note_ui_sample/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.scentsnote.scents_note_ui_sample"> @@ -19,7 +19,7 @@ diff --git a/scents_note_ui_sample/src/main/java/com/scents/scents_note_ui_sample/MainActivity.kt b/scents_note_ui_sample/src/main/java/com/scentsnote/scents_note_ui_sample/MainActivity.kt similarity index 79% rename from scents_note_ui_sample/src/main/java/com/scents/scents_note_ui_sample/MainActivity.kt rename to scents_note_ui_sample/src/main/java/com/scentsnote/scents_note_ui_sample/MainActivity.kt index b5ea80da..4dfb11ee 100644 --- a/scents_note_ui_sample/src/main/java/com/scents/scents_note_ui_sample/MainActivity.kt +++ b/scents_note_ui_sample/src/main/java/com/scentsnote/scents_note_ui_sample/MainActivity.kt @@ -1,9 +1,9 @@ -package com.scents.scents_note_ui_sample +package com.scentsnote.scents_note_ui_sample import android.content.Intent import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import com.scents.scents_note_ui_sample.selectbox.SelectBoxActivity +import com.scentsnote.scents_note_ui_sample.selectbox.SelectBoxActivity class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/scents_note_ui_sample/src/main/java/com/scents/scents_note_ui_sample/common/CommonUtils.kt b/scents_note_ui_sample/src/main/java/com/scentsnote/scents_note_ui_sample/common/CommonUtils.kt similarity index 93% rename from scents_note_ui_sample/src/main/java/com/scents/scents_note_ui_sample/common/CommonUtils.kt rename to scents_note_ui_sample/src/main/java/com/scentsnote/scents_note_ui_sample/common/CommonUtils.kt index e8df0aa1..87fbea06 100644 --- a/scents_note_ui_sample/src/main/java/com/scents/scents_note_ui_sample/common/CommonUtils.kt +++ b/scents_note_ui_sample/src/main/java/com/scentsnote/scents_note_ui_sample/common/CommonUtils.kt @@ -1,4 +1,4 @@ -package com.scents.scents_note_ui_sample.common +package com.scentsnote.scents_note_ui_sample.common import android.view.ViewGroup import androidx.core.view.children diff --git a/scents_note_ui_sample/src/main/java/com/scents/scents_note_ui_sample/selectbox/SelectBoxActivity.kt b/scents_note_ui_sample/src/main/java/com/scentsnote/scents_note_ui_sample/selectbox/SelectBoxActivity.kt similarity index 77% rename from scents_note_ui_sample/src/main/java/com/scents/scents_note_ui_sample/selectbox/SelectBoxActivity.kt rename to scents_note_ui_sample/src/main/java/com/scentsnote/scents_note_ui_sample/selectbox/SelectBoxActivity.kt index 0691eed0..70f7c341 100644 --- a/scents_note_ui_sample/src/main/java/com/scents/scents_note_ui_sample/selectbox/SelectBoxActivity.kt +++ b/scents_note_ui_sample/src/main/java/com/scentsnote/scents_note_ui_sample/selectbox/SelectBoxActivity.kt @@ -1,11 +1,11 @@ -package com.scents.scents_note_ui_sample.selectbox +package com.scentsnote.scents_note_ui_sample.selectbox import android.os.Bundle import android.view.ViewGroup import android.widget.CheckedTextView import androidx.appcompat.app.AppCompatActivity -import com.scents.scents_note_ui_sample.R -import com.scents.scents_note_ui_sample.common.CommonUtils.findAllViews +import com.scentsnote.scents_note_ui_sample.R +import com.scentsnote.scents_note_ui_sample.common.CommonUtils.findAllViews class SelectBoxActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/scents_note_ui_sample/src/main/res/layout/activity_select_box.xml b/scents_note_ui_sample/src/main/res/layout/activity_select_box.xml index 7d9cd90c..4c39b3f9 100644 --- a/scents_note_ui_sample/src/main/res/layout/activity_select_box.xml +++ b/scents_note_ui_sample/src/main/res/layout/activity_select_box.xml @@ -23,7 +23,7 @@ android:layout_height="wrap_content" android:orientation="horizontal"> - - - - - - - - - - - - -