Skip to content

Commit 16cfb84

Browse files
committed
skip delete confirmation option
1 parent 59e5713 commit 16cfb84

File tree

5 files changed

+38
-1
lines changed

5 files changed

+38
-1
lines changed

app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SettingsActivity.kt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ class SettingsActivity : SimpleActivity() {
3838
setupAppPasswordProtection()
3939
setupFileDeletionPasswordProtection()
4040
setupKeepLastModified()
41+
setupDeleteConfirmation()
4142
setupEnableRootAccess()
4243
updateTextColors(settings_holder)
4344
setupSectionColors()
@@ -206,6 +207,14 @@ class SettingsActivity : SimpleActivity() {
206207
}
207208
}
208209

210+
private fun setupDeleteConfirmation() {
211+
settings_delete_confirmation.isChecked = config.skipDeleteConfirmation
212+
settings_delete_confirmation_holder.setOnClickListener {
213+
settings_delete_confirmation.toggle()
214+
config.skipDeleteConfirmation = settings_delete_confirmation.isChecked
215+
}
216+
}
217+
209218
private fun setupEnableRootAccess() {
210219
settings_enable_root_access_holder.beVisibleIf(config.isRootAvailable)
211220
settings_enable_root_access.isChecked = config.enableRootAccess

app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
123123
R.id.cab_compress -> compressSelection()
124124
R.id.cab_decompress -> decompressSelection()
125125
R.id.cab_select_all -> selectAll()
126-
R.id.cab_delete -> askConfirmDelete()
126+
R.id.cab_delete -> if (config.skipDeleteConfirmation) deleteFiles() else askConfirmDelete()
127127
}
128128
}
129129

app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/Config.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@ class Config(context: Context) : BaseConfig(context) {
7676
get() = prefs.getFloat(EDITOR_TEXT_ZOOM, 1.2f)
7777
set(editorTextZoom) = prefs.edit().putFloat(EDITOR_TEXT_ZOOM, editorTextZoom).apply()
7878

79+
/* var skipDeleteConfirmation: Boolean
80+
get() = prefs.getBoolean(SKIP_DELETE_CONFIRMATION, true)
81+
set(deleteConfirmationEnabled) = prefs.edit().putBoolean(SKIP_DELETE_CONFIRMATION, deleteConfirmationEnabled).apply()*/
82+
7983
var viewType: Int
8084
get() = prefs.getInt(VIEW_TYPE, VIEW_TYPE_LIST)
8185
set(viewTypeFiles) = prefs.edit().putInt(VIEW_TYPE, viewTypeFiles).apply()

app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/Constants.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ const val FILE_COLUMN_CNT = "file_column_cnt"
2020
const val FILE_LANDSCAPE_COLUMN_CNT = "file_landscape_column_cnt"
2121
const val DISPLAY_FILE_NAMES = "display_file_names"
2222
const val SHOW_TABS = "show_tabs"
23+
//const val SKIP_DELETE_CONFIRMATION = "skip_delete_confirm"
2324

2425
// open as
2526
const val OPEN_AS_DEFAULT = 0

app/src/main/res/layout/activity_settings.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,29 @@
239239

240240
</RelativeLayout>
241241

242+
<RelativeLayout
243+
android:id="@+id/settings_delete_confirmation_holder"
244+
android:layout_width="match_parent"
245+
android:layout_height="wrap_content"
246+
android:layout_marginTop="@dimen/medium_margin"
247+
android:background="?attr/selectableItemBackground"
248+
android:paddingStart="@dimen/normal_margin"
249+
android:paddingTop="@dimen/activity_margin"
250+
android:paddingEnd="@dimen/normal_margin"
251+
android:paddingBottom="@dimen/activity_margin">
252+
253+
<com.simplemobiletools.commons.views.MySwitchCompat
254+
android:id="@+id/settings_delete_confirmation"
255+
android:layout_width="match_parent"
256+
android:layout_height="wrap_content"
257+
android:background="@null"
258+
android:clickable="false"
259+
android:paddingStart="@dimen/medium_margin"
260+
android:text="@string/skip_delete_confirmation"
261+
app:switchPadding="@dimen/medium_margin" />
262+
263+
</RelativeLayout>
264+
242265
<com.simplemobiletools.commons.views.MyTextView
243266
android:id="@+id/security_label"
244267
android:layout_width="wrap_content"

0 commit comments

Comments
 (0)