From b01900348bb3e518f44c924d7297a4ef91060006 Mon Sep 17 00:00:00 2001
From: Agnieszka C <85929121+Aga-C@users.noreply.github.com>
Date: Thu, 21 Oct 2021 20:20:19 +0200
Subject: [PATCH] Added an option to disable pull-to-refresh (#223)
---
.../pro/activities/SettingsActivity.kt | 11 ++++++-
.../pro/fragments/ItemsFragment.kt | 4 ++-
.../pro/fragments/RecentsFragment.kt | 2 ++
app/src/main/res/layout/activity_settings.xml | 33 +++++++++++++++++++
4 files changed, 48 insertions(+), 2 deletions(-)
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 15db26fd..5d80c2fb 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
@@ -33,6 +33,7 @@ class SettingsActivity : SimpleActivity() {
setupChangeDateTimeFormat()
setupFontSize()
setupShowHidden()
+ setupEnablePullToRefresh()
setupPressBackTwice()
setupHiddenItemPasswordProtection()
setupAppPasswordProtection()
@@ -52,7 +53,7 @@ class SettingsActivity : SimpleActivity() {
private fun setupSectionColors() {
val adjustedPrimaryColor = getAdjustedPrimaryColor()
- arrayListOf(visibility_label, file_operations_label, security_label).forEach {
+ arrayListOf(visibility_label, scrolling_label, file_operations_label, security_label).forEach {
it.setTextColor(adjustedPrimaryColor)
}
}
@@ -125,6 +126,14 @@ class SettingsActivity : SimpleActivity() {
config.showHidden = settings_show_hidden.isChecked
}
+ private fun setupEnablePullToRefresh() {
+ settings_enable_pull_to_refresh.isChecked = config.enablePullToRefresh
+ settings_enable_pull_to_refresh_holder.setOnClickListener {
+ settings_enable_pull_to_refresh.toggle()
+ config.enablePullToRefresh = settings_enable_pull_to_refresh.isChecked
+ }
+ }
+
private fun setupPressBackTwice() {
settings_press_back_twice.isChecked = config.pressBackTwice
settings_press_back_twice_holder.setOnClickListener {
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt
index 008576da..18287c09 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt
@@ -23,6 +23,7 @@ import com.simplemobiletools.filemanager.pro.helpers.MAX_COLUMN_COUNT
import com.simplemobiletools.filemanager.pro.helpers.RootHelpers
import com.simplemobiletools.filemanager.pro.interfaces.ItemOperationsListener
import com.simplemobiletools.filemanager.pro.models.ListItem
+import kotlinx.android.synthetic.main.items_fragment.*
import kotlinx.android.synthetic.main.items_fragment.view.*
import java.io.File
import java.util.*
@@ -60,6 +61,7 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
breadcrumbs.updateColor(textColor)
items_fastscroller.updateBubbleColors()
+ items_swipe_refresh.isEnabled = activity?.config?.enablePullToRefresh != false
}
override fun setupFontSize() {
@@ -380,7 +382,7 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
skipItemUpdating = false
lastSearchedText = ""
- items_swipe_refresh.isEnabled = true
+ items_swipe_refresh.isEnabled = activity?.config?.enablePullToRefresh != false
items_list.beVisible()
items_placeholder.beGone()
items_placeholder_2.beGone()
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/RecentsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/RecentsFragment.kt
index 297b6975..2d724f5e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/RecentsFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/RecentsFragment.kt
@@ -72,6 +72,8 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
updateTextColor(textColor)
initDrawables()
}
+
+ recents_swipe_refresh.isEnabled = activity?.config?.enablePullToRefresh != false
}
private fun setupLayoutManager() {
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 9053d0fd..85a33d33 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -206,6 +206,39 @@
+
+
+
+
+
+
+
+