From 85e219aa5edc1e34a380d915cd29564b41053cb9 Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Fri, 20 Mar 2015 14:18:33 -0500
Subject: [PATCH] Only redraw task list if appearance prefs change

---
 src/main/AndroidManifest.xml                  |  5 +++
 .../org/tasks/injection/ActivityModule.java   |  4 ++-
 .../preferences/AppearancePreferences.java    | 34 +++++++++++++++++++
 .../tasks/preferences/BasicPreferences.java   | 20 +++++++++++
 .../tasks/ui/NavigationDrawerFragment.java    |  9 +++--
 src/main/res/xml/preferences.xml              |  9 ++---
 6 files changed, 72 insertions(+), 9 deletions(-)
 create mode 100644 src/main/java/org/tasks/preferences/AppearancePreferences.java

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index ef43c8615..bf56f4710 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -279,6 +279,11 @@
 
         <!-- ========================================================= Plugins = -->
 
+        <activity
+            android:name=".preferences.AppearancePreferences"
+            android:label="@string/EPr_appearance_header"
+            android:theme="@style/Tasks" />
+
         <activity
             android:name="com.todoroo.astrid.core.DefaultsPreferences"
             android:label="@string/task_defaults"
diff --git a/src/main/java/org/tasks/injection/ActivityModule.java b/src/main/java/org/tasks/injection/ActivityModule.java
index a42d51d2f..e61f04d5b 100644
--- a/src/main/java/org/tasks/injection/ActivityModule.java
+++ b/src/main/java/org/tasks/injection/ActivityModule.java
@@ -33,6 +33,7 @@ import org.tasks.activities.DonationActivity;
 import org.tasks.activities.ExportTaskActivity;
 import org.tasks.activities.ImportTaskActivity;
 import org.tasks.activities.PurgeDeletedActivity;
+import org.tasks.preferences.AppearancePreferences;
 import org.tasks.preferences.BasicPreferences;
 import org.tasks.preferences.HelpAndFeedbackActivity;
 import org.tasks.preferences.MiscellaneousPreferences;
@@ -80,7 +81,8 @@ import dagger.Provides;
                 ClearGtaskDataActivity.class,
                 ReminderPreferences.class,
                 HelpAndFeedbackActivity.class,
-                DonationActivity.class
+                DonationActivity.class,
+                AppearancePreferences.class
         })
 public class ActivityModule {
 
diff --git a/src/main/java/org/tasks/preferences/AppearancePreferences.java b/src/main/java/org/tasks/preferences/AppearancePreferences.java
new file mode 100644
index 000000000..a606d238e
--- /dev/null
+++ b/src/main/java/org/tasks/preferences/AppearancePreferences.java
@@ -0,0 +1,34 @@
+package org.tasks.preferences;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.preference.Preference;
+
+import org.tasks.R;
+import org.tasks.injection.InjectingPreferenceActivity;
+
+public class AppearancePreferences extends InjectingPreferenceActivity {
+
+    public static String FORCE_REFRESH = "force_refresh";
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        addPreferencesFromResource(R.xml.preferences_appearance);
+
+        setRefreshOnChange(R.string.p_use_dark_theme);
+        setRefreshOnChange(R.string.p_fontSize);
+        setRefreshOnChange(R.string.p_fullTaskTitle);
+    }
+
+    private void setRefreshOnChange(int resId) {
+        findPreference(getString(resId)).setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                setResult(RESULT_OK, new Intent().putExtra(FORCE_REFRESH, true));
+                return true;
+            }
+        });
+    }
+}
diff --git a/src/main/java/org/tasks/preferences/BasicPreferences.java b/src/main/java/org/tasks/preferences/BasicPreferences.java
index 64f764342..4d072dfb8 100644
--- a/src/main/java/org/tasks/preferences/BasicPreferences.java
+++ b/src/main/java/org/tasks/preferences/BasicPreferences.java
@@ -1,12 +1,16 @@
 package org.tasks.preferences;
 
+import android.content.Intent;
 import android.os.Bundle;
+import android.preference.Preference;
 
 import org.tasks.R;
 import org.tasks.injection.InjectingPreferenceActivity;
 
 public class BasicPreferences extends InjectingPreferenceActivity {
 
+    private static final int RC_PREFS = 10001;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -14,6 +18,13 @@ public class BasicPreferences extends InjectingPreferenceActivity {
         String action = getIntent().getAction();
         if (action == null) {
             addPreferencesFromResource(R.xml.preferences);
+            findPreference(getString(R.string.EPr_appearance_header)).setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+                @Override
+                public boolean onPreferenceClick(Preference preference) {
+                    startActivityForResult(new Intent(BasicPreferences.this, AppearancePreferences.class), RC_PREFS);
+                    return true;
+                }
+            });
         } else if (action.equals(getString(R.string.EPr_appearance_header))) {
             toolbar.setTitle(getString(R.string.EPr_appearance_header));
             addPreferencesFromResource(R.xml.preferences_appearance);
@@ -22,4 +33,13 @@ public class BasicPreferences extends InjectingPreferenceActivity {
             addPreferencesFromResource(R.xml.preferences_backup);
         }
     }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == RC_PREFS) {
+            setResult(resultCode, data);
+        } else {
+            super.onActivityResult(requestCode, resultCode, data);
+        }
+    }
 }
diff --git a/src/main/java/org/tasks/ui/NavigationDrawerFragment.java b/src/main/java/org/tasks/ui/NavigationDrawerFragment.java
index 19c76dfe9..2c1771151 100644
--- a/src/main/java/org/tasks/ui/NavigationDrawerFragment.java
+++ b/src/main/java/org/tasks/ui/NavigationDrawerFragment.java
@@ -43,6 +43,7 @@ import org.tasks.filters.FilterCounter;
 import org.tasks.filters.FilterProvider;
 import org.tasks.injection.ForApplication;
 import org.tasks.injection.InjectingFragment;
+import org.tasks.preferences.AppearancePreferences;
 import org.tasks.preferences.BasicPreferences;
 import org.tasks.preferences.HelpAndFeedbackActivity;
 import org.tasks.preferences.Preferences;
@@ -115,8 +116,10 @@ public class NavigationDrawerFragment extends InjectingFragment {
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == ACTIVITY_SETTINGS) {
-            getActivity().finish();
-            getActivity().startActivity(getActivity().getIntent());
+            if (resultCode == Activity.RESULT_OK && data.getBooleanExtra(AppearancePreferences.FORCE_REFRESH, false)) {
+                getActivity().finish();
+                getActivity().startActivity(getActivity().getIntent());
+            }
         } else {
             super.onActivityResult(requestCode, resultCode, data);
         }
@@ -136,12 +139,14 @@ public class NavigationDrawerFragment extends InjectingFragment {
         layout.findViewById(R.id.settings_row).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                closeMenu();
                 startActivityForResult(new Intent(getActivity(), BasicPreferences.class), ACTIVITY_SETTINGS);
             }
         });
         layout.findViewById(R.id.help_row).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                closeMenu();
                 startActivity(new Intent(getActivity(), HelpAndFeedbackActivity.class));
             }
         });
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 0aec43e6f..0a4615bd2 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <Preference android:title="@string/EPr_appearance_header">
-        <intent
-            android:action="@string/EPr_appearance_header"
-            android:targetClass="org.tasks.preferences.BasicPreferences"
-            android:targetPackage="org.tasks" />
-    </Preference>
+    <Preference
+        android:key="@string/EPr_appearance_header"
+        android:title="@string/EPr_appearance_header" />
 
     <Preference android:title="@string/notifications">
         <intent