fenix
/
Simple-Gallery
mirror of https://github.com/SimpleMobileTools/Simple-Gallery.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

store column count separate for portrait and landscape

This commit is contained in:
tibbi 2017-06-15 22:57:58 +02:00
parent 68c6186fa7
commit 0fcac3deff
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
View File

@ -1,6 +1,7 @@
package com.simplemobiletools.gallery.helpers package com.simplemobiletools.gallery.helpers
import android.content.Context import android.content.Context
import android.content.res.Configuration
import com.google.gson.Gson import com.google.gson.Gson
import com.google.gson.reflect.TypeToken import com.google.gson.reflect.TypeToken
import com.simplemobiletools.commons.helpers.BaseConfig import com.simplemobiletools.commons.helpers.BaseConfig
@ -160,12 +161,22 @@ class Config(context: Context) : BaseConfig(context) {
set(showMedia) = prefs.edit().putInt(SHOW_MEDIA, showMedia).apply() set(showMedia) = prefs.edit().putInt(SHOW_MEDIA, showMedia).apply()
var dirColumnCnt: Int var dirColumnCnt: Int
get() = prefs.getInt(DIR_COLUMN_CNT, context.resources.getInteger(R.integer.directory_columns)) get() = prefs.getInt(getDirectoryColumnsField(), context.resources.getInteger(R.integer.directory_columns))
set(dirColumnCnt) = prefs.edit().putInt(DIR_COLUMN_CNT, dirColumnCnt).apply() set(dirColumnCnt) = prefs.edit().putInt(getDirectoryColumnsField(), dirColumnCnt).apply()
private fun getDirectoryColumnsField(): String {
val isPortrait = context.resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT
return if (isPortrait) DIR_COLUMN_CNT else DIR_LANDSCAPE_COLUMN_CNT
}
var mediaColumnCnt: Int var mediaColumnCnt: Int
get() = prefs.getInt(MEDIA_COLUMN_CNT, context.resources.getInteger(R.integer.media_columns)) get() = prefs.getInt(getMediaColumnsField(), context.resources.getInteger(R.integer.media_columns))
set(mediaColumnCnt) = prefs.edit().putInt(MEDIA_COLUMN_CNT, mediaColumnCnt).apply() set(mediaColumnCnt) = prefs.edit().putInt(getMediaColumnsField(), mediaColumnCnt).apply()
private fun getMediaColumnsField(): String {
val isPortrait = context.resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT
return if (isPortrait) MEDIA_COLUMN_CNT else MEDIA_LANDSCAPE_COLUMN_CNT
}
var directories: String var directories: String
get() = prefs.getString(DIRECTORIES, "") get() = prefs.getString(DIRECTORIES, "")

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

@ -16,7 +16,9 @@ val DISPLAY_FILE_NAMES = "display_file_names"
val DARK_BACKGROUND = "dark_background" val DARK_BACKGROUND = "dark_background"
val PINNED_FOLDERS = "pinned_folders" val PINNED_FOLDERS = "pinned_folders"
val DIR_COLUMN_CNT = "dir_column_cnt" val DIR_COLUMN_CNT = "dir_column_cnt"
val DIR_LANDSCAPE_COLUMN_CNT = "dir_landscape_column_cnt"
val MEDIA_COLUMN_CNT = "media_column_cnt" val MEDIA_COLUMN_CNT = "media_column_cnt"
val MEDIA_LANDSCAPE_COLUMN_CNT = "media_landscape_column_cnt"
val SHOW_ALL = "show_all" // display images and videos from all folders together val SHOW_ALL = "show_all" // display images and videos from all folders together
val SHOW_MEDIA = "show_media" val SHOW_MEDIA = "show_media"
val SAVE_FOLDER_PREFIX = "folder2_" val SAVE_FOLDER_PREFIX = "folder2_"