From 8450f6953ec7e12f407000b247bd36d4dd766ec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= Date: Sun, 7 Jul 2024 23:22:37 +0200 Subject: [PATCH] [UI] Enable swipe-to-refresh on home, grades, behaviour fragments --- .../szczodrzynski/edziennik/ui/behaviour/BehaviourFragment.kt | 1 + .../pl/szczodrzynski/edziennik/ui/grades/GradesListFragment.kt | 1 + .../java/pl/szczodrzynski/edziennik/ui/home/HomeFragment.kt | 2 ++ app/src/main/res/layout/fragment_home.xml | 2 +- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/behaviour/BehaviourFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/behaviour/BehaviourFragment.kt index 67ad5ee2..62405e76 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/behaviour/BehaviourFragment.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/behaviour/BehaviourFragment.kt @@ -20,6 +20,7 @@ class BehaviourFragment : BaseFragment( inflater = FragmentBehaviourBinding::inflate, ) { + override fun getRefreshScrollingView() = b.noticesView override fun getMarkAsReadType() = MetadataType.NOTICE private var displayMode = MODE_YEAR diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/GradesListFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/GradesListFragment.kt index ae8acfc4..e2d08410 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/GradesListFragment.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/grades/GradesListFragment.kt @@ -38,6 +38,7 @@ class GradesListFragment : BaseFragment inflater = GradesListFragmentBinding::inflate, ) { + override fun getRefreshScrollingView() = b.list override fun getMarkAsReadType() = MetadataType.GRADE override fun getBottomSheetItems() = listOf( BottomSheetPrimaryItem(true) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeFragment.kt index c9c14c6c..4254cb01 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeFragment.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/home/HomeFragment.kt @@ -78,6 +78,7 @@ class HomeFragment : BaseFragment( } } + override fun getRefreshScrollingView() = b.scrollView override fun getBottomSheetItems() = listOf( BottomSheetPrimaryItem(true) .withTitle(R.string.menu_add_remove_cards) @@ -174,6 +175,7 @@ class HomeFragment : BaseFragment( adapter.itemTouchHelper = itemTouchHelper b.list.layoutManager = LinearLayoutManager(activity) b.list.adapter = adapter + b.list.isNestedScrollingEnabled = false b.list.setAccessibilityDelegateCompat(object : RecyclerViewAccessibilityDelegate(b.list) { override fun getItemDelegate(): AccessibilityDelegateCompat { return object : ItemDelegate(this) { diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 67f5d23e..62620d3f 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -11,7 +11,7 @@