From 466395a34b6a02bba4de6a8ec008e5cc1871f46d Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 16 Dec 2024 11:29:42 +0100
Subject: [PATCH] Added + icon under 0 in dialpad, changed background color in
 dark mode

---
 app/src/main/res/drawable/plus.xml            |  9 +++++++
 ....xml => shape_bottom_sheet_background.xml} |  2 +-
 ..._conversation_e2e_details_bottom_sheet.xml |  2 +-
 ...nversation_unsafe_details_bottom_sheet.xml |  2 +-
 .../chat_ephemeral_lifetime_fragment.xml      | 10 ++++----
 .../layout/start_call_numpad_bottom_sheet.xml | 25 +++++++++++--------
 app/src/main/res/values-night/themes.xml      |  1 +
 app/src/main/res/values/attrs.xml             |  1 +
 app/src/main/res/values/styles.xml            |  1 +
 app/src/main/res/values/themes.xml            |  1 +
 10 files changed, 35 insertions(+), 19 deletions(-)
 create mode 100644 app/src/main/res/drawable/plus.xml
 rename app/src/main/res/drawable/{shape_bottom_sheet_gray_100_background.xml => shape_bottom_sheet_background.xml} (73%)

diff --git a/app/src/main/res/drawable/plus.xml b/app/src/main/res/drawable/plus.xml
new file mode 100644
index 000000000..71b33fefc
--- /dev/null
+++ b/app/src/main/res/drawable/plus.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="256"
+    android:viewportHeight="256">
+  <path
+      android:pathData="M224,128a8,8 0,0 1,-8 8H136v80a8,8 0,0 1,-16 0V136H40a8,8 0,0 1,0 -16h80V40a8,8 0,0 1,16 0v80h80A8,8 0,0 1,224 128Z"
+      android:fillColor="#4e6074"/>
+</vector>
diff --git a/app/src/main/res/drawable/shape_bottom_sheet_gray_100_background.xml b/app/src/main/res/drawable/shape_bottom_sheet_background.xml
similarity index 73%
rename from app/src/main/res/drawable/shape_bottom_sheet_gray_100_background.xml
rename to app/src/main/res/drawable/shape_bottom_sheet_background.xml
index 32a79568b..fa8501363 100644
--- a/app/src/main/res/drawable/shape_bottom_sheet_gray_100_background.xml
+++ b/app/src/main/res/drawable/shape_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="?attr/color_grey_100"/>
+    <solid android:color="?attr/color_bottom_sheet_background"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_conversation_e2e_details_bottom_sheet.xml b/app/src/main/res/layout/chat_conversation_e2e_details_bottom_sheet.xml
index 00a6f5bbb..f9b3e4fef 100644
--- a/app/src/main/res/layout/chat_conversation_e2e_details_bottom_sheet.xml
+++ b/app/src/main/res/layout/chat_conversation_e2e_details_bottom_sheet.xml
@@ -9,7 +9,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        android:background="@drawable/shape_bottom_sheet_gray_100_background"
+        android:background="@drawable/shape_bottom_sheet_background"
         app:behavior_hideable="true"
         app:behavior_peekHeight="0dp"
         app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
diff --git a/app/src/main/res/layout/chat_conversation_unsafe_details_bottom_sheet.xml b/app/src/main/res/layout/chat_conversation_unsafe_details_bottom_sheet.xml
index 0c5210e27..18deddcbe 100644
--- a/app/src/main/res/layout/chat_conversation_unsafe_details_bottom_sheet.xml
+++ b/app/src/main/res/layout/chat_conversation_unsafe_details_bottom_sheet.xml
@@ -9,7 +9,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        android:background="@drawable/shape_bottom_sheet_gray_100_background"
+        android:background="@drawable/shape_bottom_sheet_background"
         app:behavior_hideable="true"
         app:behavior_peekHeight="0dp"
         app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
diff --git a/app/src/main/res/layout/chat_ephemeral_lifetime_fragment.xml b/app/src/main/res/layout/chat_ephemeral_lifetime_fragment.xml
index 0a8bafbe2..a04d4f9f6 100644
--- a/app/src/main/res/layout/chat_ephemeral_lifetime_fragment.xml
+++ b/app/src/main/res/layout/chat_ephemeral_lifetime_fragment.xml
@@ -115,7 +115,7 @@
                         android:layout_height="1dp"
                         android:layout_marginStart="16dp"
                         android:layout_marginEnd="16dp"
-                        android:background="?attr/color_main2_300"/>
+                        android:background="?attr/color_separator"/>
 
                     <RadioButton
                         style="@style/default_text_style"
@@ -139,7 +139,7 @@
                         android:layout_height="1dp"
                         android:layout_marginStart="16dp"
                         android:layout_marginEnd="16dp"
-                        android:background="?attr/color_main2_300"/>
+                        android:background="?attr/color_separator"/>
 
                     <RadioButton
                         style="@style/default_text_style"
@@ -163,7 +163,7 @@
                         android:layout_height="1dp"
                         android:layout_marginStart="16dp"
                         android:layout_marginEnd="16dp"
-                        android:background="?attr/color_main2_300"/>
+                        android:background="?attr/color_separator"/>
 
                     <RadioButton
                         style="@style/default_text_style"
@@ -187,7 +187,7 @@
                         android:layout_height="1dp"
                         android:layout_marginStart="16dp"
                         android:layout_marginEnd="16dp"
-                        android:background="?attr/color_main2_300"/>
+                        android:background="?attr/color_separator"/>
 
                     <RadioButton
                         style="@style/default_text_style"
@@ -211,7 +211,7 @@
                         android:layout_height="1dp"
                         android:layout_marginStart="16dp"
                         android:layout_marginEnd="16dp"
-                        android:background="?attr/color_main2_300"/>
+                        android:background="?attr/color_separator"/>
 
                     <RadioButton
                         style="@style/default_text_style"
diff --git a/app/src/main/res/layout/start_call_numpad_bottom_sheet.xml b/app/src/main/res/layout/start_call_numpad_bottom_sheet.xml
index abb44bdaf..4259a4f06 100644
--- a/app/src/main/res/layout/start_call_numpad_bottom_sheet.xml
+++ b/app/src/main/res/layout/start_call_numpad_bottom_sheet.xml
@@ -16,7 +16,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/shape_bottom_sheet_gray_100_background"
+        android:background="@drawable/shape_bottom_sheet_background"
         android:clickable="true"
         android:focusable="true"
         app:behavior_hideable="true"
@@ -46,7 +46,7 @@
             android:text="1"
             android:textSize="24sp"
             android:drawableBottom="@drawable/voicemail"
-            android:paddingBottom="5dp"
+            android:drawableTint="@color/gray_main2_600"
             app:layout_constraintTop_toTopOf="@id/digit_2"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toStartOf="@id/digit_2"
@@ -57,7 +57,7 @@
             style="@style/call_start_numpad_digits_style"
             android:id="@+id/digit_2"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="0dp"
             android:layout_marginTop="14dp"
             android:text="2"
             app:layout_constraintVertical_chainStyle="packed"
@@ -71,7 +71,7 @@
             style="@style/call_start_numpad_digits_style"
             android:id="@+id/digit_3"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="0dp"
             android:text="3"
             app:layout_constraintTop_toTopOf="@id/digit_2"
             app:layout_constraintStart_toEndOf="@id/digit_2"
@@ -83,7 +83,7 @@
             style="@style/call_start_numpad_digits_style"
             android:id="@+id/digit_4"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="0dp"
             android:text="4"
             app:layout_constraintTop_toTopOf="@id/digit_5"
             app:layout_constraintStart_toStartOf="parent"
@@ -95,7 +95,7 @@
             style="@style/call_start_numpad_digits_style"
             android:id="@+id/digit_5"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="0dp"
             android:layout_marginTop="10dp"
             android:text="5"
             app:layout_constraintTop_toBottomOf="@id/digit_2"
@@ -108,7 +108,7 @@
             style="@style/call_start_numpad_digits_style"
             android:id="@+id/digit_6"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="0dp"
             android:text="6"
             app:layout_constraintTop_toTopOf="@id/digit_5"
             app:layout_constraintStart_toEndOf="@id/digit_5"
@@ -120,7 +120,7 @@
             style="@style/call_start_numpad_digits_style"
             android:id="@+id/digit_7"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="0dp"
             android:text="7"
             app:layout_constraintTop_toTopOf="@id/digit_8"
             app:layout_constraintStart_toStartOf="parent"
@@ -132,7 +132,7 @@
             style="@style/call_start_numpad_digits_style"
             android:id="@+id/digit_8"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="0dp"
             android:layout_marginTop="10dp"
             android:text="8"
             app:layout_constraintTop_toBottomOf="@id/digit_5"
@@ -145,7 +145,7 @@
             style="@style/call_start_numpad_digits_style"
             android:id="@+id/digit_9"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="0dp"
             android:text="9"
             app:layout_constraintTop_toTopOf="@id/digit_8"
             app:layout_constraintStart_toEndOf="@id/digit_8"
@@ -157,7 +157,7 @@
             style="@style/call_start_numpad_digits_style"
             android:id="@+id/digit_star"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="0dp"
             android:text="*"
             app:layout_constraintTop_toTopOf="@id/digit_0"
             app:layout_constraintStart_toStartOf="parent"
@@ -174,6 +174,9 @@
             android:layout_marginTop="10dp"
             android:layout_marginBottom="20dp"
             android:text="0"
+            android:textSize="24sp"
+            android:drawableBottom="@drawable/plus"
+            android:drawableTint="@color/gray_main2_600"
             app:layout_constraintTop_toBottomOf="@id/digit_8"
             app:layout_constraintStart_toEndOf="@id/digit_star"
             app:layout_constraintEnd_toStartOf="@id/digit_sharp"
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index b041cf47a..bb9c8f04c 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -71,6 +71,7 @@
         <item name="color_trust_track">@color/text_field_background_color_dark_mode</item>
         <item name="color_conversation_send_area_background">@color/background_color_alt_dark_mode</item>
         <item name="color_bottom_sheet_handle">@color/gray_main2_400</item>
+        <item name="color_bottom_sheet_background">@color/background_color_alt_dark_mode</item>
     </style>
 
     <style name="Theme.LinphoneYellow" parent="Theme.Linphone">
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 0fc4f7c4d..a593a9cd3 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -69,5 +69,6 @@
         <attr name="color_trust_track" format="color"/>
         <attr name="color_conversation_send_area_background" format="color"/>
         <attr name="color_bottom_sheet_handle" format="color"/>
+        <attr name="color_bottom_sheet_background" format="color"/>
     </declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ba2a24e9d..f3286bf11 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -155,6 +155,7 @@
         <item name="android:textSize">32sp</item>
         <item name="android:gravity">center</item>
         <item name="android:elevation">3dp</item>
+        <item name="android:paddingBottom">5dp</item>
         <item name="android:background">@drawable/circle_white_button_background</item>
     </style>
     <style name="message_reaction_style">
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index c4c08550c..cfc1acf00 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -72,6 +72,7 @@
         <item name="color_trust_track">@color/blue_info_500</item>
         <item name="color_conversation_send_area_background">@color/gray_100</item>
         <item name="color_bottom_sheet_handle">@color/gray_main2_300</item>
+        <item name="color_bottom_sheet_background">@color/gray_100</item>
     </style>
 
     <style name="Theme.LinphoneYellow" parent="Theme.Linphone">