From f99ea8d42e104af7f608e987e4b2ff9723483501 Mon Sep 17 00:00:00 2001
From: Iván Ávalos <avalos@disroot.org>
Date: Sat, 28 Jan 2023 14:06:53 -0600
Subject: Tweaks taken from Material 3 branch

---
 ServerProxy                                  | 2 +-
 app/src/main/res/layout/basic_count_item.xml | 4 ++--
 app/src/main/res/layout/basic_list_item.xml  | 4 ++--
 app/src/main/res/values-v21/themes.xml       | 9 ++++++---
 app/src/main/res/values/colors.xml           | 3 +++
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ServerProxy b/ServerProxy
index 08f66ee2..5987cdfb 160000
--- a/ServerProxy
+++ b/ServerProxy
@@ -1 +1 @@
-Subproject commit 08f66ee2da9aa39ae569c8ed2a2ad02f141e971f
+Subproject commit 5987cdfb222b92a4bf37740a82a957e2c6d36836
diff --git a/app/src/main/res/layout/basic_count_item.xml b/app/src/main/res/layout/basic_count_item.xml
index ce1aa800..7037ad57 100644
--- a/app/src/main/res/layout/basic_count_item.xml
+++ b/app/src/main/res/layout/basic_count_item.xml
@@ -11,8 +11,8 @@
 		android:layout_height="fill_parent"
 		android:textAppearance="?android:attr/textAppearanceMedium"
 		android:gravity="left|center_vertical"
-		android:paddingLeft="6dip"
-		android:paddingRight="6dip"
+		android:paddingVertical="10dip"
+		android:paddingHorizontal="16dip"
 		android:background="@android:color/transparent"
 		android:text="Text"
 		android:textColor="?android:textColorPrimary"/>
diff --git a/app/src/main/res/layout/basic_list_item.xml b/app/src/main/res/layout/basic_list_item.xml
index ea1df8e8..72a659a9 100644
--- a/app/src/main/res/layout/basic_list_item.xml
+++ b/app/src/main/res/layout/basic_list_item.xml
@@ -12,8 +12,8 @@
 		android:layout_weight="1"
 		android:textAppearance="?android:attr/textAppearanceMedium"
 		android:gravity="left|center_vertical"
-		android:paddingLeft="6dip"
-		android:paddingRight="6dip"
+		android:paddingVertical="10dip"
+		android:paddingHorizontal="16dip"
 		android:minHeight="50dip"
 		android:background="@android:color/transparent"
 		android:textColor="?android:textColorPrimary"/>
diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml
index 6461130a..c19636c3 100644
--- a/app/src/main/res/values-v21/themes.xml
+++ b/app/src/main/res/values-v21/themes.xml
@@ -16,15 +16,18 @@
 
 	<style name="Theme.DSub.Light.No_Color" parent="Theme.DSub.Light.No_Color.Base">
 		<item name="android:windowTranslucentStatus">false</item>
-		<item name="android:statusBarColor">@android:color/black</item>
+		<item name="android:statusBarColor">@color/lightBackground</item>
+		<item name="android:windowLightStatusBar">true</item>
+		<item name="android:navigationBarColor">@color/lightBackground</item>
 	</style>
 	<style name="Theme.DSub.Black.No_Color" parent="Theme.DSub.Black.No_Color.Base">
 		<item name="android:windowTranslucentStatus">false</item>
-		<item name="android:statusBarColor">@android:color/black</item>
+
 	</style>
 	<style name="Theme.DSub.Dark.No_Color" parent="Theme.DSub.Dark.No_Color.Base">
 		<item name="android:windowTranslucentStatus">false</item>
-		<item name="android:statusBarColor">@android:color/black</item>
+		<item name="android:statusBarColor">@color/darkBackground</item>
+		<item name="android:navigationBarColor">@color/darkBackground</item>
 	</style>
 	<style name="Theme.DSub.Holo.No_Color" parent="Theme.DSub.Holo.No_Color.Base">
 		<item name="android:windowTranslucentStatus">false</item>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 772d0abf..56e32b9d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -15,4 +15,7 @@
 	<color name="holoPrimary">#009688</color>
 	<color name="holoPrimaryDark">#00897b</color>
 	<color name="holoAccent">#64ffda</color>
+
+	<color name="lightBackground">#FAFAFA</color>
+	<color name="darkBackground">#202124</color>
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3