From 432975f413fcb64f4d55eb91c3421bcff06c011d Mon Sep 17 00:00:00 2001
From: Mauro <34335419+Velin92@users.noreply.github.com>
Date: Thu, 31 Aug 2023 17:03:27 +0200
Subject: [PATCH] New Room button has been moved to the top (#1604)

* completed

* removed old toolbar visibility stuff
---
 .../Screens/HomeScreen/View/HomeScreen.swift    | 17 ++---------------
 changelog.d/1602.change                         |  1 +
 2 files changed, 3 insertions(+), 15 deletions(-)
 create mode 100644 changelog.d/1602.change

diff --git a/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift b/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift
index a9bfae404..aa3b8dde7 100644
--- a/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift
+++ b/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift
@@ -23,17 +23,8 @@ struct HomeScreen: View {
     @ObservedObject var context: HomeScreenViewModel.Context
     
     @State private var scrollViewAdapter = ScrollViewAdapter()
-    @State private var lastScrollDirection: ScrollViewAdapter.ScrollDirection = .up
     @State private var isSearching = false
     
-    var bottomBarVisibility: Visibility {
-        switch context.viewState.roomListMode {
-        case .skeletons: return .hidden
-        case .empty: return .visible
-        case .rooms: return lastScrollDirection == .up ? .automatic : .hidden
-        }
-    }
-    
     var body: some View {
         GeometryReader { geometry in
             ScrollView {
@@ -78,9 +69,6 @@ struct HomeScreen: View {
             .onChange(of: context.searchQuery) { _ in
                 updateVisibleRange()
             }
-            .onReceive(scrollViewAdapter.scrollDirection) { direction in
-                withAnimation(.elementDefault) { lastScrollDirection = direction }
-            }
             .onChange(of: context.viewState.visibleRooms) { _ in
                 updateVisibleRange()
             }
@@ -96,7 +84,6 @@ struct HomeScreen: View {
                actions: leaveRoomAlertActions,
                message: leaveRoomAlertMessage)
         .navigationTitle(L10n.screenRoomlistMainSpaceTitle)
-        .toolbar(bottomBarVisibility, for: .bottomBar)
         .toolbar { toolbar }
         .background(Color.compound.bgCanvasDefault.ignoresSafeArea())
         .track(screen: .home)
@@ -163,8 +150,7 @@ struct HomeScreen: View {
             HomeScreenUserMenuButton(context: context)
         }
         
-        ToolbarItemGroup(placement: .bottomBar) {
-            Spacer()
+        ToolbarItemGroup(placement: .primaryAction) {
             newRoomButton
         }
     }
@@ -174,6 +160,7 @@ struct HomeScreen: View {
             context.send(viewAction: .startChat)
         } label: {
             Image(systemName: "square.and.pencil")
+                .fontWeight(.semibold)
         }
         .accessibilityIdentifier(A11yIdentifiers.homeScreen.startChat)
     }
diff --git a/changelog.d/1602.change b/changelog.d/1602.change
new file mode 100644
index 000000000..ff7bf10c2
--- /dev/null
+++ b/changelog.d/1602.change
@@ -0,0 +1 @@
+New room button has been moved to the top.
\ No newline at end of file