From db17809e5c72214901749e13768c8015d5039764 Mon Sep 17 00:00:00 2001 From: hyojin Date: Sat, 27 Jul 2024 01:10:34 +0900 Subject: [PATCH] fix : target sdk update and library version update --- app/build.gradle.kts | 7 +-- app/src/dev/AndroidManifest.xml | 3 +- app/src/main/AndroidManifest.xml | 3 +- build.gradle.kts | 4 +- buildSrc/build.gradle.kts | 2 +- buildSrc/src/main/kotlin/AndroidConfig.kt | 8 +-- buildSrc/src/main/kotlin/Dependencies.kt | 4 +- buildSrc/src/main/kotlin/Versions.kt | 16 +++--- core/build.gradle.kts | 3 +- core/src/main/AndroidManifest.xml | 2 +- .../hjiee/core/event/SingleContentEvent.kt | 15 ------ .../java/com/hjiee/core/ext/Extensions.kt | 6 +-- .../com/hjiee/core/manager/VersionManager.kt | 2 +- .../com/hjiee/core/util/log/CrashlyticsLog.kt | 2 +- .../main/java/com/hjiee/core/util/log/L.kt | 2 +- data/build.gradle.kts | 3 +- data/src/main/AndroidManifest.xml | 2 +- .../com/hjiee/data/di/AuthenticatorModule.kt | 2 +- .../com/hjiee/data/di/InterceptorModule.kt | 2 +- .../java/com/hjiee/data/di/NetworkModule.kt | 2 +- domain/build.gradle.kts | 3 +- domain/src/main/AndroidManifest.xml | 3 +- gradle.properties | 3 +- gradle/wrapper/gradle-wrapper.properties | 4 +- presentation/build.gradle.kts | 8 +-- presentation/src/main/AndroidManifest.xml | 4 +- .../ui/common/filter/AromaProvider.kt | 2 +- .../ui/common/filter/FilterStringProvider.kt | 2 +- .../ui/common/filter/StyleProvider.kt | 2 +- .../detail/view/BeerDetailStringProvider.kt | 2 +- .../ui/filter/style/view/StyleActivity.kt | 52 +++++++++---------- .../ui/login/view/LoginStringProvider.kt | 4 +- .../mypage/setting/view/SettingActivity.kt | 8 +-- .../setting/view/SettingStringProvider.kt | 2 +- .../presentation/ui/main/view/MainActivity.kt | 2 +- .../ui/webview/view/WebViewActivity.kt | 3 +- .../hjiee/presentation/util/ext/ContextExt.kt | 2 +- .../hjiee/presentation/util/sort/SortType.kt | 2 +- .../main/res/layout/activity_filter_style.xml | 26 +++++----- 39 files changed, 100 insertions(+), 124 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 1fee4e96..8bbc3c2d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -14,7 +14,6 @@ plugins { id("com.google.firebase.crashlytics") id("dagger.hilt.android.plugin") kotlin("android") - kotlin("android.extensions") kotlin("kapt") id("androidx.navigation.safeargs.kotlin") id("com.google.android.gms.oss-licenses-plugin") @@ -90,10 +89,8 @@ android { multiDexEnabled = true } } + namespace = "com.ddd4.synesthesia.beer" - androidExtensions { - isExperimental = true - } hilt { enableAggregatingTask = ENABLE_AGGREGATING_TASK } @@ -110,7 +107,7 @@ dependencies { implementation(Libs.TIMBER) implementation(Libs.HILT) kapt(Libs.HILT_ANNOTATION) - implementation(Libs.HILT_VIEWMODEL) +// implementation(Libs.HILT_VIEWMODEL) kapt(Libs.HILT_COMPILER) implementation(Libs.KAKAO) diff --git a/app/src/dev/AndroidManifest.xml b/app/src/dev/AndroidManifest.xml index 888c6c73..0dfeb8f3 100644 --- a/app/src/dev/AndroidManifest.xml +++ b/app/src/dev/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> + xmlns:tools="http://schemas.android.com/tools"> diff --git a/build.gradle.kts b/build.gradle.kts index 185de3bf..250620b2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,7 +2,7 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { @@ -19,7 +19,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() maven { setUrl("https://devrepo.kakao.com/nexus/content/groups/public/") } maven { setUrl("https://jitpack.io") } } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index c39a297b..b22ed732 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -3,5 +3,5 @@ plugins { } repositories { - jcenter() + mavenCentral() } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/AndroidConfig.kt b/buildSrc/src/main/kotlin/AndroidConfig.kt index 81f6f3aa..186ee3a6 100644 --- a/buildSrc/src/main/kotlin/AndroidConfig.kt +++ b/buildSrc/src/main/kotlin/AndroidConfig.kt @@ -1,16 +1,16 @@ import org.gradle.api.JavaVersion object AndroidConfig { - const val COMPILE_SDK_VERSION = 31 + const val COMPILE_SDK_VERSION = 35 const val MIN_SDK_VERSION = 23 - const val TARGET_SDK_VERSION = 30 + const val TARGET_SDK_VERSION = 35 const val VERSION_CODE = 11 const val VERSION_NAME = "2.0.0" - const val BUILD_TOOLS_VERSION = "30.0.3" + const val BUILD_TOOLS_VERSION = "34.0.0" const val APPLICATION_ID = "com.ddd4.synesthesia.beer" const val TEST_INSTRUMENTATION_RUNNER = "androidx.test.runner.AndroidJUnitRunner" - val JAVA_VERSION = JavaVersion.VERSION_11 + val JAVA_VERSION = JavaVersion.VERSION_17 } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index cc2a2712..38c0d96c 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -53,8 +53,8 @@ object Libs { "com.google.android.gms:play-services-oss-licenses:${Versions.OSS_LICENSES}" // - const val SNAP_RECYCLERVIEW = - "com.yarolegovich:discrete-scrollview:${Versions.SNAP_RECYCLERVIEW}" +// const val SNAP_RECYCLERVIEW = +// "com.yarolegovich:discrete-scrollview:${Versions.SNAP_RECYCLERVIEW}" const val LOTTIE = "com.airbnb.android:lottie:${Versions.LOTTIE}" } diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 09b2f565..89e01391 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,7 +1,7 @@ object Versions { // Kotlin - const val GRADLE = "7.1.1" - const val KOTLIN = "1.4.10" + const val GRADLE = "8.4.0" + const val KOTLIN = "1.9.0" const val COROUTINES = "1.3.7" // Android Framework @@ -10,30 +10,30 @@ object Versions { const val COORDINATOR_LAYOUT = "1.1.0" const val RECYCLER_VIEW = "1.1.0" const val MATERIAL = "1.2.0" - const val BILLING = "5.0.0" + const val BILLING = "7.0.0" const val CORE_KTX = "1.3.0" const val ACTIVITY_KTX = "1.1.0" const val FRAGMENT_KTX = "1.2.4" const val LIFECYCLE = "2.4.0" - const val NAVIGATION_VERSION = "2.3.5" - const val GOOGLE_SERVIER = "4.3.4" + const val NAVIGATION_VERSION = "2.7.7" + const val GOOGLE_SERVIER = "4.4.2" // ThirdParty Libraries const val RETROFIT = "2.8.2" const val GLIDE = "4.11.0" const val OK_HTTP = "4.7.2" const val GSON = "2.8.6" - const val HILT = "2.40.5" + const val HILT = "2.51.1" const val HILT_EXTENSION = "1.0.0-alpha03" const val TIMBER = "4.7.1" const val KAKAO = "2.0.3" const val RANGE_SEEK_BAR = "3.0.0" const val GOOGLE_BOM = "26.3.0" - const val GOOGLE_CRASHLYTICS = "2.3.0" + const val GOOGLE_CRASHLYTICS = "3.0.2" const val FIREBASE_ANALYTICS = "17.5.0" const val FIREBASE_CRASHLYTICS = "17.2.1" - const val OSS_LICENSES_PLUGIN = "0.10.4" + const val OSS_LICENSES_PLUGIN = "0.10.6" const val OSS_LICENSES = "17.0.0" // diff --git a/core/build.gradle.kts b/core/build.gradle.kts index bfa7b812..a35e4244 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -44,6 +44,7 @@ android { buildFeatures { dataBinding = true } + namespace = "com.hjiee.core" hilt { enableAggregatingTask = ENABLE_AGGREGATING_TASK } @@ -58,7 +59,7 @@ dependencies { implementation(Libs.TIMBER) implementation(Libs.HILT) kapt(Libs.HILT_ANNOTATION) - implementation(Libs.HILT_VIEWMODEL) +// implementation(Libs.HILT_VIEWMODEL) kapt(Libs.HILT_COMPILER) implementation(platform(Libs.FIREBASE)) diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml index e61a71e8..44008a43 100644 --- a/core/src/main/AndroidManifest.xml +++ b/core/src/main/AndroidManifest.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/core/src/main/java/com/hjiee/core/event/SingleContentEvent.kt b/core/src/main/java/com/hjiee/core/event/SingleContentEvent.kt index b5c6b6a8..0eb061d5 100644 --- a/core/src/main/java/com/hjiee/core/event/SingleContentEvent.kt +++ b/core/src/main/java/com/hjiee/core/event/SingleContentEvent.kt @@ -42,19 +42,4 @@ open class SingleContentEvent(private val content: T) { * Returns the content, even if it's already been handled. */ fun peekContent(): T = content -} - -/** - * An [Observer] for [SingleContentEvent]s, simplifying the pattern of checking if the [SingleContentEvent]'s content has - * already been handled. - * - * [onEventUnhandledContent] is *only* called if the [SingleContentEvent]'s contents has not been handled. - */ -class EventObserver(private val onEventUnhandledContent: (T) -> Unit) : - Observer> { - override fun onChanged(singleContentEvent: SingleContentEvent?) { - singleContentEvent?.getContentIfNotHandled()?.let { - onEventUnhandledContent(it) - } - } } \ No newline at end of file diff --git a/core/src/main/java/com/hjiee/core/ext/Extensions.kt b/core/src/main/java/com/hjiee/core/ext/Extensions.kt index 3deb49eb..293fddf8 100644 --- a/core/src/main/java/com/hjiee/core/ext/Extensions.kt +++ b/core/src/main/java/com/hjiee/core/ext/Extensions.kt @@ -44,8 +44,4 @@ fun Boolean?.toggle(): Boolean = this?.not() ?: false /** * string */ -fun String?.orDefault(default: String): String = if (this.isNullOrEmpty()) { - default -} else { - this -} \ No newline at end of file +fun String?.orDefault(default: String): String = this ?: default \ No newline at end of file diff --git a/core/src/main/java/com/hjiee/core/manager/VersionManager.kt b/core/src/main/java/com/hjiee/core/manager/VersionManager.kt index 60a18135..773f792a 100644 --- a/core/src/main/java/com/hjiee/core/manager/VersionManager.kt +++ b/core/src/main/java/com/hjiee/core/manager/VersionManager.kt @@ -17,7 +17,7 @@ class VersionManager @Inject constructor( val version: String get() = try { - context.packageManager.getPackageInfo(context.packageName, 0).versionName + context.packageManager.getPackageInfo(context.packageName, 0).versionName.orEmpty() } catch (e: Exception) { L.e(e) "" diff --git a/core/src/main/java/com/hjiee/core/util/log/CrashlyticsLog.kt b/core/src/main/java/com/hjiee/core/util/log/CrashlyticsLog.kt index eea8b358..b684e094 100644 --- a/core/src/main/java/com/hjiee/core/util/log/CrashlyticsLog.kt +++ b/core/src/main/java/com/hjiee/core/util/log/CrashlyticsLog.kt @@ -1,8 +1,8 @@ package com.hjiee.core.util.log import com.google.firebase.crashlytics.ktx.crashlytics +import com.google.firebase.ktx.BuildConfig import com.google.firebase.ktx.Firebase -import com.hjiee.core.BuildConfig object CrashlyticsLog { diff --git a/core/src/main/java/com/hjiee/core/util/log/L.kt b/core/src/main/java/com/hjiee/core/util/log/L.kt index d4accb6c..2b6de26e 100644 --- a/core/src/main/java/com/hjiee/core/util/log/L.kt +++ b/core/src/main/java/com/hjiee/core/util/log/L.kt @@ -1,6 +1,6 @@ package com.hjiee.core.util.log -import com.hjiee.core.BuildConfig +import com.google.firebase.ktx.BuildConfig import com.hjiee.core.util.log.timber.CrashlyticsTree import timber.log.Timber diff --git a/data/build.gradle.kts b/data/build.gradle.kts index e462bf0c..c8ac0c3d 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -40,6 +40,7 @@ android { dimension = "mode" } } + namespace = "com.hjiee.data" hilt { enableAggregatingTask = ENABLE_AGGREGATING_TASK } @@ -63,7 +64,7 @@ dependencies { implementation(Libs.HILT) kapt(Libs.HILT_ANNOTATION) - implementation(Libs.HILT_VIEWMODEL) +// implementation(Libs.HILT_VIEWMODEL) kapt(Libs.HILT_COMPILER) implementation(Libs.KAKAO) diff --git a/data/src/main/AndroidManifest.xml b/data/src/main/AndroidManifest.xml index 862f19e4..44008a43 100644 --- a/data/src/main/AndroidManifest.xml +++ b/data/src/main/AndroidManifest.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/data/src/main/java/com/hjiee/data/di/AuthenticatorModule.kt b/data/src/main/java/com/hjiee/data/di/AuthenticatorModule.kt index f9f7aa69..9751edf2 100644 --- a/data/src/main/java/com/hjiee/data/di/AuthenticatorModule.kt +++ b/data/src/main/java/com/hjiee/data/di/AuthenticatorModule.kt @@ -56,7 +56,7 @@ object AuthenticatorModule { @Named(PROVIDE_NAME_AUTHENTICATOR_OKHTTP) okHttp: OkHttpClient ): BeerApi { return Retrofit.Builder() - .baseUrl(stringProvider.getStringRes(R.string.base_url)) + .baseUrl(stringProvider.getStringRes(com.hjiee.domain.R.string.base_url)) .addConverterFactory(GsonConverterFactory.create()) .client(okHttp) .build() diff --git a/data/src/main/java/com/hjiee/data/di/InterceptorModule.kt b/data/src/main/java/com/hjiee/data/di/InterceptorModule.kt index 0522d6c6..34908b58 100644 --- a/data/src/main/java/com/hjiee/data/di/InterceptorModule.kt +++ b/data/src/main/java/com/hjiee/data/di/InterceptorModule.kt @@ -1,9 +1,9 @@ package com.hjiee.data.di -import com.hjiee.core.BuildConfig import com.hjiee.core.manager.VersionManager import com.hjiee.core.provider.SharedPreferenceProvider import com.hjiee.data.authentication.AuthenticationInterceptor +import com.kakao.sdk.auth.BuildConfig import dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/data/src/main/java/com/hjiee/data/di/NetworkModule.kt b/data/src/main/java/com/hjiee/data/di/NetworkModule.kt index 9a4a3955..e4fce3be 100644 --- a/data/src/main/java/com/hjiee/data/di/NetworkModule.kt +++ b/data/src/main/java/com/hjiee/data/di/NetworkModule.kt @@ -56,7 +56,7 @@ object NetworkModule { @Named(PROVIDE_NAME_OKHTTP) okHttp: OkHttpClient ): Retrofit { return Retrofit.Builder() - .baseUrl(stringProvider.getStringRes(R.string.base_url)) + .baseUrl(stringProvider.getStringRes(com.hjiee.domain.R.string.base_url)) .addConverterFactory(GsonConverterFactory.create()) .client(okHttp) .build() diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts index b4a7bc56..c1a81354 100644 --- a/domain/build.gradle.kts +++ b/domain/build.gradle.kts @@ -44,6 +44,7 @@ android { dimension = "mode" } } + namespace = "com.hjiee.domain" hilt { enableAggregatingTask = ENABLE_AGGREGATING_TASK } @@ -57,7 +58,7 @@ dependencies { implementation(Libs.GSON) implementation(Libs.HILT) kapt(Libs.HILT_ANNOTATION) - implementation(Libs.HILT_VIEWMODEL) +// implementation(Libs.HILT_VIEWMODEL) kapt(Libs.HILT_COMPILER) // implementation("androidx.core:core-ktx:1.3.2") diff --git a/domain/src/main/AndroidManifest.xml b/domain/src/main/AndroidManifest.xml index 20c4841d..294dbaa3 100644 --- a/domain/src/main/AndroidManifest.xml +++ b/domain/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 4d15d015..a28f6c58 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,4 +18,5 @@ android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=true # Kotlin code style for this project: "official" or "obsolete": -kotlin.code.style=official \ No newline at end of file +kotlin.code.style=official +android.suppressUnsupportedCompileSdk=35 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ff0935e7..d2210521 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Nov 16 20:13:08 KST 2020 +#Fri Jul 26 22:19:31 KST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip diff --git a/presentation/build.gradle.kts b/presentation/build.gradle.kts index 9578c70b..895ffd86 100644 --- a/presentation/build.gradle.kts +++ b/presentation/build.gradle.kts @@ -5,7 +5,6 @@ plugins { id("com.android.library") id("org.jetbrains.kotlin.android") id("dagger.hilt.android.plugin") - kotlin("android.extensions") kotlin("kapt") id("androidx.navigation.safeargs.kotlin") } @@ -15,7 +14,7 @@ android { defaultConfig { minSdk = AndroidConfig.MIN_SDK_VERSION - targetSdk = AndroidConfig.TARGET_SDK_VERSION + testOptions.targetSdk = AndroidConfig.TARGET_SDK_VERSION manifestPlaceholders[KAKAO] = getKakaoKey() @@ -57,6 +56,7 @@ android { kotlinOptions { jvmTarget = AndroidConfig.JAVA_VERSION.toString() } + namespace = "com.hjiee.presentation" } dependencies { @@ -95,14 +95,14 @@ dependencies { implementation(Libs.TIMBER) implementation(Libs.HILT) kapt(Libs.HILT_ANNOTATION) - implementation(Libs.HILT_VIEWMODEL) +// implementation(Libs.HILT_VIEWMODEL) kapt(Libs.HILT_COMPILER) implementation(Libs.KAKAO) implementation(Libs.RANGE_SEEK_BAR) implementation(Libs.LICENSES) - implementation(Libs.SNAP_RECYCLERVIEW) +// implementation(Libs.SNAP_RECYCLERVIEW) implementation(Libs.LOTTIE) testImplementation(TestLibs.JUNIT) diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml index 357a9ea7..2c713aba 100644 --- a/presentation/src/main/AndroidManifest.xml +++ b/presentation/src/main/AndroidManifest.xml @@ -1,12 +1,12 @@ + xmlns:tools="http://schemas.android.com/tools"> diff --git a/presentation/src/main/java/com/hjiee/presentation/ui/common/filter/AromaProvider.kt b/presentation/src/main/java/com/hjiee/presentation/ui/common/filter/AromaProvider.kt index d379b299..dd3ada9e 100644 --- a/presentation/src/main/java/com/hjiee/presentation/ui/common/filter/AromaProvider.kt +++ b/presentation/src/main/java/com/hjiee/presentation/ui/common/filter/AromaProvider.kt @@ -44,7 +44,7 @@ class AromaProvider @Inject constructor( value: List? ) { preference.setValue(KEY_EXTRA_FILTER_AROMA, Gson().toJson(value)) - channel.offer(value) + channel.trySend(value) } override fun getValue( diff --git a/presentation/src/main/java/com/hjiee/presentation/ui/common/filter/FilterStringProvider.kt b/presentation/src/main/java/com/hjiee/presentation/ui/common/filter/FilterStringProvider.kt index 683db1b7..0eed44e6 100644 --- a/presentation/src/main/java/com/hjiee/presentation/ui/common/filter/FilterStringProvider.kt +++ b/presentation/src/main/java/com/hjiee/presentation/ui/common/filter/FilterStringProvider.kt @@ -31,7 +31,7 @@ class FilterStringProvider @Inject constructor( } } - fun getErrorMessage() = getStringRes(R.string.error_message) + fun getErrorMessage() = getStringRes(com.hjiee.core.R.string.error_message) override fun getStringRes(resId: Int): String { return context.getString(resId) diff --git a/presentation/src/main/java/com/hjiee/presentation/ui/common/filter/StyleProvider.kt b/presentation/src/main/java/com/hjiee/presentation/ui/common/filter/StyleProvider.kt index a195fec0..9b651392 100644 --- a/presentation/src/main/java/com/hjiee/presentation/ui/common/filter/StyleProvider.kt +++ b/presentation/src/main/java/com/hjiee/presentation/ui/common/filter/StyleProvider.kt @@ -43,7 +43,7 @@ class StyleProvider @Inject constructor( value: List? ) { preference.setValue(KEY_EXTRA_FILTER_STYLE, Gson().toJson(value)) - channel.offer(value) + channel.trySend(value) } override fun getValue(thisRef: Any, property: KProperty<*>): List { diff --git a/presentation/src/main/java/com/hjiee/presentation/ui/detail/view/BeerDetailStringProvider.kt b/presentation/src/main/java/com/hjiee/presentation/ui/detail/view/BeerDetailStringProvider.kt index 987d8c62..114e7323 100644 --- a/presentation/src/main/java/com/hjiee/presentation/ui/detail/view/BeerDetailStringProvider.kt +++ b/presentation/src/main/java/com/hjiee/presentation/ui/detail/view/BeerDetailStringProvider.kt @@ -9,7 +9,7 @@ class BeerDetailStringProvider @Inject constructor( private val context: Context ) : IStringResourceProvider { - fun getError(): String = getStringRes(R.string.error_message) + fun getError(): String = getStringRes(com.hjiee.core.R.string.error_message) fun getDeleteMessage(): String = getStringRes(R.string.success_deleted_review) diff --git a/presentation/src/main/java/com/hjiee/presentation/ui/filter/style/view/StyleActivity.kt b/presentation/src/main/java/com/hjiee/presentation/ui/filter/style/view/StyleActivity.kt index 9f3bba2c..93306f61 100644 --- a/presentation/src/main/java/com/hjiee/presentation/ui/filter/style/view/StyleActivity.kt +++ b/presentation/src/main/java/com/hjiee/presentation/ui/filter/style/view/StyleActivity.kt @@ -20,13 +20,11 @@ import com.hjiee.presentation.util.ext.showToast import com.google.android.material.tabs.TabLayout import com.hjiee.core.event.entity.ActionEntity import com.hjiee.core.event.entity.ItemClickEntity -import com.yarolegovich.discretescrollview.DiscreteScrollView -import com.yarolegovich.discretescrollview.transform.ScaleTransformer import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint class StyleActivity : BaseActivity(R.layout.activity_filter_style), - DiscreteScrollView.OnItemChangedListener, +// DiscreteScrollView.OnItemChangedListener, TabLayout.OnTabSelectedListener { private var isFirstStart = true @@ -45,18 +43,18 @@ class StyleActivity : BaseActivity(R.layout.activity override fun initBind() { binding.apply { viewModel = this@StyleActivity.viewModel - with(rvFilterMiddleCategory) { - adapter = middleCategoryListAdapter - lifecycleOwner = this@StyleActivity - addOnItemChangedListener(this@StyleActivity) - setItemTransformer( - ScaleTransformer.Builder() - .setMinScale(0.7f) - .build() - ) - setOffscreenItems(3) - scrollToPosition(0) - } +// with(rvFilterMiddleCategory) { +// adapter = middleCategoryListAdapter +// lifecycleOwner = this@StyleActivity +// addOnItemChangedListener(this@StyleActivity) +// setItemTransformer( +// ScaleTransformer.Builder() +// .setMinScale(0.7f) +// .build() +// ) +// setOffscreenItems(3) +// scrollToPosition(0) +// } with(rvFilterStyleSmall) { adapter = smallCategoryListAdapter lifecycleOwner = this@StyleActivity @@ -100,9 +98,9 @@ class StyleActivity : BaseActivity(R.layout.activity is StyleActionEntity.UpdateMiddle -> { middleCategoryListAdapter.clear() middleCategoryListAdapter.addAll(entity.style, true) - binding.rvFilterMiddleCategory.run { - post { scrollToPosition(0) } - } +// binding.rvFilterMiddleCategory.run { +// post { scrollToPosition(0) } +// } } is StyleActionEntity.UpdateSmall -> { smallCategoryListAdapter.clear() @@ -146,15 +144,15 @@ class StyleActivity : BaseActivity(R.layout.activity } } - override fun onCurrentItemChanged( - viewHolder: StyleMiddleItemViewHolder?, - adapterPosition: Int - ) { - if (!isFirstStart) { - viewModel.selectMiddleCategory(adapterPosition) - } - isFirstStart = false - } +// override fun onCurrentItemChanged( +// viewHolder: StyleMiddleItemViewHolder?, +// adapterPosition: Int +// ) { +// if (!isFirstStart) { +// viewModel.selectMiddleCategory(adapterPosition) +// } +// isFirstStart = false +// } companion object { const val REQ_CODE_FILTER = 30 diff --git a/presentation/src/main/java/com/hjiee/presentation/ui/login/view/LoginStringProvider.kt b/presentation/src/main/java/com/hjiee/presentation/ui/login/view/LoginStringProvider.kt index 14178089..8f62237b 100644 --- a/presentation/src/main/java/com/hjiee/presentation/ui/login/view/LoginStringProvider.kt +++ b/presentation/src/main/java/com/hjiee/presentation/ui/login/view/LoginStringProvider.kt @@ -19,8 +19,8 @@ class LoginStringProvider @Inject constructor( HtmlCompat.fromHtml( String.format( getStringRes(R.string.login_notice), - preference.getPreferenceString(getStringRes(R.string.terms_of_use)), - preference.getPreferenceString(getStringRes(R.string.privacy_policy)) + preference.getPreferenceString(getStringRes(com.hjiee.core.R.string.terms_of_use)), + preference.getPreferenceString(getStringRes(com.hjiee.core.R.string.privacy_policy)) ), HtmlCompat.FROM_HTML_MODE_LEGACY ) diff --git a/presentation/src/main/java/com/hjiee/presentation/ui/main/mypage/setting/view/SettingActivity.kt b/presentation/src/main/java/com/hjiee/presentation/ui/main/mypage/setting/view/SettingActivity.kt index 998f2982..6c56442e 100644 --- a/presentation/src/main/java/com/hjiee/presentation/ui/main/mypage/setting/view/SettingActivity.kt +++ b/presentation/src/main/java/com/hjiee/presentation/ui/main/mypage/setting/view/SettingActivity.kt @@ -158,7 +158,7 @@ class SettingActivity : start( WebViewActivity.getIntent( context = this, - url = preference.getPreferenceString(getString(R.string.terms_of_use)) + url = preference.getPreferenceString(getString(com.hjiee.core.R.string.terms_of_use)) ) ) } @@ -170,7 +170,7 @@ class SettingActivity : start( WebViewActivity.getIntent( context = this, - url = preference.getPreferenceString(getString(R.string.privacy_policy)) + url = preference.getPreferenceString(getString(com.hjiee.core.R.string.privacy_policy)) ) ) } @@ -182,7 +182,7 @@ class SettingActivity : start( WebViewActivity.getIntent( context = this, - url = preference.getPreferenceString(getString(R.string.notice)) + url = preference.getPreferenceString(getString(com.hjiee.core.R.string.notice)) ) ) } @@ -205,7 +205,7 @@ class SettingActivity : start( WebViewActivity.getIntent( context = this, - url = preference.getPreferenceString(getString(R.string.release_note)) + url = preference.getPreferenceString(getString(com.hjiee.core.R.string.release_note)) ) ) } diff --git a/presentation/src/main/java/com/hjiee/presentation/ui/main/mypage/setting/view/SettingStringProvider.kt b/presentation/src/main/java/com/hjiee/presentation/ui/main/mypage/setting/view/SettingStringProvider.kt index b15e0393..7ce5cf03 100644 --- a/presentation/src/main/java/com/hjiee/presentation/ui/main/mypage/setting/view/SettingStringProvider.kt +++ b/presentation/src/main/java/com/hjiee/presentation/ui/main/mypage/setting/view/SettingStringProvider.kt @@ -9,7 +9,7 @@ class SettingStringProvider @Inject constructor( private val context: Context ) : IStringResourceProvider { - fun getError() = getStringRes(R.string.error_message) + fun getError() = getStringRes(com.hjiee.core.R.string.error_message) val selectedTheme get() = context.resources.getStringArray(R.array.theme_list) diff --git a/presentation/src/main/java/com/hjiee/presentation/ui/main/view/MainActivity.kt b/presentation/src/main/java/com/hjiee/presentation/ui/main/view/MainActivity.kt index c9443788..ec6118a7 100644 --- a/presentation/src/main/java/com/hjiee/presentation/ui/main/view/MainActivity.kt +++ b/presentation/src/main/java/com/hjiee/presentation/ui/main/view/MainActivity.kt @@ -40,7 +40,7 @@ class MainActivity : BaseActivity(R.layout.activity_main) { } R.id.nav_search, R.id.nav_mypage -> { - binding.navBottomView.selectedItemId = graph.startDestination + binding.navBottomView.selectedItemId = graph.startDestinationId } else -> { // do nothing diff --git a/presentation/src/main/java/com/hjiee/presentation/ui/webview/view/WebViewActivity.kt b/presentation/src/main/java/com/hjiee/presentation/ui/webview/view/WebViewActivity.kt index 5d899b4b..86c642ee 100644 --- a/presentation/src/main/java/com/hjiee/presentation/ui/webview/view/WebViewActivity.kt +++ b/presentation/src/main/java/com/hjiee/presentation/ui/webview/view/WebViewActivity.kt @@ -13,7 +13,6 @@ import com.hjiee.presentation.ui.webview.CustomWebViewClient import com.hjiee.presentation.ui.webview.model.WebViewActionEntity import com.hjiee.core.event.ActionEventNotifier import com.hjiee.core.event.entity.ActionEntity -import kotlinx.android.synthetic.main.activity_webview.* class WebViewActivity : BaseActivity(R.layout.activity_webview), @@ -49,7 +48,7 @@ class WebViewActivity : BaseActivity(R.layout.activity_w override fun onBackPressed() { when (binding.webview.canGoBack()) { true -> { - webview.goBack() + binding.webview.goBack() } false -> { finish() diff --git a/presentation/src/main/java/com/hjiee/presentation/util/ext/ContextExt.kt b/presentation/src/main/java/com/hjiee/presentation/util/ext/ContextExt.kt index 5771b30f..73893c57 100644 --- a/presentation/src/main/java/com/hjiee/presentation/util/ext/ContextExt.kt +++ b/presentation/src/main/java/com/hjiee/presentation/util/ext/ContextExt.kt @@ -57,7 +57,7 @@ fun Context.showToast(message: String, duration: Int? = null) { } fun Context.showSimpleDialog( - title: String? = getString(R.string.app_name), + title: String? = getString(com.jaygoo.widget.R.string.app_name), message: String, result: (() -> Unit)? = null ) { diff --git a/presentation/src/main/java/com/hjiee/presentation/util/sort/SortType.kt b/presentation/src/main/java/com/hjiee/presentation/util/sort/SortType.kt index b0cf1093..ff936a82 100644 --- a/presentation/src/main/java/com/hjiee/presentation/util/sort/SortType.kt +++ b/presentation/src/main/java/com/hjiee/presentation/util/sort/SortType.kt @@ -32,7 +32,7 @@ class SortImpl(val preference: SharedPreferenceProvider, context: Context) : Sor override fun setValue(thisRef: Any, property: KProperty<*>, value: SortType) { preference.setValue(key, value.toString()) - channel.offer(value) + channel.trySend(value) } override fun getValue(thisRef: Any, property: KProperty<*>): SortType = getDefaultValue() diff --git a/presentation/src/main/res/layout/activity_filter_style.xml b/presentation/src/main/res/layout/activity_filter_style.xml index 5ea7c6e9..3ebe6b5b 100644 --- a/presentation/src/main/res/layout/activity_filter_style.xml +++ b/presentation/src/main/res/layout/activity_filter_style.xml @@ -117,19 +117,19 @@ android:paddingTop="16dp" app:layout_scrollFlags="scroll"> - + + + + + + + + + + + + +