Skip to content

Commit 23208bf

Browse files
committed
disable swipe refresh gesture at item selection, needs better solution
1 parent 65bbe06 commit 23208bf

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import android.util.TypedValue
1616
import android.view.Menu
1717
import android.view.View
1818
import android.view.ViewGroup
19+
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
1920
import com.bumptech.glide.Glide
2021
import com.bumptech.glide.load.DecodeFormat
2122
import com.bumptech.glide.load.engine.DiskCacheStrategy
@@ -55,7 +56,7 @@ import java.util.zip.ZipFile
5556
import java.util.zip.ZipOutputStream
5657

5758
class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem>, val listener: ItemOperationsListener?, recyclerView: MyRecyclerView,
58-
val isPickMultipleIntent: Boolean, fastScroller: FastScroller?, itemClick: (Any) -> Unit) :
59+
val isPickMultipleIntent: Boolean, fastScroller: FastScroller?, val swipeRefreshLayout: SwipeRefreshLayout, itemClick: (Any) -> Unit) :
5960
MyRecyclerViewAdapter(activity, recyclerView, fastScroller, itemClick) {
6061

6162
private val TYPE_FILE_DIR = 1
@@ -133,9 +134,14 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
133134

134135
override fun getItemKeyPosition(key: Int) = listItems.indexOfFirst { it.path.hashCode() == key }
135136

136-
override fun onActionModeCreated() {}
137+
override fun onActionModeCreated() {
138+
swipeRefreshLayout.isRefreshing = false
139+
swipeRefreshLayout.isEnabled = false
140+
}
137141

138-
override fun onActionModeDestroyed() {}
142+
override fun onActionModeDestroyed() {
143+
swipeRefreshLayout.isEnabled = true
144+
}
139145

140146
override fun getItemViewType(position: Int): Int {
141147
return if (listItems[position].isSectionTitle) {

app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,8 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
174174
}
175175

176176
storedItems = items
177-
ItemsAdapter(activity as SimpleActivity, storedItems, this@ItemsFragment, items_list, isPickMultipleIntent, items_fastscroller) {
177+
ItemsAdapter(activity as SimpleActivity, storedItems, this@ItemsFragment, items_list, isPickMultipleIntent, items_fastscroller,
178+
items_swipe_refresh) {
178179
if ((it as? ListItem)?.isSectionTitle == true) {
179180
openDirectory(it.mPath)
180181
searchClosed()

0 commit comments

Comments
 (0)