From 6b08d5453677caee92c22a6baebdf8097b11fe6f Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Thu, 5 Jan 2017 16:08:05 +0530 Subject: [PATCH] Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G # Conflicts: # GSKMTOrange/src/main/AndroidManifest.xml # GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java --- .../gskmtorange/gsk_dailyentry/CategoryListActivity.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java index d5bfab4..bf30822 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java @@ -116,14 +116,15 @@ public class CategoryListActivity extends AppCompatActivity { final CategoryGetterSetter categoryData = list.get(position); holder.categoryName.setText(categoryData.getCategory()); - holder.categoryIcon.setImageResource(R.drawable.category); - /*if (categoryData.getCategory().equalsIgnoreCase("Oral Health")) { + //holder.categoryIcon.setImageResource(R.drawable.category); + + if (categoryData.getCategory().equalsIgnoreCase("Oral Health")) { holder.categoryIcon.setImageResource(R.drawable.ohc); } else if (categoryData.getCategory().equalsIgnoreCase("Wellness")) { holder.categoryIcon.setImageResource(R.drawable.pdr); } else if (categoryData.getCategory().equalsIgnoreCase("Nutritionals")) { holder.categoryIcon.setImageResource(R.drawable.hfd); - }*/ + } holder.lay_menu.setOnClickListener(new View.OnClickListener() {