From 66ee03c4658006bf3c346c53024fcb2fa86d2712 Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Tue, 17 Mar 2015 11:25:01 -0500
Subject: [PATCH] AppearancePreferences extends PreferenceActivity

---
 .../astrid/activity/EditPreferences.java      |  4 +--
 .../org/tasks/injection/ActivityModule.java   |  4 +--
 .../preferences/AppearancePreferences.java    | 31 ++-----------------
 src/main/res/values/keys.xml                  |  9 +++---
 src/main/res/xml/preferences_appearance.xml   |  8 +++--
 5 files changed, 15 insertions(+), 41 deletions(-)

diff --git a/src/main/java/com/todoroo/astrid/activity/EditPreferences.java b/src/main/java/com/todoroo/astrid/activity/EditPreferences.java
index 571f88dc1..5c5dc6d0d 100644
--- a/src/main/java/com/todoroo/astrid/activity/EditPreferences.java
+++ b/src/main/java/com/todoroo/astrid/activity/EditPreferences.java
@@ -8,6 +8,7 @@ package com.todoroo.astrid.activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.preference.Preference;
+import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
 
 import com.todoroo.astrid.api.AstridApiConstants;
@@ -17,7 +18,6 @@ import com.todoroo.astrid.core.OldTaskPreferences;
 import com.todoroo.astrid.gtasks.GtasksPreferences;
 import com.todoroo.astrid.reminders.ReminderPreferences;
 import com.todoroo.astrid.service.StartupService;
-import com.todoroo.astrid.utility.TodorooPreferenceActivity;
 
 import org.tasks.R;
 import org.tasks.injection.InjectingPreferenceActivity;
@@ -64,7 +64,7 @@ public class EditPreferences extends InjectingPreferenceActivity {
         }
     }
 
-    private Preference getPreference(final Class<? extends TodorooPreferenceActivity> klass, final int label) {
+    private Preference getPreference(final Class<? extends PreferenceActivity> klass, final int label) {
         return new Preference(this) {{
             setTitle(getResources().getString(label));
             setIntent(new Intent(EditPreferences.this, klass) {{
diff --git a/src/main/java/org/tasks/injection/ActivityModule.java b/src/main/java/org/tasks/injection/ActivityModule.java
index 54bc70e5a..dc1590e71 100644
--- a/src/main/java/org/tasks/injection/ActivityModule.java
+++ b/src/main/java/org/tasks/injection/ActivityModule.java
@@ -26,7 +26,6 @@ import com.todoroo.astrid.tags.DeleteTagActivity;
 import com.todoroo.astrid.tags.RenameTagActivity;
 import com.todoroo.astrid.widget.WidgetConfigActivity;
 
-import org.tasks.preferences.AppearancePreferences;
 import org.tasks.preferences.MiscellaneousPreferences;
 import org.tasks.reminders.SnoozeActivity;
 import org.tasks.voice.VoiceCommandActivity;
@@ -63,8 +62,7 @@ import dagger.Provides;
                 ReminderPreferences.class,
                 AACRecordingActivity.class,
                 SnoozeActivity.class,
-                MiscellaneousPreferences.class,
-                AppearancePreferences.class
+                MiscellaneousPreferences.class
         })
 public class ActivityModule {
 
diff --git a/src/main/java/org/tasks/preferences/AppearancePreferences.java b/src/main/java/org/tasks/preferences/AppearancePreferences.java
index 975b6855d..ac356db3d 100644
--- a/src/main/java/org/tasks/preferences/AppearancePreferences.java
+++ b/src/main/java/org/tasks/preferences/AppearancePreferences.java
@@ -1,40 +1,15 @@
 package org.tasks.preferences;
 
-import android.content.Intent;
 import android.os.Bundle;
-import android.preference.Preference;
-
-import com.todoroo.astrid.activity.BeastModePreferences;
-import com.todoroo.astrid.api.AstridApiConstants;
-import com.todoroo.astrid.utility.TodorooPreferenceActivity;
+import android.preference.PreferenceActivity;
 
 import org.tasks.R;
 
-public class AppearancePreferences extends TodorooPreferenceActivity {
-
+public class AppearancePreferences extends PreferenceActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        // first-order preferences
-
-        findPreference(getString(R.string.p_beastMode)).setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
-            @Override
-            public boolean onPreferenceClick(Preference p) {
-                startActivity(new Intent(AppearancePreferences.this, BeastModePreferences.class) {{
-                    setAction(AstridApiConstants.ACTION_SETTINGS);
-                }});
-                return true;
-            }
-        });
-    }
-
-    @Override
-    public int getPreferenceResource() {
-        return R.xml.preferences_appearance;
-    }
-
-    @Override
-    public void updatePreferences(Preference preference, Object value) {
+        addPreferencesFromResource(R.xml.preferences_appearance);
     }
 }
diff --git a/src/main/res/values/keys.xml b/src/main/res/values/keys.xml
index 7d4203b13..2454da093 100644
--- a/src/main/res/values/keys.xml
+++ b/src/main/res/values/keys.xml
@@ -89,7 +89,6 @@
   <!-- ======================================================= APPEARANCE == -->
 
   <string name="p_fontSize">font_size</string>
-  <string name="p_beastMode">beastMode</string>
 
   <string name="p_voicePrefSection">voicePrefSection</string>
   <string name="p_voiceRemindersEnabled">voiceRemindersEnabled</string>
@@ -228,12 +227,12 @@
       <item>@string/TEA_control_repeat</item>
       <item>@string/TEA_control_importance</item>
       <item>@string/TEA_control_lists</item>
-      <item>@string/TEA_control_notes</item>
+      <item>@string/TEA_control_reminders</item>
       <item>@string/TEA_control_files</item>
+      <item>@string/TEA_control_notes</item>
       <item>@string/TEA_hideUntil_label</item>
-      <item>@string/TEA_control_reminders</item>
-      <item>@string/TEA_control_timer</item>
       <item>@string/TEA_control_gcal</item>
+      <item>@string/TEA_control_timer</item>
       <item>@string/TEA_control_hidden_section</item>
   </string-array>
 
@@ -261,8 +260,8 @@
         <item>@string/TEA_ctrl_repeat_pref</item>
         <item>@string/TEA_ctrl_importance_pref</item>
         <item>@string/TEA_ctrl_lists_pref</item>
-        <item>@string/TEA_ctrl_files_pref</item>
         <item>@string/TEA_ctrl_reminders_pref</item>
+        <item>@string/TEA_ctrl_files_pref</item>
         <item>@string/TEA_ctrl_notes_pref</item>
         <item>@string/TEA_ctrl_hide_until_pref</item>
         <item>@string/TEA_ctrl_gcal</item>
diff --git a/src/main/res/xml/preferences_appearance.xml b/src/main/res/xml/preferences_appearance.xml
index 9748e3d8f..63be5635c 100644
--- a/src/main/res/xml/preferences_appearance.xml
+++ b/src/main/res/xml/preferences_appearance.xml
@@ -25,9 +25,11 @@
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/EPr_edit_screen_options">
-        <PreferenceScreen
-            android:key="@string/p_beastMode"
-            android:title="@string/EPr_beastMode_title" />
+        <Preference android:title="@string/EPr_beastMode_title">
+            <intent
+                android:targetClass="com.todoroo.astrid.activity.BeastModePreferences"
+                android:targetPackage="org.tasks" />
+        </Preference>
 
         <com.todoroo.astrid.ui.MultilineCheckboxPreference
             android:defaultValue="true"