- Fix highlight in the "Countries", "Followers" and "Comments" modules. The app was showing a selection even though nothing happens when you click them.

- Fix the "null view root"  issue reported by Inspector. Props @nbradbury
- Use a lighter text color for checked tabs in Visitors and Views. (Used the same color of the web).

9 files changed, 27 insertions, 19 deletions

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsAbstractListFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsAbstractListFragment.java
index d3cd87a50..16e8aadec 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsAbstractListFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsAbstractListFragment.java
@@ -323,12 +323,12 @@ public abstract class StatsAbstractListFragment extends StatsAbstractFragment {
         return isSingleView() ? MAX_NUM_OF_ITEMS_DISPLAYED_IN_SINGLE_VIEW_LIST : MAX_NUM_OF_ITEMS_DISPLAYED_IN_LIST;
     }
 
-    protected void setupTopModulePager(LayoutInflater inflater, View view, String[] buttonTitles) {
+    protected void setupTopModulePager(LayoutInflater inflater, ViewGroup container, View view, String[] buttonTitles) {
         int dp4 = DisplayUtils.dpToPx(view.getContext(), 4);
         int dp80 = DisplayUtils.dpToPx(view.getContext(), 80);
 
         for (int i = 0; i < buttonTitles.length; i++) {
-            CheckedTextView rb = (CheckedTextView) inflater.inflate(R.layout.stats_top_module_pager_button, null, false);
+            CheckedTextView rb = (CheckedTextView) inflater.inflate(R.layout.stats_top_module_pager_button, container, false);
             RadioGroup.LayoutParams params = new RadioGroup.LayoutParams(RadioGroup.LayoutParams.MATCH_PARENT,
                     RadioGroup.LayoutParams.WRAP_CONTENT);
             params.weight = 1;
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsCommentsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsCommentsFragment.java
index 32d291d19..98ff19556 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsCommentsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsCommentsFragment.java
@@ -37,7 +37,7 @@ public class StatsCommentsFragment extends StatsAbstractListFragment {
                 res.getString(R.string.stats_comments_by_posts_and_pages),
         };
 
-        setupTopModulePager(inflater, view, titles);
+        setupTopModulePager(inflater, container, view, titles);
 
         return view;
     }
@@ -170,7 +170,7 @@ public class StatsCommentsFragment extends StatsAbstractListFragment {
             View rowView = convertView;
             // reuse views
             if (rowView == null) {
-                rowView = inflater.inflate(R.layout.stats_list_cell, null);
+                rowView = inflater.inflate(R.layout.stats_list_cell, parent, false);
                 // configure view holder
                 StatsViewHolder viewHolder = new StatsViewHolder(rowView);
                 rowView.setTag(viewHolder);
@@ -180,9 +180,8 @@ public class StatsCommentsFragment extends StatsAbstractListFragment {
             final StatsViewHolder holder = (StatsViewHolder) rowView.getTag();
 
             // entries
-            holder.entryTextView.setText(currentRowData.getName());
+            holder.setEntryText(currentRowData.getName());
             holder.entryTextView.setTextColor(context.getResources().getColor(R.color.stats_text_color));
-            holder.entryTextView.setOnClickListener(null);
 
             // totals
             holder.totalsTextView.setText(FormatUtils.formatDecimal(currentRowData.getViews()));
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsFollowersFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsFollowersFragment.java
index 093fb05b3..fba184e75 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsFollowersFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsFollowersFragment.java
@@ -42,7 +42,7 @@ public class StatsFollowersFragment extends StatsAbstractListFragment {
         };
 
 
-        setupTopModulePager(inflater, view, titles);
+        setupTopModulePager(inflater, container, view, titles);
 
         mTopPagerContainer.setVisibility(View.VISIBLE);
         mTotalsLabel.setVisibility(View.VISIBLE);
@@ -204,7 +204,7 @@ public class StatsFollowersFragment extends StatsAbstractListFragment {
             View rowView = convertView;
             // reuse views
             if (rowView == null) {
-                rowView = inflater.inflate(R.layout.stats_list_cell, null);
+                rowView = inflater.inflate(R.layout.stats_list_cell, parent, false);
                 // configure view holder
                 StatsViewHolder viewHolder = new StatsViewHolder(rowView);
                 rowView.setTag(viewHolder);
@@ -236,7 +236,7 @@ public class StatsFollowersFragment extends StatsAbstractListFragment {
                 }
             } else {
                 // Email followers.
-                holder.entryTextView.setText(currentRowData.getLabel());
+                holder.setEntryText(currentRowData.getLabel());
             }
 
             // since date
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsGeoviewsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsGeoviewsFragment.java
index 1168f23f7..99f7c85e2 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsGeoviewsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsGeoviewsFragment.java
@@ -81,7 +81,7 @@ public class StatsGeoviewsFragment extends StatsAbstractListFragment {
             View rowView = convertView;
             // reuse views
             if (rowView == null) {
-                rowView = inflater.inflate(R.layout.stats_list_cell, null);
+                rowView = inflater.inflate(R.layout.stats_list_cell, parent, false);
                 // configure view holder
                 StatsViewHolder viewHolder = new StatsViewHolder(rowView);
                 rowView.setTag(viewHolder);
@@ -94,7 +94,7 @@ public class StatsGeoviewsFragment extends StatsAbstractListFragment {
             String imageUrl = currentRowData.getImageUrl();
             int total = currentRowData.getViews();
 
-            holder.entryTextView.setText(entry);
+            holder.setEntryText(entry);
             holder.totalsTextView.setText(FormatUtils.formatDecimal(total));
 
             // image (country flag)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsPublicizeFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsPublicizeFragment.java
index b22a35ba1..67db0b87a 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsPublicizeFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsPublicizeFragment.java
@@ -79,7 +79,7 @@ public class StatsPublicizeFragment extends StatsAbstractListFragment {
             View rowView = convertView;
             // reuse views
             if (rowView == null) {
-                rowView = inflater.inflate(R.layout.stats_list_cell, null);
+                rowView = inflater.inflate(R.layout.stats_list_cell, parent, false);
                 // configure view holder
                 StatsViewHolder viewHolder = new StatsViewHolder(rowView);
                 rowView.setTag(viewHolder);
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVideoplaysFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVideoplaysFragment.java
index 584cdd3db..410472a43 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVideoplaysFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVideoplaysFragment.java
@@ -79,7 +79,7 @@ public class StatsVideoplaysFragment extends StatsAbstractListFragment {
             View rowView = convertView;
             // reuse views
             if (rowView == null) {
-                rowView = inflater.inflate(R.layout.stats_list_cell, null);
+                rowView = inflater.inflate(R.layout.stats_list_cell, parent, false);
                 // configure view holder
                 StatsViewHolder viewHolder = new StatsViewHolder(rowView);
                 rowView.setTag(viewHolder);
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsViewHolder.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsViewHolder.java
index c50fd93b8..5d8f158c0 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsViewHolder.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsViewHolder.java
@@ -26,7 +26,6 @@ public class StatsViewHolder {
 
     public StatsViewHolder(View view) {
         entryTextView = (TextView) view.findViewById(R.id.stats_list_cell_entry);
-        entryTextView.setMovementMethod(StatsWPLinkMovementMethod.getInstance());
         totalsTextView = (TextView) view.findViewById(R.id.stats_list_cell_total);
         chevronImageView = (ImageView) view.findViewById(R.id.stats_list_cell_chevron);
 
@@ -42,25 +41,35 @@ public class StatsViewHolder {
         if (entryTextView == null) {
             return;
         }
-        boolean isLink = false;
+        boolean isLink;
         if (TextUtils.isEmpty(linkUrl)) {
             entryTextView.setText(linkName);
             isLink = (linkName != null && linkName.startsWith("http"));
+            Linkify.addLinks(entryTextView, Linkify.WEB_URLS);
         } else if (TextUtils.isEmpty(linkName)) {
             entryTextView.setText(linkUrl);
+            Linkify.addLinks(entryTextView, Linkify.WEB_URLS);
             isLink = (linkUrl != null && linkUrl.startsWith("http"));
         } else {
             entryTextView.setText(Html.fromHtml("<a href=\"" + linkUrl + "\">" + linkName + "</a>"));
+            isLink = true;
         }
 
         if (isLink) {
             entryTextView.setMovementMethod(StatsWPLinkMovementMethod.getInstance());
-            Linkify.addLinks(entryTextView, Linkify.WEB_URLS);
+            StatsUIHelper.removeUnderlines((Spannable) entryTextView.getText());
         }
 
         // Remove the highlight color. It's already specified in the XML, but Linkify and friends re-add it at run-time.
         entryTextView.setHighlightColor(entryTextView.getResources().getColor(R.color.transparent));
-        StatsUIHelper.removeUnderlines((Spannable) entryTextView.getText());
+    }
+
+
+    public void setEntryText(String text) {
+        entryTextView.setText(text);
+        entryTextView.setMovementMethod(null);
+        entryTextView.setFocusable(false);
+        entryTextView.setClickable(false);
     }
 
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVisitorsAndViewsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVisitorsAndViewsFragment.java
index 98cbffce1..5c49840ab 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVisitorsAndViewsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVisitorsAndViewsFragment.java
@@ -89,7 +89,7 @@ public class StatsVisitorsAndViewsFragment extends StatsAbstractFragment
         mModuleButtonsContainer = (LinearLayout) view.findViewById(R.id.stats_pager_tabs);
 
         for (int i = 0; i < overviewItems.length; i++) {
-            CheckedTextView rb = (CheckedTextView) inflater.inflate(R.layout.stats_visitors_and_views_button, null, false);
+            CheckedTextView rb = (CheckedTextView) inflater.inflate(R.layout.stats_visitors_and_views_button, container, false);
             LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(RadioGroup.LayoutParams.MATCH_PARENT,
                     RadioGroup.LayoutParams.WRAP_CONTENT);
             params.weight = 1;
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/adapters/PostsAndPagesAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/adapters/PostsAndPagesAdapter.java
index 2ef99e0a4..daf70acfc 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/adapters/PostsAndPagesAdapter.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/adapters/PostsAndPagesAdapter.java
@@ -33,7 +33,7 @@ public class PostsAndPagesAdapter extends ArrayAdapter<SingleItemModel> {
         View rowView = convertView;
         // reuse views
         if (rowView == null) {
-            rowView = inflater.inflate(R.layout.stats_list_cell, null);
+            rowView = inflater.inflate(R.layout.stats_list_cell, parent, false);
             // configure view holder
             StatsViewHolder viewHolder = new StatsViewHolder(rowView);
             rowView.setTag(viewHolder);