1 files changed, 71 insertions, 24 deletions

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 dd932814f..3f005fe36 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
@@ -1,14 +1,12 @@
 package de.danoeh.antennapod.activity;
 
-import android.annotation.TargetApi;
-import android.app.Activity;
 import android.content.Intent;
-import android.os.Build;
 import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.PreferenceFragment;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceFragmentCompat;
+import android.support.v7.preference.PreferenceScreen;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.ViewGroup;
@@ -16,6 +14,9 @@ import android.widget.FrameLayout;
 
 import java.lang.ref.WeakReference;
 
+import com.bytehamster.lib.preferencesearch.SearchPreference;
+import com.bytehamster.lib.preferencesearch.SearchPreferenceResult;
+import com.bytehamster.lib.preferencesearch.SearchPreferenceResultListener;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.preferences.PreferenceController;
@@ -24,25 +25,40 @@ import de.danoeh.antennapod.preferences.PreferenceController;
  * PreferenceActivity for API 11+. In order to change the behavior of the preference UI, see
  * PreferenceController.
  */
-public class PreferenceActivity extends AppCompatActivity {
+public class PreferenceActivity extends AppCompatActivity implements SearchPreferenceResultListener {
 
+    public static final String PARAM_RESOURCE = "resource";
     private static WeakReference<PreferenceActivity> instance;
     private PreferenceController preferenceController;
-    private MainFragment prefFragment;
     private final PreferenceController.PreferenceUI preferenceUI = new PreferenceController.PreferenceUI() {
-        @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+        private PreferenceFragmentCompat fragment;
+
+        @Override
+        public void setFragment(PreferenceFragmentCompat fragment) {
+            this.fragment = fragment;
+        }
+
+        @Override
+        public PreferenceFragmentCompat getFragment() {
+            return fragment;
+        }
+
         @Override
         public Preference findPreference(CharSequence key) {
-            return prefFragment.findPreference(key);
+            return fragment.findPreference(key);
         }
 
         @Override
-        public Activity getActivity() {
+        public PreferenceScreen getPreferenceScreen() {
+            return fragment.getPreferenceScreen();
+        }
+
+        @Override
+        public AppCompatActivity getActivity() {
             return PreferenceActivity.this;
         }
     };
 
-    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         // This must be the FIRST thing we do, otherwise other code may not have the
@@ -68,8 +84,21 @@ public class PreferenceActivity extends AppCompatActivity {
         // since the MainFragment depends on the preferenceController already being created
         preferenceController = new PreferenceController(preferenceUI);
 
-        prefFragment = new MainFragment();
-        getFragmentManager().beginTransaction().replace(R.id.content, prefFragment).commit();
+        showPreferenceScreen(R.xml.preferences, false);
+    }
+
+    private void showPreferenceScreen(int screen, boolean addHistory) {
+        PreferenceFragmentCompat prefFragment = new MainFragment();
+        preferenceUI.setFragment(prefFragment);
+        Bundle args = new Bundle();
+        args.putInt(PARAM_RESOURCE, screen);
+        prefFragment.setArguments(args);
+        if (addHistory) {
+            getSupportFragmentManager().beginTransaction().replace(R.id.content, prefFragment)
+                    .addToBackStack(getString(PreferenceController.getTitleOfPage(screen))).commit();
+        } else {
+            getSupportFragmentManager().beginTransaction().replace(R.id.content, prefFragment).commit();
+        }
     }
 
     @Override
@@ -88,24 +117,40 @@ public class PreferenceActivity extends AppCompatActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case android.R.id.home:
-                finish();
+                if (getSupportFragmentManager().getBackStackEntryCount() == 0) {
+                    finish();
+                } else {
+                    getSupportFragmentManager().popBackStack();
+                }
                 return true;
             default:
                 return false;
         }
     }
 
-    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-    public static class MainFragment extends PreferenceFragment {
+    @Override
+    public void onSearchResultClicked(SearchPreferenceResult result) {
+        showPreferenceScreen(result.getResourceFile(), true);
+        result.highlight(preferenceUI.getFragment());
+    }
+
+    public static class MainFragment extends PreferenceFragmentCompat {
+        private int screen;
 
         @Override
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
             setRetainInstance(true);
-            addPreferencesFromResource(R.xml.preferences);
+        }
+
+        @Override
+        public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+            screen = getArguments().getInt(PARAM_RESOURCE);
+            addPreferencesFromResource(screen);
             PreferenceActivity activity = instance.get();
-            if(activity != null && activity.preferenceController != null) {
-                activity.preferenceController.onCreate();
+            if (activity != null && activity.preferenceController != null) {
+                activity.preferenceUI.setFragment(this);
+                activity.preferenceController.onCreate(screen);
             }
         }
 
@@ -114,15 +159,17 @@ public class PreferenceActivity extends AppCompatActivity {
             super.onResume();
             PreferenceActivity activity = instance.get();
             if(activity != null && activity.preferenceController != null) {
-                activity.preferenceController.onResume();
+                activity.setTitle(PreferenceController.getTitleOfPage(screen));
+                activity.preferenceUI.setFragment(this);
+                activity.preferenceController.onResume(screen);
             }
         }
 
         @Override
         public void onPause() {
             PreferenceActivity activity = instance.get();
-            if(activity != null && activity.preferenceController != null) {
-                activity.preferenceController.onPause();
+            if (screen == R.xml.preferences_gpodder) {
+                activity.preferenceController.unregisterGpodnet();
             }
             super.onPause();
         }
@@ -130,8 +177,8 @@ public class PreferenceActivity extends AppCompatActivity {
         @Override
         public void onStop() {
             PreferenceActivity activity = instance.get();
-            if(activity != null && activity.preferenceController != null) {
-                activity.preferenceController.onStop();
+            if (screen == R.xml.preferences_storage) {
+                activity.preferenceController.unsubscribeExportSubscription();
             }
             super.onStop();
         }