fenix/Simple-Gallery
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Gallery.git synced 2025-06-05 21:59:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

replacing the old file checking setting item with a new one

Browse Source
This commit is contained in:
tibbi
2019-02-27 16:24:19 +01:00
parent 1a21192223
commit ec5c902fb7
37 changed files with 74 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SettingsActivity.kt
View File

@ -36,11 +36,11 @@ class SettingsActivity : SimpleActivity() {
setupCustomizeColors()
setupUseEnglish()
setupChangeDateTimeFormat()
setupFileLoadingPriority()
setupManageIncludedFolders()
setupManageExcludedFolders()
setupManageHiddenFolders()
setupShowHiddenItems()
setupDoExtraCheck()
setupAutoplayVideos()
setupRememberLastVideo()
setupLoopVideos()
@ -117,6 +117,27 @@ class SettingsActivity : SimpleActivity() {
}
}
private fun setupFileLoadingPriority() {
settings_file_loading_priority.text = getFileLoadingPriorityText()
settings_file_loading_priority_holder.setOnClickListener {
val items = arrayListOf(
RadioItem(PRIORITY_SPEED, getString(R.string.speed)),
RadioItem(PRIORITY_COMPROMISE, getString(R.string.compromise)),
RadioItem(PRIORITY_VALIDITY, getString(R.string.avoid_showing_invalid_files)))
RadioGroupDialog(this@SettingsActivity, items, config.fileLoadingPriority) {
config.fileLoadingPriority = it as Int
settings_file_loading_priority.text = getFileLoadingPriorityText()
}
}
}
private fun getFileLoadingPriorityText() = getString(when (config.fileLoadingPriority) {
PRIORITY_SPEED -> R.string.speed
PRIORITY_COMPROMISE -> R.string.compromise
else -> R.string.avoid_showing_invalid_files
})
private fun setupManageIncludedFolders() {
settings_manage_included_folders_holder.setOnClickListener {
startActivity(Intent(this, IncludedFoldersActivity::class.java))
@ -155,14 +176,6 @@ class SettingsActivity : SimpleActivity() {
config.showHiddenMedia = settings_show_hidden_items.isChecked
}
private fun setupDoExtraCheck() {
settings_do_extra_check.isChecked = config.doExtraCheck
settings_do_extra_check_holder.setOnClickListener {
settings_do_extra_check.toggle()
config.doExtraCheck = settings_do_extra_check.isChecked
}
}
private fun setupAutoplayVideos() {
settings_autoplay_videos.isChecked = config.autoplayVideos
settings_autoplay_videos_holder.setOnClickListener {
@ -596,7 +609,7 @@ class SettingsActivity : SimpleActivity() {
put(INCLUDED_FOLDERS, TextUtils.join(",", config.includedFolders))
put(EXCLUDED_FOLDERS, TextUtils.join(",", config.excludedFolders))
put(SHOW_HIDDEN_MEDIA, config.showHiddenMedia)
put(DO_EXTRA_CHECK, config.doExtraCheck)
put(FILE_LOADING_PRIORITY, config.fileLoadingPriority)
put(AUTOPLAY_VIDEOS, config.autoplayVideos)
put(REMEMBER_LAST_VIDEO_POSITION, config.rememberLastVideoPosition)
put(LAST_VIDEO_PATH, config.lastVideoPath)
@ -719,7 +732,7 @@ class SettingsActivity : SimpleActivity() {
INCLUDED_FOLDERS -> config.addIncludedFolders(value.toStringSet())
EXCLUDED_FOLDERS -> config.addExcludedFolders(value.toStringSet())
SHOW_HIDDEN_MEDIA -> config.showHiddenMedia = value.toBoolean()
DO_EXTRA_CHECK -> config.doExtraCheck = value.toBoolean()
FILE_LOADING_PRIORITY -> config.fileLoadingPriority = value.toInt()
AUTOPLAY_VIDEOS -> config.autoplayVideos = value.toBoolean()
REMEMBER_LAST_VIDEO_POSITION -> config.rememberLastVideoPosition = value.toBoolean()
LAST_VIDEO_PATH -> config.lastVideoPath = value.toString()

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

@ -182,6 +182,10 @@ class Config(context: Context) : BaseConfig(context) {
get() = prefs.getInt(SCREEN_ROTATION, ROTATE_BY_SYSTEM_SETTING)
set(screenRotation) = prefs.edit().putInt(SCREEN_ROTATION, screenRotation).apply()
var fileLoadingPriority: Int
get() = prefs.getInt(FILE_LOADING_PRIORITY, PRIORITY_COMPROMISE)
set(fileLoadingPriority) = prefs.edit().putInt(FILE_LOADING_PRIORITY, fileLoadingPriority).apply()
var loopVideos: Boolean
get() = prefs.getBoolean(LOOP_VIDEOS, false)
set(loop) = prefs.edit().putBoolean(LOOP_VIDEOS, loop).apply()
@ -335,10 +339,6 @@ class Config(context: Context) : BaseConfig(context) {
get() = prefs.getInt(EXTENDED_DETAILS, EXT_RESOLUTION or EXT_LAST_MODIFIED or EXT_EXIF_PROPERTIES)
set(extendedDetails) = prefs.edit().putInt(EXTENDED_DETAILS, extendedDetails).apply()
var doExtraCheck: Boolean
get() = prefs.getBoolean(DO_EXTRA_CHECK, false)
set(doExtraCheck) = prefs.edit().putBoolean(DO_EXTRA_CHECK, doExtraCheck).apply()
var wasNewAppShown: Boolean
get() = prefs.getBoolean(WAS_NEW_APP_SHOWN, false)
set(wasNewAppShown) = prefs.edit().putBoolean(WAS_NEW_APP_SHOWN, wasNewAppShown).apply()

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

@ -48,7 +48,6 @@ const val SHOW_EXTENDED_DETAILS = "show_extended_details"
const val EXTENDED_DETAILS = "extended_details"
const val HIDE_EXTENDED_DETAILS = "hide_extended_details"
const val ALLOW_INSTANT_CHANGE = "allow_instant_change"
const val DO_EXTRA_CHECK = "do_extra_check"
const val WAS_NEW_APP_SHOWN = "was_new_app_shown_clock"
const val LAST_FILEPICKER_PATH = "last_filepicker_path"
const val WAS_OTG_HANDLED = "was_otg_handled_2"
@ -79,6 +78,7 @@ const val ALLOW_ROTATING_WITH_GESTURES = "allow_rotating_with_gestures"
const val LAST_EDITOR_DRAW_COLOR = "last_editor_draw_color"
const val LAST_EDITOR_BRUSH_SIZE = "last_editor_brush_size"
const val SHOW_NOTCH = "show_notch"
const val FILE_LOADING_PRIORITY = "file_loading_priority"
// slideshow
const val SLIDESHOW_INTERVAL = "slideshow_interval"
@ -126,6 +126,11 @@ const val ROTATE_BY_SYSTEM_SETTING = 0
const val ROTATE_BY_DEVICE_ROTATION = 1
const val ROTATE_BY_ASPECT_RATIO = 2
// file loading priority
const val PRIORITY_SPEED = 0
const val PRIORITY_COMPROMISE = 1
const val PRIORITY_VALIDITY = 2
// view types
const val VIEW_TYPE_GRID = 1
const val VIEW_TYPE_LIST = 2

4
app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt
View File

@ -165,7 +165,7 @@ class MediaFetcher(val context: Context) {
ArrayList()
}
val doExtraCheck = context.config.doExtraCheck
val checkFileExistence = context.config.fileLoadingPriority == PRIORITY_VALIDITY
val showHidden = context.config.shouldShowHidden
val dateTakens = if (getProperDateTaken && folder != FAVORITES && !isRecycleBin) getFolderDateTakens(folder) else HashMap()
@ -210,7 +210,7 @@ class MediaFetcher(val context: Context) {
continue
val size = file.length()
if (size <= 0L || (doExtraCheck && !file.exists()))
if (size <= 0L || (checkFileExistence && !file.exists()))
continue
if (isRecycleBin) {