From 72582a049bd564a87db46caee2b00353b9d48a5b Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 21 Feb 2019 16:53:00 +0100 Subject: [PATCH] add a main screen menu item for toggling recycle bin visibility --- .../gallery/pro/activities/MainActivity.kt | 18 ++++++++++++++++++ app/src/main/res/menu/menu_main.xml | 8 ++++++++ 2 files changed, 26 insertions(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt index 0f0618f94..7f4b17ae8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt @@ -43,6 +43,7 @@ import com.simplemobiletools.gallery.pro.models.Medium import kotlinx.android.synthetic.main.activity_main.* import java.io.* import java.util.* +import kotlin.collections.ArrayList class MainActivity : SimpleActivity(), DirectoryOperationsListener { private val PICK_MEDIA = 2 @@ -264,9 +265,12 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { menuInflater.inflate(R.menu.menu_main_intent, menu) } else { menuInflater.inflate(R.menu.menu_main, menu) + val useBin = config.useRecycleBin menu.apply { findItem(R.id.increase_column_count).isVisible = config.viewTypeFolders == VIEW_TYPE_GRID && config.dirColumnCnt < MAX_COLUMN_COUNT findItem(R.id.reduce_column_count).isVisible = config.viewTypeFolders == VIEW_TYPE_GRID && config.dirColumnCnt > 1 + findItem(R.id.hide_the_recycle_bin).isVisible = useBin && config.showRecycleBinAtFolders + findItem(R.id.show_the_recycle_bin).isVisible = useBin && !config.showRecycleBinAtFolders setupSearch(this) } } @@ -287,6 +291,8 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { R.id.temporarily_show_hidden -> tryToggleTemporarilyShowHidden() R.id.stop_showing_hidden -> tryToggleTemporarilyShowHidden() R.id.create_new_folder -> createNewFolder() + R.id.show_the_recycle_bin -> toggleRecycleBin(true) + R.id.hide_the_recycle_bin -> toggleRecycleBin(false) R.id.increase_column_count -> increaseColumnCount() R.id.reduce_column_count -> reduceColumnCount() R.id.settings -> launchSettings() @@ -612,6 +618,18 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener { mZoomListener = null } + private fun toggleRecycleBin(show: Boolean) { + config.showRecycleBinAtFolders = show + invalidateOptionsMenu() + Thread { + var dirs = getCurrentlyDisplayedDirs() + if (!show) { + dirs = dirs.filter { it.path != RECYCLE_BIN } as ArrayList + } + gotDirectories(dirs) + }.start() + } + private fun createNewFolder() { FilePickerDialog(this, internalStoragePath, false, config.shouldShowHidden, false, true) { CreateNewFolderDialog(this, it) { diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index 5d6ee89c7..15dd5ecfd 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -38,6 +38,14 @@ android:id="@+id/stop_showing_hidden" android:title="@string/stop_showing_hidden" app:showAsAction="never"/> + +