From b1a20f51e07b519b26349fe3a6959e62ebef61f0 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 18 Mar 2017 19:48:03 +0100 Subject: [PATCH] update commons to 2.12.9 --- app/build.gradle | 2 +- .../gallery/views/FastScroller.kt | 124 ------------------ .../main/res/drawable/fastscroller_handle.xml | 15 --- app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/layout/activity_media.xml | 2 +- app/src/main/res/layout/fastscroller.xml | 14 -- .../main/res/layout/item_manage_folder.xml | 4 +- app/src/main/res/values/dimens.xml | 3 - 8 files changed, 5 insertions(+), 161 deletions(-) delete mode 100644 app/src/main/kotlin/com/simplemobiletools/gallery/views/FastScroller.kt delete mode 100644 app/src/main/res/drawable/fastscroller_handle.xml delete mode 100644 app/src/main/res/layout/fastscroller.xml diff --git a/app/build.gradle b/app/build.gradle index ac24c9f53..c29780173 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -32,7 +32,7 @@ android { } dependencies { - compile 'com.simplemobiletools:commons:2.12.7' + compile 'com.simplemobiletools:commons:2.12.9' compile 'com.theartofdev.edmodo:android-image-cropper:2.3.1' compile 'com.bignerdranch.android:recyclerview-multiselect:0.2' compile 'com.google.code.gson:gson:2.8.0' diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/views/FastScroller.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/views/FastScroller.kt deleted file mode 100644 index e949d28d8..000000000 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/views/FastScroller.kt +++ /dev/null @@ -1,124 +0,0 @@ -package com.simplemobiletools.gallery.views - -import android.content.Context -import android.graphics.PorterDuff -import android.support.v4.widget.SwipeRefreshLayout -import android.support.v7.widget.GridLayoutManager -import android.support.v7.widget.RecyclerView -import android.util.AttributeSet -import android.view.LayoutInflater -import android.view.MotionEvent -import android.view.View -import android.widget.LinearLayout -import com.simplemobiletools.gallery.R -import com.simplemobiletools.gallery.extensions.config -import kotlinx.android.synthetic.main.fastscroller.view.* - -// based on https://blog.stylingandroid.com/recyclerview-fastscroll-part-1 -class FastScroller : LinearLayout { - private val handle: View - private var currHeight = 0 - - private val HANDLE_HIDE_DELAY = 1000L - private var recyclerView: RecyclerView? = null - private var swipeRefreshLayout: SwipeRefreshLayout? = null - - constructor(context: Context) : super(context) - - constructor(context: Context, attrs: AttributeSet) : super(context, attrs) - - constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle) - - fun setViews(recyclerView: RecyclerView, swipeRefreshLayout: SwipeRefreshLayout) { - this.recyclerView = recyclerView - this.swipeRefreshLayout = swipeRefreshLayout - handle.background.setColorFilter(context.config.primaryColor, PorterDuff.Mode.SRC_IN) - - recyclerView.setOnScrollListener(object : RecyclerView.OnScrollListener() { - override fun onScrolled(rv: RecyclerView, dx: Int, dy: Int) { - updateHandlePosition() - } - - override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) { - super.onScrollStateChanged(recyclerView, newState) - if (newState == RecyclerView.SCROLL_STATE_DRAGGING) { - showHandle() - } else if (newState == RecyclerView.SCROLL_STATE_IDLE) { - hideHandle() - } - } - }) - } - - override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) { - super.onSizeChanged(w, h, oldw, oldh) - currHeight = h - updateHandlePosition() - } - - private fun updateHandlePosition() { - if (handle.isSelected || recyclerView == null) - return - - val verticalScrollOffset = recyclerView!!.computeVerticalScrollOffset() - val verticalScrollRange = recyclerView!!.computeVerticalScrollRange() - val proportion = verticalScrollOffset.toFloat() / (verticalScrollRange.toFloat() - currHeight) - setPosition(currHeight * proportion) - } - - override fun onTouchEvent(event: MotionEvent): Boolean { - return when (event.action) { - MotionEvent.ACTION_DOWN -> { - showHandle() - handle.isSelected = true - swipeRefreshLayout?.isEnabled = false - true - } - MotionEvent.ACTION_MOVE -> { - setPosition(event.y) - setRecyclerViewPosition(event.y) - true - } - MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> { - hideHandle() - handle.isSelected = false - swipeRefreshLayout?.isEnabled = true - true - } - else -> super.onTouchEvent(event) - } - } - - private fun setRecyclerViewPosition(y: Float) { - if (recyclerView != null) { - val itemCount = recyclerView!!.adapter.itemCount - val proportion = y / currHeight - val targetPos = getValueInRange(0f, (itemCount - 1).toFloat(), proportion * itemCount).toInt() - (recyclerView!!.layoutManager as GridLayoutManager).scrollToPositionWithOffset(targetPos, 0) - } - } - - init { - orientation = LinearLayout.HORIZONTAL - clipChildren = false - val inflater = LayoutInflater.from(context) - inflater.inflate(R.layout.fastscroller, this) - handle = fastscroller_handle - } - - private fun showHandle() { - handle.animate().alpha(1f).startDelay = 0L - } - - private fun hideHandle() { - handle.animate().alpha(0f).startDelay = HANDLE_HIDE_DELAY - } - - private fun setPosition(y: Float) { - val position = y / currHeight - val handleHeight = handle.height - handle.y = getValueInRange(0f, (currHeight - handleHeight).toFloat(), (currHeight - handleHeight) * position) - } - - private fun getValueInRange(min: Float, max: Float, value: Float) = Math.min(Math.max(min, value), max) -} diff --git a/app/src/main/res/drawable/fastscroller_handle.xml b/app/src/main/res/drawable/fastscroller_handle.xml deleted file mode 100644 index e02ea3291..000000000 --- a/app/src/main/res/drawable/fastscroller_handle.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index c19f7a444..8390ab0bc 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -19,7 +19,7 @@ app:layoutManager="android.support.v7.widget.GridLayoutManager" app:spanCount="@integer/directory_columns"/> - - - - - - - diff --git a/app/src/main/res/layout/item_manage_folder.xml b/app/src/main/res/layout/item_manage_folder.xml index 5bb41596d..ac706585a 100644 --- a/app/src/main/res/layout/item_manage_folder.xml +++ b/app/src/main/res/layout/item_manage_folder.xml @@ -19,8 +19,8 @@ 160dp 24dp 50dp - 48dp - 6dp - 40dp