Removed STATS_SITE_AVATAR from WPNetworkImageView in favor of setting default/error image resources.

4 files changed, 25 insertions, 20 deletions

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsClicksFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsClicksFragment.java
index f01bc55c5..e789da8c2 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsClicksFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsClicksFragment.java
@@ -160,13 +160,17 @@ public class StatsClicksFragment extends StatsAbstractListFragment {
         public View getGroupView(int groupPosition, boolean isExpanded,
                                  View convertView, ViewGroup parent) {
 
+            final StatsViewHolder holder;
             if (convertView == null) {
                 convertView = inflater.inflate(R.layout.stats_list_cell, parent, false);
-                convertView.setTag(new StatsViewHolder(convertView));
+                holder = new StatsViewHolder(convertView);
+                holder.networkImageView.setErrorImageResId(R.drawable.stats_icon_default_site_avatar);
+                holder.networkImageView.setDefaultImageResId(R.drawable.stats_icon_default_site_avatar);
+                convertView.setTag(holder);
+            } else {
+                holder = (StatsViewHolder) convertView.getTag();
             }
 
-            final StatsViewHolder holder = (StatsViewHolder) convertView.getTag();
-
             ClickGroupModel group = (ClickGroupModel) getGroup(groupPosition);
 
             String name = group.getName();
@@ -184,7 +188,7 @@ public class StatsClicksFragment extends StatsAbstractListFragment {
             // totals
             holder.totalsTextView.setText(FormatUtils.formatDecimal(total));
 
-            holder.networkImageView.setImageUrl(GravatarUtils.fixGravatarUrl(icon, mResourceVars.headerAvatarSizePx), WPNetworkImageView.ImageType.STATS_SITE_AVATAR);
+            holder.networkImageView.setImageUrl(GravatarUtils.fixGravatarUrl(icon, mResourceVars.headerAvatarSizePx), WPNetworkImageView.ImageType.BLAVATAR);
             holder.networkImageView.setVisibility(View.VISIBLE);
 
             if (children == 0) {
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 7f0dca053..615508d1c 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
@@ -78,15 +78,19 @@ public class StatsPublicizeFragment extends StatsAbstractListFragment {
         public View getView(int position, View convertView, ViewGroup parent) {
             View rowView = convertView;
             // reuse views
+            final StatsViewHolder holder;
             if (rowView == null) {
                 rowView = inflater.inflate(R.layout.stats_list_cell, parent, false);
                 // configure view holder
-                StatsViewHolder viewHolder = new StatsViewHolder(rowView);
-                rowView.setTag(viewHolder);
+                holder = new StatsViewHolder(rowView);
+                holder.networkImageView.setErrorImageResId(R.drawable.stats_icon_default_site_avatar);
+                holder.networkImageView.setDefaultImageResId(R.drawable.stats_icon_default_site_avatar);
+                rowView.setTag(holder);
+            } else {
+                holder = (StatsViewHolder) rowView.getTag();
             }
 
             final SingleItemModel currentRowData = list.get(position);
-            StatsViewHolder holder = (StatsViewHolder) rowView.getTag();
 
             String serviceName = currentRowData.getTitle();
 
@@ -97,7 +101,7 @@ public class StatsPublicizeFragment extends StatsAbstractListFragment {
             holder.totalsTextView.setText(FormatUtils.formatDecimal(currentRowData.getTotals()));
 
             // image
-            holder.networkImageView.setImageUrl(getServiceImage(serviceName), WPNetworkImageView.ImageType.STATS_SITE_AVATAR);
+            holder.networkImageView.setImageUrl(getServiceImage(serviceName), WPNetworkImageView.ImageType.BLAVATAR);
             holder.networkImageView.setVisibility(View.VISIBLE);
 
             return rowView;
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsReferrersFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsReferrersFragment.java
index b3347fecb..d0507d97f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsReferrersFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsReferrersFragment.java
@@ -172,13 +172,17 @@ public class StatsReferrersFragment extends StatsAbstractListFragment {
         public View getGroupView(final int groupPosition, boolean isExpanded,
                                  View convertView, ViewGroup parent) {
 
+            final StatsViewHolder holder;
             if (convertView == null) {
                 convertView = inflater.inflate(R.layout.stats_list_cell, parent, false);
-                convertView.setTag(new StatsViewHolder(convertView));
+                holder = new StatsViewHolder(convertView);
+                holder.networkImageView.setErrorImageResId(R.drawable.stats_icon_default_site_avatar);
+                holder.networkImageView.setDefaultImageResId(R.drawable.stats_icon_default_site_avatar);
+                convertView.setTag(holder);
+            } else {
+                holder = (StatsViewHolder) convertView.getTag();
             }
 
-            final StatsViewHolder holder = (StatsViewHolder) convertView.getTag();
-
             ReferrerGroupModel group = (ReferrerGroupModel) getGroup(groupPosition);
 
             String name = group.getName();
@@ -196,7 +200,7 @@ public class StatsReferrersFragment extends StatsAbstractListFragment {
             // totals
             holder.totalsTextView.setText(FormatUtils.formatDecimal(total));
 
-            holder.networkImageView.setImageUrl(GravatarUtils.fixGravatarUrl(icon, mResourceVars.headerAvatarSizePx), WPNetworkImageView.ImageType.STATS_SITE_AVATAR);
+            holder.networkImageView.setImageUrl(GravatarUtils.fixGravatarUrl(icon, mResourceVars.headerAvatarSizePx), WPNetworkImageView.ImageType.BLAVATAR);
             holder.networkImageView.setVisibility(View.VISIBLE);
 
             holder.chevronImageView.setVisibility(View.VISIBLE);
diff --git a/WordPress/src/main/java/org/wordpress/android/widgets/WPNetworkImageView.java b/WordPress/src/main/java/org/wordpress/android/widgets/WPNetworkImageView.java
index e96fc0723..3515cd516 100644
--- a/WordPress/src/main/java/org/wordpress/android/widgets/WPNetworkImageView.java
+++ b/WordPress/src/main/java/org/wordpress/android/widgets/WPNetworkImageView.java
@@ -42,8 +42,7 @@ public class WPNetworkImageView extends ImageView {
                                   MSHOT,
                                   VIDEO,
                                   AVATAR,
-                                BLAVATAR,
-                       STATS_SITE_AVATAR}
+                                BLAVATAR}
 
     private ImageType mImageType = ImageType.NONE;
     private String mUrl;
@@ -326,9 +325,6 @@ public class WPNetworkImageView extends ImageView {
                 // Grey circle for avatars
                 setImageResource(R.drawable.shape_oval_grey_light);
                 break;
-            case STATS_SITE_AVATAR:
-                setImageResource(R.drawable.stats_icon_default_site_avatar);
-                break;
             default :
                 // light grey box for all others
                 setImageDrawable(new ColorDrawable(getColorRes(R.color.grey_light)));
@@ -357,9 +353,6 @@ public class WPNetworkImageView extends ImageView {
             case BLAVATAR:
                 setImageResource(R.drawable.gravatar_placeholder);
                 break;
-            case STATS_SITE_AVATAR:
-                setImageResource(R.drawable.stats_icon_default_site_avatar);
-                break;
             default :
                 // medium grey box for all others
                 setImageDrawable(new ColorDrawable(getColorRes(R.color.grey_medium)));