From dc23df8b3a28a3c131dfd04bb7b38366055ef273 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 22 Jan 2024 17:10:49 +0100
Subject: [PATCH] More dark theme fixes

---
 .../layout/call_media_encryption_stats_menu.xml    | 14 +++++++-------
 app/src/main/res/layout/chat_info_fragment.xml     |  1 +
 .../main/res/layout/chat_participant_list_cell.xml |  1 +
 app/src/main/res/values/styles.xml                 |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/layout/call_media_encryption_stats_menu.xml b/app/src/main/res/layout/call_media_encryption_stats_menu.xml
index 4948ce320..d69c9bc07 100644
--- a/app/src/main/res/layout/call_media_encryption_stats_menu.xml
+++ b/app/src/main/res/layout/call_media_encryption_stats_menu.xml
@@ -19,8 +19,8 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
-            android:text="@{model.mediaEncryption}"
-            android:textColor="@color/black"
+            android:text="@{model.mediaEncryption, default=`Media Encryption: Post Quantum ZRTP`}"
+            android:textColor="?attr/color_grey_900"
             android:gravity="center_vertical" />
 
         <androidx.appcompat.widget.AppCompatTextView
@@ -30,7 +30,7 @@
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
             android:text="@{model.zrtpCipher}"
-            android:textColor="@color/black"
+            android:textColor="?attr/color_grey_900"
             android:gravity="center_vertical"
             android:visibility="@{model.isMediaEncryptionZrtp ? View.VISIBLE : View.GONE}"/>
 
@@ -41,7 +41,7 @@
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
             android:text="@{model.zrtpKeyAgreement}"
-            android:textColor="@color/black"
+            android:textColor="?attr/color_grey_900"
             android:gravity="center_vertical"
             android:visibility="@{model.isMediaEncryptionZrtp ? View.VISIBLE : View.GONE}" />
 
@@ -52,7 +52,7 @@
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
             android:text="@{model.zrtpHash}"
-            android:textColor="@color/black"
+            android:textColor="?attr/color_grey_900"
             android:gravity="center_vertical"
             android:visibility="@{model.isMediaEncryptionZrtp ? View.VISIBLE : View.GONE}" />
 
@@ -63,7 +63,7 @@
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
             android:text="@{model.zrtpAuthTag}"
-            android:textColor="@color/black"
+            android:textColor="?attr/color_grey_900"
             android:gravity="center_vertical"
             android:visibility="@{model.isMediaEncryptionZrtp ? View.VISIBLE : View.GONE}" />
 
@@ -74,7 +74,7 @@
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
             android:text="@{model.zrtpAuthSas}"
-            android:textColor="@color/black"
+            android:textColor="?attr/color_grey_900"
             android:gravity="center_vertical"
             android:visibility="@{model.isMediaEncryptionZrtp ? View.VISIBLE : View.GONE}" />
 
diff --git a/app/src/main/res/layout/chat_info_fragment.xml b/app/src/main/res/layout/chat_info_fragment.xml
index 6a05f8a93..d87bec69d 100644
--- a/app/src/main/res/layout/chat_info_fragment.xml
+++ b/app/src/main/res/layout/chat_info_fragment.xml
@@ -125,6 +125,7 @@
                     android:onClick="@{editSubjectClickListener}"
                     android:src="@drawable/pencil_simple"
                     android:visibility="@{!viewModel.isGroup || viewModel.isReadOnly || !viewModel.isMyselfAdmin ? View.GONE : View.VISIBLE}"
+                    app:tint="?attr/color_grey_600"
                     app:layout_constraintBottom_toBottomOf="@id/title"
                     app:layout_constraintStart_toEndOf="@id/title"
                     app:layout_constraintTop_toTopOf="@id/title" />
diff --git a/app/src/main/res/layout/chat_participant_list_cell.xml b/app/src/main/res/layout/chat_participant_list_cell.xml
index 8a677fea6..91cae0808 100644
--- a/app/src/main/res/layout/chat_participant_list_cell.xml
+++ b/app/src/main/res/layout/chat_participant_list_cell.xml
@@ -88,6 +88,7 @@
             android:layout_height="@dimen/icon_size"
             android:src="@drawable/dots_three_vertical"
             android:visibility="@{model.showMenu ? View.VISIBLE : View.GONE}"
+            app:tint="?attr/color_grey_600"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/name"
             app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7d92f8337..19d86f28a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -119,7 +119,7 @@
     </style>
     <style name="call_start_numpad_digits_style">
         <item name="android:fontFamily">@font/noto_sans</item>
-        <item name="android:textColor">?attr/color_main2_600</item>
+        <item name="android:textColor">@color/gray_main2_600</item>
         <item name="android:textSize">32sp</item>
         <item name="android:gravity">center</item>
         <item name="android:elevation">3dp</item>