From 453f742732dcb1b54175ab9f388b07d0d3af8644 Mon Sep 17 00:00:00 2001
From: len <len@kanade.eu>
Date: Tue, 15 Nov 2016 19:12:03 +0100
Subject: [PATCH] Trying to fix a crash in settings (again)

---
 app/src/main/res/xml/pref_about.xml     |  7 ++++--
 app/src/main/res/xml/pref_downloads.xml | 13 +++++-----
 app/src/main/res/xml/pref_general.xml   |  8 +++---
 app/src/main/res/xml/pref_reader.xml    | 33 ++++++++++++++-----------
 4 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/app/src/main/res/xml/pref_about.xml b/app/src/main/res/xml/pref_about.xml
index 2b938c8caa..3fc01ac676 100644
--- a/app/src/main/res/xml/pref_about.xml
+++ b/app/src/main/res/xml/pref_about.xml
@@ -11,13 +11,16 @@
             android:defaultValue="true"
             android:key="acra.enable"
             android:summary="@string/pref_acra_summary"
-            android:title="@string/pref_enable_acra"
-            app:showText="false"/>
+            android:textOff="@string/pref_enable_acra"
+            android:textOn="@string/pref_enable_acra"
+            android:title="@string/pref_enable_acra" />
 
         <SwitchPreference
             android:defaultValue="false"
             android:key="@string/pref_enable_automatic_updates_key"
             android:summary="@string/pref_enable_automatic_updates_summary"
+            android:textOff="@string/pref_enable_automatic_updates"
+            android:textOn="@string/pref_enable_automatic_updates"
             android:title="@string/pref_enable_automatic_updates"
             app:showText="false"/>
 
diff --git a/app/src/main/res/xml/pref_downloads.xml b/app/src/main/res/xml/pref_downloads.xml
index 4067f79eee..d29807bf97 100644
--- a/app/src/main/res/xml/pref_downloads.xml
+++ b/app/src/main/res/xml/pref_downloads.xml
@@ -1,6 +1,5 @@
 <?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">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <PreferenceScreen
         android:key="downloads_screen"
@@ -14,8 +13,9 @@
         <SwitchPreference
             android:defaultValue="true"
             android:key="@string/pref_download_only_over_wifi_key"
-            android:title="@string/pref_download_only_over_wifi"
-            app:showText="false"/>
+            android:textOff="@string/pref_download_only_over_wifi"
+            android:textOn="@string/pref_download_only_over_wifi"
+            android:title="@string/pref_download_only_over_wifi" />
 
         <eu.kanade.tachiyomi.widget.preference.IntListPreference
             android:defaultValue="1"
@@ -32,8 +32,9 @@
         <SwitchPreference
             android:defaultValue="false"
             android:key="@string/pref_remove_after_marked_as_read_key"
-            android:title="@string/pref_remove_after_marked_as_read"
-            app:showText="false"/>
+            android:textOff="@string/pref_remove_after_marked_as_read"
+            android:textOn="@string/pref_remove_after_marked_as_read"
+            android:title="@string/pref_remove_after_marked_as_read" />
 
         <eu.kanade.tachiyomi.widget.preference.IntListPreference
             android:defaultValue="-1"
diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
index 07d5b9a2d6..088c25e47d 100644
--- a/app/src/main/res/xml/pref_general.xml
+++ b/app/src/main/res/xml/pref_general.xml
@@ -1,6 +1,5 @@
 <?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">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <PreferenceScreen
         android:key="general_screen"
@@ -51,8 +50,9 @@
         <SwitchPreference
             android:defaultValue="false"
             android:key="@string/pref_update_only_non_completed_key"
-            android:title="@string/pref_update_only_non_completed"
-            app:showText="false"/>
+            android:textOff="@string/pref_update_only_non_completed"
+            android:textOn="@string/pref_update_only_non_completed"
+            android:title="@string/pref_update_only_non_completed" />
 
     </PreferenceScreen>
 
diff --git a/app/src/main/res/xml/pref_reader.xml b/app/src/main/res/xml/pref_reader.xml
index c1cf896b15..1b3f53edd2 100644
--- a/app/src/main/res/xml/pref_reader.xml
+++ b/app/src/main/res/xml/pref_reader.xml
@@ -1,6 +1,5 @@
 <?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">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <PreferenceScreen
         android:key="reader_screen"
@@ -56,43 +55,49 @@
             android:summary="%s" />
 
         <SwitchPreference
+            android:textOff="@string/pref_fullscreen"
+            android:textOn="@string/pref_fullscreen"
             android:title="@string/pref_fullscreen"
             android:key="@string/pref_fullscreen_key"
-            android:defaultValue="true"
-            app:showText="false"/>
+            android:defaultValue="true" />
 
         <SwitchPreference
+            android:textOff="@string/pref_enable_transitions"
+            android:textOn="@string/pref_enable_transitions"
             android:title="@string/pref_enable_transitions"
             android:key="@string/pref_enable_transitions_key"
-            android:defaultValue="true"
-            app:showText="false"/>
+            android:defaultValue="true" />
 
         <SwitchPreference
+            android:textOff="@string/pref_show_page_number"
+            android:textOn="@string/pref_show_page_number"
             android:title="@string/pref_show_page_number"
             android:key="@string/pref_show_page_number_key"
-            android:defaultValue="true"
-            app:showText="false"/>
+            android:defaultValue="true" />
 
         <SwitchPreference
+            android:textOff="@string/pref_keep_screen_on"
+            android:textOn="@string/pref_keep_screen_on"
             android:title="@string/pref_keep_screen_on"
             android:key="@string/pref_keep_screen_on_key"
-            android:defaultValue="true"
-            app:showText="false"/>
+            android:defaultValue="true" />
 
         <PreferenceCategory
             android:title="@string/pref_reader_navigation">
 
             <SwitchPreference
+                android:textOff="@string/pref_read_with_tapping"
+                android:textOn="@string/pref_read_with_tapping"
                 android:title="@string/pref_read_with_tapping"
                 android:key="@string/pref_read_with_tapping_key"
-                android:defaultValue="true"
-                app:showText="false"/>
+                android:defaultValue="true" />
 
             <SwitchPreference
+                android:textOff="@string/pref_read_with_volume_keys"
+                android:textOn="@string/pref_read_with_volume_keys"
                 android:title="@string/pref_read_with_volume_keys"
                 android:key="@string/pref_read_with_volume_keys_key"
-                android:defaultValue="false"
-                app:showText="false"/>
+                android:defaultValue="false" />
 
         </PreferenceCategory>