AndroidNative2026/Haleon_All_Country
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G

Browse Source 
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
This commit is contained in:
Gagan290
2017-01-05 16:08:05 +05:30
parent ade4954f45
commit 6b08d54536
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java
+4 -3
View File
@@ -116,14 +116,15 @@ public class CategoryListActivity extends AppCompatActivity {
final CategoryGetterSetter categoryData = list.get(position); final CategoryGetterSetter categoryData = list.get(position);
holder.categoryName.setText(categoryData.getCategory()); holder.categoryName.setText(categoryData.getCategory());
holder.categoryIcon.setImageResource(R.drawable.category); //holder.categoryIcon.setImageResource(R.drawable.category);
/*if (categoryData.getCategory().equalsIgnoreCase("Oral Health")) {
if (categoryData.getCategory().equalsIgnoreCase("Oral Health")) {
holder.categoryIcon.setImageResource(R.drawable.ohc); holder.categoryIcon.setImageResource(R.drawable.ohc);
} else if (categoryData.getCategory().equalsIgnoreCase("Wellness")) { } else if (categoryData.getCategory().equalsIgnoreCase("Wellness")) {
holder.categoryIcon.setImageResource(R.drawable.pdr); holder.categoryIcon.setImageResource(R.drawable.pdr);
} else if (categoryData.getCategory().equalsIgnoreCase("Nutritionals")) { } else if (categoryData.getCategory().equalsIgnoreCase("Nutritionals")) {
holder.categoryIcon.setImageResource(R.drawable.hfd); holder.categoryIcon.setImageResource(R.drawable.hfd);
}*/ }
holder.lay_menu.setOnClickListener(new View.OnClickListener() { holder.lay_menu.setOnClickListener(new View.OnClickListener() {