From b057163b431683e50022e45027487eb3b642bcf6 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 3 Feb 2025 17:15:28 +0100
Subject: [PATCH] Removed useless back button

---
 .../res/layout-land/call_ended_fragment.xml   | 22 +++++--------------
 .../layout-land/call_outgoing_fragment.xml    | 16 +-------------
 .../main/res/layout/call_ended_fragment.xml   | 22 +++++--------------
 .../res/layout/call_outgoing_fragment.xml     |  1 -
 4 files changed, 11 insertions(+), 50 deletions(-)

diff --git a/app/src/main/res/layout-land/call_ended_fragment.xml b/app/src/main/res/layout-land/call_ended_fragment.xml
index bef0449ff..2a8e0554a 100644
--- a/app/src/main/res/layout-land/call_ended_fragment.xml
+++ b/app/src/main/res/layout-land/call_ended_fragment.xml
@@ -15,38 +15,26 @@
         android:layout_height="match_parent"
         android:background="@color/gray_900">
 
-        <ImageView
-            android:id="@+id/back"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/top_bar_height"
-            android:adjustViewBounds="true"
-            android:padding="15dp"
-            android:src="@drawable/caret_left"
-            android:contentDescription="@string/content_description_go_back_icon"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:tint="@color/bc_white" />
-
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/call_header_style"
             android:id="@+id/call_direction_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
+            android:layout_marginTop="10dp"
             android:text="@{viewModel.terminatedByUser ? @string/call_locally_ended : @string/call_remotely_ended, default=@string/call_locally_ended}"
-            app:layout_constraintStart_toEndOf="@id/back"
-            app:layout_constraintTop_toTopOf="@id/back"
-            app:layout_constraintBottom_toBottomOf="@id/back"/>
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"/>
 
         <include
             android:id="@+id/call_media_encryption_info"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:visibility="@{viewModel.callDuration > 0 ? View.VISIBLE : View.GONE, default=gone}"
+            android:visibility="@{viewModel.callDuration > 0 ? View.VISIBLE : View.GONE}"
             layout="@layout/call_media_encryption_info"
             bind:viewModel="@{viewModel}"
             app:layout_constraintTop_toBottomOf="@id/call_direction_label"
-            app:layout_constraintStart_toEndOf="@id/back"
+            app:layout_constraintStart_toStartOf="@id/call_direction_label"
             app:layout_constraintEnd_toEndOf="parent"/>
 
         <include
diff --git a/app/src/main/res/layout-land/call_outgoing_fragment.xml b/app/src/main/res/layout-land/call_outgoing_fragment.xml
index 81f9c0de9..2f9c0292f 100644
--- a/app/src/main/res/layout-land/call_outgoing_fragment.xml
+++ b/app/src/main/res/layout-land/call_outgoing_fragment.xml
@@ -15,19 +15,6 @@
         android:layout_height="match_parent"
         android:background="@color/gray_900">
 
-        <ImageView
-            android:id="@+id/back"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/top_bar_height"
-            android:adjustViewBounds="true"
-            android:padding="15dp"
-            android:src="@drawable/caret_left"
-            android:contentDescription="@string/content_description_go_back_icon"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            android:visibility="invisible"
-            app:tint="@color/bc_white" />
-
         <ImageView
             android:id="@+id/call_direction_icon"
             android:layout_width="12dp"
@@ -50,8 +37,7 @@
             android:layout_marginBottom="10dp"
             android:text="@string/call_outgoing"
             app:layout_constraintStart_toEndOf="@id/call_direction_icon"
-            app:layout_constraintTop_toTopOf="@id/back"
-            app:layout_constraintBottom_toBottomOf="@id/back"/>
+            app:layout_constraintTop_toTopOf="parent"/>
 
         <include
             android:id="@+id/avatar"
diff --git a/app/src/main/res/layout/call_ended_fragment.xml b/app/src/main/res/layout/call_ended_fragment.xml
index 6d9666522..dfc8431d6 100644
--- a/app/src/main/res/layout/call_ended_fragment.xml
+++ b/app/src/main/res/layout/call_ended_fragment.xml
@@ -15,38 +15,26 @@
         android:layout_height="match_parent"
         android:background="@color/gray_900">
 
-        <ImageView
-            android:id="@+id/back"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/top_bar_height"
-            android:adjustViewBounds="true"
-            android:padding="15dp"
-            android:src="@drawable/caret_left"
-            android:contentDescription="@string/content_description_go_back_icon"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:tint="@color/bc_white" />
-
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/call_header_style"
             android:id="@+id/call_direction_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
+            android:layout_marginTop="10dp"
             android:text="@{viewModel.terminatedByUser ? @string/call_locally_ended : @string/call_remotely_ended, default=@string/call_locally_ended}"
-            app:layout_constraintStart_toEndOf="@id/back"
-            app:layout_constraintTop_toTopOf="@id/back"
-            app:layout_constraintBottom_toBottomOf="@id/back"/>
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"/>
 
         <include
             android:id="@+id/call_media_encryption_info"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:visibility="@{viewModel.callDuration > 0 ? View.VISIBLE : View.GONE, default=gone}"
+            android:visibility="@{viewModel.callDuration > 0 ? View.VISIBLE : View.GONE}"
             layout="@layout/call_media_encryption_info"
             bind:viewModel="@{viewModel}"
             app:layout_constraintTop_toBottomOf="@id/call_direction_label"
-            app:layout_constraintStart_toEndOf="@id/back"
+            app:layout_constraintStart_toStartOf="@id/call_direction_label"
             app:layout_constraintEnd_toEndOf="parent"/>
 
         <include
diff --git a/app/src/main/res/layout/call_outgoing_fragment.xml b/app/src/main/res/layout/call_outgoing_fragment.xml
index f36acb79f..fe69ccf88 100644
--- a/app/src/main/res/layout/call_outgoing_fragment.xml
+++ b/app/src/main/res/layout/call_outgoing_fragment.xml
@@ -34,7 +34,6 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
             android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp"
             android:text="@string/call_outgoing"
             app:layout_constraintStart_toEndOf="@id/call_direction_icon"
             app:layout_constraintTop_toTopOf="parent"/>