Skip to content

Commit 2cf5a8a

Browse files
authored
Merge branch 'master' into fix-swipe-refresh-indicator
2 parents a74c720 + 2fe8b22 commit 2cf5a8a

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1313

1414
### Fixed
1515

16+
- Pull-to-refresh setting is now applied as expected ([#136])
1617
- Fixed accidental rendering of swipe refresh indicator.
1718

1819
## [1.0.1] - 2024-03-17
@@ -39,3 +40,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3940
[Unreleased]: https://github.com/FossifyOrg/File-Manager/compare/1.0.1...HEAD
4041
[1.0.1]: https://github.com/FossifyOrg/File-Manager/compare/1.0.0...1.0.1
4142
[1.0.0]: https://github.com/FossifyOrg/File-Manager/releases/tag/1.0.0
43+
44+
[#136]: https://github.com/FossifyOrg/File-Manager/issues/136

app/src/main/kotlin/org/fossify/filemanager/adapters/ItemsAdapter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ class ItemsAdapter(
220220
}
221221

222222
override fun onActionModeDestroyed() {
223-
swipeRefreshLayout?.isEnabled = true
223+
swipeRefreshLayout?.isEnabled = config.enablePullToRefresh
224224
}
225225

226226
override fun getItemViewType(position: Int): Int {

0 commit comments

Comments
 (0)