reorder message action items

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>

1 files changed, 20 insertions, 22 deletions

diff --git a/app/src/main/res/layout/dialog_message_actions.xml b/app/src/main/res/layout/dialog_message_actions.xml
index 328353a29..f79ccbb41 100644
--- a/app/src/main/res/layout/dialog_message_actions.xml
+++ b/app/src/main/res/layout/dialog_message_actions.xml
@@ -113,11 +113,10 @@
         android:layout_height="wrap_content"
         android:paddingStart="@dimen/standard_padding"
         android:paddingEnd="@dimen/standard_padding"
-
         android:orientation="vertical">
 
         <LinearLayout
-            android:id="@+id/menu_copy_message"
+            android:id="@+id/menu_reply_to_message"
             android:layout_width="match_parent"
             android:layout_height="@dimen/bottom_sheet_item_height"
             android:background="?android:attr/selectableItemBackground"
@@ -126,21 +125,21 @@
             tools:ignore="UseCompoundDrawables">
 
             <ImageView
-                android:id="@+id/menu_icon_copy_message"
+                android:id="@+id/menu_icon_reply_to_message"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@null"
-                android:src="@drawable/ic_content_copy"
+                android:src="@drawable/ic_reply"
                 app:tint="@color/high_emphasis_menu_icon" />
 
             <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/menu_text_copy_message"
+                android:id="@+id/menu_text_reply_to_message"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="start|center_vertical"
                 android:paddingStart="@dimen/standard_double_padding"
                 android:paddingEnd="@dimen/zero"
-                android:text="@string/nc_copy_message"
+                android:text="@string/nc_reply"
                 android:textAlignment="viewStart"
                 android:textColor="@color/high_emphasis_text"
                 android:textSize="@dimen/bottom_sheet_text_size" />
@@ -148,7 +147,7 @@
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/menu_mark_as_unread"
+            android:id="@+id/menu_reply_privately"
             android:layout_width="match_parent"
             android:layout_height="@dimen/bottom_sheet_item_height"
             android:background="?android:attr/selectableItemBackground"
@@ -157,21 +156,21 @@
             tools:ignore="UseCompoundDrawables">
 
             <ImageView
-                android:id="@+id/menu_icon_mark_as_unread"
+                android:id="@+id/menu_icon_reply_privately"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@null"
-                android:src="@drawable/ic_eye_off"
+                android:src="@drawable/ic_reply"
                 app:tint="@color/high_emphasis_menu_icon" />
 
             <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/menu_text_mark_as_unread"
+                android:id="@+id/menu_text_reply_privately"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="start|center_vertical"
                 android:paddingStart="@dimen/standard_double_padding"
                 android:paddingEnd="@dimen/zero"
-                android:text="@string/nc_mark_as_unread"
+                android:text="@string/nc_reply_privately"
                 android:textAlignment="viewStart"
                 android:textColor="@color/high_emphasis_text"
                 android:textSize="@dimen/bottom_sheet_text_size" />
@@ -210,7 +209,7 @@
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/menu_reply_to_message"
+            android:id="@+id/menu_mark_as_unread"
             android:layout_width="match_parent"
             android:layout_height="@dimen/bottom_sheet_item_height"
             android:background="?android:attr/selectableItemBackground"
@@ -219,21 +218,21 @@
             tools:ignore="UseCompoundDrawables">
 
             <ImageView
-                android:id="@+id/menu_icon_reply_to_message"
+                android:id="@+id/menu_icon_mark_as_unread"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@null"
-                android:src="@drawable/ic_reply"
+                android:src="@drawable/ic_eye_off"
                 app:tint="@color/high_emphasis_menu_icon" />
 
             <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/menu_text_reply_to_message"
+                android:id="@+id/menu_text_mark_as_unread"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="start|center_vertical"
                 android:paddingStart="@dimen/standard_double_padding"
                 android:paddingEnd="@dimen/zero"
-                android:text="@string/nc_reply"
+                android:text="@string/nc_mark_as_unread"
                 android:textAlignment="viewStart"
                 android:textColor="@color/high_emphasis_text"
                 android:textSize="@dimen/bottom_sheet_text_size" />
@@ -241,7 +240,7 @@
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/menu_reply_privately"
+            android:id="@+id/menu_copy_message"
             android:layout_width="match_parent"
             android:layout_height="@dimen/bottom_sheet_item_height"
             android:background="?android:attr/selectableItemBackground"
@@ -250,21 +249,21 @@
             tools:ignore="UseCompoundDrawables">
 
             <ImageView
-                android:id="@+id/menu_icon_reply_privately"
+                android:id="@+id/menu_icon_copy_message"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@null"
-                android:src="@drawable/ic_reply"
+                android:src="@drawable/ic_content_copy"
                 app:tint="@color/high_emphasis_menu_icon" />
 
             <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/menu_text_reply_privately"
+                android:id="@+id/menu_text_copy_message"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="start|center_vertical"
                 android:paddingStart="@dimen/standard_double_padding"
                 android:paddingEnd="@dimen/zero"
-                android:text="@string/nc_reply_privately"
+                android:text="@string/nc_copy_message"
                 android:textAlignment="viewStart"
                 android:textColor="@color/high_emphasis_text"
                 android:textSize="@dimen/bottom_sheet_text_size" />
@@ -302,7 +301,6 @@
 
         </LinearLayout>
 
-
     </LinearLayout>
 
 </LinearLayout>