diff options
| author | Allan Wang <me@allanwang.ca> | 2019-09-08 01:25:23 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-08 01:25:23 -0700 |
| commit | c6140c1008b042376bab328780f1686b75a9f839 (patch) | |
| tree | 7a4578d02c9d93f922b721610124d445f7209ed3 /mediapicker | |
| parent | a9407288fad0d30e71e2f6862b66533e043f9311 (diff) | |
| parent | ff2a6237d1412b400644650f12389fefe73480c8 (diff) | |
| download | kau-c6140c1008b042376bab328780f1686b75a9f839.tar.gz kau-c6140c1008b042376bab328780f1686b75a9f839.tar.bz2 kau-c6140c1008b042376bab328780f1686b75a9f839.zip | |
Merge pull request #221 from AllanWang/android-readability
Android readability
Diffstat (limited to 'mediapicker')
| -rw-r--r-- | mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerActivityBase.kt | 5 | ||||
| -rw-r--r-- | mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerCore.kt | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerActivityBase.kt b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerActivityBase.kt index c7cff55..ad83d8a 100644 --- a/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerActivityBase.kt +++ b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerActivityBase.kt @@ -110,11 +110,12 @@ abstract class MediaPickerActivityBase( */ private fun setToolbarScrollable(scrollable: Boolean) { val params = kau_toolbar.layoutParams as AppBarLayout.LayoutParams - if (scrollable) + if (scrollable) { params.scrollFlags = AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS or AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL - else + } else { params.scrollFlags = 0 + } } override fun onLoadFinished(loader: Loader<Cursor>, data: Cursor?) { diff --git a/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerCore.kt b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerCore.kt index 9b8bdfa..68d1121 100644 --- a/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerCore.kt +++ b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerCore.kt @@ -144,9 +144,8 @@ abstract class MediaPickerCore<T : GenericItem>( recycler.apply { val manager = object : GridLayoutManager(context, computeColumnCount(context)) { override fun getExtraLayoutSpace(state: RecyclerView.State?): Int { - return if (mediaType != MediaType.VIDEO) extraSpace else super.getExtraLayoutSpace( - state - ) + return if (mediaType != MediaType.VIDEO) extraSpace + else super.getExtraLayoutSpace(state) } } setItemViewCacheSize(CACHE_SIZE) |