From 2ee169d7e1d25555d24dff7571c869a2b8c6d0e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Sch=C3=BCller?= <sschueller@techdroid.com>
Date: Fri, 4 Feb 2022 23:47:05 +0100
Subject: [PATCH] fix: fix top app bar not loading on filter change

---
 .../presentation/video/VideoListScreen.kt     | 39 ++++++++++---------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video/VideoListScreen.kt b/app/src/main/java/net/schueller/peertube/feature_video/presentation/video/VideoListScreen.kt
index b59aca3..e7292dd 100644
--- a/app/src/main/java/net/schueller/peertube/feature_video/presentation/video/VideoListScreen.kt
+++ b/app/src/main/java/net/schueller/peertube/feature_video/presentation/video/VideoListScreen.kt
@@ -59,24 +59,6 @@ fun VideoListScreen(
     val context = LocalContext.current
 
 
-    // Events
-    LaunchedEffect(key1 = true) {
-        viewModel.eventFlow.collectLatest { event ->
-            when(event) {
-                is VideoListViewModel.UiEvent.ScrollToTop -> {
-                    listState.scrollToItem(index = 0)
-                }
-                is VideoListViewModel.UiEvent.ShowToast -> {
-                    Toast.makeText(
-                        context,
-                        event.message,
-                        event.length
-                    ).show()
-                }
-            }
-        }
-    }
-
     // Auto hide top appbar
     val toolBarHeight = 56.dp
     val toolBarHeightPx = with(LocalDensity.current) { toolBarHeight.roundToPx().toFloat()}
@@ -92,6 +74,27 @@ fun VideoListScreen(
         }
     }
 
+    // Events
+    LaunchedEffect(key1 = true) {
+        viewModel.eventFlow.collectLatest { event ->
+            when(event) {
+                is VideoListViewModel.UiEvent.ScrollToTop -> {
+                    listState.scrollToItem(index = 0)
+                    // reset toolbar to visible
+                    toolBarOffsetHeightPx.value = 0f
+                }
+                is VideoListViewModel.UiEvent.ShowToast -> {
+                    Toast.makeText(
+                        context,
+                        event.message,
+                        event.length
+                    ).show()
+                }
+            }
+        }
+    }
+
+
     Box(
         Modifier
             .fillMaxSize()