From 601f5e1884f479100a71bf35dee4a277357ca763 Mon Sep 17 00:00:00 2001 From: RyanBateman Date: Mon, 15 Oct 2012 16:00:51 -0400 Subject: [PATCH] Ensure only relevant counts were shown for All Shared / All titles --- .../database/MixedExpandableListAdapter.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/media/android/NewsBlur/src/com/newsblur/database/MixedExpandableListAdapter.java b/media/android/NewsBlur/src/com/newsblur/database/MixedExpandableListAdapter.java index d568bbb22..f91164723 100644 --- a/media/android/NewsBlur/src/com/newsblur/database/MixedExpandableListAdapter.java +++ b/media/android/NewsBlur/src/com/newsblur/database/MixedExpandableListAdapter.java @@ -286,7 +286,7 @@ public class MixedExpandableListAdapter extends BaseExpandableListAdapter{ } }); String neutCount = sharedStoriesCountCursor.getString(sharedStoriesCountCursor.getColumnIndex(DatabaseConstants.SUM_NEUT)); - if (TextUtils.isEmpty(neutCount) || TextUtils.equals(neutCount, "0")) { + if (currentState == AppConstants.STATE_BEST || TextUtils.isEmpty(neutCount) || TextUtils.equals(neutCount, "0")) { v.findViewById(R.id.row_foldersumneu).setVisibility(View.GONE); } else { v.findViewById(R.id.row_foldersumneu).setVisibility(View.VISIBLE); @@ -307,8 +307,17 @@ public class MixedExpandableListAdapter extends BaseExpandableListAdapter{ cursor = allStoriesCountCursor; v = inflater.inflate(R.layout.row_all_stories, null, false); allStoriesCountCursor.moveToFirst(); - ((TextView) v.findViewById(R.id.row_foldersumneu)).setText(allStoriesCountCursor.getString(allStoriesCountCursor.getColumnIndex(DatabaseConstants.SUM_NEUT))); - ((TextView) v.findViewById(R.id.row_foldersumpos)).setText(allStoriesCountCursor.getString(allStoriesCountCursor.getColumnIndex(DatabaseConstants.SUM_POS))); + switch (currentState) { + case AppConstants.STATE_BEST: + v.findViewById(R.id.row_foldersumneu).setVisibility(View.INVISIBLE); + ((TextView) v.findViewById(R.id.row_foldersumpos)).setText(allStoriesCountCursor.getString(allStoriesCountCursor.getColumnIndex(DatabaseConstants.SUM_POS))); + break; + default: + ((TextView) v.findViewById(R.id.row_foldersumneu)).setText(allStoriesCountCursor.getString(allStoriesCountCursor.getColumnIndex(DatabaseConstants.SUM_NEUT))); + ((TextView) v.findViewById(R.id.row_foldersumpos)).setText(allStoriesCountCursor.getString(allStoriesCountCursor.getColumnIndex(DatabaseConstants.SUM_POS))); + break; + } + } else { cursor = folderCursorHelper.moveTo(groupPosition - 2); if (convertView == null) {