From 1d122abb1761c9ed30df9e376198fe598692d9b5 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 16 Jan 2024 16:42:55 +0100
Subject: [PATCH] Updated colors on some parts while in call

---
 app/src/main/AndroidManifest.xml                  |  1 +
 .../shape_call_bottom_sheet_background.xml        |  2 +-
 ...e_round_in_call_disabled_button_background.xml |  2 +-
 .../shape_round_in_call_gray_background.xml       |  2 +-
 app/src/main/res/layout/call_ended_actions.xml    |  2 +-
 app/src/main/res/layout/call_ended_fragment.xml   | 15 +++++++++++----
 app/src/main/res/values-night/themes.xml          |  1 +
 app/src/main/res/values/themes.xml                |  6 ++++++
 8 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2a97f4120..31bf52567 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -117,6 +117,7 @@
 
         <activity
             android:name=".ui.call.CallActivity"
+            android:theme="@style/Theme.LinphoneInCall"
             android:launchMode="singleTask"
             android:turnScreenOn="true"
             android:showWhenLocked="true"
diff --git a/app/src/main/res/drawable/shape_call_bottom_sheet_background.xml b/app/src/main/res/drawable/shape_call_bottom_sheet_background.xml
index 37ea330b5..ad5726169 100644
--- a/app/src/main/res/drawable/shape_call_bottom_sheet_background.xml
+++ b/app/src/main/res/drawable/shape_call_bottom_sheet_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <corners android:topRightRadius="20dp" android:topLeftRadius="20dp" />
-    <solid android:color="@color/gray_800"/>
+    <solid android:color="@color/gray_600"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_round_in_call_disabled_button_background.xml b/app/src/main/res/drawable/shape_round_in_call_disabled_button_background.xml
index d242fd79e..1076b3193 100644
--- a/app/src/main/res/drawable/shape_round_in_call_disabled_button_background.xml
+++ b/app/src/main/res/drawable/shape_round_in_call_disabled_button_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
     <size android:width="55dp" android:height="55dp" />
-    <solid android:color="@color/gray_600"/>
+    <solid android:color="@color/white"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_round_in_call_gray_background.xml b/app/src/main/res/drawable/shape_round_in_call_gray_background.xml
index 62367e1b1..68dd4325a 100644
--- a/app/src/main/res/drawable/shape_round_in_call_gray_background.xml
+++ b/app/src/main/res/drawable/shape_round_in_call_gray_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <corners android:radius="20dp" />
-    <solid android:color="@color/gray_600"/>
+    <solid android:color="@color/gray_900"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/call_ended_actions.xml b/app/src/main/res/layout/call_ended_actions.xml
index f7ee57e43..d5adc8e24 100644
--- a/app/src/main/res/layout/call_ended_actions.xml
+++ b/app/src/main/res/layout/call_ended_actions.xml
@@ -13,7 +13,7 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/call_main_actions_menu_height"
         android:paddingBottom="5dp"
-        android:background="@color/gray_900">
+        android:background="@drawable/shape_call_bottom_sheet_background">
 
         <ImageView
             android:id="@+id/hang_up"
diff --git a/app/src/main/res/layout/call_ended_fragment.xml b/app/src/main/res/layout/call_ended_fragment.xml
index 9000a42f5..0df8dbe6c 100644
--- a/app/src/main/res/layout/call_ended_fragment.xml
+++ b/app/src/main/res/layout/call_ended_fragment.xml
@@ -133,13 +133,18 @@
         <com.google.android.material.imageview.ShapeableImageView
             style="@style/avatar_imageview"
             android:id="@+id/avatar"
-            android:layout_width="@dimen/avatar_in_call_size"
-            android:layout_height="@dimen/avatar_in_call_size"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginTop="5dp"
             coilCallAvatar="@{viewModel.contact}"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintWidth_max="@dimen/avatar_in_call_size"
+            app:layout_constraintHeight_max="@dimen/avatar_in_call_size"
+            app:layout_constraintVertical_chainStyle="packed"
             app:layout_constraintEnd_toEndOf="@id/background"
             app:layout_constraintStart_toStartOf="@id/background"
             app:layout_constraintTop_toTopOf="@id/background"
-            app:layout_constraintBottom_toBottomOf="@id/background"/>
+            app:layout_constraintBottom_toTopOf="@id/name"/>
 
         <ImageView
             android:id="@+id/trust_badge"
@@ -160,6 +165,7 @@
             android:textColor="@color/white"
             android:textSize="22sp"
             app:layout_constraintTop_toBottomOf="@id/avatar"
+            app:layout_constraintBottom_toTopOf="@id/address"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
 
@@ -168,11 +174,12 @@
             android:id="@+id/address"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="5dp"
             android:text="@{viewModel.displayedAddress, default=`sip:johndoe@sip.linphone.org`}"
             android:textColor="@color/white"
             android:textSize="14sp"
-            android:visibility="@{viewModel.conferenceModel.isCurrentCallInConference ? View.GONE : View.VISIBLE}"
             app:layout_constraintTop_toBottomOf="@id/name"
+            app:layout_constraintBottom_toBottomOf="@id/background"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
 
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 157b54375..8af58fea9 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -13,6 +13,7 @@
         <!-- Customize your theme here. -->
         <item name="android:windowActivityTransitions">true</item>
         <item name="android:windowBackground">@color/black</item>
+        <item name="android:navigationBarColor">@color/black</item>
 
         <item name="color_main1_100">@color/orange_main_100</item>
         <item name="color_main1_300">@color/orange_main_300</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 9a62d92c8..6422e9fad 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -14,6 +14,7 @@
         <!-- Customize your theme here. -->
         <item name="android:windowActivityTransitions">true</item>
         <item name="android:windowBackground">@color/white</item>
+        <item name="android:navigationBarColor">@color/white</item>
 
         <item name="color_main1_100">@color/orange_main_100</item>
         <item name="color_main1_300">@color/orange_main_300</item>
@@ -55,6 +56,11 @@
         <item name="color_on_main">@color/white</item>
     </style>
 
+    <!-- In-call application theme. -->
+    <style name="Theme.LinphoneInCall" parent="Theme.Linphone">
+        <item name="android:navigationBarColor">@color/gray_600</item>
+    </style>
+
     <style name="Theme.LinphoneDialog" parent="Theme.Linphone">
         <item name="android:windowAnimationStyle">@null</item>
         <item name="android:windowBackground">@color/transparent_color</item>