From e2ae1ddc4b3aa75365bcc71e8a6a5e2e5890e79a Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Tue, 13 Dec 2022 23:25:54 +0100
Subject: [PATCH] remove the Hide/show recycle bin menu items from the main
 screen

---
 app/build.gradle                                |  2 +-
 .../gallery/pro/activities/MainActivity.kt      | 17 -----------------
 app/src/main/res/menu/menu_main.xml             | 10 ----------
 3 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 45a0f74ac..229b5ee6e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -78,7 +78,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:a1ecb048c0'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:ecdc896381'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
     implementation 'it.sephiroth.android.exif:library:1.0.1'
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.24'
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 ffef7d040..3b4542375 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
@@ -306,12 +306,9 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener {
 
     private fun refreshMenuItems() {
         if (!mIsThirdPartyIntent) {
-            val useBin = config.useRecycleBin
             directories_toolbar.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
                 findItem(R.id.set_as_default_folder).isVisible = !config.defaultFolder.isEmpty()
                 findItem(R.id.more_apps_from_us).isVisible = !resources.getBoolean(R.bool.hide_google_relations)
                 setupSearch(this)
@@ -352,8 +349,6 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener {
                 R.id.temporarily_show_excluded -> tryToggleTemporarilyShowExcluded()
                 R.id.stop_showing_excluded -> tryToggleTemporarilyShowExcluded()
                 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.set_as_default_folder -> setAsDefaultFolder()
@@ -751,18 +746,6 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener {
         }
     }
 
-    private fun toggleRecycleBin(show: Boolean) {
-        config.showRecycleBinAtFolders = show
-        refreshMenuItems()
-        ensureBackgroundThread {
-            var dirs = getCurrentlyDisplayedDirs()
-            if (!show) {
-                dirs = dirs.filter { it.path != RECYCLE_BIN } as ArrayList<Directory>
-            }
-            gotDirectories(dirs)
-        }
-    }
-
     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 f8398f716..5af41f989 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -54,16 +54,6 @@
         android:showAsAction="never"
         android:title="@string/show_all"
         app:showAsAction="never" />
-    <item
-        android:id="@+id/show_the_recycle_bin"
-        android:showAsAction="never"
-        android:title="@string/show_the_recycle_bin"
-        app:showAsAction="never" />
-    <item
-        android:id="@+id/hide_the_recycle_bin"
-        android:showAsAction="never"
-        android:title="@string/hide_the_recycle_bin"
-        app:showAsAction="never" />
     <item
         android:id="@+id/set_as_default_folder"
         android:showAsAction="never"