From 256ca13dca160c7ca02b6ad1cd5186b4d3090bf0 Mon Sep 17 00:00:00 2001
From: "Alinson S. Xavier" <git@axavier.org>
Date: Sun, 18 Apr 2021 07:29:03 -0500
Subject: [PATCH] Small tweaks to preferences screen; restore default accent
 color

---
 uhabits-android/src/main/res/values/styles.xml |  4 +++-
 .../src/main/res/xml/preferences.xml           | 18 +++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/uhabits-android/src/main/res/values/styles.xml b/uhabits-android/src/main/res/values/styles.xml
index 4d588fa2a..e42da7511 100644
--- a/uhabits-android/src/main/res/values/styles.xml
+++ b/uhabits-android/src/main/res/values/styles.xml
@@ -30,7 +30,7 @@
         <item name="android:textColor">@color/grey_800</item>
         <item name="cardBackground">@drawable/card_light_background</item>
         <item name="cardBgColor">@color/grey_50</item>
-        <item name="colorAccent">#303030</item>
+        <item name="colorAccent">?aboutScreenColor</item>
         <item name="colorPrimary">#363636</item>
         <item name="colorPrimaryDark">#303030</item>
         <item name="dialogIconChangeColor">@drawable/ic_action_color_light</item>
@@ -60,6 +60,7 @@
         <item name="windowActionModeOverlay">true</item>
         <item name="windowBackgroundColor">@color/grey_200</item>
         <item name="android:textColorAlertDialogListItem">@color/grey_800</item>
+        <item name="singleLineTitle">false</item>
     </style>
 
     <style name="AppBaseThemeDark" parent="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
@@ -104,6 +105,7 @@
         <item name="buttonBarNegativeButtonStyle">@style/DialogButtonStyle</item>
         <item name="buttonBarPositiveButtonStyle">@style/DialogButtonStyle</item>
         <item name="android:textColorAlertDialogListItem">@color/grey_100</item>
+        <item name="singleLineTitle">false</item>
     </style>
 
     <style name="AppBaseThemeDark.PureBlack">
diff --git a/uhabits-android/src/main/res/xml/preferences.xml b/uhabits-android/src/main/res/xml/preferences.xml
index 8d44da556..baf20e5f0 100644
--- a/uhabits-android/src/main/res/xml/preferences.xml
+++ b/uhabits-android/src/main/res/xml/preferences.xml
@@ -24,35 +24,35 @@
             android:key="interfaceCategory"
             android:title="@string/interface_preferences">
 
-        <CheckBoxPreference
+        <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="pref_short_toggle"
                 android:summary="@string/pref_toggle_description"
                 android:title="@string/pref_toggle_title"
                 app:iconSpaceReserved="false" />
 
-        <CheckBoxPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="pref_midnight_delay"
             android:summary="@string/pref_midnight_delay_description"
             android:title="@string/pref_midnight_delay_title"
             app:iconSpaceReserved="false" />
 
-        <CheckBoxPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="pref_skip_enabled"
             android:summary="@string/pref_skip_description"
             android:title="@string/pref_skip_title"
             app:iconSpaceReserved="false" />
 
-        <CheckBoxPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="pref_unknown_enabled"
             android:summary="@string/pref_unknown_description"
             android:title="@string/pref_unknown_title"
             app:iconSpaceReserved="false" />
 
-        <CheckBoxPreference
+        <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="pref_checkmark_reverse_order"
                 android:summary="@string/reverse_days_description"
@@ -60,7 +60,7 @@
                 app:iconSpaceReserved="false" />
 
 
-        <CheckBoxPreference
+        <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="pref_pure_black"
                 android:summary="@string/pure_black_description"
@@ -92,14 +92,14 @@
                 android:title="@string/reminder_sound"
                 app:iconSpaceReserved="false" />
 
-        <CheckBoxPreference
+        <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="pref_sticky_notifications"
                 android:summary="@string/sticky_notifications_description"
                 android:title="@string/sticky_notifications"
                 app:iconSpaceReserved="false" />
 
-        <CheckBoxPreference
+        <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="pref_led_notifications"
                 android:summary="@string/led_notifications_description"
@@ -189,7 +189,7 @@
             android:key="devCategory"
             android:title="Development">
 
-        <CheckBoxPreference
+        <SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:key="pref_developer"
                 android:title="Enable developer mode"