PatchesAndForks/FossifyGalleryVisibilityPatch
1
0
Fork 0
forked from Mirrors/FossifyGallery
Code Pull requests Activity

add the fast scroll to directory view too

Browse source
This commit is contained in:
tibbi 2017-03-04 20:26:43 +01:00
parent 084d685993
commit 956ffafe9e
5 changed files with 32 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
View file

@ -64,7 +64,7 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
mIsThirdPartyIntent = mIsPickImageIntent || mIsPickVideoIntent || mIsGetImageContentIntent || mIsGetVideoContentIntent || mIsThirdPartyIntent = mIsPickImageIntent || mIsPickVideoIntent || mIsGetImageContentIntent || mIsGetVideoContentIntent ||
mIsGetAnyContentIntent || mIsSetWallpaperIntent mIsGetAnyContentIntent || mIsSetWallpaperIntent
directories_holder.setOnRefreshListener({ getDirectories() }) directories_refresh_layout.setOnRefreshListener({ getDirectories() })
mDirs = ArrayList<Directory>() mDirs = ArrayList<Directory>()
mStoredAnimateGifs = config.animateGifs mStoredAnimateGifs = config.animateGifs
storeStoragePaths() storeStoragePaths()
@ -107,7 +107,7 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
super.onPause() super.onPause()
mCurrAsyncTask?.shouldStop = true mCurrAsyncTask?.shouldStop = true
storeDirectories() storeDirectories()
directories_holder.isRefreshing = false directories_refresh_layout.isRefreshing = false
mIsGettingDirs = false mIsGettingDirs = false
mStoredAnimateGifs = config.animateGifs mStoredAnimateGifs = config.animateGifs
} }
@ -152,7 +152,7 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
val token = object : TypeToken<List<Directory>>() {}.type val token = object : TypeToken<List<Directory>>() {}.type
val dirs = Gson().fromJson<ArrayList<Directory>>(config.directories, token) ?: ArrayList<Directory>(1) val dirs = Gson().fromJson<ArrayList<Directory>>(config.directories, token) ?: ArrayList<Directory>(1)
if (dirs.size == 0) { if (dirs.size == 0) {
directories_holder.isRefreshing = true directories_refresh_layout.isRefreshing = true
} else { } else {
gotDirectories(dirs) gotDirectories(dirs)
} }
@ -324,7 +324,7 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
} }
fun gotDirectories(dirs: ArrayList<Directory>) { fun gotDirectories(dirs: ArrayList<Directory>) {
directories_holder.isRefreshing = false directories_refresh_layout.isRefreshing = false
mIsGettingDirs = false mIsGettingDirs = false
if (dirs.hashCode() == mDirs.hashCode()) if (dirs.hashCode() == mDirs.hashCode())
@ -347,6 +347,7 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
} }
directories_grid.adapter = adapter directories_grid.adapter = adapter
directories_fastscroller.setViews(directories_grid, directories_refresh_layout)
} }
override fun refreshItems() { override fun refreshItems() {

2
app/src/main/kotlin/com/simplemobiletools/gallery/views/FastScroller.kt
View file

@ -54,7 +54,7 @@ class FastScroller : LinearLayout {
} }
private fun updateHandlePosition() { private fun updateHandlePosition() {
if (handle.isSelected) if (handle.isSelected || recyclerView == null)
return return
val verticalScrollOffset = recyclerView!!.computeVerticalScrollOffset() val verticalScrollOffset = recyclerView!!.computeVerticalScrollOffset()

31
app/src/main/res/layout/activity_main.xml
View file

@ -2,16 +2,31 @@
<android.support.v4.widget.SwipeRefreshLayout <android.support.v4.widget.SwipeRefreshLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/directories_holder" android:id="@+id/directories_refresh_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="wrap_content">
<com.simplemobiletools.gallery.views.MyScalableRecyclerView <RelativeLayout
android:id="@+id/directories_grid" android:id="@+id/directories_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:scrollbars="vertical"
app:layoutManager="android.support.v7.widget.GridLayoutManager"
app:spanCount="@integer/directory_columns"/>
<com.simplemobiletools.gallery.views.MyScalableRecyclerView
android:id="@+id/directories_grid"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollbars="none"
app:layoutManager="android.support.v7.widget.GridLayoutManager"
app:spanCount="@integer/directory_columns"/>
<com.simplemobiletools.gallery.views.FastScroller
android:id="@+id/directories_fastscroller"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:paddingLeft="@dimen/normal_margin"
android:paddingStart="@dimen/normal_margin"/>
</RelativeLayout>
</android.support.v4.widget.SwipeRefreshLayout> </android.support.v4.widget.SwipeRefreshLayout>

3
app/src/main/res/layout/activity_media.xml
View file

@ -25,7 +25,8 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:paddingLeft="@dimen/normal_margin"/> android:paddingLeft="@dimen/normal_margin"
android:paddingStart="@dimen/normal_margin"/>
</RelativeLayout> </RelativeLayout>
</android.support.v4.widget.SwipeRefreshLayout> </android.support.v4.widget.SwipeRefreshLayout>

1
app/src/main/res/layout/fastscroller.xml
View file

@ -8,6 +8,7 @@
android:id="@+id/fastscroller_handle" android:id="@+id/fastscroller_handle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:alpha="0"
android:background="@drawable/fastscroller_handle"/> android:background="@drawable/fastscroller_handle"/>
</merge> </merge>