Reorder settings

Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java

@@ -129,32 +129,29 @@ public class MainSettingsController extends SettingsController implements Toolba
             }
         }));
 
-        passLink = (LinkSettingView) general.add(new LinkSettingView(this, s(R.string.settings_pass), null, new View.OnClickListener() {
+        groups.add(general);
-            @Override
+
-            public void onClick(View v) {
+        SettingsGroup appearance = new SettingsGroup(s(R.string.settings_group_appearance));
-                navigationController.pushController(new PassSettingsController(context));
-            }
-        }));
 
-        general.add(new LinkSettingView(this, s(R.string.settings_screen_theme), null, new View.OnClickListener() {
+        appearance.add(new LinkSettingView(this, s(R.string.settings_screen_theme), null, new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 navigationController.pushController(new ThemeSettingsController(context));
             }
         }));
 
-        groups.add(general);
-
-        // Browsing group
-        SettingsGroup browsing = new SettingsGroup(s(R.string.settings_group_browsing));
-
         List<ListSettingView.Item> fontSizes = new ArrayList<>();
         for (int size = 10; size <= 19; size++) {
             String name = size + (String.valueOf(size).equals(ChanSettings.fontSize.getDefault()) ? " " + s(R.string.setting_font_size_default) : "");
             fontSizes.add(new ListSettingView.Item(name, String.valueOf(size)));
         }
 
-        browsing.add(new ListSettingView(this, ChanSettings.fontSize, s(R.string.setting_font_size), fontSizes.toArray(new ListSettingView.Item[fontSizes.size()])));
+        appearance.add(new ListSettingView(this, ChanSettings.fontSize, s(R.string.setting_font_size), fontSizes.toArray(new ListSettingView.Item[fontSizes.size()])));
+
+        groups.add(appearance);
+
+        // Browsing group
+        SettingsGroup browsing = new SettingsGroup(s(R.string.settings_group_browsing));
 
         browsing.add(new BooleanSettingView(this, ChanSettings.openLinkConfirmation, s(R.string.setting_open_link_confirmation), null));
         browsing.add(new BooleanSettingView(this, ChanSettings.autoRefreshThread, s(R.string.setting_auto_refresh_thread), null));
@@ -166,29 +163,21 @@ public class MainSettingsController extends SettingsController implements Toolba
 
         // Posting group
         SettingsGroup posting = new SettingsGroup(s(R.string.settings_group_posting));
-        posting.add(new StringSettingView(this, ChanSettings.postDefaultName, s(R.string.setting_post_default_name), s(R.string.setting_post_default_name)));
-        posting.add(new BooleanSettingView(this, ChanSettings.postPinThread, s(R.string.setting_post_pin), null));
 
-        groups.add(posting);
+        passLink = (LinkSettingView) posting.add(new LinkSettingView(this, s(R.string.settings_pass), null, new View.OnClickListener() {
-
-        // About group
-        SettingsGroup about = new SettingsGroup(s(R.string.settings_group_about));
-        about.add(new LinkSettingView(this, s(R.string.settings_about_license), s(R.string.settings_about_license_description), new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                navigationController.pushController(new LicensesController(context,
+                navigationController.pushController(new PassSettingsController(context));
-                        s(R.string.settings_about_license), "file:///android_asset/html/license.html"));
             }
         }));
 
-        about.add(new LinkSettingView(this, s(R.string.settings_about_licenses), s(R.string.settings_about_licenses_description), new View.OnClickListener() {
+        posting.add(new BooleanSettingView(this, ChanSettings.postPinThread, s(R.string.setting_post_pin), null));
-            @Override
+        posting.add(new StringSettingView(this, ChanSettings.postDefaultName, s(R.string.setting_post_default_name), s(R.string.setting_post_default_name)));
-            public void onClick(View v) {
-                navigationController.pushController(new LicensesController(context,
-                        s(R.string.settings_about_licenses), "file:///android_asset/html/licenses.html"));
-            }
-        }));
 
+        groups.add(posting);
+
+        // About group
+        SettingsGroup about = new SettingsGroup(s(R.string.settings_group_about));
         String version = "";
         try {
             version = context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionName;
@@ -211,6 +200,22 @@ public class MainSettingsController extends SettingsController implements Toolba
             }
         }));
 
+        about.add(new LinkSettingView(this, s(R.string.settings_about_license), s(R.string.settings_about_license_description), new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                navigationController.pushController(new LicensesController(context,
+                        s(R.string.settings_about_license), "file:///android_asset/html/license.html"));
+            }
+        }));
+
+        about.add(new LinkSettingView(this, s(R.string.settings_about_licenses), s(R.string.settings_about_licenses_description), new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                navigationController.pushController(new LicensesController(context,
+                        s(R.string.settings_about_licenses), "file:///android_asset/html/licenses.html"));
+            }
+        }));
+
         developerView = about.add(new LinkSettingView(this, s(R.string.settings_developer), null, new View.OnClickListener() {
             @Override
             public void onClick(View v) {

Clover/app/src/main/res/values/strings.xml

@@ -164,9 +164,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     <string name="settings_screen">Settings</string>
     <string name="settings_group_general">General</string>
-    <string name="settings_board_edit">Edit boards</string>
+    <string name="settings_board_edit">Boards</string>
-    <string name="settings_watch">Thread watcher settings</string>
+    <string name="settings_watch">Thread watcher</string>
-    <string name="settings_pass">4chan pass settings</string>
+    <string name="settings_pass">4chan pass</string>
+
+    <string name="settings_group_appearance">Appearance</string>
 
     <string name="settings_group_browsing">Browsing</string>
     <string name="setting_theme">Theme</string>