fix

pantasystem · Aug 7, 2023 · 9f71f23 · 9f71f23
1 parent 6589da7
commit 9f71f23
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/...les/features/note/src/main/java/net/pantasystem/milktea/note/timeline/TimelineFragment.kt b/...les/features/note/src/main/java/net/pantasystem/milktea/note/timeline/TimelineFragment.kt
@@ -187,11 +187,14 @@ class TimelineFragment : Fragment(R.layout.fragment_swipe_refresh_recycler_view)
             mViewModel.loadNew()
         }
 
-        mViewModel.isLoading.observe(viewLifecycleOwner, Observer {
-            if (it != null && !it) {
+        mViewModel.isLoading.onEach {
+            if (!it) {
                 mBinding.refresh.isRefreshing = false
             }
-        })
+        }.flowWithLifecycle(
+            viewLifecycleOwner.lifecycle,
+            Lifecycle.State.RESUMED
+        ).launchIn(viewLifecycleOwner.lifecycleScope)
 
 
         mBinding.listView.adapter = adapter

diff --git a/...s/notification/src/main/java/net/pantasystem/milktea/notification/NotificationFragment.kt b/...s/notification/src/main/java/net/pantasystem/milktea/notification/NotificationFragment.kt
@@ -141,9 +141,12 @@ class NotificationFragment : Fragment(R.layout.fragment_notification) {
         ).launchIn(viewLifecycleOwner.lifecycleScope)
 
 
-        mViewModel.isLoading.observe(viewLifecycleOwner) {
+        mViewModel.isLoading.onEach {
             mBinding.notificationSwipeRefresh.isRefreshing = it
-        }
+        }.flowWithLifecycle(
+            viewLifecycleOwner.lifecycle,
+            Lifecycle.State.RESUMED
+        ).launchIn(viewLifecycleOwner.lifecycleScope)
 
         mBinding.notificationSwipeRefresh.setOnRefreshListener {
             mViewModel.loadInit()