Mirrors/FossifyGallery
2
0
Fork 1
mirror of https://github.com/FossifyOrg/Gallery.git synced 2024-11-23 13:08:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

store the amount of columns

Browse source
This commit is contained in:
tibbi 2016-12-11 21:54:40 +01:00
parent 72381ba53d
commit 9bb9e3496c
8 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -62,7 +62,6 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
mToBeDeleted = ArrayList<String>()
directories_holder.setOnRefreshListener({ getDirectories() })
mDirs = ArrayList<Directory>()
handleZooming()
}
override fun onCreateOptionsMenu(menu: Menu): Boolean {
@ -120,6 +119,7 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
showAllMedia()
else
getDirectories()
handleZooming()
} else {
ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), STORAGE_PERMISSION)
}
@ -234,17 +234,18 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
private fun handleZooming() {
val layoutManager = directories_grid.layoutManager as GridLayoutManager
layoutManager.spanCount = mConfig.dirColumnCnt
MyScalableRecyclerView.mListener = object : MyScalableRecyclerView.ZoomListener {
override fun zoomIn() {
if (layoutManager.spanCount > 1) {
layoutManager.spanCount--
mConfig.dirColumnCnt = --layoutManager.spanCount
DirectoryAdapter.actMode?.finish()
}
}
override fun zoomOut() {
if (layoutManager.spanCount < 10) {
layoutManager.spanCount++
mConfig.dirColumnCnt = ++layoutManager.spanCount
DirectoryAdapter.actMode?.finish()
}
}

7
app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
View file

@ -50,7 +50,6 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
mIsGetAnyIntent = getBooleanExtra(GET_ANY_INTENT, false)
}
handleZooming()
media_holder.setOnRefreshListener({ getMedia() })
mPath = intent.getStringExtra(DIRECTORY)
mMedia = ArrayList<Medium>()
@ -69,6 +68,7 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
val dirName = getHumanizedFilename(mPath)
title = if (mShowAll) resources.getString(R.string.all_folders) else dirName
getMedia()
handleZooming()
} else {
finish()
}
@ -203,17 +203,18 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
private fun handleZooming() {
val layoutManager = media_grid.layoutManager as GridLayoutManager
layoutManager.spanCount = mConfig.mediaColumnCnt
MyScalableRecyclerView.mListener = object : MyScalableRecyclerView.ZoomListener {
override fun zoomIn() {
if (layoutManager.spanCount > 1) {
layoutManager.spanCount--
mConfig.mediaColumnCnt = --layoutManager.spanCount
MediaAdapter.actMode?.finish()
}
}
override fun zoomOut() {
if (layoutManager.spanCount < 10) {
layoutManager.spanCount++
mConfig.mediaColumnCnt = ++layoutManager.spanCount
MediaAdapter.actMode?.finish()
}
}

11
app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
View file

@ -2,9 +2,10 @@ package com.simplemobiletools.gallery.helpers
import android.content.Context
import android.content.SharedPreferences
import com.simplemobiletools.gallery.R
import java.util.*
class Config private constructor(context: Context) {
class Config private constructor(val context: Context) {
private val mPrefs: SharedPreferences
companion object {
@ -100,4 +101,12 @@ class Config private constructor(context: Context) {
var showMedia: Int
get() = mPrefs.getInt(SHOW_MEDIA, IMAGES_AND_VIDEOS)
set(showMedia) = mPrefs.edit().putInt(SHOW_MEDIA, showMedia).apply()
var dirColumnCnt: Int
get() = mPrefs.getInt(DIR_COLUMN_CNT, context.resources.getInteger(R.integer.directory_columns))
set(dirColumnCnt) = mPrefs.edit().putInt(DIR_COLUMN_CNT, dirColumnCnt).apply()
var mediaColumnCnt: Int
get() = mPrefs.getInt(MEDIA_COLUMN_CNT, context.resources.getInteger(R.integer.media_columns))
set(mediaColumnCnt) = mPrefs.edit().putInt(MEDIA_COLUMN_CNT, mediaColumnCnt).apply()
}

2
app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt
View file

@ -13,6 +13,8 @@ val AUTOPLAY_VIDEOS = "autoplay_videos"
val TREE_URI = "tree_uri"
val DISPLAY_FILE_NAMES = "display_file_names"
val PINNED_FOLDERS = "pinned_folders"
val DIR_COLUMN_CNT = "dir_column_cnt"
val MEDIA_COLUMN_CNT = "media_column_cnt"
val SHOW_ALL = "show_all" // display images and videos from all folders together
val SHOW_MEDIA = "show_media"

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

@ -12,6 +12,6 @@
android:layout_height="match_parent"
android:scrollbars="vertical"
app:layoutManager="android.support.v7.widget.GridLayoutManager"
app:spanCount="@integer/photo_columns"/>
app:spanCount="@integer/media_columns"/>
</android.support.v4.widget.SwipeRefreshLayout>

2
app/src/main/res/values-w480dp/integers.xml
View file

@ -1,4 +1,4 @@
<resources>
<integer name="directory_columns">3</integer>
<integer name="photo_columns">5</integer>
<integer name="media_columns">5</integer>
</resources>

2
app/src/main/res/values-w600dp/integers.xml
View file

@ -1,4 +1,4 @@
<resources>
<integer name="directory_columns">4</integer>
<integer name="photo_columns">7</integer>
<integer name="media_columns">7</integer>
</resources>

2
app/src/main/res/values/integers.xml
View file

@ -1,4 +1,4 @@
<resources>
<integer name="directory_columns">2</integer>
<integer name="photo_columns">3</integer>
<integer name="media_columns">3</integer>
</resources>