From f2843fd56d4f761ea812083df6731b6fcf646207 Mon Sep 17 00:00:00 2001
From: Florens Douwes <Floens@gmail.com>
Date: Fri, 18 Jul 2014 11:40:27 +0200
Subject: [PATCH] Move board mode to advanced settings

---
 .../ui/activity/AdvancedSettingsActivity.java | 22 +++++++++++++++++++
 .../chan/ui/fragment/SettingsFragment.java    | 16 --------------
 Clover/app/src/main/res/xml/preference.xml    |  8 -------
 .../src/main/res/xml/preference_advanced.xml  |  8 +++++++
 4 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/Clover/app/src/main/java/org/floens/chan/ui/activity/AdvancedSettingsActivity.java b/Clover/app/src/main/java/org/floens/chan/ui/activity/AdvancedSettingsActivity.java
index adea74c6..a04bd923 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/activity/AdvancedSettingsActivity.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/activity/AdvancedSettingsActivity.java
@@ -18,6 +18,7 @@
 package org.floens.chan.ui.activity;
 
 import android.os.Bundle;
+import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceFragment;
@@ -62,6 +63,27 @@ public class AdvancedSettingsActivity extends PreferenceActivity {
                     return true;
                 }
             });
+
+            final ListPreference boardMode = (ListPreference) findPreference("preference_board_mode");
+            String currentModeValue = boardMode.getValue();
+            if (currentModeValue == null) {
+                boardMode.setValue((String) boardMode.getEntryValues()[0]);
+                currentModeValue = boardMode.getValue();
+            }
+            updateSummary(boardMode, currentModeValue);
+            boardMode.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+                @Override
+                public boolean onPreferenceChange(Preference preference, Object newValue) {
+                    updateSummary(boardMode, newValue.toString());
+                    BaseActivity.doRestartOnResume = true;
+                    return true;
+                }
+            });
+        }
+
+        private void updateSummary(ListPreference list, String value) {
+            int index = list.findIndexOfValue(value);
+            list.setSummary(list.getEntries()[index]);
         }
     }
 }
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/fragment/SettingsFragment.java b/Clover/app/src/main/java/org/floens/chan/ui/fragment/SettingsFragment.java
index 45be71f3..b4bd3451 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/fragment/SettingsFragment.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/fragment/SettingsFragment.java
@@ -122,22 +122,6 @@ public class SettingsFragment extends PreferenceFragment {
                 return true;
             }
         });
-
-        final ListPreference boardMode = (ListPreference) findPreference("preference_board_mode");
-        String currentModeValue = boardMode.getValue();
-        if (currentModeValue == null) {
-            boardMode.setValue((String) boardMode.getEntryValues()[0]);
-            currentModeValue = boardMode.getValue();
-        }
-        updateSummary(boardMode, currentModeValue);
-        boardMode.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                updateSummary(boardMode, newValue.toString());
-                BaseActivity.doRestartOnResume = true;
-                return true;
-            }
-        });
     }
 
     public void onStart() {
diff --git a/Clover/app/src/main/res/xml/preference.xml b/Clover/app/src/main/res/xml/preference.xml
index d2aebdcc..32c97291 100644
--- a/Clover/app/src/main/res/xml/preference.xml
+++ b/Clover/app/src/main/res/xml/preference.xml
@@ -52,14 +52,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             android:entryValues="@array/preference_themes_values"
             android:title="@string/preference_theme"/>
 
-        <ListPreference
-            android:key="preference_board_mode"
-            android:defaultValue="catalog"
-            android:dialogTitle="@string/preference_board_mode"
-            android:entries="@array/preference_board_modes"
-            android:entryValues="@array/preference_board_modes_values"
-            android:title="@string/preference_board_mode" />
-
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="preference_open_link_confirmation"
diff --git a/Clover/app/src/main/res/xml/preference_advanced.xml b/Clover/app/src/main/res/xml/preference_advanced.xml
index 7d27e167..45d215f4 100644
--- a/Clover/app/src/main/res/xml/preference_advanced.xml
+++ b/Clover/app/src/main/res/xml/preference_advanced.xml
@@ -17,6 +17,14 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <ListPreference
+        android:key="preference_board_mode"
+        android:defaultValue="catalog"
+        android:dialogTitle="@string/preference_board_mode"
+        android:entries="@array/preference_board_modes"
+        android:entryValues="@array/preference_board_modes_values"
+        android:title="@string/preference_board_mode" />
+
     <CheckBoxPreference
         android:defaultValue="false"
         android:key="preference_force_phone_layout"