From 5a2dca284034b6f06313d13ef59bee330133d30e Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Tue, 10 Apr 2018 23:41:41 +0200
Subject: [PATCH] Removed misc settings

---
 .../activity/PreferenceActivity.java          |  2 --
 .../preferences/PreferenceController.java     |  3 ---
 app/src/main/res/xml/preferences.xml          |  6 +++---
 .../res/xml/preferences_miscellaneous.xml     | 20 -------------------
 app/src/main/res/xml/preferences_playback.xml |  9 +++++++++
 app/src/main/res/xml/preferences_storage.xml  |  3 +++
 core/src/main/res/values/strings.xml          |  1 -
 7 files changed, 15 insertions(+), 29 deletions(-)
 delete mode 100644 app/src/main/res/xml/preferences_miscellaneous.xml

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
index b2e5c8f08..99d39fbd9 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
@@ -143,8 +143,6 @@ public class PreferenceActivity extends AppCompatActivity {
                     return R.string.user_interface_label;
                 case R.xml.preferences_services:
                     return R.string.services_label;
-                case R.xml.preferences_miscellaneous:
-                    return R.string.miscellaneous_pref;
                 default:
                     return R.string.settings_label;
             }
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 9ec5eeb8e..1e0df6a94 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -79,7 +79,6 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
     private static final String PREF_SCREEN_DOWNLOADS = "prefScreenDownloads";
     private static final String PREF_SCREEN_SERVICES = "prefScreenServices";
     private static final String PREF_SCREEN_STORAGE = "prefScreenStorage";
-    private static final String PREF_SCREEN_MISCELLANEOUS = "prefScreenMiscellaneous";
 
     private static final String PREF_FLATTR_SETTINGS = "prefFlattrSettings";
     private static final String PREF_FLATTR_AUTH = "pref_flattr_authenticate";
@@ -155,8 +154,6 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                     openScreen(R.xml.preferences_services, activity));
             ui.findPreference(PREF_SCREEN_STORAGE).setOnPreferenceClickListener(preference ->
                     openScreen(R.xml.preferences_storage, activity));
-            ui.findPreference(PREF_SCREEN_MISCELLANEOUS).setOnPreferenceClickListener(preference ->
-                    openScreen(R.xml.preferences_miscellaneous, activity));
         }
 /*
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 1ab4e5ba3..8407026b6 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -28,9 +28,9 @@
             android:icon="@drawable/ic_filter_grey600_24dp" />
 
     <Preference
-            android:key="prefScreenMiscellaneous"
-            android:title="@string/miscellaneous_pref"
-            android:icon="@drawable/ic_cast_disconnect_grey600_36dp" />
+            android:key="statistics"
+            android:title="@string/statistics_label"
+            android:icon="@drawable/stat_notify_sync" />
 
     <PreferenceCategory android:title="@string/project_pref">
         <Preference
diff --git a/app/src/main/res/xml/preferences_miscellaneous.xml b/app/src/main/res/xml/preferences_miscellaneous.xml
deleted file mode 100644
index ad7cb9192..000000000
--- a/app/src/main/res/xml/preferences_miscellaneous.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen
-        xmlns:android="http://schemas.android.com/apk/res/android">
-    <Preference
-            android:key="statistics"
-            android:title="@string/statistics_label"/>
-
-    <PreferenceCategory android:title="@string/experimental_pref">
-        <de.danoeh.antennapod.preferences.SwitchCompatPreference
-                android:defaultValue="false"
-                android:enabled="true"
-                android:key="prefCast"
-                android:summary="@string/pref_cast_message"
-                android:title="@string/pref_cast_title"/>
-
-        <Preference
-                android:key="importExport"
-                android:title="@string/import_export"/>
-    </PreferenceCategory>
-</PreferenceScreen>
diff --git a/app/src/main/res/xml/preferences_playback.xml b/app/src/main/res/xml/preferences_playback.xml
index 7fd92d344..7509f859f 100644
--- a/app/src/main/res/xml/preferences_playback.xml
+++ b/app/src/main/res/xml/preferences_playback.xml
@@ -108,4 +108,13 @@
                 android:summary="@string/pref_sonic_message"
                 android:title="@string/pref_sonic_title"/>
     </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/experimental_pref">
+        <de.danoeh.antennapod.preferences.SwitchCompatPreference
+                android:defaultValue="false"
+                android:enabled="true"
+                android:key="prefCast"
+                android:summary="@string/pref_cast_message"
+                android:title="@string/pref_cast_title"/>
+    </PreferenceCategory>
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/preferences_storage.xml b/app/src/main/res/xml/preferences_storage.xml
index c1d7a69fc..9c9834479 100644
--- a/app/src/main/res/xml/preferences_storage.xml
+++ b/app/src/main/res/xml/preferences_storage.xml
@@ -36,5 +36,8 @@
         <Preference
                 android:key="prefHtmlExport"
                 android:title="@string/html_export_label"/>
+        <Preference
+                android:key="importExport"
+                android:title="@string/import_export"/>
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index f2f29eb30..9a8e3f654 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -309,7 +309,6 @@
     <string name="services_label">Services</string>
     <string name="flattr_label">Flattr</string>
     <string name="flattr_summary">Micropayment service</string>
-    <string name="miscellaneous_pref">Miscellaneous</string>
     <string name="data_usage">Data usage</string>
     <string name="download_pref_details">Details</string>
     <string name="import_export_pref">Import/Export</string>