From 9885a8c1647e1b2dc736cd11ebf81463fb00ec86 Mon Sep 17 00:00:00 2001
From: ZIER <ezimmermann@kuhner.com>
Date: Mon, 9 Mar 2026 12:15:43 +0100
Subject: [PATCH] reorder items, so your less likely to share location on
 accident.

---
 lib/screens/channel_chat_screen.dart | 20 ++++++++++----------
 lib/screens/chat_screen.dart         | 20 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/lib/screens/channel_chat_screen.dart b/lib/screens/channel_chat_screen.dart
index f697801..605451d 100644
--- a/lib/screens/channel_chat_screen.dart
+++ b/lib/screens/channel_chat_screen.dart
@@ -1017,6 +1017,16 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
                   }
                 },
                 itemBuilder: (context) => [
+                  PopupMenuItem(
+                    value: _ChannelChatInputAction.shareLocation,
+                    child: Row(
+                      children: [
+                        const Icon(Icons.location_on, size: 20),
+                        const SizedBox(width: 8),
+                        Text(context.l10n.chat_shareLocation),
+                      ],
+                    ),
+                  ),
                   PopupMenuItem(
                     value: _ChannelChatInputAction.sendGif,
                     child: Row(
@@ -1037,16 +1047,6 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
                       ],
                     ),
                   ),
-                  PopupMenuItem(
-                    value: _ChannelChatInputAction.shareLocation,
-                    child: Row(
-                      children: [
-                        const Icon(Icons.location_on, size: 20),
-                        const SizedBox(width: 8),
-                        Text(context.l10n.chat_shareLocation),
-                      ],
-                    ),
-                  ),
                 ],
               ),
               Expanded(
diff --git a/lib/screens/chat_screen.dart b/lib/screens/chat_screen.dart
index bf7613f..d3394f2 100644
--- a/lib/screens/chat_screen.dart
+++ b/lib/screens/chat_screen.dart
@@ -359,6 +359,16 @@ class _ChatScreenState extends State<ChatScreen> {
                 }
               },
               itemBuilder: (context) => [
+                PopupMenuItem(
+                  value: _ChatInputAction.shareLocation,
+                  child: Row(
+                    children: [
+                      const Icon(Icons.my_location, size: 20),
+                      const SizedBox(width: 8),
+                      Text(context.l10n.chat_shareLocation),
+                    ],
+                  ),
+                ),
                 PopupMenuItem(
                   value: _ChatInputAction.sendGif,
                   child: Row(
@@ -379,16 +389,6 @@ class _ChatScreenState extends State<ChatScreen> {
                     ],
                   ),
                 ),
-                PopupMenuItem(
-                  value: _ChatInputAction.shareLocation,
-                  child: Row(
-                    children: [
-                      const Icon(Icons.my_location, size: 20),
-                      const SizedBox(width: 8),
-                      Text(context.l10n.chat_shareLocation),
-                    ],
-                  ),
-                ),
               ],
             ),
             Expanded(