From 16cfb8401cf919626f85f3485558dfe53783209a Mon Sep 17 00:00:00 2001
From: Agus <agustinadaro@hotmail.com>
Date: Fri, 28 May 2021 16:04:27 -0300
Subject: [PATCH] skip delete confirmation option

---
 .../pro/activities/SettingsActivity.kt        |  9 ++++++++
 .../filemanager/pro/adapters/ItemsAdapter.kt  |  2 +-
 .../filemanager/pro/helpers/Config.kt         |  4 ++++
 .../filemanager/pro/helpers/Constants.kt      |  1 +
 app/src/main/res/layout/activity_settings.xml | 23 +++++++++++++++++++
 5 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SettingsActivity.kt
index c787a668..15035fa7 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SettingsActivity.kt
@@ -38,6 +38,7 @@ class SettingsActivity : SimpleActivity() {
         setupAppPasswordProtection()
         setupFileDeletionPasswordProtection()
         setupKeepLastModified()
+        setupDeleteConfirmation()
         setupEnableRootAccess()
         updateTextColors(settings_holder)
         setupSectionColors()
@@ -206,6 +207,14 @@ class SettingsActivity : SimpleActivity() {
         }
     }
 
+    private fun setupDeleteConfirmation() {
+        settings_delete_confirmation.isChecked = config.skipDeleteConfirmation
+        settings_delete_confirmation_holder.setOnClickListener {
+            settings_delete_confirmation.toggle()
+            config.skipDeleteConfirmation = settings_delete_confirmation.isChecked
+        }
+    }
+
     private fun setupEnableRootAccess() {
         settings_enable_root_access_holder.beVisibleIf(config.isRootAvailable)
         settings_enable_root_access.isChecked = config.enableRootAccess
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt
index 8b4f3ba7..48caa7a5 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt
@@ -123,7 +123,7 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
             R.id.cab_compress -> compressSelection()
             R.id.cab_decompress -> decompressSelection()
             R.id.cab_select_all -> selectAll()
-            R.id.cab_delete -> askConfirmDelete()
+            R.id.cab_delete -> if (config.skipDeleteConfirmation) deleteFiles() else askConfirmDelete()
         }
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/Config.kt
index 7c73b2bc..cb75ee53 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/Config.kt
@@ -76,6 +76,10 @@ class Config(context: Context) : BaseConfig(context) {
         get() = prefs.getFloat(EDITOR_TEXT_ZOOM, 1.2f)
         set(editorTextZoom) = prefs.edit().putFloat(EDITOR_TEXT_ZOOM, editorTextZoom).apply()
 
+   /* var skipDeleteConfirmation: Boolean
+        get() = prefs.getBoolean(SKIP_DELETE_CONFIRMATION, true)
+        set(deleteConfirmationEnabled) = prefs.edit().putBoolean(SKIP_DELETE_CONFIRMATION, deleteConfirmationEnabled).apply()*/
+
     var viewType: Int
         get() = prefs.getInt(VIEW_TYPE, VIEW_TYPE_LIST)
         set(viewTypeFiles) = prefs.edit().putInt(VIEW_TYPE, viewTypeFiles).apply()
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/Constants.kt
index 9a0c221f..f0a1e859 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/Constants.kt
@@ -20,6 +20,7 @@ const val FILE_COLUMN_CNT = "file_column_cnt"
 const val FILE_LANDSCAPE_COLUMN_CNT = "file_landscape_column_cnt"
 const val DISPLAY_FILE_NAMES = "display_file_names"
 const val SHOW_TABS = "show_tabs"
+//const val SKIP_DELETE_CONFIRMATION = "skip_delete_confirm"
 
 // open as
 const val OPEN_AS_DEFAULT = 0
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index dad60f05..1d5f46fe 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -239,6 +239,29 @@
 
         </RelativeLayout>
 
+        <RelativeLayout
+            android:id="@+id/settings_delete_confirmation_holder"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/medium_margin"
+            android:background="?attr/selectableItemBackground"
+            android:paddingStart="@dimen/normal_margin"
+            android:paddingTop="@dimen/activity_margin"
+            android:paddingEnd="@dimen/normal_margin"
+            android:paddingBottom="@dimen/activity_margin">
+
+            <com.simplemobiletools.commons.views.MySwitchCompat
+                android:id="@+id/settings_delete_confirmation"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@null"
+                android:clickable="false"
+                android:paddingStart="@dimen/medium_margin"
+                android:text="@string/skip_delete_confirmation"
+                app:switchPadding="@dimen/medium_margin" />
+
+        </RelativeLayout>
+
         <com.simplemobiletools.commons.views.MyTextView
             android:id="@+id/security_label"
             android:layout_width="wrap_content"