From e4a80d6e1b8523348a3e27270017d3185962fbb7 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Fri, 13 Jan 2017 10:19:25 +0530 Subject: [PATCH] Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest # Conflicts: # GSKMTOrange/src/main/AndroidManifest.xml --- .../gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java index 9e78b17..fd4338f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java @@ -330,6 +330,7 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { ImageView img_camera = (ImageView) convertView.findViewById(R.id.img_camera); txt_categoryHeader.setTypeface(null, Typeface.BOLD); + txt_categoryHeader.setTextColor(getResources().getColor(R.color.colorPrimary)); txt_categoryHeader.setText(headerTitle.getSub_category() + "-" + headerTitle.getBrand()); /*img_camera.setOnClickListener(new View.OnClickListener() { @@ -399,6 +400,8 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { holder.cardView = (CardView) convertView.findViewById(R.id.card_view); holder.lin_category = (LinearLayout) convertView.findViewById(R.id.lin_category); + holder.txt_skuName.setTextColor(getResources().getColor(R.color.colorPrimary)); + holder.txt_skuName = (TextView) convertView.findViewById(R.id.txt_skuName); holder.txt_mbq = (TextView) convertView.findViewById(R.id.txt_mbq); holder.toggle_available = (ToggleButton) convertView.findViewById(R.id.toggle_available);