mirror of
https://github.com/FossifyOrg/Gallery.git
synced 2024-11-22 20:48:00 +01:00
show an explanation dialog at first attempt to exclude a folder
This commit is contained in:
parent
0a649df9c3
commit
f354818b66
17 changed files with 40 additions and 17 deletions
|
@ -15,6 +15,7 @@ import com.bumptech.glide.request.animation.GlideAnimation
|
|||
import com.bumptech.glide.request.target.SimpleTarget
|
||||
import com.google.gson.Gson
|
||||
import com.google.gson.reflect.TypeToken
|
||||
import com.simplemobiletools.commons.dialogs.ConfirmationDialog
|
||||
import com.simplemobiletools.commons.extensions.*
|
||||
import com.simplemobiletools.gallery.R
|
||||
import com.simplemobiletools.gallery.adapters.MediaAdapter
|
||||
|
@ -119,7 +120,7 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
|
|||
R.id.folder_view -> switchToFolderView()
|
||||
R.id.hide_folder -> hideFolder()
|
||||
R.id.unhide_folder -> unhideFolder()
|
||||
R.id.exclude_folder -> excludeFolder()
|
||||
R.id.exclude_folder -> tryExcludeFolder()
|
||||
R.id.increase_column_count -> increaseColumnCount()
|
||||
R.id.reduce_column_count -> reduceColumnCount()
|
||||
R.id.settings -> launchSettings()
|
||||
|
@ -166,6 +167,17 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
|
|||
}
|
||||
}
|
||||
|
||||
private fun tryExcludeFolder() {
|
||||
if (config.wasExcludeFolderTooltipShown) {
|
||||
excludeFolder()
|
||||
} else {
|
||||
ConfirmationDialog(this, getString(R.string.exclude_folder_description)) {
|
||||
config.wasExcludeFolderTooltipShown = true
|
||||
excludeFolder()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun excludeFolder() {
|
||||
|
||||
}
|
||||
|
|
|
@ -78,7 +78,7 @@ class DirectoryAdapter(val activity: SimpleActivity, val dirs: MutableList<Direc
|
|||
R.id.cab_unpin -> pinFolders(false)
|
||||
R.id.cab_hide -> toggleFoldersVisibility(true)
|
||||
R.id.cab_unhide -> toggleFoldersVisibility(false)
|
||||
R.id.exclude_folder -> excludeFolder()
|
||||
R.id.cab_exclude -> tryExcludeFolder()
|
||||
R.id.cab_copy_move -> displayCopyDialog()
|
||||
R.id.cab_select_all -> selectAll()
|
||||
R.id.cab_delete -> askConfirmDelete()
|
||||
|
@ -185,6 +185,17 @@ class DirectoryAdapter(val activity: SimpleActivity, val dirs: MutableList<Direc
|
|||
}
|
||||
}
|
||||
|
||||
private fun tryExcludeFolder() {
|
||||
if (config.wasExcludeFolderTooltipShown) {
|
||||
excludeFolder()
|
||||
} else {
|
||||
ConfirmationDialog(activity, activity.getString(R.string.exclude_folder_description)) {
|
||||
config.wasExcludeFolderTooltipShown = true
|
||||
excludeFolder()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun excludeFolder() {
|
||||
|
||||
}
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
<string name="hide_folder_description">This function hides the folder by adding a \'.nomedia\' file into it. You can still see it by toggling \'Show hidden folders\' option in Settings. Continue?</string>
|
||||
<string name="exclude">Exclude</string>
|
||||
<string name="excluded_folders">Excluded folders</string>
|
||||
<string name="exclude_folder_description">This function will make this folder hidden only for Simple Gallery. You can manage hidden folders in Settings. Continue?</string>
|
||||
<string name="exclude_folder_description">This function will make the selection hidden only for Simple Gallery. You can manage hidden folders in Settings. Continue?</string>
|
||||
|
||||
<!-- Resizing -->
|
||||
<string name="resize">Resize</string>
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
<string name="hide_folder_description">This function hides the folder by adding a \'.nomedia\' file into it. You can still see it by toggling \'Show hidden folders\' option in Settings. Continue?</string>
|
||||
<string name="exclude">Exclude</string>
|
||||
<string name="excluded_folders">Excluded folders</string>
|
||||
<string name="exclude_folder_description">This function will make this folder hidden only for Simple Gallery. You can manage hidden folders in Settings. Continue?</string>
|
||||
<string name="exclude_folder_description">This function will make the selection hidden only for Simple Gallery. You can manage hidden folders in Settings. Continue?</string>
|
||||
|
||||
<!-- Resizing -->
|
||||
<string name="resize">Größe ändern</string>
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
<string name="hide_folder_description">This function hides the folder by adding a \'.nomedia\' file into it. You can still see it by toggling \'Show hidden folders\' option in Settings. Continue?</string>
|
||||
<string name="exclude">Exclude</string>
|
||||
<string name="excluded_folders">Excluded folders</string>
|
||||
<string name="exclude_folder_description">This function will make this folder hidden only for Simple Gallery. You can manage hidden folders in Settings. Continue?</string>
|
||||
<string name="exclude_folder_description">This function will make the selection hidden only for Simple Gallery. You can manage hidden folders in Settings. Continue?</string>
|
||||
|
||||
<!-- Resizing -->
|
||||
<string name="resize">Resize</string>
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
<string name="hide_folder_description">This function hides the folder by adding a \'.nomedia\' file into it. You can still see it by toggling \'Show hidden folders\' option in Settings. Continue?</string>
|
||||
<string name="exclude">Exclude</string>
|
||||
<string name="excluded_folders">Excluded folders</string>
|
||||
<string name="exclude_folder_description">This function will make this folder hidden only for Simple Gallery. You can manage hidden folders in Settings. Continue?</string>
|
||||
<string name="exclude_folder_description">This function will make the selection hidden only for Simple Gallery. You can manage hidden folders in Settings. Continue?</string>
|
||||
|
||||
<!-- Resizing -->
|
||||
<string name="resize">Redimensionner</string>
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
<string name="hide_folder_description">This function hides the folder by adding a \'.nomedia\' file into it. You can still see it by toggling \'Show hidden folders\' option in Settings. Continue?</string>
|
||||
<string name="exclude">Exclude</string>
|
||||
<string name="excluded_folders">Excluded folders</string>
|
||||
<string name="exclude_folder_description">This function will make this folder hidden only for Simple Gallery. You can manage hidden folders in Settings. Continue?</string>
|
||||
<string name="exclude_folder_description">This function will make the selection hidden only for Simple Gallery. You can manage hidden folders in Settings. Continue?</string>
|
||||
|
||||
<!-- Resizing -->
|
||||
<string name="resize">Resize</string>
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
<string name="hide_folder_description">This function hides the folder by adding a \'.nomedia\' file into it. You can still see it by toggling \'Show hidden folders\' option in Settings. Continue?</string>
|
||||
<string name="exclude">Exclude</string>
|
||||
<string name="excluded_folders">Excluded folders</string>
|
||||
<string name="exclude_folder_description">This function will make this folder hidden only for Simple Gallery. You can manage hidden folders in Settings. Continue?</string>
|
||||
<string name="exclude_folder_description">This function will make the selection hidden only for Simple Gallery. You can manage hidden folders in Settings. Continue?</string>
|
||||
|
||||
<!-- Resizing -->
|
||||
<string name="resize">Resize</string>
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
<string name="hide_folder_description">This function hides the folder by adding a \'.nomedia\' file into it. You can still see it by toggling \'Show hidden folders\' option in Settings. Continue?</string>
|
||||
<string name="exclude">Exclude</string>
|
||||
<string name="excluded_folders">Excluded folders</string>
|
||||
<string name="exclude_folder_description">This function will make this folder hidden only for Simple Gallery. You can manage hidden folders in Settings. Continue?</string>
|
||||
<string name="exclude_folder_description">This function will make the selection hidden only for Simple Gallery. You can manage hidden folders in Settings. Continue?</string>
|
||||
|
||||
<!-- Resizing -->
|
||||
<string name="resize">Resize</string>
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
<string name="hide_folder_description">This function hides the folder by adding a \'.nomedia\' file into it. You can still see it by toggling \'Show hidden folders\' option in Settings. Continue?</string>
|
||||
<string name="exclude">Exclude</string>
|
||||
<string name="excluded_folders">Excluded folders</string>
|
||||
<string name="exclude_folder_description">This function will make this folder hidden only for Simple Gallery. You can manage hidden folders in Settings. Continue?</string>
|
||||
<string name="exclude_folder_description">This function will make the selection hidden only for Simple Gallery. You can manage hidden folders in Settings. Continue?</string>
|
||||
|
||||
<!-- Resizing -->
|
||||
<string name="resize">Redimensionar</string>
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
<string name="hide_folder_description">This function hides the folder by adding a \'.nomedia\' file into it. You can still see it by toggling \'Show hidden folders\' option in Settings. Continue?</string>
|
||||
<string name="exclude">Exclude</string>
|
||||
<string name="excluded_folders">Excluded folders</string>
|
||||
<string name="exclude_folder_description">This function will make this folder hidden only for Simple Gallery. You can manage hidden folders in Settings. Continue?</string>
|
||||
<string name="exclude_folder_description">This function will make the selection hidden only for Simple Gallery. You can manage hidden folders in Settings. Continue?</string>
|
||||
|
||||
<!-- Resizing -->
|
||||
<string name="resize">Изменить размер</string>
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
<string name="hide_folder_description">Táto funkcia skryje priečinok pridaním súboru \'.nomedia\'. Stále ho môžete vidieť zvolením možnosti \'Zobraziť skryté priečinky\' v nastaveniach. Pokračovať?</string>
|
||||
<string name="exclude">Vylúčiť</string>
|
||||
<string name="excluded_folders">Vylúčené priečinky</string>
|
||||
<string name="exclude_folder_description">Táto funkcia ukryje priečinok iba pred Jednoduchou galériou. Spravovať vylúčené priečinky je možné v nastaveniach. Pokračovať?</string>
|
||||
<string name="exclude_folder_description">Táto funkcia ukryje výber iba pred Jednoduchou galériou. Spravovať vylúčené priečinky je možné v nastaveniach. Pokračovať?</string>
|
||||
|
||||
<!-- Resizing -->
|
||||
<string name="resize">Zmeniť veľkosť</string>
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
<string name="hide_folder_description">This function hides the folder by adding a \'.nomedia\' file into it. You can still see it by toggling \'Show hidden folders\' option in Settings. Continue?</string>
|
||||
<string name="exclude">Exclude</string>
|
||||
<string name="excluded_folders">Excluded folders</string>
|
||||
<string name="exclude_folder_description">This function will make this folder hidden only for Simple Gallery. You can manage hidden folders in Settings. Continue?</string>
|
||||
<string name="exclude_folder_description">This function will make the selection hidden only for Simple Gallery. You can manage hidden folders in Settings. Continue?</string>
|
||||
|
||||
<!-- Resizing -->
|
||||
<string name="resize">Ändra storlek</string>
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
<string name="hide_folder_description">This function hides the folder by adding a \'.nomedia\' file into it. You can still see it by toggling \'Show hidden folders\' option in Settings. Continue?</string>
|
||||
<string name="exclude">Exclude</string>
|
||||
<string name="excluded_folders">Excluded folders</string>
|
||||
<string name="exclude_folder_description">This function will make this folder hidden only for Simple Gallery. You can manage hidden folders in Settings. Continue?</string>
|
||||
<string name="exclude_folder_description">This function will make the selection hidden only for Simple Gallery. You can manage hidden folders in Settings. Continue?</string>
|
||||
|
||||
<!-- Resizing -->
|
||||
<string name="resize">Yeniden boyutlandır</string>
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
<string name="hide_folder_description">This function hides the folder by adding a \'.nomedia\' file into it. You can still see it by toggling \'Show hidden folders\' option in Settings. Continue?</string>
|
||||
<string name="exclude">Exclude</string>
|
||||
<string name="excluded_folders">Excluded folders</string>
|
||||
<string name="exclude_folder_description">This function will make this folder hidden only for Simple Gallery. You can manage hidden folders in Settings. Continue?</string>
|
||||
<string name="exclude_folder_description">This function will make the selection hidden only for Simple Gallery. You can manage hidden folders in Settings. Continue?</string>
|
||||
|
||||
<!-- Resizing -->
|
||||
<string name="resize">缩放</string>
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
<string name="hide_folder_description">This function hides the folder by adding a \'.nomedia\' file into it. You can still see it by toggling \'Show hidden folders\' option in Settings. Continue?</string>
|
||||
<string name="exclude">Exclude</string>
|
||||
<string name="excluded_folders">Excluded folders</string>
|
||||
<string name="exclude_folder_description">This function will make this folder hidden only for Simple Gallery. You can manage hidden folders in Settings. Continue?</string>
|
||||
<string name="exclude_folder_description">This function will make the selection hidden only for Simple Gallery. You can manage hidden folders in Settings. Continue?</string>
|
||||
|
||||
<!-- Resizing -->
|
||||
<string name="resize">縮放</string>
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
<string name="hide_folder_description">This function hides the folder by adding a \'.nomedia\' file into it. You can still see it by toggling \'Show hidden folders\' option in Settings. Continue?</string>
|
||||
<string name="exclude">Exclude</string>
|
||||
<string name="excluded_folders">Excluded folders</string>
|
||||
<string name="exclude_folder_description">This function will make this folder hidden only for Simple Gallery. You can manage hidden folders in Settings. Continue?</string>
|
||||
<string name="exclude_folder_description">This function will make the selection hidden only for Simple Gallery. You can manage hidden folders in Settings. Continue?</string>
|
||||
|
||||
<!-- Resizing -->
|
||||
<string name="resize">Resize</string>
|
||||
|
|
Loading…
Reference in a new issue