From 5728644461320aec5cdca247a43078043f2dea0d Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Tue, 24 Nov 2015 15:49:11 -0800
Subject: [PATCH 01/63] Styling More preference

---
 .../android/ui/prefs/SiteSettingsFragment.java        | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index 69e707037920..628073c4cd9d 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -180,8 +180,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                 prefList.setOnHierarchyChangeListener(new ViewGroup.OnHierarchyChangeListener() {
                     @Override
                     public void onChildViewAdded(View parent, View child) {
+                        Resources res = getResources();
                         if (child.getId() == android.R.id.title && child instanceof TextView) {
-                            Resources res = getResources();
                             TextView title = (TextView) child;
                             title.setTypeface(TypefaceCache.getTypeface(getActivity(),
                                     TypefaceCache.FAMILY_OPEN_SANS,
@@ -191,6 +191,15 @@ public void onChildViewAdded(View parent, View child) {
                                     res.getDimensionPixelSize(R.dimen.text_sz_medium));
                             title.setTextColor(ContextCompat.getColor(getActivity(),
                                                                       R.color.orange_jazzy));
+                        } else {
+                            Typeface typeface = TypefaceCache.getTypeface(getActivity(),
+                                    TypefaceCache.FAMILY_OPEN_SANS,
+                                    Typeface.NORMAL,
+                                    TypefaceCache.VARIATION_NORMAL);
+                            TextView title = (TextView) child.findViewById(android.R.id.title);
+                            title.setTypeface(typeface);
+                            title.setTextSize(TypedValue.COMPLEX_UNIT_PX, res.getDimensionPixelSize(R.dimen.text_sz_large));
+                            title.setTextColor(res.getColor(title.isEnabled() ? R.color.grey_dark : R.color.grey_lighten_10));
                         }
                     }
 

From fa05c8de403dceac419602ae5f14cfc896605805 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Tue, 24 Nov 2015 16:51:44 -0800
Subject: [PATCH 02/63] Removing divider between list and buttons in
 DetailListPreference dialog

---
 .../org/wordpress/android/ui/prefs/DetailListPreference.java    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/DetailListPreference.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/DetailListPreference.java
index 21087f1c5e79..68a976fb6332 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/DetailListPreference.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/DetailListPreference.java
@@ -131,8 +131,6 @@ public void onClick(DialogInterface dialog, int which) {
         if (listView != null) {
             listView.setDividerHeight(0);
             listView.setClipToPadding(true);
-            //noinspection deprecation
-            listView.setBackgroundColor(res.getColor(R.color.grey_lighten_30));
             listView.setPadding(0, 0, 0, res.getDimensionPixelSize(R.dimen.site_settings_divider_height));
         }
 

From 6b4bc30500c8fa95401dd000b46f4ceae860582c Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Tue, 24 Nov 2015 16:54:57 -0800
Subject: [PATCH 03/63] Fixing lint error

---
 WordPress/src/main/res/values/styles_calypso.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/src/main/res/values/styles_calypso.xml b/WordPress/src/main/res/values/styles_calypso.xml
index 779a6b97e338..c19c827a8897 100644
--- a/WordPress/src/main/res/values/styles_calypso.xml
+++ b/WordPress/src/main/res/values/styles_calypso.xml
@@ -27,7 +27,7 @@
 
     <style name="Calypso.ActionMode" parent="CalypsoTheme">
         <item name="colorPrimaryDark">@color/grey_darken_10</item>
-        <item name="android:statusBarColor">@color/grey_darken_10</item>
+        <!--<item name="statusBarColor">@color/grey_darken_10</item>-->
         <item name="android:background">@color/grey_darken_10</item>
         <item name="android:titleTextStyle">@style/Calypso.ActionMode.Text</item>
         <item name="android:subtitleTextStyle">@style/Calypso.ActionMode.Text</item>

From faa074d7cf6ed674e52ea6cce4e4a73aec37ef2d Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Mon, 30 Nov 2015 11:58:48 -0800
Subject: [PATCH 04/63] Fixing edit text preference styling

---
 .../ui/prefs/SummaryEditTextPreference.java   | 85 ++++++++++++++++++-
 1 file changed, 82 insertions(+), 3 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SummaryEditTextPreference.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SummaryEditTextPreference.java
index e4d2687a3c08..ae0cc10d1f66 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SummaryEditTextPreference.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SummaryEditTextPreference.java
@@ -2,14 +2,20 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.graphics.Typeface;
+import android.os.Bundle;
 import android.preference.EditTextPreference;
 import android.support.annotation.NonNull;
+import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 
@@ -34,6 +40,7 @@ public class SummaryEditTextPreference extends EditTextPreference implements Pre
     private int mLines;
     private int mMaxLines;
     private String mHint;
+    private AlertDialog mDialog;
 
     public SummaryEditTextPreference(Context context) {
         super(context);
@@ -102,18 +109,90 @@ protected void onBindView(@NonNull View view) {
         }
     }
 
+    @Override
+    protected void showDialog(Bundle state) {
+        Context context = getContext();
+        Resources res = context.getResources();
+        AlertDialog.Builder builder = new AlertDialog.Builder(context, R.style.Calypso_AlertDialog);
+        View titleView = View.inflate(getContext(), R.layout.detail_list_preference_title, null);
+
+        builder.setPositiveButton(R.string.ok, this);
+        builder.setNegativeButton(res.getString(R.string.cancel).toUpperCase(), this);
+        if (titleView != null) {
+            TextView titleText = (TextView) titleView.findViewById(R.id.title);
+            if (titleText != null) {
+                titleText.setText(getTitle());
+            }
+
+            builder.setCustomTitle(titleView);
+        } else {
+            builder.setTitle(getTitle());
+        }
+
+        View view = View.inflate(getContext(), getDialogLayoutResource(), null);
+        if (view != null) {
+            onBindDialogView(view);
+            builder.setView(view);
+        }
+
+        if ((mDialog = builder.create()) == null) return;
+
+        if (state != null) {
+            mDialog.onRestoreInstanceState(state);
+        }
+        mDialog.setOnDismissListener(this);
+        mDialog.show();
+
+        Button positive = mDialog.getButton(DialogInterface.BUTTON_POSITIVE);
+        Button negative = mDialog.getButton(DialogInterface.BUTTON_NEGATIVE);
+        Typeface typeface = TypefaceCache.getTypeface(getContext(),
+                TypefaceCache.FAMILY_OPEN_SANS,
+                Typeface.BOLD,
+                TypefaceCache.VARIATION_LIGHT);
+
+        if (positive != null) {
+            //noinspection deprecation
+            positive.setTextColor(res.getColor(R.color.blue_medium));
+            positive.setTypeface(typeface);
+        }
+
+        if (negative != null) {
+            //noinspection deprecation
+            negative.setTextColor(res.getColor(R.color.blue_medium));
+            negative.setTypeface(typeface);
+        }
+    }
+
     @Override
     protected void onBindDialogView(View view) {
         super.onBindDialogView(view);
 
         if (view != null) {
-            EditText text = (EditText) view.findViewById(android.R.id.edit);
-            if (text != null) {
-                text.setSelection(text.getText().length());
+            Typeface typeface = TypefaceCache.getTypeface(getContext(),
+                    TypefaceCache.FAMILY_OPEN_SANS,
+                    Typeface.NORMAL,
+                    TypefaceCache.VARIATION_NORMAL);
+            EditText editText = getEditText();
+            ViewParent oldParent = editText.getParent();
+            if (oldParent != view) {
+                if (oldParent != null) {
+                    ((ViewGroup) oldParent).removeView(editText);
+                }
+                ((View) oldParent).setPadding(((View) oldParent).getPaddingLeft(), 0, ((View) oldParent).getPaddingRight(), ((View) oldParent).getPaddingBottom());
+                onAddEditTextToDialogView(view, editText);
             }
+            editText.setSelection(editText.getText().length());
+            editText.setTypeface(typeface);
+            editText.setTextColor(getContext().getResources().getColor(R.color.grey_dark));
         }
     }
 
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        mDialog = null;
+        onDialogClosed(false);
+    }
+
     @Override
     protected void onDialogClosed(boolean positiveResult) {
         super.onDialogClosed(positiveResult);

From eb06bc6e35445092a83a2cc76138a2fda93c74be Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Mon, 30 Nov 2015 12:15:29 -0800
Subject: [PATCH 05/63] Removing dividers in number picker

---
 .../wordpress/android/ui/WPNumberPicker.java  | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java b/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
index bfc75a997306..2202dcd24d87 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
@@ -1,6 +1,7 @@
 package org.wordpress.android.ui;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.graphics.Typeface;
 import android.util.AttributeSet;
 import android.view.View;
@@ -10,10 +11,35 @@
 import org.wordpress.android.R;
 import org.wordpress.android.widgets.TypefaceCache;
 
+import java.lang.reflect.Field;
+
 public class WPNumberPicker extends NumberPicker {
+    private static final String DIVIDER_FIELD = "mSelectionDivider";
+
     public WPNumberPicker(Context context, AttributeSet attrs) {
         super(context, attrs);
         setWrapSelectorWheel(false);
+
+        Class<?> numberPickerClass = null;
+        try {
+            numberPickerClass = Class.forName("android.widget.NumberPicker");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        Field selectionDivider = null;
+        try {
+            selectionDivider = numberPickerClass.getDeclaredField(DIVIDER_FIELD);
+        } catch (NoSuchFieldException e) {
+            e.printStackTrace();
+        }
+
+        try {
+            selectionDivider.setAccessible(true);
+            selectionDivider.set(this, null);
+        } catch (IllegalArgumentException | IllegalAccessException | Resources.NotFoundException e) {
+            e.printStackTrace();
+        }
     }
 
     @Override

From 5a54497d801d7fcbec2d04182663497853d41b48 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Mon, 30 Nov 2015 16:32:40 -0800
Subject: [PATCH 06/63] Adjusting fonts on Related Posts dialog

---
 .../main/res/color/related_posts_preview_header.xml  |  2 +-
 .../src/main/res/drawable/related_posts_divider.xml  |  2 +-
 .../src/main/res/layout/related_posts_dialog.xml     | 12 ++++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/WordPress/src/main/res/color/related_posts_preview_header.xml b/WordPress/src/main/res/color/related_posts_preview_header.xml
index be9e76f6e555..908d6534ca60 100644
--- a/WordPress/src/main/res/color/related_posts_preview_header.xml
+++ b/WordPress/src/main/res/color/related_posts_preview_header.xml
@@ -4,7 +4,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
-        android:color="@color/grey_darken_10"
+        android:color="@color/grey"
         android:state_enabled="true" />
 
     <item
diff --git a/WordPress/src/main/res/drawable/related_posts_divider.xml b/WordPress/src/main/res/drawable/related_posts_divider.xml
index ef0382346724..16e006514c7d 100644
--- a/WordPress/src/main/res/drawable/related_posts_divider.xml
+++ b/WordPress/src/main/res/drawable/related_posts_divider.xml
@@ -4,7 +4,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
-        android:drawable="@color/grey_lighten_20"
+        android:drawable="@color/grey_lighten_30"
         android:state_enabled="true" />
 
     <item
diff --git a/WordPress/src/main/res/layout/related_posts_dialog.xml b/WordPress/src/main/res/layout/related_posts_dialog.xml
index cde1b3844ac3..289b3947f635 100644
--- a/WordPress/src/main/res/layout/related_posts_dialog.xml
+++ b/WordPress/src/main/res/layout/related_posts_dialog.xml
@@ -34,7 +34,7 @@
             android:layout_height="wrap_content"
             android:text="@string/related_posts_switch_summary"
             android:textColor="@color/grey_darken_10"
-            android:textSize="@dimen/text_sz_medium"
+            android:textSize="@dimen/text_sz_small"
             app:fontFamily="openSans"
             app:fontVariation="normal" />
 
@@ -43,6 +43,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
+            android:textColor="@color/grey_dark"
+            android:textSize="@dimen/text_sz_medium"
             android:text="@string/related_posts_show_header_title" />
 
         <CheckBox
@@ -50,6 +52,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
+            android:textColor="@color/grey_dark"
+            android:textSize="@dimen/text_sz_medium"
             android:text="@string/related_posts_show_images_title" />
 
         <View
@@ -65,11 +69,11 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="24dp"
             android:text="@string/preview"
-            android:textStyle="italic"
+            android:textStyle="italic|bold"
             android:textColor="@color/related_posts_preview_header"
-            android:textSize="@dimen/text_sz_related_post_small"
+            android:textSize="@dimen/text_sz_medium"
             app:fontFamily="openSans"
-            app:fontVariation="normal" />
+            app:fontVariation="light" />
 
         <org.wordpress.android.widgets.WPTextView
             android:id="@+id/related_posts_list_header"

From a9b9df75abea63611a197f1e89f7e0ac9fac01e2 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Mon, 30 Nov 2015 16:44:47 -0800
Subject: [PATCH 07/63] Adding dividers to related posts dialog

---
 WordPress/src/main/res/layout/related_posts_dialog.xml | 10 +++++++---
 WordPress/src/main/res/values/dimens.xml               |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/WordPress/src/main/res/layout/related_posts_dialog.xml b/WordPress/src/main/res/layout/related_posts_dialog.xml
index 289b3947f635..69fdec0be76f 100644
--- a/WordPress/src/main/res/layout/related_posts_dialog.xml
+++ b/WordPress/src/main/res/layout/related_posts_dialog.xml
@@ -5,7 +5,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:paddingTop="1dp"
+    android:paddingBottom="1dp"
+    android:orientation="vertical"
+    android:background="@color/grey_lighten_30">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -16,7 +19,8 @@
         android:paddingRight="@dimen/related_posts_dialog_padding_right"
         android:paddingEnd="@dimen/related_posts_dialog_padding_right"
         android:paddingBottom="@dimen/related_posts_dialog_padding_bottom"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:background="@color/white">
 
         <org.wordpress.android.widgets.WPSwitch
             android:id="@+id/toggle_related_posts_switch"
@@ -24,7 +28,7 @@
             android:layout_height="wrap_content"
             android:text="@string/related_posts_switch_title"
             android:textColor="@color/grey_dark"
-            android:textSize="@dimen/text_sz_extra_large"
+            android:textSize="@dimen/text_sz_large"
             app:fontFamily="openSans"
             app:fontVariation="normal" />
 
diff --git a/WordPress/src/main/res/values/dimens.xml b/WordPress/src/main/res/values/dimens.xml
index 46d5e3bb7dca..651b47ec0b35 100644
--- a/WordPress/src/main/res/values/dimens.xml
+++ b/WordPress/src/main/res/values/dimens.xml
@@ -93,6 +93,7 @@
     <dimen name="text_sz_large">16sp</dimen>
     <dimen name="text_sz_extra_large">20sp</dimen>
     <dimen name="text_sz_double_extra_large">24sp</dimen>
+    <dimen name="text_sz_triple_extra_large">26sp</dimen>
 
     <dimen name="avatar_sz_extra_small">24dp</dimen>
     <dimen name="avatar_sz_small">32dp</dimen>

From 64c4b325b0cb78ba56b3ca19ba268c4f6765c20b Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Mon, 30 Nov 2015 16:47:09 -0800
Subject: [PATCH 08/63] Padding empty view

---
 WordPress/src/main/res/layout/list_editor.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/WordPress/src/main/res/layout/list_editor.xml b/WordPress/src/main/res/layout/list_editor.xml
index 33d971a96ab7..58651109e9cb 100644
--- a/WordPress/src/main/res/layout/list_editor.xml
+++ b/WordPress/src/main/res/layout/list_editor.xml
@@ -11,6 +11,10 @@
         android:id="@+id/empty_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:paddingLeft="@dimen/margin_extra_large"
+        android:paddingRight="@dimen/margin_extra_large"
+        android:paddingEnd="@dimen/margin_extra_large"
+        android:paddingTop="@dimen/margin_extra_large"
         android:text="@string/no_items"
         android:textColor="@color/grey_lighten_10"
         android:textSize="@dimen/text_sz_large"

From 912d836ab197e3097cdf3387724e51b11dd5ca8a Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Mon, 30 Nov 2015 16:50:04 -0800
Subject: [PATCH 09/63] Creating utility class to handle common functions

---
 .../wordpress/android/ui/WPNumberPicker.java  |  66 ++++----
 .../ui/prefs/SiteSettingsFragment.java        |  23 +--
 .../wordpress/android/util/WPPrefUtils.java   | 141 ++++++++++++++++++
 3 files changed, 174 insertions(+), 56 deletions(-)
 create mode 100644 WordPress/src/main/java/org/wordpress/android/util/WPPrefUtils.java

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java b/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
index 2202dcd24d87..3f0ff97b87d7 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
@@ -2,14 +2,13 @@
 
 import android.content.Context;
 import android.content.res.Resources;
-import android.graphics.Typeface;
 import android.util.AttributeSet;
 import android.view.View;
+import android.widget.EditText;
 import android.widget.NumberPicker;
 import android.widget.TextView;
 
-import org.wordpress.android.R;
-import org.wordpress.android.widgets.TypefaceCache;
+import org.wordpress.android.util.WPPrefUtils;
 
 import java.lang.reflect.Field;
 
@@ -18,14 +17,39 @@ public class WPNumberPicker extends NumberPicker {
 
     public WPNumberPicker(Context context, AttributeSet attrs) {
         super(context, attrs);
-        setWrapSelectorWheel(false);
+        removeDividers();
+    }
+
+    @Override
+    public void addView(View child, int index, android.view.ViewGroup.LayoutParams params) {
+        super.addView(child, index, params);
+        updateView(child);
+    }
 
+    @Override
+    public void setValue(int value) {
+        super.setValue(value);
+        EditText view = (EditText) getChildAt(0);
+        WPPrefUtils.layoutAsNumberPickerSelected(view);
+    }
+
+    private void updateView(final View view) {
+        if (view instanceof TextView) {
+            WPPrefUtils.layoutAsNumberPickerPeek((TextView) view);
+        }
+    }
+
+    /**
+     * From https://www.snip2code.com/Snippet/67740/NumberPicker-with-transparent-selection-
+     */
+    private void removeDividers() {
         Class<?> numberPickerClass = null;
         try {
-            numberPickerClass = Class.forName("android.widget.NumberPicker");
+            numberPickerClass = Class.forName(NumberPicker.class.getName());
         } catch (ClassNotFoundException e) {
             e.printStackTrace();
         }
+        if (numberPickerClass == null) return;
 
         Field selectionDivider = null;
         try {
@@ -33,6 +57,7 @@ public WPNumberPicker(Context context, AttributeSet attrs) {
         } catch (NoSuchFieldException e) {
             e.printStackTrace();
         }
+        if (selectionDivider == null) return;
 
         try {
             selectionDivider.setAccessible(true);
@@ -41,35 +66,4 @@ public WPNumberPicker(Context context, AttributeSet attrs) {
             e.printStackTrace();
         }
     }
-
-    @Override
-    public void addView(View child) {
-        super.addView(child);
-        updateView(child);
-    }
-
-    @Override
-    public void addView(View child, int index,
-                        android.view.ViewGroup.LayoutParams params) {
-        super.addView(child, index, params);
-        updateView(child);
-    }
-
-    @Override
-    public void addView(View child, android.view.ViewGroup.LayoutParams params) {
-        super.addView(child, params);
-        updateView(child);
-    }
-
-    private void updateView(View view) {
-        if (view instanceof TextView) {
-            Typeface type = TypefaceCache.getTypeface(getContext(),
-                    TypefaceCache.FAMILY_OPEN_SANS,
-                    Typeface.NORMAL,
-                    TypefaceCache.VARIATION_NORMAL);
-            ((TextView) view).setTypeface(type);
-            ((TextView) view).setTextSize(24);
-            ((TextView) view).setTextColor(getResources().getColor(R.color.wp_blue));
-        }
-    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index 628073c4cd9d..bef9cefb12eb 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -9,7 +9,6 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.Resources;
-import android.graphics.Typeface;
 import android.os.Bundle;
 import android.preference.EditTextPreference;
 import android.preference.Preference;
@@ -18,10 +17,8 @@
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.util.SparseBooleanArray;
-import android.util.TypedValue;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -49,8 +46,8 @@
 import org.wordpress.android.util.StringUtils;
 import org.wordpress.android.util.ToastUtils;
 import org.wordpress.android.util.WPActivityUtils;
+import org.wordpress.android.util.WPPrefUtils;
 import org.wordpress.android.util.widgets.WPEditText;
-import org.wordpress.android.widgets.TypefaceCache;
 
 import java.util.List;
 import java.util.Locale;
@@ -180,26 +177,12 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                 prefList.setOnHierarchyChangeListener(new ViewGroup.OnHierarchyChangeListener() {
                     @Override
                     public void onChildViewAdded(View parent, View child) {
-                        Resources res = getResources();
                         if (child.getId() == android.R.id.title && child instanceof TextView) {
                             TextView title = (TextView) child;
-                            title.setTypeface(TypefaceCache.getTypeface(getActivity(),
-                                    TypefaceCache.FAMILY_OPEN_SANS,
-                                    Typeface.BOLD,
-                                    TypefaceCache.VARIATION_LIGHT));
-                            title.setTextSize(TypedValue.COMPLEX_UNIT_PX,
-                                    res.getDimensionPixelSize(R.dimen.text_sz_medium));
-                            title.setTextColor(ContextCompat.getColor(getActivity(),
-                                                                      R.color.orange_jazzy));
+                            WPPrefUtils.layoutAsBody2(title);
                         } else {
-                            Typeface typeface = TypefaceCache.getTypeface(getActivity(),
-                                    TypefaceCache.FAMILY_OPEN_SANS,
-                                    Typeface.NORMAL,
-                                    TypefaceCache.VARIATION_NORMAL);
                             TextView title = (TextView) child.findViewById(android.R.id.title);
-                            title.setTypeface(typeface);
-                            title.setTextSize(TypedValue.COMPLEX_UNIT_PX, res.getDimensionPixelSize(R.dimen.text_sz_large));
-                            title.setTextColor(res.getColor(title.isEnabled() ? R.color.grey_dark : R.color.grey_lighten_10));
+                            WPPrefUtils.layoutAsSubhead(title);
                         }
                     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/util/WPPrefUtils.java b/WordPress/src/main/java/org/wordpress/android/util/WPPrefUtils.java
new file mode 100644
index 000000000000..98a6a8414fbd
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/util/WPPrefUtils.java
@@ -0,0 +1,141 @@
+package org.wordpress.android.util;
+
+import android.content.Context;
+import android.graphics.Typeface;
+import android.util.TypedValue;
+import android.widget.TextView;
+
+import org.wordpress.android.widgets.TypefaceCache;
+
+import org.wordpress.android.R;
+
+/**
+ * Design guidelines for Calypso-styled Site Settings (and likely
+ */
+
+public class WPPrefUtils {
+    /**
+     * Font      : Open Sans
+     * Style     : Normal
+     * Variation : Normal
+     */
+    public static Typeface getNormalTypeface(Context context) {
+        return TypefaceCache.getTypeface(context,
+                TypefaceCache.FAMILY_OPEN_SANS, Typeface.NORMAL, TypefaceCache.VARIATION_NORMAL);
+    }
+
+    /**
+     * Font      : Open Sans
+     * Style     : Bold
+     * Variation : Light
+     */
+    public static Typeface getSemiboldTypeface(Context context) {
+        return TypefaceCache.getTypeface(context,
+                TypefaceCache.FAMILY_OPEN_SANS, Typeface.BOLD, TypefaceCache.VARIATION_LIGHT);
+    }
+
+    /**
+     * Styles a {@link TextView} to display a large title against a dark background.
+     */
+    public static void layoutAsLightTitle(TextView view) {
+        int size = view.getResources().getDimensionPixelSize(R.dimen.text_sz_extra_large);
+        setTextViewAttributes(view, size, R.color.white, getSemiboldTypeface(view.getContext()));
+    }
+
+    /**
+     * Styles a {@link TextView} to display a large title against a light background.
+     */
+    public static void layoutAsDarkTitle(TextView view) {
+        int size = view.getResources().getDimensionPixelSize(R.dimen.text_sz_extra_large);
+        setTextViewAttributes(view, size, R.color.grey_dark, getSemiboldTypeface(view.getContext()));
+    }
+
+    /**
+     * Styles a {@link TextView} to display medium sized text as a header with sub-elements.
+     */
+    public static void layoutAsSubhead(TextView view) {
+        int color = view.isEnabled() ? R.color.grey_dark : R.color.grey_lighten_10;
+        int size = view.getResources().getDimensionPixelSize(R.dimen.text_sz_large);
+        setTextViewAttributes(view, size, color, getNormalTypeface(view.getContext()));
+    }
+
+    /**
+     * Styles a {@link TextView} to display smaller text.
+     */
+    public static void layoutAsBody1(TextView view) {
+        int color = view.isEnabled() ? R.color.grey_darken_10 : R.color.grey_lighten_10;
+        int size = view.getResources().getDimensionPixelSize(R.dimen.text_sz_medium);
+        setTextViewAttributes(view, size, color, getNormalTypeface(view.getContext()));
+    }
+
+    /**
+     * Styles a {@link TextView} to display smaller text with the orange accent color.
+     */
+    public static void layoutAsBody2(TextView view) {
+        int size = view.getResources().getDimensionPixelSize(R.dimen.text_sz_medium);
+        setTextViewAttributes(view, size, R.color.orange_jazzy, getSemiboldTypeface(view.getContext()));
+    }
+
+    /**
+     * Styles a {@link TextView} to display very small helper text.
+     */
+    public static void layoutAsCaption(TextView view) {
+        int size = view.getResources().getDimensionPixelSize(R.dimen.text_sz_small);
+        setTextViewAttributes(view, size, R.color.grey_darken_10, getNormalTypeface(view.getContext()));
+    }
+
+    /**
+     * Styles a {@link TextView} to display text in a button.
+     */
+    public static void layoutAsFlatButton(TextView view) {
+        int size = view.getResources().getDimensionPixelSize(R.dimen.text_sz_medium);
+        setTextViewAttributes(view, size, R.color.blue_medium, getSemiboldTypeface(view.getContext()));
+    }
+
+    /**
+     * Styles a {@link TextView} to display text in a button.
+     */
+    public static void layoutAsRaisedButton(TextView view) {
+        int size = view.getResources().getDimensionPixelSize(R.dimen.text_sz_medium);
+        setTextViewAttributes(view, size, R.color.white, getSemiboldTypeface(view.getContext()));
+    }
+
+    /**
+     * Styles a {@link TextView} to display text in an editable text field.
+     */
+    public static void layoutAsInput(TextView view) {
+        int size = view.getResources().getDimensionPixelSize(R.dimen.text_sz_large);
+        setTextViewAttributes(view, size, R.color.grey_dark, getNormalTypeface(view.getContext()));
+    }
+
+    /**
+     * Styles a {@link TextView} to display selected numbers in a {@link android.widget.NumberPicker}.
+     */
+    public static void layoutAsNumberPickerSelected(TextView view) {
+        int size = view.getResources().getDimensionPixelSize(R.dimen.text_sz_triple_extra_large);
+        setTextViewAttributes(view, size, R.color.blue_medium, getSemiboldTypeface(view.getContext()));
+    }
+
+    /**
+     * Styles a {@link TextView} to display non-selected numbers in a {@link android.widget.NumberPicker}.
+     */
+    public static void layoutAsNumberPickerPeek(TextView view) {
+        int size = view.getResources().getDimensionPixelSize(R.dimen.text_sz_large);
+        setTextViewAttributes(view, size, R.color.grey_dark, getNormalTypeface(view.getContext()));
+    }
+
+    public static void setTextViewAttributes(TextView textView, int size, int colorRes, int family, int style, int variation) {
+        if (textView == null) return;
+        Context context = textView.getContext();
+        if (context == null) return;
+
+        Typeface typeface = TypefaceCache.getTypeface(context, family, style, variation);
+        setTextViewAttributes(textView, size, colorRes, typeface);
+    }
+
+    public static void setTextViewAttributes(TextView textView, int size, int colorRes, Typeface typeface) {
+        textView.setTypeface(typeface);
+        textView.setTextSize(TypedValue.COMPLEX_UNIT_PX, size);
+        textView.setTextColor(textView.getResources().getColor(colorRes));
+    }
+}

From ce97891f21c0fb0efb57185cfc6f3135506cceee Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Wed, 2 Dec 2015 12:27:36 -0800
Subject: [PATCH 10/63] Adjusting layout of related posts dialog to match
 design

---
 .../android/ui/prefs/RelatedPostsDialog.java  | 22 +++++--------------
 .../wordpress/android/util/WPPrefUtils.java   |  2 +-
 .../res/color/related_posts_list_header.xml   |  2 +-
 .../main/res/layout/related_posts_dialog.xml  |  6 ++---
 4 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/RelatedPostsDialog.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/RelatedPostsDialog.java
index 0544bc14aec7..5293f282bc1d 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/RelatedPostsDialog.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/RelatedPostsDialog.java
@@ -21,6 +21,7 @@
 import android.widget.TextView;
 
 import org.wordpress.android.R;
+import org.wordpress.android.util.WPPrefUtils;
 import org.wordpress.android.widgets.TypefaceCache;
 import org.wordpress.android.widgets.WPSwitch;
 
@@ -78,6 +79,9 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
         mPreviewImages.add((ImageView) v.findViewById(R.id.related_post_image2));
         mPreviewImages.add((ImageView) v.findViewById(R.id.related_post_image3));
 
+        WPPrefUtils.layoutAsSubhead(mShowHeader);
+        WPPrefUtils.layoutAsSubhead(mShowImages);
+
         Bundle args = getArguments();
         if (args != null) {
             mShowRelatedPosts.setChecked(args.getBoolean(SHOW_RELATED_POSTS_KEY));
@@ -112,24 +116,10 @@ public void onStart() {
         super.onStart();
 
         AlertDialog dialog = (AlertDialog) getDialog();
-        Resources res = getResources();
-
         Button positive = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
         Button negative = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
-        Typeface typeface = TypefaceCache.getTypeface(getActivity(),
-                TypefaceCache.FAMILY_OPEN_SANS,
-                Typeface.BOLD,
-                TypefaceCache.VARIATION_LIGHT);
-
-        if (positive != null) {
-            positive.setTextColor(res.getColor(R.color.blue_medium));
-            positive.setTypeface(typeface);
-        }
-
-        if (negative != null) {
-            negative.setTextColor(res.getColor(R.color.blue_medium));
-            negative.setTypeface(typeface);
-        }
+        if (positive != null) WPPrefUtils.layoutAsFlatButton(positive);
+        if (negative != null) WPPrefUtils.layoutAsFlatButton(negative);
     }
 
     @Override
diff --git a/WordPress/src/main/java/org/wordpress/android/util/WPPrefUtils.java b/WordPress/src/main/java/org/wordpress/android/util/WPPrefUtils.java
index 98a6a8414fbd..8824e02dc456 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/WPPrefUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/util/WPPrefUtils.java
@@ -10,7 +10,7 @@
 import org.wordpress.android.R;
 
 /**
- * Design guidelines for Calypso-styled Site Settings (and likely
+ * Design guidelines for Calypso-styled Site Settings (and likely other screens)
  */
 
 public class WPPrefUtils {
diff --git a/WordPress/src/main/res/color/related_posts_list_header.xml b/WordPress/src/main/res/color/related_posts_list_header.xml
index 31c580903a59..6c730e29ce1e 100644
--- a/WordPress/src/main/res/color/related_posts_list_header.xml
+++ b/WordPress/src/main/res/color/related_posts_list_header.xml
@@ -4,7 +4,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
-        android:color="@color/grey_darken_20"
+        android:color="@color/grey_dark"
         android:state_enabled="true" />
 
     <item
diff --git a/WordPress/src/main/res/layout/related_posts_dialog.xml b/WordPress/src/main/res/layout/related_posts_dialog.xml
index 69fdec0be76f..14575abbb8c9 100644
--- a/WordPress/src/main/res/layout/related_posts_dialog.xml
+++ b/WordPress/src/main/res/layout/related_posts_dialog.xml
@@ -5,8 +5,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingTop="1dp"
-    android:paddingBottom="1dp"
+    android:paddingTop="@dimen/site_settings_divider_height"
+    android:paddingBottom="@dimen/site_settings_divider_height"
     android:orientation="vertical"
     android:background="@color/grey_lighten_30">
 
@@ -86,7 +86,7 @@
             android:layout_marginBottom="8dp"
             android:text="@string/related_posts_preview_header"
             android:textStyle="bold"
-            android:textSize="@dimen/text_sz_related_post_small"
+            android:textSize="@dimen/text_sz_medium"
             android:textColor="@color/related_posts_list_header"
             app:fontFamily="openSans"
             app:fontVariation="light" />

From 30a58e10d53b500fdb8b796dd9a0b066ff3f4e52 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Wed, 2 Dec 2015 15:41:14 -0800
Subject: [PATCH 11/63] Matching design with list editor input dialog

---
 .../android/ui/prefs/SiteSettingsFragment.java   | 16 ++++++++++++----
 .../org/wordpress/android/util/WPPrefUtils.java  | 13 +++----------
 WordPress/src/main/res/layout/list_editor.xml    |  3 ++-
 WordPress/src/main/res/values/strings.xml        |  1 +
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index bef9cefb12eb..b47252fdd960 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -24,9 +24,11 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
+import android.view.WindowManager;
 import android.widget.AbsListView;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
+import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ListAdapter;
 import android.widget.ListView;
@@ -47,7 +49,6 @@
 import org.wordpress.android.util.ToastUtils;
 import org.wordpress.android.util.WPActivityUtils;
 import org.wordpress.android.util.WPPrefUtils;
-import org.wordpress.android.util.widgets.WPEditText;
 
 import java.util.List;
 import java.util.Locale;
@@ -765,8 +766,9 @@ public boolean onDeleteRequested() {
             public void onClick(View v) {
                 AlertDialog.Builder builder =
                         new AlertDialog.Builder(getActivity(), R.style.Calypso_AlertDialog);
-                final EditText input = new WPEditText(getActivity());
-                input.setHint("Enter a word or phrase");
+                final EditText input = new EditText(getActivity());
+                WPPrefUtils.layoutAsInput(input);
+                input.setHint(R.string.list_editor_input_hint);
                 builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
@@ -781,9 +783,15 @@ public void onClick(DialogInterface dialog, int which) {
                 });
                 builder.setNegativeButton(R.string.cancel, null);
                 AlertDialog alertDialog = builder.create();
-                alertDialog.setView(input, 64, 64, 64, 0);
+                int spacing = getResources().getDimensionPixelSize(R.dimen.dlp_padding_start);
+                alertDialog.setView(input, spacing, spacing, spacing, 0);
                 alertDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
                 alertDialog.show();
+                alertDialog.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT);
+                Button positive = alertDialog.getButton(DialogInterface.BUTTON_POSITIVE);
+                Button negative = alertDialog.getButton(DialogInterface.BUTTON_NEGATIVE);
+                if (positive != null) WPPrefUtils.layoutAsFlatButton(positive);
+                if (negative != null) WPPrefUtils.layoutAsFlatButton(negative);
             }
         });
 
diff --git a/WordPress/src/main/java/org/wordpress/android/util/WPPrefUtils.java b/WordPress/src/main/java/org/wordpress/android/util/WPPrefUtils.java
index 8824e02dc456..2b3aad71f128 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/WPPrefUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/util/WPPrefUtils.java
@@ -3,6 +3,7 @@
 import android.content.Context;
 import android.graphics.Typeface;
 import android.util.TypedValue;
+import android.widget.EditText;
 import android.widget.TextView;
 
 import org.wordpress.android.widgets.TypefaceCache;
@@ -103,9 +104,10 @@ public static void layoutAsRaisedButton(TextView view) {
     /**
      * Styles a {@link TextView} to display text in an editable text field.
      */
-    public static void layoutAsInput(TextView view) {
+    public static void layoutAsInput(EditText view) {
         int size = view.getResources().getDimensionPixelSize(R.dimen.text_sz_large);
         setTextViewAttributes(view, size, R.color.grey_dark, getNormalTypeface(view.getContext()));
+        view.setHintTextColor(view.getResources().getColor(R.color.grey_lighten_10));
     }
 
     /**
@@ -124,15 +126,6 @@ public static void layoutAsNumberPickerPeek(TextView view) {
         setTextViewAttributes(view, size, R.color.grey_dark, getNormalTypeface(view.getContext()));
     }
 
-    public static void setTextViewAttributes(TextView textView, int size, int colorRes, int family, int style, int variation) {
-        if (textView == null) return;
-        Context context = textView.getContext();
-        if (context == null) return;
-
-        Typeface typeface = TypefaceCache.getTypeface(context, family, style, variation);
-        setTextViewAttributes(textView, size, colorRes, typeface);
-    }
-
     public static void setTextViewAttributes(TextView textView, int size, int colorRes, Typeface typeface) {
         textView.setTypeface(typeface);
         textView.setTextSize(TypedValue.COMPLEX_UNIT_PX, size);
diff --git a/WordPress/src/main/res/layout/list_editor.xml b/WordPress/src/main/res/layout/list_editor.xml
index 58651109e9cb..198057ccffa2 100644
--- a/WordPress/src/main/res/layout/list_editor.xml
+++ b/WordPress/src/main/res/layout/list_editor.xml
@@ -33,9 +33,10 @@
         android:paddingRight="@dimen/margin_extra_large"
         android:paddingEnd="@dimen/margin_extra_large"
         android:paddingTop="@dimen/margin_extra_large"
+        android:textSize="@dimen/text_sz_small"
         android:textColor="@color/grey_darken_10" />
 
-    <!-- this coordinator is only here due to https://code.google.com/p/android/issues/detail?id=175330 -->
+    <!-- CoordinatorLayout required: https://code.google.com/p/android/issues/detail?id=175330 -->
     <android.support.design.widget.CoordinatorLayout
         android:id="@+id/coordinator"
         android:layout_width="match_parent"
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index 92feb7c07c7b..204df48676a9 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -547,6 +547,7 @@
     <string name="related_post_preview2_site">in \"Apps\"</string>
     <string name="related_post_preview3_title">Upgrade Focus: VideoPress For Weddings</string>
     <string name="related_post_preview3_site">in \"Upgrade\"</string>
+    <string name="list_editor_input_hint">Enter a word or phrase</string>
     <string name="hold_for_moderation_description">When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the moderation queue. You can enter partial words, so \"press\" will match \"WordPress.\"</string>
     <string name="blacklist_description">When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be marked as spam. You can enter partial words, so \"press\" will match \"WordPress.\"</string>
     <string name="multiple_links_description">Require approval for comments that include more than this number of links.</string>

From 92f38bb6b71e498cbe599adddf6a283f64243e37 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Wed, 2 Dec 2015 17:19:13 -0800
Subject: [PATCH 12/63] Toggling background color for checked items in action
 mode

---
 .../wordpress/android/ui/prefs/MultiSelectListView.java   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/MultiSelectListView.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/MultiSelectListView.java
index c21af32f3030..5e4746386db3 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/MultiSelectListView.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/MultiSelectListView.java
@@ -54,6 +54,8 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
         if (getCheckedItemCount() <= 0) {
             mActionMode.finish();
         } else {
+            int color = isItemChecked(position) ? R.color.white : R.color.transparent;
+            getChildAt(position).setBackgroundColor(getResources().getColor(color));
             mActionMode.invalidate();
         }
     }
@@ -64,6 +66,7 @@ public boolean onItemLongClick(AdapterView<?> parent, View view, int position, l
         if (mEnterListener != null) mEnterListener.onEnterMultiSelect();
 
         setItemChecked(position, true);
+        getChildAt(position).setBackgroundColor(getResources().getColor(R.color.white));
         mActionMode = startActionMode(this);
 
         return true;
@@ -96,6 +99,11 @@ public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
 
     @Override
     public void onDestroyActionMode(ActionMode mode) {
+        for (int i = 0; i < getChildCount(); ++i) {
+            getChildAt(i).setBackgroundColor(getResources().getColor(R.color.transparent));
+        }
+
+        clearChoices();
         mActionMode = null;
         if (mExitListener != null) mExitListener.onExitMultiSelect();
     }

From 2cb682e95f04242f8f73a5f6cfd9faad9a03e5cd Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Thu, 3 Dec 2015 17:49:36 -0800
Subject: [PATCH 13/63] Paging and close after settings no longer show
 pre-defined values

---
 .../ui/prefs/SiteSettingsFragment.java        | 40 +++++++++++--------
 WordPress/src/main/res/xml/site_settings.xml  |  8 +---
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index b47252fdd960..52709bfb98a0 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -100,10 +100,10 @@ public class SiteSettingsFragment extends PreferenceFragment
     private WPSwitchPreference mReceivePingbacksPref;
     private WPSwitchPreference mIdentityRequiredPreference;
     private WPSwitchPreference mUserAccountRequiredPref;
-    private DetailListPreference mCloseAfterPref;
+    private Preference mCloseAfterPref;
     private DetailListPreference mSortByPref;
     private DetailListPreference mThreadingPref;
-    private DetailListPreference mPagingPref;
+    private Preference mPagingPref;
     private DetailListPreference mWhitelistPref;
     private Preference mMultipleLinksPref;
     private Preference mModerationHoldPref;
@@ -240,6 +240,10 @@ public boolean onPreferenceClick(Preference preference) {
         } else if (preference == mDeleteSitePref) {
             removeBlogWithConfirmation();
             return true;
+        } else if (preference == mCloseAfterPref) {
+            // TODO
+        } else if (preference == mPagingPref) {
+            // TODO
         }
 
         return false;
@@ -274,9 +278,9 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
             setReceivePingbacks((Boolean) newValue);
         } else if (preference == mCloseAfterPref) {
             mSiteSettings.setCloseAfter(Integer.parseInt(newValue.toString()));
-            setDetailListPreferenceValue(mCloseAfterPref,
-                    newValue.toString(),
-                    getCloseAfterSummary(mSiteSettings.getCloseAfter()));
+//            setDetailListPreferenceValue(mCloseAfterPref,
+//                    newValue.toString(),
+//                    getCloseAfterSummary(mSiteSettings.getCloseAfter()));
         } else if (preference == mSortByPref) {
             mSiteSettings.setCommentSorting(Integer.parseInt(newValue.toString()));
             setDetailListPreferenceValue(mSortByPref,
@@ -289,9 +293,9 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
                     getThreadingSummary(mSiteSettings.getThreadingLevels()));
         } else if (preference == mPagingPref) {
             mSiteSettings.setPagingCount(Integer.parseInt(newValue.toString()));
-            setDetailListPreferenceValue(mPagingPref,
-                    newValue.toString(),
-                    getPagingSummary(mSiteSettings.getPagingCount()));
+//            setDetailListPreferenceValue(mPagingPref,
+//                    newValue.toString(),
+//                    getPagingSummary(mSiteSettings.getPagingCount()));
         } else if (preference == mIdentityRequiredPreference) {
             mSiteSettings.setIdentityRequired((Boolean) newValue);
         } else if (preference == mUserAccountRequiredPref) {
@@ -415,10 +419,10 @@ private void initPreferences() {
         mReceivePingbacksNested = (WPSwitchPreference) getPref(R.string.pref_key_site_receive_pingbacks_nested);
         mIdentityRequiredPreference = (WPSwitchPreference) getPref(R.string.pref_key_site_identity_required);
         mUserAccountRequiredPref = (WPSwitchPreference) getPref(R.string.pref_key_site_user_account_required);
-        mCloseAfterPref = (DetailListPreference) getPref(R.string.pref_key_site_close_after);
+        mCloseAfterPref = findPreference(getString(R.string.pref_key_site_close_after));
         mSortByPref = (DetailListPreference) getPref(R.string.pref_key_site_sort_by);
         mThreadingPref = (DetailListPreference) getPref(R.string.pref_key_site_threading);
-        mPagingPref = (DetailListPreference) getPref(R.string.pref_key_site_paging);
+        mPagingPref = findPreference(getString(R.string.pref_key_site_paging));
         mWhitelistPref = (DetailListPreference) getPref(R.string.pref_key_site_whitelist);
         mMultipleLinksPref = getPref(R.string.pref_key_site_multiple_links);
         mModerationHoldPref = getPref(R.string.pref_key_site_moderation_hold);
@@ -430,6 +434,8 @@ private void initPreferences() {
         mModerationHoldPref.setOnPreferenceClickListener(this);
         mBlacklistPref.setOnPreferenceClickListener(this);
         mDeleteSitePref.setOnPreferenceClickListener(this);
+        mCloseAfterPref.setOnPreferenceClickListener(this);
+        mPagingPref.setOnPreferenceClickListener(this);
 
         // .com sites hide the Account category, self-hosted sites hide the Related Posts preference
         if (mBlog.isDotcomFlag()) {
@@ -500,18 +506,18 @@ private void setPreferencesFromSiteSettings() {
         setAllowComments(mSiteSettings.getAllowComments());
         setSendPingbacks(mSiteSettings.getSendPingbacks());
         setReceivePingbacks(mSiteSettings.getReceivePingbacks());
-        setDetailListPreferenceValue(mCloseAfterPref,
-                String.valueOf(mSiteSettings.getCloseAfter()),
-                getCloseAfterSummary(mSiteSettings.getCloseAfter()));
+//        setDetailListPreferenceValue(mCloseAfterPref,
+//                String.valueOf(mSiteSettings.getCloseAfter()),
+//                getCloseAfterSummary(mSiteSettings.getCloseAfter()));
         setDetailListPreferenceValue(mSortByPref,
                 String.valueOf(mSiteSettings.getCommentSorting()),
                 getSortOrderSummary(mSiteSettings.getCommentSorting()));
         setDetailListPreferenceValue(mThreadingPref,
                 String.valueOf(mSiteSettings.getThreadingLevels()),
                 getThreadingSummary(mSiteSettings.getThreadingLevels()));
-        setDetailListPreferenceValue(mPagingPref,
-                String.valueOf(mSiteSettings.getPagingCount()),
-                getPagingSummary(mSiteSettings.getPagingCount()));
+//        setDetailListPreferenceValue(mPagingPref,
+//                String.valueOf(mSiteSettings.getPagingCount()),
+//                getPagingSummary(mSiteSettings.getPagingCount()));
         int approval = mSiteSettings.getManualApproval() ?
                 mSiteSettings.getUseCommentWhitelist() ? 0
                         : -1 : 1;
@@ -523,7 +529,7 @@ private void setPreferencesFromSiteSettings() {
         mIdentityRequiredPreference.setChecked(mSiteSettings.getIdentityRequired());
         mUserAccountRequiredPref.setChecked(mSiteSettings.getUserAccountRequired());
         mThreadingPref.setValue(String.valueOf(mSiteSettings.getThreadingLevels()));
-        mPagingPref.setValue(String.valueOf(mSiteSettings.getPagingCount()));
+//        mPagingPref.setValue(String.valueOf(mSiteSettings.getPagingCount()));
     }
 
     private void setCategories() {
diff --git a/WordPress/src/main/res/xml/site_settings.xml b/WordPress/src/main/res/xml/site_settings.xml
index 7c5b9446df25..f53cdfd5d458 100644
--- a/WordPress/src/main/res/xml/site_settings.xml
+++ b/WordPress/src/main/res/xml/site_settings.xml
@@ -197,12 +197,10 @@
                     android:title="@string/site_settings_account_required_title"
                     app:longClickHint="@string/site_user_account_required_hint" />
 
-                <org.wordpress.android.ui.prefs.DetailListPreference
+                <org.wordpress.android.ui.prefs.WPPreference
                     android:id="@+id/pref_close_after"
                     android:key="@string/pref_key_site_close_after"
                     android:title="@string/site_settings_close_after_title"
-                    android:entries="@array/site_settings_close_after_entries"
-                    android:entryValues="@array/site_settings_close_after_values"
                     android:defaultValue="0"
                     app:longClickHint="@string/site_close_after_hint" />
 
@@ -224,12 +222,10 @@
                     android:defaultValue="0"
                     app:longClickHint="@string/site_threading_hint" />
 
-                <org.wordpress.android.ui.prefs.DetailListPreference
+                <org.wordpress.android.ui.prefs.WPPreference
                     android:id="@+id/pref_paging"
                     android:key="@string/pref_key_site_paging"
                     android:title="@string/site_settings_paging_title"
-                    android:entries="@array/site_settings_paging_entries"
-                    android:entryValues="@array/site_settings_paging_values"
                     android:defaultValue="0"
                     app:longClickHint="@string/site_paging_hint" />
 

From 8c5e13b796f83c6872a6471582719c7a69b4ef6d Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Fri, 4 Dec 2015 17:41:28 -0800
Subject: [PATCH 14/63] Using reflection to style number picker view

---
 .../wordpress/android/ui/WPNumberPicker.java  | 136 +++++++++++++++++-
 .../main/res/layout/number_picker_dialog.xml  |   5 +
 2 files changed, 134 insertions(+), 7 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java b/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
index 3f0ff97b87d7..23b3fdc1f555 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
@@ -2,18 +2,35 @@
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.graphics.Canvas;
+import android.graphics.Paint;
 import android.util.AttributeSet;
+import android.util.SparseArray;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.NumberPicker;
 import android.widget.TextView;
 
+import org.wordpress.android.R;
 import org.wordpress.android.util.WPPrefUtils;
 
 import java.lang.reflect.Field;
 
 public class WPNumberPicker extends NumberPicker {
     private static final String DIVIDER_FIELD = "mSelectionDivider";
+    private static final String INPUT_FIELD = "mInputText";
+    private static final String INDICES_FIELD = "mSelectorIndices";
+    private static final String CUR_OFFSET_FIELD = "mCurrentScrollOffset";
+    private static final String MIDDLE_INDEX_FIELD = "SELECTOR_MIDDLE_ITEM_INDEX";
+    private static final String STRING_CACHE_FIELD = "mSelectorIndexToStringCache";
+    private static final String SELECTOR_HEIGHT_FIELD = "mSelectorElementHeight";
+
+    private Field mOffsetField;
+    private Field mSelectorHeight;
+    private Field mSelectorIndices;
+    private Field mStringCache;
+    private int mMiddleIndex;
+    private EditText mInputView;
 
     public WPNumberPicker(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -33,12 +50,65 @@ public void setValue(int value) {
         WPPrefUtils.layoutAsNumberPickerSelected(view);
     }
 
+    @Override
+    protected void onDraw(Canvas canvas) {
+        // Draw normally, skipping the middle number
+        if (mInputView != null) mInputView.setVisibility(View.VISIBLE);
+        super.onDraw(canvas);
+
+        // Draw the middle number with a different font
+        String scrollSelectorValue = getDisplayString();
+        float x = ((getRight() - getLeft()) / 2.0f) - (6.0f * getResources().getDisplayMetrics().scaledDensity * scrollSelectorValue.length());
+        float y = getScrollOffset() + getSelectorElementHeight();
+        Paint paint = mInputView.getPaint();
+        paint.setColor(getResources().getColor(R.color.blue_medium));
+        canvas.drawText(scrollSelectorValue, x, y, paint);
+        if (mInputView != null) mInputView.setVisibility(View.INVISIBLE);
+    }
+
     private void updateView(final View view) {
         if (view instanceof TextView) {
             WPPrefUtils.layoutAsNumberPickerPeek((TextView) view);
         }
     }
 
+    private String getDisplayString() {
+        if (mSelectorIndices == null || mStringCache == null) return "";
+
+        try {
+            int index = ((int []) mSelectorIndices.get(this))[mMiddleIndex];
+            return ((SparseArray<String>) mStringCache.get(this)).get(index);
+        } catch (IllegalArgumentException | IllegalAccessException | Resources.NotFoundException e) {
+            e.printStackTrace();
+        }
+
+        return "";
+    }
+
+    private int getScrollOffset() {
+        if (mOffsetField != null) {
+            try {
+                return (Integer) mOffsetField.get(this);
+            } catch (IllegalArgumentException | IllegalAccessException | Resources.NotFoundException e) {
+                e.printStackTrace();
+            }
+        }
+
+        return 0;
+    }
+
+    private int getSelectorElementHeight() {
+        if (mSelectorHeight != null) {
+            try {
+                return (Integer) mSelectorHeight.get(this);
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            }
+        }
+
+        return 0;
+    }
+
     /**
      * From https://www.snip2code.com/Snippet/67740/NumberPicker-with-transparent-selection-
      */
@@ -52,18 +122,70 @@ private void removeDividers() {
         if (numberPickerClass == null) return;
 
         Field selectionDivider = null;
+        Field inputField = null;
+        Field middleIndex = null;
         try {
             selectionDivider = numberPickerClass.getDeclaredField(DIVIDER_FIELD);
+            inputField = numberPickerClass.getDeclaredField(INPUT_FIELD);
+            middleIndex = numberPickerClass.getDeclaredField(MIDDLE_INDEX_FIELD);
+            mSelectorIndices = numberPickerClass.getDeclaredField(INDICES_FIELD);
+            mSelectorHeight = numberPickerClass.getDeclaredField(SELECTOR_HEIGHT_FIELD);
+            mOffsetField = numberPickerClass.getDeclaredField(CUR_OFFSET_FIELD);
+            mStringCache = numberPickerClass.getDeclaredField(STRING_CACHE_FIELD);
         } catch (NoSuchFieldException e) {
             e.printStackTrace();
         }
-        if (selectionDivider == null) return;
-
-        try {
-            selectionDivider.setAccessible(true);
-            selectionDivider.set(this, null);
-        } catch (IllegalArgumentException | IllegalAccessException | Resources.NotFoundException e) {
-            e.printStackTrace();
+        if (middleIndex != null) {
+            try {
+                middleIndex.setAccessible(true);
+                mMiddleIndex = (Integer) middleIndex.get(this);
+            } catch (IllegalArgumentException | IllegalAccessException | Resources.NotFoundException e) {
+                e.printStackTrace();
+            }
+        }
+        if (selectionDivider != null) {
+            try {
+                selectionDivider.setAccessible(true);
+                selectionDivider.set(this, null);
+            } catch (IllegalArgumentException | IllegalAccessException | Resources.NotFoundException e) {
+                e.printStackTrace();
+            }
+        }
+        if (inputField != null) {
+            try {
+                inputField.setAccessible(true);
+                mInputView = ((EditText) inputField.get(this));
+            } catch (IllegalArgumentException | IllegalAccessException | Resources.NotFoundException e) {
+                e.printStackTrace();
+            }
+        }
+        if (mStringCache != null) {
+            try {
+                mStringCache.setAccessible(true);
+            } catch (IllegalArgumentException | Resources.NotFoundException e) {
+                e.printStackTrace();
+            }
+        }
+        if (mSelectorIndices != null) {
+            try {
+                mSelectorIndices.setAccessible(true);
+            } catch (IllegalArgumentException | Resources.NotFoundException e) {
+                e.printStackTrace();
+            }
+        }
+        if (mOffsetField != null) {
+            try {
+                mOffsetField.setAccessible(true);
+            } catch (IllegalArgumentException | Resources.NotFoundException e) {
+                e.printStackTrace();
+            }
+        }
+        if (mSelectorHeight != null) {
+            try {
+                mSelectorHeight.setAccessible(true);
+            } catch (IllegalArgumentException | Resources.NotFoundException e) {
+                e.printStackTrace();
+            }
         }
     }
 }
diff --git a/WordPress/src/main/res/layout/number_picker_dialog.xml b/WordPress/src/main/res/layout/number_picker_dialog.xml
index 9b31166341f0..c15a361495f2 100644
--- a/WordPress/src/main/res/layout/number_picker_dialog.xml
+++ b/WordPress/src/main/res/layout/number_picker_dialog.xml
@@ -9,6 +9,11 @@
     android:paddingLeft="@dimen/margin_extra_large"
     android:paddingRight="@dimen/margin_extra_large">
 
+    <org.wordpress.android.widgets.WPSwitch
+        android:id="@+id/number_picker_switch"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
     <org.wordpress.android.widgets.WPTextView
         android:id="@+id/number_picker_text"
         android:layout_width="match_parent"

From 171c55a9a8dc4c82919e03a47620f28352fb309e Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Fri, 4 Dec 2015 17:55:03 -0800
Subject: [PATCH 15/63] Improving number alignment for center number

---
 .../src/main/java/org/wordpress/android/ui/WPNumberPicker.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java b/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
index 23b3fdc1f555..ef55397ed540 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
@@ -58,9 +58,10 @@ protected void onDraw(Canvas canvas) {
 
         // Draw the middle number with a different font
         String scrollSelectorValue = getDisplayString();
-        float x = ((getRight() - getLeft()) / 2.0f) - (6.0f * getResources().getDisplayMetrics().scaledDensity * scrollSelectorValue.length());
+        float x = ((getRight() - getLeft()) / 2.0f);
         float y = getScrollOffset() + getSelectorElementHeight();
         Paint paint = mInputView.getPaint();
+        paint.setTextAlign(Paint.Align.CENTER);
         paint.setColor(getResources().getColor(R.color.blue_medium));
         canvas.drawText(scrollSelectorValue, x, y, paint);
         if (mInputView != null) mInputView.setVisibility(View.INVISIBLE);

From bfc16e255b586fc81584a2a08d96da3e4a2e727e Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Sun, 6 Dec 2015 19:52:57 -0800
Subject: [PATCH 16/63] Drawing 5 items in the number picker scroller, no
 fading edges

---
 .../wordpress/android/ui/WPNumberPicker.java  | 218 +++++++++++-------
 .../main/res/layout/number_picker_dialog.xml  |  13 +-
 2 files changed, 147 insertions(+), 84 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java b/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
index ef55397ed540..94193beab6ea 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
@@ -1,7 +1,6 @@
 package org.wordpress.android.ui;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.util.AttributeSet;
@@ -21,26 +20,44 @@ public class WPNumberPicker extends NumberPicker {
     private static final String INPUT_FIELD = "mInputText";
     private static final String INDICES_FIELD = "mSelectorIndices";
     private static final String CUR_OFFSET_FIELD = "mCurrentScrollOffset";
-    private static final String MIDDLE_INDEX_FIELD = "SELECTOR_MIDDLE_ITEM_INDEX";
     private static final String STRING_CACHE_FIELD = "mSelectorIndexToStringCache";
     private static final String SELECTOR_HEIGHT_FIELD = "mSelectorElementHeight";
+    private static final String INITIAL_OFFSET_FIELD = "mInitialScrollOffset";
+    private static final String CURRENT_OFFSET_FIELD = "mCurrentScrollOffset";
+    private static final String PAINT_FIELD = "mSelectorWheelPaint";
+
+    private static final int DISPLAY_COUNT = 5;
+    private static final int MIDDLE_INDEX = 2;
 
     private Field mOffsetField;
     private Field mSelectorHeight;
     private Field mSelectorIndices;
     private Field mStringCache;
-    private int mMiddleIndex;
+    private Field mInitialOffset;
+    private Field mCurrentOffset;
+
     private EditText mInputView;
+    private Paint mPaint;
 
     public WPNumberPicker(Context context, AttributeSet attrs) {
         super(context, attrs);
-        removeDividers();
+        getFieldsViaReflection();
     }
 
     @Override
     public void addView(View child, int index, android.view.ViewGroup.LayoutParams params) {
         super.addView(child, index, params);
-        updateView(child);
+        if (child instanceof TextView) {
+            WPPrefUtils.layoutAsNumberPickerPeek((TextView) child);
+        }
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        super.onLayout(changed, left, top, right, bottom);
+        updateIntitialOffset();
+        setVerticalFadingEdgeEnabled(false);
+        setHorizontalFadingEdgeEnabled(false);
     }
 
     @Override
@@ -53,44 +70,75 @@ public void setValue(int value) {
     @Override
     protected void onDraw(Canvas canvas) {
         // Draw normally, skipping the middle number
-        if (mInputView != null) mInputView.setVisibility(View.VISIBLE);
+        mInputView.setVisibility(View.VISIBLE);
+        int[] selectorIndices = getIndices();
+        setIndices(new int[0]);
         super.onDraw(canvas);
+        setIndices(selectorIndices);
 
         // Draw the middle number with a different font
-        String scrollSelectorValue = getDisplayString();
+        float elementHeight = getSelectorElementHeight();
         float x = ((getRight() - getLeft()) / 2.0f);
-        float y = getScrollOffset() + getSelectorElementHeight();
+        float y = getScrollOffset();
+        SparseArray displayStrings = getDisplayStrings();
         Paint paint = mInputView.getPaint();
         paint.setTextAlign(Paint.Align.CENTER);
+        //noinspection deprecation
         paint.setColor(getResources().getColor(R.color.blue_medium));
-        canvas.drawText(scrollSelectorValue, x, y, paint);
-        if (mInputView != null) mInputView.setVisibility(View.INVISIBLE);
+        if (selectorIndices != null && displayStrings != null) {
+            for (int i = 0; i < selectorIndices.length; i++) {
+                int selectorIndex = selectorIndices[i];
+                String scrollSelectorValue = String.valueOf(displayStrings.get(selectorIndex));
+                if (i == MIDDLE_INDEX) {
+                    canvas.drawText(scrollSelectorValue, x, y, paint);
+                } else {
+                    canvas.drawText(scrollSelectorValue, x, y, mPaint);
+                }
+                y += elementHeight;
+            }
+        }
+        mInputView.setVisibility(View.INVISIBLE);
     }
 
-    private void updateView(final View view) {
-        if (view instanceof TextView) {
-            WPPrefUtils.layoutAsNumberPickerPeek((TextView) view);
+    private void setIndices(int[] indices) {
+        if (mSelectorIndices != null) {
+            try {
+                mSelectorIndices.set(this, indices);
+            } catch (IllegalArgumentException | IllegalAccessException e) {
+                e.printStackTrace();
+            }
         }
     }
 
-    private String getDisplayString() {
-        if (mSelectorIndices == null || mStringCache == null) return "";
+    private int[] getIndices() {
+        if (mSelectorIndices != null) {
+            try {
+                return (int[]) mSelectorIndices.get(this);
+            } catch (IllegalArgumentException | IllegalAccessException e) {
+                e.printStackTrace();
+            }
+        }
 
-        try {
-            int index = ((int []) mSelectorIndices.get(this))[mMiddleIndex];
-            return ((SparseArray<String>) mStringCache.get(this)).get(index);
-        } catch (IllegalArgumentException | IllegalAccessException | Resources.NotFoundException e) {
-            e.printStackTrace();
+        return null;
+    }
+
+    private SparseArray getDisplayStrings() {
+        if (mStringCache != null) {
+            try {
+                return (SparseArray) mStringCache.get(this);
+            } catch (IllegalArgumentException | IllegalAccessException e) {
+                e.printStackTrace();
+            }
         }
 
-        return "";
+        return null;
     }
 
     private int getScrollOffset() {
         if (mOffsetField != null) {
             try {
                 return (Integer) mOffsetField.get(this);
-            } catch (IllegalArgumentException | IllegalAccessException | Resources.NotFoundException e) {
+            } catch (IllegalArgumentException | IllegalAccessException e) {
                 e.printStackTrace();
             }
         }
@@ -110,83 +158,93 @@ private int getSelectorElementHeight() {
         return 0;
     }
 
-    /**
-     * From https://www.snip2code.com/Snippet/67740/NumberPicker-with-transparent-selection-
-     */
-    private void removeDividers() {
-        Class<?> numberPickerClass = null;
-        try {
-            numberPickerClass = Class.forName(NumberPicker.class.getName());
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-        if (numberPickerClass == null) return;
-
-        Field selectionDivider = null;
-        Field inputField = null;
-        Field middleIndex = null;
-        try {
-            selectionDivider = numberPickerClass.getDeclaredField(DIVIDER_FIELD);
-            inputField = numberPickerClass.getDeclaredField(INPUT_FIELD);
-            middleIndex = numberPickerClass.getDeclaredField(MIDDLE_INDEX_FIELD);
-            mSelectorIndices = numberPickerClass.getDeclaredField(INDICES_FIELD);
-            mSelectorHeight = numberPickerClass.getDeclaredField(SELECTOR_HEIGHT_FIELD);
-            mOffsetField = numberPickerClass.getDeclaredField(CUR_OFFSET_FIELD);
-            mStringCache = numberPickerClass.getDeclaredField(STRING_CACHE_FIELD);
-        } catch (NoSuchFieldException e) {
-            e.printStackTrace();
-        }
-        if (middleIndex != null) {
+    private void updateIntitialOffset() {
+        if (mInitialOffset != null) {
             try {
-                middleIndex.setAccessible(true);
-                mMiddleIndex = (Integer) middleIndex.get(this);
-            } catch (IllegalArgumentException | IllegalAccessException | Resources.NotFoundException e) {
+                int offset = (Integer) mInitialOffset.get(this) - getSelectorElementHeight();
+                mInitialOffset.set(this, offset);
+                // Only do this once
+                mInitialOffset = null;
+
+                if (mCurrentOffset != null) {
+                    mCurrentOffset.set(this, offset);
+                }
+            } catch (IllegalAccessException e) {
                 e.printStackTrace();
             }
         }
+    }
+
+    /**
+     * From https://www.snip2code.com/Snippet/67740/NumberPicker-with-transparent-selection-
+     */
+    private void removeDividers(Class<?> clazz) {
+        Field selectionDivider = getFieldAndSetAccessible(clazz, DIVIDER_FIELD);
         if (selectionDivider != null) {
             try {
-                selectionDivider.setAccessible(true);
                 selectionDivider.set(this, null);
-            } catch (IllegalArgumentException | IllegalAccessException | Resources.NotFoundException e) {
+            } catch (IllegalArgumentException | IllegalAccessException e) {
                 e.printStackTrace();
             }
         }
-        if (inputField != null) {
-            try {
-                inputField.setAccessible(true);
-                mInputView = ((EditText) inputField.get(this));
-            } catch (IllegalArgumentException | IllegalAccessException | Resources.NotFoundException e) {
-                e.printStackTrace();
-            }
-        }
-        if (mStringCache != null) {
+    }
+
+    private void getTextPaint(Class<?> clazz) {
+        Field paint = getFieldAndSetAccessible(clazz, PAINT_FIELD);
+        if (paint != null) {
             try {
-                mStringCache.setAccessible(true);
-            } catch (IllegalArgumentException | Resources.NotFoundException e) {
+                mPaint = (Paint) paint.get(this);
+            } catch (IllegalArgumentException | IllegalAccessException e) {
                 e.printStackTrace();
             }
         }
-        if (mSelectorIndices != null) {
+    }
+
+    private void getInputField(Class<?> clazz) {
+        Field inputField = getFieldAndSetAccessible(clazz, INPUT_FIELD);
+        if (inputField != null) {
             try {
-                mSelectorIndices.setAccessible(true);
-            } catch (IllegalArgumentException | Resources.NotFoundException e) {
+                mInputView = ((EditText) inputField.get(this));
+            } catch (IllegalArgumentException | IllegalAccessException e) {
                 e.printStackTrace();
             }
         }
-        if (mOffsetField != null) {
-            try {
-                mOffsetField.setAccessible(true);
-            } catch (IllegalArgumentException | Resources.NotFoundException e) {
-                e.printStackTrace();
-            }
+    }
+
+    /**
+     * Gets a class field using reflection and makes it accessible.
+     */
+    private Field getFieldAndSetAccessible(Class<?> clazz, String fieldName) {
+        Field field = null;
+        try {
+            field = clazz.getDeclaredField(fieldName);
+            field.setAccessible(true);
+        } catch (NoSuchFieldException e) {
+            e.printStackTrace();
         }
-        if (mSelectorHeight != null) {
-            try {
-                mSelectorHeight.setAccessible(true);
-            } catch (IllegalArgumentException | Resources.NotFoundException e) {
-                e.printStackTrace();
-            }
+
+        return field;
+    }
+
+    private void getFieldsViaReflection() {
+        Class<?> numberPickerClass = null;
+        try {
+            numberPickerClass = Class.forName(NumberPicker.class.getName());
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
         }
+        if (numberPickerClass == null) return;
+
+        mSelectorHeight = getFieldAndSetAccessible(numberPickerClass, SELECTOR_HEIGHT_FIELD);
+        mOffsetField = getFieldAndSetAccessible(numberPickerClass, CUR_OFFSET_FIELD);
+        mStringCache = getFieldAndSetAccessible(numberPickerClass, STRING_CACHE_FIELD);
+        mSelectorIndices = getFieldAndSetAccessible(numberPickerClass, INDICES_FIELD);
+        mInitialOffset = getFieldAndSetAccessible(numberPickerClass, INITIAL_OFFSET_FIELD);
+        mCurrentOffset = getFieldAndSetAccessible(numberPickerClass, CURRENT_OFFSET_FIELD);
+
+        getTextPaint(numberPickerClass);
+        getInputField(numberPickerClass);
+        removeDividers(numberPickerClass);
+        setIndices(new int[DISPLAY_COUNT]);
     }
 }
diff --git a/WordPress/src/main/res/layout/number_picker_dialog.xml b/WordPress/src/main/res/layout/number_picker_dialog.xml
index c15a361495f2..5b3103d36fb8 100644
--- a/WordPress/src/main/res/layout/number_picker_dialog.xml
+++ b/WordPress/src/main/res/layout/number_picker_dialog.xml
@@ -12,19 +12,24 @@
     <org.wordpress.android.widgets.WPSwitch
         android:id="@+id/number_picker_switch"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp" />
 
     <org.wordpress.android.widgets.WPTextView
         android:id="@+id/number_picker_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textSize="@dimen/text_sz_medium"
-        app:fontVariation="light" />
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:textSize="@dimen/text_sz_small"
+        app:fontFamily="openSans"
+        app:fontVariation="normal" />
 
     <org.wordpress.android.ui.WPNumberPicker
         android:id="@+id/number_picker"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:showDividers="none" />
+        android:paddingTop="36dp" />
 
 </LinearLayout>

From 713ae1f3f835e69f98bd52f0d693ee0e13d49cae Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Sun, 6 Dec 2015 20:53:01 -0800
Subject: [PATCH 17/63] Changing to number pickers for close after and paging
 settings

---
 .../wordpress/android/ui/WPNumberPicker.java  |  51 ++++-----
 .../ui/prefs/SiteSettingsFragment.java        | 107 +++++++++++++-----
 .../main/res/layout/number_picker_dialog.xml  |  12 ++
 WordPress/src/main/res/values/integers.xml    |   2 +
 WordPress/src/main/res/values/strings.xml     |   1 +
 5 files changed, 118 insertions(+), 55 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java b/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
index 94193beab6ea..c5436268d8b6 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
@@ -4,7 +4,6 @@
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.util.AttributeSet;
-import android.util.SparseArray;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.NumberPicker;
@@ -20,7 +19,6 @@ public class WPNumberPicker extends NumberPicker {
     private static final String INPUT_FIELD = "mInputText";
     private static final String INDICES_FIELD = "mSelectorIndices";
     private static final String CUR_OFFSET_FIELD = "mCurrentScrollOffset";
-    private static final String STRING_CACHE_FIELD = "mSelectorIndexToStringCache";
     private static final String SELECTOR_HEIGHT_FIELD = "mSelectorElementHeight";
     private static final String INITIAL_OFFSET_FIELD = "mInitialScrollOffset";
     private static final String CURRENT_OFFSET_FIELD = "mCurrentScrollOffset";
@@ -32,15 +30,16 @@ public class WPNumberPicker extends NumberPicker {
     private Field mOffsetField;
     private Field mSelectorHeight;
     private Field mSelectorIndices;
-    private Field mStringCache;
     private Field mInitialOffset;
     private Field mCurrentOffset;
 
     private EditText mInputView;
     private Paint mPaint;
+    private int[] mDisplayValues;
 
     public WPNumberPicker(Context context, AttributeSet attrs) {
         super(context, attrs);
+        mDisplayValues = new int[DISPLAY_COUNT];
         getFieldsViaReflection();
     }
 
@@ -77,29 +76,40 @@ protected void onDraw(Canvas canvas) {
         setIndices(selectorIndices);
 
         // Draw the middle number with a different font
+        setDisplayValues();
         float elementHeight = getSelectorElementHeight();
         float x = ((getRight() - getLeft()) / 2.0f);
         float y = getScrollOffset();
-        SparseArray displayStrings = getDisplayStrings();
         Paint paint = mInputView.getPaint();
         paint.setTextAlign(Paint.Align.CENTER);
         //noinspection deprecation
         paint.setColor(getResources().getColor(R.color.blue_medium));
-        if (selectorIndices != null && displayStrings != null) {
-            for (int i = 0; i < selectorIndices.length; i++) {
-                int selectorIndex = selectorIndices[i];
-                String scrollSelectorValue = String.valueOf(displayStrings.get(selectorIndex));
-                if (i == MIDDLE_INDEX) {
-                    canvas.drawText(scrollSelectorValue, x, y, paint);
-                } else {
-                    canvas.drawText(scrollSelectorValue, x, y, mPaint);
-                }
-                y += elementHeight;
+
+        // Draw the visible values
+        for (int i = 0; i < DISPLAY_COUNT; ++i) {
+            String scrollSelectorValue = String.valueOf(mDisplayValues[i]);
+            if (i == MIDDLE_INDEX) {
+                canvas.drawText(scrollSelectorValue, x, y, paint);
+            } else {
+                canvas.drawText(scrollSelectorValue, x, y, mPaint);
             }
+            y += elementHeight;
         }
         mInputView.setVisibility(View.INVISIBLE);
     }
 
+    private void setDisplayValues() {
+        int value = getValue();
+        for (int i = 0; i < DISPLAY_COUNT; ++i) {
+            mDisplayValues[i] = value - MIDDLE_INDEX + i;
+            if (mDisplayValues[i] < getMinValue()) {
+                mDisplayValues[i] = getMaxValue() - (getMinValue() - mDisplayValues[i] + 1);
+            } else if (mDisplayValues[i] > getMaxValue()) {
+                mDisplayValues[i] = getMinValue() + (mDisplayValues[i] - getMaxValue() - 1);
+            }
+        }
+    }
+
     private void setIndices(int[] indices) {
         if (mSelectorIndices != null) {
             try {
@@ -122,18 +132,6 @@ private int[] getIndices() {
         return null;
     }
 
-    private SparseArray getDisplayStrings() {
-        if (mStringCache != null) {
-            try {
-                return (SparseArray) mStringCache.get(this);
-            } catch (IllegalArgumentException | IllegalAccessException e) {
-                e.printStackTrace();
-            }
-        }
-
-        return null;
-    }
-
     private int getScrollOffset() {
         if (mOffsetField != null) {
             try {
@@ -237,7 +235,6 @@ private void getFieldsViaReflection() {
 
         mSelectorHeight = getFieldAndSetAccessible(numberPickerClass, SELECTOR_HEIGHT_FIELD);
         mOffsetField = getFieldAndSetAccessible(numberPickerClass, CUR_OFFSET_FIELD);
-        mStringCache = getFieldAndSetAccessible(numberPickerClass, STRING_CACHE_FIELD);
         mSelectorIndices = getFieldAndSetAccessible(numberPickerClass, INDICES_FIELD);
         mInitialOffset = getFieldAndSetAccessible(numberPickerClass, INITIAL_OFFSET_FIELD);
         mCurrentOffset = getFieldAndSetAccessible(numberPickerClass, CURRENT_OFFSET_FIELD);
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index 52709bfb98a0..1d1f933febf7 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -17,6 +17,7 @@
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.support.annotation.NonNull;
+import android.support.v7.widget.SwitchCompat;
 import android.text.TextUtils;
 import android.util.SparseBooleanArray;
 import android.view.ContextThemeWrapper;
@@ -241,9 +242,9 @@ public boolean onPreferenceClick(Preference preference) {
             removeBlogWithConfirmation();
             return true;
         } else if (preference == mCloseAfterPref) {
-            // TODO
+            showCloseAfterDialog();
         } else if (preference == mPagingPref) {
-            // TODO
+            showPagingDialog();
         }
 
         return false;
@@ -278,9 +279,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
             setReceivePingbacks((Boolean) newValue);
         } else if (preference == mCloseAfterPref) {
             mSiteSettings.setCloseAfter(Integer.parseInt(newValue.toString()));
-//            setDetailListPreferenceValue(mCloseAfterPref,
-//                    newValue.toString(),
-//                    getCloseAfterSummary(mSiteSettings.getCloseAfter()));
+            mCloseAfterPref.setSummary(getCloseAfterSummary(mSiteSettings.getCloseAfter()));
         } else if (preference == mSortByPref) {
             mSiteSettings.setCommentSorting(Integer.parseInt(newValue.toString()));
             setDetailListPreferenceValue(mSortByPref,
@@ -293,9 +292,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
                     getThreadingSummary(mSiteSettings.getThreadingLevels()));
         } else if (preference == mPagingPref) {
             mSiteSettings.setPagingCount(Integer.parseInt(newValue.toString()));
-//            setDetailListPreferenceValue(mPagingPref,
-//                    newValue.toString(),
-//                    getPagingSummary(mSiteSettings.getPagingCount()));
+            mPagingPref.setSummary(getPagingSummary(mSiteSettings.getPagingCount()));
         } else if (preference == mIdentityRequiredPreference) {
             mSiteSettings.setIdentityRequired((Boolean) newValue);
         } else if (preference == mUserAccountRequiredPref) {
@@ -458,25 +455,84 @@ private void showRelatedPostsDialog() {
         relatedPosts.show(getFragmentManager(), "related-posts");
     }
 
+    private View getDialogTitleView(int title) {
+        LayoutInflater inflater = LayoutInflater.from(getActivity());
+        @SuppressLint("InflateParams")
+        View titleView = inflater.inflate(R.layout.detail_list_preference_title, null);
+        TextView titleText = ((TextView) titleView.findViewById(R.id.title));
+        titleText.setText(title);
+        titleText.setLayoutParams(new RelativeLayout.LayoutParams(
+                RelativeLayout.LayoutParams.MATCH_PARENT,
+                RelativeLayout.LayoutParams.WRAP_CONTENT));
+        return titleView;
+    }
+
+    private void showPagingDialog() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.Calypso_AlertDialog);
+        View view = View.inflate(getActivity(), R.layout.number_picker_dialog, null);
+
+        SwitchCompat switchView = (SwitchCompat) view.findViewById(R.id.number_picker_switch);
+        switchView.setText(R.string.site_settings_paging_title);
+
+        TextView detailText = (TextView) view.findViewById(R.id.number_picker_text);
+        detailText.setText(R.string.paging_description);
+
+        final NumberPicker numberPicker = (NumberPicker) view.findViewById(R.id.number_picker);
+        numberPicker.setMinValue(1);
+        numberPicker.setMaxValue(getResources().getInteger(R.integer.paging_limit));
+        numberPicker.setValue(Math.max(numberPicker.getMinValue(), Math.min(numberPicker.getMaxValue(), mSiteSettings.getPagingCount())));
+
+        builder.setCustomTitle(getDialogTitleView(R.string.site_settings_paging_title));
+        builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                if (mSiteSettings.getPagingCount() != numberPicker.getValue()) {
+                    onPreferenceChange(mPagingPref, numberPicker.getValue());
+                }
+            }
+        });
+        builder.setNegativeButton(R.string.cancel, null);
+        builder.setView(view);
+        builder.create().show();
+    }
+
+    private void showCloseAfterDialog() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.Calypso_AlertDialog);
+        View view = View.inflate(getActivity(), R.layout.number_picker_dialog, null);
+
+        view.findViewById(R.id.number_picker_text).setVisibility(View.GONE);
+        view.findViewById(R.id.number_picker_switch).setVisibility(View.GONE);
+
+        final NumberPicker numberPicker = (NumberPicker) view.findViewById(R.id.number_picker);
+        numberPicker.setMinValue(0);
+        numberPicker.setMaxValue(getResources().getInteger(R.integer.close_after_limit));
+        numberPicker.setValue(Math.max(numberPicker.getMinValue(), Math.min(numberPicker.getMaxValue(), mSiteSettings.getCloseAfter())));
+
+        builder.setCustomTitle(getDialogTitleView(R.string.site_settings_close_after_title));
+        builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                if (mSiteSettings.getCloseAfter() != numberPicker.getValue()) {
+                    onPreferenceChange(mCloseAfterPref, numberPicker.getValue());
+                }
+            }
+        });
+        builder.setNegativeButton(R.string.cancel, null);
+        builder.setView(view);
+        builder.create().show();
+    }
+
     private void showMultipleLinksDialog() {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.Calypso_AlertDialog);
         View view = View.inflate(getActivity(), R.layout.number_picker_dialog, null);
+        view.findViewById(R.id.number_picker_switch).setVisibility(View.GONE);
         final NumberPicker numberPicker = (NumberPicker) view.findViewById(R.id.number_picker);
         TextView detailText = (TextView) view.findViewById(R.id.number_picker_text);
-        //noinspection deprecation
-        detailText.setTextColor(getResources().getColor(R.color.grey_darken_10));
         detailText.setText(R.string.multiple_links_description);
+        numberPicker.setMinValue(0);
         numberPicker.setMaxValue(getResources().getInteger(R.integer.max_links_limit));
         numberPicker.setValue(Math.max(numberPicker.getMinValue(), Math.min(numberPicker.getMaxValue(), mSiteSettings.getMultipleLinks())));
-        LayoutInflater inflater = LayoutInflater.from(getActivity());
-        @SuppressLint("InflateParams")
-        View titleView = inflater.inflate(R.layout.detail_list_preference_title, null);
-        TextView titleText = ((TextView) titleView.findViewById(R.id.title));
-        titleText.setText(R.string.site_settings_multiple_links_title);
-        titleText.setLayoutParams(new RelativeLayout.LayoutParams(
-                RelativeLayout.LayoutParams.MATCH_PARENT,
-                RelativeLayout.LayoutParams.WRAP_CONTENT));
-        builder.setCustomTitle(titleView);
+        builder.setCustomTitle(getDialogTitleView(R.string.site_settings_multiple_links_title));
         builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
@@ -506,30 +562,25 @@ private void setPreferencesFromSiteSettings() {
         setAllowComments(mSiteSettings.getAllowComments());
         setSendPingbacks(mSiteSettings.getSendPingbacks());
         setReceivePingbacks(mSiteSettings.getReceivePingbacks());
-//        setDetailListPreferenceValue(mCloseAfterPref,
-//                String.valueOf(mSiteSettings.getCloseAfter()),
-//                getCloseAfterSummary(mSiteSettings.getCloseAfter()));
         setDetailListPreferenceValue(mSortByPref,
                 String.valueOf(mSiteSettings.getCommentSorting()),
                 getSortOrderSummary(mSiteSettings.getCommentSorting()));
         setDetailListPreferenceValue(mThreadingPref,
                 String.valueOf(mSiteSettings.getThreadingLevels()),
                 getThreadingSummary(mSiteSettings.getThreadingLevels()));
-//        setDetailListPreferenceValue(mPagingPref,
-//                String.valueOf(mSiteSettings.getPagingCount()),
-//                getPagingSummary(mSiteSettings.getPagingCount()));
         int approval = mSiteSettings.getManualApproval() ?
                 mSiteSettings.getUseCommentWhitelist() ? 0
                         : -1 : 1;
         setDetailListPreferenceValue(mWhitelistPref, String.valueOf(approval), getWhitelistSummary(approval));
         mMultipleLinksPref.setSummary(getResources()
                 .getQuantityString(R.plurals.multiple_links_summary,
-                mSiteSettings.getMultipleLinks(),
-                mSiteSettings.getMultipleLinks()));
+                        mSiteSettings.getMultipleLinks(),
+                        mSiteSettings.getMultipleLinks()));
         mIdentityRequiredPreference.setChecked(mSiteSettings.getIdentityRequired());
         mUserAccountRequiredPref.setChecked(mSiteSettings.getUserAccountRequired());
         mThreadingPref.setValue(String.valueOf(mSiteSettings.getThreadingLevels()));
-//        mPagingPref.setValue(String.valueOf(mSiteSettings.getPagingCount()));
+        mCloseAfterPref.setSummary(getCloseAfterSummary(mSiteSettings.getCloseAfter()));
+        mPagingPref.setSummary(getPagingSummary(mSiteSettings.getPagingCount()));
     }
 
     private void setCategories() {
diff --git a/WordPress/src/main/res/layout/number_picker_dialog.xml b/WordPress/src/main/res/layout/number_picker_dialog.xml
index 5b3103d36fb8..7eefe624a9df 100644
--- a/WordPress/src/main/res/layout/number_picker_dialog.xml
+++ b/WordPress/src/main/res/layout/number_picker_dialog.xml
@@ -23,6 +23,18 @@
         android:layout_marginLeft="8dp"
         android:layout_marginRight="8dp"
         android:textSize="@dimen/text_sz_small"
+        android:textColor="@color/grey_darken_10"
+        app:fontFamily="openSans"
+        app:fontVariation="normal" />
+
+    <org.wordpress.android.widgets.WPTextView
+        android:id="@+id/number_picker_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:textSize="@dimen/text_sz_small"
+        android:textColor="@color/grey_darken_10"
         app:fontFamily="openSans"
         app:fontVariation="normal" />
 
diff --git a/WordPress/src/main/res/values/integers.xml b/WordPress/src/main/res/values/integers.xml
index 11f6f7a0fee0..842ecb672708 100644
--- a/WordPress/src/main/res/values/integers.xml
+++ b/WordPress/src/main/res/values/integers.xml
@@ -18,5 +18,7 @@
 
     <!-- Site Settings -->
     <integer name="max_links_limit">100</integer>
+    <integer name="paging_limit">300</integer>
+    <integer name="close_after_limit">365</integer>
 
 </resources>
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index 204df48676a9..cbe19f56fb7b 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -550,6 +550,7 @@
     <string name="list_editor_input_hint">Enter a word or phrase</string>
     <string name="hold_for_moderation_description">When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the moderation queue. You can enter partial words, so \"press\" will match \"WordPress.\"</string>
     <string name="blacklist_description">When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be marked as spam. You can enter partial words, so \"press\" will match \"WordPress.\"</string>
+    <string name="paging_description">Break comment threads into multiple pages.</string>
     <string name="multiple_links_description">Require approval for comments that include more than this number of links.</string>
     <string name="oldest_first">Oldest first</string>
     <string name="newest_first">Newest first</string>

From bcac6d8404d6c5743e2734f588074715e0b8c4bc Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Sun, 6 Dec 2015 21:28:56 -0800
Subject: [PATCH 18/63] Adding dividers and fixing wrapped number picker
 element values

---
 .../wordpress/android/ui/WPNumberPicker.java  |  2 +-
 .../main/res/layout/number_picker_dialog.xml  | 26 ++++++++++++-------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java b/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
index c5436268d8b6..8be0e2c66955 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
@@ -103,7 +103,7 @@ private void setDisplayValues() {
         for (int i = 0; i < DISPLAY_COUNT; ++i) {
             mDisplayValues[i] = value - MIDDLE_INDEX + i;
             if (mDisplayValues[i] < getMinValue()) {
-                mDisplayValues[i] = getMaxValue() - (getMinValue() - mDisplayValues[i] + 1);
+                mDisplayValues[i] = getMaxValue() - (mDisplayValues[i] + getMinValue() + 1);
             } else if (mDisplayValues[i] > getMaxValue()) {
                 mDisplayValues[i] = getMinValue() + (mDisplayValues[i] - getMaxValue() - 1);
             }
diff --git a/WordPress/src/main/res/layout/number_picker_dialog.xml b/WordPress/src/main/res/layout/number_picker_dialog.xml
index 7eefe624a9df..ea3c811dd0b2 100644
--- a/WordPress/src/main/res/layout/number_picker_dialog.xml
+++ b/WordPress/src/main/res/layout/number_picker_dialog.xml
@@ -5,23 +5,26 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingLeft="@dimen/margin_extra_large"
-    android:paddingRight="@dimen/margin_extra_large">
+    android:orientation="vertical">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/grey_lighten_30" />
 
     <org.wordpress.android.widgets.WPSwitch
         android:id="@+id/number_picker_switch"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp" />
+        android:layout_marginLeft="24dp"
+        android:layout_marginRight="24dp" />
 
     <org.wordpress.android.widgets.WPTextView
         android:id="@+id/number_picker_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
+        android:layout_marginLeft="24dp"
+        android:layout_marginRight="24dp"
         android:textSize="@dimen/text_sz_small"
         android:textColor="@color/grey_darken_10"
         app:fontFamily="openSans"
@@ -31,8 +34,8 @@
         android:id="@+id/number_picker_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
+        android:layout_marginLeft="24dp"
+        android:layout_marginRight="24dp"
         android:textSize="@dimen/text_sz_small"
         android:textColor="@color/grey_darken_10"
         app:fontFamily="openSans"
@@ -44,4 +47,9 @@
         android:layout_height="wrap_content"
         android:paddingTop="36dp" />
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/grey_lighten_30" />
+
 </LinearLayout>

From 0cb0b197bdedf85b74f922f30da50cf266895667 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Mon, 7 Dec 2015 16:54:47 -0800
Subject: [PATCH 19/63] Design cleanup, mostly ActionMode changes, some font
 tweaks, shadowing

---
 .../android/ui/prefs/MultiSelectListView.java |  2 +-
 .../ui/prefs/SiteSettingsFragment.java        |  7 ++--
 .../android/util/WPActivityUtils.java         | 10 ++++++
 .../main/res/layout/number_picker_dialog.xml  |  6 +++-
 WordPress/src/main/res/values/colors.xml      |  1 +
 .../src/main/res/values/styles_calypso.xml    | 33 +++++++++++++------
 6 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/MultiSelectListView.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/MultiSelectListView.java
index 5e4746386db3..5c03e54aab3e 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/MultiSelectListView.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/MultiSelectListView.java
@@ -63,11 +63,11 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
     @Override
     public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
         if (mActionMode != null) return false;
-        if (mEnterListener != null) mEnterListener.onEnterMultiSelect();
 
         setItemChecked(position, true);
         getChildAt(position).setBackgroundColor(getResources().getColor(R.color.white));
         mActionMode = startActionMode(this);
+        if (mEnterListener != null) mEnterListener.onEnterMultiSelect();
 
         return true;
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index 1d1f933febf7..f3a0f53668e6 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -780,20 +780,21 @@ private void showListEditorDialog(int titleRes, int footerRes) {
     }
 
     private View getListEditorView(final Dialog dialog, String footerText) {
-        View view = View.inflate(getActivity(), R.layout.list_editor, null);
+        ContextThemeWrapper wrapper = new ContextThemeWrapper(getActivity(), R.style.Calypso_SiteSettingsTheme);
+        View view = View.inflate(wrapper, R.layout.list_editor, null);
         ((TextView) view.findViewById(R.id.list_editor_footer_text)).setText(footerText);
 
         final MultiSelectListView list = (MultiSelectListView) view.findViewById(android.R.id.list);
         list.setEnterMultiSelectListener(new MultiSelectListView.OnEnterMultiSelect() {
             @Override
             public void onEnterMultiSelect() {
-                WPActivityUtils.changeDialogToolbarVisibility(dialog, View.GONE);
+                WPActivityUtils.setStatusBarColor(dialog.getWindow(), R.color.action_mode_status_bar_tint);
             }
         });
         list.setExitMultiSelectListener(new MultiSelectListView.OnExitMultiSelect() {
             @Override
             public void onExitMultiSelect() {
-                WPActivityUtils.changeDialogToolbarVisibility(dialog, View.VISIBLE);
+                WPActivityUtils.setStatusBarColor(dialog.getWindow(), R.color.status_bar_tint);
             }
         });
         list.setDeleteRequestListener(new MultiSelectListView.OnDeleteRequested() {
diff --git a/WordPress/src/main/java/org/wordpress/android/util/WPActivityUtils.java b/WordPress/src/main/java/org/wordpress/android/util/WPActivityUtils.java
index efbd7938f835..997f4e553379 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/WPActivityUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/util/WPActivityUtils.java
@@ -18,6 +18,8 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 
@@ -91,6 +93,14 @@ public static void changeDialogToolbarVisibility(Dialog dialog, int visibility)
         }
     }
 
+    public static void setStatusBarColor(Window window, int color) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+            window.setStatusBarColor(window.getContext().getResources().getColor(color));
+        }
+    }
+
     public static void applyLocale(Activity context, boolean restart) {
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
 
diff --git a/WordPress/src/main/res/layout/number_picker_dialog.xml b/WordPress/src/main/res/layout/number_picker_dialog.xml
index ea3c811dd0b2..91450fb00de9 100644
--- a/WordPress/src/main/res/layout/number_picker_dialog.xml
+++ b/WordPress/src/main/res/layout/number_picker_dialog.xml
@@ -17,7 +17,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="24dp"
-        android:layout_marginRight="24dp" />
+        android:layout_marginRight="24dp"
+        android:textStyle="bold"
+        android:textSize="@dimen/text_sz_large"
+        app:fontFamily="openSans"
+        app:fontVariation="light" />
 
     <org.wordpress.android.widgets.WPTextView
         android:id="@+id/number_picker_text"
diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml
index 8fc43508eb5e..d98c303ff972 100644
--- a/WordPress/src/main/res/values/colors.xml
+++ b/WordPress/src/main/res/values/colors.xml
@@ -76,6 +76,7 @@
     <!-- We could use blue_dark for the status bar color, but to adhere to the material design spec very closely,
       we're using a shade of blue_wordpress -->
     <color name="status_bar_tint">#006b98</color>
+    <color name="action_mode_status_bar_tint">#ff517188</color>
 
     <!-- Media Gallery -->
     <color name="media_gallery_grid_label_bg">@color/semi_transparent_grey_dark</color>
diff --git a/WordPress/src/main/res/values/styles_calypso.xml b/WordPress/src/main/res/values/styles_calypso.xml
index c19c827a8897..ca3ac4c82330 100644
--- a/WordPress/src/main/res/values/styles_calypso.xml
+++ b/WordPress/src/main/res/values/styles_calypso.xml
@@ -8,35 +8,48 @@
         <item name="android:popupMenuStyle">@style/Calypso.PopupMenu</item>
         <item name="android:textAppearanceSmallPopupMenu">@style/Calypso.TextAppearance</item>
         <item name="android:textAppearanceLargePopupMenu">@style/Calypso.TextAppearance</item>
-        <item name="android:actionModeStyle">@style/Calypso.ActionMode</item>
     </style>
 
-    <style name="Calypso.SiteSettingsTheme" parent="CalypsoTheme">
+    <style name="Calypso.SiteSettingsTheme" parent="@style/CalypsoTheme">
+        <item name="android:windowActionModeOverlay">true</item>
+        <item name="android:actionModeCloseDrawable">@drawable/ic_arrow_back_white_24dp</item>
+        <item name="android:actionModeCloseButtonStyle">@style/Calypso.ActionMode.Button</item>
+        <item name="android:actionModeStyle">@style/Calypso.ActionMode</item>
+        <item name="colorPrimaryDark">@color/grey_darken_10</item>
+
         <item name="android:windowContentOverlay">@color/grey_lighten_30</item>
         <item name="alertDialogTheme">@style/Calypso.AlertDialog</item>
+        <item name="dialogTheme">@style/Calypso.AlertDialog</item>
         <item name="colorControlActivated">@color/blue_medium</item>
         <item name="colorControlNormal">@color/grey_lighten_20</item>
-        <item name="colorAccent">@color/blue_medium</item>
+        <item name="colorAccent">@color/orange_jazzy</item>
         <item name="android:listDivider">@drawable/preferences_divider</item>
         <item name="android:dividerHeight">@dimen/site_settings_divider_height</item>
     </style>
 
+    <style name="Calypso.ActionMode.Button" parent="ActionButton.CloseMode.WordPress">
+        <item name="android:background">@color/transparent</item>
+    </style>
+
     <style name="Calypso.ActionMode.Text">
-        <item name="titleTextColor">@color/white</item>
+        <item name="fontFamily">openSans</item>
+        <item name="fontVariation">light</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textSize">@dimen/text_sz_extra_large</item>
     </style>
 
-    <style name="Calypso.ActionMode" parent="CalypsoTheme">
-        <item name="colorPrimaryDark">@color/grey_darken_10</item>
-        <!--<item name="statusBarColor">@color/grey_darken_10</item>-->
-        <item name="android:background">@color/grey_darken_10</item>
+    <style name="Calypso.ActionMode" parent="@style/Widget.AppCompat.ActionMode">
         <item name="android:titleTextStyle">@style/Calypso.ActionMode.Text</item>
-        <item name="android:subtitleTextStyle">@style/Calypso.ActionMode.Text</item>
+        <item name="android:background">@color/grey_darken_10</item>
     </style>
 
-    <style name="Calypso.AlertDialog" parent="Theme.AppCompat.Light.Dialog.Alert">
+    <style name="Calypso.AlertDialog" parent="@style/Theme.AppCompat.Light.Dialog.Alert">
         <item name="windowActionBar">false</item>
         <item name="colorPrimary">@color/white</item>
+        <item name="colorPrimaryDark">@color/grey_darken_10</item>
         <item name="colorAccent">@color/blue_medium</item>
+        <item name="actionModeStyle">@style/Calypso.ActionMode</item>
         <item name="android:background">@color/white</item>
         <item name="android:listDivider">@drawable/preferences_divider</item>
         <item name="android:dividerHeight">@dimen/site_settings_divider_height</item>

From 54830dd29e3274a0d98c0b2a6cee860e67fe6e8b Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Mon, 7 Dec 2015 18:10:22 -0800
Subject: [PATCH 20/63] Adding analytics

---
 .../android/ui/prefs/DotComSiteSettings.java  |  6 ++
 .../android/ui/prefs/LearnMorePreference.java |  7 +++
 .../ui/prefs/SelfHostedSiteSettings.java      |  6 ++
 .../ui/prefs/SiteSettingsFragment.java        | 19 ++++++
 .../android/util/WPActivityUtils.java         | 10 +--
 .../android/analytics/AnalyticsTracker.java   | 12 +++-
 .../analytics/AnalyticsTrackerMixpanel.java   | 62 +++++++++++++++----
 .../analytics/AnalyticsTrackerNosara.java     | 30 ++++++++-
 8 files changed, 126 insertions(+), 26 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java
index 94fbc0cfea42..50f4eaef55e0 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java
@@ -9,9 +9,11 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.wordpress.android.WordPress;
+import org.wordpress.android.analytics.AnalyticsTracker;
 import org.wordpress.android.datasets.SiteSettingsTable;
 import org.wordpress.android.models.Blog;
 import org.wordpress.android.models.CategoryModel;
+import org.wordpress.android.util.AnalyticsUtils;
 import org.wordpress.android.util.AppLog;
 
 import java.util.ArrayList;
@@ -87,6 +89,10 @@ public void onResponse(JSONObject response) {
                         AppLog.d(AppLog.T.API, "Site Settings saved remotely");
                         notifySavedOnUiThread(null);
                         mRemoteSettings.copyFrom(mSettings);
+                        HashMap<String, Object> properties = new HashMap<>();
+                        properties.put("items_saved", response);
+                        AnalyticsUtils.trackWithCurrentBlogDetails(
+                                AnalyticsTracker.Stat.SETTINGS_SAVED_REMOTELY, properties);
                     }
                 }, new RestRequest.ErrorListener() {
                     @Override
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/LearnMorePreference.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/LearnMorePreference.java
index c95b180e5b98..371a26c66952 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/LearnMorePreference.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/LearnMorePreference.java
@@ -14,6 +14,8 @@
 import android.webkit.WebViewClient;
 
 import org.wordpress.android.R;
+import org.wordpress.android.analytics.AnalyticsTracker;
+import org.wordpress.android.util.AnalyticsUtils;
 
 public class LearnMorePreference extends Preference
         implements PreferenceHint, View.OnClickListener, DialogInterface.OnDismissListener {
@@ -40,6 +42,9 @@ protected View onCreateView(@NonNull ViewGroup parent) {
     public void onClick(View v) {
         if (mDialog != null) return;
 
+        AnalyticsUtils.trackWithCurrentBlogDetails(
+                AnalyticsTracker.Stat.SETTINGS_LEARN_MORE_CLICKED);
+
         Context context = getContext();
         mDialog = new Dialog(context);
         mDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
@@ -51,6 +56,8 @@ public void onClick(View v) {
             public void onPageFinished(WebView webView, String url) {
                 super.onPageFinished(webView, url);
                 if (mDialog != null) {
+                    AnalyticsUtils.trackWithCurrentBlogDetails(
+                            AnalyticsTracker.Stat.SETTINGS_LEARN_MORE_LOADED);
                     mDialog.setContentView(webView);
                 }
             }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java
index 5187f87fc0a4..52a45dbe22f7 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java
@@ -3,10 +3,12 @@
 import android.app.Activity;
 import android.text.TextUtils;
 
+import org.wordpress.android.analytics.AnalyticsTracker;
 import org.wordpress.android.datasets.SiteSettingsTable;
 import org.wordpress.android.models.Blog;
 import org.wordpress.android.models.CategoryModel;
 import org.wordpress.android.models.SiteSettingsModel;
+import org.wordpress.android.util.AnalyticsUtils;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.MapUtils;
 import org.xmlrpc.android.ApiHelper;
@@ -86,6 +88,10 @@ public void saveSettings() {
             public void onSuccess(long id, final Object result) {
                 notifySavedOnUiThread(null);
                 mRemoteSettings.copyFrom(mSettings);
+                HashMap<String, Object> properties = new HashMap<>();
+                properties.put("items_saved", result);
+                AnalyticsUtils.trackWithCurrentBlogDetails(
+                        AnalyticsTracker.Stat.SETTINGS_SAVED_REMOTELY, properties);
             }
 
             @Override
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index f3a0f53668e6..bd4402c321a0 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -39,6 +39,7 @@
 
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
+import org.wordpress.android.analytics.AnalyticsTracker;
 import org.wordpress.android.models.AccountHelper;
 import org.wordpress.android.models.Blog;
 import org.wordpress.android.ui.stats.StatsWidgetProvider;
@@ -51,6 +52,7 @@
 import org.wordpress.android.util.WPActivityUtils;
 import org.wordpress.android.util.WPPrefUtils;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -123,6 +125,9 @@ public void onCreate(Bundle savedInstanceState) {
             return;
         }
 
+        AnalyticsUtils.trackWithCurrentBlogDetails(
+                AnalyticsTracker.Stat.SETTINGS_ACCESSED_SITE_SETTINGS);
+
         mShouldFetch = true;
         mSiteSettings = SiteSettingsInterface.getInterface(getActivity(), mBlog, this);
 
@@ -208,6 +213,8 @@ public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference prefere
 
         // Add Action Bar to sub-screens
         if (preference == findPreference(getString(R.string.pref_key_site_more_discussion))) {
+            AnalyticsUtils.trackWithCurrentBlogDetails(
+                    AnalyticsTracker.Stat.SETTINGS_ACCESSED_MORE_SETTINGS);
             Dialog dialog = ((PreferenceScreen) preference).getDialog();
             if (dialog != null) {
                 ListView prefList = (ListView) dialog.findViewById(android.R.id.list);
@@ -343,6 +350,10 @@ public boolean onItemLongClick(AdapterView<?> parent, View view, int position, l
             } else if (obj instanceof PreferenceHint) {
                 PreferenceHint hintObj = (PreferenceHint) obj;
                 if (hintObj.hasHint()) {
+                    HashMap<String, Object> properties = new HashMap<>();
+                    properties.put("hint_shown", hintObj.getHint());
+                    AnalyticsUtils.trackWithCurrentBlogDetails(
+                            AnalyticsTracker.Stat.SETTINGS_HINT_TOAST_SHOWN, properties);
                     ToastUtils.showToast(getActivity(), hintObj.getHint(), ToastUtils.Duration.SHORT);
                 }
                 return true;
@@ -801,6 +812,12 @@ public void onExitMultiSelect() {
             @Override
             public boolean onDeleteRequested() {
                 SparseBooleanArray checkedItems = list.getCheckedItemPositions();
+
+                HashMap<String, Object> properties = new HashMap<>();
+                properties.put("num_items_deleted", checkedItems.size());
+                AnalyticsUtils.trackWithCurrentBlogDetails(
+                        AnalyticsTracker.Stat.SETTINGS_DELETED_LIST_ITEMS, properties);
+
                 ListAdapter adapter = list.getAdapter();
                 for (int i = 0; i < checkedItems.size(); i++) {
                     final int index = checkedItems.keyAt(i);
@@ -836,6 +853,8 @@ public void onClick(DialogInterface dialog, int which) {
                             list.setAdapter(new ArrayAdapter<>(getActivity(),
                                     R.layout.wp_simple_list_item_1,
                                     mEditingList));
+                            AnalyticsUtils.trackWithCurrentBlogDetails(
+                                    AnalyticsTracker.Stat.SETTINGS_ADDED_LIST_ITEM);
                         }
                     }
                 });
diff --git a/WordPress/src/main/java/org/wordpress/android/util/WPActivityUtils.java b/WordPress/src/main/java/org/wordpress/android/util/WPActivityUtils.java
index 997f4e553379..a385f564fbda 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/WPActivityUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/util/WPActivityUtils.java
@@ -84,19 +84,11 @@ public void onClick(View v) {
         });
     }
 
-    public static void changeDialogToolbarVisibility(Dialog dialog, int visibility) {
-        if (dialog == null || !dialog.isShowing()) return;
-
-        View toolbar = dialog.findViewById(R.id.toolbar);
-        if (toolbar != null) {
-            toolbar.setVisibility(visibility);
-        }
-    }
-
     public static void setStatusBarColor(Window window, int color) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
             window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+            //noinspection deprecation
             window.setStatusBarColor(window.getContext().getResources().getColor(color));
         }
     }
diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java
index 41b54998eab2..37de363ff6de 100644
--- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java
+++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java
@@ -107,7 +107,6 @@ public enum Stat {
         PUSH_AUTHENTICATION_EXPIRED,
         PUSH_AUTHENTICATION_FAILED,
         PUSH_AUTHENTICATION_IGNORED,
-        SETTINGS_LANGUAGE_SELECTION_FORCED,
         NOTIFICATION_SETTINGS_LIST_OPENED,
         NOTIFICATION_SETTINGS_STREAMS_OPENED,
         NOTIFICATION_SETTINGS_DETAILS_OPENED,
@@ -120,9 +119,18 @@ public enum Stat {
         THEMES_CUSTOMIZE_ACCESSED,
         THEMES_SUPPORT_ACCESSED,
         THEMES_DETAILS_ACCESSED,
+        SETTINGS_LANGUAGE_SELECTION_FORCED,
+        SETTINGS_ACCESSED_SITE_SETTINGS,
+        SETTINGS_ACCESSED_MORE_SETTINGS,
+        SETTINGS_LEARN_MORE_CLICKED,
+        SETTINGS_LEARN_MORE_LOADED,
+        SETTINGS_ADDED_LIST_ITEM,
+        SETTINGS_DELETED_LIST_ITEMS,
+        SETTINGS_SAVED_REMOTELY,
+        SETTINGS_HINT_TOAST_SHOWN,
     }
 
-    private static final List<Tracker> TRACKERS = new ArrayList<Tracker>();
+    private static final List<Tracker> TRACKERS = new ArrayList<>();
 
     private AnalyticsTracker() {
     }
diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java
index 182c2f362e88..ea481eaf9ef3 100644
--- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java
+++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java
@@ -16,7 +16,6 @@
 import org.wordpress.android.util.AppLog;
 
 import java.util.EnumMap;
-import java.util.Iterator;
 import java.util.Map;
 
 public class AnalyticsTrackerMixpanel extends Tracker {
@@ -35,7 +34,7 @@ public class AnalyticsTrackerMixpanel extends Tracker {
 
     public AnalyticsTrackerMixpanel(Context context, String token) throws IllegalArgumentException {
         super(context);
-        mAggregatedProperties = new EnumMap<AnalyticsTracker.Stat, JSONObject>(AnalyticsTracker.Stat.class);
+        mAggregatedProperties = new EnumMap<>(AnalyticsTracker.Stat.class);
         mMixpanel = MixpanelAPI.getInstance(context, token);
     }
 
@@ -142,9 +141,8 @@ private void trackMixpanelEventForInstructions(AnalyticsTrackerMixpanelInstructi
 
             // Retrieve properties user has already passed in and combine them with the saved properties
             if (properties != null) {
-                Iterator iter = properties.entrySet().iterator();
-                while (iter.hasNext()) {
-                    Map.Entry pairs = (Map.Entry) iter.next();
+                for (Object o : properties.entrySet()) {
+                    Map.Entry pairs = (Map.Entry) o;
                     String key = (String) pairs.getKey();
                     try {
                         Object value = pairs.getValue();
@@ -254,7 +252,7 @@ public void clearAllData() {
 
     private AnalyticsTrackerMixpanelInstructionsForStat instructionsForStat(
             AnalyticsTracker.Stat stat) {
-        AnalyticsTrackerMixpanelInstructionsForStat instructions = null;
+        AnalyticsTrackerMixpanelInstructionsForStat instructions;
         switch (stat) {
             case APPLICATION_OPENED:
                 instructions = AnalyticsTrackerMixpanelInstructionsForStat.
@@ -725,10 +723,6 @@ private AnalyticsTrackerMixpanelInstructionsForStat instructionsForStat(
                 instructions = AnalyticsTrackerMixpanelInstructionsForStat.
                         mixpanelInstructionsForEventName("Push Authentication - Ignored");
                 break;
-            case SETTINGS_LANGUAGE_SELECTION_FORCED:
-                instructions = AnalyticsTrackerMixpanelInstructionsForStat.
-                        mixpanelInstructionsForEventName("Settings - Forced Language Selection");
-                break;
             case NOTIFICATION_SETTINGS_LIST_OPENED:
                 instructions = AnalyticsTrackerMixpanelInstructionsForStat.
                         mixpanelInstructionsForEventName("Notification Settings - Accessed List");
@@ -793,6 +787,50 @@ private AnalyticsTrackerMixpanelInstructionsForStat instructionsForStat(
                 instructions = AnalyticsTrackerMixpanelInstructionsForStat.
                         mixpanelInstructionsForEventName("Themes - Details Accessed");
                 break;
+            case SETTINGS_LANGUAGE_SELECTION_FORCED:
+                instructions = AnalyticsTrackerMixpanelInstructionsForStat.
+                        mixpanelInstructionsForEventName("Settings - Forced Language Selection");
+                break;
+            case SETTINGS_ACCESSED_SITE_SETTINGS:
+                instructions = AnalyticsTrackerMixpanelInstructionsForStat.
+                        mixpanelInstructionsForEventName("Settings - Site Settings Accessed");
+                instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_times_settings_accessed");
+                break;
+            case SETTINGS_ACCESSED_MORE_SETTINGS:
+                instructions = AnalyticsTrackerMixpanelInstructionsForStat.
+                        mixpanelInstructionsForEventName("Settings - More Settings Accessed");
+                instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_times_more_settings_accessed");
+                break;
+            case SETTINGS_ADDED_LIST_ITEM:
+                instructions = AnalyticsTrackerMixpanelInstructionsForStat.
+                        mixpanelInstructionsForEventName("Settings - Added List Item");
+                instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_list_items_added");
+                break;
+            case SETTINGS_DELETED_LIST_ITEMS:
+                instructions = AnalyticsTrackerMixpanelInstructionsForStat.
+                        mixpanelInstructionsForEventName("Settings - Site Deleted List Items");
+                instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_times_list_items_were_deleted");
+                break;
+            case SETTINGS_HINT_TOAST_SHOWN:
+                instructions = AnalyticsTrackerMixpanelInstructionsForStat.
+                        mixpanelInstructionsForEventName("Settings - Preference Hint Shown");
+                instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_preference_hints_viewed");
+                break;
+            case SETTINGS_LEARN_MORE_CLICKED:
+                instructions = AnalyticsTrackerMixpanelInstructionsForStat.
+                        mixpanelInstructionsForEventName("Settings - Learn More Clicked");
+                instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_times_learn_more_clicked");
+                break;
+            case SETTINGS_LEARN_MORE_LOADED:
+                instructions = AnalyticsTrackerMixpanelInstructionsForStat.
+                        mixpanelInstructionsForEventName("Settings - Learn More Loaded");
+                instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_times_learn_more_seen");
+                break;
+            case SETTINGS_SAVED_REMOTELY:
+                instructions = AnalyticsTrackerMixpanelInstructionsForStat.
+                        mixpanelInstructionsForEventName("Settings - Saved Remotely");
+                instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_times_settings_updated_remotely");
+                break;
             default:
                 instructions = null;
                 break;
@@ -808,6 +846,7 @@ private void incrementPeopleProperty(String property) {
         }
     }
 
+    @SuppressLint("CommitPrefEdits")
     private void incrementSuperProperty(String property) {
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(mContext);
         int propertyCount = preferences.getInt(property, 0);
@@ -864,8 +903,7 @@ private Object propertyForStat(String property, AnalyticsTracker.Stat stat) {
         }
 
         try {
-            Object valueForProperty = properties.get(property);
-            return valueForProperty;
+            return properties.get(property);
         } catch (JSONException e) {
             // We are okay with swallowing this exception as the next line will just return a null value
         }
diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java
index 1569e112c91f..3300f4d092bc 100644
--- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java
+++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java
@@ -330,9 +330,6 @@ public void track(AnalyticsTracker.Stat stat, Map<String, ?> properties) {
             case PUSH_AUTHENTICATION_IGNORED:
                 eventName = "push_authentication_ignored";
                 break;
-            case SETTINGS_LANGUAGE_SELECTION_FORCED:
-                eventName = "settings_language_selection_forced";
-                break;
             case NOTIFICATION_SETTINGS_LIST_OPENED:
                 eventName = "notification_settings_list_opened";
                 break;
@@ -375,6 +372,33 @@ public void track(AnalyticsTracker.Stat stat, Map<String, ?> properties) {
             case THEMES_DETAILS_ACCESSED:
                 eventName = "themes_details_accessed";
                 break;
+            case SETTINGS_LANGUAGE_SELECTION_FORCED:
+                eventName = "settings_language_selection_forced";
+                break;
+            case SETTINGS_ACCESSED_SITE_SETTINGS:
+                eventName = "settings_site_settings_accessed";
+                break;
+            case SETTINGS_ACCESSED_MORE_SETTINGS:
+                eventName = "settings_more_settings_accessed";
+                break;
+            case SETTINGS_ADDED_LIST_ITEM:
+                eventName = "settings_added_list_item";
+                break;
+            case SETTINGS_DELETED_LIST_ITEMS:
+                eventName = "settings_deleted_list_items";
+                break;
+            case SETTINGS_HINT_TOAST_SHOWN:
+                eventName = "settings_hint_toast_shown";
+                break;
+            case SETTINGS_LEARN_MORE_CLICKED:
+                eventName = "settings_learn_more_clicked";
+                break;
+            case SETTINGS_LEARN_MORE_LOADED:
+                eventName = "settings_learn_more_loaded";
+                break;
+            case SETTINGS_SAVED_REMOTELY:
+                eventName = "settings_saved_remotely";
+                break;
             default:
                 eventName = null;
                 break;

From 367389fb67738f3497d2bb113f6d93c82040378d Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Tue, 8 Dec 2015 16:28:41 -0800
Subject: [PATCH 21/63] Showing keyboard on input dialogs, fixing delete bug,
 editing design

---
 .../android/ui/prefs/SiteSettingsFragment.java      |  2 +-
 .../android/ui/prefs/SummaryEditTextPreference.java | 13 ++++++++++++-
 .../src/main/res/layout/number_picker_dialog.xml    | 10 +++++-----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index bd4402c321a0..ea1ec492bdec 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -821,7 +821,7 @@ public boolean onDeleteRequested() {
                 ListAdapter adapter = list.getAdapter();
                 for (int i = 0; i < checkedItems.size(); i++) {
                     final int index = checkedItems.keyAt(i);
-                    if (checkedItems.get(index) && mEditingList.size() > index) {
+                    if (checkedItems.get(index)) {
                         mEditingList.remove(adapter.getItem(index).toString());
                     }
                 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SummaryEditTextPreference.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SummaryEditTextPreference.java
index ae0cc10d1f66..433f4e426bc0 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SummaryEditTextPreference.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SummaryEditTextPreference.java
@@ -7,6 +7,7 @@
 import android.content.res.TypedArray;
 import android.graphics.Typeface;
 import android.os.Bundle;
+import android.os.Handler;
 import android.preference.EditTextPreference;
 import android.support.annotation.NonNull;
 import android.support.v7.app.AlertDialog;
@@ -15,6 +16,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
@@ -37,6 +39,8 @@
  */
 
 public class SummaryEditTextPreference extends EditTextPreference implements PreferenceHint {
+    private static final long SHOW_KEYBOARD_DELAY = 250;
+
     private int mLines;
     private int mMaxLines;
     private String mHint;
@@ -164,7 +168,7 @@ protected void showDialog(Bundle state) {
     }
 
     @Override
-    protected void onBindDialogView(View view) {
+    protected void onBindDialogView(final View view) {
         super.onBindDialogView(view);
 
         if (view != null) {
@@ -184,6 +188,13 @@ protected void onBindDialogView(View view) {
             editText.setSelection(editText.getText().length());
             editText.setTypeface(typeface);
             editText.setTextColor(getContext().getResources().getColor(R.color.grey_dark));
+            editText.requestFocusFromTouch();
+            (new Handler()).postDelayed(new Runnable() {
+                public void run() {
+                    InputMethodManager inputMethodManager = (InputMethodManager) view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+                    inputMethodManager.toggleSoftInputFromWindow(view.getWindowToken(), InputMethodManager.SHOW_FORCED, 0);
+                }
+            }, SHOW_KEYBOARD_DELAY);
         }
     }
 
diff --git a/WordPress/src/main/res/layout/number_picker_dialog.xml b/WordPress/src/main/res/layout/number_picker_dialog.xml
index 91450fb00de9..5d5a4fc01602 100644
--- a/WordPress/src/main/res/layout/number_picker_dialog.xml
+++ b/WordPress/src/main/res/layout/number_picker_dialog.xml
@@ -7,11 +7,6 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/grey_lighten_30" />
-
     <org.wordpress.android.widgets.WPSwitch
         android:id="@+id/number_picker_switch"
         android:layout_width="match_parent"
@@ -45,6 +40,11 @@
         app:fontFamily="openSans"
         app:fontVariation="normal" />
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/grey_lighten_30" />
+
     <org.wordpress.android.ui.WPNumberPicker
         android:id="@+id/number_picker"
         android:layout_width="match_parent"

From 93b7e775cee9def2efe9ddf2167a1ceb1f4aa577 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Wed, 9 Dec 2015 12:48:37 -0800
Subject: [PATCH 22/63] Fixing subscreen header fonts

---
 .../ui/prefs/SiteSettingsFragment.java        | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index ea1ec492bdec..a6e713eb6b52 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -67,6 +67,7 @@ public class SiteSettingsFragment extends PreferenceFragment
         implements Preference.OnPreferenceChangeListener,
                    Preference.OnPreferenceClickListener,
                    AdapterView.OnItemLongClickListener,
+                   ViewGroup.OnHierarchyChangeListener,
                    Dialog.OnDismissListener,
                    SiteSettingsInterface.SiteSettingsListener {
 
@@ -181,22 +182,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
             Resources res = getResources();
 
             if (prefList != null && res != null) {
-                prefList.setOnHierarchyChangeListener(new ViewGroup.OnHierarchyChangeListener() {
-                    @Override
-                    public void onChildViewAdded(View parent, View child) {
-                        if (child.getId() == android.R.id.title && child instanceof TextView) {
-                            TextView title = (TextView) child;
-                            WPPrefUtils.layoutAsBody2(title);
-                        } else {
-                            TextView title = (TextView) child.findViewById(android.R.id.title);
-                            WPPrefUtils.layoutAsSubhead(title);
-                        }
-                    }
-
-                    @Override
-                    public void onChildViewRemoved(View parent, View child) {
-                    }
-                });
+                prefList.setOnHierarchyChangeListener(this);
                 prefList.setOnItemLongClickListener(this);
                 prefList.setFooterDividersEnabled(false);
                 //noinspection deprecation
@@ -207,6 +193,21 @@ public void onChildViewRemoved(View parent, View child) {
         return view;
     }
 
+    @Override
+    public void onChildViewAdded(View parent, View child) {
+        if (child.getId() == android.R.id.title && child instanceof TextView) {
+            TextView title = (TextView) child;
+            WPPrefUtils.layoutAsBody2(title);
+        } else {
+            TextView title = (TextView) child.findViewById(android.R.id.title);
+            if (title != null) WPPrefUtils.layoutAsSubhead(title);
+        }
+    }
+
+    @Override
+    public void onChildViewRemoved(View parent, View child) {
+    }
+
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference preference) {
         super.onPreferenceTreeClick(screen, preference);
@@ -218,6 +219,7 @@ public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference prefere
             Dialog dialog = ((PreferenceScreen) preference).getDialog();
             if (dialog != null) {
                 ListView prefList = (ListView) dialog.findViewById(android.R.id.list);
+                prefList.setOnHierarchyChangeListener(this);
                 prefList.setOnItemLongClickListener(this);
                 String title = getString(R.string.site_settings_discussion_title);
                 WPActivityUtils.addToolbarToDialog(this, dialog, title);

From 9383f4f7c680b335f52f4fe3266b1b67892325fa Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Wed, 9 Dec 2015 13:49:25 -0800
Subject: [PATCH 23/63] Updating analytics based on feedback from PR

---
 .../android/ui/prefs/DotComSiteSettings.java  | 19 ++++++++---
 .../android/ui/prefs/LearnMorePreference.java |  4 +--
 .../ui/prefs/SelfHostedSiteSettings.java      | 18 ++++++++---
 .../ui/prefs/SiteSettingsFragment.java        | 10 +++---
 .../android/analytics/AnalyticsTracker.java   | 16 +++++-----
 .../analytics/AnalyticsTrackerMixpanel.java   | 16 +++++-----
 .../analytics/AnalyticsTrackerNosara.java     | 32 +++++++++----------
 7 files changed, 68 insertions(+), 47 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java
index 50f4eaef55e0..6a05baa1948a 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java
@@ -19,6 +19,8 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 
 class DotComSiteSettings extends SiteSettingsInterface {
@@ -89,10 +91,19 @@ public void onResponse(JSONObject response) {
                         AppLog.d(AppLog.T.API, "Site Settings saved remotely");
                         notifySavedOnUiThread(null);
                         mRemoteSettings.copyFrom(mSettings);
-                        HashMap<String, Object> properties = new HashMap<>();
-                        properties.put("items_saved", response);
-                        AnalyticsUtils.trackWithCurrentBlogDetails(
-                                AnalyticsTracker.Stat.SETTINGS_SAVED_REMOTELY, properties);
+
+                        if (response != null) {
+                            List<String> itemKeys = new ArrayList<>();
+                            JSONObject updated = response.optJSONObject("updated");
+                            if (updated == null) return;
+                            Iterator<String> keys = updated.keys();
+                            while (keys.hasNext()) itemKeys.add(keys.next());
+
+                            HashMap<String, Object> properties = new HashMap<>();
+                            properties.put("items_saved", itemKeys);
+                            AnalyticsUtils.trackWithCurrentBlogDetails(
+                                    AnalyticsTracker.Stat.SITE_SETTINGS_SAVED_REMOTELY, properties);
+                        }
                     }
                 }, new RestRequest.ErrorListener() {
                     @Override
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/LearnMorePreference.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/LearnMorePreference.java
index 371a26c66952..e9a98e049ad6 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/LearnMorePreference.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/LearnMorePreference.java
@@ -43,7 +43,7 @@ public void onClick(View v) {
         if (mDialog != null) return;
 
         AnalyticsUtils.trackWithCurrentBlogDetails(
-                AnalyticsTracker.Stat.SETTINGS_LEARN_MORE_CLICKED);
+                AnalyticsTracker.Stat.SITE_SETTINGS_LEARN_MORE_CLICKED);
 
         Context context = getContext();
         mDialog = new Dialog(context);
@@ -57,7 +57,7 @@ public void onPageFinished(WebView webView, String url) {
                 super.onPageFinished(webView, url);
                 if (mDialog != null) {
                     AnalyticsUtils.trackWithCurrentBlogDetails(
-                            AnalyticsTracker.Stat.SETTINGS_LEARN_MORE_LOADED);
+                            AnalyticsTracker.Stat.SITE_SETTINGS_LEARN_MORE_LOADED);
                     mDialog.setContentView(webView);
                 }
             }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java
index 52a45dbe22f7..b91b84a00041 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java
@@ -19,8 +19,10 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 
 class SelfHostedSiteSettings extends SiteSettingsInterface {
     // XML-RPC wp.getOptions keys
@@ -88,10 +90,18 @@ public void saveSettings() {
             public void onSuccess(long id, final Object result) {
                 notifySavedOnUiThread(null);
                 mRemoteSettings.copyFrom(mSettings);
-                HashMap<String, Object> properties = new HashMap<>();
-                properties.put("items_saved", result);
-                AnalyticsUtils.trackWithCurrentBlogDetails(
-                        AnalyticsTracker.Stat.SETTINGS_SAVED_REMOTELY, properties);
+
+                if (result != null) {
+                    HashMap<String, Object> properties = new HashMap<>();
+                    if (result instanceof Map) {
+                        Set keys = ((Map) result).keySet();
+                        List keyList = new ArrayList();
+                        for (Object key : keys) keyList.add(key);
+                        properties.put("items_saved", keyList);
+                    }
+                    AnalyticsUtils.trackWithCurrentBlogDetails(
+                            AnalyticsTracker.Stat.SITE_SETTINGS_SAVED_REMOTELY, properties);
+                }
             }
 
             @Override
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index a6e713eb6b52..cdad451a0948 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -127,7 +127,7 @@ public void onCreate(Bundle savedInstanceState) {
         }
 
         AnalyticsUtils.trackWithCurrentBlogDetails(
-                AnalyticsTracker.Stat.SETTINGS_ACCESSED_SITE_SETTINGS);
+                AnalyticsTracker.Stat.SITE_SETTINGS_ACCESSED);
 
         mShouldFetch = true;
         mSiteSettings = SiteSettingsInterface.getInterface(getActivity(), mBlog, this);
@@ -215,7 +215,7 @@ public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference prefere
         // Add Action Bar to sub-screens
         if (preference == findPreference(getString(R.string.pref_key_site_more_discussion))) {
             AnalyticsUtils.trackWithCurrentBlogDetails(
-                    AnalyticsTracker.Stat.SETTINGS_ACCESSED_MORE_SETTINGS);
+                    AnalyticsTracker.Stat.SITE_SETTINGS_ACCESSED_MORE_SETTINGS);
             Dialog dialog = ((PreferenceScreen) preference).getDialog();
             if (dialog != null) {
                 ListView prefList = (ListView) dialog.findViewById(android.R.id.list);
@@ -355,7 +355,7 @@ public boolean onItemLongClick(AdapterView<?> parent, View view, int position, l
                     HashMap<String, Object> properties = new HashMap<>();
                     properties.put("hint_shown", hintObj.getHint());
                     AnalyticsUtils.trackWithCurrentBlogDetails(
-                            AnalyticsTracker.Stat.SETTINGS_HINT_TOAST_SHOWN, properties);
+                            AnalyticsTracker.Stat.SITE_SETTINGS_HINT_TOAST_SHOWN, properties);
                     ToastUtils.showToast(getActivity(), hintObj.getHint(), ToastUtils.Duration.SHORT);
                 }
                 return true;
@@ -818,7 +818,7 @@ public boolean onDeleteRequested() {
                 HashMap<String, Object> properties = new HashMap<>();
                 properties.put("num_items_deleted", checkedItems.size());
                 AnalyticsUtils.trackWithCurrentBlogDetails(
-                        AnalyticsTracker.Stat.SETTINGS_DELETED_LIST_ITEMS, properties);
+                        AnalyticsTracker.Stat.SITE_SETTINGS_DELETED_LIST_ITEMS, properties);
 
                 ListAdapter adapter = list.getAdapter();
                 for (int i = 0; i < checkedItems.size(); i++) {
@@ -856,7 +856,7 @@ public void onClick(DialogInterface dialog, int which) {
                                     R.layout.wp_simple_list_item_1,
                                     mEditingList));
                             AnalyticsUtils.trackWithCurrentBlogDetails(
-                                    AnalyticsTracker.Stat.SETTINGS_ADDED_LIST_ITEM);
+                                    AnalyticsTracker.Stat.SITE_SETTINGS_ADDED_LIST_ITEM);
                         }
                     }
                 });
diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java
index 37de363ff6de..fdad9513aa1d 100644
--- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java
+++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java
@@ -120,14 +120,14 @@ public enum Stat {
         THEMES_SUPPORT_ACCESSED,
         THEMES_DETAILS_ACCESSED,
         SETTINGS_LANGUAGE_SELECTION_FORCED,
-        SETTINGS_ACCESSED_SITE_SETTINGS,
-        SETTINGS_ACCESSED_MORE_SETTINGS,
-        SETTINGS_LEARN_MORE_CLICKED,
-        SETTINGS_LEARN_MORE_LOADED,
-        SETTINGS_ADDED_LIST_ITEM,
-        SETTINGS_DELETED_LIST_ITEMS,
-        SETTINGS_SAVED_REMOTELY,
-        SETTINGS_HINT_TOAST_SHOWN,
+        SITE_SETTINGS_ACCESSED,
+        SITE_SETTINGS_ACCESSED_MORE_SETTINGS,
+        SITE_SETTINGS_LEARN_MORE_CLICKED,
+        SITE_SETTINGS_LEARN_MORE_LOADED,
+        SITE_SETTINGS_ADDED_LIST_ITEM,
+        SITE_SETTINGS_DELETED_LIST_ITEMS,
+        SITE_SETTINGS_SAVED_REMOTELY,
+        SITE_SETTINGS_HINT_TOAST_SHOWN,
     }
 
     private static final List<Tracker> TRACKERS = new ArrayList<>();
diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java
index ea481eaf9ef3..6b1ced698e7f 100644
--- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java
+++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java
@@ -791,42 +791,42 @@ private AnalyticsTrackerMixpanelInstructionsForStat instructionsForStat(
                 instructions = AnalyticsTrackerMixpanelInstructionsForStat.
                         mixpanelInstructionsForEventName("Settings - Forced Language Selection");
                 break;
-            case SETTINGS_ACCESSED_SITE_SETTINGS:
+            case SITE_SETTINGS_ACCESSED:
                 instructions = AnalyticsTrackerMixpanelInstructionsForStat.
                         mixpanelInstructionsForEventName("Settings - Site Settings Accessed");
                 instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_times_settings_accessed");
                 break;
-            case SETTINGS_ACCESSED_MORE_SETTINGS:
+            case SITE_SETTINGS_ACCESSED_MORE_SETTINGS:
                 instructions = AnalyticsTrackerMixpanelInstructionsForStat.
                         mixpanelInstructionsForEventName("Settings - More Settings Accessed");
                 instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_times_more_settings_accessed");
                 break;
-            case SETTINGS_ADDED_LIST_ITEM:
+            case SITE_SETTINGS_ADDED_LIST_ITEM:
                 instructions = AnalyticsTrackerMixpanelInstructionsForStat.
                         mixpanelInstructionsForEventName("Settings - Added List Item");
                 instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_list_items_added");
                 break;
-            case SETTINGS_DELETED_LIST_ITEMS:
+            case SITE_SETTINGS_DELETED_LIST_ITEMS:
                 instructions = AnalyticsTrackerMixpanelInstructionsForStat.
                         mixpanelInstructionsForEventName("Settings - Site Deleted List Items");
                 instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_times_list_items_were_deleted");
                 break;
-            case SETTINGS_HINT_TOAST_SHOWN:
+            case SITE_SETTINGS_HINT_TOAST_SHOWN:
                 instructions = AnalyticsTrackerMixpanelInstructionsForStat.
                         mixpanelInstructionsForEventName("Settings - Preference Hint Shown");
                 instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_preference_hints_viewed");
                 break;
-            case SETTINGS_LEARN_MORE_CLICKED:
+            case SITE_SETTINGS_LEARN_MORE_CLICKED:
                 instructions = AnalyticsTrackerMixpanelInstructionsForStat.
                         mixpanelInstructionsForEventName("Settings - Learn More Clicked");
                 instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_times_learn_more_clicked");
                 break;
-            case SETTINGS_LEARN_MORE_LOADED:
+            case SITE_SETTINGS_LEARN_MORE_LOADED:
                 instructions = AnalyticsTrackerMixpanelInstructionsForStat.
                         mixpanelInstructionsForEventName("Settings - Learn More Loaded");
                 instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_times_learn_more_seen");
                 break;
-            case SETTINGS_SAVED_REMOTELY:
+            case SITE_SETTINGS_SAVED_REMOTELY:
                 instructions = AnalyticsTrackerMixpanelInstructionsForStat.
                         mixpanelInstructionsForEventName("Settings - Saved Remotely");
                 instructions.setSuperPropertyAndPeoplePropertyToIncrement("number_of_times_settings_updated_remotely");
diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java
index 3300f4d092bc..d3006e0f762c 100644
--- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java
+++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java
@@ -375,29 +375,29 @@ public void track(AnalyticsTracker.Stat stat, Map<String, ?> properties) {
             case SETTINGS_LANGUAGE_SELECTION_FORCED:
                 eventName = "settings_language_selection_forced";
                 break;
-            case SETTINGS_ACCESSED_SITE_SETTINGS:
-                eventName = "settings_site_settings_accessed";
+            case SITE_SETTINGS_ACCESSED:
+                eventName = "site_settings_accessed";
                 break;
-            case SETTINGS_ACCESSED_MORE_SETTINGS:
-                eventName = "settings_more_settings_accessed";
+            case SITE_SETTINGS_ACCESSED_MORE_SETTINGS:
+                eventName = "site_settings_more_settings_accessed";
                 break;
-            case SETTINGS_ADDED_LIST_ITEM:
-                eventName = "settings_added_list_item";
+            case SITE_SETTINGS_ADDED_LIST_ITEM:
+                eventName = "site_settings_added_list_item";
                 break;
-            case SETTINGS_DELETED_LIST_ITEMS:
-                eventName = "settings_deleted_list_items";
+            case SITE_SETTINGS_DELETED_LIST_ITEMS:
+                eventName = "site_settings_deleted_list_items";
                 break;
-            case SETTINGS_HINT_TOAST_SHOWN:
-                eventName = "settings_hint_toast_shown";
+            case SITE_SETTINGS_HINT_TOAST_SHOWN:
+                eventName = "site_settings_hint_toast_shown";
                 break;
-            case SETTINGS_LEARN_MORE_CLICKED:
-                eventName = "settings_learn_more_clicked";
+            case SITE_SETTINGS_LEARN_MORE_CLICKED:
+                eventName = "site_settings_learn_more_clicked";
                 break;
-            case SETTINGS_LEARN_MORE_LOADED:
-                eventName = "settings_learn_more_loaded";
+            case SITE_SETTINGS_LEARN_MORE_LOADED:
+                eventName = "site_settings_learn_more_loaded";
                 break;
-            case SETTINGS_SAVED_REMOTELY:
-                eventName = "settings_saved_remotely";
+            case SITE_SETTINGS_SAVED_REMOTELY:
+                eventName = "site_settings_saved_remotely";
                 break;
             default:
                 eventName = null;

From 857d8ee51f2b5449146639bf453127818487d837 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Wed, 9 Dec 2015 15:51:54 -0800
Subject: [PATCH 24/63] Cleaning up the code, re-using dialog creation work

---
 .../ui/prefs/SiteSettingsFragment.java        | 133 +++++++++---------
 .../ui/prefs/SummaryEditTextPreference.java   |  72 +++-------
 .../wordpress/android/util/WPPrefUtils.java   |   1 +
 WordPress/src/main/res/values/strings.xml     |   2 +
 4 files changed, 93 insertions(+), 115 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index cdad451a0948..729316ae25a6 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -84,6 +84,7 @@ public class SiteSettingsFragment extends PreferenceFragment
     private List<String> mEditingList;
     private boolean mBlogDeleted;
     private boolean mShouldFetch;
+    private NumberPicker mNumberPicker;
 
     private EditTextPreference mTitlePref;
     private EditTextPreference mTaglinePref;
@@ -481,82 +482,88 @@ private View getDialogTitleView(int title) {
     }
 
     private void showPagingDialog() {
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.Calypso_AlertDialog);
-        View view = View.inflate(getActivity(), R.layout.number_picker_dialog, null);
-
-        SwitchCompat switchView = (SwitchCompat) view.findViewById(R.id.number_picker_switch);
-        switchView.setText(R.string.site_settings_paging_title);
-
-        TextView detailText = (TextView) view.findViewById(R.id.number_picker_text);
-        detailText.setText(R.string.paging_description);
-
-        final NumberPicker numberPicker = (NumberPicker) view.findViewById(R.id.number_picker);
-        numberPicker.setMinValue(1);
-        numberPicker.setMaxValue(getResources().getInteger(R.integer.paging_limit));
-        numberPicker.setValue(Math.max(numberPicker.getMinValue(), Math.min(numberPicker.getMaxValue(), mSiteSettings.getPagingCount())));
-
-        builder.setCustomTitle(getDialogTitleView(R.string.site_settings_paging_title));
-        builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                if (mSiteSettings.getPagingCount() != numberPicker.getValue()) {
-                    onPreferenceChange(mPagingPref, numberPicker.getValue());
-                }
-            }
-        });
-        builder.setNegativeButton(R.string.cancel, null);
-        builder.setView(view);
-        builder.create().show();
+        getNumberPickerDialog(true,
+                R.string.site_settings_paging_title,
+                R.string.paging_description,
+                0,
+                getResources().getInteger(R.integer.paging_limit),
+                mSiteSettings.getPagingCount(),
+                R.string.site_settings_paging_title,
+                new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        if (mSiteSettings.getPagingCount() != mNumberPicker.getValue()) {
+                            onPreferenceChange(mPagingPref, mNumberPicker.getValue());
+                        }
+                    }
+                }, null).show();
     }
 
     private void showCloseAfterDialog() {
+        getNumberPickerDialog(true,
+                R.string.close_after_switch_text,
+                R.string.close_after_description,
+                0,
+                getResources().getInteger(R.integer.close_after_limit),
+                mSiteSettings.getCloseAfter(),
+                R.string.site_settings_close_after_title,
+                new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        if (mSiteSettings.getCloseAfter() != mNumberPicker.getValue()) {
+                            onPreferenceChange(mCloseAfterPref, mNumberPicker.getValue());
+                        }
+                    }
+                }, null).show();
+    }
+
+    private Dialog getNumberPickerDialog(boolean showSwitch,
+                                         int switchText,
+                                         int detail,
+                                         int min,
+                                         int max,
+                                         int cur,
+                                         int title,
+                                         DialogInterface.OnClickListener positive,
+                                         DialogInterface.OnClickListener negative) {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.Calypso_AlertDialog);
         View view = View.inflate(getActivity(), R.layout.number_picker_dialog, null);
-
-        view.findViewById(R.id.number_picker_text).setVisibility(View.GONE);
-        view.findViewById(R.id.number_picker_switch).setVisibility(View.GONE);
-
-        final NumberPicker numberPicker = (NumberPicker) view.findViewById(R.id.number_picker);
-        numberPicker.setMinValue(0);
-        numberPicker.setMaxValue(getResources().getInteger(R.integer.close_after_limit));
-        numberPicker.setValue(Math.max(numberPicker.getMinValue(), Math.min(numberPicker.getMaxValue(), mSiteSettings.getCloseAfter())));
-
-        builder.setCustomTitle(getDialogTitleView(R.string.site_settings_close_after_title));
-        builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                if (mSiteSettings.getCloseAfter() != numberPicker.getValue()) {
-                    onPreferenceChange(mCloseAfterPref, numberPicker.getValue());
-                }
-            }
-        });
-        builder.setNegativeButton(R.string.cancel, null);
+        SwitchCompat pickerSwitch = (SwitchCompat) view.findViewById(R.id.number_picker_switch);
+        if (showSwitch) {
+            pickerSwitch.setVisibility(View.VISIBLE);
+            pickerSwitch.setText(switchText);
+        } else {
+            pickerSwitch.setVisibility(View.GONE);
+        }
+        mNumberPicker = (NumberPicker) view.findViewById(R.id.number_picker);
+        TextView detailText = (TextView) view.findViewById(R.id.number_picker_text);
+        detailText.setText(detail);
+        mNumberPicker.setMinValue(min);
+        mNumberPicker.setMaxValue(max);
+        mNumberPicker.setValue(cur);
+        builder.setCustomTitle(getDialogTitleView(title));
+        builder.setPositiveButton(R.string.ok, positive);
+        builder.setNegativeButton(R.string.cancel, negative);
         builder.setView(view);
-        builder.create().show();
+        return builder.create();
     }
 
     private void showMultipleLinksDialog() {
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.Calypso_AlertDialog);
-        View view = View.inflate(getActivity(), R.layout.number_picker_dialog, null);
-        view.findViewById(R.id.number_picker_switch).setVisibility(View.GONE);
-        final NumberPicker numberPicker = (NumberPicker) view.findViewById(R.id.number_picker);
-        TextView detailText = (TextView) view.findViewById(R.id.number_picker_text);
-        detailText.setText(R.string.multiple_links_description);
-        numberPicker.setMinValue(0);
-        numberPicker.setMaxValue(getResources().getInteger(R.integer.max_links_limit));
-        numberPicker.setValue(Math.max(numberPicker.getMinValue(), Math.min(numberPicker.getMaxValue(), mSiteSettings.getMultipleLinks())));
-        builder.setCustomTitle(getDialogTitleView(R.string.site_settings_multiple_links_title));
-        builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+        getNumberPickerDialog(false,
+                -1,
+                R.string.multiple_links_description,
+                0,
+                getResources().getInteger(R.integer.max_links_limit),
+                mSiteSettings.getMultipleLinks(),
+                R.string.site_settings_multiple_links_title,
+                new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
-                if (mSiteSettings.getMultipleLinks() != numberPicker.getValue()) {
-                    onPreferenceChange(mMultipleLinksPref, numberPicker.getValue());
+                if (mSiteSettings.getMultipleLinks() != mNumberPicker.getValue()) {
+                    onPreferenceChange(mMultipleLinksPref, mNumberPicker.getValue());
                 }
             }
-        });
-        builder.setNegativeButton(R.string.cancel, null);
-        builder.setView(view);
-        builder.create().show();
+        }, null).show();
     }
 
     private void setPreferencesFromSiteSettings() {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SummaryEditTextPreference.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SummaryEditTextPreference.java
index 433f4e426bc0..1a95540c892f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SummaryEditTextPreference.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SummaryEditTextPreference.java
@@ -1,11 +1,9 @@
 package org.wordpress.android.ui.prefs;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
-import android.graphics.Typeface;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.EditTextPreference;
@@ -22,8 +20,7 @@
 import android.widget.TextView;
 
 import org.wordpress.android.R;
-import org.wordpress.android.util.ActivityUtils;
-import org.wordpress.android.widgets.TypefaceCache;
+import org.wordpress.android.util.WPPrefUtils;
 
 /**
  * Standard EditTextPreference that has attributes to limit summary length.
@@ -45,6 +42,7 @@ public class SummaryEditTextPreference extends EditTextPreference implements Pre
     private int mMaxLines;
     private String mHint;
     private AlertDialog mDialog;
+    private int mWhichButtonClicked;
 
     public SummaryEditTextPreference(Context context) {
         super(context);
@@ -80,33 +78,13 @@ public SummaryEditTextPreference(Context context, AttributeSet attrs) {
     protected void onBindView(@NonNull View view) {
         super.onBindView(view);
 
-        Resources res = getContext().getResources();
         TextView titleView = (TextView) view.findViewById(android.R.id.title);
         TextView summaryView = (TextView) view.findViewById(android.R.id.summary);
-        Typeface font = TypefaceCache.getTypeface(getContext(),
-                TypefaceCache.FAMILY_OPEN_SANS,
-                Typeface.NORMAL,
-                TypefaceCache.VARIATION_NORMAL);
 
-        if (titleView != null) {
-            if (isEnabled()) {
-                titleView.setTextColor(res.getColor(R.color.grey_dark));
-            } else {
-                titleView.setTextColor(res.getColor(R.color.grey_lighten_10));
-            }
-            titleView.setTextSize(16);
-            titleView.setTypeface(font);
-        }
+        if (titleView != null) WPPrefUtils.layoutAsSubhead(titleView);
 
         if (summaryView != null) {
-            if (isEnabled()) {
-                summaryView.setTextColor(res.getColor(R.color.grey_darken_10));
-            } else {
-                summaryView.setTextColor(res.getColor(R.color.grey_lighten_10));
-            }
-            summaryView.setInputType(getEditText().getInputType());
-            summaryView.setTextSize(14);
-            summaryView.setTypeface(font);
+            WPPrefUtils.layoutAsBody1(summaryView);
             summaryView.setEllipsize(TextUtils.TruncateAt.END);
             if (mLines != -1) summaryView.setLines(mLines);
             if (mMaxLines != -1) summaryView.setMaxLines(mMaxLines);
@@ -119,6 +97,7 @@ protected void showDialog(Bundle state) {
         Resources res = context.getResources();
         AlertDialog.Builder builder = new AlertDialog.Builder(context, R.style.Calypso_AlertDialog);
         View titleView = View.inflate(getContext(), R.layout.detail_list_preference_title, null);
+        mWhichButtonClicked = DialogInterface.BUTTON_NEGATIVE;
 
         builder.setPositiveButton(R.string.ok, this);
         builder.setNegativeButton(res.getString(R.string.cancel).toUpperCase(), this);
@@ -149,22 +128,8 @@ protected void showDialog(Bundle state) {
 
         Button positive = mDialog.getButton(DialogInterface.BUTTON_POSITIVE);
         Button negative = mDialog.getButton(DialogInterface.BUTTON_NEGATIVE);
-        Typeface typeface = TypefaceCache.getTypeface(getContext(),
-                TypefaceCache.FAMILY_OPEN_SANS,
-                Typeface.BOLD,
-                TypefaceCache.VARIATION_LIGHT);
-
-        if (positive != null) {
-            //noinspection deprecation
-            positive.setTextColor(res.getColor(R.color.blue_medium));
-            positive.setTypeface(typeface);
-        }
-
-        if (negative != null) {
-            //noinspection deprecation
-            negative.setTextColor(res.getColor(R.color.blue_medium));
-            negative.setTypeface(typeface);
-        }
+        if (positive != null) WPPrefUtils.layoutAsFlatButton(positive);
+        if (negative != null) WPPrefUtils.layoutAsFlatButton(negative);
     }
 
     @Override
@@ -172,10 +137,6 @@ protected void onBindDialogView(final View view) {
         super.onBindDialogView(view);
 
         if (view != null) {
-            Typeface typeface = TypefaceCache.getTypeface(getContext(),
-                    TypefaceCache.FAMILY_OPEN_SANS,
-                    Typeface.NORMAL,
-                    TypefaceCache.VARIATION_NORMAL);
             EditText editText = getEditText();
             ViewParent oldParent = editText.getParent();
             if (oldParent != view) {
@@ -185,29 +146,36 @@ protected void onBindDialogView(final View view) {
                 ((View) oldParent).setPadding(((View) oldParent).getPaddingLeft(), 0, ((View) oldParent).getPaddingRight(), ((View) oldParent).getPaddingBottom());
                 onAddEditTextToDialogView(view, editText);
             }
+            WPPrefUtils.layoutAsInput(editText);
             editText.setSelection(editText.getText().length());
-            editText.setTypeface(typeface);
-            editText.setTextColor(getContext().getResources().getColor(R.color.grey_dark));
-            editText.requestFocusFromTouch();
             (new Handler()).postDelayed(new Runnable() {
                 public void run() {
                     InputMethodManager inputMethodManager = (InputMethodManager) view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
-                    inputMethodManager.toggleSoftInputFromWindow(view.getWindowToken(), InputMethodManager.SHOW_FORCED, 0);
+                    inputMethodManager.toggleSoftInputFromWindow(view.getWindowToken(), InputMethodManager.SHOW_IMPLICIT, 0);
                 }
             }, SHOW_KEYBOARD_DELAY);
         }
     }
 
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        mWhichButtonClicked = which;
+    }
+
     @Override
     public void onDismiss(DialogInterface dialog) {
+        InputMethodManager inputMethodManager = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+        inputMethodManager.toggleSoftInputFromWindow(mDialog.getCurrentFocus().getWindowToken(), InputMethodManager.HIDE_IMPLICIT_ONLY, 0);
+        onDialogClosed(mWhichButtonClicked == DialogInterface.BUTTON_POSITIVE);
         mDialog = null;
-        onDialogClosed(false);
     }
 
     @Override
     protected void onDialogClosed(boolean positiveResult) {
         super.onDialogClosed(positiveResult);
-        ActivityUtils.hideKeyboard((Activity) getContext());
+        if (positiveResult) {
+            callChangeListener(getEditText().getText());
+        }
     }
 
     @Override
diff --git a/WordPress/src/main/java/org/wordpress/android/util/WPPrefUtils.java b/WordPress/src/main/java/org/wordpress/android/util/WPPrefUtils.java
index 2b3aad71f128..1a6d11dbc994 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/WPPrefUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/util/WPPrefUtils.java
@@ -108,6 +108,7 @@ public static void layoutAsInput(EditText view) {
         int size = view.getResources().getDimensionPixelSize(R.dimen.text_sz_large);
         setTextViewAttributes(view, size, R.color.grey_dark, getNormalTypeface(view.getContext()));
         view.setHintTextColor(view.getResources().getColor(R.color.grey_lighten_10));
+        view.setTextColor(view.getResources().getColor(R.color.grey_dark));
     }
 
     /**
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index 783dac245943..9aa126ddb027 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -551,6 +551,8 @@
     <string name="hold_for_moderation_description">When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the moderation queue. You can enter partial words, so \"press\" will match \"WordPress.\"</string>
     <string name="blacklist_description">When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be marked as spam. You can enter partial words, so \"press\" will match \"WordPress.\"</string>
     <string name="paging_description">Break comment threads into multiple pages.</string>
+    <string name="close_after_description">Automatically close comments on articles.</string>
+    <string name="close_after_switch_text">Automatically close</string>
     <string name="multiple_links_description">Require approval for comments that include more than this number of links.</string>
     <string name="oldest_first">Oldest first</string>
     <string name="newest_first">Newest first</string>

From 9d3c246ad3a4d1f8503ce90c6f78557e7fa6487c Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Wed, 9 Dec 2015 17:28:52 -0800
Subject: [PATCH 25/63] Changing number picker dialog font colors when toggling
 switch

---
 .../wordpress/android/ui/WPNumberPicker.java  |  3 +
 .../ui/prefs/SiteSettingsFragment.java        | 62 +++++++++++++------
 .../main/res/color/number_picker_title.xml    | 12 ++++
 .../main/res/layout/number_picker_dialog.xml  | 58 ++++++++++-------
 WordPress/src/main/res/values/strings.xml     |  3 +
 5 files changed, 95 insertions(+), 43 deletions(-)
 create mode 100644 WordPress/src/main/res/color/number_picker_title.xml

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java b/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
index 8be0e2c66955..0826b168ab2d 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
@@ -84,6 +84,9 @@ protected void onDraw(Canvas canvas) {
         paint.setTextAlign(Paint.Align.CENTER);
         //noinspection deprecation
         paint.setColor(getResources().getColor(R.color.blue_medium));
+        int alpha = isEnabled() ? 255 : 96;
+        paint.setAlpha(alpha);
+        mPaint.setAlpha(alpha);
 
         // Draw the visible values
         for (int i = 0; i < DISPLAY_COUNT; ++i) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index 729316ae25a6..747379b92a39 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -30,6 +30,7 @@
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
+import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ListAdapter;
 import android.widget.ListView;
@@ -483,8 +484,10 @@ private View getDialogTitleView(int title) {
 
     private void showPagingDialog() {
         getNumberPickerDialog(true,
+                mSiteSettings.getPagingCount() > 0,
                 R.string.site_settings_paging_title,
                 R.string.paging_description,
+                R.string.paging_header,
                 0,
                 getResources().getInteger(R.integer.paging_limit),
                 mSiteSettings.getPagingCount(),
@@ -501,12 +504,14 @@ public void onClick(DialogInterface dialog, int which) {
 
     private void showCloseAfterDialog() {
         getNumberPickerDialog(true,
+                mSiteSettings.getCloseAfter() > 0,
                 R.string.close_after_switch_text,
                 R.string.close_after_description,
+                R.string.close_after_header,
                 0,
                 getResources().getInteger(R.integer.close_after_limit),
                 mSiteSettings.getCloseAfter(),
-                R.string.site_settings_close_after_title,
+                R.string.site_settings_close_after_dialog_title,
                 new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
@@ -517,9 +522,31 @@ public void onClick(DialogInterface dialog, int which) {
                 }, null).show();
     }
 
+    private void showMultipleLinksDialog() {
+        getNumberPickerDialog(false,
+                false,
+                -1,
+                R.string.multiple_links_description,
+                -1,
+                0,
+                getResources().getInteger(R.integer.max_links_limit),
+                mSiteSettings.getMultipleLinks(),
+                R.string.site_settings_multiple_links_title,
+                new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                if (mSiteSettings.getMultipleLinks() != mNumberPicker.getValue()) {
+                    onPreferenceChange(mMultipleLinksPref, mNumberPicker.getValue());
+                }
+            }
+        }, null).show();
+    }
+
     private Dialog getNumberPickerDialog(boolean showSwitch,
+                                         boolean switchChecked,
                                          int switchText,
                                          int detail,
+                                         int header,
                                          int min,
                                          int max,
                                          int cur,
@@ -528,15 +555,28 @@ private Dialog getNumberPickerDialog(boolean showSwitch,
                                          DialogInterface.OnClickListener negative) {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.Calypso_AlertDialog);
         View view = View.inflate(getActivity(), R.layout.number_picker_dialog, null);
+        mNumberPicker = (NumberPicker) view.findViewById(R.id.number_picker);
         SwitchCompat pickerSwitch = (SwitchCompat) view.findViewById(R.id.number_picker_switch);
         if (showSwitch) {
             pickerSwitch.setVisibility(View.VISIBLE);
             pickerSwitch.setText(switchText);
+            pickerSwitch.setChecked(switchChecked);
+            final View toggleContainer = view.findViewById(R.id.number_picker_toggleable);
+            toggleContainer.setEnabled(switchChecked);
+            mNumberPicker.setEnabled(switchChecked);
+            pickerSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+                @Override
+                public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                    toggleContainer.setEnabled(isChecked);
+                    mNumberPicker.setEnabled(isChecked);
+                }
+            });
         } else {
             pickerSwitch.setVisibility(View.GONE);
         }
-        mNumberPicker = (NumberPicker) view.findViewById(R.id.number_picker);
         TextView detailText = (TextView) view.findViewById(R.id.number_picker_text);
+        TextView headerText = (TextView) view.findViewById(R.id.number_picker_header);
+        headerText.setText(header);
         detailText.setText(detail);
         mNumberPicker.setMinValue(min);
         mNumberPicker.setMaxValue(max);
@@ -548,24 +588,6 @@ private Dialog getNumberPickerDialog(boolean showSwitch,
         return builder.create();
     }
 
-    private void showMultipleLinksDialog() {
-        getNumberPickerDialog(false,
-                -1,
-                R.string.multiple_links_description,
-                0,
-                getResources().getInteger(R.integer.max_links_limit),
-                mSiteSettings.getMultipleLinks(),
-                R.string.site_settings_multiple_links_title,
-                new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                if (mSiteSettings.getMultipleLinks() != mNumberPicker.getValue()) {
-                    onPreferenceChange(mMultipleLinksPref, mNumberPicker.getValue());
-                }
-            }
-        }, null).show();
-    }
-
     private void setPreferencesFromSiteSettings() {
         mLocationPref.setChecked(mSiteSettings.getLocation());
         changeEditTextPreferenceValue(mTitlePref, mSiteSettings.getTitle());
diff --git a/WordPress/src/main/res/color/number_picker_title.xml b/WordPress/src/main/res/color/number_picker_title.xml
new file mode 100644
index 000000000000..ad850970ea5e
--- /dev/null
+++ b/WordPress/src/main/res/color/number_picker_title.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:color="@color/grey_lighten_10"
+        android:state_enabled="false" />
+
+    <item android:color="@color/grey_dark" />
+
+</selector>
diff --git a/WordPress/src/main/res/layout/number_picker_dialog.xml b/WordPress/src/main/res/layout/number_picker_dialog.xml
index 5d5a4fc01602..72eb8f9685c7 100644
--- a/WordPress/src/main/res/layout/number_picker_dialog.xml
+++ b/WordPress/src/main/res/layout/number_picker_dialog.xml
@@ -13,10 +13,10 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="24dp"
         android:layout_marginRight="24dp"
-        android:textStyle="bold"
         android:textSize="@dimen/text_sz_large"
+        android:textColor="@color/number_picker_title"
         app:fontFamily="openSans"
-        app:fontVariation="light" />
+        app:fontVariation="normal" />
 
     <org.wordpress.android.widgets.WPTextView
         android:id="@+id/number_picker_text"
@@ -29,31 +29,43 @@
         app:fontFamily="openSans"
         app:fontVariation="normal" />
 
-    <org.wordpress.android.widgets.WPTextView
-        android:id="@+id/number_picker_title"
+    <LinearLayout
+        android:id="@+id/number_picker_toggleable"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="24dp"
-        android:layout_marginRight="24dp"
-        android:textSize="@dimen/text_sz_small"
-        android:textColor="@color/grey_darken_10"
-        app:fontFamily="openSans"
-        app:fontVariation="normal" />
+        android:orientation="vertical">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/grey_lighten_30" />
+        <org.wordpress.android.widgets.WPTextView
+            android:id="@+id/number_picker_header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="24dp"
+            android:layout_marginTop="18dp"
+            android:layout_marginRight="24dp"
+            android:layout_marginBottom="8dp"
+            android:duplicateParentState="true"
+            android:textSize="@dimen/text_sz_large"
+            android:textColor="@color/number_picker_title"
+            app:fontFamily="openSans"
+            app:fontVariation="normal" />
 
-    <org.wordpress.android.ui.WPNumberPicker
-        android:id="@+id/number_picker"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="36dp" />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/grey_lighten_30" />
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/grey_lighten_30" />
+        <org.wordpress.android.ui.WPNumberPicker
+            android:id="@+id/number_picker"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:duplicateParentState="true"
+            android:paddingTop="36dp" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/grey_lighten_30" />
+
+    </LinearLayout>
 
 </LinearLayout>
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index 9aa126ddb027..a1f2d66c0cb5 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -489,6 +489,7 @@
     <string name="site_settings_more_discussion_title">More</string>
     <string name="site_settings_comments_header">Comments</string>
     <string name="site_settings_close_after_title">Close after</string>
+    <string name="site_settings_close_after_dialog_title">Close commenting</string>
     <string name="site_settings_sort_by_title">Sort by</string>
     <string name="site_settings_threading_title">Threading</string>
     <string name="site_settings_paging_title">Paging</string>
@@ -551,6 +552,8 @@
     <string name="hold_for_moderation_description">When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the moderation queue. You can enter partial words, so \"press\" will match \"WordPress.\"</string>
     <string name="blacklist_description">When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be marked as spam. You can enter partial words, so \"press\" will match \"WordPress.\"</string>
     <string name="paging_description">Break comment threads into multiple pages.</string>
+    <string name="paging_header">Comments per page</string>
+    <string name="close_after_header">Close after</string>
     <string name="close_after_description">Automatically close comments on articles.</string>
     <string name="close_after_switch_text">Automatically close</string>
     <string name="multiple_links_description">Require approval for comments that include more than this number of links.</string>

From 3544f15f170339e15f2058f16ca733108b6235ad Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Wed, 9 Dec 2015 17:58:52 -0800
Subject: [PATCH 26/63] Formatting number picker display strings

---
 .../wordpress/android/ui/WPNumberPicker.java  | 14 +++++++++++++-
 .../ui/prefs/SiteSettingsFragment.java        | 19 +++++++++++++------
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java b/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
index 0826b168ab2d..b6467bb265ca 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
@@ -34,6 +34,7 @@ public class WPNumberPicker extends NumberPicker {
     private Field mCurrentOffset;
 
     private EditText mInputView;
+    private Formatter mFormatter;
     private Paint mPaint;
     private int[] mDisplayValues;
 
@@ -90,7 +91,12 @@ protected void onDraw(Canvas canvas) {
 
         // Draw the visible values
         for (int i = 0; i < DISPLAY_COUNT; ++i) {
-            String scrollSelectorValue = String.valueOf(mDisplayValues[i]);
+            String scrollSelectorValue;
+            if (mFormatter != null) {
+                scrollSelectorValue = mFormatter.format(mDisplayValues[i]);
+            } else {
+                scrollSelectorValue = String.valueOf(mDisplayValues[i]);
+            }
             if (i == MIDDLE_INDEX) {
                 canvas.drawText(scrollSelectorValue, x, y, paint);
             } else {
@@ -101,6 +107,12 @@ protected void onDraw(Canvas canvas) {
         mInputView.setVisibility(View.INVISIBLE);
     }
 
+    @Override
+    public void setFormatter(Formatter formatter) {
+        super.setFormatter(formatter);
+        mFormatter = formatter;
+    }
+
     private void setDisplayValues() {
         int value = getValue();
         for (int i = 0; i < DISPLAY_COUNT; ++i) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index 747379b92a39..707094ff8cfc 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -520,6 +520,13 @@ public void onClick(DialogInterface dialog, int which) {
                         }
                     }
                 }, null).show();
+        mNumberPicker.setFormatter(new NumberPicker.Formatter() {
+            @Override
+            public String format(int value) {
+                if (value == 0) return getString(R.string.never);
+                return getResources().getQuantityString(R.plurals.days_quantity, value, value);
+            }
+        });
     }
 
     private void showMultipleLinksDialog() {
@@ -533,13 +540,13 @@ private void showMultipleLinksDialog() {
                 mSiteSettings.getMultipleLinks(),
                 R.string.site_settings_multiple_links_title,
                 new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                if (mSiteSettings.getMultipleLinks() != mNumberPicker.getValue()) {
-                    onPreferenceChange(mMultipleLinksPref, mNumberPicker.getValue());
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    if (mSiteSettings.getMultipleLinks() != mNumberPicker.getValue()) {
+                        onPreferenceChange(mMultipleLinksPref, mNumberPicker.getValue());
+                    }
                 }
-            }
-        }, null).show();
+                }, null).show();
     }
 
     private Dialog getNumberPickerDialog(boolean showSwitch,

From bcee50e176ede21ae9e963ddd76146ed9476cc6c Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Wed, 9 Dec 2015 17:59:15 -0800
Subject: [PATCH 27/63] Version checking self-hosted responses to determine if
 settings are supported

---
 .../ui/prefs/SelfHostedSiteSettings.java       | 18 ++++++++++++++++++
 .../android/ui/prefs/SiteSettingsFragment.java |  1 +
 2 files changed, 19 insertions(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java
index b91b84a00041..f3fc5e7b2954 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java
@@ -51,11 +51,16 @@ class SelfHostedSiteSettings extends SiteSettingsInterface {
     public static final String MAX_LINKS_KEY = "comment_max_links";
     public static final String MODERATION_KEYS_KEY = "moderation_keys";
     public static final String BLACKLIST_KEYS_KEY = "blacklist_keys";
+    public static final String SOFTWARE_VERSION_KEY = "software_version";
     private static final String BLOG_CATEGORY_ID_KEY = "categoryId";
     private static final String BLOG_CATEGORY_PARENT_ID_KEY = "parentId";
     private static final String BLOG_CATEGORY_DESCRIPTION_KEY = "categoryDescription";
     private static final String BLOG_CATEGORY_NAME_KEY = "categoryName";
 
+    // Requires WordPress 4.5.x or higher
+    private static final int REQUIRED_MAJOR_VERSION = 4;
+    private static final int REQUIRED_MINOR_VERSION = 5;
+
     private static final String OPTION_ALLOWED = "open";
     private static final String OPTION_DISALLOWED = "closed";
 
@@ -167,6 +172,11 @@ public void onFailure(long id, Exception error) {
         public void onSuccess(long id, final Object result) {
             if (result instanceof Map) {
                 AppLog.d(AppLog.T.API, "Received Options XML-RPC response.");
+
+                if (!versionSupported((Map) result)) {
+                    notifyUpdatedOnUiThread(new XMLRPCException("Unsupported WordPress version"));
+                }
+
                 credentialsVerified(true);
 
                 deserializeOptionsResponse(mRemoteSettings, (Map) result);
@@ -187,6 +197,14 @@ public void onFailure(long id, final Exception error) {
         }
     };
 
+    private boolean versionSupported(Map map) {
+        String version = getNestedMapValue(map, SOFTWARE_VERSION_KEY);
+        if (TextUtils.isEmpty(version)) return false;
+        String[] split = version.split(".");
+        return Integer.valueOf(split[0]) >= REQUIRED_MAJOR_VERSION &&
+                Integer.valueOf(split[1]) >= REQUIRED_MINOR_VERSION;
+    }
+
     private Map<String, String> serializeSelfHostedParams() {
         Map<String, String> params = new HashMap<>();
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index 707094ff8cfc..84304069f7b8 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -376,6 +376,7 @@ public void onDismiss(DialogInterface dialog) {
     public void onSettingsUpdated(Exception error) {
         if (error != null) {
             ToastUtils.showToast(getActivity(), R.string.error_fetch_remote_site_settings);
+            getActivity().finish();
             return;
         }
 

From 4b9a7e09fef44ca093a47726e1b37a6f77bac26d Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Thu, 10 Dec 2015 11:17:29 -0800
Subject: [PATCH 28/63] Fixing crash from 0 length substring

---
 .../org/wordpress/android/ui/prefs/DotComSiteSettings.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java
index 6a05baa1948a..c70173831249 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java
@@ -307,7 +307,9 @@ public Map<String, String> serializeDotComParams() {
                 builder.append(key);
                 builder.append("\n");
             }
-            params.put(MODERATION_KEYS_KEY, builder.substring(0, builder.length() - 1));
+            if (builder.length() > 1) {
+                params.put(MODERATION_KEYS_KEY, builder.substring(0, builder.length() - 1));
+            }
         }
         if (mSettings.blacklist != null && !mSettings.blacklist.equals(mRemoteSettings.blacklist)) {
             StringBuilder builder = new StringBuilder();

From 678ce0864c382b81e82fae6f34cb14c77be8b014 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Thu, 10 Dec 2015 11:25:32 -0800
Subject: [PATCH 29/63] Verifying fragment is active before updating views

---
 .../org/wordpress/android/ui/prefs/SiteSettingsFragment.java    | 2 +-
 .../org/wordpress/android/ui/prefs/SiteSettingsInterface.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index 84304069f7b8..dcfae08556ff 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -380,7 +380,7 @@ public void onSettingsUpdated(Exception error) {
             return;
         }
 
-        setPreferencesFromSiteSettings();
+        if (isAdded()) setPreferencesFromSiteSettings();
     }
 
     @Override
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java
index 81457680a11c..fc5f3d7e56e8 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java
@@ -493,7 +493,7 @@ public SiteSettingsInterface init(boolean fetchRemote) {
      * Notifies listener that settings have been updated with the latest remote data.
      */
     protected void notifyUpdatedOnUiThread(final Exception error) {
-        if (mActivity == null || mListener == null) return;
+        if (mActivity == null || mActivity.isFinishing() || mListener == null) return;
 
         mActivity.runOnUiThread(new Runnable() {
             @Override

From 86518ab0af3e2f02ec729e69c790682edf772805 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Thu, 10 Dec 2015 11:42:43 -0800
Subject: [PATCH 30/63] Adding values of updated settings to analytics

---
 .../android/ui/prefs/DotComSiteSettings.java       | 14 ++++++++------
 .../android/ui/prefs/SelfHostedSiteSettings.java   | 13 ++++++++-----
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java
index c70173831249..7f7bdb7c2bce 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java
@@ -20,7 +20,6 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 
 class DotComSiteSettings extends SiteSettingsInterface {
@@ -93,14 +92,17 @@ public void onResponse(JSONObject response) {
                         mRemoteSettings.copyFrom(mSettings);
 
                         if (response != null) {
-                            List<String> itemKeys = new ArrayList<>();
                             JSONObject updated = response.optJSONObject("updated");
                             if (updated == null) return;
-                            Iterator<String> keys = updated.keys();
-                            while (keys.hasNext()) itemKeys.add(keys.next());
-
                             HashMap<String, Object> properties = new HashMap<>();
-                            properties.put("items_saved", itemKeys);
+                            Iterator<String> keys = updated.keys();
+                            while (keys.hasNext()) {
+                                String currentKey = keys.next();
+                                Object currentValue = updated.opt(currentKey);
+                                if (currentValue != null) {
+                                    properties.put("item_saved_" + currentKey, currentValue);
+                                }
+                            }
                             AnalyticsUtils.trackWithCurrentBlogDetails(
                                     AnalyticsTracker.Stat.SITE_SETTINGS_SAVED_REMOTELY, properties);
                         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java
index f3fc5e7b2954..4a68ba486c21 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java
@@ -19,7 +19,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
@@ -99,10 +98,14 @@ public void onSuccess(long id, final Object result) {
                 if (result != null) {
                     HashMap<String, Object> properties = new HashMap<>();
                     if (result instanceof Map) {
-                        Set keys = ((Map) result).keySet();
-                        List keyList = new ArrayList();
-                        for (Object key : keys) keyList.add(key);
-                        properties.put("items_saved", keyList);
+                        Map<String, Object> resultMap = (Map) result;
+                        Set<String> keys = resultMap.keySet();
+                        for (String key : keys) {
+                            Object currentValue = resultMap.get(key);
+                            if (currentValue != null) {
+                                properties.put("item_saved_" + key, currentValue);
+                            }
+                        }
                     }
                     AnalyticsUtils.trackWithCurrentBlogDetails(
                             AnalyticsTracker.Stat.SITE_SETTINGS_SAVED_REMOTELY, properties);

From 1fe87b5dd8c1a91b6bee70bb911ca8a8df6f592a Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Thu, 10 Dec 2015 15:34:24 -0800
Subject: [PATCH 31/63] Fixing crash when deleting multiple items from list
 editor

---
 .../org/wordpress/android/ui/prefs/SiteSettingsFragment.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index dcfae08556ff..7de9fe2e2f8a 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -53,6 +53,7 @@
 import org.wordpress.android.util.WPActivityUtils;
 import org.wordpress.android.util.WPPrefUtils;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -858,12 +859,14 @@ public boolean onDeleteRequested() {
                         AnalyticsTracker.Stat.SITE_SETTINGS_DELETED_LIST_ITEMS, properties);
 
                 ListAdapter adapter = list.getAdapter();
+                List<String> itemsToRemove = new ArrayList<>();
                 for (int i = 0; i < checkedItems.size(); i++) {
                     final int index = checkedItems.keyAt(i);
                     if (checkedItems.get(index)) {
-                        mEditingList.remove(adapter.getItem(index).toString());
+                        itemsToRemove.add(adapter.getItem(index).toString());
                     }
                 }
+                mEditingList.removeAll(itemsToRemove);
                 list.setAdapter(new ArrayAdapter<>(getActivity(),
                         R.layout.wp_simple_list_item_1,
                         mEditingList));

From c25ac5dde99694655481f1b73d0f6575e9aa1834 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Thu, 10 Dec 2015 19:02:36 -0800
Subject: [PATCH 32/63] Showing keyboard for input in list editor when FAB is
 clicked

---
 .../android/ui/accounts/AbstractFragment.java |  8 ++----
 .../android/ui/main/SitePickerActivity.java   |  4 +--
 .../ui/prefs/SiteSettingsFragment.java        |  1 +
 .../ui/prefs/SummaryEditTextPreference.java   | 28 +++++++------------
 .../android/util/WPActivityUtils.java         | 18 ++++++++++++
 5 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/AbstractFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/AbstractFragment.java
index 2fe69bb94c59..a1ffdca60af8 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/AbstractFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/AbstractFragment.java
@@ -10,7 +10,6 @@
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.inputmethod.EditorInfo;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.ImageView;
 
@@ -25,6 +24,7 @@
 import org.wordpress.android.networking.RestClientUtils;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;
+import org.wordpress.android.util.WPActivityUtils;
 
 /**
  * A fragment representing a single step in a wizard. The fragment shows a dummy title indicating
@@ -75,12 +75,8 @@ protected boolean onDoneEvent(int actionId, KeyEvent event) {
             }
 
             // hide keyboard before calling the done action
-            InputMethodManager inputManager = (InputMethodManager) getActivity().getSystemService(
-                    Context.INPUT_METHOD_SERVICE);
             View view = getActivity().getCurrentFocus();
-            if (view != null) {
-                inputManager.hideSoftInputFromWindow(view.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
-            }
+            if (view != null) WPActivityUtils.hideKeyboard(view);
 
             // call child action
             onDoneAction();
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java
index b7f76ae5416e..c40ab4356230 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java
@@ -35,6 +35,7 @@
 import org.wordpress.android.ui.stats.datasets.StatsTable;
 import org.wordpress.android.util.CoreEvents;
 import org.wordpress.android.util.ToastUtils;
+import org.wordpress.android.util.WPActivityUtils;
 import org.xmlrpc.android.ApiHelper;
 
 import de.greenrobot.event.EventBus;
@@ -318,8 +319,7 @@ private void disableSearchMode() {
 
     private void hideSoftKeyboard() {
         if (!hasHardwareKeyboard()) {
-            InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-            inputMethodManager.hideSoftInputFromWindow(mSearchView.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
+            WPActivityUtils.hideKeyboard(mSearchView);
         }
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index 7de9fe2e2f8a..08f9415aa897 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -911,6 +911,7 @@ public void onClick(DialogInterface dialog, int which) {
                 Button negative = alertDialog.getButton(DialogInterface.BUTTON_NEGATIVE);
                 if (positive != null) WPPrefUtils.layoutAsFlatButton(positive);
                 if (negative != null) WPPrefUtils.layoutAsFlatButton(negative);
+                WPActivityUtils.showKeyboard(input);
             }
         });
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SummaryEditTextPreference.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SummaryEditTextPreference.java
index 1a95540c892f..6564732b8e9c 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SummaryEditTextPreference.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SummaryEditTextPreference.java
@@ -5,7 +5,6 @@
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.os.Bundle;
-import android.os.Handler;
 import android.preference.EditTextPreference;
 import android.support.annotation.NonNull;
 import android.support.v7.app.AlertDialog;
@@ -14,12 +13,12 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 
 import org.wordpress.android.R;
+import org.wordpress.android.util.WPActivityUtils;
 import org.wordpress.android.util.WPPrefUtils;
 
 /**
@@ -36,12 +35,11 @@
  */
 
 public class SummaryEditTextPreference extends EditTextPreference implements PreferenceHint {
-    private static final long SHOW_KEYBOARD_DELAY = 250;
-
     private int mLines;
     private int mMaxLines;
     private String mHint;
     private AlertDialog mDialog;
+    private EditText mEditText;
     private int mWhichButtonClicked;
 
     public SummaryEditTextPreference(Context context) {
@@ -137,35 +135,29 @@ protected void onBindDialogView(final View view) {
         super.onBindDialogView(view);
 
         if (view != null) {
-            EditText editText = getEditText();
-            ViewParent oldParent = editText.getParent();
+            mEditText = getEditText();
+            ViewParent oldParent = mEditText.getParent();
             if (oldParent != view) {
                 if (oldParent != null) {
-                    ((ViewGroup) oldParent).removeView(editText);
+                    ((ViewGroup) oldParent).removeView(mEditText);
                 }
                 ((View) oldParent).setPadding(((View) oldParent).getPaddingLeft(), 0, ((View) oldParent).getPaddingRight(), ((View) oldParent).getPaddingBottom());
-                onAddEditTextToDialogView(view, editText);
+                onAddEditTextToDialogView(view, mEditText);
             }
-            WPPrefUtils.layoutAsInput(editText);
-            editText.setSelection(editText.getText().length());
-            (new Handler()).postDelayed(new Runnable() {
-                public void run() {
-                    InputMethodManager inputMethodManager = (InputMethodManager) view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
-                    inputMethodManager.toggleSoftInputFromWindow(view.getWindowToken(), InputMethodManager.SHOW_IMPLICIT, 0);
-                }
-            }, SHOW_KEYBOARD_DELAY);
+            WPPrefUtils.layoutAsInput(mEditText);
+            mEditText.setSelection(mEditText.getText().length());
+            WPActivityUtils.showKeyboard(mEditText);
         }
     }
 
     @Override
     public void onClick(DialogInterface dialog, int which) {
+        WPActivityUtils.hideKeyboard(mEditText);
         mWhichButtonClicked = which;
     }
 
     @Override
     public void onDismiss(DialogInterface dialog) {
-        InputMethodManager inputMethodManager = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
-        inputMethodManager.toggleSoftInputFromWindow(mDialog.getCurrentFocus().getWindowToken(), InputMethodManager.HIDE_IMPLICIT_ONLY, 0);
         onDialogClosed(mWhichButtonClicked == DialogInterface.BUTTON_POSITIVE);
         mDialog = null;
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/util/WPActivityUtils.java b/WordPress/src/main/java/org/wordpress/android/util/WPActivityUtils.java
index a385f564fbda..4c67478e664c 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/WPActivityUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/util/WPActivityUtils.java
@@ -9,6 +9,7 @@
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Build;
+import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
@@ -20,6 +21,7 @@
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 
@@ -29,6 +31,8 @@
 import java.util.Locale;
 
 public class WPActivityUtils {
+    private static final long SHOW_KEYBOARD_DELAY = 250;
+
     // Hack! PreferenceScreens don't show the toolbar, so we'll manually add one
     // See: http://stackoverflow.com/a/27455363/309558
     public static void addToolbarToDialog(final Fragment context, final Dialog dialog, String title) {
@@ -93,6 +97,20 @@ public static void setStatusBarColor(Window window, int color) {
         }
     }
 
+    public static void showKeyboard(final View view) {
+        (new Handler()).postDelayed(new Runnable() {
+            public void run() {
+                InputMethodManager inputMethodManager = (InputMethodManager) view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+                inputMethodManager.toggleSoftInputFromWindow(view.getWindowToken(), InputMethodManager.SHOW_IMPLICIT, 0);
+            }
+        }, SHOW_KEYBOARD_DELAY);
+    }
+
+    public static void hideKeyboard(final View view) {
+        InputMethodManager inputMethodManager = (InputMethodManager) view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+        inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
+    }
+
     public static void applyLocale(Activity context, boolean restart) {
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
 

From 8a73b8ed3677bdbeab0261928a444ddc61a3e434 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Thu, 10 Dec 2015 21:23:45 -0800
Subject: [PATCH 33/63] Adding more levels to Threading picker, fixing fonts
 and a crash

---
 .../android/ui/prefs/SiteSettingsFragment.java         |  8 +++++---
 WordPress/src/main/res/values/strings.xml              | 10 ++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index 08f9415aa897..e67ce3d9dfc7 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -510,7 +510,7 @@ private void showCloseAfterDialog() {
                 R.string.close_after_switch_text,
                 R.string.close_after_description,
                 R.string.close_after_header,
-                0,
+                1,
                 getResources().getInteger(R.integer.close_after_limit),
                 mSiteSettings.getCloseAfter(),
                 R.string.site_settings_close_after_dialog_title,
@@ -525,7 +525,6 @@ public void onClick(DialogInterface dialog, int which) {
         mNumberPicker.setFormatter(new NumberPicker.Formatter() {
             @Override
             public String format(int value) {
-                if (value == 0) return getString(R.string.never);
                 return getResources().getQuantityString(R.plurals.days_quantity, value, value);
             }
         });
@@ -594,7 +593,10 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
         builder.setPositiveButton(R.string.ok, positive);
         builder.setNegativeButton(R.string.cancel, negative);
         builder.setView(view);
-        return builder.create();
+        AlertDialog dialog = builder.create();
+        WPPrefUtils.layoutAsFlatButton(dialog.getButton(DialogInterface.BUTTON_POSITIVE));
+        WPPrefUtils.layoutAsFlatButton(dialog.getButton(DialogInterface.BUTTON_NEGATIVE));
+        return dialog;
     }
 
     private void setPreferencesFromSiteSettings() {
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index a1f2d66c0cb5..d42b35914b78 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -605,6 +605,11 @@
         <item>Three levels</item>
         <item>Four levels</item>
         <item>Five levels</item>
+        <item>Six levels</item>
+        <item>Seven levels</item>
+        <item>Eight levels</item>
+        <item>Nine levels</item>
+        <item>Ten levels</item>
     </string-array>
     <string-array name="site_settings_threading_values">
         <item>1</item>
@@ -612,6 +617,11 @@
         <item>3</item>
         <item>4</item>
         <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
     </string-array>
     <string-array name="site_settings_paging_entries">
         <item>@string/none</item>

From f9ff58994dc2d2d535a85c79f4e1b6cca8ca8435 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Fri, 11 Dec 2015 12:30:31 -0800
Subject: [PATCH 34/63] Adjusting font for Discussion toolbar

---
 .../ui/prefs/SiteSettingsFragment.java        | 24 ++++++++++++-------
 .../android/util/WPActivityUtils.java         |  8 ++++++-
 WordPress/src/main/res/layout/toolbar.xml     | 16 ++++++++++++-
 3 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index e67ce3d9dfc7..a9fc93923d62 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -490,7 +490,7 @@ private void showPagingDialog() {
                 R.string.site_settings_paging_title,
                 R.string.paging_description,
                 R.string.paging_header,
-                0,
+                1,
                 getResources().getInteger(R.integer.paging_limit),
                 mSiteSettings.getPagingCount(),
                 R.string.site_settings_paging_title,
@@ -501,7 +501,7 @@ public void onClick(DialogInterface dialog, int which) {
                             onPreferenceChange(mPagingPref, mNumberPicker.getValue());
                         }
                     }
-                }, null).show();
+                }, null);
     }
 
     private void showCloseAfterDialog() {
@@ -521,7 +521,7 @@ public void onClick(DialogInterface dialog, int which) {
                             onPreferenceChange(mCloseAfterPref, mNumberPicker.getValue());
                         }
                     }
-                }, null).show();
+                }, null);
         mNumberPicker.setFormatter(new NumberPicker.Formatter() {
             @Override
             public String format(int value) {
@@ -547,10 +547,10 @@ public void onClick(DialogInterface dialog, int which) {
                         onPreferenceChange(mMultipleLinksPref, mNumberPicker.getValue());
                     }
                 }
-                }, null).show();
+                }, null);
     }
 
-    private Dialog getNumberPickerDialog(boolean showSwitch,
+    private void getNumberPickerDialog(boolean showSwitch,
                                          boolean switchChecked,
                                          int switchText,
                                          int detail,
@@ -584,8 +584,16 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
         }
         TextView detailText = (TextView) view.findViewById(R.id.number_picker_text);
         TextView headerText = (TextView) view.findViewById(R.id.number_picker_header);
-        headerText.setText(header);
-        detailText.setText(detail);
+        if (header >= 0) {
+            headerText.setText(header);
+        } else {
+            headerText.setVisibility(View.GONE);
+        }
+        if (detail >= 0) {
+            detailText.setText(detail);
+        } else {
+            detailText.setVisibility(View.GONE);
+        }
         mNumberPicker.setMinValue(min);
         mNumberPicker.setMaxValue(max);
         mNumberPicker.setValue(cur);
@@ -594,9 +602,9 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
         builder.setNegativeButton(R.string.cancel, negative);
         builder.setView(view);
         AlertDialog dialog = builder.create();
+        dialog.show();
         WPPrefUtils.layoutAsFlatButton(dialog.getButton(DialogInterface.BUTTON_POSITIVE));
         WPPrefUtils.layoutAsFlatButton(dialog.getButton(DialogInterface.BUTTON_NEGATIVE));
-        return dialog;
     }
 
     private void setPreferencesFromSiteSettings() {
diff --git a/WordPress/src/main/java/org/wordpress/android/util/WPActivityUtils.java b/WordPress/src/main/java/org/wordpress/android/util/WPActivityUtils.java
index 4c67478e664c..ff7e1c4d2145 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/WPActivityUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/util/WPActivityUtils.java
@@ -24,6 +24,7 @@
 import android.view.inputmethod.InputMethodManager;
 import android.widget.LinearLayout;
 import android.widget.ListView;
+import android.widget.TextView;
 
 import org.wordpress.android.R;
 import org.wordpress.android.ui.prefs.SettingsFragment;
@@ -78,7 +79,12 @@ public static void addToolbarToDialog(final Fragment context, final Dialog dialo
 
         dialog.getWindow().setWindowAnimations(R.style.DialogAnimations);
 
-        toolbar.setTitle(title);
+        TextView titleView = (TextView) toolbar.findViewById(R.id.toolbar_title);
+        titleView.setVisibility(View.VISIBLE);
+        titleView.setText(title);
+
+        toolbar.setTitle("");
+        toolbar.setContentInsetsAbsolute(0, 0);
         toolbar.setNavigationIcon(org.wordpress.android.R.drawable.ic_arrow_back_white_24dp);
         toolbar.setNavigationOnClickListener(new View.OnClickListener() {
             @Override
diff --git a/WordPress/src/main/res/layout/toolbar.xml b/WordPress/src/main/res/layout/toolbar.xml
index 2027c8bcd7c8..a1344d3d0cb1 100644
--- a/WordPress/src/main/res/layout/toolbar.xml
+++ b/WordPress/src/main/res/layout/toolbar.xml
@@ -10,4 +10,18 @@
     app:contentInsetLeft="@dimen/toolbar_content_offset"
     app:contentInsetStart="@dimen/toolbar_content_offset"
     app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-    app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+    app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+
+    <org.wordpress.android.widgets.WPTextView
+        android:id="@+id/toolbar_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="start|center_vertical"
+        android:visibility="gone"
+        android:textColor="@color/white"
+        android:textStyle="bold"
+        android:textSize="@dimen/text_sz_extra_large"
+        app:fontFamily="openSans"
+        app:fontVariation="light" />
+
+</android.support.v7.widget.Toolbar>

From 84b9e5f53f442ca22bc67a96296b25d8962f9694 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Fri, 11 Dec 2015 12:33:23 -0800
Subject: [PATCH 35/63] Checking for valid length string before serializing

---
 .../org/wordpress/android/ui/prefs/DotComSiteSettings.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java
index 7f7bdb7c2bce..3204c3dcd87e 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java
@@ -319,7 +319,9 @@ public Map<String, String> serializeDotComParams() {
                 builder.append(key);
                 builder.append("\n");
             }
-            params.put(BLACKLIST_KEYS_KEY, builder.substring(0, builder.length() - 1));
+            if (builder.length() > 1) {
+                params.put(BLACKLIST_KEYS_KEY, builder.substring(0, builder.length() - 1));
+            }
         }
 
         return params;

From a5e369fee84f7ec956ff78f3626adda0e931cd07 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Fri, 11 Dec 2015 13:11:48 -0800
Subject: [PATCH 36/63] Savings settings as soon as they change per discussion
 with Matt

---
 .../wordpress/android/ui/WPNumberPicker.java  |  2 ++
 .../ui/prefs/SiteSettingsFragment.java        | 32 +++++++------------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java b/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
index b6467bb265ca..0a7a38c7d4dc 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
@@ -62,6 +62,8 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
 
     @Override
     public void setValue(int value) {
+        if (value < getMinValue()) value = getMinValue();
+        if (value > getMaxValue()) value = getMaxValue();
         super.setValue(value);
         EditText view = (EditText) getChildAt(0);
         WPPrefUtils.layoutAsNumberPickerSelected(view);
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index a9fc93923d62..7fab50a0e37a 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -84,7 +84,6 @@ public class SiteSettingsFragment extends PreferenceFragment
     private Blog mBlog;
     private SiteSettingsInterface mSiteSettings;
     private List<String> mEditingList;
-    private boolean mBlogDeleted;
     private boolean mShouldFetch;
     private NumberPicker mNumberPicker;
 
@@ -148,16 +147,6 @@ public void onResume() {
         mShouldFetch = false;
     }
 
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-
-        // Assume user wanted changes propagated when they leave
-        if (!mBlogDeleted && mSiteSettings != null) {
-            mSiteSettings.saveSettings();
-        }
-    }
-
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch (requestCode) {
@@ -339,6 +328,8 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
             return false;
         }
 
+        mSiteSettings.saveSettings();
+
         return true;
     }
 
@@ -386,10 +377,10 @@ public void onSettingsUpdated(Exception error) {
 
     @Override
     public void onSettingsSaved(Exception error) {
-        int message = error == null ?
-                R.string.site_settings_save_success : R.string.error_post_remote_site_settings;
-
-        ToastUtils.showToast(WordPress.getContext(), message);
+        if (error != null) {
+            ToastUtils.showToast(WordPress.getContext(), R.string.error_post_remote_site_settings);
+            return;
+        }
         mBlog.setBlogName(mSiteSettings.getTitle());
         WordPress.wpDB.saveBlog(mBlog);
         EventBus.getDefault().post(new CoreEvents.BlogListChanged());
@@ -541,12 +532,12 @@ private void showMultipleLinksDialog() {
                 mSiteSettings.getMultipleLinks(),
                 R.string.site_settings_multiple_links_title,
                 new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    if (mSiteSettings.getMultipleLinks() != mNumberPicker.getValue()) {
-                        onPreferenceChange(mMultipleLinksPref, mNumberPicker.getValue());
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        if (mSiteSettings.getMultipleLinks() != mNumberPicker.getValue()) {
+                            onPreferenceChange(mMultipleLinksPref, mNumberPicker.getValue());
+                        }
                     }
-                }
                 }, null);
     }
 
@@ -935,7 +926,6 @@ private void removeBlog() {
             ToastUtils.showToast(getActivity(), R.string.blog_removed_successfully);
             WordPress.wpDB.deleteLastBlogId();
             WordPress.currentBlog = null;
-            mBlogDeleted = true;
             getActivity().setResult(RESULT_BLOG_REMOVED);
 
             // If the last blog is removed and the user is not signed in wpcom, broadcast a UserSignedOut event

From b6cf0586f4f674a91c0feced62993ec03b9f0a69 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Fri, 11 Dec 2015 16:34:02 -0800
Subject: [PATCH 37/63] Lots of code cleanup

---
 .../android/ui/main/WPMainActivity.java       |   5 +-
 .../ui/prefs/BlogPreferencesActivity.java     |  15 +-
 .../android/ui/prefs/RelatedPostsDialog.java  |   3 -
 .../ui/prefs/SiteSettingsFragment.java        | 161 +++++++++++++-----
 4 files changed, 126 insertions(+), 58 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java
index 9fbdf0e58033..20bdad642159 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java
@@ -28,14 +28,13 @@
 import org.wordpress.android.ui.ActivityId;
 import org.wordpress.android.ui.ActivityLauncher;
 import org.wordpress.android.ui.RequestCodes;
-import org.wordpress.android.ui.media.MediaAddFragment;
 import org.wordpress.android.ui.notifications.NotificationEvents;
 import org.wordpress.android.ui.notifications.NotificationsListFragment;
 import org.wordpress.android.ui.notifications.utils.NotificationsUtils;
 import org.wordpress.android.ui.notifications.utils.SimperiumUtils;
 import org.wordpress.android.ui.prefs.AppPrefs;
-import org.wordpress.android.ui.prefs.BlogPreferencesActivity;
 import org.wordpress.android.ui.prefs.SettingsFragment;
+import org.wordpress.android.ui.prefs.SiteSettingsFragment;
 import org.wordpress.android.ui.reader.ReaderPostListFragment;
 import org.wordpress.android.util.AnalyticsUtils;
 import org.wordpress.android.util.AniUtils;
@@ -397,7 +396,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                 }
                 break;
             case RequestCodes.BLOG_SETTINGS:
-                if (resultCode == BlogPreferencesActivity.RESULT_BLOG_REMOVED) {
+                if (resultCode == SiteSettingsFragment.RESULT_BLOG_REMOVED) {
                     // user removed the current (self-hosted) blog from blog settings
                     if (!AccountHelper.isSignedIn()) {
                         ActivityLauncher.showSignInForResult(this);
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/BlogPreferencesActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/BlogPreferencesActivity.java
index f06074a84d15..d9cc32917d45 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/BlogPreferencesActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/BlogPreferencesActivity.java
@@ -10,7 +10,6 @@
 
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
-import org.wordpress.android.models.Blog;
 import org.wordpress.android.networking.ConnectionChangeReceiver;
 import org.wordpress.android.ui.ActivityLauncher;
 import org.wordpress.android.util.ToastUtils;
@@ -22,21 +21,15 @@
  */
 public class BlogPreferencesActivity extends AppCompatActivity {
     public static final String ARG_LOCAL_BLOG_ID = SiteSettingsFragment.ARG_LOCAL_BLOG_ID;
-    public static final int RESULT_BLOG_REMOVED = RESULT_FIRST_USER;
 
     private static final String KEY_SETTINGS_FRAGMENT = "settings-fragment";
 
-    // The blog this activity is managing settings for.
-    private Blog mBlog;
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         Integer id = getIntent().getIntExtra(ARG_LOCAL_BLOG_ID, -1);
-        mBlog = WordPress.getBlog(id);
-
-        if (mBlog == null) {
+        if (WordPress.getBlog(id) == null) {
             Toast.makeText(this, getString(R.string.blog_not_found), Toast.LENGTH_SHORT).show();
             finish();
             return;
@@ -79,12 +72,6 @@ protected void onStop() {
         super.onStop();
     }
 
-    @Override
-    protected void onPause() {
-        super.onPause();
-        WordPress.wpDB.saveBlog(mBlog);
-    }
-
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         int itemID = item.getItemId();
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/RelatedPostsDialog.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/RelatedPostsDialog.java
index 5293f282bc1d..6cfb2aaad905 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/RelatedPostsDialog.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/RelatedPostsDialog.java
@@ -7,8 +7,6 @@
 import android.app.Fragment;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.res.Resources;
-import android.graphics.Typeface;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -22,7 +20,6 @@
 
 import org.wordpress.android.R;
 import org.wordpress.android.util.WPPrefUtils;
-import org.wordpress.android.widgets.TypefaceCache;
 import org.wordpress.android.widgets.WPSwitch;
 
 import java.util.ArrayList;
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index 7fab50a0e37a..5a00367fea64 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -62,7 +62,9 @@
 import de.greenrobot.event.EventBus;
 
 /**
- * Handles changes to WordPress site settings. Syncs with host automatically when user leaves.
+ * Allows interfacing with WordPress site settings. Works with WP.com and WP.org v4.5+ (pending).
+ *
+ * Settings are synced automatically when local changes are made.
  */
 
 public class SiteSettingsFragment extends PreferenceFragment
@@ -73,37 +75,87 @@ public class SiteSettingsFragment extends PreferenceFragment
                    Dialog.OnDismissListener,
                    SiteSettingsInterface.SiteSettingsListener {
 
+    /**
+     * Use this argument to pass the {@link Integer} local blog ID to this fragment.
+     */
     public static final String ARG_LOCAL_BLOG_ID = "local_blog_id";
+
+    /**
+     * When the user removes a site (by selecting Delete Site) the parent {@link Activity} result
+     * is set to this value and {@link Activity#finish()} is invoked.
+     */
     public static final int RESULT_BLOG_REMOVED = Activity.RESULT_FIRST_USER;
 
+    /**
+     * Provides the regex to identify domain HTTP(S) protocol and/or 'www' sub-domain.
+     *
+     * Used to format user-facing {@link String}'s in certain preferences.
+     */
     private static final String ADDRESS_FORMAT_REGEX = "^(https?://(w{3})?|www\\.)";
+
+    /**
+     * Request code used when creating the {@link RelatedPostsDialog}.
+     */
     private static final int RELATED_POSTS_REQUEST_CODE = 1;
+
+    /**
+     * Length of a {@link String} (representing a language code) when there is no region included.
+     * For example: "en" contains no region, "en_US" contains a region (US)
+     *
+     * Used to parse a language code {@link String} when creating a {@link Locale}.
+     */
     private static final int NO_REGION_LANG_CODE_LEN = 2;
+
+    /**
+     * Index of a language code {@link String} where the region code begins. The language code
+     * format is cc_rr, where cc is the country code (e.g. en, es, az) and rr is the region code
+     * (e.g. us, au, gb).
+     */
     private static final int REGION_SUBSTRING_INDEX = 3;
 
+    // Reference to blog obtained from passed ID (ARG_LOCAL_BLOG_ID)
     private Blog mBlog;
+
+    // Can interface with WP.com or WP.org
     private SiteSettingsInterface mSiteSettings;
+
+    // Reference to the list of items being edited in the current list editor
     private List<String> mEditingList;
+
+    // Used to ensure that settings are only fetched once throughout the lifecycle of the fragment
     private boolean mShouldFetch;
+
+    // Used to customize Close After, Paging, and Multiple Links dialog views
     private NumberPicker mNumberPicker;
 
+    // General settings
     private EditTextPreference mTitlePref;
     private EditTextPreference mTaglinePref;
     private EditTextPreference mAddressPref;
-    private DetailListPreference mLanguagePref;
     private DetailListPreference mPrivacyPref;
+    private DetailListPreference mLanguagePref;
+
+    // Account settings (NOTE: only for WP.org)
     private EditTextPreference mUsernamePref;
     private EditTextPreference mPasswordPref;
+
+    // Writing settings
     private WPSwitchPreference mLocationPref;
     private DetailListPreference mCategoryPref;
     private DetailListPreference mFormatPref;
     private Preference mRelatedPostsPref;
-    private WPSwitchPreference mAllowCommentsNested;
+
+    // Discussion settings preview
     private WPSwitchPreference mAllowCommentsPref;
-    private WPSwitchPreference mSendPingbacksNested;
     private WPSwitchPreference mSendPingbacksPref;
-    private WPSwitchPreference mReceivePingbacksNested;
     private WPSwitchPreference mReceivePingbacksPref;
+
+    // Discussion settings -> Defaults for New Posts
+    private WPSwitchPreference mAllowCommentsNested;
+    private WPSwitchPreference mSendPingbacksNested;
+    private WPSwitchPreference mReceivePingbacksNested;
+
+    // Discussion settings -> Comments
     private WPSwitchPreference mIdentityRequiredPreference;
     private WPSwitchPreference mUserAccountRequiredPref;
     private Preference mCloseAfterPref;
@@ -114,36 +166,53 @@ public class SiteSettingsFragment extends PreferenceFragment
     private Preference mMultipleLinksPref;
     private Preference mModerationHoldPref;
     private Preference mBlacklistPref;
+
+    // Delete site option (NOTE: only for WP.org)
     private Preference mDeleteSitePref;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        // make sure we have local site data
-        mBlog = WordPress.getBlog(getArguments().getInt(ARG_LOCAL_BLOG_ID, -1));
+        Activity activity = getActivity();
 
-        if (!NetworkUtils.checkConnection(getActivity()) || mBlog == null) {
+        // make sure we have local site data and a network connection, otherwise finish activity
+        mBlog = WordPress.getBlog(getArguments().getInt(ARG_LOCAL_BLOG_ID, -1));
+        if (mBlog == null || !NetworkUtils.checkConnection(activity)) {
             getActivity().finish();
             return;
         }
 
+        // track successful settings screen access
         AnalyticsUtils.trackWithCurrentBlogDetails(
                 AnalyticsTracker.Stat.SITE_SETTINGS_ACCESSED);
 
+        // setup state to fetch remote settings
         mShouldFetch = true;
-        mSiteSettings = SiteSettingsInterface.getInterface(getActivity(), mBlog, this);
+
+        // initialize the appropriate settings interface (WP.com or WP.org)
+        mSiteSettings = SiteSettingsInterface.getInterface(activity, mBlog, this);
 
         setRetainInstance(true);
         addPreferencesFromResource(R.xml.site_settings);
+
+        // toggle which preferences are shown and set references
         initPreferences();
     }
 
+    @Override
+    public void onPause() {
+        super.onPause();
+        WordPress.wpDB.saveBlog(mBlog);
+    }
+
     @Override
     public void onResume() {
         super.onResume();
 
+        // initialize settings with locally cached values, fetch remote on first pass
         mSiteSettings.init(mShouldFetch);
+        // stop future calls from fetching remote settings
         mShouldFetch = false;
     }
 
@@ -151,10 +220,14 @@ public void onResume() {
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch (requestCode) {
             case RELATED_POSTS_REQUEST_CODE:
-                if (data == null) return;
-                mSiteSettings.setShowRelatedPosts(data.getBooleanExtra(RelatedPostsDialog.SHOW_RELATED_POSTS_KEY, false));
-                mSiteSettings.setShowRelatedPostHeader(data.getBooleanExtra(RelatedPostsDialog.SHOW_HEADER_KEY, false));
-                mSiteSettings.setShowRelatedPostImages(data.getBooleanExtra(RelatedPostsDialog.SHOW_IMAGES_KEY, false));
+                // data is null if user cancelled editing Related Posts settings
+                if (data == null) break;
+                mSiteSettings.setShowRelatedPosts(data.getBooleanExtra(
+                        RelatedPostsDialog.SHOW_RELATED_POSTS_KEY, false));
+                mSiteSettings.setShowRelatedPostHeader(data.getBooleanExtra(
+                        RelatedPostsDialog.SHOW_HEADER_KEY, false));
+                mSiteSettings.setShowRelatedPostImages(data.getBooleanExtra(
+                        RelatedPostsDialog.SHOW_IMAGES_KEY, false));
                 break;
         }
 
@@ -162,24 +235,16 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
     }
 
     @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
+    public View onCreateView(@NonNull LayoutInflater inflater,
+                             ViewGroup container,
                              Bundle savedInstanceState) {
-        Context contextThemeWrapper = new ContextThemeWrapper(getActivity(), R.style.Calypso_SiteSettingsTheme);
-        LayoutInflater localInflater = inflater.cloneInContext(contextThemeWrapper);
+        // use a wrapper to apply the Calypso theme
+        Context themer = new ContextThemeWrapper(getActivity(), R.style.Calypso_SiteSettingsTheme);
+        LayoutInflater localInflater = inflater.cloneInContext(themer);
         View view = super.onCreateView(localInflater, container, savedInstanceState);
 
-        // Setup the preferences to handled long clicks
         if (view != null) {
-            ListView prefList = (ListView) view.findViewById(android.R.id.list);
-            Resources res = getResources();
-
-            if (prefList != null && res != null) {
-                prefList.setOnHierarchyChangeListener(this);
-                prefList.setOnItemLongClickListener(this);
-                prefList.setFooterDividersEnabled(false);
-                //noinspection deprecation
-                prefList.setOverscrollFooter(res.getDrawable(R.color.transparent));
-            }
+            setupPreferenceList((ListView) view.findViewById(android.R.id.list), getResources());
         }
 
         return view;
@@ -188,9 +253,11 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
     @Override
     public void onChildViewAdded(View parent, View child) {
         if (child.getId() == android.R.id.title && child instanceof TextView) {
+            // style preference category title views
             TextView title = (TextView) child;
             WPPrefUtils.layoutAsBody2(title);
         } else {
+            // style preference title views
             TextView title = (TextView) child.findViewById(android.R.id.title);
             if (title != null) WPPrefUtils.layoutAsSubhead(title);
         }
@@ -198,24 +265,27 @@ public void onChildViewAdded(View parent, View child) {
 
     @Override
     public void onChildViewRemoved(View parent, View child) {
+        // NOP
     }
 
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference preference) {
         super.onPreferenceTreeClick(screen, preference);
 
-        // Add Action Bar to sub-screens
+        // More preference selected, style the Discussion screen
         if (preference == findPreference(getString(R.string.pref_key_site_more_discussion))) {
+            Dialog dialog = ((PreferenceScreen) preference).getDialog();
+            if (dialog == null) return false;
+
+            setupPreferenceList((ListView) dialog.findViewById(android.R.id.list), getResources());
+
+            // add Action Bar
+            String title = getString(R.string.site_settings_discussion_title);
+            WPActivityUtils.addToolbarToDialog(this, dialog, title);
+
+            // track user accessing the full Discussion settings screen
             AnalyticsUtils.trackWithCurrentBlogDetails(
                     AnalyticsTracker.Stat.SITE_SETTINGS_ACCESSED_MORE_SETTINGS);
-            Dialog dialog = ((PreferenceScreen) preference).getDialog();
-            if (dialog != null) {
-                ListView prefList = (ListView) dialog.findViewById(android.R.id.list);
-                prefList.setOnHierarchyChangeListener(this);
-                prefList.setOnItemLongClickListener(this);
-                String title = getString(R.string.site_settings_discussion_title);
-                WPActivityUtils.addToolbarToDialog(this, dialog, title);
-            }
         }
 
         return false;
@@ -244,8 +314,10 @@ public boolean onPreferenceClick(Preference preference) {
             return true;
         } else if (preference == mCloseAfterPref) {
             showCloseAfterDialog();
+            return true;
         } else if (preference == mPagingPref) {
             showPagingDialog();
+            return true;
         }
 
         return false;
@@ -402,6 +474,19 @@ public void allowEditing(boolean allow) {
         if (mLanguagePref != null) mLanguagePref.setEnabled(allow);
     }
 
+    private void setupPreferenceList(ListView prefList, Resources res) {
+        if (prefList == null || res == null) return;
+
+        // handle long clicks on preferences to display hints
+        prefList.setOnItemLongClickListener(this);
+        // required to customize (Calypso) preference views
+        prefList.setOnHierarchyChangeListener(this);
+        // remove footer divider bar
+        prefList.setFooterDividersEnabled(false);
+        //noinspection deprecation
+        prefList.setOverscrollFooter(res.getDrawable(R.color.transparent));
+    }
+
     /**
      * Helper method to retrieve {@link Preference} references and initialize any data.
      */
@@ -832,8 +917,8 @@ private void showListEditorDialog(int titleRes, int footerRes) {
     }
 
     private View getListEditorView(final Dialog dialog, String footerText) {
-        ContextThemeWrapper wrapper = new ContextThemeWrapper(getActivity(), R.style.Calypso_SiteSettingsTheme);
-        View view = View.inflate(wrapper, R.layout.list_editor, null);
+        Context themer = new ContextThemeWrapper(getActivity(), R.style.Calypso_SiteSettingsTheme);
+        View view = View.inflate(themer, R.layout.list_editor, null);
         ((TextView) view.findViewById(R.id.list_editor_footer_text)).setText(footerText);
 
         final MultiSelectListView list = (MultiSelectListView) view.findViewById(android.R.id.list);

From d3682b45b82a9f1d0536e541d29372df819ab269 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Sun, 13 Dec 2015 19:01:13 -0800
Subject: [PATCH 38/63] Creating constants/resources for strings

---
 .../android/ui/prefs/DotComSiteSettings.java   | 10 +++++++---
 .../ui/prefs/SelfHostedSiteSettings.java       | 18 ++++++++++--------
 .../ui/prefs/SiteSettingsInterface.java        |  2 ++
 WordPress/src/main/res/values/strings.xml      |  1 +
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java
index 3204c3dcd87e..d29f2c3424e0 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java
@@ -59,6 +59,10 @@ class DotComSiteSettings extends SiteSettingsInterface {
     private static final String SET_TITLE_KEY = "blogname";
     private static final String SET_DESC_KEY = "blogdescription";
 
+    // JSON response keys
+    private static final String SETTINGS_KEY = "settings";
+    private static final String UPDATED_KEY = "updated";
+
     // WP.com REST keys used in response to a categories GET request
     private static final String CAT_ID_KEY = "ID";
     private static final String CAT_NAME_KEY = "name";
@@ -92,7 +96,7 @@ public void onResponse(JSONObject response) {
                         mRemoteSettings.copyFrom(mSettings);
 
                         if (response != null) {
-                            JSONObject updated = response.optJSONObject("updated");
+                            JSONObject updated = response.optJSONObject(UPDATED_KEY);
                             if (updated == null) return;
                             HashMap<String, Object> properties = new HashMap<>();
                             Iterator<String> keys = updated.keys();
@@ -100,7 +104,7 @@ public void onResponse(JSONObject response) {
                                 String currentKey = keys.next();
                                 Object currentValue = updated.opt(currentKey);
                                 if (currentValue != null) {
-                                    properties.put("item_saved_" + currentKey, currentValue);
+                                    properties.put(SAVED_ITEM_PREFIX + currentKey, currentValue);
                                 }
                             }
                             AnalyticsUtils.trackWithCurrentBlogDetails(
@@ -151,7 +155,7 @@ public void onErrorResponse(VolleyError error) {
      */
     public void deserializeDotComRestResponse(Blog blog, JSONObject response) {
         if (blog == null || response == null) return;
-        JSONObject settingsObject = response.optJSONObject("settings");
+        JSONObject settingsObject = response.optJSONObject(SETTINGS_KEY);
 
         mRemoteSettings.username = blog.getUsername();
         mRemoteSettings.password = blog.getPassword();
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java
index 4a68ba486c21..781266b3a532 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java
@@ -3,6 +3,7 @@
 import android.app.Activity;
 import android.text.TextUtils;
 
+import org.wordpress.android.R;
 import org.wordpress.android.analytics.AnalyticsTracker;
 import org.wordpress.android.datasets.SiteSettingsTable;
 import org.wordpress.android.models.Blog;
@@ -25,11 +26,6 @@
 
 class SelfHostedSiteSettings extends SiteSettingsInterface {
     // XML-RPC wp.getOptions keys
-    private static final String BLOG_URL_KEY = "blog_url";
-    private static final String BLOG_TITLE_KEY = "blog_title";
-    private static final String BLOG_USERNAME_KEY = "username";
-    private static final String BLOG_PASSWORD_KEY = "password";
-    private static final String BLOG_TAGLINE_KEY = "blog_tagline";
     public static final String PRIVACY_KEY = "blog_public";
     public static final String DEF_CATEGORY_KEY = "default_category";
     public static final String DEF_POST_FORMAT_KEY = "default_post_format";
@@ -51,6 +47,12 @@ class SelfHostedSiteSettings extends SiteSettingsInterface {
     public static final String MODERATION_KEYS_KEY = "moderation_keys";
     public static final String BLACKLIST_KEYS_KEY = "blacklist_keys";
     public static final String SOFTWARE_VERSION_KEY = "software_version";
+
+    private static final String BLOG_URL_KEY = "blog_url";
+    private static final String BLOG_TITLE_KEY = "blog_title";
+    private static final String BLOG_USERNAME_KEY = "username";
+    private static final String BLOG_PASSWORD_KEY = "password";
+    private static final String BLOG_TAGLINE_KEY = "blog_tagline";
     private static final String BLOG_CATEGORY_ID_KEY = "categoryId";
     private static final String BLOG_CATEGORY_PARENT_ID_KEY = "parentId";
     private static final String BLOG_CATEGORY_DESCRIPTION_KEY = "categoryDescription";
@@ -103,7 +105,7 @@ public void onSuccess(long id, final Object result) {
                         for (String key : keys) {
                             Object currentValue = resultMap.get(key);
                             if (currentValue != null) {
-                                properties.put("item_saved_" + key, currentValue);
+                                properties.put(SAVED_ITEM_PREFIX + key, currentValue);
                             }
                         }
                     }
@@ -176,8 +178,8 @@ public void onSuccess(long id, final Object result) {
             if (result instanceof Map) {
                 AppLog.d(AppLog.T.API, "Received Options XML-RPC response.");
 
-                if (!versionSupported((Map) result)) {
-                    notifyUpdatedOnUiThread(new XMLRPCException("Unsupported WordPress version"));
+                if (!versionSupported((Map) result) && mActivity != null) {
+                    notifyUpdatedOnUiThread(new XMLRPCException(mActivity.getString(R.string.site_settings_unsupported_version_error)));
                 }
 
                 credentialsVerified(true);
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java
index fc5f3d7e56e8..2f351d515f1e 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java
@@ -47,6 +47,8 @@ public abstract class SiteSettingsInterface {
     public static final int ASCENDING_SORT = 0;
     public static final int DESCENDING_SORT = 1;
 
+    protected static final String SAVED_ITEM_PREFIX = "item_saved_";
+
     private static final String STANDARD_POST_FORMAT = "standard";
 
     /**
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index d42b35914b78..310ea9ac3102 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -505,6 +505,7 @@
     <string name="site_settings_start_over_title">Start Over</string>
     <string name="site_settings_delete_site_title">Delete Site</string>
     <string name="site_settings_remove_site_title">Remove Site</string>
+    <string name="site_settings_unsupported_version_error">Unsupported WordPress version</string>
     <string name="site_title_hint">In a few words, explain what this site is about</string>
     <string name="site_tagline_hint">A short description or catchy phrase to describe your blog</string>
     <string name="site_address_hint">Changing your address is not currently supported</string>

From ecaf8f985c0b1aa7e5e2fd9f0698ae1f9f0065f6 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Sun, 13 Dec 2015 19:28:23 -0800
Subject: [PATCH 39/63] Fixing switch implementation for paging and close after
 settings

---
 .../ui/prefs/SiteSettingsFragment.java        | 52 ++++++++++++++-----
 1 file changed, 40 insertions(+), 12 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index 5a00367fea64..57e6031ff1fd 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -125,6 +125,8 @@ public class SiteSettingsFragment extends PreferenceFragment
     // Used to ensure that settings are only fetched once throughout the lifecycle of the fragment
     private boolean mShouldFetch;
 
+    private boolean mSwitchChecked;
+
     // Used to customize Close After, Paging, and Multiple Links dialog views
     private NumberPicker mNumberPicker;
 
@@ -563,6 +565,12 @@ private View getDialogTitleView(int title) {
     private void showPagingDialog() {
         getNumberPickerDialog(true,
                 mSiteSettings.getPagingCount() > 0,
+                new CompoundButton.OnCheckedChangeListener() {
+                    @Override
+                    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                        mSwitchChecked = isChecked;
+                    }
+                },
                 R.string.site_settings_paging_title,
                 R.string.paging_description,
                 R.string.paging_header,
@@ -574,7 +582,11 @@ private void showPagingDialog() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         if (mSiteSettings.getPagingCount() != mNumberPicker.getValue()) {
-                            onPreferenceChange(mPagingPref, mNumberPicker.getValue());
+                            if (mSwitchChecked) {
+                                onPreferenceChange(mPagingPref, mNumberPicker.getValue());
+                            } else {
+                                onPreferenceChange(mPagingPref, 0);
+                            }
                         }
                     }
                 }, null);
@@ -583,6 +595,12 @@ public void onClick(DialogInterface dialog, int which) {
     private void showCloseAfterDialog() {
         getNumberPickerDialog(true,
                 mSiteSettings.getCloseAfter() > 0,
+                new CompoundButton.OnCheckedChangeListener() {
+                    @Override
+                    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                        mSwitchChecked = isChecked;
+                    }
+                },
                 R.string.close_after_switch_text,
                 R.string.close_after_description,
                 R.string.close_after_header,
@@ -594,7 +612,11 @@ private void showCloseAfterDialog() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         if (mSiteSettings.getCloseAfter() != mNumberPicker.getValue()) {
-                            onPreferenceChange(mCloseAfterPref, mNumberPicker.getValue());
+                            if (mSwitchChecked) {
+                                onPreferenceChange(mCloseAfterPref, mNumberPicker.getValue());
+                            } else {
+                                onPreferenceChange(mCloseAfterPref, 0);
+                            }
                         }
                     }
                 }, null);
@@ -609,6 +631,7 @@ public String format(int value) {
     private void showMultipleLinksDialog() {
         getNumberPickerDialog(false,
                 false,
+                null,
                 -1,
                 R.string.multiple_links_description,
                 -1,
@@ -627,16 +650,17 @@ public void onClick(DialogInterface dialog, int which) {
     }
 
     private void getNumberPickerDialog(boolean showSwitch,
-                                         boolean switchChecked,
-                                         int switchText,
-                                         int detail,
-                                         int header,
-                                         int min,
-                                         int max,
-                                         int cur,
-                                         int title,
-                                         DialogInterface.OnClickListener positive,
-                                         DialogInterface.OnClickListener negative) {
+                                       boolean switchChecked,
+                                       final CompoundButton.OnCheckedChangeListener switchListener,
+                                       int switchText,
+                                       int detail,
+                                       int header,
+                                       int min,
+                                       int max,
+                                       int cur,
+                                       int title,
+                                       DialogInterface.OnClickListener positive,
+                                       DialogInterface.OnClickListener negative) {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.Calypso_AlertDialog);
         View view = View.inflate(getActivity(), R.layout.number_picker_dialog, null);
         mNumberPicker = (NumberPicker) view.findViewById(R.id.number_picker);
@@ -653,6 +677,10 @@ private void getNumberPickerDialog(boolean showSwitch,
                 public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                     toggleContainer.setEnabled(isChecked);
                     mNumberPicker.setEnabled(isChecked);
+
+                    if (switchListener != null) {
+                        switchListener.onCheckedChanged(buttonView, isChecked);
+                    }
                 }
             });
         } else {

From 334f335d260713da1ad9ee255b7462fa3e35c664 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Mon, 14 Dec 2015 12:36:52 -0800
Subject: [PATCH 40/63] Renaming language selection stat

---
 .../java/org/wordpress/android/ui/prefs/SettingsFragment.java | 2 +-
 .../org/wordpress/android/analytics/AnalyticsTracker.java     | 2 +-
 .../wordpress/android/analytics/AnalyticsTrackerMixpanel.java | 2 +-
 .../wordpress/android/analytics/AnalyticsTrackerNosara.java   | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SettingsFragment.java
index e1a138ec7f8d..7c8881dc80be 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SettingsFragment.java
@@ -197,7 +197,7 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
                 if (position != 0) {
                     Map<String, Object> properties = new HashMap<String, Object>();
                     properties.put("forced_app_locale", conf.locale.toString());
-                    AnalyticsTracker.track(Stat.SETTINGS_LANGUAGE_SELECTION_FORCED, properties);
+                    AnalyticsTracker.track(Stat.ACCOUNT_SETTINGS_LANGUAGE_SELECTION_FORCED, properties);
                 }
 
                 // Language is now part of metadata, so we need to refresh them
diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java
index feec24e8a334..dc809c1798f8 100644
--- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java
+++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java
@@ -119,7 +119,7 @@ public enum Stat {
         THEMES_CUSTOMIZE_ACCESSED,
         THEMES_SUPPORT_ACCESSED,
         THEMES_DETAILS_ACCESSED,
-        SETTINGS_LANGUAGE_SELECTION_FORCED,
+        ACCOUNT_SETTINGS_LANGUAGE_SELECTION_FORCED,
         SITE_SETTINGS_ACCESSED,
         SITE_SETTINGS_ACCESSED_MORE_SETTINGS,
         SITE_SETTINGS_LEARN_MORE_CLICKED,
diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java
index c20407c07b81..de38e9d63792 100644
--- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java
+++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerMixpanel.java
@@ -781,7 +781,7 @@ private AnalyticsTrackerMixpanelInstructionsForStat instructionsForStat(
                 instructions = AnalyticsTrackerMixpanelInstructionsForStat.
                         mixpanelInstructionsForEventName("Themes - Details Accessed");
                 break;
-            case SETTINGS_LANGUAGE_SELECTION_FORCED:
+            case ACCOUNT_SETTINGS_LANGUAGE_SELECTION_FORCED:
                 instructions = AnalyticsTrackerMixpanelInstructionsForStat.
                         mixpanelInstructionsForEventName("Settings - Forced Language Selection");
                 break;
diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java
index cbd7976c3578..a3b645d2feed 100644
--- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java
+++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java
@@ -372,8 +372,8 @@ public void track(AnalyticsTracker.Stat stat, Map<String, ?> properties) {
             case THEMES_DETAILS_ACCESSED:
                 eventName = "themes_details_accessed";
                 break;
-            case SETTINGS_LANGUAGE_SELECTION_FORCED:
-                eventName = "settings_language_selection_forced";
+            case ACCOUNT_SETTINGS_LANGUAGE_SELECTION_FORCED:
+                eventName = "account_settings_language_selection_forced";
                 break;
             case SITE_SETTINGS_ACCESSED:
                 eventName = "site_settings_accessed";

From f9a0eeccc182b8d936866b2a5c5c3c8c36e53c3b Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Mon, 14 Dec 2015 12:41:13 -0800
Subject: [PATCH 41/63] Saving related post changes remotely

---
 .../org/wordpress/android/ui/prefs/SiteSettingsFragment.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index 57e6031ff1fd..cb7b62948f87 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -230,6 +230,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                         RelatedPostsDialog.SHOW_HEADER_KEY, false));
                 mSiteSettings.setShowRelatedPostImages(data.getBooleanExtra(
                         RelatedPostsDialog.SHOW_IMAGES_KEY, false));
+                mSiteSettings.saveSettings();
                 break;
         }
 

From 8de264efe19c4620f983d8cf2de6a6ed57fc64f6 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Mon, 14 Dec 2015 15:00:55 -0800
Subject: [PATCH 42/63] Hiding Settings option if user does not have permission
 to edit them

---
 .../org/wordpress/android/ui/main/MySiteFragment.java  | 10 +++++++++-
 WordPress/src/main/res/layout/my_site_fragment.xml     |  4 +++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java
index 8dd87e51ce31..0ca12125c937 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java
@@ -48,6 +48,8 @@ public class MySiteFragment extends Fragment
     private WPTextView mBlogSubtitleTextView;
     private LinearLayout mLookAndFeelHeader;
     private RelativeLayout mThemesContainer;
+    private View mConfigurationHeader;
+    private View mSettingsView;
     private View mFabView;
     private LinearLayout mNoSiteView;
     private ScrollView mScrollView;
@@ -116,6 +118,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         mBlogSubtitleTextView = (WPTextView) rootView.findViewById(R.id.my_site_subtitle_label);
         mLookAndFeelHeader = (LinearLayout) rootView.findViewById(R.id.my_site_look_and_feel_header);
         mThemesContainer = (RelativeLayout) rootView.findViewById(R.id.row_themes);
+        mConfigurationHeader = rootView.findViewById(R.id.row_configuration);
+        mSettingsView = rootView.findViewById(R.id.row_settings);
         mScrollView = (ScrollView) rootView.findViewById(R.id.scroll_view);
         mNoSiteView = (LinearLayout) rootView.findViewById(R.id.no_site_view);
         mNoSiteDrakeImageView = (ImageView) rootView.findViewById(R.id.my_site_no_site_view_drake);
@@ -186,7 +190,7 @@ public void onClick(View v) {
             }
         });
 
-        rootView.findViewById(R.id.row_settings).setOnClickListener(new View.OnClickListener() {
+        mSettingsView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 ActivityLauncher.viewBlogSettingsForResult(getActivity(), mBlog);
@@ -304,6 +308,10 @@ private void refreshBlogDetails() {
         mLookAndFeelHeader.setVisibility(themesVisibility);
         mThemesContainer.setVisibility(themesVisibility);
 
+        int settingsVisibility = mBlog.isAdmin() ? View.VISIBLE : View.GONE;
+        mConfigurationHeader.setVisibility(settingsVisibility);
+        mSettingsView.setVisibility(settingsVisibility);
+
         mBlavatarImageView.setImageUrl(GravatarUtils.blavatarFromUrl(mBlog.getUrl(), mBlavatarSz), WPNetworkImageView.ImageType.BLAVATAR);
 
         String blogName = StringUtils.unescapeHTML(mBlog.getBlogName());
diff --git a/WordPress/src/main/res/layout/my_site_fragment.xml b/WordPress/src/main/res/layout/my_site_fragment.xml
index dc315302f9ff..6ba434eece00 100644
--- a/WordPress/src/main/res/layout/my_site_fragment.xml
+++ b/WordPress/src/main/res/layout/my_site_fragment.xml
@@ -256,7 +256,9 @@
             </RelativeLayout>
 
             <!--Configuration-->
-            <LinearLayout style="@style/MySiteListHeaderLayout">
+            <LinearLayout
+                android:id="@+id/row_configuration"
+                style="@style/MySiteListHeaderLayout">
 
                 <org.wordpress.android.widgets.WPTextView
                     style="@style/MySiteListHeaderTextView"

From 475a5d56a18aae0b355d559267326fe31898ffc4 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Mon, 14 Dec 2015 16:56:05 -0800
Subject: [PATCH 43/63] Fixing self-hosted settings deserialization and
 password display

---
 .../android/ui/prefs/SelfHostedSiteSettings.java     | 12 +++++++-----
 .../android/ui/prefs/SummaryEditTextPreference.java  |  1 +
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java
index 781266b3a532..ef07cbd1253e 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java
@@ -180,6 +180,7 @@ public void onSuccess(long id, final Object result) {
 
                 if (!versionSupported((Map) result) && mActivity != null) {
                     notifyUpdatedOnUiThread(new XMLRPCException(mActivity.getString(R.string.site_settings_unsupported_version_error)));
+                    return;
                 }
 
                 credentialsVerified(true);
@@ -205,8 +206,9 @@ public void onFailure(long id, final Exception error) {
     private boolean versionSupported(Map map) {
         String version = getNestedMapValue(map, SOFTWARE_VERSION_KEY);
         if (TextUtils.isEmpty(version)) return false;
-        String[] split = version.split(".");
-        return Integer.valueOf(split[0]) >= REQUIRED_MAJOR_VERSION &&
+        String[] split = version.split("\\.");
+        return split.length > 0 &&
+                Integer.valueOf(split[0]) >= REQUIRED_MAJOR_VERSION &&
                 Integer.valueOf(split[1]) >= REQUIRED_MINOR_VERSION;
     }
 
@@ -325,9 +327,9 @@ private void deserializeOptionsResponse(SiteSettingsModel model, Map response) {
         String accountRequired = getNestedMapValue(response, REQUIRE_USER_ACCOUNT_KEY);
         String knownUsers = getNestedMapValue(response, WHITELIST_KNOWN_USERS_KEY);
         model.sendPingbacks = !TextUtils.isEmpty(sendPingbacks) && Integer.valueOf(sendPingbacks) > 0;
-        model.commentApprovalRequired = !TextUtils.isEmpty(approvalRequired) && Integer.valueOf(approvalRequired) > 0;
-        model.commentsRequireIdentity = !TextUtils.isEmpty(identityRequired) && Integer.valueOf(identityRequired) > 0;
-        model.commentsRequireUserAccount = !TextUtils.isEmpty(accountRequired) && Integer.valueOf(accountRequired) > 0;
+        model.commentApprovalRequired = !TextUtils.isEmpty(approvalRequired) && Boolean.valueOf(approvalRequired);
+        model.commentsRequireIdentity = !TextUtils.isEmpty(identityRequired) && Boolean.valueOf(identityRequired);
+        model.commentsRequireUserAccount = !TextUtils.isEmpty(accountRequired) && Boolean.valueOf(accountRequired);
         model.commentAutoApprovalKnownUsers = !TextUtils.isEmpty(knownUsers) && Boolean.valueOf(knownUsers);
         model.maxLinks = Integer.valueOf(getNestedMapValue(response, MAX_LINKS_KEY));
         mRemoteSettings.holdForModeration = new ArrayList<>();
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SummaryEditTextPreference.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SummaryEditTextPreference.java
index 6564732b8e9c..2ab7e866e4dc 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SummaryEditTextPreference.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SummaryEditTextPreference.java
@@ -84,6 +84,7 @@ protected void onBindView(@NonNull View view) {
         if (summaryView != null) {
             WPPrefUtils.layoutAsBody1(summaryView);
             summaryView.setEllipsize(TextUtils.TruncateAt.END);
+            summaryView.setInputType(getEditText().getInputType());
             if (mLines != -1) summaryView.setLines(mLines);
             if (mMaxLines != -1) summaryView.setMaxLines(mMaxLines);
         }

From 6641545208cefc3a3afc92ff450c6d75807d4da8 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Mon, 14 Dec 2015 18:53:31 -0800
Subject: [PATCH 44/63] Fixing issues with saving close after and paging
 settings

---
 .../ui/prefs/SiteSettingsFragment.java        | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index cb7b62948f87..01a60e6febde 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -125,6 +125,7 @@ public class SiteSettingsFragment extends PreferenceFragment
     // Used to ensure that settings are only fetched once throughout the lifecycle of the fragment
     private boolean mShouldFetch;
 
+    // Used with Close After and Paging dialogs to determine settings values
     private boolean mSwitchChecked;
 
     // Used to customize Close After, Paging, and Multiple Links dialog views
@@ -564,8 +565,9 @@ private View getDialogTitleView(int title) {
     }
 
     private void showPagingDialog() {
+        mSwitchChecked = mSiteSettings.getPagingCount() > 0;
         getNumberPickerDialog(true,
-                mSiteSettings.getPagingCount() > 0,
+                mSwitchChecked,
                 new CompoundButton.OnCheckedChangeListener() {
                     @Override
                     public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
@@ -582,20 +584,19 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        if (mSiteSettings.getPagingCount() != mNumberPicker.getValue()) {
-                            if (mSwitchChecked) {
-                                onPreferenceChange(mPagingPref, mNumberPicker.getValue());
-                            } else {
-                                onPreferenceChange(mPagingPref, 0);
-                            }
+                        if (mSwitchChecked && mSiteSettings.getPagingCount() != mNumberPicker.getValue()) {
+                            onPreferenceChange(mPagingPref, mNumberPicker.getValue());
+                        } else {
+                            onPreferenceChange(mPagingPref, 0);
                         }
                     }
                 }, null);
     }
 
     private void showCloseAfterDialog() {
+        mSwitchChecked = mSiteSettings.getCloseAfter() > 0;
         getNumberPickerDialog(true,
-                mSiteSettings.getCloseAfter() > 0,
+                mSwitchChecked,
                 new CompoundButton.OnCheckedChangeListener() {
                     @Override
                     public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
@@ -612,12 +613,10 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        if (mSiteSettings.getCloseAfter() != mNumberPicker.getValue()) {
-                            if (mSwitchChecked) {
-                                onPreferenceChange(mCloseAfterPref, mNumberPicker.getValue());
-                            } else {
-                                onPreferenceChange(mCloseAfterPref, 0);
-                            }
+                        if (mSwitchChecked && mSiteSettings.getCloseAfter() != mNumberPicker.getValue()) {
+                            onPreferenceChange(mCloseAfterPref, mNumberPicker.getValue());
+                        } else {
+                            onPreferenceChange(mCloseAfterPref, 0);
                         }
                     }
                 }, null);

From 866afb5dc8c12dbb695fad87754fd4506de2fe92 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Mon, 14 Dec 2015 18:56:36 -0800
Subject: [PATCH 45/63] Saving Blacklist and Hold for Moderation lists when
 dismissing dialog

---
 .../org/wordpress/android/ui/prefs/SiteSettingsFragment.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index 01a60e6febde..f03b72f72187 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -437,6 +437,7 @@ public boolean onItemLongClick(AdapterView<?> parent, View view, int position, l
 
     @Override
     public void onDismiss(DialogInterface dialog) {
+        mSiteSettings.saveSettings();
         mEditingList = null;
     }
 

From 91ff1dd9b5d6be80afee746ed37e267299410445 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Mon, 14 Dec 2015 22:12:39 -0800
Subject: [PATCH 46/63] Fixing some broken discussion settings serialization

---
 .../android/ui/prefs/DotComSiteSettings.java  |  4 ++++
 .../ui/prefs/SelfHostedSiteSettings.java      | 20 +++++++++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java
index d29f2c3424e0..fc5ce7ffb6c7 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java
@@ -315,6 +315,8 @@ public Map<String, String> serializeDotComParams() {
             }
             if (builder.length() > 1) {
                 params.put(MODERATION_KEYS_KEY, builder.substring(0, builder.length() - 1));
+            } else {
+                params.put(BLACKLIST_KEYS_KEY, "");
             }
         }
         if (mSettings.blacklist != null && !mSettings.blacklist.equals(mRemoteSettings.blacklist)) {
@@ -325,6 +327,8 @@ public Map<String, String> serializeDotComParams() {
             }
             if (builder.length() > 1) {
                 params.put(BLACKLIST_KEYS_KEY, builder.substring(0, builder.length() - 1));
+            } else {
+                params.put(BLACKLIST_KEYS_KEY, "");
             }
         }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java
index ef07cbd1253e..40ebe63bcc34 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java
@@ -274,10 +274,10 @@ private Map<String, String> serializeSelfHostedParams() {
             }
         }
         if (mSettings.commentsRequireIdentity != mRemoteSettings.commentsRequireIdentity) {
-            params.put(REQUIRE_IDENTITY_KEY, String.valueOf(mSettings.commentsRequireIdentity));
+            params.put(REQUIRE_IDENTITY_KEY, String.valueOf(mSettings.commentsRequireIdentity ? 1 : 0));
         }
         if (mSettings.commentsRequireUserAccount != mRemoteSettings.commentsRequireUserAccount) {
-            params.put(REQUIRE_USER_ACCOUNT_KEY, String.valueOf(mSettings.commentsRequireUserAccount));
+            params.put(REQUIRE_USER_ACCOUNT_KEY, String.valueOf(mSettings.commentsRequireUserAccount ? 1 : 0));
         }
         if (mSettings.commentAutoApprovalKnownUsers != mRemoteSettings.commentAutoApprovalKnownUsers) {
             params.put(WHITELIST_KNOWN_USERS_KEY, String.valueOf(mSettings.commentAutoApprovalKnownUsers));
@@ -291,7 +291,11 @@ private Map<String, String> serializeSelfHostedParams() {
                 builder.append(key);
                 builder.append("\n");
             }
-            params.put(MODERATION_KEYS_KEY, builder.substring(0, builder.length() - 1));
+            if (builder.length() > 1) {
+                params.put(MODERATION_KEYS_KEY, builder.substring(0, builder.length() - 1));
+            } else {
+                params.put(BLACKLIST_KEYS_KEY, "");
+            }
         }
         if (mSettings.blacklist != null && !mSettings.blacklist.equals(mRemoteSettings.blacklist)) {
             StringBuilder builder = new StringBuilder();
@@ -299,7 +303,11 @@ private Map<String, String> serializeSelfHostedParams() {
                 builder.append(key);
                 builder.append("\n");
             }
-            params.put(BLACKLIST_KEYS_KEY, builder.substring(0, builder.length() - 1));
+            if (builder.length() > 1) {
+                params.put(BLACKLIST_KEYS_KEY, builder.substring(0, builder.length() - 1));
+            } else {
+                params.put(BLACKLIST_KEYS_KEY, "");
+            }
         }
 
         return params;
@@ -328,8 +336,8 @@ private void deserializeOptionsResponse(SiteSettingsModel model, Map response) {
         String knownUsers = getNestedMapValue(response, WHITELIST_KNOWN_USERS_KEY);
         model.sendPingbacks = !TextUtils.isEmpty(sendPingbacks) && Integer.valueOf(sendPingbacks) > 0;
         model.commentApprovalRequired = !TextUtils.isEmpty(approvalRequired) && Boolean.valueOf(approvalRequired);
-        model.commentsRequireIdentity = !TextUtils.isEmpty(identityRequired) && Boolean.valueOf(identityRequired);
-        model.commentsRequireUserAccount = !TextUtils.isEmpty(accountRequired) && Boolean.valueOf(accountRequired);
+        model.commentsRequireIdentity = !TextUtils.isEmpty(identityRequired) && Integer.valueOf(identityRequired) > 0;
+        model.commentsRequireUserAccount = !TextUtils.isEmpty(accountRequired) && Integer.valueOf(identityRequired) > 0;
         model.commentAutoApprovalKnownUsers = !TextUtils.isEmpty(knownUsers) && Boolean.valueOf(knownUsers);
         model.maxLinks = Integer.valueOf(getNestedMapValue(response, MAX_LINKS_KEY));
         mRemoteSettings.holdForModeration = new ArrayList<>();

From 0b5b59ac7d836bc46609adda929ba5a5610fb166 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Tue, 15 Dec 2015 16:05:53 -0800
Subject: [PATCH 47/63] Ensuring non-null formats list when calling
 getFormats()

---
 .../org/wordpress/android/ui/prefs/SiteSettingsInterface.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java
index 2f351d515f1e..c1010937517e 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java
@@ -183,6 +183,9 @@ public boolean getLocation() {
     }
 
     public Map<String, String> getFormats() {
+        if (mSettings.postFormats == null) {
+            mSettings.postFormats = new HashMap<>();
+        }
         return mSettings.postFormats;
     }
 

From 6b25f98c768e2937f849e85492954a19f6356653 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Tue, 15 Dec 2015 17:08:27 -0800
Subject: [PATCH 48/63] Strings cleanup

---
 .../ui/prefs/SiteSettingsFragment.java        |  38 +--
 WordPress/src/main/res/layout/list_editor.xml |   2 +-
 .../main/res/layout/related_posts_dialog.xml  |  22 +-
 WordPress/src/main/res/values/strings.xml     | 305 +++++++++---------
 WordPress/src/main/res/xml/site_settings.xml  |  86 +++--
 5 files changed, 227 insertions(+), 226 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index f03b72f72187..0c9b708a7770 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -306,12 +306,12 @@ public boolean onPreferenceClick(Preference preference) {
         } else if (preference == mModerationHoldPref) {
             mEditingList = mSiteSettings.getModerationKeys();
             showListEditorDialog(R.string.site_settings_moderation_hold_title,
-                    R.string.hold_for_moderation_description);
+                    R.string.site_settings_hold_for_moderation_description);
             return true;
         } else if (preference == mBlacklistPref) {
             mEditingList = mSiteSettings.getBlacklistKeys();
             showListEditorDialog(R.string.site_settings_blacklist_title,
-                    R.string.blacklist_description);
+                    R.string.site_settings_blacklist_description);
             return true;
         } else if (preference == mDeleteSitePref) {
             removeBlogWithConfirmation();
@@ -379,7 +379,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
         } else if (preference == mMultipleLinksPref) {
             mSiteSettings.setMultipleLinks(Integer.parseInt(newValue.toString()));
             mMultipleLinksPref.setSummary(getResources()
-                    .getQuantityString(R.plurals.multiple_links_summary,
+                    .getQuantityString(R.plurals.site_settings_multiple_links_summary,
                             mSiteSettings.getMultipleLinks(),
                             mSiteSettings.getMultipleLinks()));
         } else if (preference == mUsernamePref) {
@@ -576,8 +576,8 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                     }
                 },
                 R.string.site_settings_paging_title,
-                R.string.paging_description,
-                R.string.paging_header,
+                R.string.site_settings_paging_dialog_description,
+                R.string.site_settings_paging_dialog_header,
                 1,
                 getResources().getInteger(R.integer.paging_limit),
                 mSiteSettings.getPagingCount(),
@@ -604,9 +604,9 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                         mSwitchChecked = isChecked;
                     }
                 },
-                R.string.close_after_switch_text,
-                R.string.close_after_description,
-                R.string.close_after_header,
+                R.string.site_settings_close_after_dialog_switch_text,
+                R.string.site_settings_close_after_dialog_description,
+                R.string.site_settings_close_after_dialog_header,
                 1,
                 getResources().getInteger(R.integer.close_after_limit),
                 mSiteSettings.getCloseAfter(),
@@ -634,7 +634,7 @@ private void showMultipleLinksDialog() {
                 false,
                 null,
                 -1,
-                R.string.multiple_links_description,
+                R.string.site_settings_multiple_links_dialog_description,
                 -1,
                 0,
                 getResources().getInteger(R.integer.max_links_limit),
@@ -739,7 +739,7 @@ private void setPreferencesFromSiteSettings() {
                         : -1 : 1;
         setDetailListPreferenceValue(mWhitelistPref, String.valueOf(approval), getWhitelistSummary(approval));
         mMultipleLinksPref.setSummary(getResources()
-                .getQuantityString(R.plurals.multiple_links_summary,
+                .getQuantityString(R.plurals.site_settings_multiple_links_summary,
                         mSiteSettings.getMultipleLinks(),
                         mSiteSettings.getMultipleLinks()));
         mIdentityRequiredPreference.setChecked(mSiteSettings.getIdentityRequired());
@@ -863,11 +863,11 @@ private String getPrivacySummary(int privacy) {
         if (isAdded()) {
             switch (privacy) {
                 case -1:
-                    return getString(R.string.privacy_private);
+                    return getString(R.string.site_settings_privacy_private_summary);
                 case 0:
-                    return getString(R.string.privacy_hidden);
+                    return getString(R.string.site_settings_privacy_hidden_summary);
                 case 1:
-                    return getString(R.string.privacy_public);
+                    return getString(R.string.site_settings_privacy_public_summary);
             }
         }
         return "";
@@ -894,24 +894,24 @@ private String getSortOrderSummary(int order) {
     private String getThreadingSummary(int levels) {
         if (!isAdded()) return "";
         if (levels <= 1) return getString(R.string.none);
-        return String.format(getString(R.string.levels_quantity), levels);
+        return String.format(getString(R.string.site_settings_threading_summary), levels);
     }
 
     private String getPagingSummary(int count) {
         if (!isAdded()) return "";
         if (count == 0) return getString(R.string.none);
-        return getResources().getQuantityString(R.plurals.paging_quantity, count, count);
+        return getResources().getQuantityString(R.plurals.site_settings_paging_summary, count, count);
     }
 
     private String getWhitelistSummary(int value) {
         if (isAdded()) {
             switch (value) {
                 case -1:
-                    return getString(R.string.whitelist_summary_no_users);
+                    return getString(R.string.site_settings_whitelist_none_summary);
                 case 0:
-                    return getString(R.string.whitelist_summary_known_users);
+                    return getString(R.string.site_settings_whitelist_known_summary);
                 case 1:
-                    return getString(R.string.whitelist_summary_all_users);
+                    return getString(R.string.site_settings_whitelist_all_summary);
             }
         }
         return "";
@@ -1000,7 +1000,7 @@ public void onClick(View v) {
                         new AlertDialog.Builder(getActivity(), R.style.Calypso_AlertDialog);
                 final EditText input = new EditText(getActivity());
                 WPPrefUtils.layoutAsInput(input);
-                input.setHint(R.string.list_editor_input_hint);
+                input.setHint(R.string.site_settings_list_editor_input_hint);
                 builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
diff --git a/WordPress/src/main/res/layout/list_editor.xml b/WordPress/src/main/res/layout/list_editor.xml
index 198057ccffa2..eb5df8698c67 100644
--- a/WordPress/src/main/res/layout/list_editor.xml
+++ b/WordPress/src/main/res/layout/list_editor.xml
@@ -15,7 +15,7 @@
         android:paddingRight="@dimen/margin_extra_large"
         android:paddingEnd="@dimen/margin_extra_large"
         android:paddingTop="@dimen/margin_extra_large"
-        android:text="@string/no_items"
+        android:text="@string/site_settings_list_editor_no_items_text"
         android:textColor="@color/grey_lighten_10"
         android:textSize="@dimen/text_sz_large"
         android:visibility="gone" />
diff --git a/WordPress/src/main/res/layout/related_posts_dialog.xml b/WordPress/src/main/res/layout/related_posts_dialog.xml
index 14575abbb8c9..bdd5e8e3e8e9 100644
--- a/WordPress/src/main/res/layout/related_posts_dialog.xml
+++ b/WordPress/src/main/res/layout/related_posts_dialog.xml
@@ -26,7 +26,7 @@
             android:id="@+id/toggle_related_posts_switch"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/related_posts_switch_title"
+            android:text="@string/site_settings_rp_switch_title"
             android:textColor="@color/grey_dark"
             android:textSize="@dimen/text_sz_large"
             app:fontFamily="openSans"
@@ -36,7 +36,7 @@
             android:id="@+id/toggleRelatedPostsSummary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/related_posts_switch_summary"
+            android:text="@string/site_settings_rp_switch_summary"
             android:textColor="@color/grey_darken_10"
             android:textSize="@dimen/text_sz_small"
             app:fontFamily="openSans"
@@ -49,7 +49,7 @@
             android:layout_marginTop="12dp"
             android:textColor="@color/grey_dark"
             android:textSize="@dimen/text_sz_medium"
-            android:text="@string/related_posts_show_header_title" />
+            android:text="@string/site_settings_rp_show_header_title" />
 
         <CheckBox
             android:id="@+id/show_images_checkbox"
@@ -58,7 +58,7 @@
             android:layout_marginTop="6dp"
             android:textColor="@color/grey_dark"
             android:textSize="@dimen/text_sz_medium"
-            android:text="@string/related_posts_show_images_title" />
+            android:text="@string/site_settings_rp_show_images_title" />
 
         <View
             android:layout_width="match_parent"
@@ -84,7 +84,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="8dp"
-            android:text="@string/related_posts_preview_header"
+            android:text="@string/site_settings_rp_preview_header"
             android:textStyle="bold"
             android:textSize="@dimen/text_sz_medium"
             android:textColor="@color/related_posts_list_header"
@@ -112,7 +112,7 @@
                 android:textStyle="bold"
                 android:textSize="@dimen/text_sz_medium"
                 android:textColor="@color/grey_dark"
-                android:text="@string/related_post_preview1_title"
+                android:text="@string/site_settings_rp_preview1_title"
                 app:fontFamily="openSans"
                 app:fontVariation="light" />
 
@@ -124,7 +124,7 @@
                 android:textStyle="italic"
                 android:textSize="@dimen/text_sz_related_post_small"
                 android:textColor="@color/grey_dark"
-                android:text="@string/related_post_preview1_site"
+                android:text="@string/site_settings_rp_preview1_site"
                 app:fontFamily="openSans"
                 app:fontVariation="normal" />
 
@@ -143,7 +143,7 @@
                 android:textStyle="bold"
                 android:textSize="@dimen/text_sz_medium"
                 android:textColor="@color/grey_dark"
-                android:text="@string/related_post_preview2_title"
+                android:text="@string/site_settings_rp_preview2_title"
                 app:fontFamily="openSans"
                 app:fontVariation="light" />
 
@@ -155,7 +155,7 @@
                 android:textStyle="italic"
                 android:textSize="@dimen/text_sz_related_post_small"
                 android:textColor="@color/grey_dark"
-                android:text="@string/related_post_preview2_site"
+                android:text="@string/site_settings_rp_preview2_site"
                 app:fontFamily="openSans"
                 app:fontVariation="normal" />
 
@@ -174,7 +174,7 @@
                 android:textStyle="bold"
                 android:textSize="@dimen/text_sz_medium"
                 android:textColor="@color/grey_dark"
-                android:text="@string/related_post_preview3_title"
+                android:text="@string/site_settings_rp_preview3_title"
                 app:fontFamily="openSans"
                 app:fontVariation="light" />
 
@@ -186,7 +186,7 @@
                 android:textStyle="italic"
                 android:textSize="@dimen/text_sz_related_post_small"
                 android:textColor="@color/grey_dark"
-                android:text="@string/related_post_preview3_site"
+                android:text="@string/site_settings_rp_preview3_site"
                 app:fontFamily="openSans"
                 app:fontVariation="normal" />
         </LinearLayout>
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index 19ec5bc0ca5f..01dc9a7017d3 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -177,7 +177,7 @@
     <string name="media_details_copy_url_toast">URL copied to clipboard</string>
 
     <!-- tab titles -->
-    <string name="tab_comments">Comments</string>
+    <string name="tab_comments">@string/comments</string>
 
     <!-- themes -->
     <string name="themes_live_preview">Live preview</string>
@@ -222,8 +222,8 @@
     <string name="button_preview">Preview</string>
     <string name="button_stats">Stats</string>
     <string name="button_trash">Trash</string>
-    <string name="button_delete">Delete</string>
-    <string name="button_more">More</string>
+    <string name="button_delete">@string/delete</string>
+    <string name="button_more">@string/more</string>
     <string name="button_back">Back</string>
     <string name="button_revert">Revert</string>
 
@@ -465,141 +465,97 @@
     <string name="pref_key_site_delete_site" translatable="false">wp_pref_site_delete_site</string>
     <string name="pref_key_site_remove_site" translatable="false">wp_pref_site_remove_site</string>
 
+    <!--     Begin     -->
     <!-- Site Settings -->
+    <!--               -->
+
+    <!-- General -->
+    <string name="discussion">Discussion</string>
+    <string name="privacy">Privacy</string>
+    <string name="related_posts">Related Posts</string>
+    <string name="more">More</string>
+    <string name="comments">Comments</string>
+    <string name="close_after">Close after</string>
+    <string name="oldest_first">Oldest first</string>
+    <string name="newest_first">Newest first</string>
+    <plurals name="days_quantity">
+        <item quantity="one">1 day</item>
+        <item quantity="other">%d days</item>
+    </plurals>
+
+    <!-- PreferenceCategory Headers -->
     <string name="site_settings_general_header">General</string>
     <string name="site_settings_account_header">Account</string>
     <string name="site_settings_writing_header">Writing</string>
+    <string name="site_settings_discussion_header">@string/discussion</string>
+    <string name="site_settings_discussion_new_posts_header">Defaults for New Posts</string>
+    <string name="site_settings_comments_header">@string/comments</string>
+
+    <!-- Preference Titles -->
     <string name="site_settings_title_title">Site Title</string>
     <string name="site_settings_tagline_title">Tagline</string>
     <string name="site_settings_address_title">Address</string>
-    <string name="site_settings_visibility_title">Privacy</string>
-    <string name="site_settings_username_title">Username</string>
-    <string name="site_settings_password_title">Password</string>
+    <string name="site_settings_privacy_title">@string/privacy</string>
     <string name="site_settings_language_title">@string/language</string>
+    <string name="site_settings_username_title">@string/username</string>
+    <string name="site_settings_password_title">@string/password</string>
     <string name="site_settings_location_title">Enable Location</string>
-    <string name="site_settings_category_title">Default Category</string>
-    <string name="site_settings_format_title">Default Format</string>
-    <string name="site_settings_related_posts_title">Related Posts</string>
-    <string name="site_settings_discussion_title">Discussion</string>
-    <string name="site_settings_danger_title">Danger!</string>
-    <string name="site_settings_discussion_defaults_header">Defaults for New Posts</string>
+    <string name="site_settings_default_category_title">Default Category</string>
+    <string name="site_settings_default_format_title">Default Format</string>
+    <string name="site_settings_related_posts_title">@string/related_posts</string>
+    <string name="site_settings_more_title">@string/more</string>
     <string name="site_settings_allow_comments_title">Allow Comments</string>
     <string name="site_settings_send_pingbacks_title">Send Pingbacks</string>
     <string name="site_settings_receive_pingbacks_title">Receive Pingbacks</string>
-    <string name="site_settings_more_discussion_title">More</string>
-    <string name="site_settings_comments_header">Comments</string>
-    <string name="site_settings_close_after_title">Close after</string>
-    <string name="site_settings_close_after_dialog_title">Close commenting</string>
+    <string name="site_settings_identity_required_title">Must include name and email</string>
+    <string name="site_settings_account_required_title">Users must be signed in</string>
+    <string name="site_settings_close_after_title">@string/close_after</string>
     <string name="site_settings_sort_by_title">Sort by</string>
     <string name="site_settings_threading_title">Threading</string>
     <string name="site_settings_paging_title">Paging</string>
-    <string name="site_settings_manual_approval_title">Must be manually approved</string>
-    <string name="site_settings_identity_title">Must include name and email</string>
-    <string name="site_settings_account_required_title">Users must be signed in</string>
-    <string name="site_settings_auto_approve_header">Automatically approve comments</string>
     <string name="site_settings_whitelist_title">Automatically approve</string>
     <string name="site_settings_multiple_links_title">Links in comments</string>
-    <string name="site_settings_multiple_links_summary">Require manual approval for more than %d links</string>
     <string name="site_settings_moderation_hold_title">Hold for Moderation</string>
     <string name="site_settings_blacklist_title">Blacklist</string>
-    <string name="site_settings_start_over_title">Start Over</string>
     <string name="site_settings_delete_site_title">Delete Site</string>
-    <string name="site_settings_remove_site_title">Remove Site</string>
-    <string name="site_settings_unsupported_version_error">Unsupported WordPress version</string>
-    <string name="site_title_hint">In a few words, explain what this site is about</string>
-    <string name="site_tagline_hint">A short description or catchy phrase to describe your blog</string>
-    <string name="site_address_hint">Changing your address is not currently supported</string>
-    <string name="site_privacy_hint">Controls who can see your site</string>
-    <string name="site_language_hint">Language this blog is primarily written in</string>
-    <string name="site_username_hint">Current user account</string>
-    <string name="site_password_hint">Change your password</string>
-    <string name="site_location_hint">Automatically add location data to your posts</string>
-    <string name="site_category_hint">Sets new post category</string>
-    <string name="site_format_hint">Sets new post format</string>
-    <string name="site_related_posts_hint">Show or hide related posts in reader</string>
-    <string name="site_discussion_hint">View and change your sites discussion settings</string>
-    <string name="site_allow_comments_hint">Allow readers to post comments</string>
-    <string name="site_send_pingbacks_hint">Attempt to notify any blogs linked to from the article</string>
-    <string name="site_receive_pingbacks_hint">Allow link notifications from other blogs</string>
-    <string name="site_close_after_hint">Disallow comments after the specified time</string>
-    <string name="site_sort_by_hint">Determines the order comments are displayed</string>
-    <string name="site_threading_hint">Allow nested comments to a certain depth</string>
-    <string name="site_paging_hint">Display comments in chunks of a specified size</string>
-    <string name="site_manual_approval_hint">Comments must be manually approved</string>
-    <string name="site_identity_required_hint">Comment author must fill out name and e-mail</string>
-    <string name="site_user_account_required_hint">Users must be registered and logged in to comment</string>
-    <string name="site_whitelist_hint">Comment author must have a previously approved comment</string>
-    <string name="site_multiple_links_hint">Ignores link limit from known users</string>
-    <string name="site_moderation_hold_hint">Comments that match a filter are put in the moderation queue</string>
-    <string name="site_blacklist_hint">Comments that match a filter are marked as spam</string>
-    <string name="site_settings_related_posts_summary">Show related content after posts</string>
-    <string name="site_settings_disconnected_toast">Disconnected, editing disabled.</string>
-    <string name="site_settings_save_success">Site settings updated</string>
-    <string name="site_settings_learn_more_desc">In the Default article settings, there are three options. These settings are defaults for new posts or pages, which can always be changed individually on each article.</string>
-    <string name="site_settings_learn_more_bullets">The Allow Comment option allows you to enable or disable comments by default.</string>
-    <string name="site_settings_learn_more_caption">You can override thee settings for individual posts.</string>
-    <string name="related_posts_switch_title">Show Related Posts</string>
-    <string name="related_posts_switch_summary">Related Posts displays relevant content from your site below your posts.</string>
-    <string name="related_posts_show_header_title">Show Header</string>
-    <string name="related_posts_show_images_title">Show Images</string>
-    <string name="related_posts_preview_header">Related Posts</string>
-    <string name="related_post_preview1_title">Big iPhone/iPad Update Now Available</string>
-    <string name="related_post_preview1_site">in \"Mobile\"</string>
-    <string name="related_post_preview2_title">The WordPress for Android App Gets a Big Facelift</string>
-    <string name="related_post_preview2_site">in \"Apps\"</string>
-    <string name="related_post_preview3_title">Upgrade Focus: VideoPress For Weddings</string>
-    <string name="related_post_preview3_site">in \"Upgrade\"</string>
-    <string name="list_editor_input_hint">Enter a word or phrase</string>
-    <string name="hold_for_moderation_description">When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the moderation queue. You can enter partial words, so \"press\" will match \"WordPress.\"</string>
-    <string name="blacklist_description">When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be marked as spam. You can enter partial words, so \"press\" will match \"WordPress.\"</string>
-    <string name="paging_description">Break comment threads into multiple pages.</string>
-    <string name="paging_header">Comments per page</string>
-    <string name="close_after_header">Close after</string>
-    <string name="close_after_description">Automatically close comments on articles.</string>
-    <string name="close_after_switch_text">Automatically close</string>
-    <string name="multiple_links_description">Require approval for comments that include more than this number of links.</string>
-    <string name="oldest_first">Oldest first</string>
-    <string name="newest_first">Newest first</string>
-    <string name="no_items">No items</string>
-    <plurals name="multiple_links_summary">
+
+    <!-- Preference Summaries -->
+    <string name="site_settings_privacy_public_summary">Public</string>
+    <string name="site_settings_privacy_hidden_summary">Hidden</string>
+    <string name="site_settings_privacy_private_summary">Private</string>
+    <string name="site_settings_threading_summary">%d levels</string>
+    <string name="site_settings_whitelist_all_summary">Comments from all users</string>
+    <string name="site_settings_whitelist_known_summary">Comments from known users</string>
+    <string name="site_settings_whitelist_none_summary">@string/none</string>
+    <string-array name="site_settings_auto_approve_details">
+        <item>Require manual approval for everyone\'s comments.</item>
+        <item>Automatically approve if the user has a previously approved comment.</item>
+        <item>Automatically approve everyone\'s comments.</item>
+    </string-array>
+    <plurals name="site_settings_multiple_links_summary">
         <item quantity="one">Require approval for more than 1 link</item>
         <item quantity="other">Require approval for more than %d links</item>
     </plurals>
+    <plurals name="site_settings_paging_summary">
+        <item quantity="one">1 comment per page</item>
+        <item quantity="other">%d comments per page</item>
+    </plurals>
+    <string-array name="privacy_details">
+        <item>Your site is visible to everyone and may be indexed by search engines</item>
+        <item>Your site is visible to everyone but asks search engines not to index it</item>
+        <item>Your site is visible only to you and users you approve</item>
+    </string-array>
+
+    <!-- Preference Entries -->
     <string-array name="site_settings_auto_approve_entries">
         <item>No comments</item>
         <item>Known users\' comments</item>
         <item>All users</item>
     </string-array>
-    <string-array name="site_settings_auto_approve_values">
-        <item>-1</item>
-        <item>0</item>
-        <item>1</item>
-    </string-array>
-    <string-array name="site_settings_auto_approve_details">
-        <item>Require manual approval for everyone\'s comments.</item>
-        <item>Automatically approve if the user has a previously approved comment.</item>
-        <item>Automatically approve everyone\'s comments.</item>
-    </string-array>
-    <string-array name="site_settings_close_after_entries">
-        <item>@string/never</item>
-        <item>One day</item>
-        <item>One week</item>
-        <item>One month</item>
-    </string-array>
-    <string-array name="site_settings_close_after_values">
-        <item>0</item>
-        <item>1</item>
-        <item>7</item>
-        <item>30</item>
-    </string-array>
     <string-array name="site_settings_sort_entries">
         <item>@string/oldest_first</item>
         <item>@string/newest_first</item>
     </string-array>
-    <string-array name="site_settings_sort_values">
-        <item>0</item>
-        <item>1</item>
-    </string-array>
     <string-array name="site_settings_threading_entries">
         <item>@string/none</item>
         <item>Two levels</item>
@@ -612,6 +568,22 @@
         <item>Nine levels</item>
         <item>Ten levels</item>
     </string-array>
+    <string-array name="site_settings_privacy_entries">
+        <item>@string/site_settings_privacy_public_summary</item>
+        <item>@string/site_settings_privacy_hidden_summary</item>
+        <item>@string/site_settings_privacy_private_summary</item>
+    </string-array>
+
+    <!-- Preference Values -->
+    <string-array name="site_settings_auto_approve_values">
+        <item>-1</item>
+        <item>0</item>
+        <item>1</item>
+    </string-array>
+    <string-array name="site_settings_sort_values">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
     <string-array name="site_settings_threading_values">
         <item>1</item>
         <item>2</item>
@@ -624,50 +596,83 @@
         <item>9</item>
         <item>10</item>
     </string-array>
-    <string-array name="site_settings_paging_entries">
-        <item>@string/none</item>
-        <item>50 comments per page</item>
-        <item>100 comments per page</item>
-        <item>200 comments per page</item>
-    </string-array>
-    <string-array name="site_settings_paging_values">
-        <item>0</item>
-        <item>50</item>
-        <item>100</item>
-        <item>200</item>
-    </string-array>
-    <plurals name="days_quantity">
-        <item quantity="one">1 day</item>
-        <item quantity="other">%d days</item>
-    </plurals>
-    <plurals name="paging_quantity">
-        <item quantity="one">1 comment per page</item>
-        <item quantity="other">%d comments per page</item>
-    </plurals>
-    <string name="levels_quantity">%d levels</string>
-    <string name="whitelist_summary_all_users">Comments from all users</string>
-    <string name="whitelist_summary_known_users">Comments from known users</string>
-    <string name="whitelist_summary_no_users">@string/none</string>
-    <string name="privacy">Privacy</string>
-    <string name="privacy_public">Public</string>
-    <string name="privacy_hidden">Hidden</string>
-    <string name="privacy_private">Private</string>
-    <string-array name="privacy_entries">
-        <item>@string/privacy_public</item>
-        <item>@string/privacy_hidden</item>
-        <item>@string/privacy_private</item>
-    </string-array>
-    <string-array name="privacy_details">
-        <item>Your site is visible to everyone and may be indexed by search engines</item>
-        <item>Your site is visible to everyone but asks search engines not to index it</item>
-        <item>Your site is visible only to you and users you approve</item>
-    </string-array>
-    <string-array name="privacy_values">
+    <string-array name="site_settings_privacy_values">
         <item>1</item>
         <item>0</item>
         <item>-1</item>
     </string-array>
 
+    <!-- Hints (long press) -->
+    <string name="site_settings_title_hint">In a few words, explain what this site is about</string>
+    <string name="site_settings_tagline_hint">A short description or catchy phrase to describe your blog</string>
+    <string name="site_settings_address_hint">Changing your address is not currently supported</string>
+    <string name="site_settings_privacy_hint">Controls who can see your site</string>
+    <string name="site_settings_language_hint">Language this blog is primarily written in</string>
+    <string name="site_settings_username_hint">Current user account</string>
+    <string name="site_settings_password_hint">Change your password</string>
+    <string name="site_settings_location_hint">Automatically add location data to your posts</string>
+    <string name="site_settings_category_hint">Sets new post category</string>
+    <string name="site_settings_format_hint">Sets new post format</string>
+    <string name="site_settings_related_posts_hint">Show or hide related posts in reader</string>
+    <string name="site_settings_more_hint">View all available Discussion settings</string>
+    <string name="site_settings_discussion_hint">View and change your sites discussion settings</string>
+    <string name="site_settings_allow_comments_hint">Allow readers to post comments</string>
+    <string name="site_settings_send_pingbacks_hint">Attempt to notify any blogs linked to from the article</string>
+    <string name="site_settings_receive_pingbacks_hint">Allow link notifications from other blogs</string>
+    <string name="site_settings_close_after_hint">Disallow comments after the specified time</string>
+    <string name="site_settings_sort_by_hint">Determines the order comments are displayed</string>
+    <string name="site_settings_threading_hint">Allow nested comments to a certain depth</string>
+    <string name="site_settings_paging_hint">Display comments in chunks of a specified size</string>
+    <string name="site_settings_manual_approval_hint">Comments must be manually approved</string>
+    <string name="site_settings_identity_required_hint">Comment author must fill out name and e-mail</string>
+    <string name="site_settings_user_account_required_hint">Users must be registered and logged in to comment</string>
+    <string name="site_settings_whitelist_hint">Comment author must have a previously approved comment</string>
+    <string name="site_settings_multiple_links_hint">Ignores link limit from known users</string>
+    <string name="site_settings_moderation_hold_hint">Comments that match a filter are put in the moderation queue</string>
+    <string name="site_settings_blacklist_hint">Comments that match a filter are marked as spam</string>
+    <string name="site_settings_delete_site_hint">Removes your site data from the app</string>
+
+    <!-- Related Posts -->
+    <string name="site_settings_rp_switch_title">Show Related Posts</string>
+    <string name="site_settings_rp_switch_summary">Related Posts displays relevant content from your site below your posts.</string>
+    <string name="site_settings_rp_show_header_title">Show Header</string>
+    <string name="site_settings_rp_show_images_title">Show Images</string>
+    <string name="site_settings_rp_preview_header">@string/related_posts</string>
+    <string name="site_settings_rp_preview1_title">Big iPhone/iPad Update Now Available</string>
+    <string name="site_settings_rp_preview1_site">in \"Mobile\"</string>
+    <string name="site_settings_rp_preview2_title">The WordPress for Android App Gets a Big Facelift</string>
+    <string name="site_settings_rp_preview2_site">in \"Apps\"</string>
+    <string name="site_settings_rp_preview3_title">Upgrade Focus: VideoPress For Weddings</string>
+    <string name="site_settings_rp_preview3_site">in \"Upgrade\"</string>
+
+    <!-- Learn More -->
+    <string name="site_settings_learn_more_header">@string/learn_more</string>
+    <string name="site_settings_learn_more_caption">You can override these settings for individual posts.</string>
+
+    <!-- List Editors (Blacklist, Hold for Moderation) -->
+    <string name="site_settings_list_editor_no_items_text">No items</string>
+    <string name="site_settings_list_editor_input_hint">Enter a word or phrase</string>
+    <string name="site_settings_hold_for_moderation_description">When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the moderation queue. You can enter partial words, so \"press\" will match \"WordPress.\"</string>
+    <string name="site_settings_blacklist_description">When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be marked as spam. You can enter partial words, so \"press\" will match \"WordPress.\"</string>
+
+    <!-- Dialogs -->
+    <string name="site_settings_discussion_title">@string/discussion</string>
+    <string name="site_settings_close_after_dialog_title">Close commenting</string>
+    <string name="site_settings_paging_dialog_header">Comments per page</string>
+    <string name="site_settings_paging_dialog_description">Break comment threads into multiple pages.</string>
+    <string name="site_settings_close_after_dialog_header">@string/close_after</string>
+    <string name="site_settings_close_after_dialog_description">Automatically close comments on articles.</string>
+    <string name="site_settings_close_after_dialog_switch_text">Automatically close</string>
+    <string name="site_settings_multiple_links_dialog_description">Require approval for comments that include more than this number of links.</string>
+
+    <!-- Errors -->
+    <string name="site_settings_unsupported_version_error">Unsupported WordPress version</string>
+    <string name="site_settings_disconnected_toast">Disconnected, editing disabled.</string>
+
+    <!--               -->
+    <!-- Site Settings -->
+    <!--      End      -->
+
     <!-- preferences -->
     <string name="open_source_licenses">Open source licenses</string>
     <string name="preference_privacy">Privacy</string>
@@ -713,7 +718,7 @@
     <string name="stats_views">Views</string>
     <string name="stats_visitors">Visitors</string>
     <string name="stats_likes">Likes</string>
-    <string name="stats_comments">Comments</string>
+    <string name="stats_comments">@string/comments</string>
 
     <!-- stats: labels for the views -->
     <string name="stats_view_visitors_and_views">Visitors and Views</string>
@@ -724,7 +729,7 @@
     <string name="stats_view_authors">Authors</string>
     <string name="stats_view_referrers">Referrers</string>
     <string name="stats_view_videos">Videos</string>
-    <string name="stats_view_comments">Comments</string>
+    <string name="stats_view_comments">@string/comments</string>
     <string name="stats_view_search_terms">Search Terms</string>
     <string name="stats_view_publicize">Publicize</string>
     <string name="stats_view_followers">Followers</string>
@@ -746,7 +751,7 @@
     <string name="stats_totals_views">Views</string>
     <string name="stats_totals_clicks">Clicks</string>
     <string name="stats_totals_plays">Plays</string>
-    <string name="stats_totals_comments">Comments</string>
+    <string name="stats_totals_comments">@string/comments</string>
     <string name="stats_totals_publicize">Followers</string>
     <string name="stats_totals_followers">Since</string>
 
@@ -1152,7 +1157,7 @@
     <string name="reader_title_post_detail">Reader Post</string>
     <string name="reader_title_subs">Tags &amp; Blogs</string>
     <string name="reader_title_photo_viewer">%1$d of %2$d</string>
-    <string name="reader_title_comments">Comments</string>
+    <string name="reader_title_comments">@string/comments</string>
 
     <!-- view pager titles -->
     <string name="reader_page_followed_tags">Followed tags</string>
@@ -1353,7 +1358,7 @@
     <string name="my_site_header_publish">Publish</string>
     <string name="my_site_btn_blog_posts">Blog Posts</string>
     <string name="my_site_btn_site_settings">Settings</string>
-    <string name="my_site_btn_comments">Comments</string>
+    <string name="my_site_btn_comments">@string/comments</string>
     <string name="my_site_btn_switch_site">Switch Site</string>
     <string name="my_site_btn_view_admin">View Admin</string>
     <string name="my_site_btn_view_site">View Site</string>
diff --git a/WordPress/src/main/res/xml/site_settings.xml b/WordPress/src/main/res/xml/site_settings.xml
index f53cdfd5d458..05ded3f54bb4 100644
--- a/WordPress/src/main/res/xml/site_settings.xml
+++ b/WordPress/src/main/res/xml/site_settings.xml
@@ -17,7 +17,7 @@
             android:title="@string/site_settings_title_title"
             app:summaryLines="1"
             app:maxSummaryLines="2"
-            app:longClickHint="@string/site_title_hint" />
+            app:longClickHint="@string/site_settings_title_hint" />
 
         <org.wordpress.android.ui.prefs.SummaryEditTextPreference
             android:id="@+id/pref_site_tagline"
@@ -25,7 +25,7 @@
             android:title="@string/site_settings_tagline_title"
             app:summaryLines="1"
             app:maxSummaryLines="1"
-            app:longClickHint="@string/site_tagline_hint" />
+            app:longClickHint="@string/site_settings_tagline_hint" />
 
         <org.wordpress.android.ui.prefs.SummaryEditTextPreference
             android:enabled="false"
@@ -34,18 +34,16 @@
             android:title="@string/site_settings_address_title"
             app:summaryLines="1"
             app:maxSummaryLines="1"
-            app:longClickHint="@string/site_address_hint" />
+            app:longClickHint="@string/site_settings_address_hint" />
 
         <org.wordpress.android.ui.prefs.DetailListPreference
             android:id="@+id/pref_site_privacy"
             android:key="@string/pref_key_site_visibility"
-            android:title="@string/site_settings_visibility_title"
-            android:entries="@array/privacy_entries"
-            android:entryValues="@array/privacy_values"
+            android:title="@string/site_settings_privacy_title"
+            android:entries="@array/site_settings_privacy_entries"
+            android:entryValues="@array/site_settings_privacy_values"
             android:defaultValue="-2"
-            app:dialogTitle="@string/site_settings_visibility_title"
-            app:dialogHelpUrl="@string/privacy_settings_url"
-            app:longClickHint="@string/site_privacy_hint"
+            app:longClickHint="@string/site_settings_privacy_hint"
             app:entryDetails="@array/privacy_details" />
 
         <org.wordpress.android.ui.prefs.DetailListPreference
@@ -54,9 +52,7 @@
             android:title="@string/site_settings_language_title"
             android:entries="@array/available_languages"
             android:entryValues="@array/language_codes"
-            app:dialogTitle="@string/site_settings_language_title"
-            app:dialogHelpUrl="@string/language_settings_url"
-            app:longClickHint="@string/site_language_hint" />
+            app:longClickHint="@string/site_settings_language_hint" />
 
     </PreferenceCategory>
 
@@ -73,7 +69,7 @@
             android:enabled="false"
             app:summaryLines="1"
             app:maxSummaryLines="2"
-            app:longClickHint="@string/site_username_hint" />
+            app:longClickHint="@string/site_settings_username_hint" />
 
         <org.wordpress.android.ui.prefs.SummaryEditTextPreference
             android:id="@+id/pref_site_password"
@@ -83,7 +79,7 @@
             android:inputType="textPassword"
             app:summaryLines="1"
             app:maxSummaryLines="2"
-            app:longClickHint="@string/site_password_hint" />
+            app:longClickHint="@string/site_settings_password_hint" />
 
     </PreferenceCategory>
 
@@ -97,27 +93,27 @@
             android:id="@+id/pref_enable_location"
             android:key="@string/pref_key_site_location"
             android:title="@string/site_settings_location_title"
-            app:longClickHint="@string/site_location_hint" />
+            app:longClickHint="@string/site_settings_location_hint" />
 
         <org.wordpress.android.ui.prefs.DetailListPreference
             android:id="@+id/pref_default_category"
             android:key="@string/pref_key_site_category"
-            android:title="@string/site_settings_category_title"
-            app:longClickHint="@string/site_category_hint" />
+            android:title="@string/site_settings_default_category_title"
+            app:longClickHint="@string/site_settings_category_hint" />
 
         <org.wordpress.android.ui.prefs.DetailListPreference
             android:id="@+id/pref_default_format"
             android:key="@string/pref_key_site_format"
-            android:title="@string/site_settings_format_title"
+            android:title="@string/site_settings_default_format_title"
             android:entries="@array/post_formats_array"
             android:entryValues="@array/post_formats_array"
-            app:longClickHint="@string/site_format_hint" />
+            app:longClickHint="@string/site_settings_format_hint" />
 
         <org.wordpress.android.ui.prefs.WPPreference
             android:id="@+id/pref_related_posts"
             android:key="@string/pref_key_site_related_posts"
             android:title="@string/site_settings_related_posts_title"
-            app:longClickHint="@string/site_related_posts_hint" />
+            app:longClickHint="@string/site_settings_related_posts_hint" />
 
     </PreferenceCategory>
 
@@ -125,59 +121,59 @@
     <PreferenceCategory
         android:id="@+id/pref_discussion_settings2"
         android:key="@string/pref_key_site_discussion"
-        android:title="@string/site_settings_discussion_title"
-        app:longClickHint="@string/site_discussion_hint">
+        android:title="@string/site_settings_discussion_header"
+        app:longClickHint="@string/site_settings_discussion_hint">
 
         <org.wordpress.android.ui.prefs.WPSwitchPreference
             android:id="@+id/pref_allow_comments"
             android:key="@string/pref_key_site_allow_comments"
             android:title="@string/site_settings_allow_comments_title"
-            app:longClickHint="@string/site_allow_comments_hint" />
+            app:longClickHint="@string/site_settings_allow_comments_hint" />
 
         <org.wordpress.android.ui.prefs.WPSwitchPreference
             android:id="@+id/pref_send_pingbacks"
             android:key="@string/pref_key_site_send_pingbacks"
             android:title="@string/site_settings_send_pingbacks_title"
-            app:longClickHint="@string/site_send_pingbacks_hint" />
+            app:longClickHint="@string/site_settings_send_pingbacks_hint" />
 
         <org.wordpress.android.ui.prefs.WPSwitchPreference
             android:id="@+id/pref_receive_pingbacks"
             android:key="@string/pref_key_site_receive_pingbacks"
             android:title="@string/site_settings_receive_pingbacks_title"
-            app:longClickHint="@string/site_receive_pingbacks_hint" />
+            app:longClickHint="@string/site_settings_receive_pingbacks_hint" />
 
         <PreferenceScreen
             android:id="@+id/pref_more_discussion_settings"
             android:key="@string/pref_key_site_more_discussion"
-            android:title="@string/site_settings_more_discussion_title"
-            app:longClickHint="@string/site_discussion_hint">
+            android:title="@string/site_settings_more_title"
+            app:longClickHint="@string/site_settings_more_hint">
 
             <PreferenceCategory
                 android:id="@+id/pref_site_new_posts_defaults"
-                android:title="@string/site_settings_discussion_defaults_header">
+                android:title="@string/site_settings_discussion_new_posts_header">
 
                 <org.wordpress.android.ui.prefs.WPSwitchPreference
                     android:id="@+id/pref_allow_comments"
                     android:key="@string/pref_key_site_allow_comments_nested"
                     android:title="@string/site_settings_allow_comments_title"
-                    app:longClickHint="@string/site_allow_comments_hint" />
+                    app:longClickHint="@string/site_settings_allow_comments_hint" />
 
                 <org.wordpress.android.ui.prefs.WPSwitchPreference
                     android:id="@+id/pref_send_pingbacks"
                     android:key="@string/pref_key_site_send_pingbacks_nested"
                     android:title="@string/site_settings_send_pingbacks_title"
-                    app:longClickHint="@string/site_send_pingbacks_hint" />
+                    app:longClickHint="@string/site_settings_send_pingbacks_hint" />
 
                 <org.wordpress.android.ui.prefs.WPSwitchPreference
                     android:id="@+id/pref_receive_pingbacks"
                     android:key="@string/pref_key_site_receive_pingbacks_nested"
                     android:title="@string/site_settings_receive_pingbacks_title"
-                    app:longClickHint="@string/site_receive_pingbacks_hint" />
+                    app:longClickHint="@string/site_settings_receive_pingbacks_hint" />
 
                 <org.wordpress.android.ui.prefs.LearnMorePreference
                     android:id="@+id/pref_learn_more"
                     android:key="@string/pref_key_site_learn_more"
-                    android:title="@string/learn_more" />
+                    android:title="@string/site_settings_learn_more_header" />
 
             </PreferenceCategory>
 
@@ -188,21 +184,21 @@
                 <org.wordpress.android.ui.prefs.WPSwitchPreference
                     android:id="@+id/pref_identity_required"
                     android:key="@string/pref_key_site_identity_required"
-                    android:title="@string/site_settings_identity_title"
-                    app:longClickHint="@string/site_identity_required_hint" />
+                    android:title="@string/site_settings_identity_required_title"
+                    app:longClickHint="@string/site_settings_identity_required_hint" />
 
                 <org.wordpress.android.ui.prefs.WPSwitchPreference
                     android:id="@+id/pref_user_account_required"
                     android:key="@string/pref_key_site_user_account_required"
                     android:title="@string/site_settings_account_required_title"
-                    app:longClickHint="@string/site_user_account_required_hint" />
+                    app:longClickHint="@string/site_settings_user_account_required_hint" />
 
                 <org.wordpress.android.ui.prefs.WPPreference
                     android:id="@+id/pref_close_after"
                     android:key="@string/pref_key_site_close_after"
                     android:title="@string/site_settings_close_after_title"
                     android:defaultValue="0"
-                    app:longClickHint="@string/site_close_after_hint" />
+                    app:longClickHint="@string/site_settings_close_after_hint" />
 
                 <org.wordpress.android.ui.prefs.DetailListPreference
                     android:id="@+id/pref_sort_by"
@@ -211,7 +207,7 @@
                     android:entries="@array/site_settings_sort_entries"
                     android:entryValues="@array/site_settings_sort_values"
                     android:defaultValue="0"
-                    app:longClickHint="@string/site_sort_by_hint"  />
+                    app:longClickHint="@string/site_settings_sort_by_hint"  />
 
                 <org.wordpress.android.ui.prefs.DetailListPreference
                     android:id="@+id/pref_threading"
@@ -220,14 +216,14 @@
                     android:entries="@array/site_settings_threading_entries"
                     android:entryValues="@array/site_settings_threading_values"
                     android:defaultValue="0"
-                    app:longClickHint="@string/site_threading_hint" />
+                    app:longClickHint="@string/site_settings_threading_hint" />
 
                 <org.wordpress.android.ui.prefs.WPPreference
                     android:id="@+id/pref_paging"
                     android:key="@string/pref_key_site_paging"
                     android:title="@string/site_settings_paging_title"
                     android:defaultValue="0"
-                    app:longClickHint="@string/site_paging_hint" />
+                    app:longClickHint="@string/site_settings_paging_hint" />
 
                 <org.wordpress.android.ui.prefs.DetailListPreference
                     android:id="@+id/pref_whitelist"
@@ -236,26 +232,25 @@
                     android:entries="@array/site_settings_auto_approve_entries"
                     android:entryValues="@array/site_settings_auto_approve_values"
                     app:entryDetails="@array/site_settings_auto_approve_details"
-                    app:longClickHint="@string/site_whitelist_hint" />
+                    app:longClickHint="@string/site_settings_whitelist_hint" />
 
                 <org.wordpress.android.ui.prefs.WPPreference
                     android:id="@+id/pref_multiple_links"
                     android:key="@string/pref_key_site_multiple_links"
                     android:title="@string/site_settings_multiple_links_title"
-                    android:summary="@string/site_settings_multiple_links_summary"
-                    app:longClickHint="@string/site_multiple_links_hint" />
+                    app:longClickHint="@string/site_settings_multiple_links_hint" />
 
                 <org.wordpress.android.ui.prefs.WPPreference
                     android:id="@+id/pref_moderation_hold"
                     android:key="@string/pref_key_site_moderation_hold"
                     android:title="@string/site_settings_moderation_hold_title"
-                    app:longClickHint="@string/site_moderation_hold_hint" />
+                    app:longClickHint="@string/site_settings_moderation_hold_hint" />
 
                 <org.wordpress.android.ui.prefs.WPPreference
                     android:id="@+id/pref_blacklist"
                     android:key="@string/pref_key_site_blacklist"
                     android:title="@string/site_settings_blacklist_title"
-                    app:longClickHint="@string/site_blacklist_hint" />
+                    app:longClickHint="@string/site_settings_blacklist_hint" />
 
             </PreferenceCategory>
 
@@ -266,6 +261,7 @@
     <Preference
         android:id="@+id/pref_delete_site"
         android:key="@string/pref_key_site_delete_site"
-        android:title="@string/site_settings_delete_site_title" />
+        android:title="@string/site_settings_delete_site_title"
+        app:longClickHint="@string/site_settings_delete_site_hint" />
 
 </PreferenceScreen>

From 9e8496b6f97dde2d491f8e5e79fc3b7589035fa0 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Tue, 15 Dec 2015 17:46:58 -0800
Subject: [PATCH 49/63] Using correct key when serializing hold for moderation
 list changes

---
 .../java/org/wordpress/android/ui/prefs/DotComSiteSettings.java | 2 +-
 .../org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java
index fc5ce7ffb6c7..0876fc330302 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java
@@ -316,7 +316,7 @@ public Map<String, String> serializeDotComParams() {
             if (builder.length() > 1) {
                 params.put(MODERATION_KEYS_KEY, builder.substring(0, builder.length() - 1));
             } else {
-                params.put(BLACKLIST_KEYS_KEY, "");
+                params.put(MODERATION_KEYS_KEY, "");
             }
         }
         if (mSettings.blacklist != null && !mSettings.blacklist.equals(mRemoteSettings.blacklist)) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java
index 40ebe63bcc34..973b6be654f0 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java
@@ -294,7 +294,7 @@ private Map<String, String> serializeSelfHostedParams() {
             if (builder.length() > 1) {
                 params.put(MODERATION_KEYS_KEY, builder.substring(0, builder.length() - 1));
             } else {
-                params.put(BLACKLIST_KEYS_KEY, "");
+                params.put(MODERATION_KEYS_KEY, "");
             }
         }
         if (mSettings.blacklist != null && !mSettings.blacklist.equals(mRemoteSettings.blacklist)) {

From 9eef65d174a5996c7b8911e483a20385730664ae Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Tue, 15 Dec 2015 17:51:11 -0800
Subject: [PATCH 50/63] Saving hold for moderation and blacklist changes
 immediately

---
 .../org/wordpress/android/ui/prefs/SiteSettingsFragment.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index 0c9b708a7770..65d813ac15dc 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -985,6 +985,7 @@ public boolean onDeleteRequested() {
                 list.setAdapter(new ArrayAdapter<>(getActivity(),
                         R.layout.wp_simple_list_item_1,
                         mEditingList));
+                mSiteSettings.saveSettings();
                 return true;
             }
         });
@@ -1010,6 +1011,7 @@ public void onClick(DialogInterface dialog, int which) {
                             list.setAdapter(new ArrayAdapter<>(getActivity(),
                                     R.layout.wp_simple_list_item_1,
                                     mEditingList));
+                            mSiteSettings.saveSettings();
                             AnalyticsUtils.trackWithCurrentBlogDetails(
                                     AnalyticsTracker.Stat.SITE_SETTINGS_ADDED_LIST_ITEM);
                         }

From 96df18bea9e7740e19e23565fea8ae7b0dc8292e Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Tue, 15 Dec 2015 18:52:22 -0800
Subject: [PATCH 51/63] Setting list divider programmatically

---
 .../org/wordpress/android/ui/prefs/SiteSettingsFragment.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index 65d813ac15dc..671a036e108f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -482,6 +482,8 @@ public void allowEditing(boolean allow) {
     private void setupPreferenceList(ListView prefList, Resources res) {
         if (prefList == null || res == null) return;
 
+        prefList.setDivider(getResources().getDrawable(R.drawable.preferences_divider));
+        prefList.setDividerHeight(1);
         // handle long clicks on preferences to display hints
         prefList.setOnItemLongClickListener(this);
         // required to customize (Calypso) preference views

From 559266780c69aebd69749c28c613b40da8aadadf Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Wed, 16 Dec 2015 15:23:07 -0800
Subject: [PATCH 52/63] Removing preferences when user does not have admin
 privileges

---
 .../android/ui/main/MySiteFragment.java          | 10 +---------
 .../android/ui/prefs/SiteSettingsFragment.java   | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java
index 0ca12125c937..8dd87e51ce31 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java
@@ -48,8 +48,6 @@ public class MySiteFragment extends Fragment
     private WPTextView mBlogSubtitleTextView;
     private LinearLayout mLookAndFeelHeader;
     private RelativeLayout mThemesContainer;
-    private View mConfigurationHeader;
-    private View mSettingsView;
     private View mFabView;
     private LinearLayout mNoSiteView;
     private ScrollView mScrollView;
@@ -118,8 +116,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         mBlogSubtitleTextView = (WPTextView) rootView.findViewById(R.id.my_site_subtitle_label);
         mLookAndFeelHeader = (LinearLayout) rootView.findViewById(R.id.my_site_look_and_feel_header);
         mThemesContainer = (RelativeLayout) rootView.findViewById(R.id.row_themes);
-        mConfigurationHeader = rootView.findViewById(R.id.row_configuration);
-        mSettingsView = rootView.findViewById(R.id.row_settings);
         mScrollView = (ScrollView) rootView.findViewById(R.id.scroll_view);
         mNoSiteView = (LinearLayout) rootView.findViewById(R.id.no_site_view);
         mNoSiteDrakeImageView = (ImageView) rootView.findViewById(R.id.my_site_no_site_view_drake);
@@ -190,7 +186,7 @@ public void onClick(View v) {
             }
         });
 
-        mSettingsView.setOnClickListener(new View.OnClickListener() {
+        rootView.findViewById(R.id.row_settings).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 ActivityLauncher.viewBlogSettingsForResult(getActivity(), mBlog);
@@ -308,10 +304,6 @@ private void refreshBlogDetails() {
         mLookAndFeelHeader.setVisibility(themesVisibility);
         mThemesContainer.setVisibility(themesVisibility);
 
-        int settingsVisibility = mBlog.isAdmin() ? View.VISIBLE : View.GONE;
-        mConfigurationHeader.setVisibility(settingsVisibility);
-        mSettingsView.setVisibility(settingsVisibility);
-
         mBlavatarImageView.setImageUrl(GravatarUtils.blavatarFromUrl(mBlog.getUrl(), mBlavatarSz), WPNetworkImageView.ImageType.BLAVATAR);
 
         String blogName = StringUtils.unescapeHTML(mBlog.getBlogName());
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index 671a036e108f..7ee84552f577 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -482,6 +482,7 @@ public void allowEditing(boolean allow) {
     private void setupPreferenceList(ListView prefList, Resources res) {
         if (prefList == null || res == null) return;
 
+        // customize list dividers
         prefList.setDivider(getResources().getDrawable(R.drawable.preferences_divider));
         prefList.setDividerHeight(1);
         // handle long clicks on preferences to display hints
@@ -542,6 +543,16 @@ private void initPreferences() {
             removePreference(R.string.pref_key_site_general, R.string.pref_key_site_language);
             removePreference(R.string.pref_key_site_writing, R.string.pref_key_site_related_posts);
         }
+
+        // hide all options except for Delete site and Enable Location if user is not admin
+        if (!mBlog.isAdmin()) {
+            removePreference(R.string.pref_key_site_screen, R.string.pref_key_site_general);
+            removePreference(R.string.pref_key_site_screen, R.string.pref_key_site_account);
+            removePreference(R.string.pref_key_site_screen, R.string.pref_key_site_discussion);
+            removePreference(R.string.pref_key_site_writing, R.string.pref_key_site_category);
+            removePreference(R.string.pref_key_site_writing, R.string.pref_key_site_format);
+            removePreference(R.string.pref_key_site_writing, R.string.pref_key_site_related_posts);
+        }
     }
 
     private void showRelatedPostsDialog() {
@@ -1157,9 +1168,10 @@ private Preference getPref(int id) {
      */
     private void removePreference(int parentKey, int preference) {
         PreferenceGroup parent = (PreferenceGroup) findPreference(getString(parentKey));
+        Preference child = findPreference(getString(preference));
 
-        if (parent != null) {
-            parent.removePreference(findPreference(getString(preference)));
+        if (parent != null && child != null) {
+            parent.removePreference(child);
         }
     }
 }

From 29f2a1d18966268a01d4d253985e00e5a833bd7d Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Wed, 16 Dec 2015 16:35:51 -0800
Subject: [PATCH 53/63] Delaying fetching settings to allow new screen to load
 immediately

---
 .../android/ui/prefs/SiteSettingsFragment.java     | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index 7ee84552f577..712eb9179e04 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -10,6 +10,7 @@
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.os.Handler;
 import android.preference.EditTextPreference;
 import android.preference.Preference;
 import android.preference.PreferenceCategory;
@@ -213,10 +214,15 @@ public void onPause() {
     public void onResume() {
         super.onResume();
 
-        // initialize settings with locally cached values, fetch remote on first pass
-        mSiteSettings.init(mShouldFetch);
-        // stop future calls from fetching remote settings
-        mShouldFetch = false;
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                // initialize settings with locally cached values, fetch remote on first pass
+                mSiteSettings.init(mShouldFetch);
+                // stop future calls from fetching remote settings
+                mShouldFetch = false;
+            }
+        }, 1000);
     }
 
     @Override

From 46eb536402d80744ed7ba3221ab68b98850c4759 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Wed, 16 Dec 2015 18:05:16 -0800
Subject: [PATCH 54/63] Not showing DetailListPreferences if there is no list

---
 .../android/ui/main/MySiteFragment.java       | 11 +++++++-
 .../ui/prefs/SelfHostedSiteSettings.java      | 17 +++++++----
 .../ui/prefs/SiteSettingsFragment.java        | 28 +++++++++++++------
 .../java/org/xmlrpc/android/ApiHelper.java    | 11 --------
 4 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java
index 8dd87e51ce31..54b4a7e46acb 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java
@@ -48,6 +48,8 @@ public class MySiteFragment extends Fragment
     private WPTextView mBlogSubtitleTextView;
     private LinearLayout mLookAndFeelHeader;
     private RelativeLayout mThemesContainer;
+    private View mConfigurationHeader;
+    private View mSettingsView;
     private View mFabView;
     private LinearLayout mNoSiteView;
     private ScrollView mScrollView;
@@ -116,6 +118,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         mBlogSubtitleTextView = (WPTextView) rootView.findViewById(R.id.my_site_subtitle_label);
         mLookAndFeelHeader = (LinearLayout) rootView.findViewById(R.id.my_site_look_and_feel_header);
         mThemesContainer = (RelativeLayout) rootView.findViewById(R.id.row_themes);
+        mConfigurationHeader = rootView.findViewById(R.id.row_configuration);
+        mSettingsView = rootView.findViewById(R.id.row_settings);
         mScrollView = (ScrollView) rootView.findViewById(R.id.scroll_view);
         mNoSiteView = (LinearLayout) rootView.findViewById(R.id.no_site_view);
         mNoSiteDrakeImageView = (ImageView) rootView.findViewById(R.id.my_site_no_site_view_drake);
@@ -186,7 +190,7 @@ public void onClick(View v) {
             }
         });
 
-        rootView.findViewById(R.id.row_settings).setOnClickListener(new View.OnClickListener() {
+        mSettingsView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 ActivityLauncher.viewBlogSettingsForResult(getActivity(), mBlog);
@@ -304,6 +308,11 @@ private void refreshBlogDetails() {
         mLookAndFeelHeader.setVisibility(themesVisibility);
         mThemesContainer.setVisibility(themesVisibility);
 
+        // show settings for all self-hosted to expose Delete Site
+        int settingsVisibility = mBlog.isAdmin() || !mBlog.isDotcomFlag() ? View.VISIBLE : View.GONE;
+        mConfigurationHeader.setVisibility(settingsVisibility);
+        mSettingsView.setVisibility(settingsVisibility);
+
         mBlavatarImageView.setImageUrl(GravatarUtils.blavatarFromUrl(mBlog.getUrl(), mBlavatarSz), WPNetworkImageView.ImageType.BLAVATAR);
 
         String blogName = StringUtils.unescapeHTML(mBlog.getBlogName());
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java
index 973b6be654f0..932500ab9c79 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SelfHostedSiteSettings.java
@@ -60,7 +60,7 @@ class SelfHostedSiteSettings extends SiteSettingsInterface {
 
     // Requires WordPress 4.5.x or higher
     private static final int REQUIRED_MAJOR_VERSION = 4;
-    private static final int REQUIRED_MINOR_VERSION = 5;
+    private static final int REQUIRED_MINOR_VERSION = 3;
 
     private static final String OPTION_ALLOWED = "open";
     private static final String OPTION_DISALLOWED = "closed";
@@ -133,11 +133,18 @@ public void onFailure(long id, final Exception error) {
      */
     @Override
     protected void fetchRemoteData() {
-        Object[] params = {mBlog.getRemoteBlogId(), mBlog.getUsername(), mBlog.getPassword()};
 
-        // Need two interfaces or the first call gets aborted
-        instantiateInterface().callAsync(mOptionsCallback, ApiHelper.Methods.GET_OPTIONS, params);
-        instantiateInterface().callAsync(mCategoriesCallback, ApiHelper.Methods.GET_CATEGORIES, params);
+        Thread thread = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                Object[] params = {mBlog.getRemoteBlogId(), mBlog.getUsername(), mBlog.getPassword()};
+
+                // Need two interfaces or the first call gets aborted
+                instantiateInterface().callAsync(mOptionsCallback, ApiHelper.Methods.GET_OPTIONS, params);
+                instantiateInterface().callAsync(mCategoriesCallback, ApiHelper.Methods.GET_CATEGORIES, params);
+            }
+        });
+        thread.run();
     }
 
     /**
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index 712eb9179e04..aabf4f01f885 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -114,6 +114,8 @@ public class SiteSettingsFragment extends PreferenceFragment
      */
     private static final int REGION_SUBSTRING_INDEX = 3;
 
+    private static final long FETCH_DELAY = 1000;
+
     // Reference to blog obtained from passed ID (ARG_LOCAL_BLOG_ID)
     private Blog mBlog;
 
@@ -214,15 +216,17 @@ public void onPause() {
     public void onResume() {
         super.onResume();
 
-        new Handler().postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                // initialize settings with locally cached values, fetch remote on first pass
-                mSiteSettings.init(mShouldFetch);
-                // stop future calls from fetching remote settings
-                mShouldFetch = false;
-            }
-        }, 1000);
+        if (mShouldFetch) {
+            new Handler().postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    // initialize settings with locally cached values, fetch remote on first pass
+                    mSiteSettings.init(mShouldFetch);
+                    // stop future calls from fetching remote settings
+                }
+            }, FETCH_DELAY);
+            mShouldFetch = false;
+        }
     }
 
     @Override
@@ -328,6 +332,8 @@ public boolean onPreferenceClick(Preference preference) {
         } else if (preference == mPagingPref) {
             showPagingDialog();
             return true;
+        } else if (preference == mCategoryPref || preference == mFormatPref) {
+            return !shouldShowListPreference((DetailListPreference) preference);
         }
 
         return false;
@@ -1096,6 +1102,10 @@ public void onClick(DialogInterface dialog, int whichButton) {
         dialogBuilder.create().show();
     }
 
+    private boolean shouldShowListPreference(DetailListPreference preference) {
+        return preference != null && preference.getEntries() != null && preference.getEntries().length > 0;
+    }
+
     /**
      * Generates display strings for given language codes. Used as entries in language preference.
      */
diff --git a/WordPress/src/main/java/org/xmlrpc/android/ApiHelper.java b/WordPress/src/main/java/org/xmlrpc/android/ApiHelper.java
index 7de3ca772edb..f0b01844633d 100644
--- a/WordPress/src/main/java/org/xmlrpc/android/ApiHelper.java
+++ b/WordPress/src/main/java/org/xmlrpc/android/ApiHelper.java
@@ -10,13 +10,10 @@
 import com.android.volley.DefaultRetryPolicy;
 import com.android.volley.NetworkResponse;
 import com.android.volley.RedirectError;
-import com.android.volley.Request;
-import com.android.volley.toolbox.JsonObjectRequest;
 import com.android.volley.toolbox.RequestFuture;
 import com.android.volley.toolbox.StringRequest;
 import com.google.gson.Gson;
 
-import org.json.JSONObject;
 import org.wordpress.android.WordPress;
 import org.wordpress.android.analytics.AnalyticsTracker;
 import org.wordpress.android.datasets.CommentTable;
@@ -25,7 +22,6 @@
 import org.wordpress.android.models.Comment;
 import org.wordpress.android.models.CommentList;
 import org.wordpress.android.models.FeatureSet;
-import org.wordpress.android.networking.WPDelayedHurlStack;
 import org.wordpress.android.ui.media.MediaGridFragment.Filter;
 import org.wordpress.android.ui.stats.StatsUtils;
 import org.wordpress.android.ui.stats.StatsWidgetProvider;
@@ -34,20 +30,14 @@
 import org.wordpress.android.util.AppLog.T;
 import org.wordpress.android.util.DateTimeUtils;
 import org.wordpress.android.util.MapUtils;
-import org.wordpress.android.util.UrlUtils;
 import org.wordpress.android.util.helpers.MediaFile;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
-import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.StringReader;
-import java.net.URL;
-import java.security.GeneralSecurityException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -59,7 +49,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLHandshakeException;
 
 public class ApiHelper {

From 1ba9a8b0afd527d7a355b0317e3e6f2085edb63e Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Wed, 16 Dec 2015 19:00:21 -0800
Subject: [PATCH 55/63] Fixing fetching boolean logic

---
 .../org/wordpress/android/ui/prefs/SiteSettingsFragment.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index aabf4f01f885..0bf9e6ec3660 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -216,12 +216,15 @@ public void onPause() {
     public void onResume() {
         super.onResume();
 
+        // always load cached settings
+        mSiteSettings.init(false);
+
         if (mShouldFetch) {
             new Handler().postDelayed(new Runnable() {
                 @Override
                 public void run() {
                     // initialize settings with locally cached values, fetch remote on first pass
-                    mSiteSettings.init(mShouldFetch);
+                    mSiteSettings.init(true);
                     // stop future calls from fetching remote settings
                 }
             }, FETCH_DELAY);

From 2d792a2b9b2d7207c0ba35a321af5ce0a5ab8483 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Mon, 4 Jan 2016 17:20:29 -0800
Subject: [PATCH 56/63] Including certain preference toggle values in the
 database + code clean

---
 .../android/models/SiteSettingsModel.java     |  16 +
 .../android/ui/prefs/NumberPickerDialog.java  | 159 ++++++
 .../ui/prefs/SiteSettingsFragment.java        | 432 +++++----------
 .../ui/prefs/SiteSettingsInterface.java       | 512 +++++++++++-------
 .../wordpress/android/util/WPPrefUtils.java   |  91 ++++
 5 files changed, 715 insertions(+), 495 deletions(-)
 create mode 100644 WordPress/src/main/java/org/wordpress/android/ui/prefs/NumberPickerDialog.java

diff --git a/WordPress/src/main/java/org/wordpress/android/models/SiteSettingsModel.java b/WordPress/src/main/java/org/wordpress/android/models/SiteSettingsModel.java
index 71f15d8be34d..0d8215035bb0 100644
--- a/WordPress/src/main/java/org/wordpress/android/models/SiteSettingsModel.java
+++ b/WordPress/src/main/java/org/wordpress/android/models/SiteSettingsModel.java
@@ -13,6 +13,7 @@
 /**
  * Holds blog settings and provides methods to (de)serialize .com and self-hosted network calls.
  */
+
 public class SiteSettingsModel {
     public static final int RELATED_POSTS_ENABLED_FLAG = 0x1;
     public static final int RELATED_POST_HEADER_FLAG = 0x2;
@@ -37,9 +38,12 @@ public class SiteSettingsModel {
     public static final String ALLOW_COMMENTS_COLUMN_NAME = "allowComments";
     public static final String SEND_PINGBACKS_COLUMN_NAME = "sendPingbacks";
     public static final String RECEIVE_PINGBACKS_COLUMN_NAME = "receivePingbacks";
+    public static final String SHOULD_CLOSE_AFTER_COLUMN_NAME = "shouldCloseAfter";
     public static final String CLOSE_AFTER_COLUMN_NAME = "closeAfter";
     public static final String SORT_BY_COLUMN_NAME = "sortBy";
+    public static final String SHOULD_THREAD_COLUMN_NAME = "shouldThread";
     public static final String THREADING_COLUMN_NAME = "threading";
+    public static final String SHOULD_PAGE_COLUMN_NAME = "shouldPage";
     public static final String PAGING_COLUMN_NAME = "paging";
     public static final String MANUAL_APPROVAL_COLUMN_NAME = "manualApproval";
     public static final String IDENTITY_REQUIRED_COLUMN_NAME = "identityRequired";
@@ -71,9 +75,12 @@ public class SiteSettingsModel {
                     ALLOW_COMMENTS_COLUMN_NAME + " BOOLEAN, " +
                     SEND_PINGBACKS_COLUMN_NAME + " BOOLEAN, " +
                     RECEIVE_PINGBACKS_COLUMN_NAME + " BOOLEAN, " +
+                    SHOULD_CLOSE_AFTER_COLUMN_NAME + " BOOLEAN, " +
                     CLOSE_AFTER_COLUMN_NAME + " INTEGER, " +
                     SORT_BY_COLUMN_NAME + " INTEGER, " +
+                    SHOULD_THREAD_COLUMN_NAME + " BOOLEAN, " +
                     THREADING_COLUMN_NAME + " INTEGER, " +
+                    SHOULD_PAGE_COLUMN_NAME + " BOOLEAN, " +
                     PAGING_COLUMN_NAME + " INTEGER, " +
                     MANUAL_APPROVAL_COLUMN_NAME + " BOOLEAN, " +
                     IDENTITY_REQUIRED_COLUMN_NAME + " BOOLEAN, " +
@@ -106,9 +113,12 @@ public class SiteSettingsModel {
     public boolean allowComments;
     public boolean sendPingbacks;
     public boolean receivePingbacks;
+    public boolean shouldCloseAfter;
     public int closeCommentAfter;
     public int sortCommentsBy;
+    public boolean shouldThreadComments;
     public int threadingLevels;
+    public boolean shouldPageComments;
     public int commentsPerPage;
     public boolean commentApprovalRequired;
     public boolean commentsRequireIdentity;
@@ -215,9 +225,12 @@ public void deserializeOptionsDatabaseCursor(Cursor cursor, Map<Integer, Categor
         allowComments = getBooleanFromCursor(cursor, ALLOW_COMMENTS_COLUMN_NAME);
         sendPingbacks = getBooleanFromCursor(cursor, SEND_PINGBACKS_COLUMN_NAME);
         receivePingbacks = getBooleanFromCursor(cursor, RECEIVE_PINGBACKS_COLUMN_NAME);
+        shouldCloseAfter = getBooleanFromCursor(cursor, SHOULD_CLOSE_AFTER_COLUMN_NAME);
         closeCommentAfter = getIntFromCursor(cursor, CLOSE_AFTER_COLUMN_NAME);
         sortCommentsBy = getIntFromCursor(cursor, SORT_BY_COLUMN_NAME);
+        shouldThreadComments = getBooleanFromCursor(cursor, SHOULD_THREAD_COLUMN_NAME);
         threadingLevels = getIntFromCursor(cursor, THREADING_COLUMN_NAME);
+        shouldPageComments = getBooleanFromCursor(cursor, SHOULD_PAGE_COLUMN_NAME);
         commentsPerPage = getIntFromCursor(cursor, PAGING_COLUMN_NAME);
         commentApprovalRequired = getBooleanFromCursor(cursor, MANUAL_APPROVAL_COLUMN_NAME);
         commentsRequireIdentity = getBooleanFromCursor(cursor, IDENTITY_REQUIRED_COLUMN_NAME);
@@ -283,9 +296,12 @@ public ContentValues serializeToDatabase() {
         values.put(ALLOW_COMMENTS_COLUMN_NAME, allowComments);
         values.put(SEND_PINGBACKS_COLUMN_NAME, sendPingbacks);
         values.put(RECEIVE_PINGBACKS_COLUMN_NAME, receivePingbacks);
+        values.put(SHOULD_CLOSE_AFTER_COLUMN_NAME, shouldCloseAfter);
         values.put(CLOSE_AFTER_COLUMN_NAME, closeCommentAfter);
         values.put(SORT_BY_COLUMN_NAME, sortCommentsBy);
+        values.put(SHOULD_THREAD_COLUMN_NAME, shouldThreadComments);
         values.put(THREADING_COLUMN_NAME, threadingLevels);
+        values.put(SHOULD_PAGE_COLUMN_NAME, shouldPageComments);
         values.put(PAGING_COLUMN_NAME, commentsPerPage);
         values.put(MANUAL_APPROVAL_COLUMN_NAME, commentApprovalRequired);
         values.put(IDENTITY_REQUIRED_COLUMN_NAME, commentsRequireIdentity);
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/NumberPickerDialog.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/NumberPickerDialog.java
new file mode 100644
index 000000000000..cc2977624aed
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/NumberPickerDialog.java
@@ -0,0 +1,159 @@
+package org.wordpress.android.ui.prefs;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.Fragment;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.widget.SwitchCompat;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+import android.widget.CompoundButton;
+import android.widget.NumberPicker;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import org.wordpress.android.R;
+import org.wordpress.android.util.WPPrefUtils;
+
+public class NumberPickerDialog extends DialogFragment
+        implements DialogInterface.OnClickListener,
+        CompoundButton.OnCheckedChangeListener {
+
+    public static final String SHOW_SWITCH_KEY    = "show-switch";
+    public static final String SWITCH_ENABLED_KEY = "switch-enabled";
+    public static final String SWITCH_TITLE_KEY   = "switch-title";
+    public static final String TITLE_KEY          = "dialog-title";
+    public static final String HEADER_TEXT_KEY    = "header-text";
+    public static final String MIN_VALUE_KEY      = "min-value";
+    public static final String MAX_VALUE_KEY      = "max-value";
+    public static final String CUR_VALUE_KEY      = "cur-value";
+
+    private static final int DEFAULT_MIN_VALUE = 0;
+    private static final int DEFAULT_MAX_VALUE = 99;
+
+    private SwitchCompat mSwitch;
+    private TextView mHeaderText;
+    private NumberPicker mNumberPicker;
+    private int mMinValue;
+    private int mMaxValue;
+    private boolean mConfirmed;
+
+    public NumberPickerDialog() {
+        mMinValue = DEFAULT_MIN_VALUE;
+        mMaxValue = DEFAULT_MAX_VALUE;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.Calypso_AlertDialog);
+        View view = View.inflate(getActivity(), R.layout.number_picker_dialog, null);
+        TextView switchText = (TextView) view.findViewById(R.id.number_picker_text);
+        mSwitch = (SwitchCompat) view.findViewById(R.id.number_picker_switch);
+        mHeaderText = (TextView) view.findViewById(R.id.number_picker_header);
+        mNumberPicker = (NumberPicker) view.findViewById(R.id.number_picker);
+        int value = mMinValue;
+
+        Bundle args = getArguments();
+        if (args != null) {
+            if (args.getBoolean(SHOW_SWITCH_KEY, false)) {
+                mSwitch.setVisibility(View.VISIBLE);
+                mSwitch.setText(args.getString(SWITCH_TITLE_KEY, ""));
+                mSwitch.setChecked(args.getBoolean(SWITCH_ENABLED_KEY, false));
+                final View toggleContainer = view.findViewById(R.id.number_picker_toggleable);
+                toggleContainer.setEnabled(mSwitch.isChecked());
+                mNumberPicker.setEnabled(mSwitch.isChecked());
+            } else {
+                mSwitch.setVisibility(View.GONE);
+            }
+            switchText.setText(args.getString(SWITCH_TITLE_KEY, ""));
+            mHeaderText.setText(args.getString(HEADER_TEXT_KEY, ""));
+            mMinValue = args.getInt(MIN_VALUE_KEY, DEFAULT_MIN_VALUE);
+            mMaxValue = args.getInt(MAX_VALUE_KEY, DEFAULT_MAX_VALUE);
+            value = args.getInt(CUR_VALUE_KEY, mMinValue);
+
+            builder.setCustomTitle(getDialogTitleView(args.getString(TITLE_KEY, "")));
+        }
+
+        mNumberPicker.setMinValue(mMinValue);
+        mNumberPicker.setMaxValue(mMaxValue);
+        mNumberPicker.setValue(value);
+
+        mSwitch.setOnCheckedChangeListener(this);
+
+        // hide empty text views
+        if (TextUtils.isEmpty(switchText.getText())) {
+            switchText.setVisibility(View.GONE);
+        }
+        if (TextUtils.isEmpty(mHeaderText.getText())) {
+            mHeaderText.setVisibility(View.GONE);
+        }
+
+        builder.setPositiveButton(R.string.ok, this);
+        builder.setNegativeButton(R.string.cancel, this);
+        builder.setView(view);
+
+        return builder.create();
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+
+        AlertDialog dialog = (AlertDialog) getDialog();
+        Button positive = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
+        Button negative = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
+        if (positive != null) WPPrefUtils.layoutAsFlatButton(positive);
+        if (negative != null) WPPrefUtils.layoutAsFlatButton(negative);
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        mConfirmed = which == DialogInterface.BUTTON_POSITIVE;
+        dismiss();
+    }
+
+    @Override
+    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+        mNumberPicker.setEnabled(isChecked);
+        mHeaderText.setEnabled(isChecked);
+    }
+
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        Fragment target = getTargetFragment();
+        if (target != null) {
+            target.onActivityResult(getTargetRequestCode(), Activity.RESULT_OK, getResultIntent());
+        }
+
+        super.onDismiss(dialog);
+    }
+
+    private View getDialogTitleView(String title) {
+        LayoutInflater inflater = LayoutInflater.from(getActivity());
+        @SuppressLint("InflateParams")
+        View titleView = inflater.inflate(R.layout.detail_list_preference_title, null);
+        TextView titleText = ((TextView) titleView.findViewById(R.id.title));
+        titleText.setText(title);
+        titleText.setLayoutParams(new RelativeLayout.LayoutParams(
+                RelativeLayout.LayoutParams.MATCH_PARENT,
+                RelativeLayout.LayoutParams.WRAP_CONTENT));
+        return titleView;
+    }
+
+    private Intent getResultIntent() {
+        if (mConfirmed) {
+            return new Intent()
+                    .putExtra(SWITCH_ENABLED_KEY, mSwitch.isChecked())
+                    .putExtra(CUR_VALUE_KEY, mNumberPicker.getValue());
+        }
+
+        return null;
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index 0bf9e6ec3660..e2e211812d03 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -1,6 +1,5 @@
 package org.wordpress.android.ui.prefs;
 
-import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -13,12 +12,9 @@
 import android.os.Handler;
 import android.preference.EditTextPreference;
 import android.preference.Preference;
-import android.preference.PreferenceCategory;
 import android.preference.PreferenceFragment;
-import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.support.annotation.NonNull;
-import android.support.v7.widget.SwitchCompat;
 import android.text.TextUtils;
 import android.util.SparseBooleanArray;
 import android.view.ContextThemeWrapper;
@@ -31,12 +27,9 @@
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
-import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ListAdapter;
 import android.widget.ListView;
-import android.widget.NumberPicker;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import org.wordpress.android.R;
@@ -99,20 +92,9 @@ public class SiteSettingsFragment extends PreferenceFragment
      */
     private static final int RELATED_POSTS_REQUEST_CODE = 1;
 
-    /**
-     * Length of a {@link String} (representing a language code) when there is no region included.
-     * For example: "en" contains no region, "en_US" contains a region (US)
-     *
-     * Used to parse a language code {@link String} when creating a {@link Locale}.
-     */
-    private static final int NO_REGION_LANG_CODE_LEN = 2;
-
-    /**
-     * Index of a language code {@link String} where the region code begins. The language code
-     * format is cc_rr, where cc is the country code (e.g. en, es, az) and rr is the region code
-     * (e.g. us, au, gb).
-     */
-    private static final int REGION_SUBSTRING_INDEX = 3;
+    private static final int PAGING_REQUEST_CODE = 2;
+    private static final int CLOSE_AFTER_REQUEST_CODE = 3;
+    private static final int MULTIPLE_LINKS_REQUEST_CODE = 4;
 
     private static final long FETCH_DELAY = 1000;
 
@@ -128,12 +110,6 @@ public class SiteSettingsFragment extends PreferenceFragment
     // Used to ensure that settings are only fetched once throughout the lifecycle of the fragment
     private boolean mShouldFetch;
 
-    // Used with Close After and Paging dialogs to determine settings values
-    private boolean mSwitchChecked;
-
-    // Used to customize Close After, Paging, and Multiple Links dialog views
-    private NumberPicker mNumberPicker;
-
     // General settings
     private EditTextPreference mTitlePref;
     private EditTextPreference mTaglinePref;
@@ -246,6 +222,24 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                         RelatedPostsDialog.SHOW_IMAGES_KEY, false));
                 mSiteSettings.saveSettings();
                 break;
+            case PAGING_REQUEST_CODE:
+                if (data == null) break;
+                mSiteSettings.setShouldPageComments(data.getBooleanExtra
+                        (NumberPickerDialog.SWITCH_ENABLED_KEY, false));
+                if (mSiteSettings.getShouldPageComments()) {
+                    onPreferenceChange(mPagingPref, data.getIntExtra(
+                            NumberPickerDialog.CUR_VALUE_KEY, -1));
+                } else {
+                    mSiteSettings.setPagingCount(data.getIntExtra(
+                            NumberPickerDialog.CUR_VALUE_KEY, -1));
+                }
+                break;
+            case CLOSE_AFTER_REQUEST_CODE:
+                if (data == null) break;
+                break;
+            case MULTIPLE_LINKS_REQUEST_CODE:
+                if (data == null) break;
+                break;
         }
 
         super.onActivityResult(requestCode, resultCode, data);
@@ -362,7 +356,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
             mSiteSettings.setPrivacy(Integer.valueOf(newValue.toString()));
             setDetailListPreferenceValue(mPrivacyPref,
                     String.valueOf(mSiteSettings.getPrivacy()),
-                    getPrivacySummary(mSiteSettings.getPrivacy()));
+                    mSiteSettings.getPrivacyDescription());
         } else if (preference == mAllowCommentsPref || preference == mAllowCommentsNested) {
             setAllowComments((Boolean) newValue);
         } else if (preference == mSendPingbacksPref || preference == mSendPingbacksNested) {
@@ -371,20 +365,20 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
             setReceivePingbacks((Boolean) newValue);
         } else if (preference == mCloseAfterPref) {
             mSiteSettings.setCloseAfter(Integer.parseInt(newValue.toString()));
-            mCloseAfterPref.setSummary(getCloseAfterSummary(mSiteSettings.getCloseAfter()));
+            mCloseAfterPref.setSummary(mSiteSettings.getCloseAfterDescription());
         } else if (preference == mSortByPref) {
             mSiteSettings.setCommentSorting(Integer.parseInt(newValue.toString()));
             setDetailListPreferenceValue(mSortByPref,
                     newValue.toString(),
-                    getSortOrderSummary(mSiteSettings.getCommentSorting()));
+                    mSiteSettings.getSortingDescription());
         } else if (preference == mThreadingPref) {
             mSiteSettings.setThreadingLevels(Integer.parseInt(newValue.toString()));
             setDetailListPreferenceValue(mThreadingPref,
                     newValue.toString(),
-                    getThreadingSummary(mSiteSettings.getThreadingLevels()));
+                    mSiteSettings.getThreadingDescription());
         } else if (preference == mPagingPref) {
             mSiteSettings.setPagingCount(Integer.parseInt(newValue.toString()));
-            mPagingPref.setSummary(getPagingSummary(mSiteSettings.getPagingCount()));
+            mPagingPref.setSummary(mSiteSettings.getPagingDescription());
         } else if (preference == mIdentityRequiredPreference) {
             mSiteSettings.setIdentityRequired((Boolean) newValue);
         } else if (preference == mUserAccountRequiredPref) {
@@ -498,8 +492,9 @@ private void setupPreferenceList(ListView prefList, Resources res) {
         if (prefList == null || res == null) return;
 
         // customize list dividers
-        prefList.setDivider(getResources().getDrawable(R.drawable.preferences_divider));
         prefList.setDividerHeight(1);
+        //noinspection deprecation
+        prefList.setDivider(getResources().getDrawable(R.drawable.preferences_divider));
         // handle long clicks on preferences to display hints
         prefList.setOnItemLongClickListener(this);
         // required to customize (Calypso) preference views
@@ -514,60 +509,44 @@ private void setupPreferenceList(ListView prefList, Resources res) {
      * Helper method to retrieve {@link Preference} references and initialize any data.
      */
     private void initPreferences() {
-        mTitlePref = (EditTextPreference) getPref(R.string.pref_key_site_title);
-        mTaglinePref = (EditTextPreference) getPref(R.string.pref_key_site_tagline);
-        mAddressPref = (EditTextPreference) getPref(R.string.pref_key_site_address);
-        mPrivacyPref = (DetailListPreference) getPref(R.string.pref_key_site_visibility);
-        mLanguagePref = (DetailListPreference) getPref(R.string.pref_key_site_language);
-        mUsernamePref = (EditTextPreference) getPref(R.string.pref_key_site_username);
-        mPasswordPref = (EditTextPreference) getPref(R.string.pref_key_site_password);
-        mLocationPref = (WPSwitchPreference) getPref(R.string.pref_key_site_location);
-        mCategoryPref = (DetailListPreference) getPref(R.string.pref_key_site_category);
-        mFormatPref = (DetailListPreference) getPref(R.string.pref_key_site_format);
-        mAllowCommentsPref = (WPSwitchPreference) getPref(R.string.pref_key_site_allow_comments);
-        mAllowCommentsNested = (WPSwitchPreference) getPref(R.string.pref_key_site_allow_comments_nested);
-        mSendPingbacksPref = (WPSwitchPreference) getPref(R.string.pref_key_site_send_pingbacks);
-        mSendPingbacksNested = (WPSwitchPreference) getPref(R.string.pref_key_site_send_pingbacks_nested);
-        mReceivePingbacksPref = (WPSwitchPreference) getPref(R.string.pref_key_site_receive_pingbacks);
-        mReceivePingbacksNested = (WPSwitchPreference) getPref(R.string.pref_key_site_receive_pingbacks_nested);
-        mIdentityRequiredPreference = (WPSwitchPreference) getPref(R.string.pref_key_site_identity_required);
-        mUserAccountRequiredPref = (WPSwitchPreference) getPref(R.string.pref_key_site_user_account_required);
-        mCloseAfterPref = findPreference(getString(R.string.pref_key_site_close_after));
-        mSortByPref = (DetailListPreference) getPref(R.string.pref_key_site_sort_by);
-        mThreadingPref = (DetailListPreference) getPref(R.string.pref_key_site_threading);
-        mPagingPref = findPreference(getString(R.string.pref_key_site_paging));
-        mWhitelistPref = (DetailListPreference) getPref(R.string.pref_key_site_whitelist);
-        mMultipleLinksPref = getPref(R.string.pref_key_site_multiple_links);
-        mModerationHoldPref = getPref(R.string.pref_key_site_moderation_hold);
-        mBlacklistPref = getPref(R.string.pref_key_site_blacklist);
-        mRelatedPostsPref = findPreference(getString(R.string.pref_key_site_related_posts));
-        mDeleteSitePref = findPreference(getString(R.string.pref_key_site_delete_site));
-        mRelatedPostsPref.setOnPreferenceClickListener(this);
-        mMultipleLinksPref.setOnPreferenceClickListener(this);
-        mModerationHoldPref.setOnPreferenceClickListener(this);
-        mBlacklistPref.setOnPreferenceClickListener(this);
-        mDeleteSitePref.setOnPreferenceClickListener(this);
-        mCloseAfterPref.setOnPreferenceClickListener(this);
-        mPagingPref.setOnPreferenceClickListener(this);
+        mTitlePref = (EditTextPreference) getChangePref(R.string.pref_key_site_title);
+        mTaglinePref = (EditTextPreference) getChangePref(R.string.pref_key_site_tagline);
+        mAddressPref = (EditTextPreference) getChangePref(R.string.pref_key_site_address);
+        mPrivacyPref = (DetailListPreference) getChangePref(R.string.pref_key_site_visibility);
+        mLanguagePref = (DetailListPreference) getChangePref(R.string.pref_key_site_language);
+        mUsernamePref = (EditTextPreference) getChangePref(R.string.pref_key_site_username);
+        mPasswordPref = (EditTextPreference) getChangePref(R.string.pref_key_site_password);
+        mLocationPref = (WPSwitchPreference) getChangePref(R.string.pref_key_site_location);
+        mCategoryPref = (DetailListPreference) getChangePref(R.string.pref_key_site_category);
+        mFormatPref = (DetailListPreference) getChangePref(R.string.pref_key_site_format);
+        mAllowCommentsPref = (WPSwitchPreference) getChangePref(R.string.pref_key_site_allow_comments);
+        mAllowCommentsNested = (WPSwitchPreference) getChangePref(R.string.pref_key_site_allow_comments_nested);
+        mSendPingbacksPref = (WPSwitchPreference) getChangePref(R.string.pref_key_site_send_pingbacks);
+        mSendPingbacksNested = (WPSwitchPreference) getChangePref(R.string.pref_key_site_send_pingbacks_nested);
+        mReceivePingbacksPref = (WPSwitchPreference) getChangePref(R.string.pref_key_site_receive_pingbacks);
+        mReceivePingbacksNested = (WPSwitchPreference) getChangePref(R.string.pref_key_site_receive_pingbacks_nested);
+        mIdentityRequiredPreference = (WPSwitchPreference) getChangePref(R.string.pref_key_site_identity_required);
+        mUserAccountRequiredPref = (WPSwitchPreference) getChangePref(R.string.pref_key_site_user_account_required);
+        mSortByPref = (DetailListPreference) getChangePref(R.string.pref_key_site_sort_by);
+        mThreadingPref = (DetailListPreference) getChangePref(R.string.pref_key_site_threading);
+        mWhitelistPref = (DetailListPreference) getChangePref(R.string.pref_key_site_whitelist);
+        mRelatedPostsPref = getClickPref(R.string.pref_key_site_related_posts);
+        mCloseAfterPref = getClickPref(R.string.pref_key_site_close_after);
+        mPagingPref = getClickPref(R.string.pref_key_site_paging);
+        mMultipleLinksPref = getClickPref(R.string.pref_key_site_multiple_links);
+        mModerationHoldPref = getClickPref(R.string.pref_key_site_moderation_hold);
+        mBlacklistPref = getClickPref(R.string.pref_key_site_blacklist);
+        mDeleteSitePref = getClickPref(R.string.pref_key_site_delete_site);
 
         // .com sites hide the Account category, self-hosted sites hide the Related Posts preference
         if (mBlog.isDotcomFlag()) {
-            removePreference(R.string.pref_key_site_screen, R.string.pref_key_site_account);
-            removePreference(R.string.pref_key_site_screen, R.string.pref_key_site_delete_site);
+            removeSelfHostedOnlyPreferences();
         } else {
-            removePreference(R.string.pref_key_site_general, R.string.pref_key_site_language);
-            removePreference(R.string.pref_key_site_writing, R.string.pref_key_site_related_posts);
+            removeDotComOnlyPreferences();
         }
 
         // hide all options except for Delete site and Enable Location if user is not admin
-        if (!mBlog.isAdmin()) {
-            removePreference(R.string.pref_key_site_screen, R.string.pref_key_site_general);
-            removePreference(R.string.pref_key_site_screen, R.string.pref_key_site_account);
-            removePreference(R.string.pref_key_site_screen, R.string.pref_key_site_discussion);
-            removePreference(R.string.pref_key_site_writing, R.string.pref_key_site_category);
-            removePreference(R.string.pref_key_site_writing, R.string.pref_key_site_format);
-            removePreference(R.string.pref_key_site_writing, R.string.pref_key_site_related_posts);
-        }
+        if (!mBlog.isAdmin()) hideAdminRequiredPreferences();
     }
 
     private void showRelatedPostsDialog() {
@@ -581,163 +560,47 @@ private void showRelatedPostsDialog() {
         relatedPosts.show(getFragmentManager(), "related-posts");
     }
 
-    private View getDialogTitleView(int title) {
-        LayoutInflater inflater = LayoutInflater.from(getActivity());
-        @SuppressLint("InflateParams")
-        View titleView = inflater.inflate(R.layout.detail_list_preference_title, null);
-        TextView titleText = ((TextView) titleView.findViewById(R.id.title));
-        titleText.setText(title);
-        titleText.setLayoutParams(new RelativeLayout.LayoutParams(
-                RelativeLayout.LayoutParams.MATCH_PARENT,
-                RelativeLayout.LayoutParams.WRAP_CONTENT));
-        return titleView;
+    private void showNumberPickerDialog(Bundle args, int requestCode, String tag) {
+        NumberPickerDialog dialog = new NumberPickerDialog();
+        dialog.setArguments(args);
+        dialog.setTargetFragment(this, requestCode);
+        dialog.show(getFragmentManager(), tag);
     }
 
     private void showPagingDialog() {
-        mSwitchChecked = mSiteSettings.getPagingCount() > 0;
-        getNumberPickerDialog(true,
-                mSwitchChecked,
-                new CompoundButton.OnCheckedChangeListener() {
-                    @Override
-                    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                        mSwitchChecked = isChecked;
-                    }
-                },
-                R.string.site_settings_paging_title,
-                R.string.site_settings_paging_dialog_description,
-                R.string.site_settings_paging_dialog_header,
-                1,
-                getResources().getInteger(R.integer.paging_limit),
-                mSiteSettings.getPagingCount(),
-                R.string.site_settings_paging_title,
-                new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        if (mSwitchChecked && mSiteSettings.getPagingCount() != mNumberPicker.getValue()) {
-                            onPreferenceChange(mPagingPref, mNumberPicker.getValue());
-                        } else {
-                            onPreferenceChange(mPagingPref, 0);
-                        }
-                    }
-                }, null);
+        Bundle args = new Bundle();
+        args.putBoolean(NumberPickerDialog.SHOW_SWITCH_KEY, true);
+        args.putBoolean(NumberPickerDialog.SWITCH_ENABLED_KEY, mSiteSettings.getPagingCount() > 0);
+        args.putString(NumberPickerDialog.SWITCH_TITLE_KEY, getString(R.string.site_settings_paging_title));
+        args.putString(NumberPickerDialog.TITLE_KEY, getString(R.string.site_settings_paging_title));
+        args.putString(NumberPickerDialog.HEADER_TEXT_KEY, getString(R.string.site_settings_paging_dialog_header));
+        args.putInt(NumberPickerDialog.MIN_VALUE_KEY, 1);
+        args.putInt(NumberPickerDialog.MAX_VALUE_KEY, getResources().getInteger(R.integer.paging_limit));
+        args.putInt(NumberPickerDialog.CUR_VALUE_KEY, mSiteSettings.getPagingCount());
+        showNumberPickerDialog(args, PAGING_REQUEST_CODE, "paging-dialog");
     }
 
     private void showCloseAfterDialog() {
-        mSwitchChecked = mSiteSettings.getCloseAfter() > 0;
-        getNumberPickerDialog(true,
-                mSwitchChecked,
-                new CompoundButton.OnCheckedChangeListener() {
-                    @Override
-                    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                        mSwitchChecked = isChecked;
-                    }
-                },
-                R.string.site_settings_close_after_dialog_switch_text,
-                R.string.site_settings_close_after_dialog_description,
-                R.string.site_settings_close_after_dialog_header,
-                1,
-                getResources().getInteger(R.integer.close_after_limit),
-                mSiteSettings.getCloseAfter(),
-                R.string.site_settings_close_after_dialog_title,
-                new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        if (mSwitchChecked && mSiteSettings.getCloseAfter() != mNumberPicker.getValue()) {
-                            onPreferenceChange(mCloseAfterPref, mNumberPicker.getValue());
-                        } else {
-                            onPreferenceChange(mCloseAfterPref, 0);
-                        }
-                    }
-                }, null);
-        mNumberPicker.setFormatter(new NumberPicker.Formatter() {
-            @Override
-            public String format(int value) {
-                return getResources().getQuantityString(R.plurals.days_quantity, value, value);
-            }
-        });
+        Bundle args = new Bundle();
+        args.putBoolean(NumberPickerDialog.SHOW_SWITCH_KEY, true);
+        args.putBoolean(NumberPickerDialog.SWITCH_ENABLED_KEY, mSiteSettings.getCloseAfter() > 0);
+        args.putString(NumberPickerDialog.SWITCH_TITLE_KEY, getString(R.string.site_settings_close_after_dialog_switch_text));
+        args.putString(NumberPickerDialog.TITLE_KEY, getString(R.string.site_settings_close_after_dialog_title));
+        args.putString(NumberPickerDialog.HEADER_TEXT_KEY, getString(R.string.site_settings_close_after_dialog_header));
+        args.putInt(NumberPickerDialog.MIN_VALUE_KEY, 1);
+        args.putInt(NumberPickerDialog.MAX_VALUE_KEY, getResources().getInteger(R.integer.close_after_limit));
+        args.putInt(NumberPickerDialog.CUR_VALUE_KEY, mSiteSettings.getCloseAfter());
+        showNumberPickerDialog(args, CLOSE_AFTER_REQUEST_CODE, "close-after-dialog");
     }
 
     private void showMultipleLinksDialog() {
-        getNumberPickerDialog(false,
-                false,
-                null,
-                -1,
-                R.string.site_settings_multiple_links_dialog_description,
-                -1,
-                0,
-                getResources().getInteger(R.integer.max_links_limit),
-                mSiteSettings.getMultipleLinks(),
-                R.string.site_settings_multiple_links_title,
-                new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        if (mSiteSettings.getMultipleLinks() != mNumberPicker.getValue()) {
-                            onPreferenceChange(mMultipleLinksPref, mNumberPicker.getValue());
-                        }
-                    }
-                }, null);
-    }
-
-    private void getNumberPickerDialog(boolean showSwitch,
-                                       boolean switchChecked,
-                                       final CompoundButton.OnCheckedChangeListener switchListener,
-                                       int switchText,
-                                       int detail,
-                                       int header,
-                                       int min,
-                                       int max,
-                                       int cur,
-                                       int title,
-                                       DialogInterface.OnClickListener positive,
-                                       DialogInterface.OnClickListener negative) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.Calypso_AlertDialog);
-        View view = View.inflate(getActivity(), R.layout.number_picker_dialog, null);
-        mNumberPicker = (NumberPicker) view.findViewById(R.id.number_picker);
-        SwitchCompat pickerSwitch = (SwitchCompat) view.findViewById(R.id.number_picker_switch);
-        if (showSwitch) {
-            pickerSwitch.setVisibility(View.VISIBLE);
-            pickerSwitch.setText(switchText);
-            pickerSwitch.setChecked(switchChecked);
-            final View toggleContainer = view.findViewById(R.id.number_picker_toggleable);
-            toggleContainer.setEnabled(switchChecked);
-            mNumberPicker.setEnabled(switchChecked);
-            pickerSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-                @Override
-                public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                    toggleContainer.setEnabled(isChecked);
-                    mNumberPicker.setEnabled(isChecked);
-
-                    if (switchListener != null) {
-                        switchListener.onCheckedChanged(buttonView, isChecked);
-                    }
-                }
-            });
-        } else {
-            pickerSwitch.setVisibility(View.GONE);
-        }
-        TextView detailText = (TextView) view.findViewById(R.id.number_picker_text);
-        TextView headerText = (TextView) view.findViewById(R.id.number_picker_header);
-        if (header >= 0) {
-            headerText.setText(header);
-        } else {
-            headerText.setVisibility(View.GONE);
-        }
-        if (detail >= 0) {
-            detailText.setText(detail);
-        } else {
-            detailText.setVisibility(View.GONE);
-        }
-        mNumberPicker.setMinValue(min);
-        mNumberPicker.setMaxValue(max);
-        mNumberPicker.setValue(cur);
-        builder.setCustomTitle(getDialogTitleView(title));
-        builder.setPositiveButton(R.string.ok, positive);
-        builder.setNegativeButton(R.string.cancel, negative);
-        builder.setView(view);
-        AlertDialog dialog = builder.create();
-        dialog.show();
-        WPPrefUtils.layoutAsFlatButton(dialog.getButton(DialogInterface.BUTTON_POSITIVE));
-        WPPrefUtils.layoutAsFlatButton(dialog.getButton(DialogInterface.BUTTON_NEGATIVE));
+        Bundle args = new Bundle();
+        args.putBoolean(NumberPickerDialog.SHOW_SWITCH_KEY, false);
+        args.putString(NumberPickerDialog.TITLE_KEY, getString(R.string.site_settings_multiple_links_title));
+        args.putInt(NumberPickerDialog.MIN_VALUE_KEY, 0);
+        args.putInt(NumberPickerDialog.MAX_VALUE_KEY, getResources().getInteger(R.integer.max_links_limit));
+        args.putInt(NumberPickerDialog.CUR_VALUE_KEY, mSiteSettings.getMultipleLinks());
+        showNumberPickerDialog(args, MULTIPLE_LINKS_REQUEST_CODE, "multiple-links-dialog");
     }
 
     private void setPreferencesFromSiteSettings() {
@@ -750,7 +613,7 @@ private void setPreferencesFromSiteSettings() {
         changeLanguageValue(mSiteSettings.getLanguageCode());
         setDetailListPreferenceValue(mPrivacyPref,
                 String.valueOf(mSiteSettings.getPrivacy()),
-                getPrivacySummary(mSiteSettings.getPrivacy()));
+                mSiteSettings.getPrivacyDescription());
         setCategories();
         setPostFormats();
         setAllowComments(mSiteSettings.getAllowComments());
@@ -758,10 +621,10 @@ private void setPreferencesFromSiteSettings() {
         setReceivePingbacks(mSiteSettings.getReceivePingbacks());
         setDetailListPreferenceValue(mSortByPref,
                 String.valueOf(mSiteSettings.getCommentSorting()),
-                getSortOrderSummary(mSiteSettings.getCommentSorting()));
+                mSiteSettings.getSortingDescription());
         setDetailListPreferenceValue(mThreadingPref,
                 String.valueOf(mSiteSettings.getThreadingLevels()),
-                getThreadingSummary(mSiteSettings.getThreadingLevels()));
+                mSiteSettings.getThreadingDescription());
         int approval = mSiteSettings.getManualApproval() ?
                 mSiteSettings.getUseCommentWhitelist() ? 0
                         : -1 : 1;
@@ -773,8 +636,8 @@ private void setPreferencesFromSiteSettings() {
         mIdentityRequiredPreference.setChecked(mSiteSettings.getIdentityRequired());
         mUserAccountRequiredPref.setChecked(mSiteSettings.getUserAccountRequired());
         mThreadingPref.setValue(String.valueOf(mSiteSettings.getThreadingLevels()));
-        mCloseAfterPref.setSummary(getCloseAfterSummary(mSiteSettings.getCloseAfter()));
-        mPagingPref.setSummary(getPagingSummary(mSiteSettings.getPagingCount()));
+        mCloseAfterPref.setSummary(mSiteSettings.getCloseAfterDescription());
+        mPagingPref.setSummary(mSiteSettings.getPagingDescription());
     }
 
     private void setCategories() {
@@ -803,14 +666,13 @@ private void setCategories() {
     private void setPostFormats() {
         // Ignore if there are no changes
         if (mSiteSettings.isSameFormatList(mFormatPref.getEntryValues())) {
-            mFormatPref.setValue(String.valueOf(mSiteSettings.getDefaultFormat()));
+            mFormatPref.setValue(String.valueOf(mSiteSettings.getDefaultPostFormat()));
             mFormatPref.setSummary(mSiteSettings.getDefaultPostFormatDisplay());
             return;
         }
 
         Map<String, String> formats = mSiteSettings.getFormats();
         String[] formatKeys = mSiteSettings.getFormatKeys();
-        if (formats == null || formatKeys == null) return;
         String[] entries = new String[formatKeys.length];
         String[] values = new String[formatKeys.length];
 
@@ -821,7 +683,7 @@ private void setPostFormats() {
 
         mFormatPref.setEntries(entries);
         mFormatPref.setEntryValues(values);
-        mFormatPref.setValue(String.valueOf(mSiteSettings.getDefaultFormat()));
+        mFormatPref.setValue(String.valueOf(mSiteSettings.getDefaultPostFormat()));
         mFormatPref.setSummary(mSiteSettings.getDefaultPostFormatDisplay());
     }
 
@@ -876,7 +738,7 @@ private void changeLanguageValue(String newValue) {
         if (TextUtils.isEmpty(mLanguagePref.getSummary()) ||
                 !newValue.equals(mLanguagePref.getValue())) {
             mLanguagePref.setValue(newValue);
-            String summary = getLanguageString(newValue, languageLocale(newValue));
+            String summary = getLanguageString(newValue, WPPrefUtils.languageLocale(newValue));
             mLanguagePref.setSummary(summary);
 
             // update details to display in selected locale
@@ -887,50 +749,6 @@ private void changeLanguageValue(String newValue) {
         }
     }
 
-    private String getPrivacySummary(int privacy) {
-        if (isAdded()) {
-            switch (privacy) {
-                case -1:
-                    return getString(R.string.site_settings_privacy_private_summary);
-                case 0:
-                    return getString(R.string.site_settings_privacy_hidden_summary);
-                case 1:
-                    return getString(R.string.site_settings_privacy_public_summary);
-            }
-        }
-        return "";
-    }
-
-    private String getCloseAfterSummary(int period) {
-        if (!isAdded()) return "";
-        if (period == 0) return getString(R.string.never);
-        return getResources().getQuantityString(R.plurals.days_quantity, period, period);
-    }
-
-    private String getSortOrderSummary(int order) {
-        if (!isAdded()) return "";
-        switch (order) {
-            case SiteSettingsInterface.ASCENDING_SORT:
-                return getString(R.string.oldest_first);
-            case SiteSettingsInterface.DESCENDING_SORT:
-                return getString(R.string.newest_first);
-            default:
-                return getString(R.string.unknown);
-        }
-    }
-
-    private String getThreadingSummary(int levels) {
-        if (!isAdded()) return "";
-        if (levels <= 1) return getString(R.string.none);
-        return String.format(getString(R.string.site_settings_threading_summary), levels);
-    }
-
-    private String getPagingSummary(int count) {
-        if (!isAdded()) return "";
-        if (count == 0) return getString(R.string.none);
-        return getResources().getQuantityString(R.plurals.site_settings_paging_summary, count, count);
-    }
-
     private String getWhitelistSummary(int value) {
         if (isAdded()) {
             switch (value) {
@@ -1119,7 +937,7 @@ private String[] createLanguageDisplayStrings(CharSequence[] languageCodes) {
 
         for (int i = 0; i < languageCodes.length; ++i) {
             displayStrings[i] = StringUtils.capitalize(getLanguageString(
-                    String.valueOf(languageCodes[i]), languageLocale(languageCodes[i].toString())));
+                    String.valueOf(languageCodes[i]), WPPrefUtils.languageLocale(languageCodes[i].toString())));
         }
 
         return displayStrings;
@@ -1135,7 +953,7 @@ public String[] createLanguageDetailDisplayStrings(CharSequence[] languageCodes,
         String[] detailStrings = new String[languageCodes.length];
         for (int i = 0; i < languageCodes.length; ++i) {
             detailStrings[i] = StringUtils.capitalize(
-                    getLanguageString(languageCodes[i].toString(), languageLocale(locale)));
+                    getLanguageString(languageCodes[i].toString(), WPPrefUtils.languageLocale(locale)));
         }
 
         return detailStrings;
@@ -1149,7 +967,7 @@ private String getLanguageString(String languageCode, Locale displayLocale) {
             return "";
         }
 
-        Locale languageLocale = languageLocale(languageCode);
+        Locale languageLocale = WPPrefUtils.languageLocale(languageCode);
         String displayLanguage = languageLocale.getDisplayLanguage(displayLocale);
         String displayCountry = languageLocale.getDisplayCountry(displayLocale);
 
@@ -1159,38 +977,30 @@ private String getLanguageString(String languageCode, Locale displayLocale) {
         return displayLanguage;
     }
 
-    /**
-     * Gets a locale for the given language code.
-     */
-    private Locale languageLocale(String languageCode) {
-        if (TextUtils.isEmpty(languageCode)) return Locale.getDefault();
-
-        if (languageCode.length() > NO_REGION_LANG_CODE_LEN) {
-            return new Locale(languageCode.substring(0, NO_REGION_LANG_CODE_LEN),
-                    languageCode.substring(REGION_SUBSTRING_INDEX));
-        }
+    private void hideAdminRequiredPreferences() {
+        WPPrefUtils.removePreference(this, R.string.pref_key_site_screen, R.string.pref_key_site_general);
+        WPPrefUtils.removePreference(this, R.string.pref_key_site_screen, R.string.pref_key_site_account);
+        WPPrefUtils.removePreference(this, R.string.pref_key_site_screen, R.string.pref_key_site_discussion);
+        WPPrefUtils.removePreference(this, R.string.pref_key_site_writing, R.string.pref_key_site_category);
+        WPPrefUtils.removePreference(this, R.string.pref_key_site_writing, R.string.pref_key_site_format);
+        WPPrefUtils.removePreference(this, R.string.pref_key_site_writing, R.string.pref_key_site_related_posts);
+    }
 
-        return new Locale(languageCode);
+    private void removeDotComOnlyPreferences() {
+        WPPrefUtils.removePreference(this, R.string.pref_key_site_general, R.string.pref_key_site_language);
+        WPPrefUtils.removePreference(this, R.string.pref_key_site_writing, R.string.pref_key_site_related_posts);
     }
 
-    /**
-     * Gets a preference and sets the {@link android.preference.Preference.OnPreferenceChangeListener}.
-     */
-    private Preference getPref(int id) {
-        Preference pref = findPreference(getString(id));
-        pref.setOnPreferenceChangeListener(this);
-        return pref;
+    private void removeSelfHostedOnlyPreferences() {
+        WPPrefUtils.removePreference(this, R.string.pref_key_site_screen, R.string.pref_key_site_account);
+        WPPrefUtils.removePreference(this, R.string.pref_key_site_screen, R.string.pref_key_site_delete_site);
     }
 
-    /**
-     * Removes a {@link Preference} from the {@link PreferenceCategory} with the given key.
-     */
-    private void removePreference(int parentKey, int preference) {
-        PreferenceGroup parent = (PreferenceGroup) findPreference(getString(parentKey));
-        Preference child = findPreference(getString(preference));
+    private Preference getChangePref(int id) {
+        return WPPrefUtils.getPrefAndSetChangeListener(this, id, this);
+    }
 
-        if (parent != null && child != null) {
-            parent.removePreference(child);
-        }
+    private Preference getClickPref(int id) {
+        return WPPrefUtils.getPrefAndSetClickListener(this, id, this);
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java
index c1010937517e..4f0007d97c16 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java
@@ -4,6 +4,7 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.database.Cursor;
+import android.support.annotation.NonNull;
 import android.text.TextUtils;
 
 import org.wordpress.android.R;
@@ -11,6 +12,7 @@
 import org.wordpress.android.models.Blog;
 import org.wordpress.android.models.CategoryModel;
 import org.wordpress.android.models.SiteSettingsModel;
+import org.wordpress.android.util.WPPrefUtils;
 import org.xmlrpc.android.ApiHelper;
 import org.xmlrpc.android.XMLRPCCallback;
 import org.xmlrpc.android.XMLRPCClientInterface;
@@ -23,45 +25,124 @@
 import java.util.Map;
 
 /**
- * Keeps track of various settings and handles propagating changes where necessary.
+ * Interface for WordPress (.com and .org) Site Settings. The {@link SiteSettingsModel} class is
+ * used to store the following settings:
  *
  * - Title
  * - Tagline
+ * - Address
  * - Privacy
  * - Language
- * - Address
- * - Username
- * - Password
- * - Location: only stored locally
- * - Default post category
- * - Default post format
- * - Related posts
+ * - Username (.org only)
+ * - Password (.org only)
+ * - Location (local device setting, not saved remotely)
+ * - Default Category
+ * - Default Format
+ * - Related Posts
+ * - Allow Comments
+ * - Send Pingbacks
+ * - Receive Pingbacks
+ * - Identity Required
+ * - User Account Required
+ * - Close Comments After
+ * - Comment Sort Order
+ * - Comment Threading
+ * - Comment Paging
+ * - Comment User Whitelist
+ * - Comment Link Limit
+ * - Comment Moderation Hold Filter
+ * - Comment Blacklist Filter
+ *
+ * This class is marked abstract. This is due to the fact that .org (self-hosted) and .com sites
+ * expose different API's to query and edit their respective settings (even though the options
+ * offered by each is roughly the same). To get an instance of this interface class use the
+ * {@link SiteSettingsInterface#getInterface(Activity, Blog, SiteSettingsListener)} method. It will
+ * determine which interface ({@link SelfHostedSiteSettings} or {@link DotComSiteSettings}) is
+ * appropriate for the given blog.
  */
+
 public abstract class SiteSettingsInterface {
+
+    /**
+     * Name of the {@link SharedPreferences} that is used to store local settings.
+     */
     public static final String SITE_SETTINGS_PREFS = "site-settings-prefs";
+
+    /**
+     * Key used to access the language preference stored in {@link SharedPreferences}.
+     */
     public static final String LANGUAGE_PREF_KEY = "site-settings-language-pref";
+
+    /**
+     * Key used to access the location preference stored in {@link SharedPreferences}.
+     */
     public static final String LOCATION_PREF_KEY = "site-settings-location-pref";
+
+    /**
+     * Key used to access the default category preference stored in {@link SharedPreferences}.
+     */
     public static final String DEF_CATEGORY_PREF_KEY = "site-settings-category-pref";
+
+    /**
+     * Key used to access the default post format preference stored in {@link SharedPreferences}.
+     */
     public static final String DEF_FORMAT_PREF_KEY = "site-settings-format-pref";
 
+    /**
+     * Identifies an Ascending (oldest to newest) sort order.
+     */
     public static final int ASCENDING_SORT = 0;
+
+    /**
+     * Identifies an Descending (newest to oldest) sort order.
+     */
     public static final int DESCENDING_SORT = 1;
 
+    /**
+     * Used to prefix keys in an analytics property list.
+     */
     protected static final String SAVED_ITEM_PREFIX = "item_saved_";
 
-    private static final String STANDARD_POST_FORMAT = "standard";
+    /**
+     * Key for the Standard post format. Used as default if post format is not set/known.
+     */
+    private static final String STANDARD_POST_FORMAT_KEY = "standard";
+
+    /**
+     * Standard post format value. Used as default display value if post format is unknown.
+     */
+    private static final String STANDARD_POST_FORMAT = "Standard";
+
+    /**
+     * Instantiates the appropriate (self-hosted or .com) SiteSettingsInterface.
+     */
+    public static SiteSettingsInterface getInterface(Activity host, Blog blog, SiteSettingsListener listener) {
+        if (host == null || blog == null) return null;
+
+        if (blog.isDotcomFlag()) {
+            return new DotComSiteSettings(host, blog, listener);
+        } else {
+            return new SelfHostedSiteSettings(host, blog, listener);
+        }
+    }
 
     /**
-     * Returns a SharedPreference instance to interface with Site Settings.
+     * Returns an instance of the {@link this#SITE_SETTINGS_PREFS} {@link SharedPreferences}.
      */
     public static SharedPreferences siteSettingsPreferences(Context context) {
         return context.getSharedPreferences(SITE_SETTINGS_PREFS, Context.MODE_PRIVATE);
     }
 
+    /**
+     * Gets the geo-tagging value stored in {@link SharedPreferences}, false by default.
+     */
     public static boolean getGeotagging(Context context) {
         return siteSettingsPreferences(context).getBoolean(LOCATION_PREF_KEY, false);
     }
 
+    /**
+     * Gets the default category value stored in {@link SharedPreferences}, 0 by default.
+     */
     public static String getDefaultCategory(Context context) {
         int id = siteSettingsPreferences(context).getInt(DEF_CATEGORY_PREF_KEY, 0);
 
@@ -77,13 +158,21 @@ public static String getDefaultCategory(Context context) {
         return "";
     }
 
+    /**
+     * Gets the default post format value stored in {@link SharedPreferences}, "" by default.
+     */
     public static String getDefaultFormat(Context context) {
         return siteSettingsPreferences(context).getString(DEF_FORMAT_PREF_KEY, "");
     }
 
-    public class AuthenticationError extends Exception {
-    }
+    /**
+     * Thrown when provided credentials are not valid.
+     */
+    public class AuthenticationError extends Exception { }
 
+    /**
+     * Interface callbacks for settings events.
+     */
     public interface SiteSettingsListener {
         /**
          * Called when settings have been updated with remote changes.
@@ -110,28 +199,11 @@ public interface SiteSettingsListener {
         void onCredentialsValidated(Exception error);
     }
 
-    public void saveSettings() {
-        SiteSettingsTable.saveSettings(mSettings);
-        siteSettingsPreferences(mActivity).edit().putString(LANGUAGE_PREF_KEY, mSettings.language).apply();
-        siteSettingsPreferences(mActivity).edit().putBoolean(LOCATION_PREF_KEY, mSettings.location).apply();
-        siteSettingsPreferences(mActivity).edit().putInt(DEF_CATEGORY_PREF_KEY, mSettings.defaultCategory).apply();
-        siteSettingsPreferences(mActivity).edit().putString(DEF_FORMAT_PREF_KEY, mSettings.defaultPostFormat).apply();
-    }
-
-    protected abstract void fetchRemoteData();
-
     /**
-     * Instantiates the appropriate (self-hosted or .com) SiteSettingsInterface.
+     * {@link SiteSettingsInterface} implementations should use this method to start a background
+     * task to load settings data from a remote source.
      */
-    public static SiteSettingsInterface getInterface(Activity host, Blog blog, SiteSettingsListener listener) {
-        if (host == null || blog == null) return null;
-
-        if (blog.isDotcomFlag()) {
-            return new DotComSiteSettings(host, blog, listener);
-        } else {
-            return new SelfHostedSiteSettings(host, blog, listener);
-        }
-    }
+    protected abstract void fetchRemoteData();
 
     protected final Activity mActivity;
     protected final Blog mBlog;
@@ -139,7 +211,7 @@ public static SiteSettingsInterface getInterface(Activity host, Blog blog, SiteS
     protected final SiteSettingsModel mSettings;
     protected final SiteSettingsModel mRemoteSettings;
 
-    private final HashMap<String, String> mLanguageCodes;
+    private final Map<String, String> mLanguageCodes;
 
     protected SiteSettingsInterface(Activity host, Blog blog, SiteSettingsListener listener) {
         mActivity = host;
@@ -147,59 +219,80 @@ protected SiteSettingsInterface(Activity host, Blog blog, SiteSettingsListener l
         mListener = listener;
         mSettings = new SiteSettingsModel();
         mRemoteSettings = new SiteSettingsModel();
-        mLanguageCodes = new HashMap<>();
-    }
-
-    public String getAddress() {
-        return mSettings.address;
+        mLanguageCodes = WPPrefUtils.generateLanguageMap(host);
     }
 
-    public String getUsername() {
-        return mSettings.username;
+    public void saveSettings() {
+        SiteSettingsTable.saveSettings(mSettings);
+        siteSettingsPreferences(mActivity).edit().putString(LANGUAGE_PREF_KEY, mSettings.language).apply();
+        siteSettingsPreferences(mActivity).edit().putBoolean(LOCATION_PREF_KEY, mSettings.location).apply();
+        siteSettingsPreferences(mActivity).edit().putInt(DEF_CATEGORY_PREF_KEY, mSettings.defaultCategory).apply();
+        siteSettingsPreferences(mActivity).edit().putString(DEF_FORMAT_PREF_KEY, mSettings.defaultPostFormat).apply();
     }
 
-    public String getPassword() {
-        return mSettings.password;
+    public @NonNull String getTitle() {
+        return mSettings.title == null ? "" : mSettings.title;
     }
 
-    public String getTitle() {
-        return mSettings.title;
+    public @NonNull String getTagline() {
+        return mSettings.tagline == null ? "" : mSettings.tagline;
     }
 
-    public String getTagline() {
-        return mSettings.tagline;
+    public @NonNull String getAddress() {
+        return mSettings.address == null ? "" : mSettings.address;
     }
 
     public int getPrivacy() {
         return mSettings.privacy;
     }
 
-    public String getLanguageCode() {
-        return mSettings.language;
+    public @NonNull String getPrivacyDescription() {
+        if (mActivity != null) {
+            switch (getPrivacy()) {
+                case -1:
+                    return mActivity.getString(R.string.site_settings_privacy_private_summary);
+                case 0:
+                    return mActivity.getString(R.string.site_settings_privacy_hidden_summary);
+                case 1:
+                    return mActivity.getString(R.string.site_settings_privacy_public_summary);
+            }
+        }
+        return "";
+    }
+
+    public @NonNull String getLanguageCode() {
+        return mSettings.language == null ? "" : mSettings.language;
+    }
+
+    public @NonNull String getUsername() {
+        return mSettings.username == null ? "" : mSettings.username;
+    }
+
+    public @NonNull String getPassword() {
+        return mSettings.password == null ? "" : mSettings.password;
     }
 
     public boolean getLocation() {
         return mSettings.location;
     }
 
-    public Map<String, String> getFormats() {
-        if (mSettings.postFormats == null) {
-            mSettings.postFormats = new HashMap<>();
-        }
+    public @NonNull Map<String, String> getFormats() {
+        if (mSettings.postFormats == null) mSettings.postFormats = new HashMap<>();
         return mSettings.postFormats;
     }
 
-    public String[] getFormatKeys() {
+    public @NonNull String[] getFormatKeys() {
+        if (mSettings.postFormatKeys == null) mSettings.postFormatKeys = new String[0];
         return mSettings.postFormatKeys;
     }
 
-    public CategoryModel[] getCategories() {
+    public @NonNull CategoryModel[] getCategories() {
+        if (mSettings.categories == null) mSettings.categories = new CategoryModel[0];
         return mSettings.categories;
     }
 
-    public Map<Integer, String> getCategoryNames() {
+    public @NonNull Map<Integer, String> getCategoryNames() {
         Map<Integer, String> categoryNames = new HashMap<>();
-
         if (mSettings.categories != null && mSettings.categories.length > 0) {
             for (CategoryModel model : mSettings.categories) {
                 categoryNames.put(model.id, model.name);
@@ -209,34 +302,33 @@ public Map<Integer, String> getCategoryNames() {
         return categoryNames;
     }
 
-    public String getDefaultPostFormat() {
-        if (TextUtils.isEmpty(mSettings.defaultPostFormat)) {
-            return STANDARD_POST_FORMAT;
-        }
-
-        return mSettings.defaultPostFormat;
-    }
-
-    public String getDefaultPostFormatDisplay() {
-        return getFormats().get(mSettings.defaultPostFormat);
-    }
-
     public int getDefaultCategory() {
         return mSettings.defaultCategory;
     }
 
-    public String getDefaultCategoryForDisplay() {
-        if (getCategories() != null) {
-            for (CategoryModel model : getCategories()) {
-                if (model != null && model.id == getDefaultCategory()) {
-                    return model.name;
-                }
+    public @NonNull String getDefaultCategoryForDisplay() {
+        for (CategoryModel model : getCategories()) {
+            if (model != null && model.id == getDefaultCategory()) {
+                return model.name;
             }
         }
 
         return "";
     }
 
+    public @NonNull String getDefaultPostFormat() {
+        if (TextUtils.isEmpty(mSettings.defaultPostFormat)) {
+            mSettings.defaultPostFormat = STANDARD_POST_FORMAT_KEY;
+        }
+        return mSettings.defaultPostFormat;
+    }
+
+    public @NonNull String getDefaultPostFormatDisplay() {
+        String defaultFormat = getFormats().get(getDefaultPostFormat());
+        if (TextUtils.isEmpty(defaultFormat)) defaultFormat = STANDARD_POST_FORMAT;
+        return defaultFormat;
+    }
+
     public boolean getShowRelatedPosts() {
         return mSettings.showRelatedPosts;
     }
@@ -249,16 +341,112 @@ public boolean getShowRelatedPostImages() {
         return mSettings.showRelatedPostImages;
     }
 
-    public void setAddress(String address) {
-        mSettings.address = address;
+    public boolean getAllowComments() {
+        return mSettings.allowComments;
     }
 
-    public void setUsername(String username) {
-        mSettings.username = username;
+    public boolean getSendPingbacks() {
+        return mSettings.sendPingbacks;
     }
 
-    public void setPassword(String password) {
-        mSettings.password = password;
+    public boolean getReceivePingbacks() {
+        return mSettings.receivePingbacks;
+    }
+
+    public boolean getShouldCloseAfter() {
+        return mSettings.shouldCloseAfter;
+    }
+
+    public int getCloseAfter() {
+        return mSettings.closeCommentAfter;
+    }
+
+    public @NonNull String getCloseAfterDescription() {
+        if (mActivity == null) return "";
+
+        int period = getCloseAfter();
+        if (period == 0) return mActivity.getString(R.string.never);
+        return mActivity.getResources().getQuantityString(R.plurals.days_quantity, period, period);
+    }
+
+    public int getCommentSorting() {
+        return mSettings.sortCommentsBy;
+    }
+
+    public @NonNull String getSortingDescription() {
+        if (mActivity == null) return "";
+
+        int order = getCommentSorting();
+        switch (order) {
+            case SiteSettingsInterface.ASCENDING_SORT:
+                return mActivity.getString(R.string.oldest_first);
+            case SiteSettingsInterface.DESCENDING_SORT:
+                return mActivity.getString(R.string.newest_first);
+            default:
+                return mActivity.getString(R.string.unknown);
+        }
+    }
+
+    public boolean getShouldThreadComments() {
+        return mSettings.shouldThreadComments;
+    }
+
+    public int getThreadingLevels() {
+        return mSettings.threadingLevels;
+    }
+
+    public @NonNull String getThreadingDescription() {
+        if (mActivity == null) return "";
+
+        int levels = getThreadingLevels();
+        if (levels <= 1) return mActivity.getString(R.string.none);
+        return String.format(mActivity.getString(R.string.site_settings_threading_summary), levels);
+    }
+
+    public boolean getShouldPageComments() {
+        return mSettings.shouldPageComments;
+    }
+
+    public int getPagingCount() {
+        return mSettings.commentsPerPage;
+    }
+
+    public @NonNull String getPagingDescription() {
+        if (mActivity == null) return "";
+
+        int count = getPagingCount();
+        if (count == 0) return mActivity.getString(R.string.none);
+        return mActivity.getResources().getQuantityString(R.plurals.site_settings_paging_summary, count, count);
+    }
+
+    public boolean getManualApproval() {
+        return mSettings.commentApprovalRequired;
+    }
+
+    public boolean getIdentityRequired() {
+        return mSettings.commentsRequireIdentity;
+    }
+
+    public boolean getUserAccountRequired() {
+        return mSettings.commentsRequireUserAccount;
+    }
+
+    public boolean getUseCommentWhitelist() {
+        return mSettings.commentAutoApprovalKnownUsers;
+    }
+
+    public int getMultipleLinks() {
+        return mSettings.maxLinks;
+    }
+
+    public @NonNull List<String> getModerationKeys() {
+        if (mSettings.holdForModeration == null) return new ArrayList<>();
+        return mSettings.holdForModeration;
+    }
+
+    public @NonNull List<String> getBlacklistKeys() {
+        if (mSettings.blacklist == null) return new ArrayList<>();
+        return mSettings.blacklist;
     }
 
     public void setTitle(String title) {
@@ -269,6 +457,10 @@ public void setTagline(String tagline) {
         mSettings.tagline = tagline;
     }
 
+    public void setAddress(String address) {
+        mSettings.address = address;
+    }
+
     public void setPrivacy(int privacy) {
         mSettings.privacy = privacy;
     }
@@ -279,13 +471,21 @@ public void setLanguageCode(String languageCode) {
     }
 
     public void setLanguageId(int languageId) {
-        // Want to prevent O(n) language code lookup if there is no change
+        // want to prevent O(n) language code lookup if there is no change
         if (mSettings.languageId != languageId) {
             mSettings.languageId = languageId;
             mSettings.language = languageIdToLanguageCode(Integer.toString(languageId));
         }
     }
 
+    public void setUsername(String username) {
+        mSettings.username = username;
+    }
+
+    public void setPassword(String password) {
+        mSettings.password = password;
+    }
+
     public void setLocation(boolean location) {
         mSettings.location = location;
     }
@@ -294,116 +494,70 @@ public void setAllowComments(boolean allowComments) {
         mSettings.allowComments = allowComments;
     }
 
-    public boolean getAllowComments() {
-        return mSettings.allowComments;
-    }
-
     public void setSendPingbacks(boolean sendPingbacks) {
         mSettings.sendPingbacks = sendPingbacks;
     }
 
-    public boolean getSendPingbacks() {
-        return mSettings.sendPingbacks;
-    }
-
     public void setReceivePingbacks(boolean receivePingbacks) {
         mSettings.receivePingbacks = receivePingbacks;
     }
 
-    public boolean getReceivePingbacks() {
-        return mSettings.receivePingbacks;
+    public void setShouldCloseAfter(boolean shouldCloseAfter) {
+        mSettings.shouldCloseAfter = shouldCloseAfter;
     }
 
     public void setCloseAfter(int period) {
         mSettings.closeCommentAfter = period;
     }
 
-    public int getCloseAfter() {
-        return mSettings.closeCommentAfter;
-    }
-
     public void setCommentSorting(int method) {
         mSettings.sortCommentsBy = method;
     }
 
-    public int getCommentSorting() {
-        return mSettings.sortCommentsBy;
+    public void setShouldThreadComments(boolean shouldThread) {
+        mSettings.shouldThreadComments = shouldThread;
     }
 
     public void setThreadingLevels(int levels) {
         mSettings.threadingLevels = levels;
     }
 
-    public int getThreadingLevels() {
-        return mSettings.threadingLevels;
+    public void setShouldPageComments(boolean shouldPage) {
+        mSettings.shouldPageComments= shouldPage;
     }
 
     public void setPagingCount(int count) {
         mSettings.commentsPerPage = count;
     }
 
-    public int getPagingCount() {
-        return mSettings.commentsPerPage;
-    }
-
     public void setManualApproval(boolean required) {
         mSettings.commentApprovalRequired = required;
     }
 
-    public boolean getManualApproval() {
-        return mSettings.commentApprovalRequired;
-    }
-
     public void setIdentityRequired(boolean required) {
         mSettings.commentsRequireIdentity = required;
     }
 
-    public boolean getIdentityRequired() {
-        return mSettings.commentsRequireIdentity;
-    }
-
     public void setUserAccountRequired(boolean required) {
         mSettings.commentsRequireUserAccount = required;
     }
 
-    public boolean getUserAccountRequired() {
-        return mSettings.commentsRequireUserAccount;
-    }
-
     public void setUseCommentWhitelist(boolean useWhitelist) {
         mSettings.commentAutoApprovalKnownUsers = useWhitelist;
     }
 
-    public boolean getUseCommentWhitelist() {
-        return mSettings.commentAutoApprovalKnownUsers;
-    }
-
     public void setMultipleLinks(int count) {
         mSettings.maxLinks = count;
     }
 
-    public int getMultipleLinks() {
-        return mSettings.maxLinks;
-    }
-
     public void setModerationKeys(List<String> keys) {
         mSettings.holdForModeration = keys;
     }
 
-    public List<String> getModerationKeys() {
-        if (mSettings.holdForModeration == null) return new ArrayList<>();
-        return mSettings.holdForModeration;
-    }
-
     public void setBlacklistKeys(List<String> keys) {
         mSettings.blacklist = keys;
     }
 
-    public List<String> getBlacklistKeys() {
-        if (mSettings.blacklist == null) return new ArrayList<>();
-        return mSettings.blacklist;
-    }
-
     public void setDefaultCategory(int category) {
         mSettings.defaultCategory = category;
     }
@@ -412,20 +566,16 @@ public void setDefaultCategory(int category) {
      * Sets the default post format.
      *
      * @param format
-     * if null or empty default format is set to {@link SiteSettingsInterface#STANDARD_POST_FORMAT}
+     * if null or empty default format is set to {@link SiteSettingsInterface#STANDARD_POST_FORMAT_KEY}
      */
     public void setDefaultFormat(String format) {
         if (TextUtils.isEmpty(format)) {
-            mSettings.defaultPostFormat = STANDARD_POST_FORMAT;
+            mSettings.defaultPostFormat = STANDARD_POST_FORMAT_KEY;
         } else {
             mSettings.defaultPostFormat = format.toLowerCase();
         }
     }
 
-    public String getDefaultFormat() {
-        return TextUtils.isEmpty(mSettings.defaultPostFormat) ? STANDARD_POST_FORMAT : mSettings.defaultPostFormat;
-    }
-
     public void setShowRelatedPosts(boolean relatedPosts) {
         mSettings.showRelatedPosts = relatedPosts;
     }
@@ -438,6 +588,20 @@ public void setShowRelatedPostImages(boolean showImages) {
         mSettings.showRelatedPostImages = showImages;
     }
 
+    /**
+     * Determines if the current Moderation Hold list contains a given value.
+     */
+    public boolean moderationHoldListContains(String value) {
+        return getModerationKeys().contains(value);
+    }
+
+    /**
+     * Determines if the current Blacklist list contains a given value.
+     */
+    public boolean blacklistListContains(String value) {
+        return getBlacklistKeys().contains(value);
+    }
+
     /**
      * Checks if the provided list of post format IDs is the same (order dependent) as the current
      * list of Post Formats in the local settings object.
@@ -488,38 +652,14 @@ public boolean isSameCategoryList(CharSequence[] ids) {
      * {@link SiteSettingsInterface#getInterface(Activity, Blog, SiteSettingsListener)}
      */
     public SiteSettingsInterface init(boolean fetchRemote) {
-        generateLanguageMap();
-        initSettings(fetchRemote);
-
-        return this;
-    }
-
-    /**
-     * Notifies listener that settings have been updated with the latest remote data.
-     */
-    protected void notifyUpdatedOnUiThread(final Exception error) {
-        if (mActivity == null || mActivity.isFinishing() || mListener == null) return;
-
-        mActivity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mListener.onSettingsUpdated(error);
-            }
-        });
-    }
+        loadCachedSettings();
 
-    /**
-     * Notifies listener that settings have been saved or an error occurred while saving.
-     */
-    protected void notifySavedOnUiThread(final Exception error) {
-        if (mActivity == null || mListener == null) return;
+        if (fetchRemote) {
+            fetchRemoteData();
+            fetchPostFormats();
+        }
 
-        mActivity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mListener.onSettingsSaved(error);
-            }
-        });
+        return this;
     }
 
     /**
@@ -663,26 +803,30 @@ public void run() {
     }
 
     /**
-     * Attempts to load cached settings for the blog then fetches remote settings.
+     * Notifies listener that settings have been updated with the latest remote data.
      */
-    private void initSettings(boolean fetchRemote) {
-        loadCachedSettings();
+    protected void notifyUpdatedOnUiThread(final Exception error) {
+        if (mActivity == null || mActivity.isFinishing() || mListener == null) return;
 
-        if (fetchRemote) {
-            fetchRemoteData();
-            fetchPostFormats();
-        }
+        mActivity.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mListener.onSettingsUpdated(error);
+            }
+        });
     }
 
     /**
-     * Creates a map from language codes to WordPress language IDs.
+     * Notifies listener that settings have been saved or an error occurred while saving.
      */
-    private void generateLanguageMap() {
-        // Generate map of language codes
-        String[] languageIds = mActivity.getResources().getStringArray(R.array.lang_ids);
-        String[] languageCodes = mActivity.getResources().getStringArray(R.array.language_codes);
-        for (int i = 0; i < languageIds.length && i < languageCodes.length; ++i) {
-            mLanguageCodes.put(languageCodes[i], languageIds[i]);
-        }
+    protected void notifySavedOnUiThread(final Exception error) {
+        if (mActivity == null || mListener == null) return;
+
+        mActivity.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mListener.onSettingsSaved(error);
+            }
+        });
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/util/WPPrefUtils.java b/WordPress/src/main/java/org/wordpress/android/util/WPPrefUtils.java
index 1a6d11dbc994..618dcaca1e83 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/WPPrefUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/util/WPPrefUtils.java
@@ -1,7 +1,13 @@
 package org.wordpress.android.util;
 
+import android.app.Activity;
 import android.content.Context;
 import android.graphics.Typeface;
+import android.preference.Preference;
+import android.preference.PreferenceCategory;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceGroup;
+import android.text.TextUtils;
 import android.util.TypedValue;
 import android.widget.EditText;
 import android.widget.TextView;
@@ -10,11 +16,67 @@
 
 import org.wordpress.android.R;
 
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
 /**
  * Design guidelines for Calypso-styled Site Settings (and likely other screens)
  */
 
 public class WPPrefUtils {
+
+    /**
+     * Length of a {@link String} (representing a language code) when there is no region included.
+     * For example: "en" contains no region, "en_US" contains a region (US)
+     *
+     * Used to parse a language code {@link String} when creating a {@link Locale}.
+     */
+    private static final int NO_REGION_LANG_CODE_LEN = 2;
+
+    /**
+     * Index of a language code {@link String} where the region code begins. The language code
+     * format is cc_rr, where cc is the country code (e.g. en, es, az) and rr is the region code
+     * (e.g. us, au, gb).
+     */
+    private static final int REGION_SUBSTRING_INDEX = 3;
+
+    /**
+     * Gets a preference and sets the {@link android.preference.Preference.OnPreferenceChangeListener}.
+     */
+    public static Preference getPrefAndSetClickListener(PreferenceFragment prefFrag,
+                                                         int id,
+                                                         Preference.OnPreferenceClickListener listener) {
+        Preference pref = prefFrag.findPreference(prefFrag.getString(id));
+        if (pref != null) pref.setOnPreferenceClickListener(listener);
+        return pref;
+    }
+
+    /**
+     * Gets a preference and sets the {@link android.preference.Preference.OnPreferenceChangeListener}.
+     */
+    public static Preference getPrefAndSetChangeListener(PreferenceFragment prefFrag,
+                                                         int id,
+                                                         Preference.OnPreferenceChangeListener listener) {
+        Preference pref = prefFrag.findPreference(prefFrag.getString(id));
+        if (pref != null) pref.setOnPreferenceChangeListener(listener);
+        return pref;
+    }
+
+    /**
+     * Removes a {@link Preference} from the {@link PreferenceCategory} with the given key.
+     */
+    public static void removePreference(PreferenceFragment prefFrag, int parentKey, int prefKey) {
+        String parentName = prefFrag.getString(parentKey);
+        String prefName = prefFrag.getString(prefKey);
+        PreferenceGroup parent = (PreferenceGroup) prefFrag.findPreference(parentName);
+        Preference child = prefFrag.findPreference(prefName);
+
+        if (parent != null && child != null) {
+            parent.removePreference(child);
+        }
+    }
+
     /**
      * Font      : Open Sans
      * Style     : Normal
@@ -132,4 +194,33 @@ public static void setTextViewAttributes(TextView textView, int size, int colorR
         textView.setTextSize(TypedValue.COMPLEX_UNIT_PX, size);
         textView.setTextColor(textView.getResources().getColor(colorRes));
     }
+
+    /**
+     * Gets a locale for the given language code.
+     */
+    public static Locale languageLocale(String languageCode) {
+        if (TextUtils.isEmpty(languageCode)) return Locale.getDefault();
+
+        if (languageCode.length() > NO_REGION_LANG_CODE_LEN) {
+            return new Locale(languageCode.substring(0, NO_REGION_LANG_CODE_LEN),
+                    languageCode.substring(REGION_SUBSTRING_INDEX));
+        }
+
+        return new Locale(languageCode);
+    }
+
+    /**
+     * Creates a map from language codes to WordPress language IDs.
+     */
+    public static Map<String, String> generateLanguageMap(Activity activity) {
+        String[] languageIds = activity.getResources().getStringArray(R.array.lang_ids);
+        String[] languageCodes = activity.getResources().getStringArray(R.array.language_codes);
+
+        Map<String, String> languageMap = new HashMap<>();
+        for (int i = 0; i < languageIds.length && i < languageCodes.length; ++i) {
+            languageMap.put(languageCodes[i], languageIds[i]);
+        }
+
+        return languageMap;
+    }
 }

From 49661eb7feb87d61ee8126712364e711f9209ada Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Mon, 4 Jan 2016 17:20:59 -0800
Subject: [PATCH 57/63] Capitalizing first letter of language summary string

---
 .../org/wordpress/android/ui/prefs/SiteSettingsFragment.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index e2e211812d03..1ef148edcbb5 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -968,7 +968,7 @@ private String getLanguageString(String languageCode, Locale displayLocale) {
         }
 
         Locale languageLocale = WPPrefUtils.languageLocale(languageCode);
-        String displayLanguage = languageLocale.getDisplayLanguage(displayLocale);
+        String displayLanguage = StringUtils.capitalize(languageLocale.getDisplayLanguage(displayLocale));
         String displayCountry = languageLocale.getDisplayCountry(displayLocale);
 
         if (!TextUtils.isEmpty(displayCountry)) {

From e43b88ce1128ff57efda54996549a76bb0e84d79 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Mon, 4 Jan 2016 17:37:26 -0800
Subject: [PATCH 58/63] Default Format value set to standard if value is not in
 format map

---
 .../org/wordpress/android/ui/prefs/SiteSettingsInterface.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java
index 4f0007d97c16..ff3ce0134c91 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java
@@ -317,7 +317,7 @@ public int getDefaultCategory() {
     }
 
     public @NonNull String getDefaultPostFormat() {
-        if (TextUtils.isEmpty(mSettings.defaultPostFormat)) {
+        if (TextUtils.isEmpty(mSettings.defaultPostFormat) || !getFormats().containsKey(mSettings.defaultPostFormat)) {
             mSettings.defaultPostFormat = STANDARD_POST_FORMAT_KEY;
         }
         return mSettings.defaultPostFormat;

From fbc416596532bbb4636ff5e0eaeb4c4d101f2ea3 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Mon, 4 Jan 2016 18:32:26 -0800
Subject: [PATCH 59/63] Moving Uncategorized to the beginning of the category
 list

---
 .../android/ui/prefs/SiteSettingsFragment.java        | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index 1ef148edcbb5..bb386cbe38e1 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -654,7 +654,16 @@ private void setCategories() {
         int i = 0;
         for (Integer key : categories.keySet()) {
             entries[i] = categories.get(key);
-            values[i++] = String.valueOf(key);
+            values[i] = String.valueOf(key);
+            if (key == 1) {
+                CharSequence temp = entries[0];
+                entries[0] = entries[i];
+                entries[i] = temp;
+                temp = values[0];
+                values[0] = values[i];
+                values[i] = temp;
+            }
+            ++i;
         }
 
         mCategoryPref.setEntries(entries);

From c01ba16d04d10f4a3b0cb83553b23fdcf4a65052 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Mon, 4 Jan 2016 19:42:21 -0800
Subject: [PATCH 60/63] Fixing implementation of Threading, Paging, and Close
 after preferences

---
 .../android/models/SiteSettingsModel.java     |  3 +
 .../android/ui/prefs/DotComSiteSettings.java  | 57 ++++++-------------
 .../ui/prefs/SiteSettingsFragment.java        | 40 ++++++++-----
 .../ui/prefs/SiteSettingsInterface.java       |  5 +-
 4 files changed, 52 insertions(+), 53 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/models/SiteSettingsModel.java b/WordPress/src/main/java/org/wordpress/android/models/SiteSettingsModel.java
index 0d8215035bb0..e37db5973dd7 100644
--- a/WordPress/src/main/java/org/wordpress/android/models/SiteSettingsModel.java
+++ b/WordPress/src/main/java/org/wordpress/android/models/SiteSettingsModel.java
@@ -191,9 +191,12 @@ public void copyFrom(SiteSettingsModel other) {
         allowComments = other.allowComments;
         sendPingbacks = other.sendPingbacks;
         receivePingbacks = other.receivePingbacks;
+        shouldCloseAfter = other.shouldCloseAfter;
         closeCommentAfter = other.closeCommentAfter;
         sortCommentsBy = other.sortCommentsBy;
+        shouldThreadComments = other.shouldThreadComments;
         threadingLevels = other.threadingLevels;
+        shouldPageComments = other.shouldPageComments;
         commentsPerPage = other.commentsPerPage;
         commentApprovalRequired = other.commentApprovalRequired;
         commentsRequireIdentity = other.commentsRequireIdentity;
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java
index 0876fc330302..ecf13fb5c339 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/DotComSiteSettings.java
@@ -170,6 +170,12 @@ public void deserializeDotComRestResponse(Blog blog, JSONObject response) {
         mRemoteSettings.allowComments = settingsObject.optBoolean(ALLOW_COMMENTS_KEY, true);
         mRemoteSettings.sendPingbacks = settingsObject.optBoolean(SEND_PINGBACKS_KEY, false);
         mRemoteSettings.receivePingbacks = settingsObject.optBoolean(RECEIVE_PINGBACKS_KEY, true);
+        mRemoteSettings.shouldCloseAfter = settingsObject.optBoolean(CLOSE_OLD_COMMENTS_KEY, false);
+        mRemoteSettings.closeCommentAfter = settingsObject.optInt(CLOSE_OLD_COMMENTS_DAYS_KEY, 0);
+        mRemoteSettings.shouldThreadComments = settingsObject.optBoolean(THREAD_COMMENTS_KEY, false);
+        mRemoteSettings.threadingLevels = settingsObject.optInt(THREAD_COMMENTS_DEPTH_KEY, 0);
+        mRemoteSettings.shouldPageComments = settingsObject.optBoolean(PAGE_COMMENTS_KEY, false);
+        mRemoteSettings.commentsPerPage = settingsObject.optInt(PAGE_COMMENT_COUNT_KEY, 0);
         mRemoteSettings.commentApprovalRequired = settingsObject.optBoolean(COMMENT_MODERATION_KEY, false);
         mRemoteSettings.commentsRequireIdentity = settingsObject.optBoolean(REQUIRE_IDENTITY_KEY, false);
         mRemoteSettings.commentsRequireUserAccount = settingsObject.optBoolean(REQUIRE_USER_ACCOUNT_KEY, true);
@@ -187,24 +193,6 @@ public void deserializeDotComRestResponse(Blog blog, JSONObject response) {
             Collections.addAll(mRemoteSettings.blacklist, blacklistKeys.split("\n"));
         }
 
-        if (settingsObject.optBoolean(CLOSE_OLD_COMMENTS_KEY, false)) {
-            mRemoteSettings.closeCommentAfter = settingsObject.optInt(CLOSE_OLD_COMMENTS_DAYS_KEY, 0);
-        } else {
-            mRemoteSettings.closeCommentAfter = 0;
-        }
-
-        if (settingsObject.optBoolean(THREAD_COMMENTS_KEY, false)) {
-            mRemoteSettings.threadingLevels = settingsObject.optInt(THREAD_COMMENTS_DEPTH_KEY, 0);
-        } else {
-            mRemoteSettings.threadingLevels = 0;
-        }
-
-        if (settingsObject.optBoolean(PAGE_COMMENTS_KEY, false)) {
-            mRemoteSettings.commentsPerPage = settingsObject.optInt(PAGE_COMMENT_COUNT_KEY, 0);
-        } else {
-            mRemoteSettings.commentsPerPage = 0;
-        }
-
         if (settingsObject.optString(COMMENT_SORT_ORDER_KEY, "").equals("asc")) {
             mRemoteSettings.sortCommentsBy = ASCENDING_SORT;
         } else {
@@ -264,13 +252,10 @@ public Map<String, String> serializeDotComParams() {
         if (mSettings.commentApprovalRequired != mRemoteSettings.commentApprovalRequired) {
             params.put(COMMENT_MODERATION_KEY, String.valueOf(mSettings.commentApprovalRequired));
         }
-        if (mSettings.closeCommentAfter != mRemoteSettings.closeCommentAfter) {
-            if (mSettings.closeCommentAfter <= 0) {
-                params.put(CLOSE_OLD_COMMENTS_KEY, String.valueOf(false));
-            } else {
-                params.put(CLOSE_OLD_COMMENTS_KEY, String.valueOf(true));
-                params.put(CLOSE_OLD_COMMENTS_DAYS_KEY, String.valueOf(mSettings.closeCommentAfter));
-            }
+        if (mSettings.closeCommentAfter != mRemoteSettings.closeCommentAfter
+                || mSettings.shouldCloseAfter != mRemoteSettings.shouldCloseAfter) {
+            params.put(CLOSE_OLD_COMMENTS_KEY, String.valueOf(mSettings.shouldCloseAfter));
+            params.put(CLOSE_OLD_COMMENTS_DAYS_KEY, String.valueOf(mSettings.closeCommentAfter));
         }
         if (mSettings.sortCommentsBy != mRemoteSettings.sortCommentsBy) {
             if (mSettings.sortCommentsBy == ASCENDING_SORT) {
@@ -279,21 +264,15 @@ public Map<String, String> serializeDotComParams() {
                 params.put(COMMENT_SORT_ORDER_KEY, "desc");
             }
         }
-        if (mSettings.threadingLevels != mRemoteSettings.threadingLevels) {
-            if (mSettings.threadingLevels <= 1) {
-                params.put(THREAD_COMMENTS_KEY, String.valueOf(false));
-            } else {
-                params.put(PAGE_COMMENTS_KEY, String.valueOf(true));
-                params.put(THREAD_COMMENTS_DEPTH_KEY, String.valueOf(mSettings.threadingLevels));
-            }
+        if (mSettings.threadingLevels != mRemoteSettings.threadingLevels
+                || mSettings.shouldThreadComments != mRemoteSettings.shouldThreadComments) {
+            params.put(THREAD_COMMENTS_KEY, String.valueOf(mSettings.shouldThreadComments));
+            params.put(THREAD_COMMENTS_DEPTH_KEY, String.valueOf(mSettings.threadingLevels));
         }
-        if (mSettings.commentsPerPage != mRemoteSettings.commentsPerPage) {
-            if (mSettings.commentsPerPage <= 0) {
-                params.put(PAGE_COMMENTS_KEY, String.valueOf(false));
-            } else{
-                params.put(PAGE_COMMENTS_KEY, String.valueOf(true));
-                params.put(PAGE_COMMENT_COUNT_KEY, String.valueOf(mSettings.commentsPerPage));
-            }
+        if (mSettings.commentsPerPage != mRemoteSettings.commentsPerPage
+                || mSettings.shouldPageComments != mRemoteSettings.shouldPageComments) {
+            params.put(PAGE_COMMENTS_KEY, String.valueOf(mSettings.shouldPageComments));
+            params.put(PAGE_COMMENT_COUNT_KEY, String.valueOf(mSettings.commentsPerPage));
         }
         if (mSettings.commentsRequireIdentity != mRemoteSettings.commentsRequireIdentity) {
             params.put(REQUIRE_IDENTITY_KEY, String.valueOf(mSettings.commentsRequireIdentity));
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index bb386cbe38e1..11f12aba8f0b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -92,9 +92,10 @@ public class SiteSettingsFragment extends PreferenceFragment
      */
     private static final int RELATED_POSTS_REQUEST_CODE = 1;
 
-    private static final int PAGING_REQUEST_CODE = 2;
-    private static final int CLOSE_AFTER_REQUEST_CODE = 3;
-    private static final int MULTIPLE_LINKS_REQUEST_CODE = 4;
+    private static final int THREADING_REQUEST_CODE = 2;
+    private static final int PAGING_REQUEST_CODE = 3;
+    private static final int CLOSE_AFTER_REQUEST_CODE = 4;
+    private static final int MULTIPLE_LINKS_REQUEST_CODE = 5;
 
     private static final long FETCH_DELAY = 1000;
 
@@ -222,23 +223,32 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                         RelatedPostsDialog.SHOW_IMAGES_KEY, false));
                 mSiteSettings.saveSettings();
                 break;
+            case THREADING_REQUEST_CODE:
+                if (data == null) break;
+                mSiteSettings.setShouldThreadComments(data.getBooleanExtra
+                        (NumberPickerDialog.SWITCH_ENABLED_KEY, false));
+                onPreferenceChange(mThreadingPref, data.getIntExtra(
+                        NumberPickerDialog.CUR_VALUE_KEY, -1));
+                break;
             case PAGING_REQUEST_CODE:
                 if (data == null) break;
                 mSiteSettings.setShouldPageComments(data.getBooleanExtra
                         (NumberPickerDialog.SWITCH_ENABLED_KEY, false));
-                if (mSiteSettings.getShouldPageComments()) {
-                    onPreferenceChange(mPagingPref, data.getIntExtra(
-                            NumberPickerDialog.CUR_VALUE_KEY, -1));
-                } else {
-                    mSiteSettings.setPagingCount(data.getIntExtra(
-                            NumberPickerDialog.CUR_VALUE_KEY, -1));
-                }
+                onPreferenceChange(mPagingPref, data.getIntExtra(
+                        NumberPickerDialog.CUR_VALUE_KEY, -1));
                 break;
             case CLOSE_AFTER_REQUEST_CODE:
                 if (data == null) break;
+                mSiteSettings.setShouldCloseAfter(data.getBooleanExtra
+                        (NumberPickerDialog.SWITCH_ENABLED_KEY, false));
+                onPreferenceChange(mCloseAfterPref, data.getIntExtra(
+                        NumberPickerDialog.CUR_VALUE_KEY, -1));
                 break;
             case MULTIPLE_LINKS_REQUEST_CODE:
                 if (data == null) break;
+                int numLinks = data.getIntExtra(NumberPickerDialog.CUR_VALUE_KEY, -1);
+                if (numLinks < 0 || numLinks == mSiteSettings.getMultipleLinks()) return;
+                onPreferenceChange(mMultipleLinksPref, numLinks);
                 break;
         }
 
@@ -365,7 +375,11 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
             setReceivePingbacks((Boolean) newValue);
         } else if (preference == mCloseAfterPref) {
             mSiteSettings.setCloseAfter(Integer.parseInt(newValue.toString()));
-            mCloseAfterPref.setSummary(mSiteSettings.getCloseAfterDescription());
+            if (mSiteSettings.getShouldCloseAfter()) {
+                mCloseAfterPref.setSummary(mSiteSettings.getCloseAfterDescription());
+            } else {
+                mCloseAfterPref.setSummary(mSiteSettings.getCloseAfterDescription(0));
+            }
         } else if (preference == mSortByPref) {
             mSiteSettings.setCommentSorting(Integer.parseInt(newValue.toString()));
             setDetailListPreferenceValue(mSortByPref,
@@ -570,7 +584,7 @@ private void showNumberPickerDialog(Bundle args, int requestCode, String tag) {
     private void showPagingDialog() {
         Bundle args = new Bundle();
         args.putBoolean(NumberPickerDialog.SHOW_SWITCH_KEY, true);
-        args.putBoolean(NumberPickerDialog.SWITCH_ENABLED_KEY, mSiteSettings.getPagingCount() > 0);
+        args.putBoolean(NumberPickerDialog.SWITCH_ENABLED_KEY, mSiteSettings.getShouldPageComments());
         args.putString(NumberPickerDialog.SWITCH_TITLE_KEY, getString(R.string.site_settings_paging_title));
         args.putString(NumberPickerDialog.TITLE_KEY, getString(R.string.site_settings_paging_title));
         args.putString(NumberPickerDialog.HEADER_TEXT_KEY, getString(R.string.site_settings_paging_dialog_header));
@@ -583,7 +597,7 @@ private void showPagingDialog() {
     private void showCloseAfterDialog() {
         Bundle args = new Bundle();
         args.putBoolean(NumberPickerDialog.SHOW_SWITCH_KEY, true);
-        args.putBoolean(NumberPickerDialog.SWITCH_ENABLED_KEY, mSiteSettings.getCloseAfter() > 0);
+        args.putBoolean(NumberPickerDialog.SWITCH_ENABLED_KEY, mSiteSettings.getShouldCloseAfter());
         args.putString(NumberPickerDialog.SWITCH_TITLE_KEY, getString(R.string.site_settings_close_after_dialog_switch_text));
         args.putString(NumberPickerDialog.TITLE_KEY, getString(R.string.site_settings_close_after_dialog_title));
         args.putString(NumberPickerDialog.HEADER_TEXT_KEY, getString(R.string.site_settings_close_after_dialog_header));
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java
index ff3ce0134c91..6d2aa3158696 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java
@@ -362,9 +362,12 @@ public int getCloseAfter() {
     }
 
     public @NonNull String getCloseAfterDescription() {
+        return getCloseAfterDescription(getCloseAfter());
+    }
+
+    public @NonNull String getCloseAfterDescription(int period) {
         if (mActivity == null) return "";
 
-        int period = getCloseAfter();
         if (period == 0) return mActivity.getString(R.string.never);
         return mActivity.getResources().getQuantityString(R.plurals.days_quantity, period, period);
     }

From d398c6eca048ee1989c77bb3b0525afe7362ef03 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Mon, 4 Jan 2016 20:31:03 -0800
Subject: [PATCH 61/63] Fixing wrapped number picker values

---
 .../src/main/java/org/wordpress/android/ui/WPNumberPicker.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java b/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
index 0a7a38c7d4dc..a6da842a5c73 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
@@ -120,7 +120,7 @@ private void setDisplayValues() {
         for (int i = 0; i < DISPLAY_COUNT; ++i) {
             mDisplayValues[i] = value - MIDDLE_INDEX + i;
             if (mDisplayValues[i] < getMinValue()) {
-                mDisplayValues[i] = getMaxValue() - (mDisplayValues[i] + getMinValue() + 1);
+                mDisplayValues[i] = getMaxValue() + (mDisplayValues[i] + 1 - getMinValue());
             } else if (mDisplayValues[i] > getMaxValue()) {
                 mDisplayValues[i] = getMinValue() + (mDisplayValues[i] - getMaxValue() - 1);
             }

From 9e462ec48fe7ef37bed0552aae2ef74b50d47dc2 Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Tue, 5 Jan 2016 15:16:23 -0800
Subject: [PATCH 62/63] Self-hosted sites will use the old settings for now

---
 .../ui/prefs/BlogPreferencesActivity.java     | 290 +++++++++++++++++-
 1 file changed, 274 insertions(+), 16 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/BlogPreferencesActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/BlogPreferencesActivity.java
index d9cc32917d45..7e283a3ad823 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/BlogPreferencesActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/BlogPreferencesActivity.java
@@ -2,17 +2,35 @@
 
 import android.app.Fragment;
 import android.app.FragmentManager;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.view.MenuItem;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.Spinner;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
-import org.wordpress.android.networking.ConnectionChangeReceiver;
+import org.wordpress.android.models.AccountHelper;
+import org.wordpress.android.models.Blog;
 import org.wordpress.android.ui.ActivityLauncher;
+import org.wordpress.android.ui.stats.StatsWidgetProvider;
+import org.wordpress.android.ui.stats.datasets.StatsTable;
+import org.wordpress.android.util.AnalyticsUtils;
+import org.wordpress.android.util.CoreEvents.UserSignedOutCompletely;
+import org.wordpress.android.util.StringUtils;
 import org.wordpress.android.util.ToastUtils;
+import org.wordpress.android.networking.ConnectionChangeReceiver;
 
 import de.greenrobot.event.EventBus;
 
@@ -21,36 +39,87 @@
  */
 public class BlogPreferencesActivity extends AppCompatActivity {
     public static final String ARG_LOCAL_BLOG_ID = SiteSettingsFragment.ARG_LOCAL_BLOG_ID;
+    public static final int RESULT_BLOG_REMOVED = RESULT_FIRST_USER;
 
     private static final String KEY_SETTINGS_FRAGMENT = "settings-fragment";
 
+    // The blog this activity is managing settings for.
+    private Blog blog;
+    private boolean mBlogDeleted;
+    private EditText mUsernameET;
+    private EditText mPasswordET;
+    private EditText mHttpUsernameET;
+    private EditText mHttpPasswordET;
+    private CheckBox mFullSizeCB;
+    private CheckBox mScaledCB;
+    private Spinner mImageWidthSpinner;
+    private EditText mScaledImageWidthET;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         Integer id = getIntent().getIntExtra(ARG_LOCAL_BLOG_ID, -1);
+        blog = WordPress.getBlog(id);
         if (WordPress.getBlog(id) == null) {
             Toast.makeText(this, getString(R.string.blog_not_found), Toast.LENGTH_SHORT).show();
             finish();
             return;
         }
 
-        ActionBar actionBar = getSupportActionBar();
-        if (actionBar != null) {
-            actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
-            actionBar.setDisplayHomeAsUpEnabled(true);
-            actionBar.setCustomView(R.layout.site_settings_actionbar);
-        }
+        if (blog.isDotcomFlag()) {
+            ActionBar actionBar = getSupportActionBar();
+            if (actionBar != null) {
+                actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+                actionBar.setDisplayHomeAsUpEnabled(true);
+                actionBar.setCustomView(R.layout.site_settings_actionbar);
+            }
 
-        FragmentManager fragmentManager = getFragmentManager();
-        Fragment siteSettingsFragment = fragmentManager.findFragmentByTag(KEY_SETTINGS_FRAGMENT);
-
-        if (siteSettingsFragment == null) {
-            siteSettingsFragment = new SiteSettingsFragment();
-            siteSettingsFragment.setArguments(getIntent().getExtras());
-            getFragmentManager().beginTransaction()
-                    .replace(android.R.id.content, siteSettingsFragment, KEY_SETTINGS_FRAGMENT)
-                    .commit();
+            FragmentManager fragmentManager = getFragmentManager();
+            Fragment siteSettingsFragment = fragmentManager.findFragmentByTag(KEY_SETTINGS_FRAGMENT);
+
+            if (siteSettingsFragment == null) {
+                siteSettingsFragment = new SiteSettingsFragment();
+                siteSettingsFragment.setArguments(getIntent().getExtras());
+                getFragmentManager().beginTransaction()
+                        .replace(android.R.id.content, siteSettingsFragment, KEY_SETTINGS_FRAGMENT)
+                        .commit();
+            }
+        } else {
+            setContentView(R.layout.blog_preferences);
+
+            ActionBar actionBar = getSupportActionBar();
+            if (actionBar != null) {
+                actionBar.setTitle(StringUtils.unescapeHTML(blog.getNameOrHostUrl()));
+                actionBar.setDisplayHomeAsUpEnabled(true);
+            }
+
+            mUsernameET = (EditText) findViewById(R.id.username);
+            mPasswordET = (EditText) findViewById(R.id.password);
+            mHttpUsernameET = (EditText) findViewById(R.id.httpuser);
+            mHttpPasswordET = (EditText) findViewById(R.id.httppassword);
+            mScaledImageWidthET = (EditText) findViewById(R.id.scaledImageWidth);
+            mFullSizeCB = (CheckBox) findViewById(R.id.fullSizeImage);
+            mScaledCB = (CheckBox) findViewById(R.id.scaledImage);
+            mImageWidthSpinner = (Spinner) findViewById(R.id.maxImageWidth);
+            Button removeBlogButton = (Button) findViewById(R.id.remove_account);
+
+            // remove blog & credentials apply only to dot org
+            if (blog.isDotcomFlag()) {
+                View credentialsRL = findViewById(R.id.sectionContent);
+                credentialsRL.setVisibility(View.GONE);
+                removeBlogButton.setVisibility(View.GONE);
+            } else {
+                removeBlogButton.setVisibility(View.VISIBLE);
+                removeBlogButton.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        removeBlogWithConfirmation();
+                    }
+                });
+            }
+
+            loadSettingsForBlog();
         }
     }
 
@@ -60,6 +129,61 @@ public void finish() {
         ActivityLauncher.slideOutToRight(this);
     }
 
+    @Override
+    protected void onPause() {
+        super.onPause();
+
+        if (blog.isDotcomFlag() || mBlogDeleted) {
+            return;
+        }
+
+        blog.setUsername(mUsernameET.getText().toString());
+        blog.setPassword(mPasswordET.getText().toString());
+        blog.setHttpuser(mHttpUsernameET.getText().toString());
+        blog.setHttppassword(mHttpPasswordET.getText().toString());
+
+        blog.setFullSizeImage(mFullSizeCB.isChecked());
+        blog.setScaledImage(mScaledCB.isChecked());
+        if (blog.isScaledImage()) {
+            EditText scaledImgWidth = (EditText) findViewById(R.id.scaledImageWidth);
+
+            boolean error = false;
+            int width = 0;
+            try {
+                width = Integer.parseInt(scaledImgWidth.getText().toString().trim());
+            } catch (NumberFormatException e) {
+                error = true;
+            }
+
+            if (width == 0) {
+                error = true;
+            }
+
+            if (error) {
+                AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(BlogPreferencesActivity.this);
+                dialogBuilder.setTitle(getResources().getText(R.string.error));
+                dialogBuilder.setMessage(getResources().getText(R.string.scaled_image_error));
+                dialogBuilder.setPositiveButton("OK", new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int whichButton) {
+                    }
+                });
+                dialogBuilder.setCancelable(true);
+                dialogBuilder.create().show();
+                return;
+            } else {
+                blog.setScaledImageWidth(width);
+            }
+        }
+
+        blog.setMaxImageWidth(mImageWidthSpinner.getSelectedItem().toString());
+
+        WordPress.wpDB.saveBlog(blog);
+
+        if (WordPress.getCurrentBlog().getLocalTableBlogId() == blog.getLocalTableBlogId()) {
+            WordPress.currentBlog = blog;
+        }
+    }
+
     @Override
     protected void onStart() {
         super.onStart();
@@ -102,4 +226,138 @@ public void onEventMainThread(ConnectionChangeReceiver.ConnectionChangeEvent eve
 //            StatsWidgetProvider.updateWidgetsOnLogout(this);
         }
     }
+
+    private void loadSettingsForBlog() {
+        ArrayAdapter<Object> spinnerArrayAdapter = new ArrayAdapter<Object>(this,
+                R.layout.simple_spinner_item, new String[]{
+                "Original Size", "100", "200", "300", "400", "500", "600", "700", "800",
+                "900", "1000", "1100", "1200", "1300", "1400", "1500", "1600", "1700",
+                "1800", "1900", "2000"
+        });
+        spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        mImageWidthSpinner.setAdapter(spinnerArrayAdapter);
+        mImageWidthSpinner.setOnItemSelectedListener(new OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                CheckBox fullSizeImageCheckBox = (CheckBox) findViewById(R.id.fullSizeImage);
+                // Original size selected. Do not show the link to full image.
+                if (id == 0) {
+                    fullSizeImageCheckBox.setVisibility(View.GONE);
+                } else {
+                    fullSizeImageCheckBox.setVisibility(View.VISIBLE);
+                }
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> arg0) {
+            }
+        });
+
+        mUsernameET.setText(blog.getUsername());
+        mPasswordET.setText(blog.getPassword());
+        mHttpUsernameET.setText(blog.getHttpuser());
+        mHttpPasswordET.setText(blog.getHttppassword());
+        TextView httpUserLabel = (TextView) findViewById(R.id.l_httpuser);
+        if (blog.isDotcomFlag()) {
+            mHttpUsernameET.setVisibility(View.GONE);
+            mHttpPasswordET.setVisibility(View.GONE);
+            httpUserLabel.setVisibility(View.GONE);
+        } else {
+            mHttpUsernameET.setVisibility(View.VISIBLE);
+            mHttpPasswordET.setVisibility(View.VISIBLE);
+            httpUserLabel.setVisibility(View.VISIBLE);
+        }
+
+        mFullSizeCB.setChecked(blog.isFullSizeImage());
+        mScaledCB.setChecked(blog.isScaledImage());
+
+        this.mScaledImageWidthET.setText("" + blog.getScaledImageWidth());
+        showScaledSetting(blog.isScaledImage());
+
+        CheckBox scaledImage = (CheckBox) findViewById(R.id.scaledImage);
+        scaledImage.setChecked(false);
+        scaledImage.setVisibility(View.GONE);
+
+        // sets up a state listener for the full-size checkbox
+        CheckBox fullSizeImageCheckBox = (CheckBox) findViewById(R.id.fullSizeImage);
+        fullSizeImageCheckBox.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                CheckBox fullSize = (CheckBox) findViewById(R.id.fullSizeImage);
+                if (fullSize.isChecked()) {
+                    CheckBox scaledImage = (CheckBox) findViewById(R.id.scaledImage);
+                    if (scaledImage.isChecked()) {
+                        scaledImage.setChecked(false);
+                        showScaledSetting(false);
+                    }
+                }
+            }
+        });
+
+        int imageWidthPosition = spinnerArrayAdapter.getPosition(blog.getMaxImageWidth());
+        mImageWidthSpinner.setSelection((imageWidthPosition >= 0) ? imageWidthPosition : 0);
+        if (mImageWidthSpinner.getSelectedItemPosition() ==
+                0) //Original size selected. Do not show the link to full image.
+        {
+            fullSizeImageCheckBox.setVisibility(View.GONE);
+        } else {
+            fullSizeImageCheckBox.setVisibility(View.VISIBLE);
+        }
+    }
+
+    /**
+     * Hides / shows the scaled image settings
+     */
+    private void showScaledSetting(boolean show) {
+        TextView tw = (TextView) findViewById(R.id.l_scaledImage);
+        EditText et = (EditText) findViewById(R.id.scaledImageWidth);
+        tw.setVisibility(show ? View.VISIBLE : View.GONE);
+        et.setVisibility(show ? View.VISIBLE : View.GONE);
+    }
+
+    /**
+     * Remove the blog this activity is managing settings for.
+     */
+    private void removeBlogWithConfirmation() {
+        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
+        dialogBuilder.setTitle(getResources().getText(R.string.remove_account));
+        dialogBuilder.setMessage(getResources().getText(R.string.sure_to_remove_account));
+        dialogBuilder.setPositiveButton(getResources().getText(R.string.yes), new DialogInterface.OnClickListener() {
+            public void onClick(DialogInterface dialog, int whichButton) {
+                removeBlog();
+            }
+        });
+        dialogBuilder.setNegativeButton(getResources().getText(R.string.no), null);
+        dialogBuilder.setCancelable(false);
+        dialogBuilder.create().show();
+    }
+
+    private void removeBlog() {
+        if (WordPress.wpDB.deleteBlog(this, blog.getLocalTableBlogId())) {
+            StatsTable.deleteStatsForBlog(this,blog.getLocalTableBlogId()); // Remove stats data
+            AnalyticsUtils.refreshMetadata();
+            ToastUtils.showToast(this, R.string.blog_removed_successfully);
+            WordPress.wpDB.deleteLastBlogId();
+            WordPress.currentBlog = null;
+            mBlogDeleted = true;
+            setResult(RESULT_BLOG_REMOVED);
+
+            // If the last blog is removed and the user is not signed in wpcom, broadcast a UserSignedOut event
+            if (!AccountHelper.isSignedIn()) {
+                EventBus.getDefault().post(new UserSignedOutCompletely());
+            }
+
+            // Checks for stats widgets that were synched with a blog that could be gone now.
+            StatsWidgetProvider.updateWidgetsOnLogout(this);
+
+            finish();
+        } else {
+            AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
+            dialogBuilder.setTitle(getResources().getText(R.string.error));
+            dialogBuilder.setMessage(getResources().getText(R.string.could_not_remove_account));
+            dialogBuilder.setPositiveButton("OK", null);
+            dialogBuilder.setCancelable(true);
+            dialogBuilder.create().show();
+        }
+    }
 }

From 7fbe1ddd4d0165168b0a1568f0f886e03b9c417b Mon Sep 17 00:00:00 2001
From: Tony Rankin <tonyr@tonyrankin.com>
Date: Tue, 5 Jan 2016 18:03:02 -0800
Subject: [PATCH 63/63] Adjusting positions of number picker elements

---
 .../java/org/wordpress/android/ui/WPNumberPicker.java  | 10 ++++------
 .../android/ui/prefs/SiteSettingsFragment.java         |  7 ++++++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java b/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
index a6da842a5c73..404c4aa67255 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java
@@ -58,6 +58,7 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
         updateIntitialOffset();
         setVerticalFadingEdgeEnabled(false);
         setHorizontalFadingEdgeEnabled(false);
+        mInputView.setVisibility(View.INVISIBLE);
     }
 
     @Override
@@ -71,11 +72,8 @@ public void setValue(int value) {
 
     @Override
     protected void onDraw(Canvas canvas) {
-        // Draw normally, skipping the middle number
-        mInputView.setVisibility(View.VISIBLE);
         int[] selectorIndices = getIndices();
         setIndices(new int[0]);
-        super.onDraw(canvas);
         setIndices(selectorIndices);
 
         // Draw the middle number with a different font
@@ -91,6 +89,7 @@ protected void onDraw(Canvas canvas) {
         paint.setAlpha(alpha);
         mPaint.setAlpha(alpha);
 
+        int offset = getResources().getDimensionPixelSize(R.dimen.margin_medium);
         // Draw the visible values
         for (int i = 0; i < DISPLAY_COUNT; ++i) {
             String scrollSelectorValue;
@@ -100,13 +99,12 @@ protected void onDraw(Canvas canvas) {
                 scrollSelectorValue = String.valueOf(mDisplayValues[i]);
             }
             if (i == MIDDLE_INDEX) {
-                canvas.drawText(scrollSelectorValue, x, y, paint);
+                canvas.drawText(scrollSelectorValue, x, y - ((paint.descent() + paint.ascent()) / 2) - offset, paint);
             } else {
-                canvas.drawText(scrollSelectorValue, x, y, mPaint);
+                canvas.drawText(scrollSelectorValue, x, y - ((mPaint.descent() + mPaint.ascent()) / 2) - offset, mPaint);
             }
             y += elementHeight;
         }
-        mInputView.setVisibility(View.INVISIBLE);
     }
 
     @Override
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index 11f12aba8f0b..d5284d2795af 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -87,6 +87,11 @@ public class SiteSettingsFragment extends PreferenceFragment
      */
     private static final String ADDRESS_FORMAT_REGEX = "^(https?://(w{3})?|www\\.)";
 
+    /**
+     * Used to move the Uncategorized category to the beginning of the category list.
+     */
+    private static final int UNCATEGORIZED_CATEGORY_ID = 1;
+
     /**
      * Request code used when creating the {@link RelatedPostsDialog}.
      */
@@ -669,7 +674,7 @@ private void setCategories() {
         for (Integer key : categories.keySet()) {
             entries[i] = categories.get(key);
             values[i] = String.valueOf(key);
-            if (key == 1) {
+            if (key == UNCATEGORIZED_CATEGORY_ID) {
                 CharSequence temp = entries[0];
                 entries[0] = entries[i];
                 entries[i] = temp;