diff --git a/app/build.gradle b/app/build.gradle index 8ef12af2..9fb08f08 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -91,8 +91,8 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.1" implementation "androidx.appcompat:appcompat:1.2.0" - implementation "androidx.activity:activity-ktx:1.2.0-rc01" - implementation "androidx.fragment:fragment-ktx:1.3.0-rc02" + implementation "androidx.activity:activity-ktx:1.3.0-alpha02" + implementation "androidx.fragment:fragment-ktx:1.3.0" implementation "androidx.preference:preference-ktx:1.1.1" implementation "androidx.recyclerview:recyclerview:1.1.0" implementation "androidx.constraintlayout:constraintlayout:2.0.4" diff --git a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt index e4801087..43f2c7b7 100644 --- a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt +++ b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt @@ -99,7 +99,7 @@ class MainActivity : initView() - model.query.observe(this) { + model.query.observe(this) { binding.contents.searchview.binding.querySection.searchBarText.run { if (text?.toString() != it) setText(it, TextView.BufferType.EDITABLE) } diff --git a/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt index 879d4c08..c4d5256a 100644 --- a/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt +++ b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt @@ -34,12 +34,10 @@ import com.orhanobut.logger.Logger import com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller import org.kodein.di.DIAware import org.kodein.di.android.di -import org.kodein.di.direct import org.kodein.di.instance import xyz.quaver.pupil.R import xyz.quaver.pupil.adapters.ReaderAdapter import xyz.quaver.pupil.databinding.ReaderActivityBinding -import xyz.quaver.pupil.sources.AnySource import xyz.quaver.pupil.ui.viewmodel.ReaderViewModel import xyz.quaver.pupil.util.Preferences import xyz.quaver.pupil.util.SavedSourceSet