From 3166b3b489970af68072c247424d71f872ff3769 Mon Sep 17 00:00:00 2001
From: Arne <arne@monocles.de>
Date: Sat, 28 Oct 2023 21:27:14 +0200
Subject: [PATCH] Theme, styles and contact details improvements

---
 .../res/layout/activity_contact_details.xml   | 19 ++++++++++++++-----
 src/main/res/values/styles.xml                |  6 +++---
 src/main/res/values/themes.xml                | 11 ++++++++---
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 417bca221..3386b9c4a 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -119,7 +119,8 @@
 
                                     <View
                                         android:layout_width="fill_parent"
-                                        android:layout_height="wrap_content" />
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginBottom="24dp" />
 
                                     <TextView
                                         android:id="@+id/details_lastseen"
@@ -179,7 +180,16 @@
                                 <RelativeLayout
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:layout_below="@+id/details_jidbox">
+                                    android:layout_below="@+id/details_jidbox" >
+
+                                    <TextView
+                                        android:layout_width="match_parent"
+                                        android:layout_height="wrap_content"
+                                        android:layout_alignParentStart="true"
+                                        android:layout_alignParentLeft="true"
+                                        android:paddingTop="4dp"
+                                        android:text="@string/pref_notification_settings"
+                                        android:textAppearance="@style/TextAppearance.Conversations.Body1" />
 
                                     <TextView
                                         android:id="@+id/notification_status_text"
@@ -187,11 +197,11 @@
                                         android:layout_height="wrap_content"
                                         android:layout_alignParentStart="true"
                                         android:layout_alignParentLeft="true"
-                                        android:layout_centerVertical="true"
+                                        android:layout_alignParentBottom="true"
                                         android:layout_toStartOf="@+id/notification_status_button"
                                         android:layout_toLeftOf="@+id/notification_status_button"
                                         android:text="@string/notify_on_all_messages"
-                                        android:textSize="?attr/TextSizeBody" />
+                                        android:textAppearance="@style/TextAppearance.Conversations.Status" />
 
                                     <ImageButton
                                         android:id="@+id/notification_status_button"
@@ -202,7 +212,6 @@
                                         android:layout_alignParentRight="true"
                                         android:layout_centerVertical="true"
                                         android:layout_gravity="center_horizontal"
-                                        android:alpha="?attr/icon_alpha"
                                         android:background="?attr/selectableItemBackgroundBorderless"
                                         android:padding="@dimen/image_button_padding"
                                         android:src="@drawable/ic_notifications_black_24dp" />
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index d42d0c29d..ac1e44094 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -51,9 +51,9 @@
 
     </style>
 
-    <style name="TextAppearance.Conversations.Caption" parent="TextAppearance.Material3.LabelLarge">
+    <style name="TextAppearance.Conversations.Caption" parent="TextAppearance.Material3.LabelMedium">
         <item name="android:textSize">?TextSizeCaption</item>
-        <item name="fontFamily">@font/notosansbold</item>
+        <item name="fontFamily">@font/notosanssemibold</item>
 
     </style>
 
@@ -80,7 +80,7 @@
     </style>
 
     <style name="Widget.monocles.Switch" parent="Widget.Material3.CompoundButton.MaterialSwitch">
-        <item name="android:textSize">?TextSizeBody1</item>
+        <item name="android:switchTextAppearance">?TextSizeBody</item>
         <item name="fontFamily">@font/notosansregular</item>
     </style>
 
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 342828fff..d99fbd5bb 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -43,7 +43,7 @@
         <item name="colorControlNormal">@color/accent</item>
         <item name="colorControlActivated">@color/accent</item>
         <item name="text_Color_Main">@color/realblack</item>
-        <item name="colorOnPrimary">@color/realblack</item>
+        <item name="colorOnPrimary">@color/realwhite</item>
         <item name="button_text_color_disabled">@color/grey500</item>
         <item name="chat_bg">@drawable/bg_light_blue</item>
         <item name="icon_tint">@color/black54</item>
@@ -235,7 +235,7 @@
         <item name="colorControlNormal">@color/accent</item>
         <item name="colorControlActivated">@color/accent</item>
         <item name="text_Color_Main">@color/realwhite</item>
-        <item name="colorOnPrimary">@color/realwhite</item>
+        <item name="colorOnPrimary">@color/grey800</item>
         <item name="button_text_color_disabled">@color/grey500</item>
         <item name="android:navigationBarColor" >@color/black</item>
         <item name="chat_bg">@drawable/bg_dark_blue</item>
@@ -423,7 +423,7 @@
 
     <!-- blue theme - black -->
     <style name="ConversationsTheme.Black" parent="ConversationsTheme.Dark">
-        <item name="colorPrimary">@color/primary_black</item>
+        <item name="colorPrimary">@color/accent</item>
         <item name="colorPrimaryDark">@color/primary_dark_black</item>
         <item name="color_background_primary">@color/darkblack</item>
         <item name="color_background_secondary">@color/primary_black</item>
@@ -634,6 +634,7 @@
 
     <!-- monocles theme - black -->
     <style name="ConversationsTheme.Monocles.Black" parent="ConversationsTheme.Black">
+        <item name="colorPrimary">@color/accent_monocles</item>
         <item name="colorAccent">@color/accent_monocles</item>
         <item name="colorAccentLight">@color/accent_light_monocles</item>
         <item name="colorAccentLightDisabled">@color/accent_light_disabled_monocles</item>
@@ -828,6 +829,7 @@
 
     <!-- orange theme - black -->
     <style name="ConversationsTheme.Orange.Black" parent="ConversationsTheme.Black">
+        <item name="colorPrimary">@color/accent_orange</item>
         <item name="colorAccent">@color/accent_orange</item>
         <item name="colorAccentLight">@color/accent_light_orange</item>
         <item name="colorAccentLightDisabled">@color/accent_light_orange_disabled</item>
@@ -1020,6 +1022,7 @@
 
     <!-- grey theme - black -->
     <style name="ConversationsTheme.Grey.Black" parent="ConversationsTheme.Black">
+        <item name="colorPrimary">@color/accent_grey</item>
         <item name="colorAccent">@color/accent_grey</item>
         <item name="colorAccentLight">@color/accent_light_grey</item>
         <item name="colorAccentLightDisabled">@color/accent_light_grey_disabled</item>
@@ -1212,6 +1215,7 @@
 
     <!-- pink theme - black -->
     <style name="ConversationsTheme.Pink.Black" parent="ConversationsTheme.Black">
+        <item name="colorPrimary">@color/accent_pink</item>
         <item name="colorAccent">@color/accent_pink</item>
         <item name="colorAccentLight">@color/accent_light_pink</item>
         <item name="colorAccentLightDisabled">@color/accent_light_pink_disabled</item>
@@ -1405,6 +1409,7 @@
 
     <!-- White theme - black -->
     <style name="ConversationsTheme.White.Black" parent="ConversationsTheme.Black">
+        <item name="colorPrimary">@color/accent_White</item>
         <item name="colorAccent">@color/accent_White</item>
         <item name="colorAccentLight">@color/accent_light_White</item>
         <item name="colorAccentLightDisabled">@color/accent_light_White_disabled</item>