From 751898ae192d223216965c982b54cd9729b50fa7 Mon Sep 17 00:00:00 2001
From: Arne <arne@monocles.de>
Date: Wed, 4 Oct 2023 22:43:09 +0200
Subject: [PATCH] 1.

---
 build.gradle                                  |  4 +-
 .../ui/ConversationsActivity.java             |  6 +-
 .../ui/util/ConversationMenuConfigurator.java |  2 +-
 .../res/drawable/ic_arrow_back_black_24dp.xml |  6 ++
 .../drawable/ic_attach_file_black_24dp.xml    |  5 ++
 .../drawable/ic_cloud_download_black_24dp.xml |  5 ++
 .../res/drawable/ic_contacts_black_24dp.xml   |  5 ++
 .../drawable/ic_content_copy_black_24dp.xml   |  5 ++
 .../drawable/ic_file_download_black_24dp.xml  |  5 ++
 .../res/drawable/ic_group_add_black_24dp.xml  |  9 +++
 src/main/res/drawable/ic_group_black_24dp.xml |  5 ++
 src/main/res/drawable/ic_lock_black_24dp.xml  |  5 ++
 .../res/drawable/ic_lock_open_black_24dp.xml  |  5 ++
 .../res/drawable/ic_navigation_black_24dp.xml |  5 ++
 .../res/drawable/ic_person_add_black_24dp.xml |  5 ++
 .../drawable/ic_phone_in_talk_black_24dp.xml  |  6 ++
 .../drawable/ic_qrcode_scan_black_24dp.xml    |  5 ++
 .../ic_question_answer_black_24dp.xml         |  5 ++
 .../res/drawable/ic_search_black_24dp.xml     |  5 ++
 src/main/res/layout/ab_title.xml              |  4 +-
 src/main/res/layout/toolbar.xml               |  8 +--
 src/main/res/values/styles.xml                |  6 +-
 src/main/res/values/themes.xml                | 55 ++++++++++---------
 23 files changed, 127 insertions(+), 44 deletions(-)
 create mode 100644 src/main/res/drawable/ic_arrow_back_black_24dp.xml
 create mode 100644 src/main/res/drawable/ic_attach_file_black_24dp.xml
 create mode 100644 src/main/res/drawable/ic_cloud_download_black_24dp.xml
 create mode 100644 src/main/res/drawable/ic_contacts_black_24dp.xml
 create mode 100644 src/main/res/drawable/ic_content_copy_black_24dp.xml
 create mode 100644 src/main/res/drawable/ic_file_download_black_24dp.xml
 create mode 100644 src/main/res/drawable/ic_group_add_black_24dp.xml
 create mode 100644 src/main/res/drawable/ic_group_black_24dp.xml
 create mode 100644 src/main/res/drawable/ic_lock_black_24dp.xml
 create mode 100644 src/main/res/drawable/ic_lock_open_black_24dp.xml
 create mode 100644 src/main/res/drawable/ic_navigation_black_24dp.xml
 create mode 100644 src/main/res/drawable/ic_person_add_black_24dp.xml
 create mode 100644 src/main/res/drawable/ic_phone_in_talk_black_24dp.xml
 create mode 100644 src/main/res/drawable/ic_qrcode_scan_black_24dp.xml
 create mode 100644 src/main/res/drawable/ic_question_answer_black_24dp.xml
 create mode 100644 src/main/res/drawable/ic_search_black_24dp.xml

diff --git a/build.gradle b/build.gradle
index c62b489cb..5d197bf3c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -156,8 +156,8 @@ android {
         targetSdkVersion 32
 
         versionNameSuffix " beta_(2023-10-04)" // " beta_(XXXX-XX-XX)" // activate for beta versions
-        versionCode 138
-        versionName "1.8"
+        versionCode 137
+        versionName "1.7.5"
         //resConfigs "en"
 
         archivesBaseName += "-$versionName"
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
index 22989c9a3..0394fcc0b 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
@@ -1048,7 +1048,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
                 final View view = getLayoutInflater().inflate(R.layout.ab_title, null);
                 getSupportActionBar().setCustomView(view);
                 actionBar.setIcon(null);
-                actionBar.setBackgroundDrawable(new ColorDrawable(StyledAttributes.getColor(this, R.attr.colorPrimary)));
+                actionBar.setBackgroundDrawable(new ColorDrawable(StyledAttributes.getColor(this, R.attr.color_background_secondary)));
                 actionBar.setDisplayShowTitleEnabled(false);
                 actionBar.setDisplayShowCustomEnabled(true);
                 TextView abtitle = findViewById(android.R.id.text1);
@@ -1122,12 +1122,10 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
                 return;
             }
         }
-        actionBar.setDisplayShowTitleEnabled(true);
         actionBar.setDisplayShowCustomEnabled(false);
         actionBar.setTitle(null);
-        actionBar.setIcon(R.drawable.logo_toolbar_white);
+        actionBar.setIcon(R.drawable.logo_800);
         //actionBar.setBackgroundDrawable(new ColorDrawable(getResources().getColor(R.color.header_background)));
-        actionBar.setSubtitle(null);
         actionBar.setDisplayHomeAsUpEnabled(false);
         ActionBarUtil.resetCustomActionBarOnClickListeners(binding.toolbar);
     }
diff --git a/src/main/java/eu/siacs/conversations/ui/util/ConversationMenuConfigurator.java b/src/main/java/eu/siacs/conversations/ui/util/ConversationMenuConfigurator.java
index f7092d200..1e650685d 100644
--- a/src/main/java/eu/siacs/conversations/ui/util/ConversationMenuConfigurator.java
+++ b/src/main/java/eu/siacs/conversations/ui/util/ConversationMenuConfigurator.java
@@ -130,7 +130,7 @@ public class ConversationMenuConfigurator {
         }
 
         if (conversation.getNextEncryption() != Message.ENCRYPTION_NONE) {
-            menuSecure.setIcon(R.drawable.ic_lock_white_24dp);
+            menuSecure.setIcon(R.drawable.ic_lock_black_24dp);
         }
         otr.setVisible(Config.supportOtr() && activity.enableOTR());
         if (conversation.getMode() == Conversation.MODE_MULTI) {
diff --git a/src/main/res/drawable/ic_arrow_back_black_24dp.xml b/src/main/res/drawable/ic_arrow_back_black_24dp.xml
new file mode 100644
index 000000000..37210bb72
--- /dev/null
+++ b/src/main/res/drawable/ic_arrow_back_black_24dp.xml
@@ -0,0 +1,6 @@
+<vector android:alpha="0.77" android:autoMirrored="true"
+    android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M11.67,3.87L9.9,2.1 0,12l9.9,9.9 1.77,-1.77L3.54,12z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_attach_file_black_24dp.xml b/src/main/res/drawable/ic_attach_file_black_24dp.xml
new file mode 100644
index 000000000..4a2cae9a8
--- /dev/null
+++ b/src/main/res/drawable/ic_attach_file_black_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:alpha="0.77" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M16.5,6v11.5c0,2.21 -1.79,4 -4,4s-4,-1.79 -4,-4V5c0,-1.38 1.12,-2.5 2.5,-2.5s2.5,1.12 2.5,2.5v10.5c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1V6H10v9.5c0,1.38 1.12,2.5 2.5,2.5s2.5,-1.12 2.5,-2.5V5c0,-2.21 -1.79,-4 -4,-4S7,2.79 7,5v12.5c0,3.04 2.46,5.5 5.5,5.5s5.5,-2.46 5.5,-5.5V6h-1.5z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_cloud_download_black_24dp.xml b/src/main/res/drawable/ic_cloud_download_black_24dp.xml
new file mode 100644
index 000000000..ec749b392
--- /dev/null
+++ b/src/main/res/drawable/ic_cloud_download_black_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:alpha="0.77" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM17,13l-5,5 -5,-5h3V9h4v4h3z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_contacts_black_24dp.xml b/src/main/res/drawable/ic_contacts_black_24dp.xml
new file mode 100644
index 000000000..fb9f7b6c7
--- /dev/null
+++ b/src/main/res/drawable/ic_contacts_black_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:alpha="0.77" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M20,0L4,0v2h16L20,0zM4,24h16v-2L4,22v2zM20,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM12,6.75c1.24,0 2.25,1.01 2.25,2.25s-1.01,2.25 -2.25,2.25S9.75,10.24 9.75,9 10.76,6.75 12,6.75zM17,17L7,17v-1.5c0,-1.67 3.33,-2.5 5,-2.5s5,0.83 5,2.5L17,17z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_content_copy_black_24dp.xml b/src/main/res/drawable/ic_content_copy_black_24dp.xml
new file mode 100644
index 000000000..a02b5d5bb
--- /dev/null
+++ b/src/main/res/drawable/ic_content_copy_black_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:alpha="0.77" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM15,5l6,6v10c0,1.1 -0.9,2 -2,2L7.99,23C6.89,23 6,22.1 6,21l0.01,-14c0,-1.1 0.89,-2 1.99,-2h7zM14,12h5.5L14,6.5L14,12z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_file_download_black_24dp.xml b/src/main/res/drawable/ic_file_download_black_24dp.xml
new file mode 100644
index 000000000..1d13784f2
--- /dev/null
+++ b/src/main/res/drawable/ic_file_download_black_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:alpha="0.77" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_group_add_black_24dp.xml b/src/main/res/drawable/ic_group_add_black_24dp.xml
new file mode 100644
index 000000000..d0a7a0b62
--- /dev/null
+++ b/src/main/res/drawable/ic_group_add_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector android:alpha="0.77" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M22,9l0,-2l-2,0l0,2l-2,0l0,2l2,0l0,2l2,0l0,-2l2,0l0,-2z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M8,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4S4,5.79 4,8S5.79,12 8,12z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M8,13c-2.67,0 -8,1.34 -8,4v3h16v-3C16,14.34 10.67,13 8,13z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M12.51,4.05C13.43,5.11 14,6.49 14,8s-0.57,2.89 -1.49,3.95C14.47,11.7 16,10.04 16,8S14.47,4.3 12.51,4.05z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M16.53,13.83C17.42,14.66 18,15.7 18,17v3h2v-3C20,15.55 18.41,14.49 16.53,13.83z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_group_black_24dp.xml b/src/main/res/drawable/ic_group_black_24dp.xml
new file mode 100644
index 000000000..79d596ce8
--- /dev/null
+++ b/src/main/res/drawable/ic_group_black_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:alpha="0.77" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_lock_black_24dp.xml b/src/main/res/drawable/ic_lock_black_24dp.xml
new file mode 100644
index 000000000..d833d3323
--- /dev/null
+++ b/src/main/res/drawable/ic_lock_black_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:alpha="0.77" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_lock_open_black_24dp.xml b/src/main/res/drawable/ic_lock_open_black_24dp.xml
new file mode 100644
index 000000000..cf40bec18
--- /dev/null
+++ b/src/main/res/drawable/ic_lock_open_black_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:alpha="0.77" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6h1.9c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM18,20L6,20L6,10h12v10z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_navigation_black_24dp.xml b/src/main/res/drawable/ic_navigation_black_24dp.xml
new file mode 100644
index 000000000..21021e139
--- /dev/null
+++ b/src/main/res/drawable/ic_navigation_black_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:alpha="0.77" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,2L4.5,20.29l0.71,0.71L12,18l6.79,3 0.71,-0.71z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_person_add_black_24dp.xml b/src/main/res/drawable/ic_person_add_black_24dp.xml
new file mode 100644
index 000000000..f6b071331
--- /dev/null
+++ b/src/main/res/drawable/ic_person_add_black_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:alpha="0.77" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M13,8c0,-2.21 -1.79,-4 -4,-4S5,5.79 5,8s1.79,4 4,4S13,10.21 13,8zM15,10v2h3v3h2v-3h3v-2h-3V7h-2v3H15zM1,18v2h16v-2c0,-2.66 -5.33,-4 -8,-4S1,15.34 1,18z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_phone_in_talk_black_24dp.xml b/src/main/res/drawable/ic_phone_in_talk_black_24dp.xml
new file mode 100644
index 000000000..0a0193136
--- /dev/null
+++ b/src/main/res/drawable/ic_phone_in_talk_black_24dp.xml
@@ -0,0 +1,6 @@
+<vector android:alpha="0.77" android:autoMirrored="true"
+    android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M18,11l5,-5 -5,-5v3h-4v4h4v3zM20,15.5c-1.25,0 -2.45,-0.2 -3.57,-0.57 -0.35,-0.11 -0.74,-0.03 -1.02,0.24l-2.2,2.2c-2.83,-1.44 -5.15,-3.75 -6.59,-6.59l2.2,-2.21c0.28,-0.26 0.36,-0.65 0.25,-1C8.7,6.45 8.5,5.25 8.5,4c0,-0.55 -0.45,-1 -1,-1L4,3c-0.55,0 -1,0.45 -1,1 0,9.39 7.61,17 17,17 0.55,0 1,-0.45 1,-1v-3.5c0,-0.55 -0.45,-1 -1,-1z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_qrcode_scan_black_24dp.xml b/src/main/res/drawable/ic_qrcode_scan_black_24dp.xml
new file mode 100644
index 000000000..339ed020b
--- /dev/null
+++ b/src/main/res/drawable/ic_qrcode_scan_black_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:alpha="0.77" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M9.5,6.5v3h-3v-3H9.5M11,5H5v6h6V5L11,5zM9.5,14.5v3h-3v-3H9.5M11,13H5v6h6V13L11,13zM17.5,6.5v3h-3v-3H17.5M19,5h-6v6h6V5L19,5zM13,13h1.5v1.5H13V13zM14.5,14.5H16V16h-1.5V14.5zM16,13h1.5v1.5H16V13zM13,16h1.5v1.5H13V16zM14.5,17.5H16V19h-1.5V17.5zM16,16h1.5v1.5H16V16zM17.5,14.5H19V16h-1.5V14.5zM17.5,17.5H19V19h-1.5V17.5zM22,7h-2V4h-3V2h5V7zM22,22v-5h-2v3h-3v2H22zM2,22h5v-2H4v-3H2V22zM2,2v5h2V4h3V2H2z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_question_answer_black_24dp.xml b/src/main/res/drawable/ic_question_answer_black_24dp.xml
new file mode 100644
index 000000000..0506325c9
--- /dev/null
+++ b/src/main/res/drawable/ic_question_answer_black_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:alpha="0.77" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M21,6h-2v9L6,15v2c0,0.55 0.45,1 1,1h11l4,4L22,7c0,-0.55 -0.45,-1 -1,-1zM17,12L17,3c0,-0.55 -0.45,-1 -1,-1L3,2c-0.55,0 -1,0.45 -1,1v14l4,-4h10c0.55,0 1,-0.45 1,-1z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_search_black_24dp.xml b/src/main/res/drawable/ic_search_black_24dp.xml
new file mode 100644
index 000000000..890cc0927
--- /dev/null
+++ b/src/main/res/drawable/ic_search_black_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:alpha="0.77" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>
diff --git a/src/main/res/layout/ab_title.xml b/src/main/res/layout/ab_title.xml
index 76d9ca0f6..0721a1a96 100644
--- a/src/main/res/layout/ab_title.xml
+++ b/src/main/res/layout/ab_title.xml
@@ -17,7 +17,7 @@
         android:paddingTop="1dp"
         android:scrollHorizontally="true"
         android:singleLine="true"
-        android:textColor="@color/realwhite" />
+        android:textColor="@color/realblack" />
 
     <TextView
         android:id="@android:id/text2"
@@ -32,6 +32,6 @@
         android:paddingBottom="1dp"
         android:scrollHorizontally="true"
         android:singleLine="true"
-        android:textColor="@color/realwhite"
+        android:textColor="@color/realblack"
         android:textSize="12sp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/toolbar.xml b/src/main/res/layout/toolbar.xml
index 097510aee..b258cf437 100644
--- a/src/main/res/layout/toolbar.xml
+++ b/src/main/res/layout/toolbar.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.appbar.MaterialToolbar xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/toolbar"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/colorPrimary"
+    android:layout_height="?attr/actionBarSize"
+    style="@style/Widget.Material3.Toolbar"
     android:elevation="@dimen/toolbar_elevation"
-    android:minHeight="?attr/actionBarSize"
-    android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar"
     app:popupTheme="?popupOverlayStyle" />
\ No newline at end of file
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 95913cab9..9e2b45305 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -1,12 +1,12 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
 
     <style name="TextAppearance.Conversations.Display2.Monospace" parent="TextAppearance.Conversations.Display2">
-        <item name="android:fontFamily" tools:targetApi="jelly_bean">monospace</item>
+        <item name="android:fontFamily" >monospace</item>
         <item name="android:typeface">monospace</item>
     </style>
 
     <style name="TextAppearance.Conversations.Title.Monospace" parent="TextAppearance.Conversations.Title">
-        <item name="android:fontFamily" tools:targetApi="jelly_bean">monospace</item>
+        <item name="android:fontFamily" >monospace</item>
         <item name="android:typeface">monospace</item>
     </style>
 
@@ -113,7 +113,7 @@
     </style>
 
     <style name="TextAppearance.Conversations.Fingerprint" parent="TextAppearance.Conversations.Body1">
-        <item name="android:fontFamily" tools:targetApi="jelly_bean">monospace</item>
+        <item name="android:fontFamily" >monospace</item>
         <item name="android:typeface">monospace</item>
     </style>
 
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index ce7440788..62e2a03cc 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -11,7 +11,7 @@
     -->
 
     <!-- fullscreen -->
-    <style name="ConversationsTheme.FullScreen" parent="Theme.MaterialComponents.Light">
+    <style name="ConversationsTheme.FullScreen" parent="Theme.Material3.Light">
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primary_dark</item>
         <item name="android:windowNoTitle">true</item>
@@ -20,17 +20,18 @@
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowBackground">@android:color/black</item>
         <item name="android:navigationBarColor" >@color/black</item>
+        <item name="android:statusBarColor">@color/accent</item>
     </style>
 
     <!-- splash theme -->
-    <style name="SplashTheme" parent="Theme.MaterialComponents.NoActionBar">
+    <style name="SplashTheme" parent="Theme.Material3.DayNight.NoActionBar">
         <item name="colorPrimaryDark">@android:color/transparent</item>
         <item name="android:windowBackground">@drawable/background</item>
     </style>
 
     <!-- 1. blue -->
     <!-- blue theme -->
-    <style name="ConversationsTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
+    <style name="ConversationsTheme" parent="Theme.Material3.Light.NoActionBar">
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primary_dark</item>
         <item name="colorAccent">@color/accent</item>
@@ -64,7 +65,7 @@
         <item name="color_border">@color/grey500</item>
         <item name="windowActionModeOverlay">true</item>
         <item name="android:actionModeBackground">@color/accent</item>
-        <item name="android:homeAsUpIndicator" type="reference">@drawable/ic_arrow_back_white_24dp
+        <item name="android:homeAsUpIndicator" type="reference">@drawable/ic_arrow_back_black_24dp
         </item>
         <item name="buttonBarPositiveButtonStyle">@style/Widget.Conversations.Button.Dialog</item>
         <item name="buttonBarNeutralButtonStyle">@style/Widget.Conversations.Button.Dialog</item>
@@ -119,45 +120,45 @@
         <item name="icon_email" type="reference">@drawable/email_black</item>
         <item name="icon_org" type="reference">@drawable/business_black</item>
         <item name="icon_chat" type="reference">@drawable/ic_chat_black_24dp</item>
-        <item name="icon_add_group" type="reference">@drawable/ic_group_add_white_24dp</item>
-        <item name="icon_add_person" type="reference">@drawable/ic_person_add_white_24dp</item>
+        <item name="icon_add_group" type="reference">@drawable/ic_group_add_black_24dp</item>
+        <item name="icon_add_person" type="reference">@drawable/ic_person_add_black_24dp</item>
         <item name="icon_cancel" type="reference">@drawable/ic_cancel_black_24dp</item>
         <item name="icon_copy" type="reference">@drawable/ic_content_copy_grey600_24dp</item>
-        <item name="icon_action_copy" type="reference">@drawable/ic_content_copy_white_24dp</item>
-        <item name="icon_navigate" type="reference">@drawable/ic_navigation_white_24dp</item>
+        <item name="icon_action_copy" type="reference">@drawable/ic_content_copy_black_24dp</item>
+        <item name="icon_navigate" type="reference">@drawable/ic_navigation_black_24dp</item>
         <item name="icon_show_qr_code" type="reference">@drawable/ic_qrcode_grey600_24dp</item>
-        <item name="icon_discard" type="reference">@drawable/ic_delete_white_24dp</item>
-        <item name="icon_download" type="reference">@drawable/ic_file_download_white_24dp</item>
-        <item name="icon_edit" type="reference">@drawable/ic_edit_white_24dp</item>
+        <item name="icon_discard" type="reference">@drawable/ic_delete_black_24dp</item>
+        <item name="icon_download" type="reference">@drawable/ic_file_download_black_24dp</item>
+        <item name="icon_edit" type="reference">@drawable/ic_edit_black_24dp</item>
         <item name="icon_edit_body" type="reference">@drawable/ic_edit_black_24dp</item>
         <item name="icon_save" type="reference">@drawable/ic_save_black_24dp</item>
         <item name="icon_done" type="reference">@drawable/ic_done_black_24dp</item>
-        <item name="icon_group" type="reference">@drawable/ic_group_white_24dp</item>
-        <item name="icon_new" type="reference">@drawable/ic_contacts_white_24dp</item>
+        <item name="icon_group" type="reference">@drawable/ic_group_black_24dp</item>
+        <item name="icon_new" type="reference">@drawable/ic_contacts_black_24dp</item>
         <item name="icon_quote" type="reference">@drawable/ic_reply_black</item>
-        <item name="icon_new_attachment" type="reference">@drawable/ic_attach_file_white_24dp</item>
-        <item name="icon_not_secure" type="reference">@drawable/ic_lock_open_white_24dp</item>
+        <item name="icon_new_attachment" type="reference">@drawable/ic_attach_file_black_24dp</item>
+        <item name="icon_not_secure" type="reference">@drawable/ic_lock_open_black_24dp</item>
         <item name="ic_make_audio_call" type="reference">@drawable/ic_call_black54_24dp</item>
         <item name="ic_make_video_call" type="reference">@drawable/ic_videocam_black54_24dp</item>
-        <item name="icon_call" type="reference">@drawable/ic_call_white_24dp</item>
-        <item name="icon_ongoing_call" type="reference">@drawable/ic_phone_in_talk_white_24dp</item>
+        <item name="icon_call" type="reference">@drawable/ic_call_black_24dp</item>
+        <item name="icon_ongoing_call" type="reference">@drawable/ic_phone_in_talk_black_24dp</item>
         <item name="ic_ongoing_call_hint" type="reference">@drawable/ic_phone_in_talk_black_18dp
         </item>
         <item name="icon_refresh" type="reference">@drawable/ic_refresh_grey600_24dp</item>
         <item name="icon_remove" type="reference">@drawable/ic_delete_grey600_24dp</item>
-        <item name="icon_search" type="reference">@drawable/ic_search_white_24dp</item>
-        <item name="icon_help" type="reference">@drawable/ic_help_white_24dp</item>
+        <item name="icon_search" type="reference">@drawable/ic_search_black_24dp</item>
+        <item name="icon_help" type="reference">@drawable/ic_help_black_24dp</item>
         <item name="icon_help_black" type="reference">@drawable/ic_help_black_24dp</item>
-        <item name="icon_goto_chat" type="reference">@drawable/ic_question_answer_white_24dp</item>
-        <item name="icon_secure" type="reference">@drawable/ic_lock_open_white_24dp</item>
+        <item name="icon_goto_chat" type="reference">@drawable/ic_question_answer_black_24dp</item>
+        <item name="icon_secure" type="reference">@drawable/ic_lock_open_black_24dp</item>
         <item name="icon_small_lock" type="reference">@drawable/ic_lock_black_18dp</item>
         <item name="icon_settings" type="reference">@drawable/ic_settings_black_24dp</item>
         <item name="icon_delete" type="reference">@drawable/ic_delete_black_24dp</item>
         <item name="icon_share" type="reference">@drawable/ic_share_black_24dp</item>
-        <item name="icon_action_share" type="reference">@drawable/ic_share_white_24dp</item>
-        <item name="ic_cloud_download" type="reference">@drawable/ic_cloud_download_white_24dp
+        <item name="icon_action_share" type="reference">@drawable/ic_share_black_24dp</item>
+        <item name="ic_cloud_download" type="reference">@drawable/ic_cloud_download_black_24dp
         </item>
-        <item name="icon_scan_qr_code" type="reference">@drawable/ic_qrcode_scan_white_24dp</item>
+        <item name="icon_scan_qr_code" type="reference">@drawable/ic_qrcode_scan_black_24dp</item>
         <item name="icon_scroll_down" type="reference">@drawable/ic_scroll_to_end_black</item>
 
         <!-- settings-->
@@ -230,7 +231,7 @@
         <item name="text_Color_Main">@color/realwhite</item>
         <item name="colorOnPrimary">@color/realwhite</item>
         <item name="button_text_color_disabled">@color/grey500</item>
-        <item name="android:navigationBarColor" tools:targetApi="21">@color/black</item>
+        <item name="android:navigationBarColor" >@color/black</item>
         <item name="chat_bg">@drawable/bg_dark_blue</item>
         <item name="icon_tint">@color/realwhite</item>
         <item name="color_background_primary">@color/grey700</item>
@@ -423,7 +424,7 @@
     </style>
 
     <!-- blue dialog -->
-    <style name="ConversationsTheme.Dialog" parent="Theme.AppCompat.Light.Dialog">
+    <style name="ConversationsTheme.Dialog" parent="Theme.Material3.Light.Dialog">
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primary_dark</item>
         <item name="colorAccent">@color/accent</item>
@@ -439,7 +440,7 @@
     </style>
 
     <!-- blue dialog - dark -->
-    <style name="ConversationsTheme.Dark.Dialog" parent="Theme.AppCompat.Dialog">
+    <style name="ConversationsTheme.Dark.Dialog" parent="Theme.Material3.Dark.Dialog">
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primary_dark</item>
         <item name="colorAccent">@color/accent</item>