From cc698cc82d3e098c8953b75bd74f9964710e16c7 Mon Sep 17 00:00:00 2001 From: Koitharu Date: Sat, 11 Mar 2023 08:38:31 +0200 Subject: [PATCH] Update AndroidX dependencies --- app/build.gradle | 14 ++++++-------- .../base/ui/util/ReversibleActionObserver.kt | 2 +- .../core/exceptions/resolve/ErrorObserver.kt | 2 +- .../koitharu/kotatsu/details/ui/DetailsActivity.kt | 2 +- .../kotatsu/reader/ui/pager/PageHolderDelegate.kt | 2 +- .../org/koitharu/kotatsu/utils/ext/FragmentExt.kt | 4 ++-- .../org/koitharu/kotatsu/utils/ext/ViewModel.kt | 6 ++++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index edcbe2105..44d2a9aab 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -55,11 +55,9 @@ android { '-opt-in=kotlinx.coroutines.FlowPreview', '-opt-in=kotlin.contracts.ExperimentalContracts', '-opt-in=coil.annotation.ExperimentalCoilApi', - '-opt-in=com.google.android.material.badge.ExperimentalBadgeUtils', ] } lint { - abortOnError false disable 'MissingTranslation', 'PrivateResource', 'NotifyDataSetChanged' } testOptions { @@ -90,20 +88,20 @@ dependencies { implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.activity:activity-ktx:1.6.1' implementation 'androidx.fragment:fragment-ktx:1.5.5' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1' - implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1' - implementation 'androidx.lifecycle:lifecycle-service:2.5.1' - implementation 'androidx.lifecycle:lifecycle-process:2.5.1' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.0' + implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.0' + implementation 'androidx.lifecycle:lifecycle-service:2.6.0' + implementation 'androidx.lifecycle:lifecycle-process:2.6.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' - implementation 'androidx.recyclerview:recyclerview:1.2.1' + implementation 'androidx.recyclerview:recyclerview:1.3.0' implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01' implementation 'androidx.preference:preference-ktx:1.2.0' implementation 'androidx.work:work-runtime-ktx:2.8.0' implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha05' implementation 'com.google.android.material:material:1.8.0' //noinspection LifecycleAnnotationProcessorWithJava8 - kapt 'androidx.lifecycle:lifecycle-compiler:2.5.1' + kapt 'androidx.lifecycle:lifecycle-compiler:2.6.0' implementation 'androidx.room:room-runtime:2.5.0' implementation 'androidx.room:room-ktx:2.5.0' diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/util/ReversibleActionObserver.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/util/ReversibleActionObserver.kt index f5191615a..b9af794f5 100644 --- a/app/src/main/java/org/koitharu/kotatsu/base/ui/util/ReversibleActionObserver.kt +++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/util/ReversibleActionObserver.kt @@ -10,7 +10,7 @@ import org.koitharu.kotatsu.utils.ext.findActivity class ReversibleActionObserver( private val snackbarHost: View, -) : Observer { +) : Observer { override fun onChanged(action: ReversibleAction?) { if (action == null) { diff --git a/app/src/main/java/org/koitharu/kotatsu/core/exceptions/resolve/ErrorObserver.kt b/app/src/main/java/org/koitharu/kotatsu/core/exceptions/resolve/ErrorObserver.kt index 214cacdc8..e41b65955 100644 --- a/app/src/main/java/org/koitharu/kotatsu/core/exceptions/resolve/ErrorObserver.kt +++ b/app/src/main/java/org/koitharu/kotatsu/core/exceptions/resolve/ErrorObserver.kt @@ -19,7 +19,7 @@ abstract class ErrorObserver( protected val fragment: Fragment?, private val resolver: ExceptionResolver?, private val onResolved: Consumer?, -) : Observer { +) : Observer { protected val activity = host.context.findActivity() diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt index 7542552dc..8b8cae8f8 100644 --- a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt @@ -310,7 +310,7 @@ class DetailsActivity : private class PrefetchObserver( private val context: Context, - ) : Observer> { + ) : Observer?> { private var isCalled = false diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/PageHolderDelegate.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/PageHolderDelegate.kt index 43b517fff..3c838884e 100644 --- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/PageHolderDelegate.kt +++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/PageHolderDelegate.kt @@ -104,7 +104,7 @@ class PageHolderDelegate( } } - override fun onChanged(t: ReaderSettings?) { + override fun onChanged(t: ReaderSettings) { if (state == State.SHOWN) { callback.onImageShowing(readerSettings) } diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/FragmentExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/FragmentExt.kt index 5ea1fb4af..e154a5b45 100644 --- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/FragmentExt.kt +++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/FragmentExt.kt @@ -9,9 +9,9 @@ import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.Observer import androidx.lifecycle.coroutineScope +import kotlinx.coroutines.suspendCancellableCoroutine import java.io.Serializable import kotlin.coroutines.resume -import kotlinx.coroutines.suspendCancellableCoroutine inline fun T.withArgs(size: Int, block: Bundle.() -> Unit): T { val b = Bundle(size) @@ -48,7 +48,7 @@ fun Fragment.addMenuProvider(provider: MenuProvider) { suspend fun Fragment.awaitViewLifecycle(): LifecycleOwner = suspendCancellableCoroutine { cont -> val liveData = viewLifecycleOwnerLiveData - val observer = object : Observer { + val observer = object : Observer { override fun onChanged(result: LifecycleOwner?) { if (result != null) { liveData.removeObserver(this) diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewModel.kt index 4b73f9503..2dded9f99 100644 --- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewModel.kt +++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewModel.kt @@ -12,22 +12,24 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewmodel.CreationExtras +@Deprecated("Migrate to SavedStateHandle in vm") @MainThread inline fun ComponentActivity.assistedViewModels( noinline viewModelProducer: (SavedStateHandle) -> VM, ): Lazy = viewModels { - object : AbstractSavedStateViewModelFactory(this, intent.extras) { + object : AbstractSavedStateViewModelFactory(this@assistedViewModels, intent.extras) { override fun create(key: String, modelClass: Class, handle: SavedStateHandle): T { return requireNotNull(modelClass.cast(viewModelProducer(handle))) } } } +@Deprecated("Migrate to SavedStateHandle in vm") @MainThread inline fun Fragment.assistedViewModels( noinline viewModelProducer: (SavedStateHandle) -> VM, ): Lazy = viewModels { - object : AbstractSavedStateViewModelFactory(this, arguments) { + object : AbstractSavedStateViewModelFactory(this@assistedViewModels, arguments) { override fun create(key: String, modelClass: Class, handle: SavedStateHandle): T { return requireNotNull(modelClass.cast(viewModelProducer(handle))) }