diff --git a/afume-ui/src/main/res/color/afume_ui_select_box_text_color.xml b/afume-ui/src/main/res/color/afume_ui_select_box_text_color.xml deleted file mode 100644 index e4b0a6bd..00000000 --- a/afume-ui/src/main/res/color/afume_ui_select_box_text_color.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/afume-ui/src/main/res/drawable/afume_ui_select_box_shape.xml b/afume-ui/src/main/res/drawable/afume_ui_select_box_shape.xml deleted file mode 100644 index 7f338162..00000000 --- a/afume-ui/src/main/res/drawable/afume_ui_select_box_shape.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - \ No newline at end of file diff --git a/afume-ui/src/main/res/drawable/afume_ui_select_box_shape_checked.xml b/afume-ui/src/main/res/drawable/afume_ui_select_box_shape_checked.xml deleted file mode 100644 index 097ae884..00000000 --- a/afume-ui/src/main/res/drawable/afume_ui_select_box_shape_checked.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/afume-ui/src/main/res/drawable/afume_ui_select_box_shape_pressed.xml b/afume-ui/src/main/res/drawable/afume_ui_select_box_shape_pressed.xml deleted file mode 100644 index aa564784..00000000 --- a/afume-ui/src/main/res/drawable/afume_ui_select_box_shape_pressed.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/afume-ui/src/main/res/values/colors.xml b/afume-ui/src/main/res/values/colors.xml deleted file mode 100644 index 69529412..00000000 --- a/afume-ui/src/main/res/values/colors.xml +++ /dev/null @@ -1,8 +0,0 @@ - - #cdcdcd - #f0f0f0 - #ffffff - #c8bbb6 - #ccc8bbb6 - #282725 - \ No newline at end of file diff --git a/afume-ui/src/main/res/values/dimen.xml b/afume-ui/src/main/res/values/dimen.xml deleted file mode 100644 index 897ee4c1..00000000 --- a/afume-ui/src/main/res/values/dimen.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - 42dp - 26dp - - 18dp - 10dp - - 10dp - 3dp - 5dp - - 15sp - 12sp - - 1dp - - \ No newline at end of file diff --git a/afume-ui/src/main/res/values/styles.xml b/afume-ui/src/main/res/values/styles.xml deleted file mode 100644 index b607ffb7..00000000 --- a/afume-ui/src/main/res/values/styles.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - \ No newline at end of file diff --git a/afume_ui_sample/src/main/res/values/strings.xml b/afume_ui_sample/src/main/res/values/strings.xml deleted file mode 100644 index db1bf631..00000000 --- a/afume_ui_sample/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - afume_ui_sample - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e21d9eba..173c4b37 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,7 +10,7 @@ android { buildToolsVersion ConfigData.buildToolsVersion defaultConfig { - applicationId "com.afume.afume_android" + applicationId "com.scents.note" minSdkVersion ConfigData.minSdkVersion targetSdkVersion ConfigData.targetSdkVersion versionCode ConfigData.versionCode @@ -40,7 +40,7 @@ android { } dependencies { - implementation project(path: ':afume-ui') + implementation project(path: ':scents-note-ui') implementation Dependencies.supportV4 diff --git a/afume-ui/src/androidTest/java/com/afume/afume_ui/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/scents/note/ExampleInstrumentedTest.kt similarity index 85% rename from afume-ui/src/androidTest/java/com/afume/afume_ui/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/com/scents/note/ExampleInstrumentedTest.kt index 64e7fe1f..2928d0ee 100644 --- a/afume-ui/src/androidTest/java/com/afume/afume_ui/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/com/scents/note/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.afume.afume_ui +package com.scents.note import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 @@ -19,6 +19,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.afume.afume_ui.test", appContext.packageName) + assertEquals("com.scents.note", appContext.packageName) } } \ No newline at end of file diff --git a/app/src/androidTest/java/com/afume/afume_android/data/remote/network/AfumeServiceImplTest.kt b/app/src/androidTest/java/com/scents/note/data/remote/network/ScentsNoteServiceImplTest.kt similarity index 96% rename from app/src/androidTest/java/com/afume/afume_android/data/remote/network/AfumeServiceImplTest.kt rename to app/src/androidTest/java/com/scents/note/data/remote/network/ScentsNoteServiceImplTest.kt index 2ed62df6..44bd9f0f 100644 --- a/app/src/androidTest/java/com/afume/afume_android/data/remote/network/AfumeServiceImplTest.kt +++ b/app/src/androidTest/java/com/scents/note/data/remote/network/ScentsNoteServiceImplTest.kt @@ -1,8 +1,8 @@ -package com.afume.afume_android.data.remote.network +package com.scents.note.data.remote.network import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry -import com.afume.afume_android.data.vo.request.RequestLogin +import com.scents.note.data.vo.request.RequestLogin import kotlinx.coroutines.runBlocking import org.junit.Assert import org.junit.Before @@ -11,9 +11,9 @@ import org.junit.runner.RunWith import retrofit2.HttpException @RunWith(AndroidJUnit4::class) -class AfumeServiceImplTest { +class ScentsNoteServiceImplTest { - private var api: AfumeService = AfumeServiceImpl.service + private var api: ScentsNoteService = ScentsNoteServiceImpl.service private var token: String? = null @Before @@ -33,7 +33,7 @@ class AfumeServiceImplTest { @Test fun useAppContext() { val appContext = InstrumentationRegistry.getInstrumentation().targetContext - Assert.assertEquals("com.afume.afume_android", appContext.packageName) + Assert.assertEquals("com.scents.note", appContext.packageName) } @Test diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 77e2a238..fed98ad0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,47 +1,47 @@ + package="com.scents.note"> - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/afume/afume_android/data/repository/PerfumeDetailRepository.kt b/app/src/main/java/com/afume/afume_android/data/repository/PerfumeDetailRepository.kt deleted file mode 100644 index 8ac29c4d..00000000 --- a/app/src/main/java/com/afume/afume_android/data/repository/PerfumeDetailRepository.kt +++ /dev/null @@ -1,26 +0,0 @@ -package com.afume.afume_android.data.repository - -import com.afume.afume_android.data.remote.RemoteDataSource -import com.afume.afume_android.data.remote.RemoteDataSourceImpl -import com.afume.afume_android.data.remote.network.AfumeServiceImpl -import com.afume.afume_android.data.vo.request.RequestReportReview -import com.afume.afume_android.data.vo.response.ResponseBase -import com.afume.afume_android.data.vo.response.ResponsePerfumeDetail -import com.afume.afume_android.data.vo.response.ResponsePerfumeDetailWithReviews -import io.reactivex.Single - -class PerfumeDetailRepository { - val remoteDataSource: RemoteDataSource = RemoteDataSourceImpl() - - fun getPerfumeDetail(token: String, perfumeIdx: Int): Single = - AfumeServiceImpl.service.getPerfumeDetail(token, perfumeIdx).map { it } - - fun getPerfumeDetailWithReviews(token: String, perfumeIdx: Int): Single = - AfumeServiceImpl.service.getPerfumeDetailWithReview(token, perfumeIdx).map { it } - - fun postPerfumeLike(token: String, perfumeIdx: Int): Single> = - AfumeServiceImpl.service.postPerfumeLike(token, perfumeIdx).map { it } - - suspend fun postReviewLike(token: String, reviewIdx: Int) = remoteDataSource.postReviewLike(token, reviewIdx) - suspend fun reportReview(token: String, reviewIdx: Int, body: RequestReportReview) = remoteDataSource.reportReview(token, reviewIdx, body) -} \ No newline at end of file diff --git a/app/src/main/java/com/afume/afume_android/data/repository/SearchRepository.kt b/app/src/main/java/com/afume/afume_android/data/repository/SearchRepository.kt deleted file mode 100644 index d504b43e..00000000 --- a/app/src/main/java/com/afume/afume_android/data/repository/SearchRepository.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.afume.afume_android.data.repository - -import com.afume.afume_android.data.remote.RemoteDataSource -import com.afume.afume_android.data.remote.RemoteDataSourceImpl -import com.afume.afume_android.data.remote.network.AfumeServiceImpl -import com.afume.afume_android.data.vo.request.RequestSearch -import com.afume.afume_android.data.vo.response.ResponseBase -import io.reactivex.Single - -class SearchRepository { - val remoteDataSource : RemoteDataSource = RemoteDataSourceImpl() - - suspend fun postResultPerfume(token:String?,body:RequestSearch)=remoteDataSource.postSearchPerfume(token,body) - fun postPerfumeLike(token: String, perfumeIdx: Int): Single> = - AfumeServiceImpl.service.postPerfumeLike(token, perfumeIdx).map { it } - -} \ No newline at end of file diff --git a/app/src/main/java/com/afume/afume_android/AfumeApplication.kt b/app/src/main/java/com/scents/note/ScentsNoteApplication.kt similarity index 72% rename from app/src/main/java/com/afume/afume_android/AfumeApplication.kt rename to app/src/main/java/com/scents/note/ScentsNoteApplication.kt index e181d508..3aee5f5b 100644 --- a/app/src/main/java/com/afume/afume_android/AfumeApplication.kt +++ b/app/src/main/java/com/scents/note/ScentsNoteApplication.kt @@ -1,15 +1,15 @@ -package com.afume.afume_android +package com.scents.note import android.app.Application import android.content.Context import androidx.appcompat.app.AppCompatDelegate -import com.afume.afume_android.data.local.preference.SharedPreferencesManager +import com.scents.note.data.local.preference.SharedPreferencesManager -class AfumeApplication : Application() { +class ScentsNoteApplication : Application() { companion object { lateinit var prefManager : SharedPreferencesManager - private var instance: AfumeApplication? = null + private var instance: ScentsNoteApplication? = null fun applicationContext() : Context { return instance!!.applicationContext } diff --git a/app/src/main/java/com/afume/afume_android/data/local/preference/SharedPreferencesManager.kt b/app/src/main/java/com/scents/note/data/local/preference/SharedPreferencesManager.kt similarity index 94% rename from app/src/main/java/com/afume/afume_android/data/local/preference/SharedPreferencesManager.kt rename to app/src/main/java/com/scents/note/data/local/preference/SharedPreferencesManager.kt index b4df261d..382ebbc1 100644 --- a/app/src/main/java/com/afume/afume_android/data/local/preference/SharedPreferencesManager.kt +++ b/app/src/main/java/com/scents/note/data/local/preference/SharedPreferencesManager.kt @@ -1,10 +1,10 @@ -package com.afume.afume_android.data.local.preference +package com.scents.note.data.local.preference import android.content.Context import android.content.SharedPreferences import androidx.annotation.CallSuper import androidx.core.content.edit -import com.afume.afume_android.AfumeApplication +import com.scents.note.ScentsNoteApplication class SharedPreferencesManager (context: Context){ private val sharedPreferences : SharedPreferences = context.getSharedPreferences(PREFERENCES_KEY, Context.MODE_PRIVATE) @@ -61,7 +61,7 @@ class SharedPreferencesManager (context: Context){ } fun haveToken(): Boolean { - return AfumeApplication.prefManager.accessToken != "" + return ScentsNoteApplication.prefManager.accessToken != "" } companion object { diff --git a/app/src/main/java/com/afume/afume_android/data/remote/RemoteDataSource.kt b/app/src/main/java/com/scents/note/data/remote/RemoteDataSource.kt similarity index 93% rename from app/src/main/java/com/afume/afume_android/data/remote/RemoteDataSource.kt rename to app/src/main/java/com/scents/note/data/remote/RemoteDataSource.kt index 4ee1078f..b6bd0238 100644 --- a/app/src/main/java/com/afume/afume_android/data/remote/RemoteDataSource.kt +++ b/app/src/main/java/com/scents/note/data/remote/RemoteDataSource.kt @@ -1,7 +1,7 @@ -package com.afume.afume_android.data.remote +package com.scents.note.data.remote -import com.afume.afume_android.data.vo.request.* -import com.afume.afume_android.data.vo.response.* +import com.scents.note.data.vo.request.* +import com.scents.note.data.vo.response.* interface RemoteDataSource { suspend fun getValidateEmail(email : String): Boolean diff --git a/app/src/main/java/com/afume/afume_android/data/remote/RemoteDataSourceImpl.kt b/app/src/main/java/com/scents/note/data/remote/RemoteDataSourceImpl.kt similarity index 94% rename from app/src/main/java/com/afume/afume_android/data/remote/RemoteDataSourceImpl.kt rename to app/src/main/java/com/scents/note/data/remote/RemoteDataSourceImpl.kt index 42a946c9..dd6f3f1a 100644 --- a/app/src/main/java/com/afume/afume_android/data/remote/RemoteDataSourceImpl.kt +++ b/app/src/main/java/com/scents/note/data/remote/RemoteDataSourceImpl.kt @@ -1,12 +1,12 @@ -package com.afume.afume_android.data.remote +package com.scents.note.data.remote import android.util.Log -import com.afume.afume_android.data.remote.network.AfumeServiceImpl -import com.afume.afume_android.data.vo.request.* -import com.afume.afume_android.data.vo.response.* +import com.scents.note.data.remote.network.ScentsNoteServiceImpl +import com.scents.note.data.vo.request.* +import com.scents.note.data.vo.response.* class RemoteDataSourceImpl : RemoteDataSource{ - val api = AfumeServiceImpl.service + val api = ScentsNoteServiceImpl.service override suspend fun getValidateEmail(email: String): Boolean{ return api.getValidateEmail(email).data diff --git a/app/src/main/java/com/afume/afume_android/data/remote/network/NetworkInterceptor.kt b/app/src/main/java/com/scents/note/data/remote/network/NetworkInterceptor.kt similarity index 60% rename from app/src/main/java/com/afume/afume_android/data/remote/network/NetworkInterceptor.kt rename to app/src/main/java/com/scents/note/data/remote/network/NetworkInterceptor.kt index c8916a5f..1f3b4f02 100644 --- a/app/src/main/java/com/afume/afume_android/data/remote/network/NetworkInterceptor.kt +++ b/app/src/main/java/com/scents/note/data/remote/network/NetworkInterceptor.kt @@ -1,7 +1,4 @@ -package com.afume.afume_android.data.remote.network - -import okhttp3.Interceptor -import okhttp3.Response +package com.scents.note.data.remote.network //class NetworkInterceptor : Interceptor { // override fun intercept(chain: Interceptor.Chain): Response { diff --git a/app/src/main/java/com/afume/afume_android/data/remote/network/AfumeService.kt b/app/src/main/java/com/scents/note/data/remote/network/ScentsNoteService.kt similarity index 96% rename from app/src/main/java/com/afume/afume_android/data/remote/network/AfumeService.kt rename to app/src/main/java/com/scents/note/data/remote/network/ScentsNoteService.kt index 4961c31c..c1829765 100644 --- a/app/src/main/java/com/afume/afume_android/data/remote/network/AfumeService.kt +++ b/app/src/main/java/com/scents/note/data/remote/network/ScentsNoteService.kt @@ -1,11 +1,11 @@ -package com.afume.afume_android.data.remote.network +package com.scents.note.data.remote.network -import com.afume.afume_android.data.vo.request.* -import com.afume.afume_android.data.vo.response.* +import com.scents.note.data.vo.request.* +import com.scents.note.data.vo.response.* import io.reactivex.Single import retrofit2.http.* -interface AfumeService { +interface ScentsNoteService { //Sign - validate email @GET("user/validate/email") suspend fun getValidateEmail( diff --git a/app/src/main/java/com/afume/afume_android/data/remote/network/AfumeServiceImpl.kt b/app/src/main/java/com/scents/note/data/remote/network/ScentsNoteServiceImpl.kt similarity index 73% rename from app/src/main/java/com/afume/afume_android/data/remote/network/AfumeServiceImpl.kt rename to app/src/main/java/com/scents/note/data/remote/network/ScentsNoteServiceImpl.kt index eb1340e4..76416c21 100644 --- a/app/src/main/java/com/afume/afume_android/data/remote/network/AfumeServiceImpl.kt +++ b/app/src/main/java/com/scents/note/data/remote/network/ScentsNoteServiceImpl.kt @@ -1,11 +1,11 @@ -package com.afume.afume_android.data.remote.network +package com.scents.note.data.remote.network import retrofit2.Retrofit import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory import retrofit2.converter.gson.GsonConverterFactory -object AfumeServiceImpl { - private const val BASE_URL = "http://13.124.104.53:8081/A.fume/api/0.0.1/" +object ScentsNoteServiceImpl { + private const val BASE_URL = "http://13.124.104.53:8082/A.fume/api/0.0.1/" // private val okHttpClient: OkHttpClient = // OkHttpClient.Builder().addInterceptor(NetworkInterceptor()) @@ -19,5 +19,5 @@ object AfumeServiceImpl { .addConverterFactory(GsonConverterFactory.create()) .build() - val service : AfumeService = retrofit.create(AfumeService::class.java) + val service : ScentsNoteService = retrofit.create(ScentsNoteService::class.java) } \ No newline at end of file diff --git a/app/src/main/java/com/afume/afume_android/data/repository/EditMyInfoRepository.kt b/app/src/main/java/com/scents/note/data/repository/EditMyInfoRepository.kt similarity index 53% rename from app/src/main/java/com/afume/afume_android/data/repository/EditMyInfoRepository.kt rename to app/src/main/java/com/scents/note/data/repository/EditMyInfoRepository.kt index 0ea470a1..76512a0a 100644 --- a/app/src/main/java/com/afume/afume_android/data/repository/EditMyInfoRepository.kt +++ b/app/src/main/java/com/scents/note/data/repository/EditMyInfoRepository.kt @@ -1,9 +1,9 @@ -package com.afume.afume_android.data.repository +package com.scents.note.data.repository -import com.afume.afume_android.data.remote.RemoteDataSource -import com.afume.afume_android.data.remote.RemoteDataSourceImpl -import com.afume.afume_android.data.vo.request.RequestEditMyInfo -import com.afume.afume_android.data.vo.request.RequestEditPassword +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 class EditMyInfoRepository { val remoteDataSource: RemoteDataSource = RemoteDataSourceImpl() diff --git a/app/src/main/java/com/afume/afume_android/data/repository/FilterRepository.kt b/app/src/main/java/com/scents/note/data/repository/FilterRepository.kt similarity index 62% rename from app/src/main/java/com/afume/afume_android/data/repository/FilterRepository.kt rename to app/src/main/java/com/scents/note/data/repository/FilterRepository.kt index f7507c2b..fb5f8516 100644 --- a/app/src/main/java/com/afume/afume_android/data/repository/FilterRepository.kt +++ b/app/src/main/java/com/scents/note/data/repository/FilterRepository.kt @@ -1,7 +1,7 @@ -package com.afume.afume_android.data.repository +package com.scents.note.data.repository -import com.afume.afume_android.data.remote.RemoteDataSource -import com.afume.afume_android.data.remote.RemoteDataSourceImpl +import com.scents.note.data.remote.RemoteDataSource +import com.scents.note.data.remote.RemoteDataSourceImpl class FilterRepository { val remoteDataSource: RemoteDataSource = RemoteDataSourceImpl() diff --git a/app/src/main/java/com/afume/afume_android/data/repository/HomeRepository.kt b/app/src/main/java/com/scents/note/data/repository/HomeRepository.kt similarity index 60% rename from app/src/main/java/com/afume/afume_android/data/repository/HomeRepository.kt rename to app/src/main/java/com/scents/note/data/repository/HomeRepository.kt index c97a5733..42e6bd45 100644 --- a/app/src/main/java/com/afume/afume_android/data/repository/HomeRepository.kt +++ b/app/src/main/java/com/scents/note/data/repository/HomeRepository.kt @@ -1,9 +1,9 @@ -package com.afume.afume_android.data.repository +package com.scents.note.data.repository -import com.afume.afume_android.data.remote.RemoteDataSource -import com.afume.afume_android.data.remote.RemoteDataSourceImpl -import com.afume.afume_android.data.remote.network.AfumeServiceImpl -import com.afume.afume_android.data.vo.response.ResponseBase +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 io.reactivex.Single class HomeRepository { @@ -14,5 +14,5 @@ class HomeRepository { suspend fun getRecentPerfumeList(token : String) = remoteDataSource.getRecentPerfumeList(token) suspend fun getNewPerfumeList() = remoteDataSource.getNewPerfumeList() fun postPerfumeLike(token: String, perfumeIdx: Int): Single> = - AfumeServiceImpl.service.postPerfumeLike(token, perfumeIdx).map { it } + ScentsNoteServiceImpl.service.postPerfumeLike(token, perfumeIdx).map { it } } \ No newline at end of file diff --git a/app/src/main/java/com/afume/afume_android/data/repository/MyRepository.kt b/app/src/main/java/com/scents/note/data/repository/MyRepository.kt similarity index 62% rename from app/src/main/java/com/afume/afume_android/data/repository/MyRepository.kt rename to app/src/main/java/com/scents/note/data/repository/MyRepository.kt index 7af8a15c..39619f37 100644 --- a/app/src/main/java/com/afume/afume_android/data/repository/MyRepository.kt +++ b/app/src/main/java/com/scents/note/data/repository/MyRepository.kt @@ -1,7 +1,7 @@ -package com.afume.afume_android.data.repository +package com.scents.note.data.repository -import com.afume.afume_android.data.remote.RemoteDataSource -import com.afume.afume_android.data.remote.RemoteDataSourceImpl +import com.scents.note.data.remote.RemoteDataSource +import com.scents.note.data.remote.RemoteDataSourceImpl class MyRepository { val remoteDataSource: RemoteDataSource = RemoteDataSourceImpl() diff --git a/app/src/main/java/com/afume/afume_android/data/repository/NoteRepository.kt b/app/src/main/java/com/scents/note/data/repository/NoteRepository.kt similarity index 70% rename from app/src/main/java/com/afume/afume_android/data/repository/NoteRepository.kt rename to app/src/main/java/com/scents/note/data/repository/NoteRepository.kt index bce05772..1097cb4d 100644 --- a/app/src/main/java/com/afume/afume_android/data/repository/NoteRepository.kt +++ b/app/src/main/java/com/scents/note/data/repository/NoteRepository.kt @@ -1,8 +1,8 @@ -package com.afume.afume_android.data.repository +package com.scents.note.data.repository -import com.afume.afume_android.data.remote.RemoteDataSource -import com.afume.afume_android.data.remote.RemoteDataSourceImpl -import com.afume.afume_android.data.vo.request.RequestReview +import com.scents.note.data.remote.RemoteDataSource +import com.scents.note.data.remote.RemoteDataSourceImpl +import com.scents.note.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/scents/note/data/repository/PerfumeDetailRepository.kt new file mode 100644 index 00000000..34f5b791 --- /dev/null +++ b/app/src/main/java/com/scents/note/data/repository/PerfumeDetailRepository.kt @@ -0,0 +1,26 @@ +package com.scents.note.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 io.reactivex.Single + +class PerfumeDetailRepository { + val remoteDataSource: RemoteDataSource = RemoteDataSourceImpl() + + fun getPerfumeDetail(token: String, perfumeIdx: Int): Single = + ScentsNoteServiceImpl.service.getPerfumeDetail(token, perfumeIdx).map { it } + + fun getPerfumeDetailWithReviews(token: String, perfumeIdx: Int): Single = + ScentsNoteServiceImpl.service.getPerfumeDetailWithReview(token, perfumeIdx).map { it } + + fun postPerfumeLike(token: String, perfumeIdx: Int): Single> = + ScentsNoteServiceImpl.service.postPerfumeLike(token, perfumeIdx).map { it } + + suspend fun postReviewLike(token: String, reviewIdx: Int) = remoteDataSource.postReviewLike(token, reviewIdx) + suspend fun reportReview(token: String, reviewIdx: Int, body: RequestReportReview) = remoteDataSource.reportReview(token, reviewIdx, body) +} \ No newline at end of file diff --git a/app/src/main/java/com/scents/note/data/repository/SearchRepository.kt b/app/src/main/java/com/scents/note/data/repository/SearchRepository.kt new file mode 100644 index 00000000..e8e236b6 --- /dev/null +++ b/app/src/main/java/com/scents/note/data/repository/SearchRepository.kt @@ -0,0 +1,17 @@ +package com.scents.note.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 io.reactivex.Single + +class SearchRepository { + val remoteDataSource : RemoteDataSource = RemoteDataSourceImpl() + + suspend fun postResultPerfume(token:String?,body:RequestSearch)=remoteDataSource.postSearchPerfume(token,body) + fun postPerfumeLike(token: String, perfumeIdx: Int): Single> = + ScentsNoteServiceImpl.service.postPerfumeLike(token, perfumeIdx).map { it } + +} \ No newline at end of file diff --git a/app/src/main/java/com/afume/afume_android/data/repository/SignRepository.kt b/app/src/main/java/com/scents/note/data/repository/SignRepository.kt similarity index 61% rename from app/src/main/java/com/afume/afume_android/data/repository/SignRepository.kt rename to app/src/main/java/com/scents/note/data/repository/SignRepository.kt index 61fb63df..47a68ecc 100644 --- a/app/src/main/java/com/afume/afume_android/data/repository/SignRepository.kt +++ b/app/src/main/java/com/scents/note/data/repository/SignRepository.kt @@ -1,9 +1,9 @@ -package com.afume.afume_android.data.repository +package com.scents.note.data.repository -import com.afume.afume_android.data.remote.RemoteDataSource -import com.afume.afume_android.data.remote.RemoteDataSourceImpl -import com.afume.afume_android.data.vo.request.RequestLogin -import com.afume.afume_android.data.vo.request.RequestRegister +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 class SignRepository { val remoteDataSource: RemoteDataSource = RemoteDataSourceImpl() diff --git a/app/src/main/java/com/afume/afume_android/data/repository/SplashRepository.kt b/app/src/main/java/com/scents/note/data/repository/SplashRepository.kt similarity index 51% rename from app/src/main/java/com/afume/afume_android/data/repository/SplashRepository.kt rename to app/src/main/java/com/scents/note/data/repository/SplashRepository.kt index febc8da8..4f96171b 100644 --- a/app/src/main/java/com/afume/afume_android/data/repository/SplashRepository.kt +++ b/app/src/main/java/com/scents/note/data/repository/SplashRepository.kt @@ -1,7 +1,7 @@ -package com.afume.afume_android.data.repository +package com.scents.note.data.repository -import com.afume.afume_android.data.remote.RemoteDataSource -import com.afume.afume_android.data.remote.RemoteDataSourceImpl +import com.scents.note.data.remote.RemoteDataSource +import com.scents.note.data.remote.RemoteDataSourceImpl class SplashRepository { val remoteDataSource: RemoteDataSource = RemoteDataSourceImpl() diff --git a/app/src/main/java/com/afume/afume_android/data/repository/SurveyRepository.kt b/app/src/main/java/com/scents/note/data/repository/SurveyRepository.kt similarity index 54% rename from app/src/main/java/com/afume/afume_android/data/repository/SurveyRepository.kt rename to app/src/main/java/com/scents/note/data/repository/SurveyRepository.kt index 7dedb00e..7aff7d89 100644 --- a/app/src/main/java/com/afume/afume_android/data/repository/SurveyRepository.kt +++ b/app/src/main/java/com/scents/note/data/repository/SurveyRepository.kt @@ -1,16 +1,16 @@ -package com.afume.afume_android.data.repository +package com.scents.note.data.repository -import com.afume.afume_android.AfumeApplication -import com.afume.afume_android.data.remote.RemoteDataSource -import com.afume.afume_android.data.remote.RemoteDataSourceImpl -import com.afume.afume_android.data.vo.request.RequestSurvey +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 class SurveyRepository { val remoteDataSource: RemoteDataSource = RemoteDataSourceImpl() suspend fun getSeries() = remoteDataSource.getSeries() suspend fun getSurveyPerfume()=remoteDataSource.getSurveyPerfume( - AfumeApplication.prefManager.accessToken + ScentsNoteApplication.prefManager.accessToken ) suspend fun getKeyword()=remoteDataSource.getKeyword() suspend fun postSurvey(token: String, body: RequestSurvey)=remoteDataSource.postSurvey(token, body) diff --git a/app/src/main/java/com/afume/afume_android/data/vo/DetailNoteListData.kt b/app/src/main/java/com/scents/note/data/vo/DetailNoteListData.kt similarity index 69% rename from app/src/main/java/com/afume/afume_android/data/vo/DetailNoteListData.kt rename to app/src/main/java/com/scents/note/data/vo/DetailNoteListData.kt index 0c81a0fe..d176ec03 100644 --- a/app/src/main/java/com/afume/afume_android/data/vo/DetailNoteListData.kt +++ b/app/src/main/java/com/scents/note/data/vo/DetailNoteListData.kt @@ -1,6 +1,4 @@ -package com.afume.afume_android.data.vo - -import android.provider.ContactsContract +package com.scents.note.data.vo data class DetailNoteListData( val age: String, diff --git a/app/src/main/java/com/afume/afume_android/data/vo/HomePerfumeListData.kt b/app/src/main/java/com/scents/note/data/vo/HomePerfumeListData.kt similarity index 75% rename from app/src/main/java/com/afume/afume_android/data/vo/HomePerfumeListData.kt rename to app/src/main/java/com/scents/note/data/vo/HomePerfumeListData.kt index 9b92cf60..a3c2bdeb 100644 --- a/app/src/main/java/com/afume/afume_android/data/vo/HomePerfumeListData.kt +++ b/app/src/main/java/com/scents/note/data/vo/HomePerfumeListData.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.data.vo +package com.scents.note.data.vo data class HomePerfumeListData ( val image: String?, diff --git a/app/src/main/java/com/afume/afume_android/data/vo/NewPerfumeListData.kt b/app/src/main/java/com/scents/note/data/vo/NewPerfumeListData.kt similarity index 81% rename from app/src/main/java/com/afume/afume_android/data/vo/NewPerfumeListData.kt rename to app/src/main/java/com/scents/note/data/vo/NewPerfumeListData.kt index d2134e1c..168e3f83 100644 --- a/app/src/main/java/com/afume/afume_android/data/vo/NewPerfumeListData.kt +++ b/app/src/main/java/com/scents/note/data/vo/NewPerfumeListData.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.data.vo +package com.scents.note.data.vo data class NewPerfumeListData( val status: Int, diff --git a/app/src/main/java/com/afume/afume_android/data/vo/ParcelableWishList.kt b/app/src/main/java/com/scents/note/data/vo/ParcelableWishList.kt similarity index 86% rename from app/src/main/java/com/afume/afume_android/data/vo/ParcelableWishList.kt rename to app/src/main/java/com/scents/note/data/vo/ParcelableWishList.kt index 3db8743d..6aced960 100644 --- a/app/src/main/java/com/afume/afume_android/data/vo/ParcelableWishList.kt +++ b/app/src/main/java/com/scents/note/data/vo/ParcelableWishList.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.data.vo +package com.scents.note.data.vo import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/app/src/main/java/com/afume/afume_android/data/vo/PerfumeDetailData.kt b/app/src/main/java/com/scents/note/data/vo/PerfumeDetailData.kt similarity index 75% rename from app/src/main/java/com/afume/afume_android/data/vo/PerfumeDetailData.kt rename to app/src/main/java/com/scents/note/data/vo/PerfumeDetailData.kt index fb0d11e7..05fe84d4 100644 --- a/app/src/main/java/com/afume/afume_android/data/vo/PerfumeDetailData.kt +++ b/app/src/main/java/com/scents/note/data/vo/PerfumeDetailData.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.data.vo +package com.scents.note.data.vo data class PerfumeDetailData( val image: List, diff --git a/app/src/main/java/com/afume/afume_android/data/vo/RecommendPerfumeListData.kt b/app/src/main/java/com/scents/note/data/vo/RecommendPerfumeListData.kt similarity index 77% rename from app/src/main/java/com/afume/afume_android/data/vo/RecommendPerfumeListData.kt rename to app/src/main/java/com/scents/note/data/vo/RecommendPerfumeListData.kt index 600ebb9e..40a138ea 100644 --- a/app/src/main/java/com/afume/afume_android/data/vo/RecommendPerfumeListData.kt +++ b/app/src/main/java/com/scents/note/data/vo/RecommendPerfumeListData.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.data.vo +package com.scents.note.data.vo data class RecommendPerfumeListData( val image: String?, diff --git a/app/src/main/java/com/afume/afume_android/data/vo/RvCircleData.kt b/app/src/main/java/com/scents/note/data/vo/RvCircleData.kt similarity index 76% rename from app/src/main/java/com/afume/afume_android/data/vo/RvCircleData.kt rename to app/src/main/java/com/scents/note/data/vo/RvCircleData.kt index c3bba18e..66c1860f 100644 --- a/app/src/main/java/com/afume/afume_android/data/vo/RvCircleData.kt +++ b/app/src/main/java/com/scents/note/data/vo/RvCircleData.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.data.vo +package com.scents.note.data.vo data class RvCircleData( val img:Int, diff --git a/app/src/main/java/com/afume/afume_android/data/vo/request/RequestBase.kt b/app/src/main/java/com/scents/note/data/vo/request/RequestBase.kt similarity index 62% rename from app/src/main/java/com/afume/afume_android/data/vo/request/RequestBase.kt rename to app/src/main/java/com/scents/note/data/vo/request/RequestBase.kt index cfed7974..04ff0434 100644 --- a/app/src/main/java/com/afume/afume_android/data/vo/request/RequestBase.kt +++ b/app/src/main/java/com/scents/note/data/vo/request/RequestBase.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.data.vo.request +package com.scents.note.data.vo.request data class RequestBase ( val pagingSize : Int, diff --git a/app/src/main/java/com/afume/afume_android/data/vo/request/RequestEditMyInfo.kt b/app/src/main/java/com/scents/note/data/vo/request/RequestEditMyInfo.kt similarity index 72% rename from app/src/main/java/com/afume/afume_android/data/vo/request/RequestEditMyInfo.kt rename to app/src/main/java/com/scents/note/data/vo/request/RequestEditMyInfo.kt index 8aba923f..a9c75741 100644 --- a/app/src/main/java/com/afume/afume_android/data/vo/request/RequestEditMyInfo.kt +++ b/app/src/main/java/com/scents/note/data/vo/request/RequestEditMyInfo.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.data.vo.request +package com.scents.note.data.vo.request data class RequestEditMyInfo( val email : String, diff --git a/app/src/main/java/com/afume/afume_android/data/vo/request/RequestEditPassword.kt b/app/src/main/java/com/scents/note/data/vo/request/RequestEditPassword.kt similarity index 66% rename from app/src/main/java/com/afume/afume_android/data/vo/request/RequestEditPassword.kt rename to app/src/main/java/com/scents/note/data/vo/request/RequestEditPassword.kt index 47ef5924..1e7350b9 100644 --- a/app/src/main/java/com/afume/afume_android/data/vo/request/RequestEditPassword.kt +++ b/app/src/main/java/com/scents/note/data/vo/request/RequestEditPassword.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.data.vo.request +package com.scents.note.data.vo.request data class RequestEditPassword( val prevPassword : String, diff --git a/app/src/main/java/com/afume/afume_android/data/vo/request/RequestLogin.kt b/app/src/main/java/com/scents/note/data/vo/request/RequestLogin.kt similarity index 61% rename from app/src/main/java/com/afume/afume_android/data/vo/request/RequestLogin.kt rename to app/src/main/java/com/scents/note/data/vo/request/RequestLogin.kt index 3e72563d..3aa71ae0 100644 --- a/app/src/main/java/com/afume/afume_android/data/vo/request/RequestLogin.kt +++ b/app/src/main/java/com/scents/note/data/vo/request/RequestLogin.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.data.vo.request +package com.scents.note.data.vo.request data class RequestLogin( val email : String, diff --git a/app/src/main/java/com/afume/afume_android/data/vo/request/RequestRegister.kt b/app/src/main/java/com/scents/note/data/vo/request/RequestRegister.kt similarity index 76% rename from app/src/main/java/com/afume/afume_android/data/vo/request/RequestRegister.kt rename to app/src/main/java/com/scents/note/data/vo/request/RequestRegister.kt index c11cfbd3..d5c24368 100644 --- a/app/src/main/java/com/afume/afume_android/data/vo/request/RequestRegister.kt +++ b/app/src/main/java/com/scents/note/data/vo/request/RequestRegister.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.data.vo.request +package com.scents.note.data.vo.request data class RequestRegister( val email : String, diff --git a/app/src/main/java/com/afume/afume_android/data/vo/request/RequestReportReview.kt b/app/src/main/java/com/scents/note/data/vo/request/RequestReportReview.kt similarity index 54% rename from app/src/main/java/com/afume/afume_android/data/vo/request/RequestReportReview.kt rename to app/src/main/java/com/scents/note/data/vo/request/RequestReportReview.kt index ef0d9713..d3140d08 100644 --- a/app/src/main/java/com/afume/afume_android/data/vo/request/RequestReportReview.kt +++ b/app/src/main/java/com/scents/note/data/vo/request/RequestReportReview.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.data.vo.request +package com.scents.note.data.vo.request data class RequestReportReview( val reason : String diff --git a/app/src/main/java/com/afume/afume_android/data/vo/request/RequestReview.kt b/app/src/main/java/com/scents/note/data/vo/request/RequestReview.kt similarity index 83% rename from app/src/main/java/com/afume/afume_android/data/vo/request/RequestReview.kt rename to app/src/main/java/com/scents/note/data/vo/request/RequestReview.kt index 398e3c2a..55ba151b 100644 --- a/app/src/main/java/com/afume/afume_android/data/vo/request/RequestReview.kt +++ b/app/src/main/java/com/scents/note/data/vo/request/RequestReview.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.data.vo.request +package com.scents.note.data.vo.request data class RequestReview( val score : Float, diff --git a/app/src/main/java/com/afume/afume_android/data/vo/request/RequestSearch.kt b/app/src/main/java/com/scents/note/data/vo/request/RequestSearch.kt similarity index 83% rename from app/src/main/java/com/afume/afume_android/data/vo/request/RequestSearch.kt rename to app/src/main/java/com/scents/note/data/vo/request/RequestSearch.kt index abc75cae..13abd3f9 100644 --- a/app/src/main/java/com/afume/afume_android/data/vo/request/RequestSearch.kt +++ b/app/src/main/java/com/scents/note/data/vo/request/RequestSearch.kt @@ -1,7 +1,7 @@ -package com.afume.afume_android.data.vo.request +package com.scents.note.data.vo.request import android.os.Parcelable -import com.afume.afume_android.data.vo.response.SeriesIngredients +import com.scents.note.data.vo.response.SeriesIngredients import kotlinx.parcelize.Parcelize data class RequestSearch( diff --git a/app/src/main/java/com/afume/afume_android/data/vo/request/RequestSurvey.kt b/app/src/main/java/com/scents/note/data/vo/request/RequestSurvey.kt similarity index 75% rename from app/src/main/java/com/afume/afume_android/data/vo/request/RequestSurvey.kt rename to app/src/main/java/com/scents/note/data/vo/request/RequestSurvey.kt index 68ddbffc..e0d92be6 100644 --- a/app/src/main/java/com/afume/afume_android/data/vo/request/RequestSurvey.kt +++ b/app/src/main/java/com/scents/note/data/vo/request/RequestSurvey.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.data.vo.request +package com.scents.note.data.vo.request data class RequestSurvey( val keywordList: MutableList?, diff --git a/app/src/main/java/com/afume/afume_android/data/vo/response/ResponseBase.kt b/app/src/main/java/com/scents/note/data/vo/response/ResponseBase.kt similarity index 72% rename from app/src/main/java/com/afume/afume_android/data/vo/response/ResponseBase.kt rename to app/src/main/java/com/scents/note/data/vo/response/ResponseBase.kt index 120e005e..57444c9e 100644 --- a/app/src/main/java/com/afume/afume_android/data/vo/response/ResponseBase.kt +++ b/app/src/main/java/com/scents/note/data/vo/response/ResponseBase.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.data.vo.response +package com.scents.note.data.vo.response data class ResponseBase( val message: String, diff --git a/app/src/main/java/com/afume/afume_android/data/vo/response/ResponseBrand.kt b/app/src/main/java/com/scents/note/data/vo/response/ResponseBrand.kt similarity index 86% rename from app/src/main/java/com/afume/afume_android/data/vo/response/ResponseBrand.kt rename to app/src/main/java/com/scents/note/data/vo/response/ResponseBrand.kt index 95f6cf95..c7d10c1b 100644 --- a/app/src/main/java/com/afume/afume_android/data/vo/response/ResponseBrand.kt +++ b/app/src/main/java/com/scents/note/data/vo/response/ResponseBrand.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.data.vo.response +package com.scents.note.data.vo.response data class ResponseBrand( val count: Int, diff --git a/app/src/main/java/com/afume/afume_android/data/vo/response/ResponseEditMyInfo.kt b/app/src/main/java/com/scents/note/data/vo/response/ResponseEditMyInfo.kt similarity index 75% rename from app/src/main/java/com/afume/afume_android/data/vo/response/ResponseEditMyInfo.kt rename to app/src/main/java/com/scents/note/data/vo/response/ResponseEditMyInfo.kt index 79ab727b..038590f6 100644 --- a/app/src/main/java/com/afume/afume_android/data/vo/response/ResponseEditMyInfo.kt +++ b/app/src/main/java/com/scents/note/data/vo/response/ResponseEditMyInfo.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.data.vo.response +package com.scents.note.data.vo.response data class ResponseEditMyInfo( val userIdx : Int, diff --git a/app/src/main/java/com/afume/afume_android/data/vo/response/ResponseHomePerfumeList.kt b/app/src/main/java/com/scents/note/data/vo/response/ResponseHomePerfumeList.kt similarity index 84% rename from app/src/main/java/com/afume/afume_android/data/vo/response/ResponseHomePerfumeList.kt rename to app/src/main/java/com/scents/note/data/vo/response/ResponseHomePerfumeList.kt index 355d869b..983f4af8 100644 --- a/app/src/main/java/com/afume/afume_android/data/vo/response/ResponseHomePerfumeList.kt +++ b/app/src/main/java/com/scents/note/data/vo/response/ResponseHomePerfumeList.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.data.vo.response +package com.scents.note.data.vo.response class ResponseHomePerfumeList ( val count : Int, diff --git a/app/src/main/java/com/afume/afume_android/data/vo/response/ResponseKeyword.kt b/app/src/main/java/com/scents/note/data/vo/response/ResponseKeyword.kt similarity index 82% rename from app/src/main/java/com/afume/afume_android/data/vo/response/ResponseKeyword.kt rename to app/src/main/java/com/scents/note/data/vo/response/ResponseKeyword.kt index b9ebb7ee..d6cd5632 100644 --- a/app/src/main/java/com/afume/afume_android/data/vo/response/ResponseKeyword.kt +++ b/app/src/main/java/com/scents/note/data/vo/response/ResponseKeyword.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.data.vo.response +package com.scents.note.data.vo.response data class ResponseKeyword( val count: Int, diff --git a/app/src/main/java/com/afume/afume_android/data/vo/response/ResponseLogin.kt b/app/src/main/java/com/scents/note/data/vo/response/ResponseLogin.kt similarity index 78% rename from app/src/main/java/com/afume/afume_android/data/vo/response/ResponseLogin.kt rename to app/src/main/java/com/scents/note/data/vo/response/ResponseLogin.kt index ba5ae165..c98cb8d8 100644 --- a/app/src/main/java/com/afume/afume_android/data/vo/response/ResponseLogin.kt +++ b/app/src/main/java/com/scents/note/data/vo/response/ResponseLogin.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.data.vo.response +package com.scents.note.data.vo.response data class ResponseLogin( val userIdx : Int, diff --git a/app/src/main/java/com/afume/afume_android/data/vo/response/ResponseMyPerfume.kt b/app/src/main/java/com/scents/note/data/vo/response/ResponseMyPerfume.kt similarity index 81% rename from app/src/main/java/com/afume/afume_android/data/vo/response/ResponseMyPerfume.kt rename to app/src/main/java/com/scents/note/data/vo/response/ResponseMyPerfume.kt index 825ea813..bac98679 100644 --- a/app/src/main/java/com/afume/afume_android/data/vo/response/ResponseMyPerfume.kt +++ b/app/src/main/java/com/scents/note/data/vo/response/ResponseMyPerfume.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.data.vo.response +package com.scents.note.data.vo.response data class ResponseMyPerfume( val reviewIdx: Int, diff --git a/app/src/main/java/com/afume/afume_android/data/vo/response/ResponseNewPerfumeList.kt b/app/src/main/java/com/scents/note/data/vo/response/ResponseNewPerfumeList.kt similarity index 84% rename from app/src/main/java/com/afume/afume_android/data/vo/response/ResponseNewPerfumeList.kt rename to app/src/main/java/com/scents/note/data/vo/response/ResponseNewPerfumeList.kt index c6d3feb6..57c51947 100644 --- a/app/src/main/java/com/afume/afume_android/data/vo/response/ResponseNewPerfumeList.kt +++ b/app/src/main/java/com/scents/note/data/vo/response/ResponseNewPerfumeList.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.data.vo.response +package com.scents.note.data.vo.response data class ResponseNewPerfumeList( val count : Int, diff --git a/app/src/main/java/com/afume/afume_android/data/vo/response/ResponsePerfume.kt b/app/src/main/java/com/scents/note/data/vo/response/ResponsePerfume.kt similarity index 89% rename from app/src/main/java/com/afume/afume_android/data/vo/response/ResponsePerfume.kt rename to app/src/main/java/com/scents/note/data/vo/response/ResponsePerfume.kt index 96414f27..567a06a4 100644 --- a/app/src/main/java/com/afume/afume_android/data/vo/response/ResponsePerfume.kt +++ b/app/src/main/java/com/scents/note/data/vo/response/ResponsePerfume.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.data.vo.response +package com.scents.note.data.vo.response data class ResponsePerfume( val count: Int, diff --git a/app/src/main/java/com/afume/afume_android/data/vo/response/ResponsePerfumeDetail.kt b/app/src/main/java/com/scents/note/data/vo/response/ResponsePerfumeDetail.kt similarity index 96% rename from app/src/main/java/com/afume/afume_android/data/vo/response/ResponsePerfumeDetail.kt rename to app/src/main/java/com/scents/note/data/vo/response/ResponsePerfumeDetail.kt index 7233b351..c94a0602 100644 --- a/app/src/main/java/com/afume/afume_android/data/vo/response/ResponsePerfumeDetail.kt +++ b/app/src/main/java/com/scents/note/data/vo/response/ResponsePerfumeDetail.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.data.vo.response +package com.scents.note.data.vo.response data class ResponsePerfumeDetail( val message: String, diff --git a/app/src/main/java/com/afume/afume_android/data/vo/response/ResponsePerfumeDetailWithReviews.kt b/app/src/main/java/com/scents/note/data/vo/response/ResponsePerfumeDetailWithReviews.kt similarity index 89% rename from app/src/main/java/com/afume/afume_android/data/vo/response/ResponsePerfumeDetailWithReviews.kt rename to app/src/main/java/com/scents/note/data/vo/response/ResponsePerfumeDetailWithReviews.kt index 1d8daaf8..377a354f 100644 --- a/app/src/main/java/com/afume/afume_android/data/vo/response/ResponsePerfumeDetailWithReviews.kt +++ b/app/src/main/java/com/scents/note/data/vo/response/ResponsePerfumeDetailWithReviews.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.data.vo.response +package com.scents.note.data.vo.response data class ResponsePerfumeDetailWithReviews( val message: String, diff --git a/app/src/main/java/com/afume/afume_android/data/vo/response/ResponseRecommendPerfumeList.kt b/app/src/main/java/com/scents/note/data/vo/response/ResponseRecommendPerfumeList.kt similarity index 86% rename from app/src/main/java/com/afume/afume_android/data/vo/response/ResponseRecommendPerfumeList.kt rename to app/src/main/java/com/scents/note/data/vo/response/ResponseRecommendPerfumeList.kt index aa26e198..aacd3a6e 100644 --- a/app/src/main/java/com/afume/afume_android/data/vo/response/ResponseRecommendPerfumeList.kt +++ b/app/src/main/java/com/scents/note/data/vo/response/ResponseRecommendPerfumeList.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.data.vo.response +package com.scents.note.data.vo.response data class ResponseRecommendPerfumeList( val count : Int, diff --git a/app/src/main/java/com/afume/afume_android/data/vo/response/ResponseRegister.kt b/app/src/main/java/com/scents/note/data/vo/response/ResponseRegister.kt similarity index 68% rename from app/src/main/java/com/afume/afume_android/data/vo/response/ResponseRegister.kt rename to app/src/main/java/com/scents/note/data/vo/response/ResponseRegister.kt index f4824cb9..e851a6f4 100644 --- a/app/src/main/java/com/afume/afume_android/data/vo/response/ResponseRegister.kt +++ b/app/src/main/java/com/scents/note/data/vo/response/ResponseRegister.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.data.vo.response +package com.scents.note.data.vo.response data class ResponseRegister( val userIdx : Int, diff --git a/app/src/main/java/com/afume/afume_android/data/vo/response/ResponseReview.kt b/app/src/main/java/com/scents/note/data/vo/response/ResponseReview.kt similarity index 93% rename from app/src/main/java/com/afume/afume_android/data/vo/response/ResponseReview.kt rename to app/src/main/java/com/scents/note/data/vo/response/ResponseReview.kt index 87784e29..1bc98895 100644 --- a/app/src/main/java/com/afume/afume_android/data/vo/response/ResponseReview.kt +++ b/app/src/main/java/com/scents/note/data/vo/response/ResponseReview.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.data.vo.response +package com.scents.note.data.vo.response import com.google.gson.annotations.SerializedName diff --git a/app/src/main/java/com/afume/afume_android/data/vo/response/ResponseReviewAdd.kt b/app/src/main/java/com/scents/note/data/vo/response/ResponseReviewAdd.kt similarity index 53% rename from app/src/main/java/com/afume/afume_android/data/vo/response/ResponseReviewAdd.kt rename to app/src/main/java/com/scents/note/data/vo/response/ResponseReviewAdd.kt index 5027d475..a129e7d4 100644 --- a/app/src/main/java/com/afume/afume_android/data/vo/response/ResponseReviewAdd.kt +++ b/app/src/main/java/com/scents/note/data/vo/response/ResponseReviewAdd.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.data.vo.response +package com.scents.note.data.vo.response data class ResponseReviewAdd( val reviewIdx : Int diff --git a/app/src/main/java/com/afume/afume_android/data/vo/response/ResponseSeries.kt b/app/src/main/java/com/scents/note/data/vo/response/ResponseSeries.kt similarity index 93% rename from app/src/main/java/com/afume/afume_android/data/vo/response/ResponseSeries.kt rename to app/src/main/java/com/scents/note/data/vo/response/ResponseSeries.kt index 98cb465d..858728e1 100644 --- a/app/src/main/java/com/afume/afume_android/data/vo/response/ResponseSeries.kt +++ b/app/src/main/java/com/scents/note/data/vo/response/ResponseSeries.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.data.vo.response +package com.scents.note.data.vo.response import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/app/src/main/java/com/afume/afume_android/ui/ButtonActivity.kt b/app/src/main/java/com/scents/note/ui/ButtonActivity.kt similarity index 77% rename from app/src/main/java/com/afume/afume_android/ui/ButtonActivity.kt rename to app/src/main/java/com/scents/note/ui/ButtonActivity.kt index 32f8bdb8..141acbc6 100644 --- a/app/src/main/java/com/afume/afume_android/ui/ButtonActivity.kt +++ b/app/src/main/java/com/scents/note/ui/ButtonActivity.kt @@ -1,14 +1,14 @@ -package com.afume.afume_android.ui +package com.scents.note.ui import android.content.Intent import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil -import com.afume.afume_android.R -import com.afume.afume_android.databinding.ActivityButtonBinding -import com.afume.afume_android.ui.detail.PerfumeDetailActivity -import com.afume.afume_android.ui.note.NoteActivity -import com.afume.afume_android.ui.signin.SignHomeActivity +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 class ButtonActivity : AppCompatActivity() { lateinit var binding: ActivityButtonBinding diff --git a/app/src/main/java/com/afume/afume_android/ui/MainActivity.kt b/app/src/main/java/com/scents/note/ui/MainActivity.kt similarity index 86% rename from app/src/main/java/com/afume/afume_android/ui/MainActivity.kt rename to app/src/main/java/com/scents/note/ui/MainActivity.kt index c067917d..a30a3a21 100644 --- a/app/src/main/java/com/afume/afume_android/ui/MainActivity.kt +++ b/app/src/main/java/com/scents/note/ui/MainActivity.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui +package com.scents.note.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.afume.afume_android.AfumeApplication -import com.afume.afume_android.R -import com.afume.afume_android.data.vo.request.FilterInfoP -import com.afume.afume_android.data.vo.request.SendFilter -import com.afume.afume_android.databinding.ActivityMainBinding -import com.afume.afume_android.ui.my.MyViewModel -import com.afume.afume_android.ui.search.SearchViewModel -import com.afume.afume_android.ui.search.SingleViewModelFactory +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.google.android.material.bottomnavigation.BottomNavigationView import kotlinx.coroutines.launch @@ -42,7 +42,7 @@ class MainActivity : AppCompatActivity() { super.onResume() getFilter() - if(AfumeApplication.prefManager.haveToken()){ + if(ScentsNoteApplication.prefManager.haveToken()){ lifecycleScope.launch { myViewModel.getLikedPerfume() myViewModel.getMyPerfume() diff --git a/app/src/main/java/com/afume/afume_android/ui/detail/DetailImageAdapter.kt b/app/src/main/java/com/scents/note/ui/detail/DetailImageAdapter.kt similarity index 92% rename from app/src/main/java/com/afume/afume_android/ui/detail/DetailImageAdapter.kt rename to app/src/main/java/com/scents/note/ui/detail/DetailImageAdapter.kt index ea438028..cf7e3b4e 100644 --- a/app/src/main/java/com/afume/afume_android/ui/detail/DetailImageAdapter.kt +++ b/app/src/main/java/com/scents/note/ui/detail/DetailImageAdapter.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.detail +package com.scents.note.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.afume.afume_android.R -import com.afume.afume_android.databinding.RvItemDetailImageBinding +import com.scents.note.R +import com.scents.note.databinding.RvItemDetailImageBinding import com.bumptech.glide.Glide class DetailImageAdapter(val context: Context) : RecyclerView.Adapter() { diff --git a/app/src/main/java/com/afume/afume_android/ui/detail/MeasuredViewPager.kt b/app/src/main/java/com/scents/note/ui/detail/MeasuredViewPager.kt similarity index 97% rename from app/src/main/java/com/afume/afume_android/ui/detail/MeasuredViewPager.kt rename to app/src/main/java/com/scents/note/ui/detail/MeasuredViewPager.kt index 7430b2fa..f6155180 100644 --- a/app/src/main/java/com/afume/afume_android/ui/detail/MeasuredViewPager.kt +++ b/app/src/main/java/com/scents/note/ui/detail/MeasuredViewPager.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.detail +package com.scents.note.ui.detail import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/com/afume/afume_android/ui/detail/PerfumeDetailActivity.kt b/app/src/main/java/com/scents/note/ui/detail/PerfumeDetailActivity.kt similarity index 87% rename from app/src/main/java/com/afume/afume_android/ui/detail/PerfumeDetailActivity.kt rename to app/src/main/java/com/scents/note/ui/detail/PerfumeDetailActivity.kt index 6377a22b..33b19dea 100644 --- a/app/src/main/java/com/afume/afume_android/ui/detail/PerfumeDetailActivity.kt +++ b/app/src/main/java/com/scents/note/ui/detail/PerfumeDetailActivity.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.detail +package com.scents.note.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.afume.afume_android.AfumeApplication -import com.afume.afume_android.R -import com.afume.afume_android.data.vo.ParcelableWishList -import com.afume.afume_android.databinding.ActivityPerfumeDetailBinding -import com.afume.afume_android.ui.detail.info.DetailInfoFragment -import com.afume.afume_android.ui.detail.note.DetailNoteFragment -import com.afume.afume_android.ui.note.NoteActivity -import com.afume.afume_android.util.* -import com.afume.afume_android.util.BindingAdapter.setNoteBtnText +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.bumptech.glide.Glide +import com.scents.note.util.BindingAdapter.setNoteBtnText class PerfumeDetailActivity : AppCompatActivity() { lateinit var binding: ActivityPerfumeDetailBinding @@ -113,7 +113,7 @@ class PerfumeDetailActivity : AppCompatActivity() { private fun setClick(){ binding.actPerfumeDetailClLike.setOnClickListener{ - if(AfumeApplication.prefManager.haveToken()){ + if(ScentsNoteApplication.prefManager.haveToken()){ if(isLiked) { isLiked = false binding.actPerfumeDetailIvLike.setImageResource(R.drawable.favorite_inactive) @@ -127,7 +127,7 @@ class PerfumeDetailActivity : AppCompatActivity() { } binding.actPerfumeDetailIvWrite.setOnClickListener { - if(AfumeApplication.prefManager.haveToken()){ + if(ScentsNoteApplication.prefManager.haveToken()){ val intent = Intent(this@PerfumeDetailActivity, NoteActivity::class.java) val wishListPerfume = ParcelableWishList(perfumeIdx,reviewIdx,perfumeName,brandName,image) diff --git a/app/src/main/java/com/afume/afume_android/ui/detail/PerfumeDetailViewModel.kt b/app/src/main/java/com/scents/note/ui/detail/PerfumeDetailViewModel.kt similarity index 86% rename from app/src/main/java/com/afume/afume_android/ui/detail/PerfumeDetailViewModel.kt rename to app/src/main/java/com/scents/note/ui/detail/PerfumeDetailViewModel.kt index 964311b7..e4e7fd43 100644 --- a/app/src/main/java/com/afume/afume_android/ui/detail/PerfumeDetailViewModel.kt +++ b/app/src/main/java/com/scents/note/ui/detail/PerfumeDetailViewModel.kt @@ -1,15 +1,15 @@ -package com.afume.afume_android.ui.detail +package com.scents.note.ui.detail import android.util.Log import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.afume.afume_android.AfumeApplication -import com.afume.afume_android.data.repository.PerfumeDetailRepository -import com.afume.afume_android.data.vo.request.RequestReportReview -import com.afume.afume_android.data.vo.response.PerfumeDetail -import com.afume.afume_android.data.vo.response.PerfumeDetailWithReviews +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 io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable import io.reactivex.schedulers.Schedulers @@ -35,7 +35,7 @@ class PerfumeDetailViewModel: ViewModel() { fun getPerfumeInfo(perfumeIdx: Int) { compositeDisposable.add( - repo.getPerfumeDetail(AfumeApplication.prefManager.accessToken, perfumeIdx) + repo.getPerfumeDetail(ScentsNoteApplication.prefManager.accessToken, perfumeIdx) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe({ @@ -64,7 +64,7 @@ class PerfumeDetailViewModel: ViewModel() { fun getPerfumeInfoWithReview(perfumeIdx: Int) { compositeDisposable.add( - repo.getPerfumeDetailWithReviews(AfumeApplication.prefManager.accessToken, perfumeIdx) + repo.getPerfumeDetailWithReviews(ScentsNoteApplication.prefManager.accessToken, perfumeIdx) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe({ @@ -85,7 +85,7 @@ class PerfumeDetailViewModel: ViewModel() { fun postPerfumeLike(perfumeIdx: Int) { compositeDisposable.add( - repo.postPerfumeLike(AfumeApplication.prefManager.accessToken, perfumeIdx) + repo.postPerfumeLike(ScentsNoteApplication.prefManager.accessToken, perfumeIdx) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe({ @@ -102,7 +102,7 @@ class PerfumeDetailViewModel: ViewModel() { fun postReviewLike(reviewIdx: Int){ viewModelScope.launch { try{ - repo.postReviewLike(AfumeApplication.prefManager.accessToken, reviewIdx).let{ + repo.postReviewLike(ScentsNoteApplication.prefManager.accessToken, reviewIdx).let{ _reviewLike.postValue(it) clickHeartNoteList(reviewIdx, it) Log.d("시향 노트 좋아요 상태 : ", it.toString()) @@ -147,7 +147,7 @@ class PerfumeDetailViewModel: ViewModel() { fun reportReview(reviewIdx: Int){ viewModelScope.launch { try{ - repo.reportReview(AfumeApplication.prefManager.accessToken, reviewIdx, RequestReportReview(reportTxt.value!!) ).let { + repo.reportReview(ScentsNoteApplication.prefManager.accessToken, reviewIdx, RequestReportReview(reportTxt.value!!) ).let { _isValidReport.postValue(true) Log.d("시향 노트 신고 성공",it) } diff --git a/app/src/main/java/com/afume/afume_android/ui/detail/StickyScrollView.kt b/app/src/main/java/com/scents/note/ui/detail/StickyScrollView.kt similarity index 98% rename from app/src/main/java/com/afume/afume_android/ui/detail/StickyScrollView.kt rename to app/src/main/java/com/scents/note/ui/detail/StickyScrollView.kt index 358f528a..da435713 100644 --- a/app/src/main/java/com/afume/afume_android/ui/detail/StickyScrollView.kt +++ b/app/src/main/java/com/scents/note/ui/detail/StickyScrollView.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.detail +package com.scents.note.ui.detail import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/com/afume/afume_android/ui/detail/ViewPagerAdapter.kt b/app/src/main/java/com/scents/note/ui/detail/ViewPagerAdapter.kt similarity index 90% rename from app/src/main/java/com/afume/afume_android/ui/detail/ViewPagerAdapter.kt rename to app/src/main/java/com/scents/note/ui/detail/ViewPagerAdapter.kt index df8173d9..0f9b78f8 100644 --- a/app/src/main/java/com/afume/afume_android/ui/detail/ViewPagerAdapter.kt +++ b/app/src/main/java/com/scents/note/ui/detail/ViewPagerAdapter.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.detail +package com.scents.note.ui.detail import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager diff --git a/app/src/main/java/com/afume/afume_android/ui/detail/info/DetailInfoFragment.kt b/app/src/main/java/com/scents/note/ui/detail/info/DetailInfoFragment.kt similarity index 97% rename from app/src/main/java/com/afume/afume_android/ui/detail/info/DetailInfoFragment.kt rename to app/src/main/java/com/scents/note/ui/detail/info/DetailInfoFragment.kt index 2c7542fe..96e3bd47 100644 --- a/app/src/main/java/com/afume/afume_android/ui/detail/info/DetailInfoFragment.kt +++ b/app/src/main/java/com/scents/note/ui/detail/info/DetailInfoFragment.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.detail.info +package com.scents.note.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.afume.afume_android.R -import com.afume.afume_android.databinding.FragmentDetailInfoBinding -import com.afume.afume_android.ui.detail.PerfumeDetailViewModel -import com.afume.afume_android.ui.home.HomeViewModel -import com.afume.afume_android.ui.home.adapter.PopularListAdapter +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.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/afume/afume_android/ui/detail/info/DetailKeywordAdapter.kt b/app/src/main/java/com/scents/note/ui/detail/info/DetailKeywordAdapter.kt similarity index 91% rename from app/src/main/java/com/afume/afume_android/ui/detail/info/DetailKeywordAdapter.kt rename to app/src/main/java/com/scents/note/ui/detail/info/DetailKeywordAdapter.kt index 6ecf77f5..6b3c2723 100644 --- a/app/src/main/java/com/afume/afume_android/ui/detail/info/DetailKeywordAdapter.kt +++ b/app/src/main/java/com/scents/note/ui/detail/info/DetailKeywordAdapter.kt @@ -1,11 +1,11 @@ -package com.afume.afume_android.ui.detail.info +package com.scents.note.ui.detail.info import android.view.LayoutInflater import android.view.ViewGroup import androidx.databinding.DataBindingUtil import androidx.recyclerview.widget.RecyclerView -import com.afume.afume_android.R -import com.afume.afume_android.databinding.RvItemDetailKeywordBinding +import com.scents.note.R +import com.scents.note.databinding.RvItemDetailKeywordBinding class DetailKeywordAdapter : RecyclerView.Adapter() { var data = mutableListOf() diff --git a/app/src/main/java/com/afume/afume_android/ui/detail/info/HorizontalBarChartAdapter.kt b/app/src/main/java/com/scents/note/ui/detail/info/HorizontalBarChartAdapter.kt similarity index 96% rename from app/src/main/java/com/afume/afume_android/ui/detail/info/HorizontalBarChartAdapter.kt rename to app/src/main/java/com/scents/note/ui/detail/info/HorizontalBarChartAdapter.kt index aa323594..57a08ff4 100644 --- a/app/src/main/java/com/afume/afume_android/ui/detail/info/HorizontalBarChartAdapter.kt +++ b/app/src/main/java/com/scents/note/ui/detail/info/HorizontalBarChartAdapter.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.detail.info +package com.scents.note.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.afume.afume_android.R -import com.afume.afume_android.databinding.RvItemDetailsInfoHorizontalBarChartBinding +import com.scents.note.R +import com.scents.note.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/afume/afume_android/ui/detail/info/PriceRvAdapter.kt b/app/src/main/java/com/scents/note/ui/detail/info/PriceRvAdapter.kt similarity index 89% rename from app/src/main/java/com/afume/afume_android/ui/detail/info/PriceRvAdapter.kt rename to app/src/main/java/com/scents/note/ui/detail/info/PriceRvAdapter.kt index df3816bf..e8bc2aaa 100644 --- a/app/src/main/java/com/afume/afume_android/ui/detail/info/PriceRvAdapter.kt +++ b/app/src/main/java/com/scents/note/ui/detail/info/PriceRvAdapter.kt @@ -1,10 +1,10 @@ -package com.afume.afume_android.ui.detail.info +package com.scents.note.ui.detail.info import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.afume.afume_android.R -import com.afume.afume_android.databinding.RvItemDetailPriceBinding +import com.scents.note.R +import com.scents.note.databinding.RvItemDetailPriceBinding class PriceRvAdapter : RecyclerView.Adapter() { diff --git a/app/src/main/java/com/afume/afume_android/ui/detail/note/DetailNoteAdapter.kt b/app/src/main/java/com/scents/note/ui/detail/note/DetailNoteAdapter.kt similarity index 86% rename from app/src/main/java/com/afume/afume_android/ui/detail/note/DetailNoteAdapter.kt rename to app/src/main/java/com/scents/note/ui/detail/note/DetailNoteAdapter.kt index ab539c05..5f918d5a 100644 --- a/app/src/main/java/com/afume/afume_android/ui/detail/note/DetailNoteAdapter.kt +++ b/app/src/main/java/com/scents/note/ui/detail/note/DetailNoteAdapter.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.detail.note +package com.scents.note.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.afume.afume_android.AfumeApplication -import com.afume.afume_android.data.vo.response.PerfumeDetailWithReviews -import com.afume.afume_android.databinding.RvItemDetailNoteBinding -import com.afume.afume_android.databinding.RvItemDetailNoteReportBinding -import com.afume.afume_android.ui.detail.PerfumeDetailViewModel -import com.afume.afume_android.util.CommonDialog -import com.afume.afume_android.util.ReportDialog +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 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() @@ -82,14 +82,14 @@ class DetailNoteAdapter(private val context: Context, private val vm: PerfumeDet binding.item = item binding.btnLike.setOnClickListener { - if (!AfumeApplication.prefManager.haveToken()) createLoginDialog() + if (!ScentsNoteApplication.prefManager.haveToken()) createLoginDialog() else { clickBtnLike(item.reviewIdx) } } binding.txtRvDetailNoteReport.setOnClickListener { - if (!AfumeApplication.prefManager.haveToken()) createLoginDialog() + if (!ScentsNoteApplication.prefManager.haveToken()) createLoginDialog() else { createReportDialog(item.reviewIdx) } diff --git a/app/src/main/java/com/afume/afume_android/ui/detail/note/DetailNoteFragment.kt b/app/src/main/java/com/scents/note/ui/detail/note/DetailNoteFragment.kt similarity index 90% rename from app/src/main/java/com/afume/afume_android/ui/detail/note/DetailNoteFragment.kt rename to app/src/main/java/com/scents/note/ui/detail/note/DetailNoteFragment.kt index c8bd4815..89bac24b 100644 --- a/app/src/main/java/com/afume/afume_android/ui/detail/note/DetailNoteFragment.kt +++ b/app/src/main/java/com/scents/note/ui/detail/note/DetailNoteFragment.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.detail.note +package com.scents.note.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.afume.afume_android.R -import com.afume.afume_android.databinding.FragmentDetailNoteBinding -import com.afume.afume_android.ui.detail.PerfumeDetailViewModel +import com.scents.note.R +import com.scents.note.databinding.FragmentDetailNoteBinding +import com.scents.note.ui.detail.PerfumeDetailViewModel class DetailNoteFragment(val perfumeIdx: Int) : Fragment() { diff --git a/app/src/main/java/com/afume/afume_android/ui/filter/FilterActivity.kt b/app/src/main/java/com/scents/note/ui/filter/FilterActivity.kt similarity index 85% rename from app/src/main/java/com/afume/afume_android/ui/filter/FilterActivity.kt rename to app/src/main/java/com/scents/note/ui/filter/FilterActivity.kt index 51d0074f..926ee703 100644 --- a/app/src/main/java/com/afume/afume_android/ui/filter/FilterActivity.kt +++ b/app/src/main/java/com/scents/note/ui/filter/FilterActivity.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.filter +package com.scents.note.ui.filter import android.content.Intent import android.os.Bundle @@ -8,21 +8,21 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import androidx.databinding.DataBindingUtil import androidx.lifecycle.Observer -import com.afume.afume_android.R -import com.afume.afume_android.data.vo.request.SendFilter -import com.afume.afume_android.databinding.ActivityFilterBinding -import com.afume.afume_android.ui.MainActivity -import com.afume.afume_android.ui.filter.brand.FilterBrandFragment -import com.afume.afume_android.ui.filter.incense.FilterIncenseSeriesFragment -import com.afume.afume_android.ui.filter.keyword.FilterKeywordFragment -import com.afume.afume_android.ui.search.SearchHomeFragment.Companion.SEARCH_HOME -import com.afume.afume_android.util.TabSelectedListener -import com.afume.afume_android.util.changeTabsFont +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.google.android.material.badge.BadgeDrawable +import com.scents.note.util.changeTabsFont class FilterActivity : AppCompatActivity() { private lateinit var binding: ActivityFilterBinding - private lateinit var filterViewPagerAdapter: AfumeViewPagerAdapter + private lateinit var filterViewPagerAdapter: ScentsNoteViewPagerAdapter private val filterViewModel: FilterViewModel by viewModels() { FilterViewModelFactory.getInstance() } @@ -81,7 +81,7 @@ class FilterActivity : AppCompatActivity() { } private fun initViewPager() { - filterViewPagerAdapter = AfumeViewPagerAdapter(supportFragmentManager) + filterViewPagerAdapter = ScentsNoteViewPagerAdapter(supportFragmentManager) filterViewPagerAdapter.fragments = listOf( FilterIncenseSeriesFragment(), FilterBrandFragment(), diff --git a/app/src/main/java/com/afume/afume_android/ui/filter/FilterViewModel.kt b/app/src/main/java/com/scents/note/ui/filter/FilterViewModel.kt similarity index 96% rename from app/src/main/java/com/afume/afume_android/ui/filter/FilterViewModel.kt rename to app/src/main/java/com/scents/note/ui/filter/FilterViewModel.kt index 0f899544..a5c3ccf5 100644 --- a/app/src/main/java/com/afume/afume_android/ui/filter/FilterViewModel.kt +++ b/app/src/main/java/com/scents/note/ui/filter/FilterViewModel.kt @@ -1,17 +1,17 @@ -package com.afume.afume_android.ui.filter +package com.scents.note.ui.filter import android.util.Log import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.afume.afume_android.data.repository.FilterRepository -import com.afume.afume_android.data.vo.request.FilterInfoP -import com.afume.afume_android.data.vo.request.SendFilter -import com.afume.afume_android.data.vo.response.BrandInfo -import com.afume.afume_android.data.vo.response.KeywordInfo -import com.afume.afume_android.data.vo.response.SeriesInfo -import com.afume.afume_android.data.vo.response.SeriesIngredients +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 kotlinx.coroutines.launch import retrofit2.HttpException diff --git a/app/src/main/java/com/afume/afume_android/ui/filter/FilterViewModelFactory.kt b/app/src/main/java/com/scents/note/ui/filter/FilterViewModelFactory.kt similarity index 94% rename from app/src/main/java/com/afume/afume_android/ui/filter/FilterViewModelFactory.kt rename to app/src/main/java/com/scents/note/ui/filter/FilterViewModelFactory.kt index 0828e19f..728d08b7 100644 --- a/app/src/main/java/com/afume/afume_android/ui/filter/FilterViewModelFactory.kt +++ b/app/src/main/java/com/scents/note/ui/filter/FilterViewModelFactory.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.filter +package com.scents.note.ui.filter import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider diff --git a/app/src/main/java/com/afume/afume_android/ui/filter/Filterbinding.kt b/app/src/main/java/com/scents/note/ui/filter/Filterbinding.kt similarity index 80% rename from app/src/main/java/com/afume/afume_android/ui/filter/Filterbinding.kt rename to app/src/main/java/com/scents/note/ui/filter/Filterbinding.kt index d819b301..47557553 100644 --- a/app/src/main/java/com/afume/afume_android/ui/filter/Filterbinding.kt +++ b/app/src/main/java/com/scents/note/ui/filter/Filterbinding.kt @@ -1,17 +1,17 @@ -package com.afume.afume_android.ui.filter +package com.scents.note.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.afume.afume_android.R -import com.afume.afume_android.data.vo.response.BrandInfo -import com.afume.afume_android.data.vo.response.SeriesInfo -import com.afume.afume_android.data.vo.response.SeriesIngredients -import com.afume.afume_android.ui.filter.brand.BrandRecyclerViewAdapter -import com.afume.afume_android.ui.filter.incense.IngredientFlexboxAdapter -import com.afume.afume_android.ui.filter.incense.SeriesIngredientsViewAdapter +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 object FilterBinding { diff --git a/app/src/main/java/com/afume/afume_android/ui/filter/AfumeViewPagerAdapter.kt b/app/src/main/java/com/scents/note/ui/filter/ScentsNoteViewPagerAdapter.kt similarity index 65% rename from app/src/main/java/com/afume/afume_android/ui/filter/AfumeViewPagerAdapter.kt rename to app/src/main/java/com/scents/note/ui/filter/ScentsNoteViewPagerAdapter.kt index c58dfc35..6c5c97b3 100644 --- a/app/src/main/java/com/afume/afume_android/ui/filter/AfumeViewPagerAdapter.kt +++ b/app/src/main/java/com/scents/note/ui/filter/ScentsNoteViewPagerAdapter.kt @@ -1,10 +1,10 @@ -package com.afume.afume_android.ui.filter +package com.scents.note.ui.filter import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentStatePagerAdapter -class AfumeViewPagerAdapter (fm: FragmentManager):FragmentStatePagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT){ +class ScentsNoteViewPagerAdapter (fm: FragmentManager):FragmentStatePagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT){ var fragments = listOf() override fun getItem(position: Int): Fragment =fragments[position] diff --git a/app/src/main/java/com/afume/afume_android/ui/filter/brand/BrandRecyclerViewAdapter.kt b/app/src/main/java/com/scents/note/ui/filter/brand/BrandRecyclerViewAdapter.kt similarity index 93% rename from app/src/main/java/com/afume/afume_android/ui/filter/brand/BrandRecyclerViewAdapter.kt rename to app/src/main/java/com/scents/note/ui/filter/brand/BrandRecyclerViewAdapter.kt index afd15132..533f63b8 100644 --- a/app/src/main/java/com/afume/afume_android/ui/filter/brand/BrandRecyclerViewAdapter.kt +++ b/app/src/main/java/com/scents/note/ui/filter/brand/BrandRecyclerViewAdapter.kt @@ -1,11 +1,11 @@ -package com.afume.afume_android.ui.filter.brand +package com.scents.note.ui.filter.brand import android.view.LayoutInflater import android.view.ViewGroup import android.widget.Toast import androidx.recyclerview.widget.RecyclerView -import com.afume.afume_android.data.vo.response.BrandInfo -import com.afume.afume_android.databinding.RvItemFilterBrandBinding +import com.scents.note.data.vo.response.BrandInfo +import com.scents.note.databinding.RvItemFilterBrandBinding class BrandRecyclerViewAdapter( val setSelectedBrand: (BrandInfo, Boolean) -> Unit, diff --git a/app/src/main/java/com/afume/afume_android/ui/filter/brand/FilterBrandFragment.kt b/app/src/main/java/com/scents/note/ui/filter/brand/FilterBrandFragment.kt similarity index 91% rename from app/src/main/java/com/afume/afume_android/ui/filter/brand/FilterBrandFragment.kt rename to app/src/main/java/com/scents/note/ui/filter/brand/FilterBrandFragment.kt index 22985069..9b7a58f1 100644 --- a/app/src/main/java/com/afume/afume_android/ui/filter/brand/FilterBrandFragment.kt +++ b/app/src/main/java/com/scents/note/ui/filter/brand/FilterBrandFragment.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.filter.brand +package com.scents.note.ui.filter.brand import android.content.Context import android.os.Bundle @@ -10,12 +10,11 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.lifecycle.Observer import androidx.recyclerview.widget.LinearLayoutManager -import com.afume.afume_android.databinding.FragmentFilterBrandBinding -import com.afume.afume_android.ui.filter.FilterViewModel -import com.afume.afume_android.ui.filter.FilterViewModelFactory -import com.afume.afume_android.util.TabSelectedListener -import com.afume.afume_android.util.changeTabsFont +import com.scents.note.databinding.FragmentFilterBrandBinding +import com.scents.note.ui.filter.FilterViewModel +import com.scents.note.ui.filter.FilterViewModelFactory import com.google.android.material.tabs.TabLayout +import com.scents.note.util.changeTabsFont class FilterBrandFragment : Fragment() { private val viewModel: FilterViewModel by activityViewModels() { diff --git a/app/src/main/java/com/afume/afume_android/ui/filter/incense/FilterIncenseSeriesFragment.kt b/app/src/main/java/com/scents/note/ui/filter/incense/FilterIncenseSeriesFragment.kt similarity index 88% rename from app/src/main/java/com/afume/afume_android/ui/filter/incense/FilterIncenseSeriesFragment.kt rename to app/src/main/java/com/scents/note/ui/filter/incense/FilterIncenseSeriesFragment.kt index f76725cb..daf22277 100644 --- a/app/src/main/java/com/afume/afume_android/ui/filter/incense/FilterIncenseSeriesFragment.kt +++ b/app/src/main/java/com/scents/note/ui/filter/incense/FilterIncenseSeriesFragment.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.filter.incense +package com.scents.note.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.afume.afume_android.databinding.FragmentFilterIncenseSeriesBinding -import com.afume.afume_android.ui.filter.FilterViewModel -import com.afume.afume_android.ui.filter.FilterViewModelFactory +import com.scents.note.databinding.FragmentFilterIncenseSeriesBinding +import com.scents.note.ui.filter.FilterViewModel +import com.scents.note.ui.filter.FilterViewModelFactory class FilterIncenseSeriesFragment : Fragment() { private lateinit var binding: FragmentFilterIncenseSeriesBinding diff --git a/app/src/main/java/com/afume/afume_android/ui/filter/incense/IngredientFlexboxAdapter.kt b/app/src/main/java/com/scents/note/ui/filter/incense/IngredientFlexboxAdapter.kt similarity index 96% rename from app/src/main/java/com/afume/afume_android/ui/filter/incense/IngredientFlexboxAdapter.kt rename to app/src/main/java/com/scents/note/ui/filter/incense/IngredientFlexboxAdapter.kt index fdb2b01b..7e5fc284 100644 --- a/app/src/main/java/com/afume/afume_android/ui/filter/incense/IngredientFlexboxAdapter.kt +++ b/app/src/main/java/com/scents/note/ui/filter/incense/IngredientFlexboxAdapter.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.filter.incense +package com.scents.note.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.afume.afume_android.data.vo.response.SeriesIngredients -import com.afume.afume_android.databinding.RvItemSeriesIngredientsFilterBinding +import com.scents.note.data.vo.response.SeriesIngredients +import com.scents.note.databinding.RvItemSeriesIngredientsFilterBinding class IngredientFlexboxAdapter( val ingredientsList: MutableList, diff --git a/app/src/main/java/com/afume/afume_android/ui/filter/incense/SeriesIngredientsViewAdapter.kt b/app/src/main/java/com/scents/note/ui/filter/incense/SeriesIngredientsViewAdapter.kt similarity index 92% rename from app/src/main/java/com/afume/afume_android/ui/filter/incense/SeriesIngredientsViewAdapter.kt rename to app/src/main/java/com/scents/note/ui/filter/incense/SeriesIngredientsViewAdapter.kt index 7c98302d..23a0dc2f 100644 --- a/app/src/main/java/com/afume/afume_android/ui/filter/incense/SeriesIngredientsViewAdapter.kt +++ b/app/src/main/java/com/scents/note/ui/filter/incense/SeriesIngredientsViewAdapter.kt @@ -1,13 +1,13 @@ -package com.afume.afume_android.ui.filter.incense +package com.scents.note.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.afume.afume_android.data.vo.response.SeriesInfo -import com.afume.afume_android.data.vo.response.SeriesIngredients -import com.afume.afume_android.databinding.RvItemFilterSeriesBinding +import com.scents.note.data.vo.response.SeriesInfo +import com.scents.note.data.vo.response.SeriesIngredients +import com.scents.note.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/afume/afume_android/ui/filter/keyword/FilterKeywordFragment.kt b/app/src/main/java/com/scents/note/ui/filter/keyword/FilterKeywordFragment.kt similarity index 88% rename from app/src/main/java/com/afume/afume_android/ui/filter/keyword/FilterKeywordFragment.kt rename to app/src/main/java/com/scents/note/ui/filter/keyword/FilterKeywordFragment.kt index f3b18b2b..5aedd78f 100644 --- a/app/src/main/java/com/afume/afume_android/ui/filter/keyword/FilterKeywordFragment.kt +++ b/app/src/main/java/com/scents/note/ui/filter/keyword/FilterKeywordFragment.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.filter.keyword +package com.scents.note.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.afume.afume_android.databinding.FragmentFilterKeywordBinding -import com.afume.afume_android.ui.filter.FilterViewModel -import com.afume.afume_android.ui.filter.FilterViewModelFactory -import com.afume.afume_android.util.FlexboxRecyclerViewAdapter +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.google.android.flexbox.AlignItems import com.google.android.flexbox.FlexDirection import com.google.android.flexbox.FlexWrap diff --git a/app/src/main/java/com/afume/afume_android/ui/home/HomeBinding.kt b/app/src/main/java/com/scents/note/ui/home/HomeBinding.kt similarity index 89% rename from app/src/main/java/com/afume/afume_android/ui/home/HomeBinding.kt rename to app/src/main/java/com/scents/note/ui/home/HomeBinding.kt index 00d04d7f..28383920 100644 --- a/app/src/main/java/com/afume/afume_android/ui/home/HomeBinding.kt +++ b/app/src/main/java/com/scents/note/ui/home/HomeBinding.kt @@ -1,11 +1,11 @@ -package com.afume.afume_android.ui.home +package com.scents.note.ui.home import androidx.databinding.BindingAdapter import androidx.recyclerview.widget.RecyclerView import androidx.viewpager2.widget.ViewPager2 -import com.afume.afume_android.data.vo.response.HomePerfumeItem -import com.afume.afume_android.data.vo.response.RecommendPerfumeItem -import com.afume.afume_android.ui.home.adapter.* +import com.scents.note.data.vo.response.HomePerfumeItem +import com.scents.note.data.vo.response.RecommendPerfumeItem +import com.scents.note.ui.home.adapter.* object HomeBinding { @JvmStatic diff --git a/app/src/main/java/com/afume/afume_android/ui/home/HomeFragment.kt b/app/src/main/java/com/scents/note/ui/home/HomeFragment.kt similarity index 80% rename from app/src/main/java/com/afume/afume_android/ui/home/HomeFragment.kt rename to app/src/main/java/com/scents/note/ui/home/HomeFragment.kt index 4de46e13..01e21833 100644 --- a/app/src/main/java/com/afume/afume_android/ui/home/HomeFragment.kt +++ b/app/src/main/java/com/scents/note/ui/home/HomeFragment.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.home +package com.scents.note.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.afume.afume_android.AfumeApplication -import com.afume.afume_android.R -import com.afume.afume_android.databinding.FragmentHomeBinding -import com.afume.afume_android.ui.home.adapter.NewListAdapter -import com.afume.afume_android.ui.home.adapter.PopularListAdapter -import com.afume.afume_android.ui.home.adapter.RecentListAdapter -import com.afume.afume_android.ui.home.adapter.RecommendListAdapter +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 java.util.* @@ -66,16 +66,16 @@ class HomeFragment : Fragment() { @SuppressLint("SetTextI18n") private fun initInfo(){ - if(AfumeApplication.prefManager.haveToken()){ - binding.txtHomeNameTitle.text = AfumeApplication.prefManager.userNickname+ getString(R.string.txt_home_title) + if(ScentsNoteApplication.prefManager.haveToken()){ + binding.txtHomeNameTitle.text = ScentsNoteApplication.prefManager.userNickname+ getString(R.string.txt_home_title) binding.txtHomeAgeTitle.text = getAgeGroupInfo().toString() + "대 " + getGenderInfo()+getString(R.string.txt_home_age) - binding.txtHomeNameSubtitle.text = AfumeApplication.prefManager.userNickname+getString(R.string.txt_home_subtitle) + binding.txtHomeNameSubtitle.text = ScentsNoteApplication.prefManager.userNickname+getString(R.string.txt_home_subtitle) } } // 나이 구하기 private fun getAgeGroupInfo() : Int{ - val age = getYear() - AfumeApplication.prefManager.userAge + 1 + val age = getYear() - ScentsNoteApplication.prefManager.userAge + 1 return (age/10)*10 } @@ -88,7 +88,7 @@ class HomeFragment : Fragment() { private fun getGenderInfo(): String{ - return if(AfumeApplication.prefManager.userGender == "MAN"){ + return if(ScentsNoteApplication.prefManager.userGender == "MAN"){ "남성" }else{ "여성" diff --git a/app/src/main/java/com/afume/afume_android/ui/home/HomeViewModel.kt b/app/src/main/java/com/scents/note/ui/home/HomeViewModel.kt similarity index 88% rename from app/src/main/java/com/afume/afume_android/ui/home/HomeViewModel.kt rename to app/src/main/java/com/scents/note/ui/home/HomeViewModel.kt index e22bce52..602a2265 100644 --- a/app/src/main/java/com/afume/afume_android/ui/home/HomeViewModel.kt +++ b/app/src/main/java/com/scents/note/ui/home/HomeViewModel.kt @@ -1,15 +1,15 @@ -package com.afume.afume_android.ui.home +package com.scents.note.ui.home import android.util.Log import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.afume.afume_android.AfumeApplication -import com.afume.afume_android.data.repository.HomeRepository -import com.afume.afume_android.data.vo.response.HomePerfumeItem -import com.afume.afume_android.data.vo.response.PerfumeInfo -import com.afume.afume_android.data.vo.response.RecommendPerfumeItem +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 io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable import io.reactivex.schedulers.Schedulers @@ -55,7 +55,7 @@ class HomeViewModel : ViewModel(){ private suspend fun getRecommendPerfumeList(){ try{ - _recommendPerfumeList.value = homeRepository.getRecommendPerfumeList(AfumeApplication.prefManager.accessToken) + _recommendPerfumeList.value = homeRepository.getRecommendPerfumeList(ScentsNoteApplication.prefManager.accessToken) Log.d("getRecommendPerfumeList", _recommendPerfumeList.value.toString()) }catch (e : HttpException){ Log.d("getRecommendPerfumeList error", e.message()) @@ -64,7 +64,7 @@ class HomeViewModel : ViewModel(){ private suspend fun getCommonPerfumeList(){ try{ - _commonPerfumeList.value = homeRepository.getCommonPerfumeList(AfumeApplication.prefManager.accessToken) + _commonPerfumeList.value = homeRepository.getCommonPerfumeList(ScentsNoteApplication.prefManager.accessToken) Log.d("getCommonPerfumeList", _commonPerfumeList.value.toString()) }catch (e : HttpException){ Log.d("getCommonPerfumeList error", e.message()) @@ -74,7 +74,7 @@ class HomeViewModel : ViewModel(){ private suspend fun getRecentPerfumeList(){ try{ _isValidRecentList.postValue(true) - _recentPerfumeList.value = homeRepository.getRecentPerfumeList(AfumeApplication.prefManager.accessToken) + _recentPerfumeList.value = homeRepository.getRecentPerfumeList(ScentsNoteApplication.prefManager.accessToken) Log.d("getRecentPerfumeList", _recentPerfumeList.value.toString()) if(_recentPerfumeList.value!!.isEmpty()){ @@ -100,7 +100,7 @@ class HomeViewModel : ViewModel(){ fun postPerfumeLike(type: Int, perfumeIdx: Int) { compositeDisposable.add( - homeRepository.postPerfumeLike(AfumeApplication.prefManager.accessToken, perfumeIdx) + homeRepository.postPerfumeLike(ScentsNoteApplication.prefManager.accessToken, perfumeIdx) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe({ diff --git a/app/src/main/java/com/afume/afume_android/ui/home/MoreNewPerfumeActivity.kt b/app/src/main/java/com/scents/note/ui/home/MoreNewPerfumeActivity.kt similarity index 81% rename from app/src/main/java/com/afume/afume_android/ui/home/MoreNewPerfumeActivity.kt rename to app/src/main/java/com/scents/note/ui/home/MoreNewPerfumeActivity.kt index 9e13a48d..bf6c9ea9 100644 --- a/app/src/main/java/com/afume/afume_android/ui/home/MoreNewPerfumeActivity.kt +++ b/app/src/main/java/com/scents/note/ui/home/MoreNewPerfumeActivity.kt @@ -1,13 +1,13 @@ -package com.afume.afume_android.ui.home +package com.scents.note.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.afume.afume_android.R -import com.afume.afume_android.databinding.ActivityMoreNewPerfumeBinding -import com.afume.afume_android.ui.home.adapter.MoreNewListAdapter +import com.scents.note.R +import com.scents.note.databinding.ActivityMoreNewPerfumeBinding +import com.scents.note.ui.home.adapter.MoreNewListAdapter class MoreNewPerfumeActivity : AppCompatActivity() { lateinit var binding: ActivityMoreNewPerfumeBinding diff --git a/app/src/main/java/com/afume/afume_android/ui/home/adapter/HashTagAdapter.kt b/app/src/main/java/com/scents/note/ui/home/adapter/HashTagAdapter.kt similarity index 87% rename from app/src/main/java/com/afume/afume_android/ui/home/adapter/HashTagAdapter.kt rename to app/src/main/java/com/scents/note/ui/home/adapter/HashTagAdapter.kt index 01b9d1e9..f736eeab 100644 --- a/app/src/main/java/com/afume/afume_android/ui/home/adapter/HashTagAdapter.kt +++ b/app/src/main/java/com/scents/note/ui/home/adapter/HashTagAdapter.kt @@ -1,11 +1,11 @@ -package com.afume.afume_android.ui.home.adapter +package com.scents.note.ui.home.adapter import android.view.LayoutInflater import android.view.ViewGroup import androidx.databinding.DataBindingUtil import androidx.recyclerview.widget.RecyclerView -import com.afume.afume_android.R -import com.afume.afume_android.databinding.RvItemHomeHashTagBinding +import com.scents.note.R +import com.scents.note.databinding.RvItemHomeHashTagBinding class HashTagAdapter : RecyclerView.Adapter() { var data = listOf() diff --git a/app/src/main/java/com/afume/afume_android/ui/home/adapter/MoreNewListAdapter.kt b/app/src/main/java/com/scents/note/ui/home/adapter/MoreNewListAdapter.kt similarity index 80% rename from app/src/main/java/com/afume/afume_android/ui/home/adapter/MoreNewListAdapter.kt rename to app/src/main/java/com/scents/note/ui/home/adapter/MoreNewListAdapter.kt index 1d4ec3e3..c6081840 100644 --- a/app/src/main/java/com/afume/afume_android/ui/home/adapter/MoreNewListAdapter.kt +++ b/app/src/main/java/com/scents/note/ui/home/adapter/MoreNewListAdapter.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.home.adapter +package com.scents.note.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.afume.afume_android.AfumeApplication -import com.afume.afume_android.R -import com.afume.afume_android.data.vo.response.HomePerfumeItem -import com.afume.afume_android.databinding.RvItemHomeMoreNewBinding -import com.afume.afume_android.ui.detail.PerfumeDetailActivity -import com.afume.afume_android.util.createDialog +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 class MoreNewListAdapter(private val context: Context, private val fragmentManager: FragmentManager, val clickBtnLike:(Int)->Unit) : RecyclerView.Adapter() { var data = mutableListOf() @@ -52,7 +52,7 @@ class MoreNewListAdapter(private val context: Context, private val fragmentManag } binding.btnLike.setOnClickListener { - if (!AfumeApplication.prefManager.haveToken()) context.createDialog(fragmentManager, "login") + if (!ScentsNoteApplication.prefManager.haveToken()) context.createDialog(fragmentManager, "login") else { clickBtnLike(item.perfumeIdx) } diff --git a/app/src/main/java/com/afume/afume_android/ui/home/adapter/NewListAdapter.kt b/app/src/main/java/com/scents/note/ui/home/adapter/NewListAdapter.kt similarity index 80% rename from app/src/main/java/com/afume/afume_android/ui/home/adapter/NewListAdapter.kt rename to app/src/main/java/com/scents/note/ui/home/adapter/NewListAdapter.kt index aae5b4c7..588c263b 100644 --- a/app/src/main/java/com/afume/afume_android/ui/home/adapter/NewListAdapter.kt +++ b/app/src/main/java/com/scents/note/ui/home/adapter/NewListAdapter.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.home.adapter +package com.scents.note.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.afume.afume_android.AfumeApplication -import com.afume.afume_android.R -import com.afume.afume_android.data.vo.response.HomePerfumeItem -import com.afume.afume_android.databinding.RvItemHomeNewBinding -import com.afume.afume_android.ui.detail.PerfumeDetailActivity -import com.afume.afume_android.util.createDialog +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 class NewListAdapter(private val context: Context, private val fragmentManager: FragmentManager, val clickBtnLike:(Int)->Unit) : RecyclerView.Adapter() { var data = mutableListOf() @@ -51,7 +51,7 @@ class NewListAdapter(private val context: Context, private val fragmentManager: } binding.btnLike.setOnClickListener { - if (!AfumeApplication.prefManager.haveToken()) context.createDialog(fragmentManager, "login") + if (!ScentsNoteApplication.prefManager.haveToken()) context.createDialog(fragmentManager, "login") else { clickBtnLike(item.perfumeIdx) } diff --git a/app/src/main/java/com/afume/afume_android/ui/home/adapter/PopularListAdapter.kt b/app/src/main/java/com/scents/note/ui/home/adapter/PopularListAdapter.kt similarity index 81% rename from app/src/main/java/com/afume/afume_android/ui/home/adapter/PopularListAdapter.kt rename to app/src/main/java/com/scents/note/ui/home/adapter/PopularListAdapter.kt index 17ac83cb..5d296323 100644 --- a/app/src/main/java/com/afume/afume_android/ui/home/adapter/PopularListAdapter.kt +++ b/app/src/main/java/com/scents/note/ui/home/adapter/PopularListAdapter.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.home.adapter +package com.scents.note.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.afume.afume_android.AfumeApplication -import com.afume.afume_android.R -import com.afume.afume_android.data.vo.response.HomePerfumeItem -import com.afume.afume_android.databinding.RvItemHomePopularBinding -import com.afume.afume_android.ui.detail.PerfumeDetailActivity -import com.afume.afume_android.util.createDialog +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 class PopularListAdapter(private val context: Context, private val fragmentManager: FragmentManager, val clickBtnLike:(Int)->Unit) : RecyclerView.Adapter() { var data = mutableListOf() @@ -54,7 +54,7 @@ class PopularListAdapter(private val context: Context, private val fragmentManag } binding.btnLike.setOnClickListener { - if (!AfumeApplication.prefManager.haveToken()) context.createDialog(fragmentManager, "login") + if (!ScentsNoteApplication.prefManager.haveToken()) context.createDialog(fragmentManager, "login") else { clickBtnLike(item.perfumeIdx) } diff --git a/app/src/main/java/com/afume/afume_android/ui/home/adapter/RecentListAdapter.kt b/app/src/main/java/com/scents/note/ui/home/adapter/RecentListAdapter.kt similarity index 80% rename from app/src/main/java/com/afume/afume_android/ui/home/adapter/RecentListAdapter.kt rename to app/src/main/java/com/scents/note/ui/home/adapter/RecentListAdapter.kt index 309d9361..0e9bdded 100644 --- a/app/src/main/java/com/afume/afume_android/ui/home/adapter/RecentListAdapter.kt +++ b/app/src/main/java/com/scents/note/ui/home/adapter/RecentListAdapter.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.home.adapter +package com.scents.note.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.afume.afume_android.AfumeApplication -import com.afume.afume_android.R -import com.afume.afume_android.data.vo.response.HomePerfumeItem -import com.afume.afume_android.databinding.RvItemHomeRecentBinding -import com.afume.afume_android.ui.detail.PerfumeDetailActivity -import com.afume.afume_android.util.createDialog +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 class RecentListAdapter(private val context: Context, private val fragmentManager: FragmentManager, val clickBtnLike:(Int)->Unit) : RecyclerView.Adapter() { var data = mutableListOf() @@ -54,7 +54,7 @@ class RecentListAdapter(private val context: Context, private val fragmentManage } binding.btnLike.setOnClickListener { - if (!AfumeApplication.prefManager.haveToken()) context.createDialog(fragmentManager, "login") + if (!ScentsNoteApplication.prefManager.haveToken()) context.createDialog(fragmentManager, "login") else { clickBtnLike(item.perfumeIdx) } diff --git a/app/src/main/java/com/afume/afume_android/ui/home/adapter/RecommendListAdapter.kt b/app/src/main/java/com/scents/note/ui/home/adapter/RecommendListAdapter.kt similarity index 88% rename from app/src/main/java/com/afume/afume_android/ui/home/adapter/RecommendListAdapter.kt rename to app/src/main/java/com/scents/note/ui/home/adapter/RecommendListAdapter.kt index ec564a87..d4e40327 100644 --- a/app/src/main/java/com/afume/afume_android/ui/home/adapter/RecommendListAdapter.kt +++ b/app/src/main/java/com/scents/note/ui/home/adapter/RecommendListAdapter.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.home.adapter +package com.scents.note.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.afume.afume_android.R -import com.afume.afume_android.data.vo.response.RecommendPerfumeItem -import com.afume.afume_android.databinding.RvItemHomeRecommendBinding -import com.afume.afume_android.ui.detail.PerfumeDetailActivity +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 class RecommendListAdapter(private val context: Context) : RecyclerView.Adapter() { diff --git a/app/src/main/java/com/afume/afume_android/ui/my/MyBinding.kt b/app/src/main/java/com/scents/note/ui/my/MyBinding.kt similarity index 74% rename from app/src/main/java/com/afume/afume_android/ui/my/MyBinding.kt rename to app/src/main/java/com/scents/note/ui/my/MyBinding.kt index c3c269ea..06e53a9e 100644 --- a/app/src/main/java/com/afume/afume_android/ui/my/MyBinding.kt +++ b/app/src/main/java/com/scents/note/ui/my/MyBinding.kt @@ -1,12 +1,12 @@ -package com.afume.afume_android.ui.my +package com.scents.note.ui.my import android.util.Log import androidx.databinding.BindingAdapter import androidx.recyclerview.widget.RecyclerView -import com.afume.afume_android.data.vo.response.PerfumeInfo -import com.afume.afume_android.data.vo.response.ResponseMyPerfume -import com.afume.afume_android.ui.my.myperfume.MyPerfumeRecyclerViewAdapter -import com.afume.afume_android.ui.my.wishlist.WishListAdapter +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 object MyBinding { @JvmStatic diff --git a/app/src/main/java/com/afume/afume_android/ui/my/MyFragment.kt b/app/src/main/java/com/scents/note/ui/my/MyFragment.kt similarity index 82% rename from app/src/main/java/com/afume/afume_android/ui/my/MyFragment.kt rename to app/src/main/java/com/scents/note/ui/my/MyFragment.kt index adef8e2c..87e2e372 100644 --- a/app/src/main/java/com/afume/afume_android/ui/my/MyFragment.kt +++ b/app/src/main/java/com/scents/note/ui/my/MyFragment.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.my +package com.scents.note.ui.my import android.content.Context import android.content.Intent @@ -11,24 +11,24 @@ import android.widget.TextView import androidx.activity.OnBackPressedCallback import androidx.core.view.GravityCompat import androidx.fragment.app.Fragment -import com.afume.afume_android.AfumeApplication -import com.afume.afume_android.R -import com.afume.afume_android.databinding.FragmentMypageBinding -import com.afume.afume_android.ui.MainActivity -import com.afume.afume_android.ui.filter.AfumeViewPagerAdapter -import com.afume.afume_android.ui.my.myperfume.MyPerfumeFragment -import com.afume.afume_android.ui.my.wishlist.WishListFragment -import com.afume.afume_android.ui.setting.EditMyInfoActivity -import com.afume.afume_android.ui.setting.EditPasswordActivity -import com.afume.afume_android.ui.signin.SignHomeActivity -import com.afume.afume_android.util.TabSelectedListener -import com.afume.afume_android.util.changeTabsFont -import com.afume.afume_android.util.refreshFragment -import com.afume.afume_android.util.toastLong +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 class MyFragment : Fragment() { private lateinit var binding: FragmentMypageBinding - private lateinit var myPagePagerAdapter: AfumeViewPagerAdapter + private lateinit var myPagePagerAdapter: ScentsNoteViewPagerAdapter private lateinit var callback: OnBackPressedCallback var isDrawerOpen = true @@ -88,7 +88,7 @@ class MyFragment : Fragment() { } private fun initVp() { - myPagePagerAdapter = AfumeViewPagerAdapter(childFragmentManager) + myPagePagerAdapter = ScentsNoteViewPagerAdapter(childFragmentManager) myPagePagerAdapter.fragments = listOf( MyPerfumeFragment(), WishListFragment() @@ -117,7 +117,7 @@ class MyFragment : Fragment() { } private fun inflateMenu() { - if (AfumeApplication.prefManager.haveToken()) binding.myNavigationDrawer.inflateMenu(R.menu.navigation_drawer) + if (ScentsNoteApplication.prefManager.haveToken()) binding.myNavigationDrawer.inflateMenu(R.menu.navigation_drawer) else { val textView = TextView(context) textView.text = " " @@ -150,7 +150,7 @@ class MyFragment : Fragment() { R.id.edit_my_info -> intent(EditMyInfoActivity::class.java) R.id.edit_password -> intent(EditPasswordActivity::class.java) R.id.logout -> { - AfumeApplication.prefManager.clear() + ScentsNoteApplication.prefManager.clear() requireContext().toastLong("로그아웃되었습니다.") inflateMenu() refreshFragment(myPagePagerAdapter.fragments[0],childFragmentManager) diff --git a/app/src/main/java/com/afume/afume_android/ui/my/MyInquiryActivity.kt b/app/src/main/java/com/scents/note/ui/my/MyInquiryActivity.kt similarity index 90% rename from app/src/main/java/com/afume/afume_android/ui/my/MyInquiryActivity.kt rename to app/src/main/java/com/scents/note/ui/my/MyInquiryActivity.kt index 32031dc0..95e5cea5 100644 --- a/app/src/main/java/com/afume/afume_android/ui/my/MyInquiryActivity.kt +++ b/app/src/main/java/com/scents/note/ui/my/MyInquiryActivity.kt @@ -1,12 +1,12 @@ -package com.afume.afume_android.ui.my +package com.scents.note.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.afume.afume_android.R -import com.afume.afume_android.databinding.ActivityMyInquiryBinding +import com.scents.note.R +import com.scents.note.databinding.ActivityMyInquiryBinding class MyInquiryActivity : AppCompatActivity() { lateinit var binding: ActivityMyInquiryBinding diff --git a/app/src/main/java/com/afume/afume_android/ui/my/MyViewModel.kt b/app/src/main/java/com/scents/note/ui/my/MyViewModel.kt similarity index 76% rename from app/src/main/java/com/afume/afume_android/ui/my/MyViewModel.kt rename to app/src/main/java/com/scents/note/ui/my/MyViewModel.kt index e862e788..f15a8e6d 100644 --- a/app/src/main/java/com/afume/afume_android/ui/my/MyViewModel.kt +++ b/app/src/main/java/com/scents/note/ui/my/MyViewModel.kt @@ -1,14 +1,14 @@ -package com.afume.afume_android.ui.my +package com.scents.note.ui.my import android.util.Log import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.afume.afume_android.AfumeApplication -import com.afume.afume_android.data.repository.MyRepository -import com.afume.afume_android.data.vo.response.PerfumeInfo -import com.afume.afume_android.data.vo.response.ResponseMyPerfume +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 kotlinx.coroutines.launch import retrofit2.HttpException @@ -31,7 +31,7 @@ class MyViewModel : ViewModel() { suspend fun getLikedPerfume() { try { _wishList.value = myRepository.getLikedPerfume( - AfumeApplication.prefManager.accessToken, AfumeApplication.prefManager.userIdx + ScentsNoteApplication.prefManager.accessToken, ScentsNoteApplication.prefManager.userIdx ) Log.d("getLikedPerfume", _wishList.value.toString()) } catch (e: HttpException) { @@ -42,7 +42,7 @@ class MyViewModel : ViewModel() { suspend fun getMyPerfume() { try { _myPerfumeList.value = myRepository.getMyPerfume( - AfumeApplication.prefManager.accessToken + ScentsNoteApplication.prefManager.accessToken ) Log.d("getMyPerfume", _myPerfumeList.value.toString()) } catch (e: HttpException) { diff --git a/app/src/main/java/com/afume/afume_android/ui/my/myperfume/MyPerfumeFragment.kt b/app/src/main/java/com/scents/note/ui/my/myperfume/MyPerfumeFragment.kt similarity index 86% rename from app/src/main/java/com/afume/afume_android/ui/my/myperfume/MyPerfumeFragment.kt rename to app/src/main/java/com/scents/note/ui/my/myperfume/MyPerfumeFragment.kt index 604fc81a..ea933592 100644 --- a/app/src/main/java/com/afume/afume_android/ui/my/myperfume/MyPerfumeFragment.kt +++ b/app/src/main/java/com/scents/note/ui/my/myperfume/MyPerfumeFragment.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.my.myperfume +package com.scents.note.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.afume.afume_android.AfumeApplication -import com.afume.afume_android.databinding.FragmentMyPerfumeBinding -import com.afume.afume_android.databinding.LayoutPleaseLoginBinding -import com.afume.afume_android.ui.my.MyViewModel -import com.afume.afume_android.ui.signin.SignHomeActivity +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 class MyPerfumeFragment : Fragment() { @@ -38,13 +38,13 @@ class MyPerfumeFragment : Fragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - if (AfumeApplication.prefManager.accessToken == "") setPleaseLoginView(loginBinding) + if (ScentsNoteApplication.prefManager.accessToken == "") setPleaseLoginView(loginBinding) else setMyPerfumeView(perfumeBinding) } private fun inflateView(container: ViewGroup?): View { - return if (AfumeApplication.prefManager.accessToken == "") { + return if (ScentsNoteApplication.prefManager.accessToken == "") { loginBinding = LayoutPleaseLoginBinding.inflate(layoutInflater, container, false) loginBinding.lifecycleOwner = this loginBinding.root diff --git a/app/src/main/java/com/afume/afume_android/ui/my/myperfume/MyPerfumeRecyclerViewAdapter.kt b/app/src/main/java/com/scents/note/ui/my/myperfume/MyPerfumeRecyclerViewAdapter.kt similarity index 85% rename from app/src/main/java/com/afume/afume_android/ui/my/myperfume/MyPerfumeRecyclerViewAdapter.kt rename to app/src/main/java/com/scents/note/ui/my/myperfume/MyPerfumeRecyclerViewAdapter.kt index d11b12e2..bbd6ae26 100644 --- a/app/src/main/java/com/afume/afume_android/ui/my/myperfume/MyPerfumeRecyclerViewAdapter.kt +++ b/app/src/main/java/com/scents/note/ui/my/myperfume/MyPerfumeRecyclerViewAdapter.kt @@ -1,14 +1,14 @@ -package com.afume.afume_android.ui.my.myperfume +package com.scents.note.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.afume.afume_android.data.vo.ParcelableWishList -import com.afume.afume_android.data.vo.response.ResponseMyPerfume -import com.afume.afume_android.databinding.RvItemMyMyperfumeBinding -import com.afume.afume_android.ui.note.NoteActivity +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 class MyPerfumeRecyclerViewAdapter() : RecyclerView.Adapter() { var data = listOf() diff --git a/app/src/main/java/com/afume/afume_android/ui/my/myperfume/ShelfRecyclerViewAdapter.kt b/app/src/main/java/com/scents/note/ui/my/myperfume/ShelfRecyclerViewAdapter.kt similarity index 86% rename from app/src/main/java/com/afume/afume_android/ui/my/myperfume/ShelfRecyclerViewAdapter.kt rename to app/src/main/java/com/scents/note/ui/my/myperfume/ShelfRecyclerViewAdapter.kt index 8e1fdeea..13303130 100644 --- a/app/src/main/java/com/afume/afume_android/ui/my/myperfume/ShelfRecyclerViewAdapter.kt +++ b/app/src/main/java/com/scents/note/ui/my/myperfume/ShelfRecyclerViewAdapter.kt @@ -1,10 +1,10 @@ -package com.afume.afume_android.ui.my.myperfume +package com.scents.note.ui.my.myperfume import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.afume.afume_android.R -import com.afume.afume_android.databinding.RvItemMyPerfuemBgShelfBinding +import com.scents.note.R +import com.scents.note.databinding.RvItemMyPerfuemBgShelfBinding class ShelfRecyclerViewAdapter(val count: Int?) : RecyclerView.Adapter() { diff --git a/app/src/main/java/com/afume/afume_android/ui/my/wishlist/WishListAdapter.kt b/app/src/main/java/com/scents/note/ui/my/wishlist/WishListAdapter.kt similarity index 84% rename from app/src/main/java/com/afume/afume_android/ui/my/wishlist/WishListAdapter.kt rename to app/src/main/java/com/scents/note/ui/my/wishlist/WishListAdapter.kt index f95a6823..c84be9aa 100644 --- a/app/src/main/java/com/afume/afume_android/ui/my/wishlist/WishListAdapter.kt +++ b/app/src/main/java/com/scents/note/ui/my/wishlist/WishListAdapter.kt @@ -1,14 +1,14 @@ -package com.afume.afume_android.ui.my.wishlist +package com.scents.note.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.afume.afume_android.data.vo.ParcelableWishList -import com.afume.afume_android.data.vo.response.PerfumeInfo -import com.afume.afume_android.databinding.RvItemMyWishlistBinding -import com.afume.afume_android.ui.note.NoteActivity +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 class WishListAdapter (): RecyclerView.Adapter(){ diff --git a/app/src/main/java/com/afume/afume_android/ui/my/wishlist/WishListFragment.kt b/app/src/main/java/com/scents/note/ui/my/wishlist/WishListFragment.kt similarity index 84% rename from app/src/main/java/com/afume/afume_android/ui/my/wishlist/WishListFragment.kt rename to app/src/main/java/com/scents/note/ui/my/wishlist/WishListFragment.kt index cc349c55..428a9891 100644 --- a/app/src/main/java/com/afume/afume_android/ui/my/wishlist/WishListFragment.kt +++ b/app/src/main/java/com/scents/note/ui/my/wishlist/WishListFragment.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.my.wishlist +package com.scents.note.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.afume.afume_android.AfumeApplication -import com.afume.afume_android.databinding.FragmentWishListBinding -import com.afume.afume_android.databinding.LayoutPleaseLoginBinding -import com.afume.afume_android.ui.my.MyViewModel -import com.afume.afume_android.ui.signin.SignHomeActivity +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 class WishListFragment : Fragment() { @@ -31,12 +31,12 @@ class WishListFragment : Fragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - if (AfumeApplication.prefManager.haveToken()) setMyWishListView(wishListBinding) + if (ScentsNoteApplication.prefManager.haveToken()) setMyWishListView(wishListBinding) else setPleaseLoginView(loginBinding) } private fun inflateView(container: ViewGroup?): View { - return if (AfumeApplication.prefManager.accessToken == "") { + return if (ScentsNoteApplication.prefManager.accessToken == "") { loginBinding = LayoutPleaseLoginBinding.inflate(layoutInflater, container, false) loginBinding.lifecycleOwner = this loginBinding.root diff --git a/app/src/main/java/com/afume/afume_android/ui/note/KeywordBottomSheetFragment.kt b/app/src/main/java/com/scents/note/ui/note/KeywordBottomSheetFragment.kt similarity index 91% rename from app/src/main/java/com/afume/afume_android/ui/note/KeywordBottomSheetFragment.kt rename to app/src/main/java/com/scents/note/ui/note/KeywordBottomSheetFragment.kt index 14b7eefe..1195cbf5 100644 --- a/app/src/main/java/com/afume/afume_android/ui/note/KeywordBottomSheetFragment.kt +++ b/app/src/main/java/com/scents/note/ui/note/KeywordBottomSheetFragment.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.note +package com.scents.note.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.afume.afume_android.databinding.FragmentKeywordBottomSheetBinding -import com.afume.afume_android.util.NoteKeywordAdapter +import com.scents.note.databinding.FragmentKeywordBottomSheetBinding +import com.scents.note.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/afume/afume_android/ui/note/NoteActivity.kt b/app/src/main/java/com/scents/note/ui/note/NoteActivity.kt similarity index 96% rename from app/src/main/java/com/afume/afume_android/ui/note/NoteActivity.kt rename to app/src/main/java/com/scents/note/ui/note/NoteActivity.kt index 710994c5..945d7d37 100644 --- a/app/src/main/java/com/afume/afume_android/ui/note/NoteActivity.kt +++ b/app/src/main/java/com/scents/note/ui/note/NoteActivity.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.note +package com.scents.note.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.afume.afume_android.R -import com.afume.afume_android.data.vo.ParcelableWishList -import com.afume.afume_android.databinding.ActivityNoteBinding -import com.afume.afume_android.ui.detail.PerfumeDetailActivity -import com.afume.afume_android.util.* +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.google.android.flexbox.AlignItems import com.google.android.flexbox.FlexDirection import com.google.android.flexbox.FlexWrap diff --git a/app/src/main/java/com/afume/afume_android/ui/note/NoteBinding.kt b/app/src/main/java/com/scents/note/ui/note/NoteBinding.kt similarity index 73% rename from app/src/main/java/com/afume/afume_android/ui/note/NoteBinding.kt rename to app/src/main/java/com/scents/note/ui/note/NoteBinding.kt index abaf74ab..f91edda0 100644 --- a/app/src/main/java/com/afume/afume_android/ui/note/NoteBinding.kt +++ b/app/src/main/java/com/scents/note/ui/note/NoteBinding.kt @@ -1,9 +1,9 @@ -package com.afume.afume_android.ui.note +package com.scents.note.ui.note import androidx.databinding.BindingAdapter import androidx.recyclerview.widget.RecyclerView -import com.afume.afume_android.data.vo.response.KeywordInfo -import com.afume.afume_android.util.NoteKeywordAdapter +import com.scents.note.data.vo.response.KeywordInfo +import com.scents.note.util.NoteKeywordAdapter object NoteBinding { @JvmStatic diff --git a/app/src/main/java/com/afume/afume_android/ui/note/NoteKeywordAdapter.kt b/app/src/main/java/com/scents/note/ui/note/NoteKeywordAdapter.kt similarity index 95% rename from app/src/main/java/com/afume/afume_android/ui/note/NoteKeywordAdapter.kt rename to app/src/main/java/com/scents/note/ui/note/NoteKeywordAdapter.kt index a94c627d..da67c671 100644 --- a/app/src/main/java/com/afume/afume_android/ui/note/NoteKeywordAdapter.kt +++ b/app/src/main/java/com/scents/note/ui/note/NoteKeywordAdapter.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.util +package com.scents.note.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.afume.afume_android.R -import com.afume.afume_android.data.vo.response.KeywordInfo -import com.afume.afume_android.databinding.RvItemFilterFlexboxBinding +import com.scents.note.R +import com.scents.note.data.vo.response.KeywordInfo +import com.scents.note.databinding.RvItemFilterFlexboxBinding class NoteKeywordAdapter(private val type : Int, internal val select:(KeywordInfo, Boolean)->Unit) : ListAdapter( diff --git a/app/src/main/java/com/afume/afume_android/ui/note/NoteViewModel.kt b/app/src/main/java/com/scents/note/ui/note/NoteViewModel.kt similarity index 93% rename from app/src/main/java/com/afume/afume_android/ui/note/NoteViewModel.kt rename to app/src/main/java/com/scents/note/ui/note/NoteViewModel.kt index 6c60ce8b..9b96f8e4 100644 --- a/app/src/main/java/com/afume/afume_android/ui/note/NoteViewModel.kt +++ b/app/src/main/java/com/scents/note/ui/note/NoteViewModel.kt @@ -1,19 +1,19 @@ -package com.afume.afume_android.ui.note +package com.scents.note.ui.note import android.util.Log import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.afume.afume_android.AfumeApplication -import com.afume.afume_android.data.repository.NoteRepository -import com.afume.afume_android.data.repository.SurveyRepository -import com.afume.afume_android.data.vo.request.RequestReview -import com.afume.afume_android.data.vo.response.BrandItem -import com.afume.afume_android.data.vo.response.KeywordInfo -import com.afume.afume_android.data.vo.response.PerfumeItem -import com.afume.afume_android.data.vo.response.ResponseReview -import com.afume.afume_android.util.SingleLiveEvent +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 kotlinx.coroutines.launch import retrofit2.HttpException @@ -188,7 +188,7 @@ class NoteViewModel : ViewModel() { ) noteRepository.postReview( - AfumeApplication.prefManager.accessToken, + ScentsNoteApplication.prefManager.accessToken, perfumeIdx, reviewInfo ).let { @@ -321,7 +321,7 @@ class NoteViewModel : ViewModel() { ) noteRepository.putReview( - AfumeApplication.prefManager.accessToken, + ScentsNoteApplication.prefManager.accessToken, reviewIdx, reviewInfo ).let { @@ -347,7 +347,7 @@ class NoteViewModel : ViewModel() { fun deleteReview(reviewIdx: Int){ viewModelScope.launch { try{ - noteRepository.deleteReview(AfumeApplication.prefManager.accessToken, reviewIdx).let { + noteRepository.deleteReview(ScentsNoteApplication.prefManager.accessToken, reviewIdx).let { _isValidNoteDelete.postValue(true) Log.d("시향 노트 삭제 성공 : ", it) } diff --git a/app/src/main/java/com/afume/afume_android/ui/search/DefaultPerfumeRecyclerViewAdapter.kt b/app/src/main/java/com/scents/note/ui/search/DefaultPerfumeRecyclerViewAdapter.kt similarity index 82% rename from app/src/main/java/com/afume/afume_android/ui/search/DefaultPerfumeRecyclerViewAdapter.kt rename to app/src/main/java/com/scents/note/ui/search/DefaultPerfumeRecyclerViewAdapter.kt index e5a2bb6a..bad825f1 100644 --- a/app/src/main/java/com/afume/afume_android/ui/search/DefaultPerfumeRecyclerViewAdapter.kt +++ b/app/src/main/java/com/scents/note/ui/search/DefaultPerfumeRecyclerViewAdapter.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.search +package com.scents.note.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.afume.afume_android.AfumeApplication -import com.afume.afume_android.data.vo.response.PerfumeInfo -import com.afume.afume_android.databinding.RvItemDefaultPerfumeBinding -import com.afume.afume_android.ui.detail.PerfumeDetailActivity -import com.afume.afume_android.util.createDialog +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 class DefaultPerfumeRecyclerViewAdapter(val context: Context, val fragmentManager: FragmentManager, val clickBtnHeart:(Int)->Unit) : @@ -50,7 +50,7 @@ class DefaultPerfumeRecyclerViewAdapter(val context: Context, val fragmentManage binding.btnHeart.setOnClickListener { // 좋아요 누르면 로그인 하게 유도 - if (!AfumeApplication.prefManager.haveToken()) context.createDialog(fragmentManager, "login") + if (!ScentsNoteApplication.prefManager.haveToken()) context.createDialog(fragmentManager, "login") else { clickBtnHeart(data.perfumeIdx) it.isSelected = !it.isSelected diff --git a/app/src/main/java/com/afume/afume_android/ui/search/SearchBinding.kt b/app/src/main/java/com/scents/note/ui/search/SearchBinding.kt similarity index 88% rename from app/src/main/java/com/afume/afume_android/ui/search/SearchBinding.kt rename to app/src/main/java/com/scents/note/ui/search/SearchBinding.kt index b6a8d5e0..870a0f75 100644 --- a/app/src/main/java/com/afume/afume_android/ui/search/SearchBinding.kt +++ b/app/src/main/java/com/scents/note/ui/search/SearchBinding.kt @@ -1,11 +1,11 @@ -package com.afume.afume_android.ui.search +package com.scents.note.ui.search import android.util.Log import android.widget.ImageView import androidx.databinding.BindingAdapter import androidx.recyclerview.widget.RecyclerView -import com.afume.afume_android.data.vo.request.SendFilter -import com.afume.afume_android.data.vo.response.PerfumeInfo +import com.scents.note.data.vo.request.SendFilter +import com.scents.note.data.vo.response.PerfumeInfo import com.bumptech.glide.Glide object SearchBinding { diff --git a/app/src/main/java/com/afume/afume_android/ui/search/SearchResultFragment.kt b/app/src/main/java/com/scents/note/ui/search/SearchResultFragment.kt similarity index 94% rename from app/src/main/java/com/afume/afume_android/ui/search/SearchResultFragment.kt rename to app/src/main/java/com/scents/note/ui/search/SearchResultFragment.kt index aa1fa3c5..a0c76c0a 100644 --- a/app/src/main/java/com/afume/afume_android/ui/search/SearchResultFragment.kt +++ b/app/src/main/java/com/scents/note/ui/search/SearchResultFragment.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.search +package com.scents.note.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.afume.afume_android.databinding.FragmentSearchBinding -import com.afume.afume_android.ui.MainActivity -import com.afume.afume_android.ui.filter.FilterActivity +import com.scents.note.databinding.FragmentSearchBinding +import com.scents.note.ui.MainActivity +import com.scents.note.ui.filter.FilterActivity class SearchResultFragment : Fragment() { diff --git a/app/src/main/java/com/afume/afume_android/ui/search/SearchTextActivity.kt b/app/src/main/java/com/scents/note/ui/search/SearchTextActivity.kt similarity index 84% rename from app/src/main/java/com/afume/afume_android/ui/search/SearchTextActivity.kt rename to app/src/main/java/com/scents/note/ui/search/SearchTextActivity.kt index 2b7d911c..e378e29f 100644 --- a/app/src/main/java/com/afume/afume_android/ui/search/SearchTextActivity.kt +++ b/app/src/main/java/com/scents/note/ui/search/SearchTextActivity.kt @@ -1,12 +1,12 @@ -package com.afume.afume_android.ui.search +package com.scents.note.ui.search import android.content.Intent import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil -import com.afume.afume_android.R -import com.afume.afume_android.databinding.ActivitySearchTextBinding -import com.afume.afume_android.ui.MainActivity +import com.scents.note.R +import com.scents.note.databinding.ActivitySearchTextBinding +import com.scents.note.ui.MainActivity class SearchTextActivity : AppCompatActivity() { private lateinit var binding : ActivitySearchTextBinding diff --git a/app/src/main/java/com/afume/afume_android/ui/search/SearchViewModel.kt b/app/src/main/java/com/scents/note/ui/search/SearchViewModel.kt similarity index 88% rename from app/src/main/java/com/afume/afume_android/ui/search/SearchViewModel.kt rename to app/src/main/java/com/scents/note/ui/search/SearchViewModel.kt index f9ac9b62..8fab5784 100644 --- a/app/src/main/java/com/afume/afume_android/ui/search/SearchViewModel.kt +++ b/app/src/main/java/com/scents/note/ui/search/SearchViewModel.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.search +package com.scents.note.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.afume.afume_android.AfumeApplication -import com.afume.afume_android.data.repository.SearchRepository -import com.afume.afume_android.data.vo.request.FilterInfoP -import com.afume.afume_android.data.vo.request.RequestSearch -import com.afume.afume_android.data.vo.request.SendFilter -import com.afume.afume_android.data.vo.response.PerfumeInfo +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 io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable import io.reactivex.schedulers.Schedulers @@ -56,7 +56,7 @@ class SearchViewModel : ViewModel() { Log.e("Request Search ", requestSearch.toString()) perfumeList.value = searchRepository.postResultPerfume( - AfumeApplication.prefManager.accessToken, + ScentsNoteApplication.prefManager.accessToken, requestSearch ) Log.e("search result", perfumeList.value.toString()) @@ -88,7 +88,7 @@ class SearchViewModel : ViewModel() { fun postPerfumeLike(perfumeIdx: Int, context: Context?) { compositeDisposable.add( - searchRepository.postPerfumeLike(AfumeApplication.prefManager.accessToken, perfumeIdx) + searchRepository.postPerfumeLike(ScentsNoteApplication.prefManager.accessToken, perfumeIdx) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe({ diff --git a/app/src/main/java/com/afume/afume_android/ui/search/SelectedFilterRecyclerViewAdapter.kt b/app/src/main/java/com/scents/note/ui/search/SelectedFilterRecyclerViewAdapter.kt similarity index 86% rename from app/src/main/java/com/afume/afume_android/ui/search/SelectedFilterRecyclerViewAdapter.kt rename to app/src/main/java/com/scents/note/ui/search/SelectedFilterRecyclerViewAdapter.kt index e2c25189..0b09ddbb 100644 --- a/app/src/main/java/com/afume/afume_android/ui/search/SelectedFilterRecyclerViewAdapter.kt +++ b/app/src/main/java/com/scents/note/ui/search/SelectedFilterRecyclerViewAdapter.kt @@ -1,12 +1,12 @@ -package com.afume.afume_android.ui.search +package com.scents.note.ui.search import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.afume.afume_android.data.vo.request.FilterInfoP -import com.afume.afume_android.data.vo.request.SendFilter -import com.afume.afume_android.databinding.RvItemSearchFilterBinding +import com.scents.note.data.vo.request.FilterInfoP +import com.scents.note.data.vo.request.SendFilter +import com.scents.note.databinding.RvItemSearchFilterBinding class SelectedFilterRecyclerViewAdapter(val btnCancel:(FilterInfoP?)->Unit) : RecyclerView.Adapter() { diff --git a/app/src/main/java/com/afume/afume_android/ui/search/SerchHomeFragment.kt b/app/src/main/java/com/scents/note/ui/search/SerchHomeFragment.kt similarity index 90% rename from app/src/main/java/com/afume/afume_android/ui/search/SerchHomeFragment.kt rename to app/src/main/java/com/scents/note/ui/search/SerchHomeFragment.kt index 3f856d98..7953d375 100644 --- a/app/src/main/java/com/afume/afume_android/ui/search/SerchHomeFragment.kt +++ b/app/src/main/java/com/scents/note/ui/search/SerchHomeFragment.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.search +package com.scents.note.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.afume.afume_android.AfumeApplication -import com.afume.afume_android.databinding.FragmentSearchBinding -import com.afume.afume_android.ui.filter.FilterActivity +import com.scents.note.ScentsNoteApplication +import com.scents.note.databinding.FragmentSearchBinding +import com.scents.note.ui.filter.FilterActivity class SearchHomeFragment : Fragment() { @@ -45,7 +45,7 @@ class SearchHomeFragment : Fragment() { override fun onResume() { super.onResume() - if (AfumeApplication.prefManager.haveToken()) { + if (ScentsNoteApplication.prefManager.haveToken()) { viewLifecycleOwner.lifecycleScope.launchWhenStarted { viewModel.postSearchResultPerfume() } diff --git a/app/src/main/java/com/afume/afume_android/ui/search/SingleViewModelFactory.kt b/app/src/main/java/com/scents/note/ui/search/SingleViewModelFactory.kt similarity index 94% rename from app/src/main/java/com/afume/afume_android/ui/search/SingleViewModelFactory.kt rename to app/src/main/java/com/scents/note/ui/search/SingleViewModelFactory.kt index b5fa5d5e..b63195e3 100644 --- a/app/src/main/java/com/afume/afume_android/ui/search/SingleViewModelFactory.kt +++ b/app/src/main/java/com/scents/note/ui/search/SingleViewModelFactory.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.search +package com.scents.note.ui.search import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider diff --git a/app/src/main/java/com/afume/afume_android/ui/setting/EditMyInfoActivity.kt b/app/src/main/java/com/scents/note/ui/setting/EditMyInfoActivity.kt similarity index 91% rename from app/src/main/java/com/afume/afume_android/ui/setting/EditMyInfoActivity.kt rename to app/src/main/java/com/scents/note/ui/setting/EditMyInfoActivity.kt index 26104f83..ab8c0602 100644 --- a/app/src/main/java/com/afume/afume_android/ui/setting/EditMyInfoActivity.kt +++ b/app/src/main/java/com/scents/note/ui/setting/EditMyInfoActivity.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.setting +package com.scents.note.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.afume.afume_android.R -import com.afume.afume_android.databinding.ActivityMyInfoEditBinding -import com.afume.afume_android.util.CommonDialog -import com.afume.afume_android.util.YearPickerDialog -import com.afume.afume_android.util.toast +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 class EditMyInfoActivity : AppCompatActivity() { private lateinit var binding : ActivityMyInfoEditBinding diff --git a/app/src/main/java/com/afume/afume_android/ui/setting/EditMyInfoViewModel.kt b/app/src/main/java/com/scents/note/ui/setting/EditMyInfoViewModel.kt similarity index 89% rename from app/src/main/java/com/afume/afume_android/ui/setting/EditMyInfoViewModel.kt rename to app/src/main/java/com/scents/note/ui/setting/EditMyInfoViewModel.kt index a224cd36..c2fd44cf 100644 --- a/app/src/main/java/com/afume/afume_android/ui/setting/EditMyInfoViewModel.kt +++ b/app/src/main/java/com/scents/note/ui/setting/EditMyInfoViewModel.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.setting +package com.scents.note.ui.setting import android.os.Handler import android.util.Log @@ -6,11 +6,11 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.afume.afume_android.AfumeApplication -import com.afume.afume_android.data.repository.EditMyInfoRepository -import com.afume.afume_android.data.repository.SignRepository -import com.afume.afume_android.data.vo.request.RequestEditMyInfo -import com.afume.afume_android.data.vo.request.RequestEditPassword +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 kotlinx.coroutines.launch import retrofit2.HttpException import java.util.regex.Pattern @@ -33,10 +33,10 @@ class EditMyInfoViewModel : ViewModel() { // 자동입력 fun checkMyInfo(){ - if(AfumeApplication.prefManager.haveToken()){ - nickTxt.postValue(AfumeApplication.prefManager.userNickname) - checkGenderInfo(AfumeApplication.prefManager.userGender) - ageTxt.postValue(AfumeApplication.prefManager.userAge.toString()) + if(ScentsNoteApplication.prefManager.haveToken()){ + nickTxt.postValue(ScentsNoteApplication.prefManager.userNickname) + checkGenderInfo(ScentsNoteApplication.prefManager.userGender) + ageTxt.postValue(ScentsNoteApplication.prefManager.userAge.toString()) } } @@ -99,7 +99,7 @@ class EditMyInfoViewModel : ViewModel() { // 닉네임 변경확인 private fun checkChangeNick(){ - if(nickTxt.value == AfumeApplication.prefManager.userNickname){ + if(nickTxt.value == ScentsNoteApplication.prefManager.userNickname){ _isValidNickBtn.postValue(false) }else{ _isValidNickBtn.postValue(true) @@ -170,11 +170,11 @@ class EditMyInfoViewModel : ViewModel() { // 수정 여부 확인 fun checkChangeInfo(){ - _completeBtn.value = ((_isValidNick.value == true || genderTxt != AfumeApplication.prefManager.userGender || ageTxt.value != AfumeApplication.prefManager.userAge.toString()) && _isValidNickBtn.value == false + _completeBtn.value = ((_isValidNick.value == true || genderTxt != ScentsNoteApplication.prefManager.userGender || ageTxt.value != ScentsNoteApplication.prefManager.userAge.toString()) && _isValidNickBtn.value == false && _isValidNickNotice.value == false) } - private val _isValidMyInfoUpdate = MutableLiveData() + private val _isValidMyInfoUpdate = MutableLiveData(false) val isValidMyInfoUpdate : LiveData get() = _isValidMyInfoUpdate @@ -183,20 +183,20 @@ class EditMyInfoViewModel : ViewModel() { viewModelScope.launch { try{ val myInfo = RequestEditMyInfo( - AfumeApplication.prefManager.userEmail, + ScentsNoteApplication.prefManager.userEmail, nickTxt.value.toString(), genderTxt, ageTxt.value!!.toInt() ) editRepository.putMyInfo( - AfumeApplication.prefManager.accessToken, - AfumeApplication.prefManager.userIdx, + ScentsNoteApplication.prefManager.accessToken, + ScentsNoteApplication.prefManager.userIdx, myInfo ).let{ Log.d("내 정보 수정 성공 : ", it.toString()) - AfumeApplication.prefManager.userNickname = nickTxt.value.toString() - AfumeApplication.prefManager.userGender = genderTxt - AfumeApplication.prefManager.userAge = ageTxt.value!!.toInt() + ScentsNoteApplication.prefManager.userNickname = nickTxt.value.toString() + ScentsNoteApplication.prefManager.userGender = genderTxt + ScentsNoteApplication.prefManager.userAge = ageTxt.value!!.toInt() _isValidMyInfoUpdate.postValue(true) } }catch (e : HttpException){ @@ -261,7 +261,7 @@ class EditMyInfoViewModel : ViewModel() { // 본인확인 fun checkValidPassword(){ passwordNotice.value = "비밀번호를 다시 입력해주세요." - if(passwordTxt.value == AfumeApplication.prefManager.userPassword){ + if(passwordTxt.value == ScentsNoteApplication.prefManager.userPassword){ _isValidPassword.postValue(true) _isValidPasswordBtn.postValue(false) _isValidPasswordNotice.postValue(false) @@ -351,7 +351,7 @@ class EditMyInfoViewModel : ViewModel() { // 기존 비밀번호와 일치 검사 private fun checkNewPassword(){ - if(newPasswordTxt.value == AfumeApplication.prefManager.userPassword){ + if(newPasswordTxt.value == ScentsNoteApplication.prefManager.userPassword){ _isValidSamePassword.postValue(true) _newPasswordNotice.value = "최근 사용한 비밀번호입니다.\n다른 비밀번호를 입력해 주세요." _isValidNewPasswordNotice.postValue(true) @@ -416,11 +416,11 @@ class EditMyInfoViewModel : ViewModel() { newPasswordTxt.value.toString() ) editRepository.putPassword( - AfumeApplication.prefManager.accessToken, + ScentsNoteApplication.prefManager.accessToken, passwordInfo ).let { Log.d("비밀번호 수정 성공 : ", it) - AfumeApplication.prefManager.userPassword = passwordInfo.newPassword + ScentsNoteApplication.prefManager.userPassword = passwordInfo.newPassword _isValidEditPassword.postValue(true) } diff --git a/app/src/main/java/com/scents/note/ui/setting/EditPasswordActivity.kt b/app/src/main/java/com/scents/note/ui/setting/EditPasswordActivity.kt index 98004807..dc1d4992 100644 --- a/app/src/main/java/com/scents/note/ui/setting/EditPasswordActivity.kt +++ b/app/src/main/java/com/scents/note/ui/setting/EditPasswordActivity.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.setting +package com.scents.note.ui.setting import android.os.Bundle import android.view.View @@ -8,11 +8,11 @@ import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil import androidx.lifecycle.LiveData import androidx.lifecycle.Observer -import com.afume.afume_android.R -import com.afume.afume_android.databinding.ActivityPasswordEditBinding -import com.afume.afume_android.util.CommonDialog -import com.afume.afume_android.util.setKeyboard -import com.afume.afume_android.util.toast +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 class EditPasswordActivity : AppCompatActivity() { lateinit var binding : ActivityPasswordEditBinding diff --git a/app/src/main/java/com/afume/afume_android/ui/signin/SignHomeActivity.kt b/app/src/main/java/com/scents/note/ui/signin/SignHomeActivity.kt similarity index 72% rename from app/src/main/java/com/afume/afume_android/ui/signin/SignHomeActivity.kt rename to app/src/main/java/com/scents/note/ui/signin/SignHomeActivity.kt index bc9370a4..0f981d2e 100644 --- a/app/src/main/java/com/afume/afume_android/ui/signin/SignHomeActivity.kt +++ b/app/src/main/java/com/scents/note/ui/signin/SignHomeActivity.kt @@ -1,13 +1,13 @@ -package com.afume.afume_android.ui.signin +package com.scents.note.ui.signin import android.os.Bundle import android.view.View import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil -import com.afume.afume_android.R -import com.afume.afume_android.databinding.ActivitySignHomeBinding -import com.afume.afume_android.ui.signup.SignUpEmailActivity -import com.afume.afume_android.util.startActivity +import com.scents.note.R +import com.scents.note.databinding.ActivitySignHomeBinding +import com.scents.note.ui.signup.SignUpEmailActivity +import com.scents.note.util.startActivity class SignHomeActivity : AppCompatActivity() { lateinit var binding: ActivitySignHomeBinding diff --git a/app/src/main/java/com/afume/afume_android/ui/signin/SignInActivity.kt b/app/src/main/java/com/scents/note/ui/signin/SignInActivity.kt similarity index 81% rename from app/src/main/java/com/afume/afume_android/ui/signin/SignInActivity.kt rename to app/src/main/java/com/scents/note/ui/signin/SignInActivity.kt index 83905db0..3566bb85 100644 --- a/app/src/main/java/com/afume/afume_android/ui/signin/SignInActivity.kt +++ b/app/src/main/java/com/scents/note/ui/signin/SignInActivity.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.signin +package com.scents.note.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.afume.afume_android.R -import com.afume.afume_android.databinding.ActivitySignInBinding -import com.afume.afume_android.ui.MainActivity -import com.afume.afume_android.ui.signup.SignUpEmailActivity -import com.afume.afume_android.util.startActivity -import com.afume.afume_android.util.startActivityWithFinish +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 class SignInActivity : AppCompatActivity() { lateinit var binding: ActivitySignInBinding diff --git a/app/src/main/java/com/afume/afume_android/ui/signin/SignInViewModel.kt b/app/src/main/java/com/scents/note/ui/signin/SignInViewModel.kt similarity index 76% rename from app/src/main/java/com/afume/afume_android/ui/signin/SignInViewModel.kt rename to app/src/main/java/com/scents/note/ui/signin/SignInViewModel.kt index 789b4402..86767471 100644 --- a/app/src/main/java/com/afume/afume_android/ui/signin/SignInViewModel.kt +++ b/app/src/main/java/com/scents/note/ui/signin/SignInViewModel.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.signin +package com.scents.note.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.afume.afume_android.AfumeApplication -import com.afume.afume_android.data.repository.SignRepository -import com.afume.afume_android.data.vo.request.RequestLogin +import com.scents.note.ScentsNoteApplication +import com.scents.note.data.repository.SignRepository +import com.scents.note.data.vo.request.RequestLogin import kotlinx.coroutines.launch import retrofit2.HttpException @@ -21,9 +21,9 @@ class SignInViewModel : ViewModel() { // 자동입력 fun checkRegisterInfo(){ - if(AfumeApplication.prefManager.haveToken()){ - emailTxt.postValue(AfumeApplication.prefManager.userEmail) - passwordTxt.postValue(AfumeApplication.prefManager.userPassword) + if(ScentsNoteApplication.prefManager.haveToken()){ + emailTxt.postValue(ScentsNoteApplication.prefManager.userEmail) + passwordTxt.postValue(ScentsNoteApplication.prefManager.userPassword) } } @@ -94,14 +94,14 @@ class SignInViewModel : ViewModel() { try{ val loginInfo = RequestLogin(emailTxt.value.toString(),passwordTxt.value.toString()) signRepository.postLoginInfo(loginInfo).let { - AfumeApplication.prefManager.userIdx = it.userIdx - AfumeApplication.prefManager.userEmail = emailTxt.value.toString() - AfumeApplication.prefManager.userPassword = passwordTxt.value.toString() - AfumeApplication.prefManager.userNickname = it.nickname - AfumeApplication.prefManager.userGender = it.gender - AfumeApplication.prefManager.userAge = it.birth - AfumeApplication.prefManager.accessToken = "Bearer "+it.token - AfumeApplication.prefManager.refreshToken = "Bearer "+it.refreshToken + ScentsNoteApplication.prefManager.userIdx = it.userIdx + ScentsNoteApplication.prefManager.userEmail = emailTxt.value.toString() + ScentsNoteApplication.prefManager.userPassword = passwordTxt.value.toString() + ScentsNoteApplication.prefManager.userNickname = it.nickname + ScentsNoteApplication.prefManager.userGender = it.gender + ScentsNoteApplication.prefManager.userAge = it.birth + ScentsNoteApplication.prefManager.accessToken = "Bearer "+it.token + ScentsNoteApplication.prefManager.refreshToken = "Bearer "+it.refreshToken _isValidLogin.postValue(true) _isValidLoginNotice.postValue(false) diff --git a/app/src/main/java/com/afume/afume_android/ui/signup/PrivacyPolicyActivity.kt b/app/src/main/java/com/scents/note/ui/signup/PrivacyPolicyActivity.kt similarity index 87% rename from app/src/main/java/com/afume/afume_android/ui/signup/PrivacyPolicyActivity.kt rename to app/src/main/java/com/scents/note/ui/signup/PrivacyPolicyActivity.kt index b0c70d7d..63adae9a 100644 --- a/app/src/main/java/com/afume/afume_android/ui/signup/PrivacyPolicyActivity.kt +++ b/app/src/main/java/com/scents/note/ui/signup/PrivacyPolicyActivity.kt @@ -1,10 +1,10 @@ -package com.afume.afume_android.ui.signup +package com.scents.note.ui.signup import android.os.Bundle import android.widget.ImageView import android.widget.TextView import androidx.appcompat.app.AppCompatActivity -import com.afume.afume_android.R +import com.scents.note.R class PrivacyPolicyActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/afume/afume_android/ui/signup/SignUpAgeActivity.kt b/app/src/main/java/com/scents/note/ui/signup/SignUpAgeActivity.kt similarity index 81% rename from app/src/main/java/com/afume/afume_android/ui/signup/SignUpAgeActivity.kt rename to app/src/main/java/com/scents/note/ui/signup/SignUpAgeActivity.kt index 7f579379..5dcd8516 100644 --- a/app/src/main/java/com/afume/afume_android/ui/signup/SignUpAgeActivity.kt +++ b/app/src/main/java/com/scents/note/ui/signup/SignUpAgeActivity.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.signup +package com.scents.note.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.afume.afume_android.R -import com.afume.afume_android.databinding.ActivitySignUpAgeBinding -import com.afume.afume_android.ui.survey.SurveyActivity -import com.afume.afume_android.util.YearPickerDialog -import com.afume.afume_android.util.startActivityWithFinish +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 class SignUpAgeActivity : AppCompatActivity() { lateinit var binding: ActivitySignUpAgeBinding diff --git a/app/src/main/java/com/afume/afume_android/ui/signup/SignUpEmailActivity.kt b/app/src/main/java/com/scents/note/ui/signup/SignUpEmailActivity.kt similarity index 91% rename from app/src/main/java/com/afume/afume_android/ui/signup/SignUpEmailActivity.kt rename to app/src/main/java/com/scents/note/ui/signup/SignUpEmailActivity.kt index c67c0e06..ca208f4a 100644 --- a/app/src/main/java/com/afume/afume_android/ui/signup/SignUpEmailActivity.kt +++ b/app/src/main/java/com/scents/note/ui/signup/SignUpEmailActivity.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.signup +package com.scents.note.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.afume.afume_android.R -import com.afume.afume_android.databinding.ActivitySignUpEmailBinding -import com.afume.afume_android.util.setKeyboard -import com.afume.afume_android.util.startActivity +import com.scents.note.R +import com.scents.note.databinding.ActivitySignUpEmailBinding +import com.scents.note.util.setKeyboard +import com.scents.note.util.startActivity class SignUpEmailActivity : AppCompatActivity() { private lateinit var binding: ActivitySignUpEmailBinding diff --git a/app/src/main/java/com/afume/afume_android/ui/signup/SignUpGenderActivity.kt b/app/src/main/java/com/scents/note/ui/signup/SignUpGenderActivity.kt similarity index 81% rename from app/src/main/java/com/afume/afume_android/ui/signup/SignUpGenderActivity.kt rename to app/src/main/java/com/scents/note/ui/signup/SignUpGenderActivity.kt index b64e388b..d5d21b06 100644 --- a/app/src/main/java/com/afume/afume_android/ui/signup/SignUpGenderActivity.kt +++ b/app/src/main/java/com/scents/note/ui/signup/SignUpGenderActivity.kt @@ -1,13 +1,13 @@ -package com.afume.afume_android.ui.signup +package com.scents.note.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.afume.afume_android.R -import com.afume.afume_android.databinding.ActivitySignUpGenderBinding -import com.afume.afume_android.util.startActivity +import com.scents.note.R +import com.scents.note.databinding.ActivitySignUpGenderBinding +import com.scents.note.util.startActivity class SignUpGenderActivity : AppCompatActivity() { lateinit var binding: ActivitySignUpGenderBinding diff --git a/app/src/main/java/com/afume/afume_android/ui/signup/SignUpPasswordActivity.kt b/app/src/main/java/com/scents/note/ui/signup/SignUpPasswordActivity.kt similarity index 88% rename from app/src/main/java/com/afume/afume_android/ui/signup/SignUpPasswordActivity.kt rename to app/src/main/java/com/scents/note/ui/signup/SignUpPasswordActivity.kt index a19ee0d4..0d86363f 100644 --- a/app/src/main/java/com/afume/afume_android/ui/signup/SignUpPasswordActivity.kt +++ b/app/src/main/java/com/scents/note/ui/signup/SignUpPasswordActivity.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.signup +package com.scents.note.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.afume.afume_android.R -import com.afume.afume_android.databinding.ActivitySignUpPasswordBinding -import com.afume.afume_android.util.setKeyboard -import com.afume.afume_android.util.startActivity +import com.scents.note.R +import com.scents.note.databinding.ActivitySignUpPasswordBinding +import com.scents.note.util.setKeyboard +import com.scents.note.util.startActivity class SignUpPasswordActivity : AppCompatActivity() { lateinit var binding: ActivitySignUpPasswordBinding diff --git a/app/src/main/java/com/afume/afume_android/ui/signup/SignUpViewModel.kt b/app/src/main/java/com/scents/note/ui/signup/SignUpViewModel.kt similarity index 89% rename from app/src/main/java/com/afume/afume_android/ui/signup/SignUpViewModel.kt rename to app/src/main/java/com/scents/note/ui/signup/SignUpViewModel.kt index 4ae91504..3f37c857 100644 --- a/app/src/main/java/com/afume/afume_android/ui/signup/SignUpViewModel.kt +++ b/app/src/main/java/com/scents/note/ui/signup/SignUpViewModel.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.signup +package com.scents.note.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.afume.afume_android.AfumeApplication -import com.afume.afume_android.data.repository.SignRepository -import com.afume.afume_android.data.vo.request.RequestRegister +import com.scents.note.ScentsNoteApplication +import com.scents.note.data.repository.SignRepository +import com.scents.note.data.vo.request.RequestRegister import kotlinx.coroutines.launch import retrofit2.HttpException import java.util.regex.Pattern @@ -317,21 +317,21 @@ class SignUpViewModel() : ViewModel() { fun addUserInfo(info : String){ when(info){ "email" -> { - AfumeApplication.prefManager.userEmail = emailTxt.value.toString() - AfumeApplication.prefManager.userNickname = nickTxt.value.toString() + ScentsNoteApplication.prefManager.userEmail = emailTxt.value.toString() + ScentsNoteApplication.prefManager.userNickname = nickTxt.value.toString() } "password" -> { - AfumeApplication.prefManager.userPassword = passwordTxt.value.toString() + ScentsNoteApplication.prefManager.userPassword = passwordTxt.value.toString() } "gender" -> { if(_isCheckMan.value == true){ - AfumeApplication.prefManager.userGender = "MAN" + ScentsNoteApplication.prefManager.userGender = "MAN" }else{ - AfumeApplication.prefManager.userGender = "WOMAN" + ScentsNoteApplication.prefManager.userGender = "WOMAN" } } "age" -> { - AfumeApplication.prefManager.userAge = ageTxt.value!!.toInt() + ScentsNoteApplication.prefManager.userAge = ageTxt.value!!.toInt() } } } @@ -346,19 +346,19 @@ class SignUpViewModel() : ViewModel() { viewModelScope.launch { try { val registerInfo = RequestRegister( - AfumeApplication.prefManager.userEmail, - AfumeApplication.prefManager.userNickname, - AfumeApplication.prefManager.userPassword, - AfumeApplication.prefManager.userGender, - AfumeApplication.prefManager.userAge + ScentsNoteApplication.prefManager.userEmail, + ScentsNoteApplication.prefManager.userNickname, + ScentsNoteApplication.prefManager.userPassword, + ScentsNoteApplication.prefManager.userGender, + ScentsNoteApplication.prefManager.userAge ) signRepository.postRegisterInfo(registerInfo).let { Log.d("회원 가입 통신 성공 : ", it.toString()) - AfumeApplication.prefManager.userIdx = it.userIdx - AfumeApplication.prefManager.accessToken = "Bearer "+it.token - AfumeApplication.prefManager.refreshToken = "Bearer "+it.refreshToken + ScentsNoteApplication.prefManager.userIdx = it.userIdx + ScentsNoteApplication.prefManager.accessToken = "Bearer "+it.token + ScentsNoteApplication.prefManager.refreshToken = "Bearer "+it.refreshToken _isValidRegister.postValue(true) - AfumeApplication.prefManager.userSurvey = true + ScentsNoteApplication.prefManager.userSurvey = true } } catch (e: HttpException) { _isValidRegister.postValue(false) diff --git a/app/src/main/java/com/afume/afume_android/ui/splash/SplashActivity.kt b/app/src/main/java/com/scents/note/ui/splash/SplashActivity.kt similarity index 83% rename from app/src/main/java/com/afume/afume_android/ui/splash/SplashActivity.kt rename to app/src/main/java/com/scents/note/ui/splash/SplashActivity.kt index fe68160f..97d09cb8 100644 --- a/app/src/main/java/com/afume/afume_android/ui/splash/SplashActivity.kt +++ b/app/src/main/java/com/scents/note/ui/splash/SplashActivity.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.splash +package com.scents.note.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.afume.afume_android.AfumeApplication -import com.afume.afume_android.R -import com.afume.afume_android.databinding.ActivitySplashBinding -import com.afume.afume_android.ui.MainActivity -import com.afume.afume_android.ui.survey.SurveyActivity -import com.afume.afume_android.util.AppUpdateDialog -import com.afume.afume_android.util.startActivityWithFinish -import com.afume.afume_android.util.toast +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 class SplashActivity : AppCompatActivity() { @@ -83,9 +83,9 @@ class SplashActivity : AppCompatActivity() { // } private fun goToNextActivity(){ - if(AfumeApplication.prefManager.haveToken() && AfumeApplication.prefManager.userSurvey){ + if(ScentsNoteApplication.prefManager.haveToken() && ScentsNoteApplication.prefManager.userSurvey){ startActivityWithFinish(SurveyActivity::class.java) - }else if(AfumeApplication.prefManager.haveToken() && !AfumeApplication.prefManager.userSurvey){ + }else if(ScentsNoteApplication.prefManager.haveToken() && !ScentsNoteApplication.prefManager.userSurvey){ startActivityWithFinish(MainActivity::class.java) this@SplashActivity.toast("자동 로그인되었습니다.") }else{ diff --git a/app/src/main/java/com/afume/afume_android/ui/splash/SplashViewModel.kt b/app/src/main/java/com/scents/note/ui/splash/SplashViewModel.kt similarity index 85% rename from app/src/main/java/com/afume/afume_android/ui/splash/SplashViewModel.kt rename to app/src/main/java/com/scents/note/ui/splash/SplashViewModel.kt index d2a7a869..0bfb3e81 100644 --- a/app/src/main/java/com/afume/afume_android/ui/splash/SplashViewModel.kt +++ b/app/src/main/java/com/scents/note/ui/splash/SplashViewModel.kt @@ -1,12 +1,12 @@ -package com.afume.afume_android.ui.splash +package com.scents.note.ui.splash import android.util.Log import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.afume.afume_android.BuildConfig -import com.afume.afume_android.data.repository.SplashRepository +import com.scents.note.BuildConfig +import com.scents.note.data.repository.SplashRepository import kotlinx.coroutines.launch import retrofit2.HttpException diff --git a/app/src/main/java/com/afume/afume_android/ui/survey/CircleRecyclerViewAdapter.kt b/app/src/main/java/com/scents/note/ui/survey/CircleRecyclerViewAdapter.kt similarity index 92% rename from app/src/main/java/com/afume/afume_android/ui/survey/CircleRecyclerViewAdapter.kt rename to app/src/main/java/com/scents/note/ui/survey/CircleRecyclerViewAdapter.kt index 2269cd1c..c1bbb2d5 100644 --- a/app/src/main/java/com/afume/afume_android/ui/survey/CircleRecyclerViewAdapter.kt +++ b/app/src/main/java/com/scents/note/ui/survey/CircleRecyclerViewAdapter.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.survey +package com.scents.note.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.afume.afume_android.R -import com.afume.afume_android.data.vo.response.PerfumeInfo -import com.afume.afume_android.data.vo.response.SeriesInfo -import com.afume.afume_android.databinding.RvItemSurveyCircleBinding -import com.afume.afume_android.databinding.RvItemSurveySeriesBinding +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 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/scents/note/ui/survey/SurveyActivity.kt index e1ba538b..3686b70b 100644 --- a/app/src/main/java/com/scents/note/ui/survey/SurveyActivity.kt +++ b/app/src/main/java/com/scents/note/ui/survey/SurveyActivity.kt @@ -1,16 +1,15 @@ -package com.afume.afume_android.ui.survey +package com.scents.note.ui.survey import android.os.Bundle -import android.util.Log import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil -import com.afume.afume_android.AfumeApplication -import com.afume.afume_android.R -import com.afume.afume_android.databinding.ActivitySurveyBinding -import com.afume.afume_android.ui.MainActivity -import com.afume.afume_android.ui.filter.AfumeViewPagerAdapter -import com.afume.afume_android.util.* +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 java.util.* class SurveyActivity : AppCompatActivity() { @@ -37,7 +36,7 @@ class SurveyActivity : AppCompatActivity() { } private fun initTabWithVp() { - val surveyViewPagerAdapter = AfumeViewPagerAdapter(supportFragmentManager) + val surveyViewPagerAdapter = ScentsNoteViewPagerAdapter(supportFragmentManager) surveyViewPagerAdapter.fragments = listOf( SurveyPerfumeFragment(), SurveyKeywordFragment(), @@ -62,8 +61,8 @@ class SurveyActivity : AppCompatActivity() { 0 -> currentItem = 1 1 -> currentItem = 2 2 -> { - AfumeApplication.prefManager.userSurvey = false - viewModel.postSurvey(AfumeApplication.prefManager.accessToken) + ScentsNoteApplication.prefManager.userSurvey = false + viewModel.postSurvey(ScentsNoteApplication.prefManager.accessToken) this@SurveyActivity.startActivityWithFinish(MainActivity::class.java) } } diff --git a/app/src/main/java/com/afume/afume_android/ui/survey/SurveyBinding.kt b/app/src/main/java/com/scents/note/ui/survey/SurveyBinding.kt similarity index 81% rename from app/src/main/java/com/afume/afume_android/ui/survey/SurveyBinding.kt rename to app/src/main/java/com/scents/note/ui/survey/SurveyBinding.kt index 30d7d472..62aebe2a 100644 --- a/app/src/main/java/com/afume/afume_android/ui/survey/SurveyBinding.kt +++ b/app/src/main/java/com/scents/note/ui/survey/SurveyBinding.kt @@ -1,12 +1,12 @@ -package com.afume.afume_android.ui.survey +package com.scents.note.ui.survey import android.util.Log import androidx.databinding.BindingAdapter import androidx.recyclerview.widget.RecyclerView -import com.afume.afume_android.data.vo.response.KeywordInfo -import com.afume.afume_android.data.vo.response.PerfumeInfo -import com.afume.afume_android.data.vo.response.SeriesInfo -import com.afume.afume_android.util.FlexboxRecyclerViewAdapter +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 object SurveyBinding { @JvmStatic diff --git a/app/src/main/java/com/afume/afume_android/ui/survey/SurveyIncenseFragment.kt b/app/src/main/java/com/scents/note/ui/survey/SurveyIncenseFragment.kt similarity index 92% rename from app/src/main/java/com/afume/afume_android/ui/survey/SurveyIncenseFragment.kt rename to app/src/main/java/com/scents/note/ui/survey/SurveyIncenseFragment.kt index 6b674fdb..8fc9d340 100644 --- a/app/src/main/java/com/afume/afume_android/ui/survey/SurveyIncenseFragment.kt +++ b/app/src/main/java/com/scents/note/ui/survey/SurveyIncenseFragment.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.survey +package com.scents.note.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.afume.afume_android.R -import com.afume.afume_android.databinding.FragmentSurveyIncenseBinding +import com.scents.note.R +import com.scents.note.databinding.FragmentSurveyIncenseBinding class SurveyIncenseFragment : Fragment() { private lateinit var binding: FragmentSurveyIncenseBinding diff --git a/app/src/main/java/com/afume/afume_android/ui/survey/SurveyKeywordFragment.kt b/app/src/main/java/com/scents/note/ui/survey/SurveyKeywordFragment.kt similarity index 90% rename from app/src/main/java/com/afume/afume_android/ui/survey/SurveyKeywordFragment.kt rename to app/src/main/java/com/scents/note/ui/survey/SurveyKeywordFragment.kt index 48c0e771..1259f7f7 100644 --- a/app/src/main/java/com/afume/afume_android/ui/survey/SurveyKeywordFragment.kt +++ b/app/src/main/java/com/scents/note/ui/survey/SurveyKeywordFragment.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.survey +package com.scents.note.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.afume.afume_android.R -import com.afume.afume_android.databinding.FragmentSurveyKeywordBinding -import com.afume.afume_android.util.FlexboxRecyclerViewAdapter +import com.scents.note.R +import com.scents.note.databinding.FragmentSurveyKeywordBinding +import com.scents.note.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/afume/afume_android/ui/survey/SurveyPerfumeFragment.kt b/app/src/main/java/com/scents/note/ui/survey/SurveyPerfumeFragment.kt similarity index 92% rename from app/src/main/java/com/afume/afume_android/ui/survey/SurveyPerfumeFragment.kt rename to app/src/main/java/com/scents/note/ui/survey/SurveyPerfumeFragment.kt index dd19e385..a81bedfe 100644 --- a/app/src/main/java/com/afume/afume_android/ui/survey/SurveyPerfumeFragment.kt +++ b/app/src/main/java/com/scents/note/ui/survey/SurveyPerfumeFragment.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.ui.survey +package com.scents.note.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.afume.afume_android.R -import com.afume.afume_android.databinding.FragmentSurveyPerfumeBinding +import com.scents.note.R +import com.scents.note.databinding.FragmentSurveyPerfumeBinding class SurveyPerfumeFragment : Fragment() { private lateinit var binding: FragmentSurveyPerfumeBinding diff --git a/app/src/main/java/com/afume/afume_android/ui/survey/SurveyViewModel.kt b/app/src/main/java/com/scents/note/ui/survey/SurveyViewModel.kt similarity index 94% rename from app/src/main/java/com/afume/afume_android/ui/survey/SurveyViewModel.kt rename to app/src/main/java/com/scents/note/ui/survey/SurveyViewModel.kt index 0a08972a..0b9682ea 100644 --- a/app/src/main/java/com/afume/afume_android/ui/survey/SurveyViewModel.kt +++ b/app/src/main/java/com/scents/note/ui/survey/SurveyViewModel.kt @@ -1,15 +1,15 @@ -package com.afume.afume_android.ui.survey +package com.scents.note.ui.survey import android.util.Log import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.afume.afume_android.data.repository.SurveyRepository -import com.afume.afume_android.data.vo.request.RequestSurvey -import com.afume.afume_android.data.vo.response.KeywordInfo -import com.afume.afume_android.data.vo.response.PerfumeInfo -import com.afume.afume_android.data.vo.response.SeriesInfo +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 kotlinx.coroutines.launch import retrofit2.HttpException diff --git a/app/src/main/java/com/afume/afume_android/util/ActivityExtension.kt b/app/src/main/java/com/scents/note/util/ActivityExtension.kt similarity index 96% rename from app/src/main/java/com/afume/afume_android/util/ActivityExtension.kt rename to app/src/main/java/com/scents/note/util/ActivityExtension.kt index 7727cd54..0df2dfed 100644 --- a/app/src/main/java/com/afume/afume_android/util/ActivityExtension.kt +++ b/app/src/main/java/com/scents/note/util/ActivityExtension.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.util +package com.scents.note.util import android.content.Context import android.content.Intent diff --git a/app/src/main/java/com/afume/afume_android/util/AppUpdateDialog.kt b/app/src/main/java/com/scents/note/util/AppUpdateDialog.kt similarity index 94% rename from app/src/main/java/com/afume/afume_android/util/AppUpdateDialog.kt rename to app/src/main/java/com/scents/note/util/AppUpdateDialog.kt index 1172fa1b..b5e66755 100644 --- a/app/src/main/java/com/afume/afume_android/util/AppUpdateDialog.kt +++ b/app/src/main/java/com/scents/note/util/AppUpdateDialog.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.util +package com.scents.note.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.afume.afume_android.databinding.DialogAppUpdateBinding +import com.scents.note.databinding.DialogAppUpdateBinding class AppUpdateDialog: DialogFragment(), View.OnClickListener { lateinit var binding : DialogAppUpdateBinding diff --git a/app/src/main/java/com/afume/afume_android/util/BindingAdapter.kt b/app/src/main/java/com/scents/note/util/BindingAdapter.kt similarity index 96% rename from app/src/main/java/com/afume/afume_android/util/BindingAdapter.kt rename to app/src/main/java/com/scents/note/util/BindingAdapter.kt index 8fb4b5ca..c939c0f8 100644 --- a/app/src/main/java/com/afume/afume_android/util/BindingAdapter.kt +++ b/app/src/main/java/com/scents/note/util/BindingAdapter.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.util +package com.scents.note.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.afume.afume_android.AfumeApplication -import com.afume.afume_android.R +import com.scents.note.ScentsNoteApplication +import com.scents.note.R import com.bumptech.glide.Glide object BindingAdapter { @@ -199,7 +199,7 @@ object BindingAdapter { @JvmStatic @BindingAdapter("setNoteReportVisible") fun ImageView.setNoteReportVisible(nickname: String){ - if(nickname == AfumeApplication.prefManager.userNickname){ + if(nickname == ScentsNoteApplication.prefManager.userNickname){ this.visibility = View.INVISIBLE }else{ this.visibility = View.VISIBLE @@ -209,7 +209,7 @@ object BindingAdapter { @JvmStatic @BindingAdapter("setNoteReportVisible") fun TextView.setNoteReportVisible(nickname: String){ - if(nickname == AfumeApplication.prefManager.userNickname){ + if(nickname == ScentsNoteApplication.prefManager.userNickname){ this.visibility = View.GONE }else{ this.visibility = View.VISIBLE diff --git a/app/src/main/java/com/afume/afume_android/util/CommonDialog.kt b/app/src/main/java/com/scents/note/util/CommonDialog.kt similarity index 94% rename from app/src/main/java/com/afume/afume_android/util/CommonDialog.kt rename to app/src/main/java/com/scents/note/util/CommonDialog.kt index 42b76bd9..79d32224 100644 --- a/app/src/main/java/com/afume/afume_android/util/CommonDialog.kt +++ b/app/src/main/java/com/scents/note/util/CommonDialog.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.util +package com.scents.note.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.afume.afume_android.R -import com.afume.afume_android.databinding.DialogCommonBinding -import com.afume.afume_android.ui.signin.SignHomeActivity +import com.scents.note.R +import com.scents.note.databinding.DialogCommonBinding +import com.scents.note.ui.signin.SignHomeActivity class CommonDialog : DialogFragment(), View.OnClickListener { lateinit var binding : DialogCommonBinding diff --git a/app/src/main/java/com/afume/afume_android/util/Dialog.kt b/app/src/main/java/com/scents/note/util/Dialog.kt similarity index 95% rename from app/src/main/java/com/afume/afume_android/util/Dialog.kt rename to app/src/main/java/com/scents/note/util/Dialog.kt index 0c41e2ef..9ca77a08 100644 --- a/app/src/main/java/com/afume/afume_android/util/Dialog.kt +++ b/app/src/main/java/com/scents/note/util/Dialog.kt @@ -1,11 +1,11 @@ -package com.afume.afume_android.util +package com.scents.note.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.afume.afume_android.R +import com.scents.note.R fun DialogFragment.setDrawable(){ dialog?.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) diff --git a/app/src/main/java/com/afume/afume_android/util/DialogExtension.kt b/app/src/main/java/com/scents/note/util/DialogExtension.kt similarity index 96% rename from app/src/main/java/com/afume/afume_android/util/DialogExtension.kt rename to app/src/main/java/com/scents/note/util/DialogExtension.kt index e1252c7e..060d7ec6 100644 --- a/app/src/main/java/com/afume/afume_android/util/DialogExtension.kt +++ b/app/src/main/java/com/scents/note/util/DialogExtension.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.util +package com.scents.note.util import android.content.Context import android.os.Bundle diff --git a/app/src/main/java/com/afume/afume_android/util/Ext.kt b/app/src/main/java/com/scents/note/util/Ext.kt similarity index 52% rename from app/src/main/java/com/afume/afume_android/util/Ext.kt rename to app/src/main/java/com/scents/note/util/Ext.kt index f87b4c43..34bdd328 100644 --- a/app/src/main/java/com/afume/afume_android/util/Ext.kt +++ b/app/src/main/java/com/scents/note/util/Ext.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.util +package com.scents.note.util fun getToken(): String { return "" diff --git a/app/src/main/java/com/afume/afume_android/util/FlexboxRecyclerViewAdapter.kt b/app/src/main/java/com/scents/note/util/FlexboxRecyclerViewAdapter.kt similarity index 95% rename from app/src/main/java/com/afume/afume_android/util/FlexboxRecyclerViewAdapter.kt rename to app/src/main/java/com/scents/note/util/FlexboxRecyclerViewAdapter.kt index 545507c8..820b13f2 100644 --- a/app/src/main/java/com/afume/afume_android/util/FlexboxRecyclerViewAdapter.kt +++ b/app/src/main/java/com/scents/note/util/FlexboxRecyclerViewAdapter.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.util +package com.scents.note.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.afume.afume_android.data.vo.response.KeywordInfo -import com.afume.afume_android.databinding.RvItemFilterFlexboxBinding +import com.scents.note.data.vo.response.KeywordInfo +import com.scents.note.databinding.RvItemFilterFlexboxBinding class FlexboxRecyclerViewAdapter(internal val select:(KeywordInfo, Boolean)->Unit, val countBadge:(Int,Boolean)->Unit) : ListAdapter( diff --git a/app/src/main/java/com/afume/afume_android/util/Font.kt b/app/src/main/java/com/scents/note/util/Font.kt similarity index 94% rename from app/src/main/java/com/afume/afume_android/util/Font.kt rename to app/src/main/java/com/scents/note/util/Font.kt index 3eb6f22c..1f66fb51 100644 --- a/app/src/main/java/com/afume/afume_android/util/Font.kt +++ b/app/src/main/java/com/scents/note/util/Font.kt @@ -1,10 +1,10 @@ -package com.afume.afume_android.util +package com.scents.note.util import android.widget.CheckedTextView import android.widget.TextView import androidx.core.content.ContextCompat import androidx.core.content.res.ResourcesCompat -import com.afume.afume_android.R +import com.scents.note.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/afume/afume_android/util/FragmentExtension.kt b/app/src/main/java/com/scents/note/util/FragmentExtension.kt similarity index 90% rename from app/src/main/java/com/afume/afume_android/util/FragmentExtension.kt rename to app/src/main/java/com/scents/note/util/FragmentExtension.kt index 8aebe869..b9f29213 100644 --- a/app/src/main/java/com/afume/afume_android/util/FragmentExtension.kt +++ b/app/src/main/java/com/scents/note/util/FragmentExtension.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.util +package com.scents.note.util import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager diff --git a/app/src/main/java/com/afume/afume_android/util/NonSwipeViewPager.kt b/app/src/main/java/com/scents/note/util/NonSwipeViewPager.kt similarity index 95% rename from app/src/main/java/com/afume/afume_android/util/NonSwipeViewPager.kt rename to app/src/main/java/com/scents/note/util/NonSwipeViewPager.kt index dbba7e29..9394bfac 100644 --- a/app/src/main/java/com/afume/afume_android/util/NonSwipeViewPager.kt +++ b/app/src/main/java/com/scents/note/util/NonSwipeViewPager.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.util +package com.scents.note.util import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/com/afume/afume_android/util/RecyclerViewEmptySupport.kt b/app/src/main/java/com/scents/note/util/RecyclerViewEmptySupport.kt similarity index 97% rename from app/src/main/java/com/afume/afume_android/util/RecyclerViewEmptySupport.kt rename to app/src/main/java/com/scents/note/util/RecyclerViewEmptySupport.kt index a806ef8c..b743be8e 100644 --- a/app/src/main/java/com/afume/afume_android/util/RecyclerViewEmptySupport.kt +++ b/app/src/main/java/com/scents/note/util/RecyclerViewEmptySupport.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.util +package com.scents.note.util import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/com/afume/afume_android/util/ReportDialog.kt b/app/src/main/java/com/scents/note/util/ReportDialog.kt similarity index 92% rename from app/src/main/java/com/afume/afume_android/util/ReportDialog.kt rename to app/src/main/java/com/scents/note/util/ReportDialog.kt index e6d9ae64..c2f9ee3a 100644 --- a/app/src/main/java/com/afume/afume_android/util/ReportDialog.kt +++ b/app/src/main/java/com/scents/note/util/ReportDialog.kt @@ -1,13 +1,13 @@ -package com.afume.afume_android.util +package com.scents.note.util import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.DialogFragment -import com.afume.afume_android.R -import com.afume.afume_android.databinding.DialogReviewReportBinding -import com.afume.afume_android.ui.detail.PerfumeDetailViewModel +import com.scents.note.R +import com.scents.note.databinding.DialogReviewReportBinding +import com.scents.note.ui.detail.PerfumeDetailViewModel class ReportDialog(val vm : PerfumeDetailViewModel) : DialogFragment(), View.OnClickListener { lateinit var binding : DialogReviewReportBinding diff --git a/app/src/main/java/com/afume/afume_android/util/SeekBar.kt b/app/src/main/java/com/scents/note/util/SeekBar.kt similarity index 92% rename from app/src/main/java/com/afume/afume_android/util/SeekBar.kt rename to app/src/main/java/com/scents/note/util/SeekBar.kt index 2d31fd50..3e6de6be 100644 --- a/app/src/main/java/com/afume/afume_android/util/SeekBar.kt +++ b/app/src/main/java/com/scents/note/util/SeekBar.kt @@ -1,11 +1,11 @@ -package com.afume.afume_android.util +package com.scents.note.util import android.content.Context import android.widget.SeekBar import android.widget.TextView import androidx.core.content.ContextCompat -import com.afume.afume_android.R -import com.afume.afume_android.ui.note.NoteViewModel +import com.scents.note.R +import com.scents.note.ui.note.NoteViewModel fun setSelectedSeekBarTxtBold(list: List, select: Int){ for(i in list.indices){ diff --git a/app/src/main/java/com/afume/afume_android/util/SingleLiveEvent.kt b/app/src/main/java/com/scents/note/util/SingleLiveEvent.kt similarity index 95% rename from app/src/main/java/com/afume/afume_android/util/SingleLiveEvent.kt rename to app/src/main/java/com/scents/note/util/SingleLiveEvent.kt index 2ced12c8..7b4de485 100644 --- a/app/src/main/java/com/afume/afume_android/util/SingleLiveEvent.kt +++ b/app/src/main/java/com/scents/note/util/SingleLiveEvent.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.util +package com.scents.note.util import androidx.annotation.MainThread import androidx.lifecycle.LifecycleOwner diff --git a/app/src/main/java/com/afume/afume_android/util/Tab.kt b/app/src/main/java/com/scents/note/util/Tab.kt similarity index 96% rename from app/src/main/java/com/afume/afume_android/util/Tab.kt rename to app/src/main/java/com/scents/note/util/Tab.kt index 9247c9be..1a67b3c9 100644 --- a/app/src/main/java/com/afume/afume_android/util/Tab.kt +++ b/app/src/main/java/com/scents/note/util/Tab.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.util +package com.scents.note.util import android.view.ViewGroup import android.widget.TextView diff --git a/app/src/main/java/com/afume/afume_android/util/TextWatcher.kt b/app/src/main/java/com/scents/note/util/TextWatcher.kt similarity index 91% rename from app/src/main/java/com/afume/afume_android/util/TextWatcher.kt rename to app/src/main/java/com/scents/note/util/TextWatcher.kt index d6fea1b3..16dd68eb 100644 --- a/app/src/main/java/com/afume/afume_android/util/TextWatcher.kt +++ b/app/src/main/java/com/scents/note/util/TextWatcher.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.util +package com.scents.note.util import android.text.Editable import android.text.TextWatcher diff --git a/app/src/main/java/com/afume/afume_android/util/Toast.kt b/app/src/main/java/com/scents/note/util/Toast.kt similarity index 87% rename from app/src/main/java/com/afume/afume_android/util/Toast.kt rename to app/src/main/java/com/scents/note/util/Toast.kt index b939a1ea..52d2d47b 100644 --- a/app/src/main/java/com/afume/afume_android/util/Toast.kt +++ b/app/src/main/java/com/scents/note/util/Toast.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.util +package com.scents.note.util import android.content.Context import android.widget.Toast diff --git a/app/src/main/java/com/afume/afume_android/util/YearPickerDialog.kt b/app/src/main/java/com/scents/note/util/YearPickerDialog.kt similarity index 96% rename from app/src/main/java/com/afume/afume_android/util/YearPickerDialog.kt rename to app/src/main/java/com/scents/note/util/YearPickerDialog.kt index 9a687843..5855b73c 100644 --- a/app/src/main/java/com/afume/afume_android/util/YearPickerDialog.kt +++ b/app/src/main/java/com/scents/note/util/YearPickerDialog.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android.util +package com.scents.note.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.afume.afume_android.R -import com.afume.afume_android.databinding.DialogYearPickerBinding +import com.scents.note.R +import com.scents.note.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 0721868a..724b9177 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.scents.note.ui.filter.FilterViewModel" /> + app:tabTextAppearance="@style/Theme.ScentsNote.Tab"> - + type="com.scents.note.ui.home.HomeViewModel" /> + type="com.scents.note.ui.setting.EditMyInfoViewModel" /> + type="com.scents.note.ui.note.NoteViewModel" /> + type="com.scents.note.data.vo.ParcelableWishList" /> + type="com.scents.note.ui.setting.EditMyInfoViewModel" /> + type="com.scents.note.data.vo.response.PerfumeDetail" /> + type="com.scents.note.ui.detail.PerfumeDetailViewModel" /> - - + app:layout_constraintTop_toBottomOf="@+id/tab_perfume_detail"> - + + type="com.scents.note.ui.signin.SignInViewModel" /> + type="com.scents.note.ui.signup.SignUpViewModel" /> + type="com.scents.note.ui.signup.SignUpViewModel" /> + type="com.scents.note.ui.signup.SignUpViewModel" /> + type="com.scents.note.ui.signup.SignUpViewModel" /> + type="com.scents.note.ui.survey.SurveyViewModel" /> + type="com.scents.note.ui.detail.PerfumeDetailViewModel" /> + type="com.scents.note.ui.detail.PerfumeDetailViewModel" /> + type="com.scents.note.data.vo.response.PerfumeDetail" /> + type="com.scents.note.ui.detail.PerfumeDetailViewModel" /> + type="com.scents.note.ui.filter.FilterViewModel" /> + type="com.scents.note.ui.filter.FilterViewModel" /> + type="com.scents.note.ui.filter.FilterViewModel" /> + type="com.scents.note.ui.home.HomeViewModel" /> + type="com.scents.note.ui.note.NoteViewModel" /> + type="com.scents.note.ui.my.MyViewModel" /> + app:tabTextAppearance="@style/Theme.ScentsNote.Tab"> - - + @@ -76,7 +76,7 @@ android:paddingHorizontal="16dp" app:itemTextColor="@color/black" app:itemHorizontalPadding="0dp" - app:itemTextAppearance="@style/Theme.AfumeAndroid.NavigationDrawerText" + app:itemTextAppearance="@style/Theme.ScentsNoteAndroid.NavigationDrawerText" app:headerLayout="@layout/header_navigation_drawer"/> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml index 2a97d1b9..0810cf74 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.scents.note.ui.search.SearchViewModel" /> + type="com.scents.note.ui.survey.SurveyViewModel" /> - + type="com.scents.note.ui.survey.SurveyViewModel" /> - + type="com.scents.note.ui.survey.SurveyViewModel" /> - + type="com.scents.note.ui.my.MyViewModel" /> + type="com.scents.note.data.vo.response.PerfumeInfo"/> + type="com.scents.note.data.vo.response.PerfumeDetailWithReviews" /> + type="com.scents.note.data.vo.response.BrandInfo" /> + type="com.scents.note.data.vo.response.KeywordInfo" /> + type="com.scents.note.data.vo.response.SeriesInfo" /> + type="com.scents.note.data.vo.response.HomePerfumeItem" /> + type="com.scents.note.data.vo.response.HomePerfumeItem" /> + type="com.scents.note.data.vo.response.HomePerfumeItem" /> + type="com.scents.note.data.vo.response.HomePerfumeItem" /> + type="com.scents.note.data.vo.response.RecommendPerfumeItem" /> + type="com.scents.note.data.vo.response.ResponseMyPerfume" /> + type="com.scents.note.data.vo.response.PerfumeInfo" /> + type="com.scents.note.data.vo.request.FilterInfoP" /> + type="com.scents.note.data.vo.response.SeriesIngredients" /> + type="com.scents.note.data.vo.response.PerfumeInfo" /> - - - - - - + + + + + + + + + - + android:layout_marginTop="4dp" + android:fontFamily="@font/notosans_regular" + android:gravity="center" + android:includeFontPadding="false" + android:text="@{perfume.brandName}" + android:textColor="@color/dark_gray_7d" + android:textSize="12dp" + app:layout_constraintEnd_toEndOf="@+id/rv_item_img_survey_circle" + app:layout_constraintStart_toStartOf="@+id/rv_item_survey_click" + app:layout_constraintTop_toBottomOf="@+id/rv_item_img_survey_circle" /> - - - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/rv_item_survey_series.xml b/app/src/main/res/layout/rv_item_survey_series.xml index 4fbb5ab2..51761875 100644 --- a/app/src/main/res/layout/rv_item_survey_series.xml +++ b/app/src/main/res/layout/rv_item_survey_series.xml @@ -6,7 +6,7 @@ + type="com.scents.note.data.vo.response.SeriesInfo" /> @@ -23,7 +23,7 @@ \ No newline at end of file diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index ce43c104..2bafc696 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -1,6 +1,6 @@ - - - @@ -62,13 +62,13 @@ @drawable/background_splash - - diff --git a/afume-ui/src/test/java/com/afume/afume_ui/ExampleUnitTest.kt b/app/src/test/java/com/scents/note/ExampleUnitTest.kt similarity index 92% rename from afume-ui/src/test/java/com/afume/afume_ui/ExampleUnitTest.kt rename to app/src/test/java/com/scents/note/ExampleUnitTest.kt index 3054c79e..003fcafa 100644 --- a/afume-ui/src/test/java/com/afume/afume_ui/ExampleUnitTest.kt +++ b/app/src/test/java/com/scents/note/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package com.afume.afume_ui +package com.scents.note import org.junit.Test diff --git a/afume-ui/.gitignore b/scents-note-ui/.gitignore similarity index 100% rename from afume-ui/.gitignore rename to scents-note-ui/.gitignore diff --git a/afume-ui/build.gradle b/scents-note-ui/build.gradle similarity index 100% rename from afume-ui/build.gradle rename to scents-note-ui/build.gradle diff --git a/afume-ui/consumer-rules.pro b/scents-note-ui/consumer-rules.pro similarity index 100% rename from afume-ui/consumer-rules.pro rename to scents-note-ui/consumer-rules.pro diff --git a/afume-ui/proguard-rules.pro b/scents-note-ui/proguard-rules.pro similarity index 100% rename from afume-ui/proguard-rules.pro rename to scents-note-ui/proguard-rules.pro diff --git a/app/src/androidTest/java/com/afume/afume_android/ExampleInstrumentedTest.kt b/scents-note-ui/src/androidTest/java/com/scents/scents_note_ui/ExampleInstrumentedTest.kt similarity index 83% rename from app/src/androidTest/java/com/afume/afume_android/ExampleInstrumentedTest.kt rename to scents-note-ui/src/androidTest/java/com/scents/scents_note_ui/ExampleInstrumentedTest.kt index dbf36325..4ae4adf7 100644 --- a/app/src/androidTest/java/com/afume/afume_android/ExampleInstrumentedTest.kt +++ b/scents-note-ui/src/androidTest/java/com/scents/scents_note_ui/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android +package com.scents.scents_note_ui import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 @@ -19,6 +19,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.example.afume_android", appContext.packageName) + assertEquals("com.scents.scents_note_ui.test", appContext.packageName) } } \ No newline at end of file diff --git a/afume-ui/src/main/AndroidManifest.xml b/scents-note-ui/src/main/AndroidManifest.xml similarity index 74% rename from afume-ui/src/main/AndroidManifest.xml rename to scents-note-ui/src/main/AndroidManifest.xml index cc6ac0b4..dfedab82 100644 --- a/afume-ui/src/main/AndroidManifest.xml +++ b/scents-note-ui/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.scents.scents_note_ui"> \ No newline at end of file diff --git a/afume-ui/src/main/java/com/afume/afume_ui/widget/SelectBox.kt b/scents-note-ui/src/main/java/com/scents/scents_note_ui/widget/SelectBox.kt similarity index 85% rename from afume-ui/src/main/java/com/afume/afume_ui/widget/SelectBox.kt rename to scents-note-ui/src/main/java/com/scents/scents_note_ui/widget/SelectBox.kt index faeed5a0..e51ac396 100644 --- a/afume-ui/src/main/java/com/afume/afume_ui/widget/SelectBox.kt +++ b/scents-note-ui/src/main/java/com/scents/scents_note_ui/widget/SelectBox.kt @@ -1,16 +1,16 @@ -package com.afume.afume_ui.widget +package com.scents.scents_note_ui.widget import android.content.Context import android.graphics.Typeface import android.util.AttributeSet import android.widget.CompoundButton -import com.afume.afume_ui.R +import com.scents.scents_note_ui.R class SelectBox @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0, - defStyleRes: Int = R.style.AfumeUI_SelectBox_Medium + defStyleRes: Int = R.style.ScentsNoteUI_SelectBox_Medium ) : CompoundButton( context, attrs, @@ -25,11 +25,11 @@ class SelectBox @JvmOverloads constructor( var toggleAble: Boolean = DEFAULT_TOGGLEABLE init { - val defaultBackgroundRes = R.drawable.afume_ui_select_box_background + val defaultBackgroundRes = R.drawable.scents_note_ui_select_box_background val defaultBackgroundTintList = null val defaultTextColorStateList = - context.getColorStateList(R.color.afume_ui_select_box_text_color) + context.getColorStateList(R.color.scents_note_ui_select_box_text_color) val defaultClickable = true val defaultFocusable = true diff --git a/scents-note-ui/src/main/res/color/scents_note_ui_select_box_text_color.xml b/scents-note-ui/src/main/res/color/scents_note_ui_select_box_text_color.xml new file mode 100644 index 00000000..5c0d585a --- /dev/null +++ b/scents-note-ui/src/main/res/color/scents_note_ui_select_box_text_color.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/afume-ui/src/main/res/drawable/afume_ui_select_box_background.xml b/scents-note-ui/src/main/res/drawable/scents_note_ui_select_box_background.xml similarity index 59% rename from afume-ui/src/main/res/drawable/afume_ui_select_box_background.xml rename to scents-note-ui/src/main/res/drawable/scents_note_ui_select_box_background.xml index 555bb94c..620c2775 100644 --- a/afume-ui/src/main/res/drawable/afume_ui_select_box_background.xml +++ b/scents-note-ui/src/main/res/drawable/scents_note_ui_select_box_background.xml @@ -1,6 +1,6 @@ - - - + + + \ No newline at end of file diff --git a/scents-note-ui/src/main/res/drawable/scents_note_ui_select_box_shape.xml b/scents-note-ui/src/main/res/drawable/scents_note_ui_select_box_shape.xml new file mode 100644 index 00000000..80512e13 --- /dev/null +++ b/scents-note-ui/src/main/res/drawable/scents_note_ui_select_box_shape.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/scents-note-ui/src/main/res/drawable/scents_note_ui_select_box_shape_checked.xml b/scents-note-ui/src/main/res/drawable/scents_note_ui_select_box_shape_checked.xml new file mode 100644 index 00000000..515f2cca --- /dev/null +++ b/scents-note-ui/src/main/res/drawable/scents_note_ui_select_box_shape_checked.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/scents-note-ui/src/main/res/drawable/scents_note_ui_select_box_shape_pressed.xml b/scents-note-ui/src/main/res/drawable/scents_note_ui_select_box_shape_pressed.xml new file mode 100644 index 00000000..63a07d6c --- /dev/null +++ b/scents-note-ui/src/main/res/drawable/scents_note_ui_select_box_shape_pressed.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/afume-ui/src/main/res/values/attrs_select_box.xml b/scents-note-ui/src/main/res/values/attrs_select_box.xml similarity index 100% rename from afume-ui/src/main/res/values/attrs_select_box.xml rename to scents-note-ui/src/main/res/values/attrs_select_box.xml diff --git a/scents-note-ui/src/main/res/values/colors.xml b/scents-note-ui/src/main/res/values/colors.xml new file mode 100644 index 00000000..c7e57521 --- /dev/null +++ b/scents-note-ui/src/main/res/values/colors.xml @@ -0,0 +1,8 @@ + + #cdcdcd + #f0f0f0 + #ffffff + #c8bbb6 + #ccc8bbb6 + #282725 + \ No newline at end of file diff --git a/scents-note-ui/src/main/res/values/dimen.xml b/scents-note-ui/src/main/res/values/dimen.xml new file mode 100644 index 00000000..04ac13ef --- /dev/null +++ b/scents-note-ui/src/main/res/values/dimen.xml @@ -0,0 +1,19 @@ + + + + 42dp + 26dp + + 18dp + 10dp + + 10dp + 3dp + 5dp + + 15sp + 12sp + + 1dp + + \ No newline at end of file diff --git a/scents-note-ui/src/main/res/values/styles.xml b/scents-note-ui/src/main/res/values/styles.xml new file mode 100644 index 00000000..c781cfb7 --- /dev/null +++ b/scents-note-ui/src/main/res/values/styles.xml @@ -0,0 +1,27 @@ + + + + + \ No newline at end of file diff --git a/app/src/test/java/com/afume/afume_android/ExampleUnitTest.kt b/scents-note-ui/src/test/java/com/scents/scents_note_ui/ExampleUnitTest.kt similarity index 90% rename from app/src/test/java/com/afume/afume_android/ExampleUnitTest.kt rename to scents-note-ui/src/test/java/com/scents/scents_note_ui/ExampleUnitTest.kt index 9595398d..4f9d3d8d 100644 --- a/app/src/test/java/com/afume/afume_android/ExampleUnitTest.kt +++ b/scents-note-ui/src/test/java/com/scents/scents_note_ui/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package com.afume.afume_android +package com.scents.scents_note_ui import org.junit.Test diff --git a/afume_ui_sample/.gitignore b/scents_note_ui_sample/.gitignore similarity index 100% rename from afume_ui_sample/.gitignore rename to scents_note_ui_sample/.gitignore diff --git a/afume_ui_sample/build.gradle b/scents_note_ui_sample/build.gradle similarity index 87% rename from afume_ui_sample/build.gradle rename to scents_note_ui_sample/build.gradle index 0aed62ae..32543a8e 100644 --- a/afume_ui_sample/build.gradle +++ b/scents_note_ui_sample/build.gradle @@ -7,7 +7,7 @@ android { compileSdkVersion ConfigData.compileSdkVersion defaultConfig { - applicationId "com.afume.afume_ui_sample" + applicationId "com.scents.scents_note_ui_sample" minSdkVersion ConfigData.minSdkVersion targetSdkVersion ConfigData.targetSdkVersion versionCode 1 @@ -32,12 +32,14 @@ android { } dependencies { - implementation project(path: ':afume-ui') + implementation project(path: ':scents-note-ui') implementation Dependencies.coreKtx implementation Dependencies.appcompat implementation Dependencies.material + implementation Dependencies.lifecycleViewModelKtx + implementation Dependencies.flexbox testImplementation Dependencies.junit diff --git a/afume_ui_sample/proguard-rules.pro b/scents_note_ui_sample/proguard-rules.pro similarity index 100% rename from afume_ui_sample/proguard-rules.pro rename to scents_note_ui_sample/proguard-rules.pro diff --git a/afume_ui_sample/src/androidTest/java/com/afume/afume_ui_sample/ExampleInstrumentedTest.kt b/scents_note_ui_sample/src/androidTest/java/com/scents/scents_note_ui_sample/ExampleInstrumentedTest.kt similarity index 82% rename from afume_ui_sample/src/androidTest/java/com/afume/afume_ui_sample/ExampleInstrumentedTest.kt rename to scents_note_ui_sample/src/androidTest/java/com/scents/scents_note_ui_sample/ExampleInstrumentedTest.kt index 107646e9..c681b03e 100644 --- a/afume_ui_sample/src/androidTest/java/com/afume/afume_ui_sample/ExampleInstrumentedTest.kt +++ b/scents_note_ui_sample/src/androidTest/java/com/scents/scents_note_ui_sample/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.afume.afume_ui_sample +package com.scents.scents_note_ui_sample import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 @@ -19,6 +19,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.afume.afume_ui_sample", appContext.packageName) + assertEquals("com.scents.scents_note_ui_sample", appContext.packageName) } } \ No newline at end of file diff --git a/afume_ui_sample/src/main/AndroidManifest.xml b/scents_note_ui_sample/src/main/AndroidManifest.xml similarity index 69% rename from afume_ui_sample/src/main/AndroidManifest.xml rename to scents_note_ui_sample/src/main/AndroidManifest.xml index 9d511d7c..532a322c 100644 --- a/afume_ui_sample/src/main/AndroidManifest.xml +++ b/scents_note_ui_sample/src/main/AndroidManifest.xml @@ -1,15 +1,15 @@ + package="com.scents.scents_note_ui_sample"> + android:theme="@style/Theme.ScentsNoteAndroid"> @@ -19,7 +19,7 @@ diff --git a/afume_ui_sample/src/main/java/com/afume/afume_ui_sample/MainActivity.kt b/scents_note_ui_sample/src/main/java/com/scents/scents_note_ui_sample/MainActivity.kt similarity index 80% rename from afume_ui_sample/src/main/java/com/afume/afume_ui_sample/MainActivity.kt rename to scents_note_ui_sample/src/main/java/com/scents/scents_note_ui_sample/MainActivity.kt index 4f286d2b..b5ea80da 100644 --- a/afume_ui_sample/src/main/java/com/afume/afume_ui_sample/MainActivity.kt +++ b/scents_note_ui_sample/src/main/java/com/scents/scents_note_ui_sample/MainActivity.kt @@ -1,9 +1,9 @@ -package com.afume.afume_ui_sample +package com.scents.scents_note_ui_sample import android.content.Intent import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import com.afume.afume_ui_sample.selectbox.SelectBoxActivity +import com.scents.scents_note_ui_sample.selectbox.SelectBoxActivity class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/afume_ui_sample/src/main/java/com/afume/afume_ui_sample/common/CommonUtils.kt b/scents_note_ui_sample/src/main/java/com/scents/scents_note_ui_sample/common/CommonUtils.kt similarity index 94% rename from afume_ui_sample/src/main/java/com/afume/afume_ui_sample/common/CommonUtils.kt rename to scents_note_ui_sample/src/main/java/com/scents/scents_note_ui_sample/common/CommonUtils.kt index cbc90a7e..e8df0aa1 100644 --- a/afume_ui_sample/src/main/java/com/afume/afume_ui_sample/common/CommonUtils.kt +++ b/scents_note_ui_sample/src/main/java/com/scents/scents_note_ui_sample/common/CommonUtils.kt @@ -1,4 +1,4 @@ -package com.afume.afume_ui_sample.common +package com.scents.scents_note_ui_sample.common import android.view.ViewGroup import androidx.core.view.children diff --git a/afume_ui_sample/src/main/java/com/afume/afume_ui_sample/selectbox/SelectBoxActivity.kt b/scents_note_ui_sample/src/main/java/com/scents/scents_note_ui_sample/selectbox/SelectBoxActivity.kt similarity index 78% rename from afume_ui_sample/src/main/java/com/afume/afume_ui_sample/selectbox/SelectBoxActivity.kt rename to scents_note_ui_sample/src/main/java/com/scents/scents_note_ui_sample/selectbox/SelectBoxActivity.kt index 8c8b9fa0..0691eed0 100644 --- a/afume_ui_sample/src/main/java/com/afume/afume_ui_sample/selectbox/SelectBoxActivity.kt +++ b/scents_note_ui_sample/src/main/java/com/scents/scents_note_ui_sample/selectbox/SelectBoxActivity.kt @@ -1,11 +1,11 @@ -package com.afume.afume_ui_sample.selectbox +package com.scents.scents_note_ui_sample.selectbox import android.os.Bundle import android.view.ViewGroup import android.widget.CheckedTextView import androidx.appcompat.app.AppCompatActivity -import com.afume.afume_ui_sample.R -import com.afume.afume_ui_sample.common.CommonUtils.findAllViews +import com.scents.scents_note_ui_sample.R +import com.scents.scents_note_ui_sample.common.CommonUtils.findAllViews class SelectBoxActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/afume_ui_sample/src/main/res/drawable/divider.xml b/scents_note_ui_sample/src/main/res/drawable/divider.xml similarity index 100% rename from afume_ui_sample/src/main/res/drawable/divider.xml rename to scents_note_ui_sample/src/main/res/drawable/divider.xml diff --git a/afume_ui_sample/src/main/res/layout/activity_main.xml b/scents_note_ui_sample/src/main/res/layout/activity_main.xml similarity index 100% rename from afume_ui_sample/src/main/res/layout/activity_main.xml rename to scents_note_ui_sample/src/main/res/layout/activity_main.xml diff --git a/afume_ui_sample/src/main/res/layout/activity_select_box.xml b/scents_note_ui_sample/src/main/res/layout/activity_select_box.xml similarity index 85% rename from afume_ui_sample/src/main/res/layout/activity_select_box.xml rename to scents_note_ui_sample/src/main/res/layout/activity_select_box.xml index 328ac6ed..7d9cd90c 100644 --- a/afume_ui_sample/src/main/res/layout/activity_select_box.xml +++ b/scents_note_ui_sample/src/main/res/layout/activity_select_box.xml @@ -23,14 +23,14 @@ android:layout_height="wrap_content" android:orientation="horizontal"> - - - - - - - - - - - - - + scents_note_ui_sample + \ No newline at end of file diff --git a/afume_ui_sample/src/main/res/values/theme.xml b/scents_note_ui_sample/src/main/res/values/theme.xml similarity index 54% rename from afume_ui_sample/src/main/res/values/theme.xml rename to scents_note_ui_sample/src/main/res/values/theme.xml index 4964e4be..0007a00a 100644 --- a/afume_ui_sample/src/main/res/values/theme.xml +++ b/scents_note_ui_sample/src/main/res/values/theme.xml @@ -1,5 +1,5 @@ - \ No newline at end of file diff --git a/afume_ui_sample/src/test/java/com/afume/afume_ui_sample/ExampleUnitTest.kt b/scents_note_ui_sample/src/test/java/com/scents/scents_note_ui_sample/ExampleUnitTest.kt similarity index 88% rename from afume_ui_sample/src/test/java/com/afume/afume_ui_sample/ExampleUnitTest.kt rename to scents_note_ui_sample/src/test/java/com/scents/scents_note_ui_sample/ExampleUnitTest.kt index 80bc34b2..83734bf5 100644 --- a/afume_ui_sample/src/test/java/com/afume/afume_ui_sample/ExampleUnitTest.kt +++ b/scents_note_ui_sample/src/test/java/com/scents/scents_note_ui_sample/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package com.afume.afume_ui_sample +package com.scents.scents_note_ui_sample import org.junit.Test diff --git a/settings.gradle b/settings.gradle index 66ffb332..6d57e491 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ -rootProject.name = "Afume-Android" +rootProject.name = "ScentsNote-Android" include ':app' -include ':afume-ui' -include ':afume_ui_sample' +include ':scents-note-ui' +include ':scents_note_ui_sample'