From 3b0eb15646cc9ac60a7661cf25d5a1a528bae404 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Tue, 27 Aug 2019 16:46:46 +0800
Subject: This app now has an icon (finally)git statusgit statusgit status Add
 a credits page in settings. Use another error view and no comment
 placeholder.

---
 app/src/main/res/xml/about_preferences.xml   | 13 ++++++++
 app/src/main/res/xml/credits_preferences.xml | 44 ++++++++++++++++++++++++++++
 app/src/main/res/xml/main_preferences.xml    |  6 ++--
 3 files changed, 59 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/xml/about_preferences.xml
 create mode 100644 app/src/main/res/xml/credits_preferences.xml

(limited to 'app/src/main/res/xml')

diff --git a/app/src/main/res/xml/about_preferences.xml b/app/src/main/res/xml/about_preferences.xml
new file mode 100644
index 00000000..a16237e4
--- /dev/null
+++ b/app/src/main/res/xml/about_preferences.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <Preference
+        app:title="@string/settings_acknowledgement_master_title"
+        app:fragment="Settings.AcknowledgementFragment" />
+
+    <Preference
+        app:title="@string/settings_credits_master_title"
+        app:fragment="Settings.CreditsPreferenceFragment" />
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/credits_preferences.xml b/app/src/main/res/xml/credits_preferences.xml
new file mode 100644
index 00000000..d5a5f580
--- /dev/null
+++ b/app/src/main/res/xml/credits_preferences.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <Preference
+        android:key="icon_foreground"
+        app:title="@string/settings_credits_icon_foreground_title"
+        android:summary="@string/settings_credits_icon_foreground_summary" />
+
+    <Preference
+        android:key="icon_background"
+        app:title="@string/settings_credits_icon_background_title"
+        android:summary="@string/settings_credits_icon_background_summary" />
+
+    <Preference
+        android:key="error_image"
+        app:title="@string/settings_credits_error_image_title"
+        android:summary="@string/settings_credits_error_image_summary" />
+
+    <Preference
+        android:key="subreddit_and_user_placeholder"
+        app:title="@string/settings_credits_subreddit_and_user_placeholder_title"
+        android:summary="@string/settings_credits_subreddit_and_user_placeholder_summary" />
+
+    <Preference
+        android:key="gilded_icon"
+        app:title="@string/settings_credits_gilded_icon_title"
+        android:summary="@string/settings_credits_gilded_icon_summary" />
+
+    <Preference
+        android:key="crosspost_icon"
+        app:title="@string/settings_credits_crosspost_icon_title"
+        android:summary="@string/settings_credits_crosspost_icon_summary" />
+
+    <Preference
+        android:key="thumbtack_icon"
+        app:title="@string/settings_credits_thumbtack_icon_title"
+        android:summary="@string/settings_credits_thumbtack_icon_summary" />
+
+    <Preference
+        android:key="material_icons"
+        app:title="@string/settings_credits_material_icons_title"/>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/main_preferences.xml b/app/src/main/res/xml/main_preferences.xml
index 7d482fae..bdf0f2a6 100644
--- a/app/src/main/res/xml/main_preferences.xml
+++ b/app/src/main/res/xml/main_preferences.xml
@@ -3,7 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <Preference
-        app:key="notification_master"
         app:icon="@drawable/ic_outline_notifications_24px"
         app:title="@string/settings_notification_master_title"
         app:fragment="Settings.NotificationPreferenceFragment" />
@@ -31,8 +30,7 @@
         app:title="@string/settings_enable_nsfw_title"/>
 
     <Preference
-        app:key="acknowledgement_master"
-        app:title="@string/settings_acknowledgement_master_title"
-        app:fragment="Settings.AcknowledgementFragment" />
+        app:title="@string/settings_about_master_title"
+        app:fragment="Settings.AboutPreferenceFragment" />
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
-- 
cgit v1.2.3