From a5c070b3536689fef12121e5eaae7440c7162296 Mon Sep 17 00:00:00 2001
From: M57 <41645758+Hy4ri@users.noreply.github.com>
Date: Sun, 21 Jun 2026 10:24:32 +0300
Subject: [PATCH] ux: swap positions of new chat and search buttons in top bar
 (Issue #212) (#226)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Swapped the order of the Search toggle and New Chat icon buttons
in the ChatScreen top bar actions slot. Search is now on the left
(right-side outer position) which matches user expectations —
the new chat button was accidentally tapped when reaching for search.

Fixes #212

Co-authored-by: M57 <hy4ri@users.noreply.github.com>
---
 .../com/m57/hermescontrol/ui/chat/ChatScreen.kt    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt b/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt
index 71880f2f..e0de3b84 100644
--- a/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt
+++ b/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt
@@ -287,13 +287,6 @@ fun ChatScreen(
             }
         },
         actions = {
-            IconButton(onClick = { viewModel.createNewSession() }) {
-                Icon(
-                    imageVector = Icons.Filled.Add,
-                    contentDescription = "New Chat",
-                )
-            }
-
             // Search toggle
             IconButton(onClick = { viewModel.toggleSearch() }) {
                 Icon(
@@ -303,6 +296,13 @@ fun ChatScreen(
                         if (state.isSearchActive) "Close search" else "Search",
                 )
             }
+
+            IconButton(onClick = { viewModel.createNewSession() }) {
+                Icon(
+                    imageVector = Icons.Filled.Add,
+                    contentDescription = "New Chat",
+                )
+            }
         },
     ) { _ ->
         Column(