From 37b22400e5c2082a9e7d1d38fef0313b796433e9 Mon Sep 17 00:00:00 2001
From: Maxime Biais <maxime.biais@gmail.com>
Date: Thu, 25 Jul 2013 08:28:23 +0200
Subject: [PATCH 01/13] Replace category list in EditPost by category buttons

- click on category remove it from the post
- introduce a new layout: FlowLayout
- some refactoring (don't use JSONArray to manipulate data)
---
 res/layout/add_account.xml                    |   4 +-
 res/layout/add_account_settings.xml           |   2 +-
 res/layout/blog_preferences.xml               |  14 +-
 res/layout/categories_row.xml                 |   1 -
 res/layout/category_button.xml                |   8 +
 res/layout/category_select_button.xml         |   9 +
 res/layout/edit.xml                           |  33 ++-
 res/layout/edit_comment.xml                   |   2 +-
 res/values/attrs.xml                          |  11 +
 src/org/wordpress/android/WordPressDB.java    |   4 +-
 src/org/wordpress/android/models/Post.java    |   4 +-
 .../ui/accounts/AccountSetupActivity.java     |   2 +-
 .../android/ui/posts/EditPostActivity.java    | 212 ++++++++++--------
 .../ui/prefs/BlogPreferencesActivity.java     |   2 +-
 .../wordpress/android/util/FlowLayout.java    | 135 +++++++++++
 src/org/wordpress/android/util/JSONUtil.java  |  18 ++
 .../android/util/PostUploadService.java       |   2 +-
 17 files changed, 332 insertions(+), 131 deletions(-)
 create mode 100644 res/layout/category_button.xml
 create mode 100644 res/layout/category_select_button.xml
 create mode 100644 res/values/attrs.xml
 create mode 100644 src/org/wordpress/android/util/FlowLayout.java

diff --git a/res/layout/add_account.xml b/res/layout/add_account.xml
index 79fee1a4c38a..ad5f0eb42960 100644
--- a/res/layout/add_account.xml
+++ b/res/layout/add_account.xml
@@ -20,7 +20,7 @@
             android:src="@drawable/wpcom" />
 
         <RelativeLayout
-            android:id="@+id/section1"
+            android:id="@+id/sectionContent"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
             android:layout_below="@id/wpcomLogo"
@@ -93,7 +93,7 @@
             android:id="@+id/l_wordpressdotcom"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/section1"
+            android:layout_below="@id/sectionContent"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="24dp"
             android:shadowColor="#FFFFFF"
diff --git a/res/layout/add_account_settings.xml b/res/layout/add_account_settings.xml
index 17b33084815d..125e36220758 100644
--- a/res/layout/add_account_settings.xml
+++ b/res/layout/add_account_settings.xml
@@ -15,7 +15,7 @@
         android:paddingRight="10dip" >
 
         <RelativeLayout
-            android:id="@+id/section1"
+            android:id="@+id/sectionContent"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
             android:layout_marginTop="10dip"
diff --git a/res/layout/blog_preferences.xml b/res/layout/blog_preferences.xml
index 362651a8ef94..ad8355d2c328 100644
--- a/res/layout/blog_preferences.xml
+++ b/res/layout/blog_preferences.xml
@@ -14,7 +14,7 @@
         android:paddingRight="@dimen/settings_padding" >
 
         <RelativeLayout
-            android:id="@+id/section1"
+            android:id="@+id/sectionContent"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content" >
 
@@ -69,10 +69,10 @@
         </RelativeLayout>
 
         <RelativeLayout
-            android:id="@+id/section2"
+            android:id="@+id/sectionTags"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@id/section1"
+            android:layout_below="@id/sectionContent"
             android:layout_marginTop="8dp" >
 
             <TextView
@@ -131,10 +131,10 @@
         </RelativeLayout>
 
         <RelativeLayout
-            android:id="@+id/section3"
+            android:id="@+id/sectionLocation"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@id/section2"
+            android:layout_below="@id/sectionTags"
             android:layout_marginTop="8dp" >
 
             <TextView
@@ -153,10 +153,10 @@
         </RelativeLayout>
 
         <RelativeLayout
-            android:id="@+id/section4"
+            android:id="@+id/sectionSettings"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@id/section3"
+            android:layout_below="@id/sectionLocation"
             android:layout_marginTop="8dp" >
 
             <TextView
diff --git a/res/layout/categories_row.xml b/res/layout/categories_row.xml
index 9f5731845f92..93a703d69061 100644
--- a/res/layout/categories_row.xml
+++ b/res/layout/categories_row.xml
@@ -10,4 +10,3 @@
   android:paddingLeft="6dip"
   android:paddingRight="6dip"
   android:checkMark="?android:attr/listChoiceIndicatorMultiple" />
-
diff --git a/res/layout/category_button.xml b/res/layout/category_button.xml
new file mode 100644
index 000000000000..a55b77200304
--- /dev/null
+++ b/res/layout/category_button.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Button
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    style="?android:attr/buttonStyleSmall"
+    android:layout_width="wrap_content"
+    android:layout_height="fill_parent"
+    android:id="@+id/categoryButton"
+    android:drawableRight="@android:drawable/ic_delete"/>
diff --git a/res/layout/category_select_button.xml b/res/layout/category_select_button.xml
new file mode 100644
index 000000000000..75792bdce868
--- /dev/null
+++ b/res/layout/category_select_button.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Button
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        style="?android:attr/buttonStyleSmall"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:id="@+id/selectCategories"
+        android:drawableRight="@android:drawable/ic_input_add"
+        android:tag="select-category"/>
diff --git a/res/layout/edit.xml b/res/layout/edit.xml
index 099b9e0d87c1..2caf238d80a4 100644
--- a/res/layout/edit.xml
+++ b/res/layout/edit.xml
@@ -18,7 +18,7 @@
             android:padding="8dp" >
 
             <LinearLayout
-                android:id="@+id/section1"
+                android:id="@+id/sectionContent"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"
@@ -45,11 +45,11 @@
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/section2"
+                android:id="@+id/sectionTags"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"
-                android:orientation="vertical" >
+                android:orientation="vertical">
 
                 <EditText
                     android:id="@+id/tags"
@@ -59,25 +59,18 @@
                     android:hint="@string/tags_separate_with_commas"
                     android:inputType="textAutoCorrect" />
 
-                <Button
-                    android:id="@+id/selectCategories"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:text="@string/select_categories" />
-
-                <TextView
-                    android:id="@+id/selectedCategories"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="4dp"
-                    android:text="@string/selected_categories"
-                    android:textColor="#444444"
-                    android:visibility="gone" />
             </LinearLayout>
 
+            <org.wordpress.android.util.FlowLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content" android:id="@+id/sectionCategories" android:paddingLeft="8dp">
+                <TextView android:id="@+id/textView"
+                          android:layout_width="wrap_content" android:layout_height="fill_parent"
+                          android:text="@string/selected_categories"
+                          android:paddingTop="10dp" />
+            </org.wordpress.android.util.FlowLayout>
             <RelativeLayout
-                android:id="@+id/section3"
+                android:id="@+id/sectionLocation"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent"
                 android:layout_marginBottom="10dp"
@@ -127,7 +120,7 @@
             </RelativeLayout>
 
             <LinearLayout
-                android:id="@+id/section4"
+                android:id="@+id/sectionSettings"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"
diff --git a/res/layout/edit_comment.xml b/res/layout/edit_comment.xml
index 27ca683b7461..128be05bce54 100644
--- a/res/layout/edit_comment.xml
+++ b/res/layout/edit_comment.xml
@@ -17,7 +17,7 @@
         android:paddingTop="8dp" >
 
         <RelativeLayout
-            android:id="@+id/section1"
+            android:id="@+id/sectionContent"
             android:layout_width="fill_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
new file mode 100644
index 000000000000..6b0a36396465
--- /dev/null
+++ b/res/values/attrs.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="FlowLayout">
+        <attr name="horizontalSpacing" format="dimension"/>
+        <attr name="verticalSpacing" format="dimension"/>
+    </declare-styleable>
+    <declare-styleable name="FlowLayout_LayoutParams">
+        <attr name="layout_horizontalSpacing" format="dimension"/>
+        <attr name="layout_verticalSpacing" format="dimension"/>
+    </declare-styleable>
+</resources>
\ No newline at end of file
diff --git a/src/org/wordpress/android/WordPressDB.java b/src/org/wordpress/android/WordPressDB.java
index 2818ca250e70..1a9dcf3719c8 100644
--- a/src/org/wordpress/android/WordPressDB.java
+++ b/src/org/wordpress/android/WordPressDB.java
@@ -1269,10 +1269,10 @@ public int updatePost(Post post, int blogID) {
                 values.put("mt_text_more", post.getMt_text_more());
             values.put("uploaded", post.isUploaded());
 
-            if (post.getCategories() != null) {
+            if (post.getJSONCategories() != null) {
                 JSONArray jsonArray = null;
                 try {
-                    jsonArray = new JSONArray(post.getCategories().toString());
+                    jsonArray = new JSONArray(post.getJSONCategories().toString());
                     values.put("categories", jsonArray.toString());
                 } catch (JSONException e) {
                     e.printStackTrace();
diff --git a/src/org/wordpress/android/models/Post.java b/src/org/wordpress/android/models/Post.java
index 113485e096b7..71f058f652ba 100644
--- a/src/org/wordpress/android/models/Post.java
+++ b/src/org/wordpress/android/models/Post.java
@@ -158,7 +158,7 @@ public void setLocalDraft(boolean localDraft) {
         this.localDraft = localDraft;
     }
 
-    public JSONArray getCategories() {
+    public JSONArray getJSONCategories() {
         JSONArray jArray = null;
         if (categories == null)
             categories = "";
@@ -169,7 +169,7 @@ public JSONArray getCategories() {
         return jArray;
     }
 
-    public void setCategories(JSONArray categories) {
+    public void setJSONCategories(JSONArray categories) {
         this.categories = categories.toString();
     }
 
diff --git a/src/org/wordpress/android/ui/accounts/AccountSetupActivity.java b/src/org/wordpress/android/ui/accounts/AccountSetupActivity.java
index 0297ada9729f..2eac6fbba77a 100644
--- a/src/org/wordpress/android/ui/accounts/AccountSetupActivity.java
+++ b/src/org/wordpress/android/ui/accounts/AccountSetupActivity.java
@@ -489,7 +489,7 @@ public void run() {
                             Thread shake = new Thread() {
                                 public void run() {
                                     Animation shake = AnimationUtils.loadAnimation(AccountSetupActivity.this, R.anim.shake);
-                                    findViewById(R.id.section1).startAnimation(shake);
+                                    findViewById(R.id.sectionContent).startAnimation(shake);
                                     Toast.makeText(AccountSetupActivity.this, getString(R.string.invalid_login), Toast.LENGTH_SHORT).show();
                                 }
                             };
diff --git a/src/org/wordpress/android/ui/posts/EditPostActivity.java b/src/org/wordpress/android/ui/posts/EditPostActivity.java
index db9f9efb33ae..9f50e8868ff4 100644
--- a/src/org/wordpress/android/ui/posts/EditPostActivity.java
+++ b/src/org/wordpress/android/ui/posts/EditPostActivity.java
@@ -46,34 +46,15 @@
 import android.text.style.StrikethroughSpan;
 import android.text.style.StyleSpan;
 import android.text.style.URLSpan;
-import android.view.ContextMenu;
-import android.view.Display;
-import android.view.LayoutInflater;
-import android.view.MenuItem;
-import android.view.MotionEvent;
-import android.view.View;
+import android.util.Log;
+import android.view.*;
 import android.view.View.OnClickListener;
 import android.view.View.OnFocusChangeListener;
 import android.view.View.OnTouchListener;
-import android.view.WindowManager;
 import android.view.animation.AlphaAnimation;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
+import android.widget.*;
 import android.widget.CompoundButton.OnCheckedChangeListener;
-import android.widget.DatePicker;
-import android.widget.EditText;
-import android.widget.ImageButton;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.SeekBar;
 import android.widget.SeekBar.OnSeekBarChangeListener;
-import android.widget.Spinner;
-import android.widget.TextView;
-import android.widget.TimePicker;
-import android.widget.Toast;
-import android.widget.ToggleButton;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockActivity;
@@ -82,7 +63,7 @@
 import com.google.gson.reflect.TypeToken;
 
 import org.json.JSONArray;
-import org.json.JSONException;
+import org.wordpress.android.util.*;
 import org.xmlrpc.android.ApiHelper;
 
 import org.wordpress.android.Constants;
@@ -92,17 +73,7 @@
 import org.wordpress.android.models.MediaFile;
 import org.wordpress.android.models.Post;
 import org.wordpress.android.ui.accounts.NewAccountActivity;
-import org.wordpress.android.util.DeviceUtils;
-import org.wordpress.android.util.EscapeUtils;
-import org.wordpress.android.util.ImageHelper;
-import org.wordpress.android.util.LocationHelper;
 import org.wordpress.android.util.LocationHelper.LocationResult;
-import org.wordpress.android.util.PostUploadService;
-import org.wordpress.android.util.StringUtils;
-import org.wordpress.android.util.WPEditText;
-import org.wordpress.android.util.WPHtml;
-import org.wordpress.android.util.WPImageSpan;
-import org.wordpress.android.util.WPUnderlineSpan;
 
 public class EditPostActivity extends SherlockActivity implements OnClickListener, OnTouchListener, TextWatcher,
         WPEditText.OnSelectionChangedListener, OnFocusChangeListener, WPEditText.EditTextImeBackListener {
@@ -120,6 +91,9 @@ public class EditPostActivity extends SherlockActivity implements OnClickListene
     private static final int ID_DIALOG_TIME = 1;
     private static final int ID_DIALOG_LOADING = 2;
 
+    private static final String CATEGORY_PREFIX_TAG = "category-";
+    private static final String UNCATEGORIZED_LABEL = "Uncategorized";
+
     private Blog mBlog;
     private Post mPost;
 
@@ -127,7 +101,7 @@ public class EditPostActivity extends SherlockActivity implements OnClickListene
     private ImageButton mAddPictureButton;
     private Spinner mStatusSpinner;
     private EditText mTitleEditText, mPasswordEditText, mTagsEditText;
-    private TextView mLocationText, mCategoriesText, mPubDateText;
+    private TextView mLocationText, mPubDateText;
     private ToggleButton mBoldToggleButton, mEmToggleButton, mBquoteToggleButton;
     private ToggleButton mUnderlineToggleButton, mStrikeToggleButton;
     private Button mPubDateButton, mLinkButton, mMoreButton;
@@ -136,7 +110,7 @@ public class EditPostActivity extends SherlockActivity implements OnClickListene
     private Location mCurrentLocation;
     private LocationHelper mLocationHelper;
     private Handler mAutoSaveHandler;
-    private JSONArray mCategories;
+    private List<String> mCategories;
 
     private boolean mIsPage = false;
     private boolean mIsNew = false;
@@ -147,7 +121,6 @@ public class EditPostActivity extends SherlockActivity implements OnClickListene
     private boolean mIsNewDraft = false;
     private boolean mIsExternalInstance = false;
 
-    private List<String> mSelectedCategories;
     private String mAccountName = "";
     private int mQuickMediaType = -1;
     private String mMediaCapturePath = "";
@@ -181,9 +154,8 @@ public void onCreate(Bundle savedInstanceState) {
         mDay = c.get(Calendar.DAY_OF_MONTH);
         mHour = c.get(Calendar.HOUR_OF_DAY);
         mMinute = c.get(Calendar.MINUTE);
-        mCategories = new JSONArray();
+        mCategories = new ArrayList<String>();
         mAutoSaveHandler = new Handler();
-        mSelectedCategories = new Vector<String>();
 
         String action = getIntent().getAction();
         if (Intent.ACTION_SEND.equals(action) || Intent.ACTION_SEND_MULTIPLE.equals(action)) {
@@ -261,7 +233,6 @@ public void onCreate(Bundle savedInstanceState) {
         mBquoteToggleButton = (ToggleButton) findViewById(R.id.bquote);
         mUnderlineToggleButton = (ToggleButton) findViewById(R.id.underline);
         mStrikeToggleButton = (ToggleButton) findViewById(R.id.strike);
-        mCategoriesText = (TextView) findViewById(R.id.selectedCategories);
         mAddPictureButton = (ImageButton) findViewById(R.id.addPictureButton);
         mPubDateButton = (Button) findViewById(R.id.pubDateButton);
         mPubDateText = (TextView) findViewById(R.id.pubDate);
@@ -277,8 +248,9 @@ public void onCreate(Bundle savedInstanceState) {
         ((TextView) findViewById(R.id.pubDateLabel)).setText(getResources().getString(R.string.publish_date).toUpperCase());
 
         if (mIsPage) { // remove post specific views
-            ((LinearLayout) findViewById(R.id.section2)).setVisibility(View.GONE);
-            ((RelativeLayout) findViewById(R.id.section3)).setVisibility(View.GONE);
+            ((LinearLayout) findViewById(R.id.sectionTags)).setVisibility(View.GONE);
+            ((FlowLayout) findViewById(R.id.sectionCategories)).setVisibility(View.GONE);
+            ((RelativeLayout) findViewById(R.id.sectionLocation)).setVisibility(View.GONE);
             ((TextView) findViewById(R.id.postFormatLabel)).setVisibility(View.GONE);
             ((Spinner) findViewById(R.id.postFormat)).setVisibility(View.GONE);
         } else {
@@ -427,21 +399,8 @@ else if (mQuickMediaType == Constants.QUICK_POST_VIDEO_LIBRARY)
             }
 
             if (!mIsPage) {
-                if (mPost.getCategories() != null) {
-                    mCategories = mPost.getCategories();
-                    if (!mCategories.equals("")) {
-
-                        for (int i = 0; i < mCategories.length(); i++) {
-                            try {
-                                mSelectedCategories.add(mCategories.getString(i));
-                            } catch (JSONException e) {
-                                e.printStackTrace();
-                            }
-                        }
-                        mCategoriesText.setVisibility(View.VISIBLE);
-                        mCategoriesText.setText(getString(R.string.selected_categories) + " "
-                                + getCategoriesCSV());
-                    }
+                if (mPost.getJSONCategories() != null) {
+                    mCategories = JSONUtil.fromJSONArrayToStringList(mPost.getJSONCategories());
                 }
 
                 Double latitude = mPost.getLatitude();
@@ -451,17 +410,14 @@ else if (mQuickMediaType == Constants.QUICK_POST_VIDEO_LIBRARY)
                     new getAddressTask().execute(latitude, longitude);
                 }
             }
-
             String tags = mPost.getMt_keywords();
             if (!tags.equals("")) {
                 mTagsEditText.setText(tags);
             }
         }
 
-        if (!mIsPage) {
-            Button selectCategories = (Button) findViewById(R.id.selectCategories);
-            selectCategories.setOnClickListener(this);
-        }
+        // if mCategories is empty or if mIsNew, we want to add an "Uncategorized" category
+        populateSelectedCategories();
 
         registerForContextMenu(mAddPictureButton);
         mContentEditText.setOnSelectionChangedListener(this);
@@ -580,20 +536,20 @@ public void onFocusChange(View v, boolean hasFocus) {
         else if (!hasFocus && mFormatBar.getVisibility() == View.VISIBLE)
             hideFormatBar();
     }
-    
+
     @Override
     public void onImeBack(WPEditText ctrl, String text) {
         if (mFormatBar.getVisibility() == View.VISIBLE)
             hideFormatBar();
     }
-    
+
     private void showFormatBar() {
         mFormatBar.setVisibility(View.VISIBLE);
         AlphaAnimation fadeInAnimation = new AlphaAnimation(0.0f, 1.0f);
         fadeInAnimation.setDuration(500);
         mFormatBar.startAnimation(fadeInAnimation);
     }
-    
+
     private void hideFormatBar() {
         AlphaAnimation fadeOutAnimation = new AlphaAnimation(1.0f, 0.0f);
         fadeOutAnimation.setDuration(500);
@@ -640,12 +596,14 @@ public void onClick(View v) {
         } else if (id == R.id.selectCategories) {
             Bundle bundle = new Bundle();
             bundle.putInt("id", mBlogID);
-            if (mCategories.length() > 0) {
+            if (mCategories.size() > 0) {
                 bundle.putString("categoriesCSV", getCategoriesCSV());
             }
             Intent i1 = new Intent(EditPostActivity.this, SelectCategoriesActivity.class);
             i1.putExtras(bundle);
             startActivityForResult(i1, ACTIVITY_REQUEST_CODE_SELECT_CATEGORIES);
+        } else if (id == R.id.categoryButton) {
+            onCategoryButtonClick(v);
         } else if (id == R.id.post) {
             if (mAutoSaveHandler != null)
                 mAutoSaveHandler.removeCallbacks(autoSaveRunnable);
@@ -657,7 +615,7 @@ public void onClick(View v) {
                         else if (mQuickMediaType == Constants.QUICK_POST_VIDEO_CAMERA || mQuickMediaType == Constants.QUICK_POST_VIDEO_LIBRARY)
                             mPost.setQuickPostType("QuickVideo");
                     }
-                    
+
                     WordPress.currentPost = mPost;
                     startService(new Intent(this, PostUploadService.class));
                 }
@@ -693,10 +651,10 @@ else if (mQuickMediaType == Constants.QUICK_POST_VIDEO_CAMERA || mQuickMediaType
 
     @Override
     public boolean onTouch(View v, MotionEvent event) {
-        
+
         if (mFormatBar.getVisibility() != View.VISIBLE)
             showFormatBar();
-        
+
         float pos = event.getY();
 
         if (event.getAction() == 0)
@@ -909,7 +867,7 @@ private boolean selectBlogForShareAction() {
 
         mIsNew = true;
         mLocalDraft = true;
-        
+
         List<Map<String, Object>> accounts = WordPress.wpDB.getAccounts();
 
         if (accounts.size() > 0) {
@@ -1226,7 +1184,7 @@ public void run() {
 
     private void enableLBSButtons() {
         mLocationHelper = new LocationHelper();
-        ((RelativeLayout) findViewById(R.id.section3)).setVisibility(View.VISIBLE);
+        ((RelativeLayout) findViewById(R.id.sectionLocation)).setVisibility(View.VISIBLE);
         Button viewMap = (Button) findViewById(R.id.viewMap);
         Button updateLocation = (Button) findViewById(R.id.updateLocation);
         Button removeLocation = (Button) findViewById(R.id.removeLocation);
@@ -1341,19 +1299,93 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                 extras = data.getExtras();
                 String cats = extras.getString("selectedCategories");
                 String[] splitCats = cats.split(",");
-                if (splitCats.length < 1)
-                    return;
-                mCategories = new JSONArray();
-                for (int i = 0; i < splitCats.length; i++) {
-                    mCategories.put(splitCats[i]);
+                mCategories = new ArrayList<String>();
+                if (splitCats.length >= 1) {
+                    for (int i = 0; i < splitCats.length; i++) {
+                        if (!splitCats[i].isEmpty()) {
+                            mCategories.add(splitCats[i]);
+                        }
+                    }
                 }
-                mCategoriesText.setVisibility(View.VISIBLE);
-                mCategoriesText.setText(getString(R.string.selected_categories) + " " + getCategoriesCSV());
+                populateSelectedCategories();
                 break;
             }
         }// end null check
     }
 
+    private void onCategoryButtonClick(View v) {
+        // Get category name by removing prefix from the tag
+        boolean listChanged = false;
+        String categoryName = (String) v.getTag();
+        categoryName = categoryName.replaceFirst(CATEGORY_PREFIX_TAG, "");
+
+        // Remove clicked category from list
+        for (int i = 0; i < mCategories.size(); i++) {
+            if (mCategories.get(i).equals(categoryName)) {
+                mCategories.remove(i);
+                listChanged = true;
+                break;
+            }
+        }
+
+        // Recreate category views
+        if (listChanged) {
+            populateSelectedCategories();
+        }
+    }
+
+    private void populateSelectedCategories() {
+        ViewGroup sectionCategories = ((ViewGroup) findViewById(R.id.sectionCategories));
+        boolean uncategorizedAlone = false;
+
+        // We want an "Uncategorized" if no category selected
+        if (mCategories.size() == 0) {
+            mCategories.add(UNCATEGORIZED_LABEL);
+            uncategorizedAlone = true;
+        } else { // Check for an alone "Uncategorized"
+            if (mCategories.size() == 1 && mCategories.get(0).equals(UNCATEGORIZED_LABEL)) {
+                uncategorizedAlone = true;
+            }
+        }
+
+        // Remove previous category buttons if any + select category button
+        List<View> viewsToRemove = new ArrayList<View>();
+        for (int i = 0; i < sectionCategories.getChildCount(); i++) {
+            View v = sectionCategories.getChildAt(i);
+            Object tag = v.getTag();
+            if (tag != null && tag.getClass() == String.class &&
+                    (((String) tag).startsWith(CATEGORY_PREFIX_TAG) || tag.equals("select-category"))) {
+                viewsToRemove.add(v);
+            }
+        }
+        for (int i = 0; i < viewsToRemove.size(); i++) {
+            sectionCategories.removeView(viewsToRemove.get(i));
+        }
+        viewsToRemove.clear();
+
+        // New category buttons
+        LayoutInflater layoutInflater = getLayoutInflater();
+        List<View> categoryButtons = new ArrayList<View>();
+        for (int i = 0; i < mCategories.size(); i++) {
+            String categoryName = mCategories.get(i);
+            Button buttonCategory = (Button) layoutInflater.inflate(R.layout.category_button, null);
+            buttonCategory.setText(categoryName);
+            buttonCategory.setTag(CATEGORY_PREFIX_TAG + categoryName);
+            buttonCategory.setOnClickListener(this);
+            // Special case for Uncategorized, remove drawable left and disable
+            if (uncategorizedAlone) {
+                buttonCategory.setCompoundDrawables(null, null, null, null);
+                buttonCategory.setEnabled(false);
+            }
+            sectionCategories.addView(buttonCategory);
+        }
+
+        // Add select category button
+        View selectCategory = layoutInflater.inflate(R.layout.category_select_button, null);
+        selectCategory.setOnClickListener(this);
+        sectionCategories.addView(selectCategory);
+    }
+
     @Override
     protected Dialog onCreateDialog(int id) {
 
@@ -1572,7 +1604,7 @@ public void onClick(DialogInterface dialog, int whichButton) {
                 }
                 mPost.setMediaPaths(images);
                 mPost.setDate_created_gmt(pubDateTimestamp);
-                mPost.setCategories(mCategories);
+                mPost.setJSONCategories(new JSONArray(mCategories));
                 mPost.setMt_keywords(tags);
                 mPost.setPost_status(status);
                 mPost.setWP_password(password);
@@ -1694,28 +1726,28 @@ protected void onPostExecute(SpannableStringBuilder result) {
     private void setWPImageSpanWidth(Uri curStream, WPImageSpan is) {
         String imageWidth = WordPress.currentBlog.getMaxImageWidth();
         int imageWidthBlogSetting = Integer.MAX_VALUE;
-        
+
         if (!imageWidth.equals("Original Size")) {
             try {
                 imageWidthBlogSetting = Integer.valueOf(imageWidth);
             } catch (NumberFormatException e) {
                 e.printStackTrace();
             }
-        } 
-        
+        }
+
         int[] dimensions = ImageHelper.getImageSize(curStream, EditPostActivity.this);
         int imageWidthPictureSetting = dimensions[0] == 0 ? Integer.MAX_VALUE : dimensions[0];
-        
+
         if ( Math.min(imageWidthPictureSetting, imageWidthBlogSetting) ==  Integer.MAX_VALUE ) {
             is.setWidth(1024); //Default value in case of errors reading the picture size and the blog settings is set to Original size
         } else {
             is.setWidth(Math.min(imageWidthPictureSetting, imageWidthBlogSetting));
         }
     }
-    
-    
+
+
     private void addMedia(String imgPath, Uri curStream) {
-        
+
         if (mFormatBar.getVisibility() == View.VISIBLE)
             hideFormatBar();
 
@@ -1861,13 +1893,9 @@ public SpannableStringBuilder addMediaFromShareAction(String imgPath, Uri curStr
 
     private String getCategoriesCSV() {
         String csv = "";
-        if (mCategories.length() > 0) {
-            for (int i = 0; i < mCategories.length(); i++) {
-                try {
-                    csv += EscapeUtils.unescapeHtml(mCategories.getString(i)) + ",";
-                } catch (JSONException e) {
-                    e.printStackTrace();
-                }
+        if (mCategories.size() > 0) {
+            for (int i = 0; i < mCategories.size(); i++) {
+                csv += EscapeUtils.unescapeHtml(mCategories.get(i)) + ",";
             }
             csv = csv.substring(0, csv.length() - 1);
         }
diff --git a/src/org/wordpress/android/ui/prefs/BlogPreferencesActivity.java b/src/org/wordpress/android/ui/prefs/BlogPreferencesActivity.java
index 732dd4e27812..5979b8e22d92 100644
--- a/src/org/wordpress/android/ui/prefs/BlogPreferencesActivity.java
+++ b/src/org/wordpress/android/ui/prefs/BlogPreferencesActivity.java
@@ -274,7 +274,7 @@ public void onClick(View v) {
             mLocationCB.setChecked(blog.isLocation());
         } else {
             mLocationCB.setChecked(false);
-            RelativeLayout locationLayout = (RelativeLayout) findViewById(R.id.section3);
+            RelativeLayout locationLayout = (RelativeLayout) findViewById(R.id.sectionLocation);
             locationLayout.setVisibility(View.GONE);
         }
 
diff --git a/src/org/wordpress/android/util/FlowLayout.java b/src/org/wordpress/android/util/FlowLayout.java
new file mode 100644
index 000000000000..264dc9aae4aa
--- /dev/null
+++ b/src/org/wordpress/android/util/FlowLayout.java
@@ -0,0 +1,135 @@
+/*
+ * Sample FlowLayout wrote by Romain Guy: http://www.parleys.com/play/514892280364bc17fc56c0e2/chapter38/about
+ * Fixed and tweaked since
+ */
+
+package org.wordpress.android.util;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Paint;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import org.wordpress.android.R;
+
+public class FlowLayout extends ViewGroup {
+	private int mHorizontalSpacing;
+	private int mVerticalSpacing;
+	private Paint mPaint;
+
+	public FlowLayout(Context context, AttributeSet attrs) {
+		super(context, attrs);
+        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.FlowLayout);
+		try {
+			mHorizontalSpacing = a.getDimensionPixelSize(R.styleable.FlowLayout_horizontalSpacing, 0);
+			mVerticalSpacing = a.getDimensionPixelSize(R.styleable.FlowLayout_verticalSpacing, 0);
+		} finally {
+			a.recycle();
+		}
+	}
+
+	@Override
+	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+		int widthSize = MeasureSpec.getSize(widthMeasureSpec) - getPaddingRight() - getPaddingLeft();
+		int widthMode = MeasureSpec.getMode(widthMeasureSpec);
+
+		boolean growHeight = widthMode != MeasureSpec.UNSPECIFIED;
+
+		int width = 0;
+		int height = getPaddingTop();
+
+		int currentWidth = getPaddingLeft();
+		int currentHeight = 0;
+
+		boolean newLine = false;
+		int spacing = 0;
+
+		final int count = getChildCount();
+		for (int i = 0; i < count; i++) {
+			View child = getChildAt(i);
+			measureChild(child, widthMeasureSpec, heightMeasureSpec);
+
+			LayoutParams lp = (LayoutParams) child.getLayoutParams();
+		    spacing = mHorizontalSpacing;
+			if (lp.horizontalSpacing >= 0) {
+				spacing = lp.horizontalSpacing;
+			}
+
+			if (growHeight && currentWidth + child.getMeasuredWidth() > widthSize) {
+				height += currentHeight + mVerticalSpacing;
+				currentHeight = 0;
+				width = Math.max(width, currentWidth - spacing);
+				currentWidth = getPaddingLeft();
+				newLine = true;
+			} else {
+				newLine = false;
+			}
+
+			lp.x = currentWidth;
+			lp.y = height;
+
+			currentWidth += child.getMeasuredWidth() + spacing;
+			currentHeight = Math.max(currentHeight, child.getMeasuredHeight());
+		}
+
+		if (!newLine) {
+			width = Math.max(width, currentWidth - spacing);
+        }
+		width += getPaddingRight();
+		height += currentHeight + getPaddingBottom();
+
+		setMeasuredDimension(resolveSize(width, widthMeasureSpec), resolveSize(height, heightMeasureSpec));
+	}
+
+	@Override
+	protected void onLayout(boolean changed, int l, int t, int r, int b) {
+		final int count = getChildCount();
+		for (int i = 0; i < count; i++) {
+			View child = getChildAt(i);
+			LayoutParams lp = (LayoutParams) child.getLayoutParams();
+			child.layout(lp.x, lp.y, lp.x + child.getMeasuredWidth(), lp.y + child.getMeasuredHeight());
+		}
+	}
+
+	@Override
+	protected boolean checkLayoutParams(ViewGroup.LayoutParams p) {
+		return p instanceof LayoutParams;
+	}
+
+	@Override
+	protected LayoutParams generateDefaultLayoutParams() {
+		return new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+	}
+
+	@Override
+	public LayoutParams generateLayoutParams(AttributeSet attrs) {
+		return new LayoutParams(getContext(), attrs);
+	}
+	
+	@Override
+	protected LayoutParams generateLayoutParams(ViewGroup.LayoutParams p) {
+		return new LayoutParams(p.width, p.height);
+	}
+
+	public static class LayoutParams extends ViewGroup.LayoutParams {
+		int x;
+		int y;
+		
+		public int horizontalSpacing;
+
+		public LayoutParams(Context context, AttributeSet attrs) {
+			super(context, attrs);
+			TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.FlowLayout_LayoutParams);
+			try {
+				horizontalSpacing = a.getDimensionPixelSize(R.styleable.FlowLayout_LayoutParams_layout_horizontalSpacing, -1);
+			} finally {
+				a.recycle();
+			}
+		}
+
+		public LayoutParams(int w, int h) {
+			super(w, h);
+		}
+	}
+}
diff --git a/src/org/wordpress/android/util/JSONUtil.java b/src/org/wordpress/android/util/JSONUtil.java
index 83e68a494269..009a54447c09 100644
--- a/src/org/wordpress/android/util/JSONUtil.java
+++ b/src/org/wordpress/android/util/JSONUtil.java
@@ -6,6 +6,9 @@
 import org.json.JSONArray;
 import org.json.JSONException;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class JSONUtil {
     private static String QUERY_SEPERATOR=".";
     private static String QUERY_ARRAY_INDEX_START="[";
@@ -124,4 +127,19 @@ public static <U> U queryJSON(JSONArray source, String query, U defaultObject){
         }
 
     }
+
+    /**
+     * Convert a JSONArray (expected to contain strings) in a string list
+     */
+    public static List<String> fromJSONArrayToStringList(JSONArray jsonArray) {
+        List<String> stringList = new ArrayList<String>();
+        for (int i = 0; i < jsonArray.length(); i++) {
+            try {
+                stringList.add(jsonArray.getString(i));
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
+        }
+        return stringList;
+    }
 }
\ No newline at end of file
diff --git a/src/org/wordpress/android/util/PostUploadService.java b/src/org/wordpress/android/util/PostUploadService.java
index cb15a5651f54..32c73b2d8cb5 100644
--- a/src/org/wordpress/android/util/PostUploadService.java
+++ b/src/org/wordpress/android/util/PostUploadService.java
@@ -253,7 +253,7 @@ protected Boolean doInBackground(Post... posts) {
             if (mediaError)
                 return false;
 
-            JSONArray categories = post.getCategories();
+            JSONArray categories = post.getJSONCategories();
             String[] theCategories = null;
             if (categories != null) {
                 theCategories = new String[categories.length()];

From 0bc465cbcaf8792ec25bd7dd23c98dfe78a01fb3 Mon Sep 17 00:00:00 2001
From: Maxime Biais <maxime.biais@gmail.com>
Date: Thu, 25 Jul 2013 09:23:26 +0200
Subject: [PATCH 02/13] New database version (v18) atlering categories table to
 add parent_id

---
 src/org/wordpress/android/WordPressDB.java    | 43 +++++++++++++++++--
 .../ui/posts/SelectCategoriesActivity.java    |  2 +-
 .../ui/prefs/BlogPreferencesActivity.java     |  3 +-
 3 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/src/org/wordpress/android/WordPressDB.java b/src/org/wordpress/android/WordPressDB.java
index 1a9dcf3719c8..f09fd4bea4d1 100644
--- a/src/org/wordpress/android/WordPressDB.java
+++ b/src/org/wordpress/android/WordPressDB.java
@@ -34,7 +34,7 @@
 
 public class WordPressDB {
 
-    private static final int DATABASE_VERSION = 17;
+    private static final int DATABASE_VERSION = 18;
 
     private static final String CREATE_TABLE_SETTINGS = "create table if not exists accounts (id integer primary key autoincrement, "
             + "url text, blogName text, username text, password text, imagePlacement text, centerThumbnail boolean, fullSizeImage boolean, maxImageWidth text, maxImageWidthId integer, lastCommentId integer, runService boolean);";
@@ -125,6 +125,9 @@ public class WordPressDB {
 
     private static final String ADD_BLOG_OPTIONS = "alter table accounts add blog_options text default '';";
 
+    // add category parent id to keep track of category hierarchy
+    private static final String ADD_PARENTID_IN_CATEGORIES = "alter table cats add parent_id integer default 0;";
+
     private SQLiteDatabase db;
 
     protected static final String PASSWORD_SECRET = Config.DB_SECRET;
@@ -181,6 +184,7 @@ public WordPressDB(Context ctx) {
                 db.execSQL(ADD_FEATURED_IN_POST);
                 db.execSQL(ADD_HOME_URL);
                 db.execSQL(ADD_BLOG_OPTIONS);
+                db.execSQL(ADD_PARENTID_IN_CATEGORIES);
                 migratePasswords();
                 db.setVersion(DATABASE_VERSION); // set to latest revision
             } else if (db.getVersion() == 1) { // v1.0 or v1.0.1
@@ -213,6 +217,7 @@ public WordPressDB(Context ctx) {
                 db.execSQL(ADD_FEATURED_IN_POST);
                 db.execSQL(ADD_HOME_URL);
                 db.execSQL(ADD_BLOG_OPTIONS);
+                db.execSQL(ADD_PARENTID_IN_CATEGORIES);
                 migratePasswords();
                 migratePreferences(ctx);
                 migrateWPComAccount();
@@ -245,6 +250,7 @@ public WordPressDB(Context ctx) {
                 db.execSQL(ADD_FEATURED_IN_POST);
                 db.execSQL(ADD_HOME_URL);
                 db.execSQL(ADD_BLOG_OPTIONS);
+                db.execSQL(ADD_PARENTID_IN_CATEGORIES);
                 migratePasswords();
                 migratePreferences(ctx);
                 migrateWPComAccount();
@@ -274,6 +280,7 @@ public WordPressDB(Context ctx) {
                 db.execSQL(ADD_FEATURED_IN_POST);
                 db.execSQL(ADD_HOME_URL);
                 db.execSQL(ADD_BLOG_OPTIONS);
+                db.execSQL(ADD_PARENTID_IN_CATEGORIES);
                 migratePasswords();
                 migratePreferences(ctx);
                 migrateWPComAccount();
@@ -303,6 +310,7 @@ public WordPressDB(Context ctx) {
                 db.execSQL(ADD_FEATURED_IN_POST);
                 db.execSQL(ADD_HOME_URL);
                 db.execSQL(ADD_BLOG_OPTIONS);
+                db.execSQL(ADD_PARENTID_IN_CATEGORIES);
                 migratePasswords();
                 migratePreferences(ctx);
                 migrateWPComAccount();
@@ -357,6 +365,7 @@ public WordPressDB(Context ctx) {
                 db.execSQL(ADD_FEATURED_IN_POST);
                 db.execSQL(ADD_HOME_URL);
                 db.execSQL(ADD_BLOG_OPTIONS);
+                db.execSQL(ADD_PARENTID_IN_CATEGORIES);
                 migratePasswords();
                 migratePreferences(ctx);
                 migrateWPComAccount();
@@ -375,6 +384,7 @@ public WordPressDB(Context ctx) {
                 db.execSQL(ADD_FEATURED_IN_POST);
                 db.execSQL(ADD_HOME_URL);
                 db.execSQL(ADD_BLOG_OPTIONS);
+                db.execSQL(ADD_PARENTID_IN_CATEGORIES);
                 migratePasswords();
                 migratePreferences(ctx);
                 migrateWPComAccount();
@@ -392,6 +402,7 @@ public WordPressDB(Context ctx) {
                 db.execSQL(ADD_FEATURED_IN_POST);
                 db.execSQL(ADD_HOME_URL);
                 db.execSQL(ADD_BLOG_OPTIONS);
+                db.execSQL(ADD_PARENTID_IN_CATEGORIES);
                 migratePasswords();
                 migratePreferences(ctx);
                 migrateWPComAccount();
@@ -409,6 +420,7 @@ public WordPressDB(Context ctx) {
                 db.execSQL(ADD_FEATURED_IN_POST);
                 db.execSQL(ADD_HOME_URL);
                 db.execSQL(ADD_BLOG_OPTIONS);
+                db.execSQL(ADD_PARENTID_IN_CATEGORIES);
                 migratePasswords();
                 migratePreferences(ctx);
                 migrateWPComAccount();
@@ -481,6 +493,7 @@ public WordPressDB(Context ctx) {
                 db.execSQL(ADD_FEATURED_IN_POST);
                 db.execSQL(ADD_HOME_URL);
                 db.execSQL(ADD_BLOG_OPTIONS);
+                db.execSQL(ADD_PARENTID_IN_CATEGORIES);
                 migratePreferences(ctx);
                 migrateWPComAccount();
                 db.setVersion(DATABASE_VERSION);
@@ -491,6 +504,7 @@ public WordPressDB(Context ctx) {
                 db.execSQL(ADD_FEATURED_IN_POST);
                 db.execSQL(ADD_HOME_URL);
                 db.execSQL(ADD_BLOG_OPTIONS);
+                db.execSQL(ADD_PARENTID_IN_CATEGORIES);
                 migratePreferences(ctx);
                 migrateWPComAccount();
                 db.setVersion(DATABASE_VERSION);
@@ -498,27 +512,35 @@ public WordPressDB(Context ctx) {
                 db.execSQL(ADD_FEATURED_IN_POST);
                 db.execSQL(ADD_HOME_URL);
                 db.execSQL(ADD_BLOG_OPTIONS);
+                db.execSQL(ADD_PARENTID_IN_CATEGORIES);
                 migratePreferences(ctx);
                 migrateWPComAccount();
                 db.setVersion(DATABASE_VERSION);
             } else if (db.getVersion() == 13) {
                 db.execSQL(ADD_HOME_URL);
                 db.execSQL(ADD_BLOG_OPTIONS);
+                db.execSQL(ADD_PARENTID_IN_CATEGORIES);
                 migratePreferences(ctx);
                 migrateWPComAccount();
                 db.setVersion(DATABASE_VERSION);
             } else if (db.getVersion() == 14) {
                 db.execSQL(ADD_BLOG_OPTIONS);
+                db.execSQL(ADD_PARENTID_IN_CATEGORIES);
                 migratePreferences(ctx);
                 migrateWPComAccount();
                 db.setVersion(DATABASE_VERSION);
             } else if (db.getVersion() == 15) {
+                db.execSQL(ADD_PARENTID_IN_CATEGORIES);
                 migratePreferences(ctx);
                 migrateWPComAccount();
                 db.setVersion(DATABASE_VERSION);
             } else if (db.getVersion() == 16) {
+                db.execSQL(ADD_PARENTID_IN_CATEGORIES);
                 migrateWPComAccount();
                 db.setVersion(DATABASE_VERSION);
+            } else if (db.getVersion() == 17) {
+                db.execSQL(ADD_PARENTID_IN_CATEGORIES);
+                db.setVersion(DATABASE_VERSION);
             }
         } catch (SQLException e) {
             e.printStackTrace();
@@ -1228,10 +1250,10 @@ public long savePost(Post post, int blogID) {
             values.put("description", post.getDescription());
             values.put("mt_text_more", post.getMt_text_more());
 
-            if (post.getCategories() != null) {
+            if (post.getJSONCategories() != null) {
                 JSONArray jsonArray = null;
                 try {
-                    jsonArray = new JSONArray(post.getCategories().toString());
+                    jsonArray = new JSONArray(post.getJSONCategories().toString());
                     values.put("categories", jsonArray.toString());
                 } catch (JSONException e) {
                     e.printStackTrace();
@@ -1553,12 +1575,13 @@ public long getStatsDate() {
     }
 
     // categories
-    public boolean insertCategory(int id, int wp_id, String category_name) {
+    public boolean insertCategory(int id, int wp_id, int parent_id, String category_name) {
 
         ContentValues values = new ContentValues();
         values.put("blog_id", id);
         values.put("wp_id", wp_id);
         values.put("category_name", category_name.toString());
+        values.put("parent_id", parent_id);
         boolean returnValue = false;
         synchronized (this) {
             returnValue = db.insert(CATEGORIES_TABLE, null, values) > 0;
@@ -1600,6 +1623,18 @@ public int getCategoryId(int id, String category) {
         return categoryID;
     }
 
+    public int getCategoryParentId(int id, String category) {
+        Cursor c = db.query(CATEGORIES_TABLE, new String[] { "parent_id" },
+                "category_name=\"" + category + "\" AND blog_id=" + id, null,
+                null, null, null);
+        if (c.getCount() == 0)
+            return -1;
+        c.moveToFirst();
+        int categoryParentID = c.getInt(0);
+
+        return categoryParentID;
+    }
+
     public void clearCategories(int id) {
 
         // clear out the table since we are refreshing the whole enchilada
diff --git a/src/org/wordpress/android/ui/posts/SelectCategoriesActivity.java b/src/org/wordpress/android/ui/posts/SelectCategoriesActivity.java
index 06e86b32a9f4..8294fc0f2b8d 100644
--- a/src/org/wordpress/android/ui/posts/SelectCategoriesActivity.java
+++ b/src/org/wordpress/android/ui/posts/SelectCategoriesActivity.java
@@ -260,7 +260,7 @@ public String addCategory(String category_name, String category_slug, String cat
             // Convert "result" (= category_id) from type Object to int
             int category_id = Integer.parseInt(result.toString());
             // Insert the new category into database
-            WordPress.wpDB.insertCategory(id, category_id, category_name);
+            WordPress.wpDB.insertCategory(blog.getId(), category_id, parent_id, category_name);
 
             returnString = "addCategory_success";
         }
diff --git a/src/org/wordpress/android/ui/prefs/BlogPreferencesActivity.java b/src/org/wordpress/android/ui/prefs/BlogPreferencesActivity.java
index 5979b8e22d92..79ea67f531a5 100644
--- a/src/org/wordpress/android/ui/prefs/BlogPreferencesActivity.java
+++ b/src/org/wordpress/android/ui/prefs/BlogPreferencesActivity.java
@@ -5,7 +5,6 @@
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.location.LocationManager;
-import android.opengl.Visibility;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.AdapterView;
@@ -81,7 +80,7 @@ public void onCreate(Bundle savedInstanceState) {
         
         if (blog.isDotcomFlag()) {
             // Hide credentials section
-            RelativeLayout credentialsRL = (RelativeLayout)findViewById(R.id.section1);
+            RelativeLayout credentialsRL = (RelativeLayout)findViewById(R.id.sectionContent);
             credentialsRL.setVisibility(View.GONE);
         }
         

From 7ab5eb5762759de88061053c093a5a8a9042cd63 Mon Sep 17 00:00:00 2001
From: Maxime Biais <maxime.biais@gmail.com>
Date: Thu, 25 Jul 2013 14:35:13 +0200
Subject: [PATCH 03/13] add new icon: level_indicator used in select category
 view

---
 res/drawable-hdpi/ic_level_indicator.png   | Bin 0 -> 1263 bytes
 res/drawable-mdpi/ic_level_indicator.png   | Bin 0 -> 1213 bytes
 res/drawable-xhdpi/ic_level_indicator.png  | Bin 0 -> 1347 bytes
 res/drawable-xxhdpi/ic_level_indicator.png | Bin 0 -> 1498 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_level_indicator.png
 create mode 100644 res/drawable-mdpi/ic_level_indicator.png
 create mode 100644 res/drawable-xhdpi/ic_level_indicator.png
 create mode 100644 res/drawable-xxhdpi/ic_level_indicator.png

diff --git a/res/drawable-hdpi/ic_level_indicator.png b/res/drawable-hdpi/ic_level_indicator.png
new file mode 100644
index 0000000000000000000000000000000000000000..a369d6346d0161adf1d5bc59417db0b7b1e3b000
GIT binary patch
literal 1263
zcmbVLUuYaf7@yci(nv6|R9dMpZVguG-R|t&?(HtQUiWUZ_KJ5+?hbn|rP=IGa%-|X
zo83w85~{@DLw)hV2P=qD5Nl~gAH=qy^pE(U(!Q2L15%18kw9Jw1^b}0NiGTv5xVT|
z%zX3xe&6r==9>?O%5U^^ztjx?=qVmHDr_8yzpiK5|G_6sg$;Y?V4YUU7;Rc12D(E=
zF)Vu4IIdvJnVI?p4*;;O;nwQ3UV2lriI=oupJdAm7#e_qTr05b2~6QA9(VmLw{rCc
z2VE!29g|8zDJbBEdw4d))!A~*o}I8&hszy=11*gac$iwS<xTpL*2;3Lyc(OwW}btq
zE_5Qxt%<6ahG2n&7)r@h!WIyMvYbR|NtV$8C<;jA1@_7bl-49!6EkrA;aIfL8Ph6;
zxgLwHvRs4GK;!vlvzctBk|Z4Gk*caOhbShPM<SZ>sntsO(Y`i=fg?L~1L_hV#*Ee|
znWkBeDP2p!3reL8Vn13h6e}6uvH~6@1>W=GyjHy<TEYLy*wj0!%><aQ;D}6zHam~8
zeQhwS-PVC(N2W$Q8oKOItVx5|(;oI|(a3UaC+WD3W@a)bLYcIX5d~R6ND-7&UXb&G
zp3kRsQ)qK+hRtLoNf*uZppn)Q8Wa^tPz#DEAr+-`vw+&zq90Mqw{bhJ%i^wMQ(I!S
zLWnI&!Wtoy?G6}f5K5v331Fcr!~G@8cKz7!dVD}@`5HKMPh!Umi3e9Jtht*gFxCId
zd=2Y7P1SfNhL79hKkd>su^x=48_mxa8`lT>?9PPja{SnM!2_V<<)We2TKAS0f9RVR
zdJhdxoqzA3GTeFRTzC1QzH@))edYGqPnRF}>^`*|9=W{oxbXMIZ2-&x&<nsb;1B>^
zj0E(4Y3(jQua>IKKggMi|IVfBA7}91pT5hTzrFJIXLDcmKM8^0#P<iD16^<R&UICX
z7GF)P9nvdx9faS0@%w8~o8Pq^KGKdz9esUYL$Gjn_}-4w^CO)dKVSRs!ou09lezni
z<9Ba-P8KiSI%E9x;;+9QRdRn`F{7oAPLnwjYl1+%xODE+j(4vwOoN>efbCDn-pcs?
aQvXe`=h%bGC;D9`AAsUu+4v?uGXD>bT!Hlf

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_level_indicator.png b/res/drawable-mdpi/ic_level_indicator.png
new file mode 100644
index 0000000000000000000000000000000000000000..2af721778dba0716fd4eed0f3161afc504f11515
GIT binary patch
literal 1213
zcmbVLO-$re94}#I1x11EVbMz|(TF<JzRt8W(=foybSfhjaAxApa@cIAeJ~Z;SK5a&
z;75$22^SAu{0fPY>_LqmSA$B3Csa1OS@r<Q?y_Dy=!OHy%Ee`0XBZ@rU}Dq0_xj%N
z_xpdm|9@e0__@}W$66?gYRwGFSuzj!--AtL{KA~RNv2MmF5ny*$7RihRKh?-NM|f<
z0%oCR%ucVtUW#fgnfU@Ps4qx5vVxkA305qJuqmpyzv5{6B*b(PPMCI_*;!s;Xw!%@
z=LD5gofIsYgL5v-%?;=Exk)`{F#UaWZ$%;k7Q`A|v8HTKs>GS9u0+=UHp|de2%d~H
zHKz*dD4jwsq=jH8pmPAwq8J2WK@`EWG|vH^<;W`rKv)t)iI30+4@0cE#<-M~l>=Mk
zFV2)Ob|jW9m&?I&D2Ut%7Q|vPUxViZ1QGCNZLC!Sw%1)(kfEo$rh`pn)4rlsL^C+f
z5Kn6%SdOY53fta6qDacvisrB&$g!5?$5lmpI1B%A<5;wppLHOcg&vx5b#fo$-E}g_
z-N}Z0An`^TaZPe5+LVm+84KDtBgYwX5;ROhQX&xrfJm5&@SGS0Aj(BUNlr|1iDWXI
zP`J9raok8m5E8t?rR8t}fHWT!xL7L63m^tU2_*&U+>GsE&DLSvu1W0HxM}4?u9R}2
zhLM{`XsTWTqa}oqS3(Y*%8B$-s-~N^ztQ7gP%T~=y5=j;P+Vlu)eKAKF&-$f|BAfE
zHU3Z5SmF%pm&cKEsc(@Q^p}UlPks*D2il}(T+$pPiyk12^+!fd<SSc$ZmqV?({1l)
zn}x>LozGgnTzoou^|bo!&~Ixu-d^Az`DMT5%3jY;(bel?AAGbs_T;10t|SA8URwWT
zc4uYl^4X<jS8eY+{pl0)&TG_WpVnN*_^_^l=NH)Ro>RG@?dDUSF!1=Q(Y_&b%MX>h
zKD^l^wEg;5!w>E6mgeV}hp#o?O*$X{-nf<Di=MI8Vz=J-Cj0Z}=I+b4@7zm%*JWM!
z@$dDHZPfN=--};0ysC8!QSar78%K=&dwKEw?;kizJ+mw<UD`h%^3OBrVfpLi#kcMQ
DG9-N&

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_level_indicator.png b/res/drawable-xhdpi/ic_level_indicator.png
new file mode 100644
index 0000000000000000000000000000000000000000..f13d8505d87a7911f7070159922e2df282c7dd09
GIT binary patch
literal 1347
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+m@_g%B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87
z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$
zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`<jAm(=3qqRfJl%=|nBkco*&`K2Yc
zN<f!FypUVq>kBtHuNWFoz#!AFNG#Ad)HBe}%?0@jth%@)C>7xhtg4GcDhpEegHnt0
zON)|$@sXws(+mtd{1$-}0$pR}Uz7=ql*AmD{N&Qy)VvZ;7h5Huj9yA+ij|wWxtpP(
zxru?fk%5_op`nF=g|U-?nUjH|laq;~n*q!WY<isxEKCf|-CSK=jLi%UU5y-#3@n{p
zjf@=KjDQBZS;F*s<`tJD<|U`X?9Bw)3)Sm_SFe?GQEFmIeo;t%ehw@J1Z3ow<QHe;
z7brLfn<;4cCMIX*fdn)`5d`tCOKMSOS!#+~QGTuhIE1Y-vADp^l910KdQ->=HGQCC
z^g+o3DY?LefN2oKgeQI=2cCUW^MHA#2$(r^ynjkFFfbN+x;TbZ+<J58Aa9ccgG->{
z6$kk_D-LCC=kojFD7;!_-dQ<=N9U?VJL=e-&+u)%CcX3BJtjs429^c}0R|=q1`Y;B
zG)|S_x2nX;CZ>OH7Di5cIDP%*DM}6bGoSB#%B;~ZzMX*ur$&g(kK)(6xEL6Ztao@M
z#BqRW!X6f;4Gb#!jSM;rC%qLIxE($b5auwy6198JhR16jOk149e|y{Cv!!o;*S)%V
zZ1H=C+cOV|7tPVDy>;_g9%CJg65KUUUVL-B@VhheqhS5Dw~G_*Fk$hW0|Nn{6Y|;v
cuX#*743iB5c+RjWb};~fr>mdKI;Vst00fhm00000

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_level_indicator.png b/res/drawable-xxhdpi/ic_level_indicator.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5f639b3eefe4cecd5235a97d72cff657586f656
GIT binary patch
literal 1498
zcmbVMU1%It6uw#4bgd>9TJVQHT&AE2bZ73J?9A>C*=}}ccFjsAiJQd+EH;ywo9vLx
zk290*CdJy6>XHYs4=NSJBGd;TQYf^L(qe+GU=SYyBDE@5Q2U}*`~eX`?<Bj?N+{7`
zX710N^PTT}=iFHs9(<x>=c79T03D@%rA)__@QJn4clnFy9dvjkD2xUp&O}htJOXlt
zGfrU1(k4lnXvXYwtE3lzd#Yw-G#FI}B;B!CEwo|lmP@?>=*`w$O`jqG94C{eondZY
zUS^<aWSE13id0u7RkMH2BO`Nz6@6|>Pa9130PL+x6u=^Z2J6<e?Mw9xvyLm#dAQ9n
zaNQ)B$}k(GM%7^`J05`o+Y{Fj#!wVloDf72?}t3XJcsBl#&JRtM2Szr=Ecxxo-rYn
zm0~j%U1gYR5V#V@)oL}i*26m9B!|=Kbcn(8acU9wXYD|%$8CRK3qc{i?wM|2IyMXu
zwQ*-A$S{=YMhcdzs++*J-xP{U#?>{K!z|(~E6i)%+7HU)ZyH-#`;}RjaAo2<GoDWC
zF|n`ZOtrgvpwN)Ak%l~z7Dby@9DT+jc2H6>4E@3yrXdxR$s)$d1WNKqOktctsh&I%
z^C*|kCvrv9!r00;EfhqA1f`%Pau^r*lz`H5iWhJi_vDH)ZuypMKhSKQwBnjHZqrx3
ztFI(`L<=0R;yBZ-4j8UFf#X*l7s?|d>{2z|w8M?=us|F6D#SC75Toch7F<_YGPhuW
zXs-XxJjW+!)<V8ORbiUG#{W@`qhz?SJ^s-ytu5Mv;dHb4>0<Nv5SyMEj~<TC-d&vs
zAQCGnxk~-UcVDiVSJ9rA*1C-L@85o0y=e+Bp1IO^eF@J$u<P?{3p1TxpWmZoe>mKg
zC|v6(z7{<W`TzvGKnz4d1hj2)`PGBpyqV07FA6XJab)r0$nu|8U%8E+?0)72aO1*H
zCvGhrjr<q1J3_CZZ)cA^9};@+gXR9;&v*aw^wh7ArRxFc#~z}#kDW@Nyq}WY{o&sC
z@1>OQGdgcZj)Rpb-*DUdz*yuBd5PvU0EfmpFVP8_M~y=?#nXMK<q+pwSK;Kr>)p5Z
zzVqtGhnM$%^rLhA=+Lnp4}bDjojtpFW;GhwT87_FWg7<ue~w;Ow=WcEi)~xfJ7m~?
gK{hKl79DD92TwiQSXua#SquNRrNW?cE<bkSFZT7DlmGw#

literal 0
HcmV?d00001


From 2f361503712c6a3ba4afb6d974ce7322d0461b75 Mon Sep 17 00:00:00 2001
From: Maxime Biais <maxime.biais@gmail.com>
Date: Thu, 25 Jul 2013 14:39:53 +0200
Subject: [PATCH 04/13] Refresh select category view.

- Rewrite a part of category managing
- Display category hierarchy
- this also fix #213: Adding a new category remove the selection on the categories screen
- and fix #258: Adding a Category results in an unsorted category list
---
 res/layout/categories_row.xml                 |  34 ++-
 res/values/dimens.xml                         |   1 +
 .../wordpress/android/models/Category.java    |  37 ++++
 .../android/ui/posts/AddCategoryActivity.java |  16 +-
 .../ui/posts/CategoryArrayAdapter.java        |  66 ++++++
 .../ui/posts/SelectCategoriesActivity.java    | 204 +++++++++---------
 .../android/util/CheckedLinearLayout.java     |  47 ++++
 7 files changed, 285 insertions(+), 120 deletions(-)
 create mode 100644 src/org/wordpress/android/models/Category.java
 create mode 100644 src/org/wordpress/android/ui/posts/CategoryArrayAdapter.java
 create mode 100644 src/org/wordpress/android/util/CheckedLinearLayout.java

diff --git a/res/layout/categories_row.xml b/res/layout/categories_row.xml
index 93a703d69061..d0a4ff96dcb8 100644
--- a/res/layout/categories_row.xml
+++ b/res/layout/categories_row.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<CheckedTextView
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:orientation="vertical"
-  android:layout_width="fill_parent"
-  android:layout_height="?android:attr/listPreferredItemHeight"
-  android:textAppearance="?android:attr/textAppearanceLarge"
-  android:gravity="center_vertical"
-  android:textColor="#464646"
-  android:paddingLeft="6dip"
-  android:paddingRight="6dip"
-  android:checkMark="?android:attr/listChoiceIndicatorMultiple" />
+
+<org.wordpress.android.util.CheckedLinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/category_row_height"
+        android:orientation="horizontal"
+        android:id="@+id/categoryRow" android:clickable="false">
+    <ImageView android:layout_width="@dimen/category_row_height"
+               android:layout_height="@dimen/category_row_height"
+               android:src="@drawable/ic_level_indicator"
+               android:id="@+id/categoryRowLevelIndicator" android:scaleType="fitEnd"/>
+    <CheckedTextView
+            android:orientation="vertical"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:gravity="center_vertical"
+            android:textColor="#464646"
+            android:paddingLeft="6dip"
+            android:paddingRight="6dip"
+            android:checkMark="?android:attr/listChoiceIndicatorMultiple"
+            android:id="@+id/categoryRowText"/>
+</org.wordpress.android.util.CheckedLinearLayout>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 200f94f2ae97..8f8b01ca1c34 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -12,4 +12,5 @@
     <dimen name="menu_shadow_width">4dp</dimen>
     <dimen name="add_account_width">-1dp</dimen>
     <dimen name="refresh_icon_padding">12dp</dimen>
+    <dimen name="category_row_height">60dp</dimen>
 </resources>
diff --git a/src/org/wordpress/android/models/Category.java b/src/org/wordpress/android/models/Category.java
new file mode 100644
index 000000000000..6202a111ad41
--- /dev/null
+++ b/src/org/wordpress/android/models/Category.java
@@ -0,0 +1,37 @@
+package org.wordpress.android.models;
+
+public class Category {
+    private int categoryId;
+    private int parentId;
+    private String name;
+
+    public Category(int categoryId, int parentId, String name) {
+        this.categoryId = categoryId;
+        this.parentId = parentId;
+        this.name = name;
+    }
+
+    public int getCategoryId() {
+        return categoryId;
+    }
+
+    public void setCategoryId(int categoryId) {
+        this.categoryId = categoryId;
+    }
+
+    public int getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(int parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
\ No newline at end of file
diff --git a/src/org/wordpress/android/ui/posts/AddCategoryActivity.java b/src/org/wordpress/android/ui/posts/AddCategoryActivity.java
index 9ada4ff6c6f4..678269311ecc 100644
--- a/src/org/wordpress/android/ui/posts/AddCategoryActivity.java
+++ b/src/org/wordpress/android/ui/posts/AddCategoryActivity.java
@@ -107,24 +107,16 @@ private void loadCategories() {
         ArrayList<CharSequence> loadTextArray = new ArrayList<CharSequence>();
         loadTextArray.clear();
         List<?> categoriesVector = WordPress.wpDB.loadCategories(id);
-        if (categoriesVector.size() > 0)
-        {
-
+        if (categoriesVector.size() > 0) {
             loadTextArray.add(getResources().getText(R.string.none));
-
-            for(int i=0; i < categoriesVector.size(); i++)
-            {
+            for(int i=0; i < categoriesVector.size(); i++) {
                 loadTextArray.add(categoriesVector.get(i).toString());
             }
-
-            ArrayAdapter<CharSequence> categories = new ArrayAdapter<CharSequence>(this, android.R.layout.simple_dropdown_item_1line, loadTextArray);
+            ArrayAdapter<CharSequence> categories = new ArrayAdapter<CharSequence>(this,
+                    android.R.layout.simple_dropdown_item_1line, loadTextArray);
             categories.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-
             Spinner sCategories = (Spinner) findViewById(R.id.parent_category);
-
-
             sCategories.setAdapter(categories);
-
         }
 
     }
diff --git a/src/org/wordpress/android/ui/posts/CategoryArrayAdapter.java b/src/org/wordpress/android/ui/posts/CategoryArrayAdapter.java
new file mode 100644
index 000000000000..b02e71f5f2f2
--- /dev/null
+++ b/src/org/wordpress/android/ui/posts/CategoryArrayAdapter.java
@@ -0,0 +1,66 @@
+package org.wordpress.android.ui.posts;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+import org.wordpress.android.R;
+import org.wordpress.android.models.Category;
+import org.wordpress.android.util.EscapeUtils;
+
+import java.util.List;
+
+public class CategoryArrayAdapter extends ArrayAdapter<CategoryArrayAdapter.CategoryLevel> {
+    // Intermediate structure to populate the ListView
+    public static class CategoryLevel {
+        private Category category;
+        private int level;
+
+        public CategoryLevel(Category category, int level) {
+            this.category = category;
+            this.level = level;
+        }
+
+        public Category getCategory() {
+            return category;
+        }
+
+        public void setCategory(Category category) {
+            this.category = category;
+        }
+
+        public int getLevel() {
+            return level;
+        }
+
+        public void setLevel(int level) {
+            this.level = level;
+        }
+    }
+
+    public CategoryArrayAdapter(Context context, int resource, List<CategoryArrayAdapter.CategoryLevel> objects) {
+        super(context, resource, objects);
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        View rowView = inflater.inflate(R.layout.categories_row, parent, false);
+        TextView textView = (TextView) rowView.findViewById(R.id.categoryRowText);
+        ImageView levelIndicatorView = (ImageView) rowView.findViewById(R.id.categoryRowLevelIndicator);
+        textView.setText(EscapeUtils.escapeHtml(getItem(position).getCategory().getName()));
+        int level = getItem(position).getLevel();
+        if (level == 1) { // hide ImageView
+            levelIndicatorView.setVisibility(View.GONE);
+        } else {
+            ViewGroup.LayoutParams params = levelIndicatorView.getLayoutParams();
+            params.width = (params.width / 2) * level;
+            levelIndicatorView.setLayoutParams(params);
+        }
+        return rowView;
+    }
+
+}
diff --git a/src/org/wordpress/android/ui/posts/SelectCategoriesActivity.java b/src/org/wordpress/android/ui/posts/SelectCategoriesActivity.java
index 8294fc0f2b8d..fe3b5c310bec 100644
--- a/src/org/wordpress/android/ui/posts/SelectCategoriesActivity.java
+++ b/src/org/wordpress/android/ui/posts/SelectCategoriesActivity.java
@@ -1,10 +1,6 @@
 package org.wordpress.android.ui.posts;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
+import java.util.*;
 
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
@@ -13,8 +9,8 @@
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.os.Handler;
+import android.util.SparseArray;
 import android.util.SparseBooleanArray;
-import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.Toast;
 
@@ -24,29 +20,41 @@
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 
+import org.wordpress.android.models.Category;
 import org.xmlrpc.android.XMLRPCClient;
 import org.xmlrpc.android.XMLRPCException;
 
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
 import org.wordpress.android.models.Blog;
-import org.wordpress.android.util.EscapeUtils;
 
 public class SelectCategoriesActivity extends SherlockListActivity {
-    /** Called when the activity is first created. */
     String categoriesCSV = "";
-    long[] checkedCategories;
     private XMLRPCClient client;
-    String finalResult = "", addCategoryResult = "";
+    String finalResult = "";
     ProgressDialog pd;
     public String categoryErrorMsg = "";
-    public ArrayList<CharSequence> textArray = new ArrayList<CharSequence>();
-    public ArrayList<CharSequence> loadTextArray = new ArrayList<CharSequence>();
-    public ArrayList<CharSequence> formattedTextArray = new ArrayList<CharSequence>();
     private final Handler mHandler = new Handler();
     private Blog blog;
-    private int id;
     private ListView lv;
+    private CategoryNode mCategories = new CategoryNode(null);
+    private ArrayList<CategoryArrayAdapter.CategoryLevel> mCategoryLevels;
+    private Map<String, Integer> mCategoryNames = new HashMap<String, Integer>();
+
+    // Class to efficiently construct an ordered category tree
+    private class CategoryNode {
+        SortedMap<String, CategoryNode> children = new TreeMap<String, CategoryNode>(new Comparator<String>() {
+            @Override
+            public int compare(String s, String s2) {
+                return s.compareToIgnoreCase(s2);
+            }
+        });
+        Category category;
+
+        public CategoryNode(Category category) {
+            this.category = category;
+        }
+    }
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -65,56 +73,85 @@ public void onCreate(Bundle icicle) {
 
         Bundle extras = getIntent().getExtras();
         if (extras != null) {
-            id = extras.getInt("id");
+            int blogId = extras.getInt("id");
             try {
-                blog = new Blog(id);
+                blog = new Blog(blogId);
             } catch (Exception e) {
                 Toast.makeText(this, getResources().getText(R.string.blog_not_found), Toast.LENGTH_SHORT).show();
                 finish();
             }
-            checkedCategories = extras.getLongArray("checkedCategories");
             categoriesCSV = extras.getString("categoriesCSV");
         }
 
-        loadCategories();
+        createCategoryTreeFromDB();
     }
 
-    private void loadCategories() {
-        loadTextArray.clear();
-        formattedTextArray.clear();
-        List<?> categoriesVector = WordPress.wpDB.loadCategories(id);
-        if (categoriesVector.size() > 0) {
+    private void populateCategoryList() {
+        mCategoryLevels = new ArrayList<CategoryArrayAdapter.CategoryLevel>();
+        categoryTreePreorderTraversal(mCategories, mCategoryLevels);
+        for (int i = 0; i < mCategoryLevels.size(); i++) {
+            mCategoryNames.put(mCategoryLevels.get(i).getCategory().getName(), i);
+        }
 
-            for (int i = 0; i < categoriesVector.size(); i++) {
-                loadTextArray.add(categoriesVector.get(i).toString());
-                formattedTextArray.add(EscapeUtils.unescapeHtml(categoriesVector.get(i).toString()));
+        CategoryArrayAdapter categoryAdapter = new CategoryArrayAdapter(this, R.layout.categories_row, mCategoryLevels);
+        this.setListAdapter(categoryAdapter);
+        if (categoriesCSV != null) {
+            String catsArray[] = categoriesCSV.split(",");
+            ListView lv = getListView();
+            for (String selectedCategory : catsArray) {
+                if (mCategoryNames.keySet().contains(selectedCategory)) {
+                    lv.setItemChecked(mCategoryNames.get(selectedCategory), true);
+                }
             }
+        }
+    }
 
-            ArrayAdapter<CharSequence> categories = new ArrayAdapter<CharSequence>(this, R.layout.categories_row, formattedTextArray);
-
-            this.setListAdapter(categories);
-
-            if (checkedCategories != null) {
-                ListView lv = getListView();
-                for (int i = 0; i < checkedCategories.length; i++) {
-
-                    lv.setItemChecked((int) checkedCategories[i], true);
-
-                }
+    private void categoryTreePreorderTraversal(CategoryNode node,
+                                       ArrayList<CategoryArrayAdapter.CategoryLevel> mCategoryLevels) {
+        categoryTreePreorderTraversal(node, 0, mCategoryLevels);
+    }
 
-            } else if (categoriesCSV != null) {
-                String catsArray[] = categoriesCSV.split(",");
-                ListView lv = getListView();
-                for (int i = 0; i < loadTextArray.size(); i++) {
+    private void categoryTreePreorderTraversal(CategoryNode node, int level,
+                                       ArrayList<CategoryArrayAdapter.CategoryLevel> mCategoryLevels) {
+        if (node == null) {
+            return ;
+        }
+        if (node.category != null ) {
+            mCategoryLevels.add(new CategoryArrayAdapter.CategoryLevel(node.category, level));
+        }
+        for (CategoryNode child : node.children.values()) {
+            categoryTreePreorderTraversal(child, level + 1, mCategoryLevels);
+        }
+    }
 
-                    for (int x = 0; x < catsArray.length; x++) {
-                        if (catsArray[x].equals(loadTextArray.get(i).toString())) {
-                            lv.setItemChecked(i, true);
-                        }
-                    }
+    private void createCategoryTreeFromDB() {
+        List<String> stringCategories = WordPress.wpDB.loadCategories(blog.getId());
+
+        // First pass instantiate Category and CategoryNode objects
+        SparseArray<CategoryNode> categoryMap = new SparseArray<CategoryNode>();
+        mCategories = new CategoryNode(null);
+        CategoryNode currentRootNode;
+        for (String name : stringCategories) {
+            int categoryId = WordPress.wpDB.getCategoryId(blog.getId(), name);
+            int parentId = WordPress.wpDB.getCategoryParentId(blog.getId(), name);
+            Category newCategory = new Category(categoryId, parentId, name);
+            CategoryNode node = new CategoryNode(newCategory);
+            categoryMap.put(newCategory.getCategoryId(), node);
+        }
 
-                }
+        // Second pass associate nodes to form a tree
+        for(int i = 0; i < categoryMap.size(); i++){
+            Category category = categoryMap.valueAt(i).category;
+            if (category.getParentId() == 0) { // root node
+                currentRootNode = mCategories;
+            } else {
+                currentRootNode = categoryMap.get(category.getParentId());
             }
+            currentRootNode.children.put(category.getName(), categoryMap.get(category.getCategoryId()));
+        }
+
+        if (stringCategories.size() > 0) {
+            populateCategoryList();
         } else {
             refreshCategories();
         }
@@ -127,7 +164,7 @@ public void run() {
                     pd.dismiss();
                 }
 
-                loadCategories();
+                createCategoryTreeFromDB();
 
                 Toast.makeText(SelectCategoriesActivity.this, getResources().getText(R.string.adding_cat_success), Toast.LENGTH_SHORT).show();
             }
@@ -152,7 +189,7 @@ public void onClick(DialogInterface dialog, int whichButton) {
                 if (pd.isShowing()) {
                     pd.dismiss();
                 }
-                loadCategories();
+                createCategoryTreeFromDB();
                 Toast.makeText(SelectCategoriesActivity.this, getResources().getText(R.string.categories_refreshed), Toast.LENGTH_SHORT).show();
             } else if (finalResult.equals("FAIL")) {
                 if (pd.isShowing()) {
@@ -175,14 +212,14 @@ public void onClick(DialogInterface dialog, int whichButton) {
         }
     };
 
-    public String getCategories() {
-        // gets the categories via xmlrpc call to wp blog
-        String returnMessage = "";
-
+    /**
+     * Gets the categories via a xmlrpc call
+     * @return result message
+     */
+    public String fetchCategories() {
+        String returnMessage;
         Object result[] = null;
-
         Object[] params = { blog.getBlogId(), blog.getUsername(), blog.getPassword(), };
-
         client = new XMLRPCClient(blog.getUrl(), blog.getHttpuser(), blog.getHttppassword());
 
         boolean success = false;
@@ -195,30 +232,22 @@ public String getCategories() {
         }
 
         if (success) {
-            int size = result.length;
-
             // wipe out the categories table
-            WordPress.wpDB.clearCategories(id);
-
-            for (int i = 0; i < size; i++) {
-                Map<?, ?> curHash = (Map<?, ?>) result[i];
+            WordPress.wpDB.clearCategories(blog.getId());
 
+            for (Object aResult : result) {
+                Map<?, ?> curHash = (Map<?, ?>) aResult;
                 String categoryName = curHash.get("categoryName").toString();
                 String categoryID = curHash.get("categoryId").toString();
-
+                String categoryParentID = curHash.get("parentId").toString();
                 int convertedCategoryID = Integer.parseInt(categoryID);
-
-                WordPress.wpDB.insertCategory(id, convertedCategoryID, categoryName);
-
-                // populate the spinner with the category names
-                textArray.add(categoryName);
+                int convertedCategoryParentID = Integer.parseInt(categoryParentID);
+                WordPress.wpDB.insertCategory(blog.getId(), convertedCategoryID, convertedCategoryParentID, categoryName);
             }
-
             returnMessage = "gotCategories";
         } else {
             returnMessage = "FAIL";
         }
-
         return returnMessage;
     }
 
@@ -276,10 +305,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
             final Bundle extras = data.getExtras();
 
             switch (requestCode) {
-            case 0:
-
-                // Add category
-
+            case 0: // Add category
                 // Does the user want to continue, or did he press "dismiss"?
                 if (extras.getString("continue").equals("TRUE")) {
                     // Get name, slug and desc from Intent
@@ -288,19 +314,14 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                     final String category_desc = extras.getString("category_desc");
                     final int parent_id = extras.getInt("parent_id");
 
-                    if (loadTextArray.contains(category_name)) {
-                        // A category with the specified name already exists
-                    } else {
-                        // Add the category
-                        pd = ProgressDialog.show(SelectCategoriesActivity.this, getResources().getText(R.string.cat_adding_category),
+                    // Check if the category name already exists
+                    if (!mCategoryNames.keySet().contains(category_name)) {
+                        pd = ProgressDialog.show(SelectCategoriesActivity.this,
+                                getResources().getText(R.string.cat_adding_category),
                                 getResources().getText(R.string.cat_attempt_add_category), true, true);
                         Thread th = new Thread() {
                             public void run() {
                                 finalResult = addCategory(category_name, category_slug, category_desc, parent_id);
-
-                                if (finalResult.equals("addCategory_success"))
-                                    loadTextArray.add(category_name);
-
                                 mHandler.post(mUpdateResults);
                             }
                         };
@@ -328,7 +349,7 @@ public boolean onOptionsItemSelected(final MenuItem item) {
             return true;
         } else if (itemId == R.id.menu_new_category) {
             Bundle bundle = new Bundle();
-            bundle.putInt("id", id);
+            bundle.putInt("id", blog.getId());
             Intent i = new Intent(SelectCategoriesActivity.this, AddCategoryActivity.class);
             i.putExtras(bundle);
             startActivityForResult(i, 0);
@@ -346,10 +367,8 @@ private void refreshCategories() {
                 getResources().getText(R.string.attempting_categories_refresh), true, true);
         Thread th = new Thread() {
             public void run() {
-                finalResult = getCategories();
-
+                finalResult = fetchCategories();
                 mHandler.post(mUpdateResults);
-
             }
         };
         th.start();
@@ -371,21 +390,14 @@ private void saveAndFinish() {
         String selectedCategories = "";
 
         SparseBooleanArray selectedItems = lv.getCheckedItemPositions();
-        List<Integer> rCheckedItems = new Vector<Integer>();
 
         for (int i = 0; i < selectedItems.size(); i++) {
             if (selectedItems.get(selectedItems.keyAt(i)) == true) {
-                rCheckedItems.add(selectedItems.keyAt(i));
-                selectedCategories += loadTextArray.get(selectedItems.keyAt(i)).toString() + ",";
+                String categoryName = mCategoryLevels.get(selectedItems.keyAt(i)).getCategory().getName();
+                selectedCategories += categoryName + ",";
             }
         }
 
-        long finalCheckedItems[] = new long[rCheckedItems.size()];
-
-        for (int x = 0; x < rCheckedItems.size(); x++) {
-            finalCheckedItems[x] = Long.parseLong(rCheckedItems.get(x).toString());
-        }
-
         Bundle bundle = new Bundle();
         selectedCategories = selectedCategories.trim();
         if (selectedCategories.endsWith(",")) {
@@ -393,11 +405,9 @@ private void saveAndFinish() {
         }
 
         bundle.putString("selectedCategories", selectedCategories);
-        bundle.putLongArray("checkedItems", finalCheckedItems);
         Intent mIntent = new Intent();
         mIntent.putExtras(bundle);
         setResult(RESULT_OK, mIntent);
         finish();
     }
-
 }
diff --git a/src/org/wordpress/android/util/CheckedLinearLayout.java b/src/org/wordpress/android/util/CheckedLinearLayout.java
new file mode 100644
index 000000000000..eaa21f37fab8
--- /dev/null
+++ b/src/org/wordpress/android/util/CheckedLinearLayout.java
@@ -0,0 +1,47 @@
+package org.wordpress.android.util;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.Checkable;
+import android.widget.CheckedTextView;
+import android.widget.LinearLayout;
+
+public class CheckedLinearLayout extends LinearLayout implements Checkable {
+    private CheckedTextView mCheckbox;
+
+    public CheckedLinearLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        int childCount = getChildCount();
+        for (int i = 0; i < childCount; ++i) {
+            View v = getChildAt(i);
+            if (v instanceof CheckedTextView) {
+                mCheckbox = (CheckedTextView)v;
+            }
+        }
+    }
+
+    @Override
+    public boolean isChecked() {
+        return mCheckbox != null ? mCheckbox.isChecked() : false;
+    }
+
+    @Override
+    public void setChecked(boolean checked) {
+        if (mCheckbox != null) {
+            mCheckbox.setChecked(checked);
+        }
+    }
+
+    @Override
+    public void toggle() {
+        if (mCheckbox != null) {
+            mCheckbox.toggle();
+        }
+    }
+}
\ No newline at end of file

From 59aedeeecb2daf05762541cfcd5af31c657c7f33 Mon Sep 17 00:00:00 2001
From: Maxime Biais <maxime.biais@gmail.com>
Date: Thu, 25 Jul 2013 16:47:07 +0200
Subject: [PATCH 05/13] Display category hierarchy in "parent" spinner of
 "AddCategory" view

- also merge Category / CategoryNode / CategoryLevel into on CategoryNode class
---
 .../wordpress/android/models/Category.java    |  37 ------
 .../android/models/CategoryNode.java          | 108 ++++++++++++++++++
 .../android/ui/posts/AddCategoryActivity.java |  19 +--
 .../ui/posts/CategoryArrayAdapter.java        |  35 +-----
 .../ui/posts/SelectCategoriesActivity.java    |  81 ++-----------
 5 files changed, 136 insertions(+), 144 deletions(-)
 delete mode 100644 src/org/wordpress/android/models/Category.java
 create mode 100644 src/org/wordpress/android/models/CategoryNode.java

diff --git a/src/org/wordpress/android/models/Category.java b/src/org/wordpress/android/models/Category.java
deleted file mode 100644
index 6202a111ad41..000000000000
--- a/src/org/wordpress/android/models/Category.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.wordpress.android.models;
-
-public class Category {
-    private int categoryId;
-    private int parentId;
-    private String name;
-
-    public Category(int categoryId, int parentId, String name) {
-        this.categoryId = categoryId;
-        this.parentId = parentId;
-        this.name = name;
-    }
-
-    public int getCategoryId() {
-        return categoryId;
-    }
-
-    public void setCategoryId(int categoryId) {
-        this.categoryId = categoryId;
-    }
-
-    public int getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(int parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}
\ No newline at end of file
diff --git a/src/org/wordpress/android/models/CategoryNode.java b/src/org/wordpress/android/models/CategoryNode.java
new file mode 100644
index 000000000000..700fb4a5b2b2
--- /dev/null
+++ b/src/org/wordpress/android/models/CategoryNode.java
@@ -0,0 +1,108 @@
+package org.wordpress.android.models;
+
+
+import android.util.SparseArray;
+import org.wordpress.android.WordPress;
+import org.wordpress.android.ui.posts.CategoryArrayAdapter;
+
+import java.util.*;
+
+public class CategoryNode {
+    private int categoryId;
+    private String name;
+    private int parentId;
+    private int level;
+    SortedMap<String, CategoryNode> children = new TreeMap<String, CategoryNode>(new Comparator<String>() {
+        @Override
+        public int compare(String s, String s2) {
+            return s.compareToIgnoreCase(s2);
+        }
+    });
+
+    public SortedMap<String, CategoryNode> getChildren() {
+        return children;
+    }
+
+    public void setChildren(SortedMap<String, CategoryNode> children) {
+        this.children = children;
+    }
+
+    public CategoryNode(int categoryId, int parentId, String name) {
+        this.categoryId = categoryId;
+        this.parentId = parentId;
+        this.name = name;
+    }
+
+    public int getCategoryId() {
+        return categoryId;
+    }
+
+    public void setCategoryId(int categoryId) {
+        this.categoryId = categoryId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(int parentId) {
+        this.parentId = parentId;
+    }
+
+    public int getLevel() {
+        return level;
+    }
+
+    public static CategoryNode createCategoryTreeFromDB(int blogId) {
+        List<String> stringCategories = WordPress.wpDB.loadCategories(blogId);
+        // First pass instantiate Category and CategoryNode objects
+        SparseArray<CategoryNode> categoryMap = new SparseArray<CategoryNode>();
+        CategoryNode rootCategory = new CategoryNode(-1, -1, "");
+        CategoryNode currentRootNode;
+        for (String name : stringCategories) {
+            int categoryId = WordPress.wpDB.getCategoryId(blogId, name);
+            int parentId = WordPress.wpDB.getCategoryParentId(blogId, name);
+            CategoryNode node = new CategoryNode(categoryId, parentId, name);
+            categoryMap.put(categoryId, node);
+        }
+
+        // Second pass associate nodes to form a tree
+        for(int i = 0; i < categoryMap.size(); i++){
+            CategoryNode category = categoryMap.valueAt(i);
+            if (category.getParentId() == 0) { // root node
+                currentRootNode = rootCategory;
+            } else {
+                currentRootNode = categoryMap.get(category.getParentId());
+            }
+            currentRootNode.children.put(category.getName(), categoryMap.get(category.getCategoryId()));
+        }
+        return rootCategory;
+    }
+
+    private static void preOrderTreeTraversal(CategoryNode node, int level, ArrayList<CategoryNode> returnValue) {
+        if (node == null) {
+            return ;
+        }
+        if (node.parentId != -1) {
+            node.level = level;
+            returnValue.add(node);
+        }
+        for (CategoryNode child : node.getChildren().values()) {
+            preOrderTreeTraversal(child, level + 1, returnValue);
+        }
+    }
+
+    public static ArrayList<CategoryNode> getSortedListOfCategoriesFromRoot(CategoryNode node) {
+        ArrayList<CategoryNode> sortedCategories = new ArrayList<CategoryNode>();
+        preOrderTreeTraversal(node, 0, sortedCategories);
+        return sortedCategories;
+    }
+}
\ No newline at end of file
diff --git a/src/org/wordpress/android/ui/posts/AddCategoryActivity.java b/src/org/wordpress/android/ui/posts/AddCategoryActivity.java
index 678269311ecc..a84148ee235e 100644
--- a/src/org/wordpress/android/ui/posts/AddCategoryActivity.java
+++ b/src/org/wordpress/android/ui/posts/AddCategoryActivity.java
@@ -17,6 +17,7 @@
 
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
+import org.wordpress.android.models.CategoryNode;
 
 public class AddCategoryActivity extends Activity {
     private int id;
@@ -100,17 +101,22 @@ public void onClick(View v) {
                  finish();
             }
         });
-
     }
 
     private void loadCategories() {
         ArrayList<CharSequence> loadTextArray = new ArrayList<CharSequence>();
-        loadTextArray.clear();
-        List<?> categoriesVector = WordPress.wpDB.loadCategories(id);
-        if (categoriesVector.size() > 0) {
+        CategoryNode rootCategory = CategoryNode.createCategoryTreeFromDB(id);
+        ArrayList<CategoryNode> categoryLevels = CategoryNode.getSortedListOfCategoriesFromRoot(rootCategory);
+        if (categoryLevels.size() > 0) {
             loadTextArray.add(getResources().getText(R.string.none));
-            for(int i=0; i < categoriesVector.size(); i++) {
-                loadTextArray.add(categoriesVector.get(i).toString());
+            for (int i = 0; i < categoryLevels.size(); i++) {
+                CategoryNode currentCategory = categoryLevels.get(i);
+                String name = "";
+                for (int j = 1; j < currentCategory.getLevel(); j++) {
+                    name += "  ";
+                }
+                name += currentCategory.getName();
+                loadTextArray.add(name);
             }
             ArrayAdapter<CharSequence> categories = new ArrayAdapter<CharSequence>(this,
                     android.R.layout.simple_dropdown_item_1line, loadTextArray);
@@ -118,7 +124,6 @@ private void loadCategories() {
             Spinner sCategories = (Spinner) findViewById(R.id.parent_category);
             sCategories.setAdapter(categories);
         }
-
     }
 
     @Override
diff --git a/src/org/wordpress/android/ui/posts/CategoryArrayAdapter.java b/src/org/wordpress/android/ui/posts/CategoryArrayAdapter.java
index b02e71f5f2f2..817702cc5190 100644
--- a/src/org/wordpress/android/ui/posts/CategoryArrayAdapter.java
+++ b/src/org/wordpress/android/ui/posts/CategoryArrayAdapter.java
@@ -8,40 +8,14 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 import org.wordpress.android.R;
-import org.wordpress.android.models.Category;
+import org.wordpress.android.models.CategoryNode;
 import org.wordpress.android.util.EscapeUtils;
 
 import java.util.List;
 
-public class CategoryArrayAdapter extends ArrayAdapter<CategoryArrayAdapter.CategoryLevel> {
-    // Intermediate structure to populate the ListView
-    public static class CategoryLevel {
-        private Category category;
-        private int level;
+public class CategoryArrayAdapter extends ArrayAdapter<CategoryNode> {
 
-        public CategoryLevel(Category category, int level) {
-            this.category = category;
-            this.level = level;
-        }
-
-        public Category getCategory() {
-            return category;
-        }
-
-        public void setCategory(Category category) {
-            this.category = category;
-        }
-
-        public int getLevel() {
-            return level;
-        }
-
-        public void setLevel(int level) {
-            this.level = level;
-        }
-    }
-
-    public CategoryArrayAdapter(Context context, int resource, List<CategoryArrayAdapter.CategoryLevel> objects) {
+    public CategoryArrayAdapter(Context context, int resource, List<CategoryNode> objects) {
         super(context, resource, objects);
     }
 
@@ -51,7 +25,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
         View rowView = inflater.inflate(R.layout.categories_row, parent, false);
         TextView textView = (TextView) rowView.findViewById(R.id.categoryRowText);
         ImageView levelIndicatorView = (ImageView) rowView.findViewById(R.id.categoryRowLevelIndicator);
-        textView.setText(EscapeUtils.escapeHtml(getItem(position).getCategory().getName()));
+        textView.setText(EscapeUtils.escapeHtml(getItem(position).getName()));
         int level = getItem(position).getLevel();
         if (level == 1) { // hide ImageView
             levelIndicatorView.setVisibility(View.GONE);
@@ -62,5 +36,4 @@ public View getView(int position, View convertView, ViewGroup parent) {
         }
         return rowView;
     }
-
 }
diff --git a/src/org/wordpress/android/ui/posts/SelectCategoriesActivity.java b/src/org/wordpress/android/ui/posts/SelectCategoriesActivity.java
index fe3b5c310bec..258b5a2b9a3f 100644
--- a/src/org/wordpress/android/ui/posts/SelectCategoriesActivity.java
+++ b/src/org/wordpress/android/ui/posts/SelectCategoriesActivity.java
@@ -9,7 +9,6 @@
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.os.Handler;
-import android.util.SparseArray;
 import android.util.SparseBooleanArray;
 import android.widget.ListView;
 import android.widget.Toast;
@@ -20,7 +19,7 @@
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 
-import org.wordpress.android.models.Category;
+import org.wordpress.android.models.CategoryNode;
 import org.xmlrpc.android.XMLRPCClient;
 import org.xmlrpc.android.XMLRPCException;
 
@@ -37,25 +36,10 @@ public class SelectCategoriesActivity extends SherlockListActivity {
     private final Handler mHandler = new Handler();
     private Blog blog;
     private ListView lv;
-    private CategoryNode mCategories = new CategoryNode(null);
-    private ArrayList<CategoryArrayAdapter.CategoryLevel> mCategoryLevels;
+    private CategoryNode mCategories;
+    private ArrayList<CategoryNode> mCategoryLevels;
     private Map<String, Integer> mCategoryNames = new HashMap<String, Integer>();
 
-    // Class to efficiently construct an ordered category tree
-    private class CategoryNode {
-        SortedMap<String, CategoryNode> children = new TreeMap<String, CategoryNode>(new Comparator<String>() {
-            @Override
-            public int compare(String s, String s2) {
-                return s.compareToIgnoreCase(s2);
-            }
-        });
-        Category category;
-
-        public CategoryNode(Category category) {
-            this.category = category;
-        }
-    }
-
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -83,14 +67,13 @@ public void onCreate(Bundle icicle) {
             categoriesCSV = extras.getString("categoriesCSV");
         }
 
-        createCategoryTreeFromDB();
+        populateOrFetchCategories();
     }
 
     private void populateCategoryList() {
-        mCategoryLevels = new ArrayList<CategoryArrayAdapter.CategoryLevel>();
-        categoryTreePreorderTraversal(mCategories, mCategoryLevels);
+        mCategoryLevels = CategoryNode.getSortedListOfCategoriesFromRoot(mCategories);
         for (int i = 0; i < mCategoryLevels.size(); i++) {
-            mCategoryNames.put(mCategoryLevels.get(i).getCategory().getName(), i);
+            mCategoryNames.put(mCategoryLevels.get(i).getName(), i);
         }
 
         CategoryArrayAdapter categoryAdapter = new CategoryArrayAdapter(this, R.layout.categories_row, mCategoryLevels);
@@ -106,51 +89,11 @@ private void populateCategoryList() {
         }
     }
 
-    private void categoryTreePreorderTraversal(CategoryNode node,
-                                       ArrayList<CategoryArrayAdapter.CategoryLevel> mCategoryLevels) {
-        categoryTreePreorderTraversal(node, 0, mCategoryLevels);
-    }
 
-    private void categoryTreePreorderTraversal(CategoryNode node, int level,
-                                       ArrayList<CategoryArrayAdapter.CategoryLevel> mCategoryLevels) {
-        if (node == null) {
-            return ;
-        }
-        if (node.category != null ) {
-            mCategoryLevels.add(new CategoryArrayAdapter.CategoryLevel(node.category, level));
-        }
-        for (CategoryNode child : node.children.values()) {
-            categoryTreePreorderTraversal(child, level + 1, mCategoryLevels);
-        }
-    }
-
-    private void createCategoryTreeFromDB() {
-        List<String> stringCategories = WordPress.wpDB.loadCategories(blog.getId());
-
-        // First pass instantiate Category and CategoryNode objects
-        SparseArray<CategoryNode> categoryMap = new SparseArray<CategoryNode>();
-        mCategories = new CategoryNode(null);
-        CategoryNode currentRootNode;
-        for (String name : stringCategories) {
-            int categoryId = WordPress.wpDB.getCategoryId(blog.getId(), name);
-            int parentId = WordPress.wpDB.getCategoryParentId(blog.getId(), name);
-            Category newCategory = new Category(categoryId, parentId, name);
-            CategoryNode node = new CategoryNode(newCategory);
-            categoryMap.put(newCategory.getCategoryId(), node);
-        }
-
-        // Second pass associate nodes to form a tree
-        for(int i = 0; i < categoryMap.size(); i++){
-            Category category = categoryMap.valueAt(i).category;
-            if (category.getParentId() == 0) { // root node
-                currentRootNode = mCategories;
-            } else {
-                currentRootNode = categoryMap.get(category.getParentId());
-            }
-            currentRootNode.children.put(category.getName(), categoryMap.get(category.getCategoryId()));
-        }
+    private void populateOrFetchCategories() {
+        mCategories = CategoryNode.createCategoryTreeFromDB(blog.getId());
 
-        if (stringCategories.size() > 0) {
+        if (mCategories.getChildren().size() > 0) {
             populateCategoryList();
         } else {
             refreshCategories();
@@ -164,7 +107,7 @@ public void run() {
                     pd.dismiss();
                 }
 
-                createCategoryTreeFromDB();
+                populateOrFetchCategories();
 
                 Toast.makeText(SelectCategoriesActivity.this, getResources().getText(R.string.adding_cat_success), Toast.LENGTH_SHORT).show();
             }
@@ -189,7 +132,7 @@ public void onClick(DialogInterface dialog, int whichButton) {
                 if (pd.isShowing()) {
                     pd.dismiss();
                 }
-                createCategoryTreeFromDB();
+                populateOrFetchCategories();
                 Toast.makeText(SelectCategoriesActivity.this, getResources().getText(R.string.categories_refreshed), Toast.LENGTH_SHORT).show();
             } else if (finalResult.equals("FAIL")) {
                 if (pd.isShowing()) {
@@ -393,7 +336,7 @@ private void saveAndFinish() {
 
         for (int i = 0; i < selectedItems.size(); i++) {
             if (selectedItems.get(selectedItems.keyAt(i)) == true) {
-                String categoryName = mCategoryLevels.get(selectedItems.keyAt(i)).getCategory().getName();
+                String categoryName = mCategoryLevels.get(selectedItems.keyAt(i)).getName();
                 selectedCategories += categoryName + ",";
             }
         }

From e89070ef0d4f8bd3c0cb6c3c2c2f0c7162f67052 Mon Sep 17 00:00:00 2001
From: Maxime Biais <maxime.biais@gmail.com>
Date: Thu, 25 Jul 2013 18:55:47 +0200
Subject: [PATCH 06/13] New icons on delete and select category buttons

---
 res/drawable-hdpi/ic_content_new.png     | Bin 0 -> 1157 bytes
 res/drawable-hdpi/ic_content_remove.png  | Bin 0 -> 1299 bytes
 res/drawable-mdpi/ic_content_new.png     | Bin 0 -> 1099 bytes
 res/drawable-mdpi/ic_content_remove.png  | Bin 0 -> 1316 bytes
 res/drawable-xhdpi/ic_content_new.png    | Bin 0 -> 1225 bytes
 res/drawable-xhdpi/ic_content_remove.png | Bin 0 -> 1716 bytes
 res/layout/category_button.xml           |   2 +-
 res/layout/category_select_button.xml    |   2 +-
 8 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100755 res/drawable-hdpi/ic_content_new.png
 create mode 100755 res/drawable-hdpi/ic_content_remove.png
 create mode 100755 res/drawable-mdpi/ic_content_new.png
 create mode 100644 res/drawable-mdpi/ic_content_remove.png
 create mode 100755 res/drawable-xhdpi/ic_content_new.png
 create mode 100644 res/drawable-xhdpi/ic_content_remove.png

diff --git a/res/drawable-hdpi/ic_content_new.png b/res/drawable-hdpi/ic_content_new.png
new file mode 100755
index 0000000000000000000000000000000000000000..5741995cbed712bc049ffb199ebb8728cb25919a
GIT binary patch
literal 1157
zcmaJ=TWHfz7>*N%%qyr&9ZHCb7i@CUHQgFpb!}D~G^2Kv?LpBjIa|Zb#pKLpdl3Z{
zK|uu{ydYEYvIj4qpdwxn*_fygMMT9HhoHmDgn31#o^<Q<!5YZ9{CwZ{U(cRo-Kt4t
zv&#sAm?S2I6yAaNk1xe*L&^8uc$<Z48&SR4jIy!~i5k^xf~2U+EieUTwS7x33=_oI
z`C7UWHA-uE#nfrp!_cm7VKza8SGbm}v_eES!4}PkPy;t^Q>3Ows0K~~k`;p)Ezx1a
z`i{D^($T7fRBFX?GVJnLK!->sU466R@NR_4>+<;QnHh@ALr`mk8V;&aN|G_th9pM=
zp8|p`84S>D0E7aerKBIQfMNX%sPeIZ=c;(Xk|Q65z1eCrpAzCDzVIzVWe~D>hRJ5L
zbheT<?G}a&g+dJQGk(7hBYaM~fn?WbIP(e$0(2Bxvyf&Qq^Br1nQbUS;Yf#5(5+Ef
z!x<?PE*Rs=7Q@oOOQ`^qr2j*8eH87W6#NtKKZTuiy9JpPbj&te!HsL4=ee@@m<?rQ
z+G*3=T&Q9)V<OYZm=+nU=V+FcWJNPPOP(P~yl6N`HWVld5ejS2nx^s`2>1oAx{8Ye
zfn{siP=F292BNW=ILB56qHKXHm`a-t4OHN&f4J2}x!y477WOPaTiXiNxNYiWK51Sn
z9t&4gZ-lEBk0n@?%iv%bueE=*x?sZd;~hr_7hgt49~yYxZ9Leg2ex_7;;Sgsq}}K5
z4ohWs!PK48x+YwFd3RrQZEo3{J)b8(JkwcGeslZVzA5(>KcJ3IKd2pgQ{jH>-2dv7
z_+wY*^|AZco0klh5X8?po#P{*JJCanGkzR-oG88gq<hTX<m%k^A*pQYP-*;JdDme0
zQT`ncFDv8n2Qhd2SM|!?1J#^(Au;7kYi|9e?%?#E-NcedgB$wp4fPGoy%XGWY+V1$
zl5hQ$NoV1LXVHo;ExC2qcAgwFTduga@cq+`iL)<mMTbtb9q-xpmppk2G+34X{&0QC
pl^0^yi7?~aceKL;Y&?IJ7)wl?yJ+Ckg!zhR5o_y&3(-wGegovBf589%

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/ic_content_remove.png b/res/drawable-hdpi/ic_content_remove.png
new file mode 100755
index 0000000000000000000000000000000000000000..656439a31477c629306338209465502e2ab74c7d
GIT binary patch
literal 1299
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%o&*>5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tteb3LXsBRjre|nk
zYG!7rqhMrUXryldL}t2%CRV0qRz~IuP@n{~ttchUD#*nRY8Q}atCUevQedU8UtV6W
zS8lAAUzDzIXlZE)GQ-G77pOwFxH7LKu|hYmSQ%!5OKNd)QD#9&W`3Rm$i&2?{L&Iz
zC7??oUdS!*^@SUpR}2j(V36roBo^o!>KW+g=7RhMR$W{Yl!|Z$R@KEJl?AE#L8-<0
zrA5iW_()TRX$FQJev3c~fv&OgFUkZ)N@9*nesXDUYF>$_i>(q+MlU5Z#mddx+|AI?
z+{D1#$iU3P(9pub!r0Z!(bUAq&C%T1#0+KzHoZnhMotzM=8mo|X0C>Yu0~D<E(Vsa
z<`xD<jxJ6nj?OT>o_WP3iFwJXFncqB_Cobq;?-;AT$Gwvl3x^(pPvIu0Rb8LCHch}
z`2`Bj!Db2?zKO}1c_0BzPy|8z>ylcOS(cjOR+OKs01jcROe`*NvmoSih~5-(LQNm&
z7=2LkKuRt!Az&H=G2w|H$bn~{)I4CGDFS8=vF>@R85kHHJzX3_DsH`*>B!aOAkyZ0
z%Prvnr&89%bD`-kcpSw&UMM)mD!ky4I~>ccYSnnbL4AYzpGIzF^|@{j<$p-Z*8HkB
z`h2gW+2;IQJM-%=E0q}-IUE?61R5Av6dd|*Z}2P-U@3liZPDfz3nlFYb6o>vj;|DD
zm=WLUwrH`()t=8T))$4IuUxBHA{gt+9mtVfdZxW&=Oejm*Bsi+=U-{jnC&kx`)1sc
zRcbC%E3Zz~`NDgs<L9=^8KOrdjFR^C>U`l`WMJd`{=tsY&&#+X6F)E<4%Rq0BkOnK
z9j}@bX4PkYT5mZp<9caB(YBq5=j0351ix9s5VG`?`VtVM=Je-NA}zn!Kf5W;V)`-5
zbrsj4?VKA9PK#LXF;#Kej`poyG7Igq#a2GLb@_Mmvd%`v`U0@O;9lInZ8`%p1IL7f
U?_X@+egPFzp00i_>zopr0EY&;)&Kwi

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_content_new.png b/res/drawable-mdpi/ic_content_new.png
new file mode 100755
index 0000000000000000000000000000000000000000..884c9d2703775305168d0e36579816ca95140fc1
GIT binary patch
literal 1099
zcmaJ=O-K|`9G|svOH%r{RAfEJ4j$V1*mji}-E?<nS63R*b*a4s&dxmD$!6X(^K8dG
z6s3Vhhe$)CqU>5kkOdXd7X@{whzN=f8FYytf-ZqzZ_Kq0Z3A!Kdw>4F-~a3Pj(2yp
zS66MSqA035)gh(H4!pIplKh=w@dw#9;zSnrqJCUZY)C~ll!G8;C<8DJ6>a#yGuT2=
z%eLv6EY8ZiL=_o~;`uPHVG%S%wY0jHq7Fg~a&SO5BlNes_i3PO5qeKp=42}l^Lj_o
zhP}nEj9MI21&waq30ho{5Eu|Ez%}-pj_5|{1zwSyJu^##1s6ORp?@cpmAgS4*${*o
zE}(LaJZKCte25c5!gdhkc#h?REY}p^IWgQMay(f4XcEoV`o*-AT#Q9-5ju~tC9-Ux
zP+$r>7-SEyydVfH7i5FM0PzSo!zNbTfa%ni7$oSZwr*h^nZRRIa%c!gXp-sg5)5mJ
z)^rxzL>k7ripBB_=ap1)l;!`s8pe{hgVXR&zW*e4GQ$>R)6hXfwn_%qU+;yo#JCL=
zjO+|T`%7Ky&LfPRJhDK%H_Y%rR#e^eEDH!(7E`8!6;p*NDMAwtM%Ohl%*EnKAr=b9
zIEm*Iyb$7rL?{-ICc}JFD8`qt5>kf@XyOu9`-2Ua#d=~eED~9Qwtf(5NgEkpp=ePr
zpG&YT-y&8kpUaN2Se7KidZYbo)Fl(qk9S-WF1aj8ADTq(HWBvjt5qk+qqvunq8ayn
zZf<_Q^>JIp(;ok7(LXgcwdTrX?b!JA*V}D#;~V6G7w4n1H@ZK%{orjpH@+g<u=?S}
ziKK7+V``+we^Tu0X#U97G(P!E`Dgm-GD+u1XS(6s<k+LJwO?Ls9o>9td0_U?It4UO
z>}?+%iSA>4-)Ev{Dz6`V(6a9GrJCnv#U~^seNq1$s9XDJ^Ut#%ibqa2^gVsJB`}t(
w<-SmNZmoLff9*Rw4Vx1;XY()fZ+w)mlDaV06z>c?YxACWD$ylfi}fA-1s(`wsQ>@~

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_content_remove.png b/res/drawable-mdpi/ic_content_remove.png
new file mode 100644
index 0000000000000000000000000000000000000000..9de7acc8fd51eaebbd1791ecbd308b39a746d061
GIT binary patch
literal 1316
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%o&*>5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tteb3LXsBRjre|nk
zYG!7rqhMrUXryldL}t2%CRV0qRz~IuP@n{~ttchUD#*nRY8Q}atCUevQedU8UtV6W
zS8lAAUzDzIXlZE)GQ-G77pOwFxH7LKu|hYmSQ%!5OKNd)QD#9&W`3Rm$i&2?{L&Iz
zC7??oUdS!*^@SUpR}2j(V36roBo^o!>KW+g=7RhMR$W{Yl!|Z$R@KEJl?AE#L8-<0
zrA5iW_()TRX$FQJev3c~fv&OgFUkZ)N@9*nesXDUYF>$_i>(q+MlU5Z#mddx+|AI?
z+{D1#$iU3P(9pub!r0Z!(bUAq&C%T1#0+KzHoZnpmLRoGt}bRkGhB_F3|tH>UCk{F
zj2vB@OdOqIdOh=sOA_;vQ(^XI0_}zBb;PUJ%DE^tu_V7JBtJg~mI4AY@=NlIGx7@*
zoP*62G<*}2GxI<KnxF`R_}3-1D6=dz#jPkmR{<QtR+(5_;ATO{=McRq<b;|&&@uX;
z<bjl2U_!t&2x7t$Kac~@KB;-YJW~YB9E&2_b}%q726?(ThE&{2`t$$4{b2_twKhh!
z#e5Q_2Uak<$sTZ8b4b;D+KKsArCyDbCx2F8Tv~H~U#+pfx3~48)vJHc&EjK-+*kGW
zm5iO8U7bR?Fkfnn!<^qAAG=q|%g^r)DP_3uyxn2i=TD!GG3;Exm14Y0NI{Pw$u;5c
zrK5)qed<~j$gs6UcuF5@lG~CA51OLZ@f?wLsG0pLlYuj*EsBq;)81i^e8=Y#8|TEZ
z8#vVRZMwtXA-mw&7Uqw#RcVK99sY23Y;F7@V>vDO5ktTnap&57G97alEOgvm#NeG3
z?#A`a|AI-QZh62}#uqF9@&(O0FwJ_!D+Wh}b4*F9GAm`LSubjwA^ECfe@O9x@9*#X
zI;hHQm~e3VRflOt%vX2*{rC4b%Y?skChY7vvaL%$e&3m&Z*CgLDS25Ov#<Z>At5ET
wPefSwx4S8O&o*{9S%X&%f$SH!7+5425^iT*^;*Ls3o5rfUHx3vIVCg!0C5<@)c^nh

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_content_new.png b/res/drawable-xhdpi/ic_content_new.png
new file mode 100755
index 0000000000000000000000000000000000000000..9b48a63dad67fc8cba5cb57abe12f5ce97dc9e01
GIT binary patch
literal 1225
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+m{l@EB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%uvD1M9<K~
zz|zE0N5ROz&_LhNNZ-I**U-Sq)ZEIzPyq^*fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;Np<V
zf>iyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr4|esh**NZ(?$0
z9!LbN!`Ii!Gq1QLF)umQ)5TT^Xog;9W{Q=mfr*iesfDqrlYxt&p{t>#iJ_&diIcOV
zo2j9>iIX8ruS<S%X>Mv>2~2MaLazx<y`aR9TL84#CABECEH%ZgC_h&L>}jh^+-@<%
zX&zK>3U0R;;nb@Sbc{YIYLTKECIn1BASOKF0y*%cpPC0u??u3b?R9%*DFXwewWo_?
zNX4x;x1+h597K+N+}NV`x{&oEUzVlqt~pT-0)g+>E$2?XENNh%Aywd~eCB_1^Rwoc
z`FjdCor%g0@&jd0FsShj6p^|=+xzUSm8WB~?)x+^TeWJww2-p%%B5Gf{H&Q|mBsL*
z$7M~-9l;y3`X@Dd0`n>+_<!nf@yx24s3d3MeWhl<HsmZaP*`_7qMUVxx315ReRo%w
zzRKIjv*+K&D{fi0MHTYh)PwDK)wmcc<JU9p^?X+;H+QOEW7)aJ>-oLM-}BfpSg&k8
zbZ+|E!}s3)@p`qYK=2Ju!2ey7*mm(+wM1*3XKdb=!|mUM=?sUW&Y$ZxWJm9>YBDor
txSkv{`}_5$uO*}p$*VyXE8MkVm0&RGjTPG4(K#0+=;`X`vd$@?2>_7}l579~

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_content_remove.png b/res/drawable-xhdpi/ic_content_remove.png
new file mode 100644
index 0000000000000000000000000000000000000000..52b695f339d2c4a34a17a2633f85abc2c78fcd64
GIT binary patch
literal 1716
zcmbVLdrT8|96wPJo%n!6Cw6e0M8Qa}SK8|X3behpbfb(QQBXiid%{uMEA3&+V}hVT
zA?P9!8ILK>=%#`tYB4@=ZgYsnRq%mA6vQpnOedxp%!#@yP~9KICHv*>evkWnKi}8q
zw=*$8;X5Z_4gdhY$~Y{Eo@3pwk2n22O5{DDrzMmug<4H+q%3L^4v4j677i-)>TEm-
zS8EIMy6`9fn4Uu<r%)-Xc%g>WGu3Vk)2cVp)&LL{V>PNZI-CNt@NB{$f}Wqd2!VuF
z1g+(&SSq6w&mrOpP5A1<gk(*jP9xAlG0|X@RY())aY_wZ^_vW4p;ZKp^9t#;`xu76
zaR{XoK@&lxs1iXbX~ID+Ga_8WLJ$x|nFxoAqR1+c%|h5Pi+<2>gd^mlLN*Va91!iz
zq}?b?!sL^_=$#14p(vvehAkEg(-OfXP1!Ia5D45HY<4(}2salPD77`*U|!~7z;Lt1
zL>MW8G=OeKbrzXVi6A=Ci4^okmFgX_!8}<gx@53bZG;gf3)bu1d5xpZR1*F^j49FP
z<N_lOC*fu?-=v}Yv2mHln6BN29l3#YG{VnK1l<(%CXCeN>v036#6%GNhp8pBLOG8o
zM-U!|#bdKjK7#OB{0JE;=5p9_F;B`tJseZnve|42pU;!YFjR&hGPZ<;u>>+6pT!nq
z5{_8vu~iz(l-i)dJ$?z=@1!mEL0h5JgsUmiluVMFJPJt6At}<FLmENpY7`7rsWpVb
zeGuku&_uo%ZX!10TDghTgX0wz5>rGV=l@sc6Sms_Q#F_l26oHiUvlvr(He9w--(~z
zyt_WQfxa^)`f}W8O*sw#UPDSuoNVoTT7SRtX5xZQbKk1Nhr)09Y)Ly+_TZ)W*`dm^
z<1PE)p6n+l&p^7`>j%$~gX!D#t+yqFzKVD>cWgdm#%X24{geHI;R^I#{4Zndh_B4{
zl}f+t8pWl1!@<CeQeXk#6$|(P(?DRx`;9H{$Mhp@m$M$u^)8n%Iy0IR2QS#W>f`ra
zv76E@>yF)Cr0q`to)(|G-{B|gmJW<|Qjf!l+bV^ukQ2E3b>W3AH=a-(GsQNW-}lAQ
zqkq4ClW?N9D5+)55$f^cu#oHQ`tw*{u;`O{6&aH9KiU)nCF^F#hSl!9_S@{p4c{dj
zdYTt~J%|u>J!!SnzFQ$}E&lfFqc*!Y=p1<1<@)JFO~xaJ;s;6@8QAF5!8ILFQ}mZv
z4b%8_nL8YPTNmYCdb0-&91Q3fnbkPI_gQfUz=(RHDK-RevsA~`y<Xw8<ln6s$<)<%
zVlJ;i&^dqj*L%(VhqB*(J6q`F+5&rsTBz_az=%()5Ji?egSihKjWJtYuLKU*0u(Za
zx-LR9OOX}%d2gb3wYdfsj#M~X{nHLE58Y;MYFHXo5IAaFbv4rIm{XeSpT#dJU&?57
zDL2FgDfcH_dwJ9Qz_RA5T*ns@m8JWTL;mTN+~I@r(u%V7YFp69VYce_pSP>FuB>cg
zmNmK*@`dN6M>7)?OYY2DGyTT%m;0=~@=$B~H>l0E_61LQ^>q2407V8JXfG*G>@AO3
z-0d@yhTic?v9~+UZng!)_C1Jx)^{lvNG*DW_tG53g(E7BXurL^S2xSow)4>)a>w4d
z-PMh~kpiNq=;U&nt3A%4Twls+^NZaRlFJFGwNAeoYE7-GOZCsNsoZ@)y(%vco$Ain
zR_SfOJP>(IU**WueAGV_JfLYZulaqfWw>ChbH|>b&&a=~RM)uF?w)zEzH}PUdiSk=
SgBc3}=%JJ)V6BqOvVQ;$REhln

literal 0
HcmV?d00001

diff --git a/res/layout/category_button.xml b/res/layout/category_button.xml
index a55b77200304..5cbb5d61840d 100644
--- a/res/layout/category_button.xml
+++ b/res/layout/category_button.xml
@@ -5,4 +5,4 @@
     android:layout_width="wrap_content"
     android:layout_height="fill_parent"
     android:id="@+id/categoryButton"
-    android:drawableRight="@android:drawable/ic_delete"/>
+    android:drawableRight="@drawable/ic_content_remove" android:paddingEnd="5dp"/>
diff --git a/res/layout/category_select_button.xml b/res/layout/category_select_button.xml
index 75792bdce868..1468917d86e9 100644
--- a/res/layout/category_select_button.xml
+++ b/res/layout/category_select_button.xml
@@ -5,5 +5,5 @@
         android:layout_width="wrap_content"
         android:layout_height="fill_parent"
         android:id="@+id/selectCategories"
-        android:drawableRight="@android:drawable/ic_input_add"
+        android:drawableRight="@drawable/ic_content_new"
         android:tag="select-category"/>

From d62b134c0cc062b79bcec91b6e00d34373c21383 Mon Sep 17 00:00:00 2001
From: Maxime Biais <maxime.biais@gmail.com>
Date: Thu, 25 Jul 2013 18:56:25 +0200
Subject: [PATCH 07/13] Remove "Selected Categories:" label

---
 res/layout/edit.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/res/layout/edit.xml b/res/layout/edit.xml
index 2caf238d80a4..1097d843c654 100644
--- a/res/layout/edit.xml
+++ b/res/layout/edit.xml
@@ -64,10 +64,6 @@
             <org.wordpress.android.util.FlowLayout
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content" android:id="@+id/sectionCategories" android:paddingLeft="8dp">
-                <TextView android:id="@+id/textView"
-                          android:layout_width="wrap_content" android:layout_height="fill_parent"
-                          android:text="@string/selected_categories"
-                          android:paddingTop="10dp" />
             </org.wordpress.android.util.FlowLayout>
             <RelativeLayout
                 android:id="@+id/sectionLocation"

From 5a3bb354bbf63d05b991b5855749b916531a0dbc Mon Sep 17 00:00:00 2001
From: Maxime Biais <maxime.biais@gmail.com>
Date: Thu, 25 Jul 2013 18:56:48 +0200
Subject: [PATCH 08/13] Remove useless import

---
 src/org/wordpress/android/models/CategoryNode.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/org/wordpress/android/models/CategoryNode.java b/src/org/wordpress/android/models/CategoryNode.java
index 700fb4a5b2b2..20814cfac4ba 100644
--- a/src/org/wordpress/android/models/CategoryNode.java
+++ b/src/org/wordpress/android/models/CategoryNode.java
@@ -1,9 +1,7 @@
 package org.wordpress.android.models;
 
-
 import android.util.SparseArray;
 import org.wordpress.android.WordPress;
-import org.wordpress.android.ui.posts.CategoryArrayAdapter;
 
 import java.util.*;
 
@@ -63,7 +61,8 @@ public int getLevel() {
 
     public static CategoryNode createCategoryTreeFromDB(int blogId) {
         List<String> stringCategories = WordPress.wpDB.loadCategories(blogId);
-        // First pass instantiate Category and CategoryNode objects
+
+        // First pass instantiate CategoryNode objects
         SparseArray<CategoryNode> categoryMap = new SparseArray<CategoryNode>();
         CategoryNode rootCategory = new CategoryNode(-1, -1, "");
         CategoryNode currentRootNode;

From 72af0f8b731cb69782e99162f6fa6a29ea152308 Mon Sep 17 00:00:00 2001
From: Maxime Biais <maxime.biais@gmail.com>
Date: Fri, 26 Jul 2013 09:42:00 +0200
Subject: [PATCH 09/13] Reset _Uncategorized_ button padding

---
 src/org/wordpress/android/ui/posts/EditPostActivity.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/org/wordpress/android/ui/posts/EditPostActivity.java b/src/org/wordpress/android/ui/posts/EditPostActivity.java
index 9f50e8868ff4..ae2336f39ecb 100644
--- a/src/org/wordpress/android/ui/posts/EditPostActivity.java
+++ b/src/org/wordpress/android/ui/posts/EditPostActivity.java
@@ -1376,6 +1376,8 @@ private void populateSelectedCategories() {
             if (uncategorizedAlone) {
                 buttonCategory.setCompoundDrawables(null, null, null, null);
                 buttonCategory.setEnabled(false);
+                buttonCategory.setPadding(buttonCategory.getPaddingLeft(), buttonCategory.getPaddingTop(),
+                        buttonCategory.getPaddingLeft(), buttonCategory.getPaddingBottom());
             }
             sectionCategories.addView(buttonCategory);
         }

From 470adde5c91dbe96061a8bce33c6236a89439415 Mon Sep 17 00:00:00 2001
From: Maxime Biais <maxime.biais@gmail.com>
Date: Fri, 26 Jul 2013 17:57:06 +0200
Subject: [PATCH 10/13] make ic_level_indicator.png icon thinner

---
 res/drawable-hdpi/ic_level_indicator.png   | Bin 1263 -> 1200 bytes
 res/drawable-mdpi/ic_level_indicator.png   | Bin 1213 -> 1131 bytes
 res/drawable-xhdpi/ic_level_indicator.png  | Bin 1347 -> 1338 bytes
 res/drawable-xxhdpi/ic_level_indicator.png | Bin 1498 -> 1495 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/res/drawable-hdpi/ic_level_indicator.png b/res/drawable-hdpi/ic_level_indicator.png
index a369d6346d0161adf1d5bc59417db0b7b1e3b000..d0a42cafc5769100b37049ebd7e55585f25b68ce 100644
GIT binary patch
delta 405
zcmaFQxq(x$Gr-TCmrII^fq{Y7)59eQNIQTq2OE%Fm05UiqoO5~f~m8Sv4ydlrK_uv
zxuKz}k%g&+xuv12sez@DqpPv0(c~&78JHpqoQk$FB`FvfS{N7_nwuDy8yT2c7y@|~
z#!i;z#ugR^21Z8amXj@*>*{%DgdYJ~f6vp!F{I+wn_C-sn+*gQ96Dw++OCi|7`p7M
zNXVOmLM{PImUX;UzvI2d%<9j#->&=LSATy}QOeH`)CvLzijy-;KU(yqb6TA*j!*hC
zr}&Mif$!y?Pgdt^u|kx9$UpK2HtB>pXtxAtUSLwZBNrfDt@uPOLRj&QW&pS17sCi<
z#TwZFsfS{%0iG?lLz<Qf{0jTezGTWi;q|Y7eg3#TclVWCIi;Gri>+f6`tm;CPSwcb
k+QG|&umB5dL0S!q1cTZ`!=C=>UWp(Dp00i_>zopr0367CS^xk5

delta 443
zcmdnM`JPj;Gr-TCmrII^fq{Y7)59eQNGE_W2OE%lG^5;NqoO5~g1Nb=siTpbiK~l=
zqoJXzk%g&&rL%>RsiCEzv7?)_;p8eN8JHqtoQk$FB{8{KPF7%2m~6#dQ-3%^D3^hO
zQP$JNF{I+wo7)Ekn+yaT0t;6(+F1m$UR}oJ_r+0IgY|*MnFX`o{N|OYc~j)I{rzv}
z|Erl97#bKD1Q-~Y7#tWFIDm#Q2rNyM@Z-1i4K9D4KRqa~cH6#b=BYBrH`}i`^FC{C
z!*W#&E%giv4DnlaxEVOY1R6Mk18%FBSTdR_MmRDQtzZ01UBRkJlttmYm6s`_px_z>
zhMm^~Z*g`sC9pD{*xR>i=YqmA`v)1Z*Z0rMzrF4BbeCUZ_n!D$*uUE0R{U~OM}9*-
z$WaOmmaAVbtKqEMx3iQ%Sb>3o1<Bpk5Qn3Qq6oIUR6W2T8UAQ{ylN)U0}KqFu6{1-
HoD!M<rOJOn

diff --git a/res/drawable-mdpi/ic_level_indicator.png b/res/drawable-mdpi/ic_level_indicator.png
index 2af721778dba0716fd4eed0f3161afc504f11515..2f4a852cefd626d51d4a592fc76fc002d85b0f01 100644
GIT binary patch
delta 336
zcmdnX`I<wqGr-TCmrII^fq{Y7)59eQNE?7K2OE$KXZqQ`QPGk~!PMEv*uvP&#nsiw
z+|ba~$imdZ+|tn1)WFin(bd@0XmS;k3`~(TPDR_8k`xRKEes3|%}or<jSS2z41qig
zV<$^<V+#ud10y4I%gGkZb@dZ?>Q@1+pXur17*cWT&Goaq4GKIBfd+a<MCQy9)9*RZ
zX&bTV6+_j9PwD&OEKD*#HJGgw6*Ml60BQodUFSfxzTvT2>&Lmh0*8|83@5XL#U<n?
z1kL)-nx#0aZlP4iGus8dFD@OK)sYwM!F{o`Cre?~d*<sii~ofzH=C05z9_qUcG<a&
jK}=w+NJJf*1&ahj<MjH^FDG%vgCsm%{an^LB{Ts502yRV

delta 393
zcmaFOv6oY^Gr-TCmrII^fq{Y7)59eQNIQTq2OE%Fm05UiqoO5~g1Nb=siTpbfvby&
zqoJXzk%g&&rL%>RsiCEzv7?)_;p8eN8K@#xH=K&LF(om%Sx#19QkZPTTvP8qx7ZM9
z$!kv+$B>F!Z*CprZBY<tO}rVwTwAb+YxP_$i;L{O8@wN#yxZJq#CQ5X*M%RNhb<0X
zjha65bCeoCP%9W1<cFP|UHN|ht#cBKcNh5zO0q9dZ7HZ>xM`Qj2~z{44HO-`I`toD
zvIKiS;AAN_b*Ps<m?C(^#b7sghT@ESY^DNdzBBF>Y|Ch=QsTMH`OT?d)^p}tAwMic
za!*>`uUj8<YGvl<tcP#^Iqg);jobJ4tk8pefd;$4wT#t?Lf#C0!AVz;Y{O(GOxnXL
a!Jxg{bn(*vk;XuIP6kg`KbLh*2~7a&GkQA!

diff --git a/res/drawable-xhdpi/ic_level_indicator.png b/res/drawable-xhdpi/ic_level_indicator.png
index f13d8505d87a7911f7070159922e2df282c7dd09..08ebe5225e0456bf28f861bce8df19c46dbe588b 100644
GIT binary patch
delta 396
zcmX@iwTo**6qAC9iLt4np}C2xtC6{(p{tRFsfD?vp{uEZrIDknv8mDIDkd42B4eD2
zwlO6s7#La@fJ`zlH!?7@Fa+`}jGZjajV&w;42+D-Ehk$r*V!3M#Aq@wFlKnVIEGZ*
zdUI!^V3PxbOJL!Ohrf1o2z9LZwn||U|11ZdsZ$tkeCIA`sMK@0o_qUSP@XIULj~7l
z0ai(M2L_IY*<oHkcRoy%*tI*RI{WRH`)@8ExgPajK5O>3An^yeESs4b7$(1Ak*%M1
z#pXOv`43T#7$ydthDp;I7`PWaQDr#5q*2Mquz|rV4!>~2hezkQ<c@zVIDC53ooBzU
zm)d^Kd3>+_K}Fq%qrc}#)ZV&zERNBRiM64Ih3%?b0lzQ<6VQ1Kj0y}a4GaPdllfSs
mfKFkU{DH+-s^qC16AwdYvRUqArg~$bD1)b~pUXO@geCy<BZW=?

delta 399
zcmdnRb(m{I6qACJfrW{oxtpu2i?NxZp{tRjk%6VNtC5kTn~}MRft%&zDkd42A{U&B
zwlO6!0o5unDNMFvu5r-u{wdACz*y+%;uunK>&=~myiE=aE`f$u9OUP$IFz-W%kPV$
z@M@KLXXOkYovRk@sAG3N!?*RC^v-wpm>3lpSSG(^kyNNM{8p8C*~Ikk&BDlO52vr+
zJVmJ?f9CU@Pnk9P#kYeM$=ClVe!Yu}f$_+Chetvj2bd=8VPV?9prYT%pu=#|TY-Vw
z;S&L24)ZHfyZ3B(yyn5Q#Yz0PxBWd^`u2C-tDDCbzjwGj^N@Ja9KG6GH;?5p*0Crt
zurx3TFfchVJbCfW@xt%U$dAf`_1E4mPPoGa7Up1J1Ueq7hQomY?iphRi0A{ac}zSE
XlMMrS&afzUF#v(5tDnm{r-UW|zzT~{

diff --git a/res/drawable-xxhdpi/ic_level_indicator.png b/res/drawable-xxhdpi/ic_level_indicator.png
index e5f639b3eefe4cecd5235a97d72cff657586f656..932da74a7b60e6b2eb3a6bffa6e1a50f7a646f66 100644
GIT binary patch
delta 428
zcmcb`eVuzl6qAC9iLt4np}B#ptC6{(p{tRFsfD?vp{uEZrIDknv8mDIDkd4IA~QFf
zincM8@i<wU8(UZy7#JCuTTZrMuCtw2<GO=^fr-`A#WAGf)|<N<c@G(gxCZvjI9R>o
zlgP|#!AnlbMLrT%)NpQH%Q0U$@M2`lPe!379Xk%LdDk~tkVR^81FN*W#M_4)zfN1u
z|Ho3k*7R(R*;-S^GYh5^ePhZveUNje!(>BNmB|xW+3N)uI2c$Mm>3uv7#tWB7=A@v
z|N0fgkT@Ez5}U(SdnHP?LmH?;ZGvSB33LPJ6OJ>A=0L-J6j14Zfn6NSFGQZR^wL~@
zK40gy*<Z=Gzvt~?pK)coh1#XQ<4H`7V3!CmlspPvz<5voqp5nK?LPJcEKHLFSxhJA
svuaFsVig8DUVX9yE2mULd=-}g!`q9F_veVDykh_YPgg&ebxsLQ0E)zkf&c&j

delta 417
zcmcc4eT#cT6qACbsjHcRfvJnDi;1J5p{tRFsez@lg^{VDrJ=E-o3r8MDkd42B4?b6
zwlS6QI2xHanK+s{xtg21O}1dJv%k6WWFrFu6NjgZV@SoVH+L^)9ySnZyQq=E_I9DV
z@54;f*7<wdr|mFo<Po@iq_dRo$wm<u`*-mgCay<#-KMfkUdSplc>=4H(gXgdbIk3N
z)|&SIDO<ZWc>n*y{qGIEG^6VoZf*J0^n6D()8zlmnv)Y)1?mqNJgcm$6=2|C*mrcl
z$FGf=U&6A#D(C_EJ_^Mg;tVVdY7;D5xEYujgipvEVr5`#;7s9r$kf1afW@f2fYE^=
zfoZ1m4h99Fa{mOroj`^`qd|KNg8;(}hZ)WwbJl6NwuIl%d@i$e%Gvn+I;TJ6->CMl
zW0$xxuR?DL>)QDzS(qjVvWRj0m|)*-=l7Xqx9?;|7ImQGSeO_&CO5L$0KKH5%mH)>
h6VP^s1QvfrHip2s_5+>QlrAy=fv2mV%Q~loCIBY5i=+Sm


From d4bf822770d197cfe834e64eaf9e38dd7150eb4d Mon Sep 17 00:00:00 2001
From: Maxime Biais <maxime.biais@gmail.com>
Date: Fri, 26 Jul 2013 18:05:43 +0200
Subject: [PATCH 11/13] fix #213: Adding a new category remove the selection on
 the categories screen

---
 .../ui/posts/SelectCategoriesActivity.java    | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/org/wordpress/android/ui/posts/SelectCategoriesActivity.java b/src/org/wordpress/android/ui/posts/SelectCategoriesActivity.java
index 258b5a2b9a3f..615b77335999 100644
--- a/src/org/wordpress/android/ui/posts/SelectCategoriesActivity.java
+++ b/src/org/wordpress/android/ui/posts/SelectCategoriesActivity.java
@@ -9,6 +9,7 @@
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.os.Handler;
+import android.text.TextUtils;
 import android.util.SparseBooleanArray;
 import android.widget.ListView;
 import android.widget.Toast;
@@ -206,6 +207,9 @@ public String addCategory(String category_name, String category_slug, String cat
         // Return string
         String returnString = "";
 
+        // Save selected categories
+        categoriesCSV = selectedCategoriesToCSV();
+
         // Store the parameters for wp.addCategory
         Map<String, Object> struct = new HashMap<String, Object>();
         struct.put("name", category_name);
@@ -329,25 +333,20 @@ public void onBackPressed() {
         super.onBackPressed();
     }
 
-    private void saveAndFinish() {
-        String selectedCategories = "";
-
+    private String selectedCategoriesToCSV() {
+        ArrayList<String> selectedCategories = new ArrayList<String>();
         SparseBooleanArray selectedItems = lv.getCheckedItemPositions();
-
         for (int i = 0; i < selectedItems.size(); i++) {
-            if (selectedItems.get(selectedItems.keyAt(i)) == true) {
-                String categoryName = mCategoryLevels.get(selectedItems.keyAt(i)).getName();
-                selectedCategories += categoryName + ",";
+            if (selectedItems.get(selectedItems.keyAt(i))) {
+                selectedCategories.add(mCategoryLevels.get(selectedItems.keyAt(i)).getName());
             }
         }
+        return TextUtils.join(",", selectedCategories);
+    }
 
+    private void saveAndFinish() {
         Bundle bundle = new Bundle();
-        selectedCategories = selectedCategories.trim();
-        if (selectedCategories.endsWith(",")) {
-            selectedCategories = selectedCategories.substring(0, selectedCategories.length() - 1);
-        }
-
-        bundle.putString("selectedCategories", selectedCategories);
+        bundle.putString("selectedCategories", selectedCategoriesToCSV());
         Intent mIntent = new Intent();
         mIntent.putExtras(bundle);
         setResult(RESULT_OK, mIntent);

From 5c7d5379b934ffb6bfb440251569c3777de7b589 Mon Sep 17 00:00:00 2001
From: Maxime Biais <maxime.biais@gmail.com>
Date: Fri, 26 Jul 2013 18:28:24 +0200
Subject: [PATCH 12/13] Remove auto addition of special "Uncategorized"
 category

---
 res/values/strings.xml                        |  1 +
 .../android/ui/posts/EditPostActivity.java    | 29 ++++---------------
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 59918edca045..fe8d7b178a98 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -241,6 +241,7 @@
   <string name="media">Media</string>
 
   <!-- category management -->
+  <string name="category">Category</string>
   <string name="add_new_category">Add New Category</string>
   <string name="category_name">Category Name</string>
   <string name="category_slug">Category Slug (optional)</string>
diff --git a/src/org/wordpress/android/ui/posts/EditPostActivity.java b/src/org/wordpress/android/ui/posts/EditPostActivity.java
index ae2336f39ecb..3bfdf7fcc708 100644
--- a/src/org/wordpress/android/ui/posts/EditPostActivity.java
+++ b/src/org/wordpress/android/ui/posts/EditPostActivity.java
@@ -46,7 +46,6 @@
 import android.text.style.StrikethroughSpan;
 import android.text.style.StyleSpan;
 import android.text.style.URLSpan;
-import android.util.Log;
 import android.view.*;
 import android.view.View.OnClickListener;
 import android.view.View.OnFocusChangeListener;
@@ -92,7 +91,6 @@ public class EditPostActivity extends SherlockActivity implements OnClickListene
     private static final int ID_DIALOG_LOADING = 2;
 
     private static final String CATEGORY_PREFIX_TAG = "category-";
-    private static final String UNCATEGORIZED_LABEL = "Uncategorized";
 
     private Blog mBlog;
     private Post mPost;
@@ -416,7 +414,6 @@ else if (mQuickMediaType == Constants.QUICK_POST_VIDEO_LIBRARY)
             }
         }
 
-        // if mCategories is empty or if mIsNew, we want to add an "Uncategorized" category
         populateSelectedCategories();
 
         registerForContextMenu(mAddPictureButton);
@@ -1336,17 +1333,6 @@ private void onCategoryButtonClick(View v) {
 
     private void populateSelectedCategories() {
         ViewGroup sectionCategories = ((ViewGroup) findViewById(R.id.sectionCategories));
-        boolean uncategorizedAlone = false;
-
-        // We want an "Uncategorized" if no category selected
-        if (mCategories.size() == 0) {
-            mCategories.add(UNCATEGORIZED_LABEL);
-            uncategorizedAlone = true;
-        } else { // Check for an alone "Uncategorized"
-            if (mCategories.size() == 1 && mCategories.get(0).equals(UNCATEGORIZED_LABEL)) {
-                uncategorizedAlone = true;
-            }
-        }
 
         // Remove previous category buttons if any + select category button
         List<View> viewsToRemove = new ArrayList<View>();
@@ -1365,25 +1351,22 @@ private void populateSelectedCategories() {
 
         // New category buttons
         LayoutInflater layoutInflater = getLayoutInflater();
-        List<View> categoryButtons = new ArrayList<View>();
         for (int i = 0; i < mCategories.size(); i++) {
             String categoryName = mCategories.get(i);
             Button buttonCategory = (Button) layoutInflater.inflate(R.layout.category_button, null);
             buttonCategory.setText(categoryName);
             buttonCategory.setTag(CATEGORY_PREFIX_TAG + categoryName);
             buttonCategory.setOnClickListener(this);
-            // Special case for Uncategorized, remove drawable left and disable
-            if (uncategorizedAlone) {
-                buttonCategory.setCompoundDrawables(null, null, null, null);
-                buttonCategory.setEnabled(false);
-                buttonCategory.setPadding(buttonCategory.getPaddingLeft(), buttonCategory.getPaddingTop(),
-                        buttonCategory.getPaddingLeft(), buttonCategory.getPaddingBottom());
-            }
             sectionCategories.addView(buttonCategory);
         }
 
         // Add select category button
-        View selectCategory = layoutInflater.inflate(R.layout.category_select_button, null);
+        Button selectCategory = (Button) layoutInflater.inflate(R.layout.category_select_button, null);
+        if (mCategories.size() == 0) {
+            selectCategory.setText(getResources().getText(R.string.category));
+        } else {
+            selectCategory.setText("");
+        }
         selectCategory.setOnClickListener(this);
         sectionCategories.addView(selectCategory);
     }

From d107cd74b138f31fecc0d9c0c56ac3d0e3ce6d46 Mon Sep 17 00:00:00 2001
From: Maxime Biais <maxime.biais@gmail.com>
Date: Mon, 29 Jul 2013 23:38:57 +0200
Subject: [PATCH 13/13] Add a category label and change the "Category +" button
 behavior

---
 res/layout/edit.xml                                      | 8 ++++++++
 src/org/wordpress/android/ui/posts/EditPostActivity.java | 5 -----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/res/layout/edit.xml b/res/layout/edit.xml
index 1097d843c654..048d5d1cbdf4 100644
--- a/res/layout/edit.xml
+++ b/res/layout/edit.xml
@@ -59,12 +59,20 @@
                     android:hint="@string/tags_separate_with_commas"
                     android:inputType="textAutoCorrect" />
 
+                <TextView
+                        android:id="@+id/categoryLabel"
+                        style="@style/WordPressSubHeader"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/category" />
+
             </LinearLayout>
 
             <org.wordpress.android.util.FlowLayout
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content" android:id="@+id/sectionCategories" android:paddingLeft="8dp">
             </org.wordpress.android.util.FlowLayout>
+
             <RelativeLayout
                 android:id="@+id/sectionLocation"
                 android:layout_width="fill_parent"
diff --git a/src/org/wordpress/android/ui/posts/EditPostActivity.java b/src/org/wordpress/android/ui/posts/EditPostActivity.java
index 3bfdf7fcc708..c20cf6f66e3c 100644
--- a/src/org/wordpress/android/ui/posts/EditPostActivity.java
+++ b/src/org/wordpress/android/ui/posts/EditPostActivity.java
@@ -1362,11 +1362,6 @@ private void populateSelectedCategories() {
 
         // Add select category button
         Button selectCategory = (Button) layoutInflater.inflate(R.layout.category_select_button, null);
-        if (mCategories.size() == 0) {
-            selectCategory.setText(getResources().getText(R.string.category));
-        } else {
-            selectCategory.setText("");
-        }
         selectCategory.setOnClickListener(this);
         sectionCategories.addView(selectCategory);
     }