From 05d29f4cfd0d6af91ff33d110a5ed70efb27337a Mon Sep 17 00:00:00 2001 From: tarsin Date: Mon, 18 Jul 2022 20:19:09 +0800 Subject: [PATCH] Update dependencies --- app/build.gradle | 60 ++++++++++++++++--- .../com/hippo/ehviewer/widget/SearchLayout.kt | 2 +- 2 files changed, 53 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b40e7288a..f79467391 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -92,16 +92,60 @@ tasks.withType(JavaCompile) { } dependencies { - implementation 'androidx.activity:activity:1.6.0-alpha05' - implementation 'androidx.appcompat:appcompat:1.6.0-alpha05' - implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha04' - implementation 'androidx.browser:browser:1.4.0' - implementation 'androidx.fragment:fragment:1.5.0' - implementation "androidx.lifecycle:lifecycle-process:2.5.0" + def activity_version = "1.6.0-alpha05" + implementation "androidx.activity:activity:$activity_version" + implementation "androidx.activity:activity-ktx:$activity_version" + + implementation "androidx.annotation:annotation:1.4.0" + implementation "androidx.annotation:annotation-experimental:1.2.0" + implementation "androidx.appcompat:appcompat:1.6.0-alpha05" + + def arch_core_version = "2.1.0" + implementation "androidx.arch.core:core-common:$arch_core_version" + implementation "androidx.arch.core:core-runtime:$arch_core_version" + + implementation "androidx.biometric:biometric-ktx:1.2.0-alpha04" + implementation "androidx.browser:browser:1.4.0" + + def collection_version = "1.3.0-alpha01" + implementation "androidx.collection:collection:$collection_version" + implementation "androidx.collection:collection-ktx:$collection_version" + + implementation "androidx.constraintlayout:constraintlayout:2.2.0-alpha03" + implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0" + + def core_version = "1.9.0-alpha05" + implementation "androidx.core:core:$core_version" + implementation "androidx.core:core-ktx:$core_version" + + implementation "androidx.customview:customview:1.2.0-alpha01" + implementation "androidx.documentfile:documentfile:1.1.0-alpha01" + implementation "androidx.dynamicanimation:dynamicanimation:1.1.0-alpha03" + + def fragment_version = "1.5.0" + implementation "androidx.fragment:fragment:$fragment_version" + implementation "androidx.fragment:fragment-ktx:$fragment_version" + + def lifecycle_version = "2.6.0-alpha01" + implementation "androidx.lifecycle:lifecycle-livedata:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-livedata-core-ktx:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-process:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycle_version" + + implementation "androidx.loader:loader:1.1.0" implementation 'androidx.preference:preference:1.2.0' - implementation 'androidx.recyclerview:recyclerview:1.2.1' + implementation 'androidx.recyclerview:recyclerview:1.3.0-beta01' + implementation 'androidx.startup:startup-runtime:1.2.0-alpha01' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01' - implementation 'androidx.webkit:webkit:1.4.0' + implementation "androidx.transition:transition-ktx:1.4.1" + implementation "androidx.vectordrawable:vectordrawable:1.2.0-beta01" + implementation "androidx.vectordrawable:vectordrawable-animated:1.1.0" + implementation 'androidx.viewpager:viewpager:1.1.0-alpha01' + implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01' + implementation 'androidx.webkit:webkit:1.5.0-beta01' + implementation 'com.drakeet.drawer:drawer:1.0.3' implementation 'com.google.android.material:material:1.7.0-alpha03' implementation 'com.getkeepsafe.taptargetview:taptargetview:1.13.3' diff --git a/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.kt b/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.kt index 293a18a88..6e51c5d9b 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.kt +++ b/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.kt @@ -249,7 +249,7 @@ class SearchLayout @JvmOverloads constructor( fun onSelectImage() } - internal class SearchLayoutManager(context: Context?) : LinearLayoutManager(context) { + internal class SearchLayoutManager(context: Context?) : LinearLayoutManager(context!!) { override fun onLayoutChildren(recycler: Recycler, state: State) { try { super.onLayoutChildren(recycler, state)