more theme working

1 files changed, 33 insertions, 31 deletions

diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 22d015ab8..822abddcc 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen
-    android:key="main_screen"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="main_screen">
     <!--UI-->
     <PreferenceScreen
-        android:icon="@drawable/ic_image_black_24dp"
+        android:icon="?attr/ic_settings_ui"
         android:key="userinterface"
         android:title="@string/pref_ui_options">
         <intent
@@ -15,11 +14,13 @@
                 android:name="page"
                 android:value="userinterface" />
         </intent>
-        <CheckBoxPreference
-            android:defaultValue="@bool/use_white_background"
-            android:key="use_white_background"
-            android:summary="@string/pref_use_white_background_summary"
-            android:title="@string/pref_use_white_background" />
+        <ListPreference
+            android:defaultValue="@string/theme"
+            android:entries="@array/themes"
+            android:entryValues="@array/themes_values"
+            android:key="theme"
+            android:summary="@string/pref_theme_options_summary"
+            android:title="@string/pref_theme_options" />
         <CheckBoxPreference
             android:defaultValue="@bool/use_larger_font"
             android:key="use_larger_font"
@@ -61,7 +62,7 @@
     </PreferenceScreen>
     <!--Notifications-->
     <PreferenceScreen
-        android:icon="@drawable/ic_notifications_black_24dp"
+        android:icon="?attr/ic_settings_notifications"
         android:key="notifications"
         android:title="@string/pref_notification_settings">
         <intent
@@ -142,7 +143,7 @@
     </PreferenceScreen>
     <!--Attachments-->
     <PreferenceScreen
-        android:icon="@drawable/ic_attachment_black_24dp"
+        android:icon="?attr/ic_settings_attachments"
         android:key="attachments"
         android:title="@string/pref_attachments">
         <intent
@@ -191,12 +192,12 @@
         <CheckBoxPreference
             android:defaultValue="@bool/return_to_previous"
             android:key="return_to_previous"
-            android:title="@string/pref_return_to_previous"
-            android:summary="@string/pref_return_to_previous_summary"/>
+            android:summary="@string/pref_return_to_previous_summary"
+            android:title="@string/pref_return_to_previous" />
     </PreferenceScreen>
     <!--status-->
     <PreferenceScreen
-        android:icon="@drawable/ic_new_releases_black_24dp"
+        android:icon="?attr/ic_settings_status"
         android:key="presence"
         android:title="@string/pref_presence_settings">
         <intent
@@ -234,7 +235,7 @@
     </PreferenceScreen>
     <!--Security-->
     <PreferenceScreen
-        android:icon="@drawable/ic_security_black_24dp"
+        android:icon="?attr/ic_settings_security"
         android:key="security"
         android:title="@string/pref_security_settings">
         <intent
@@ -268,13 +269,13 @@
         <CheckBoxPreference
             android:defaultValue="@bool/last_activity"
             android:key="last_activity"
-            android:title="@string/pref_broadcast_last_activity"
-            android:summary="@string/pref_broadcast_last_activity_summary" />
+            android:summary="@string/pref_broadcast_last_activity_summary"
+            android:title="@string/pref_broadcast_last_activity" />
         <CheckBoxPreference
             android:defaultValue="@bool/warn_unencrypted_chat"
             android:key="warn_unencrypted_chat"
-            android:title="@string/pref_warn_unencrypted_chat"
-            android:summary="@string/pref_warn_unencrypted_chat_summary"/>
+            android:summary="@string/pref_warn_unencrypted_chat_summary"
+            android:title="@string/pref_warn_unencrypted_chat" />
         <ListPreference
             android:defaultValue="@string/omemo_setting_default"
             android:entries="@array/omemo_setting_entries"
@@ -301,7 +302,7 @@
     </PreferenceScreen>
     <!--Expert-->
     <PreferenceScreen
-        android:icon="@drawable/ic_settings_black_24dp"
+        android:icon="?attr/ic_settings_expert"
         android:key="expert"
         android:title="@string/pref_expert_options">
         <intent
@@ -312,13 +313,14 @@
                 android:name="page"
                 android:value="expert" />
         </intent>
-        <PreferenceCategory android:title="@string/pref_general"
-            android:key="general">
+        <PreferenceCategory
+            android:key="general"
+            android:title="@string/pref_general">
             <CheckBoxPreference
                 android:defaultValue="@bool/show_foreground_service"
                 android:key="show_foreground_service"
                 android:summary="@string/pref_show_foreground_service_summary"
-                android:title="@string/pref_show_foreground_service"/>
+                android:title="@string/pref_show_foreground_service" />
             <PreferenceScreen
                 android:key="huawei"
                 android:summary="@string/huawei_protected_apps_summary"
@@ -330,8 +332,8 @@
             <CheckBoxPreference
                 android:defaultValue="@bool/enable_multi_accounts"
                 android:key="enable_multi_accounts"
-                android:title="@string/pref_enable_multi_accounts_title"
-                android:summary="@string/pref_enable_multi_accounts_summary" />
+                android:summary="@string/pref_enable_multi_accounts_summary"
+                android:title="@string/pref_enable_multi_accounts_title" />
         </PreferenceCategory>
         <PreferenceCategory android:title="@string/pref_ui_options">
             <CheckBoxPreference
@@ -349,8 +351,8 @@
             <CheckBoxPreference
                 android:defaultValue="@bool/btbv"
                 android:key="btbv"
-                android:title="@string/pref_blind_trust_before_verification"
-                android:summary="@string/pref_blind_trust_before_verification_summary" />
+                android:summary="@string/pref_blind_trust_before_verification_summary"
+                android:title="@string/pref_blind_trust_before_verification" />
             <ListPreference
                 android:defaultValue="@integer/automatic_message_deletion"
                 android:key="automatic_message_deletion"
@@ -358,8 +360,8 @@
                 android:title="@string/pref_automatically_delete_messages" />
             <Preference
                 android:key="delete_omemo_identities"
-                android:title="@string/pref_delete_omemo_identities"
-                android:summary="@string/pref_delete_omemo_identities_summary" />
+                android:summary="@string/pref_delete_omemo_identities_summary"
+                android:title="@string/pref_delete_omemo_identities" />
             <CheckBoxPreference
                 android:defaultValue="@bool/dont_trust_system_cas"
                 android:key="dont_trust_system_cas"
@@ -387,7 +389,7 @@
                 android:defaultValue="@bool/show_connection_options"
                 android:key="show_connection_options"
                 android:summary="@string/pref_show_connection_options_summary"
-                android:title="@string/pref_show_connection_options"/>
+                android:title="@string/pref_show_connection_options" />
         </PreferenceCategory>
         <PreferenceCategory android:title="@string/pref_input_options">
             <CheckBoxPreference
@@ -411,7 +413,7 @@
     </PreferenceScreen>
     <!--About-->
     <de.pixart.messenger.ui.AboutPreference
-        android:icon="@drawable/ic_help_black_24dp"
+        android:icon="?attr/ic_settings_about"
         android:summary="@string/pref_about_conversations_summary"
         android:title="@string/title_activity_about" />