--- a/app/build.gradle.kts Thu Oct 10 12:04:43 2019 -0700
+++ b/app/build.gradle.kts Thu Oct 10 15:41:42 2019 -0700
@@ -142,7 +142,7 @@
implementation(project(":webapi"))
implementation(project(":faviKonSnoop"))
- implementation("com.google.android.material:material:1.1.0-alpha10")
+ implementation("com.google.android.material:material:1.1.0-beta01")
implementation("com.squareup.okhttp3:logging-interceptor:4.1.0")
testImplementation("com.squareup.okhttp3:mockwebserver:4.1.0")
implementation("io.coil-kt:coil:0.7.0")
--- a/app/src/main/java/com/geekorum/ttrss/articles_list/InAppUpdatePresenter.kt Thu Oct 10 12:04:43 2019 -0700
+++ b/app/src/main/java/com/geekorum/ttrss/articles_list/InAppUpdatePresenter.kt Thu Oct 10 15:41:42 2019 -0700
@@ -101,7 +101,7 @@
behavior.state = BottomSheetBehavior.STATE_EXPANDED
// wait for expanded state to set non hideable
- behavior.bottomSheetCallback = object : BottomSheetBehavior.BottomSheetCallback() {
+ behavior.addBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() {
override fun onSlide(bottomSheet: View, slideOffset: Float) {
// nothing to do
}
@@ -109,10 +109,10 @@
override fun onStateChanged(bottomSheet: View, newState: Int) {
if (newState == BottomSheetBehavior.STATE_EXPANDED) {
behavior.isHideable = false
- behavior.bottomSheetCallback = null
+ behavior.removeBottomSheetCallback(this)
}
}
- }
+ })
(bannerContainer.parent as? View)?.doOnNextLayout {
val fragmentContainerView = activity.findViewById<View>(R.id.middle_pane_layout)
--- a/app/src/main/res/layout-w800dp/activity_login_account.xml Thu Oct 10 12:04:43 2019 -0700
+++ b/app/src/main/res/layout-w800dp/activity_login_account.xml Thu Oct 10 15:41:42 2019 -0700
@@ -54,9 +54,7 @@
</com.google.android.material.appbar.AppBarLayout>
- <!-- not a MaterialCardView because they can't have databinding included view
- Bug: https://issuetracker.google.com/issues/134379499 -->
- <androidx.cardview.widget.CardView
+ <com.google.android.material.card.MaterialCardView
android:layout_width="560dp"
android:layout_height="match_parent"
app:layout_constraintStart_toStartOf="parent"
@@ -68,7 +66,7 @@
<include android:id="@+id/form" layout="@layout/include_form_login"
app:viewModel="@{viewModel}"/>
- </androidx.cardview.widget.CardView>
+ </com.google.android.material.card.MaterialCardView>
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>