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

lets always show the exclude confirmation dialog

Browse source
This commit is contained in:
tibbi 2017-03-03 21:29:51 +01:00
parent de0969bad3
commit 5064ca612f
4 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -193,13 +193,8 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
} }
private fun tryExcludeFolder() { private fun tryExcludeFolder() {
if (config.wasExcludeFolderTooltipShown) { ConfirmationDialog(this, getString(R.string.exclude_folder_description)) {
excludeFolder() excludeFolder()
} else {
ConfirmationDialog(this, getString(R.string.exclude_folder_description)) {
config.wasExcludeFolderTooltipShown = true
excludeFolder()
}
} }
} }

7
app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
View file

@ -196,13 +196,8 @@ class DirectoryAdapter(val activity: SimpleActivity, val dirs: MutableList<Direc
} }
private fun tryExcludeFolder() { private fun tryExcludeFolder() {
if (config.wasExcludeFolderTooltipShown) { ConfirmationDialog(activity, activity.getString(R.string.exclude_folder_description)) {
excludeFolder() excludeFolder()
} else {
ConfirmationDialog(activity, activity.getString(R.string.exclude_folder_description)) {
config.wasExcludeFolderTooltipShown = true
excludeFolder()
}
} }
} }

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

@ -38,10 +38,6 @@ class Config(context: Context) : BaseConfig(context) {
get() = prefs.getBoolean(HIDE_FOLDER_TOOLTIP_SHOWN, false) get() = prefs.getBoolean(HIDE_FOLDER_TOOLTIP_SHOWN, false)
set(wasShown) = prefs.edit().putBoolean(HIDE_FOLDER_TOOLTIP_SHOWN, wasShown).apply() set(wasShown) = prefs.edit().putBoolean(HIDE_FOLDER_TOOLTIP_SHOWN, wasShown).apply()
var wasExcludeFolderTooltipShown: Boolean
get() = prefs.getBoolean(EXCLUDE_FOLDER_TOOLTIP_SHOWN, false)
set(wasShown) = prefs.edit().putBoolean(EXCLUDE_FOLDER_TOOLTIP_SHOWN, wasShown).apply()
var showHiddenFolders: Boolean var showHiddenFolders: Boolean
get() = prefs.getBoolean(SHOW_HIDDEN_FOLDERS, false) get() = prefs.getBoolean(SHOW_HIDDEN_FOLDERS, false)
set(showHiddenFolders) = prefs.edit().putBoolean(SHOW_HIDDEN_FOLDERS, showHiddenFolders).apply() set(showHiddenFolders) = prefs.edit().putBoolean(SHOW_HIDDEN_FOLDERS, showHiddenFolders).apply()

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

@ -16,7 +16,6 @@ val SHOW_ALL = "show_all" // display images and videos from all folders togeth
val SHOW_MEDIA = "show_media" val SHOW_MEDIA = "show_media"
val SAVE_FOLDER_PREFIX = "folder_" val SAVE_FOLDER_PREFIX = "folder_"
val HIDE_FOLDER_TOOLTIP_SHOWN = "hide_folder_tooltip_shown" val HIDE_FOLDER_TOOLTIP_SHOWN = "hide_folder_tooltip_shown"
val EXCLUDE_FOLDER_TOOLTIP_SHOWN = "exclude_folder_tooltip_shown"
val EXCLUDED_FOLDERS = "excluded_folders" val EXCLUDED_FOLDERS = "excluded_folders"
val NOMEDIA = ".nomedia" val NOMEDIA = ".nomedia"