mirror of
https://github.com/tachiyomiorg/tachiyomi.git
synced 2024-12-22 21:11:52 +01:00
Update to Material Design library 1.1.0
This commit is contained in:
parent
3c41a5e910
commit
160ebe01d9
@ -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'
|
||||
|
@ -30,7 +30,7 @@ class ReaderColorFilterSheet(activity: ReaderActivity) : BottomSheetDialog(activ
|
||||
|
||||
private val preferences by injectLazy<PreferencesHelper>()
|
||||
|
||||
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() {
|
||||
|
Loading…
Reference in New Issue
Block a user