From 160ebe01d90fd6603bbda824d423cdea7a3891d4 Mon Sep 17 00:00:00 2001 From: arkon Date: Mon, 3 Feb 2020 18:54:24 -0500 Subject: [PATCH] Update to Material Design library 1.1.0 --- app/build.gradle | 2 +- .../kanade/tachiyomi/ui/reader/ReaderColorFilterSheet.kt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ceeed29a34..c84895a129 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -110,7 +110,7 @@ dependencies { // Android support library implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.cardview:cardview:1.0.0' - implementation 'com.google.android.material:material:1.0.0' + implementation 'com.google.android.material:material:1.1.0' implementation 'androidx.recyclerview:recyclerview:1.1.0' implementation 'androidx.preference:preference:1.1.0' implementation 'androidx.annotation:annotation:1.1.0' diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderColorFilterSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderColorFilterSheet.kt index bc1ba74abf..57f88346dc 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderColorFilterSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderColorFilterSheet.kt @@ -30,7 +30,7 @@ class ReaderColorFilterSheet(activity: ReaderActivity) : BottomSheetDialog(activ private val preferences by injectLazy() - private var behavior: BottomSheetBehavior<*>? = null + private var sheetBehavior: BottomSheetBehavior<*>? = null /** * Subscriptions used for this dialog @@ -51,7 +51,7 @@ class ReaderColorFilterSheet(activity: ReaderActivity) : BottomSheetDialog(activ val view = activity.layoutInflater.inflate(R.layout.reader_color_filter_sheet, null) setContentView(view) - behavior = BottomSheetBehavior.from(view.parent as ViewGroup) + sheetBehavior = BottomSheetBehavior.from(view.parent as ViewGroup) // Initialize subscriptions. subscriptions += preferences.colorFilter().asObservable() @@ -138,8 +138,8 @@ class ReaderColorFilterSheet(activity: ReaderActivity) : BottomSheetDialog(activ override fun onStart() { super.onStart() - behavior?.skipCollapsed = true - behavior?.state = BottomSheetBehavior.STATE_EXPANDED + sheetBehavior?.skipCollapsed = true + sheetBehavior?.state = BottomSheetBehavior.STATE_EXPANDED } override fun onDetachedFromWindow() {