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 GG_Update_Manifest

Browse Source 
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
This commit is contained in:
Gagan290
2017-01-13 10:19:25 +05:30
parent af4271360a
commit e4a80d6e1b
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java
+3
View File
@@ -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);