From c03f1120d3776c8cfb78b64766a1ccd350d2d4e5 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 9 Feb 2026 15:51:48 +0100
Subject: [PATCH] Fixed some duplicated IDs + wrong content description for
 drawer icon

---
 .../call_media_encryption_stats_bottom_sheet.xml     |  4 ++--
 .../main/res/layout-land/call_stats_bottom_sheet.xml |  8 ++++----
 .../main/res/layout-land/main_activity_top_bar.xml   |  2 +-
 .../layout-sw600dp-land/main_activity_top_bar.xml    |  2 +-
 .../layout/chat_bubble_emoji_picker_bottom_sheet.xml |  6 +++---
 .../main/res/layout/chat_conversation_edit_area.xml  |  4 ++--
 .../res/layout/chat_conversation_file_pickers.xml    |  4 ++--
 .../main/res/layout/chat_conversation_reply_area.xml |  6 +++---
 .../main/res/layout/chat_message_bottom_sheet.xml    |  4 ++--
 .../main/res/layout/main_activity_alert_top_bar.xml  | 10 +++++-----
 .../res/layout/main_activity_in_call_top_bar.xml     | 12 ++++++------
 .../layout/main_activity_pending_sharing_top_bar.xml | 10 +++++-----
 app/src/main/res/layout/main_activity_top_bar.xml    |  2 +-
 13 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/app/src/main/res/layout-land/call_media_encryption_stats_bottom_sheet.xml b/app/src/main/res/layout-land/call_media_encryption_stats_bottom_sheet.xml
index ec5cc2e90..380f4528a 100644
--- a/app/src/main/res/layout-land/call_media_encryption_stats_bottom_sheet.xml
+++ b/app/src/main/res/layout-land/call_media_encryption_stats_bottom_sheet.xml
@@ -24,7 +24,7 @@
         app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
     <com.google.android.material.bottomsheet.BottomSheetDragHandleView
-        android:id="@+id/handle"
+        android:id="@+id/media_encryption_stats_bottom_sheet_handle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:padding="11dp"
@@ -42,7 +42,7 @@
             android:layout_marginBottom="20dp"
             android:background="@drawable/shape_squircle_gray_600_background"
             app:columnCount="2"
-            app:layout_constraintTop_toBottomOf="@id/handle"
+            app:layout_constraintTop_toBottomOf="@id/media_encryption_stats_bottom_sheet_handle"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toBottomOf="parent">
diff --git a/app/src/main/res/layout-land/call_stats_bottom_sheet.xml b/app/src/main/res/layout-land/call_stats_bottom_sheet.xml
index 739a82c4b..45c6d9f17 100644
--- a/app/src/main/res/layout-land/call_stats_bottom_sheet.xml
+++ b/app/src/main/res/layout-land/call_stats_bottom_sheet.xml
@@ -22,7 +22,7 @@
         app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
         <com.google.android.material.bottomsheet.BottomSheetDragHandleView
-            android:id="@+id/handle"
+            android:id="@+id/stats_bottom_sheet_handle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:padding="11dp"
@@ -43,7 +43,7 @@
             android:background="@drawable/shape_squircle_gray_600_background"
             app:layout_constraintVertical_bias="0"
             app:layout_constraintHorizontal_chainStyle="spread_inside"
-            app:layout_constraintTop_toBottomOf="@id/handle"
+            app:layout_constraintTop_toBottomOf="@id/stats_bottom_sheet_handle"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toStartOf="@id/video_stats"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -140,7 +140,7 @@
             android:layout_marginBottom="20dp"
             android:background="@drawable/shape_squircle_gray_600_background"
             android:visibility="@{model.isVideoEnabled ? View.VISIBLE : View.GONE}"
-            app:layout_constraintTop_toBottomOf="@id/handle"
+            app:layout_constraintTop_toBottomOf="@id/stats_bottom_sheet_handle"
             app:layout_constraintStart_toEndOf="@id/audio_stats"
             app:layout_constraintEnd_toStartOf="@id/fec_stats"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -249,7 +249,7 @@
             android:background="@drawable/shape_squircle_gray_600_background"
             android:visibility="@{model.fecEnabled ? View.VISIBLE : View.GONE}"
             app:layout_constraintVertical_bias="0"
-            app:layout_constraintTop_toBottomOf="@id/handle"
+            app:layout_constraintTop_toBottomOf="@id/stats_bottom_sheet_handle"
             app:layout_constraintStart_toEndOf="@id/video_stats"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout-land/main_activity_top_bar.xml b/app/src/main/res/layout-land/main_activity_top_bar.xml
index e025dc746..7f171ce58 100644
--- a/app/src/main/res/layout-land/main_activity_top_bar.xml
+++ b/app/src/main/res/layout-land/main_activity_top_bar.xml
@@ -53,7 +53,7 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:src="@drawable/list"
-            android:contentDescription="@string/content_description_open_filter"
+            android:contentDescription="@string/content_description_open_drawer_menu_icon"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent" />
diff --git a/app/src/main/res/layout-sw600dp-land/main_activity_top_bar.xml b/app/src/main/res/layout-sw600dp-land/main_activity_top_bar.xml
index 9eff04add..a70d7ebcf 100644
--- a/app/src/main/res/layout-sw600dp-land/main_activity_top_bar.xml
+++ b/app/src/main/res/layout-sw600dp-land/main_activity_top_bar.xml
@@ -52,7 +52,7 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:src="@drawable/list"
-            android:contentDescription="@string/content_description_open_filter"
+            android:contentDescription="@string/content_description_open_drawer_menu_icon"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/chat_bubble_emoji_picker_bottom_sheet.xml b/app/src/main/res/layout/chat_bubble_emoji_picker_bottom_sheet.xml
index 4e5f9fa25..2b003f47e 100644
--- a/app/src/main/res/layout/chat_bubble_emoji_picker_bottom_sheet.xml
+++ b/app/src/main/res/layout/chat_bubble_emoji_picker_bottom_sheet.xml
@@ -19,7 +19,7 @@
         app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
         <com.google.android.material.bottomsheet.BottomSheetDragHandleView
-            android:id="@+id/handle"
+            android:id="@+id/emoji_picker_bottom_sheet_handle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:padding="11dp"
@@ -30,12 +30,12 @@
             app:layout_constraintEnd_toEndOf="parent" />
 
         <androidx.emoji2.emojipicker.EmojiPickerView
-            android:id="@+id/emoji_picker"
+            android:id="@+id/emoji_picker_bottom_sheet"
             android:layout_width="match_parent"
             android:layout_height="@dimen/chat_bubble_emoji_picker_height"
             android:nestedScrollingEnabled="true"
             app:emojiPickedListener="@{(emoji) -> model.sendReaction(emoji.emoji)}"
-            app:layout_constraintTop_toBottomOf="@id/handle"
+            app:layout_constraintTop_toBottomOf="@id/emoji_picker_bottom_sheet_handle"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"/>
diff --git a/app/src/main/res/layout/chat_conversation_edit_area.xml b/app/src/main/res/layout/chat_conversation_edit_area.xml
index 958155ccb..992520a6f 100644
--- a/app/src/main/res/layout/chat_conversation_edit_area.xml
+++ b/app/src/main/res/layout/chat_conversation_edit_area.xml
@@ -22,7 +22,7 @@
             app:layout_constraintTop_toTopOf="parent"/>
 
         <ImageView
-            android:id="@+id/cancel"
+            android:id="@+id/cancel_edit"
             android:onClick="@{() -> viewModel.cancelEdit()}"
             android:layout_width="@dimen/icon_size"
             android:layout_height="@dimen/icon_size"
@@ -62,7 +62,7 @@
             app:layout_constraintTop_toBottomOf="@id/edit_header"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/cancel" />
+            app:layout_constraintEnd_toStartOf="@id/cancel_edit" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/chat_conversation_file_pickers.xml b/app/src/main/res/layout/chat_conversation_file_pickers.xml
index 4af0b0232..3253d6118 100644
--- a/app/src/main/res/layout/chat_conversation_file_pickers.xml
+++ b/app/src/main/res/layout/chat_conversation_file_pickers.xml
@@ -60,13 +60,13 @@
             android:drawablePadding="5dp"
             app:drawableTint="@color/icon_color_selector"
             app:layout_constraintStart_toEndOf="@id/capture_image"
-            app:layout_constraintEnd_toStartOf="@id/attach_file"
+            app:layout_constraintEnd_toStartOf="@id/pick_file"
             app:layout_constraintTop_toBottomOf="@id/file_pickers_separator"
             app:layout_constraintBottom_toBottomOf="parent" />
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style"
-            android:id="@+id/attach_file"
+            android:id="@+id/pick_file"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:onClick="@{openFilePickerClickListener}"
diff --git a/app/src/main/res/layout/chat_conversation_reply_area.xml b/app/src/main/res/layout/chat_conversation_reply_area.xml
index 8c1feae91..50a6abff8 100644
--- a/app/src/main/res/layout/chat_conversation_reply_area.xml
+++ b/app/src/main/res/layout/chat_conversation_reply_area.xml
@@ -23,7 +23,7 @@
             app:layout_constraintTop_toTopOf="parent"/>
 
         <ImageView
-            android:id="@+id/cancel"
+            android:id="@+id/cancel_reply"
             android:onClick="@{() -> viewModel.cancelReply()}"
             android:layout_width="@dimen/icon_size"
             android:layout_height="@dimen/icon_size"
@@ -60,7 +60,7 @@
             android:textColor="?attr/color_main2_500"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toEndOf="@id/reply_header"
-            app:layout_constraintEnd_toStartOf="@id/cancel" />
+            app:layout_constraintEnd_toStartOf="@id/cancel_reply" />
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_300"
@@ -77,7 +77,7 @@
             app:layout_constraintTop_toBottomOf="@id/reply_header"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/cancel" />
+            app:layout_constraintEnd_toStartOf="@id/cancel_reply" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/chat_message_bottom_sheet.xml b/app/src/main/res/layout/chat_message_bottom_sheet.xml
index 1fac75997..9a15b0be6 100644
--- a/app/src/main/res/layout/chat_message_bottom_sheet.xml
+++ b/app/src/main/res/layout/chat_message_bottom_sheet.xml
@@ -19,7 +19,7 @@
         app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
         <com.google.android.material.bottomsheet.BottomSheetDragHandleView
-            android:id="@+id/handle"
+            android:id="@+id/message_bottom_sheet_handle"
             android:onClick="@{handleClickedListener}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -36,7 +36,7 @@
             android:layout_height="wrap_content"
             android:background="@color/transparent_color"
             android:layout_marginBottom="16dp"
-            app:layout_constraintTop_toBottomOf="@id/handle"
+            app:layout_constraintTop_toBottomOf="@id/message_bottom_sheet_handle"
             app:layout_constraintBottom_toTopOf="@id/bottom_sheet_list"
             app:tabMode="fixed"
             app:tabUnboundedRipple="true"
diff --git a/app/src/main/res/layout/main_activity_alert_top_bar.xml b/app/src/main/res/layout/main_activity_alert_top_bar.xml
index 2aa6962c2..b4f9ed078 100644
--- a/app/src/main/res/layout/main_activity_alert_top_bar.xml
+++ b/app/src/main/res/layout/main_activity_alert_top_bar.xml
@@ -17,7 +17,7 @@
         android:onClick="@{() -> viewModel.onTopBarClicked()}">
 
         <ImageView
-            android:id="@+id/icon"
+            android:id="@+id/alert_icon"
             android:layout_width="@dimen/icon_size"
             android:layout_height="@dimen/icon_size"
             android:layout_marginStart="16dp"
@@ -32,7 +32,7 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_300"
-            android:id="@+id/label"
+            android:id="@+id/alert_label"
             android:layout_width="0dp"
             android:layout_height="30dp"
             android:layout_marginStart="5dp"
@@ -45,13 +45,13 @@
             android:textSize="16sp"
             android:maxLines="1"
             android:ellipsize="end"
-            app:layout_constraintEnd_toStartOf="@id/close_notif"
-            app:layout_constraintStart_toEndOf="@id/icon"
+            app:layout_constraintEnd_toStartOf="@id/alert_close"
+            app:layout_constraintStart_toEndOf="@id/alert_icon"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"/>
 
         <ImageView
-            android:id="@+id/close_notif"
+            android:id="@+id/alert_close"
             android:onClick="@{() -> viewModel.closeTopBar()}"
             android:layout_width="@dimen/icon_size"
             android:layout_height="@dimen/icon_size"
diff --git a/app/src/main/res/layout/main_activity_in_call_top_bar.xml b/app/src/main/res/layout/main_activity_in_call_top_bar.xml
index 9130c5bb2..001103b6d 100644
--- a/app/src/main/res/layout/main_activity_in_call_top_bar.xml
+++ b/app/src/main/res/layout/main_activity_in_call_top_bar.xml
@@ -17,7 +17,7 @@
         android:onClick="@{() -> viewModel.onCallTopBarClicked()}">
 
         <ImageView
-            android:id="@+id/icon"
+            android:id="@+id/alert_call_icon"
             android:layout_width="@dimen/icon_size"
             android:layout_height="@dimen/icon_size"
             android:layout_marginStart="16dp"
@@ -32,7 +32,7 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_300"
-            android:id="@+id/label"
+            android:id="@+id/alert_call_label"
             android:layout_width="0dp"
             android:layout_height="30dp"
             android:layout_marginStart="5dp"
@@ -45,14 +45,14 @@
             android:textSize="16sp"
             android:maxLines="1"
             android:ellipsize="end"
-            app:layout_constraintEnd_toStartOf="@id/call_time"
-            app:layout_constraintStart_toEndOf="@id/icon"
+            app:layout_constraintEnd_toStartOf="@id/alert_call_time"
+            app:layout_constraintStart_toEndOf="@id/alert_call_icon"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"/>
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style"
-            android:id="@+id/call_time"
+            android:id="@+id/alert_call_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
@@ -61,7 +61,7 @@
             android:textColor="@color/bc_white"
             android:textSize="14sp"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/label"
+            app:layout_constraintStart_toEndOf="@id/alert_call_label"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"/>
 
diff --git a/app/src/main/res/layout/main_activity_pending_sharing_top_bar.xml b/app/src/main/res/layout/main_activity_pending_sharing_top_bar.xml
index bf5cc9e16..ee8f98977 100644
--- a/app/src/main/res/layout/main_activity_pending_sharing_top_bar.xml
+++ b/app/src/main/res/layout/main_activity_pending_sharing_top_bar.xml
@@ -16,7 +16,7 @@
         android:background="@drawable/color_main_activity_top_bar">
 
         <ImageView
-            android:id="@+id/icon"
+            android:id="@+id/file_sharing_alert_icon"
             android:layout_width="@dimen/icon_size"
             android:layout_height="@dimen/icon_size"
             android:layout_marginStart="16dp"
@@ -31,7 +31,7 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_300"
-            android:id="@+id/label"
+            android:id="@+id/file_sharing_alert_label"
             android:layout_width="0dp"
             android:layout_height="30dp"
             android:layout_marginStart="5dp"
@@ -44,13 +44,13 @@
             android:textSize="16sp"
             android:maxLines="1"
             android:ellipsize="end"
-            app:layout_constraintEnd_toStartOf="@id/close_notif"
-            app:layout_constraintStart_toEndOf="@id/icon"
+            app:layout_constraintEnd_toStartOf="@id/file_sharing_alert_close"
+            app:layout_constraintStart_toEndOf="@id/file_sharing_alert_icon"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"/>
 
         <ImageView
-            android:id="@+id/close_notif"
+            android:id="@+id/file_sharing_alert_close"
             android:onClick="@{() -> viewModel.cancelFileOrTextSharing()}"
             android:layout_width="@dimen/icon_size"
             android:layout_height="@dimen/icon_size"
diff --git a/app/src/main/res/layout/main_activity_top_bar.xml b/app/src/main/res/layout/main_activity_top_bar.xml
index cd3eb9c31..b49f0af09 100644
--- a/app/src/main/res/layout/main_activity_top_bar.xml
+++ b/app/src/main/res/layout/main_activity_top_bar.xml
@@ -53,7 +53,7 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:src="@drawable/list"
-            android:contentDescription="@string/content_description_open_filter"
+            android:contentDescription="@string/content_description_open_drawer_menu_icon"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent" />