From 12cb0825ca5b6a2a8f7ffed9034945d918ac8015 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Tue, 3 Jun 2025 12:17:32 +0200
Subject: [PATCH] show "Archive conversation" just before Leave & Delete

same as for web/iOS

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../layout/dialog_conversation_operations.xml | 60 +++++++++----------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/app/src/main/res/layout/dialog_conversation_operations.xml b/app/src/main/res/layout/dialog_conversation_operations.xml
index a6ef03540..6062ff11e 100644
--- a/app/src/main/res/layout/dialog_conversation_operations.xml
+++ b/app/src/main/res/layout/dialog_conversation_operations.xml
@@ -195,6 +195,36 @@
                     android:textSize="@dimen/bottom_sheet_text_size" />
             </LinearLayout>
 
+            <LinearLayout
+                android:id="@+id/conversation_operation_rename"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/bottom_sheet_item_height"
+                android:background="?android:attr/selectableItemBackground"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:paddingStart="@dimen/standard_padding"
+                android:paddingEnd="@dimen/standard_padding"
+                tools:ignore="UseCompoundDrawables">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:contentDescription="@null"
+                    android:src="@drawable/ic_pencil_grey600_24dp"
+                    app:tint="@color/high_emphasis_menu_icon" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="start|center_vertical"
+                    android:paddingStart="40dp"
+                    android:paddingEnd="@dimen/zero"
+                    android:text="@string/nc_rename"
+                    android:textAlignment="viewStart"
+                    android:textColor="@color/high_emphasis_text"
+                    android:textSize="@dimen/bottom_sheet_text_size" />
+            </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/conversation_archive"
                 android:layout_width="match_parent"
@@ -226,36 +256,6 @@
                     android:textSize="@dimen/bottom_sheet_text_size" />
             </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/conversation_operation_rename"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/bottom_sheet_item_height"
-                android:background="?android:attr/selectableItemBackground"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:paddingStart="@dimen/standard_padding"
-                android:paddingEnd="@dimen/standard_padding"
-                tools:ignore="UseCompoundDrawables">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:contentDescription="@null"
-                    android:src="@drawable/ic_pencil_grey600_24dp"
-                    app:tint="@color/high_emphasis_menu_icon" />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="start|center_vertical"
-                    android:paddingStart="40dp"
-                    android:paddingEnd="@dimen/zero"
-                    android:text="@string/nc_rename"
-                    android:textAlignment="viewStart"
-                    android:textColor="@color/high_emphasis_text"
-                    android:textSize="@dimen/bottom_sheet_text_size" />
-            </LinearLayout>
-
             <LinearLayout
                 android:id="@+id/conversation_operation_leave"
                 android:layout_width="match_parent"