From 0207a8ce0112b7ac99ab9894ed45888f5fcb5bc1 Mon Sep 17 00:00:00 2001 From: ashishandroid Date: Thu, 9 Feb 2017 18:09:13 +0530 Subject: [PATCH] review --- .idea/misc.xml | 2 +- .../dailyentry/T2PComplianceActivity.java | 33 +++++++++++++++--- .../new_no_camera_done_edit.png | Bin 0 -> 4095 bytes .../res/mipmap-xxxhdpi/new_no_camera_edit.png | Bin 0 -> 3796 bytes 4 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 GSKMTOrange/src/main/res/mipmap-xxxhdpi/new_no_camera_done_edit.png create mode 100644 GSKMTOrange/src/main/res/mipmap-xxxhdpi/new_no_camera_edit.png diff --git a/.idea/misc.xml b/.idea/misc.xml index b15ecee..b8dc4d6 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -41,7 +41,7 @@ - + diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java index f1d44a8..0ad9a3b 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java @@ -93,6 +93,7 @@ public class T2PComplianceActivity extends AppCompatActivity { //CardView cardlay; String brand_name="",brand_id=""; ArrayList brand_new_list=new ArrayList(); + ArrayList brandList; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -187,6 +188,9 @@ public class T2PComplianceActivity extends AppCompatActivity { t2PGetterSetters.get(i).setSkulist(skuList); t2PGetterSetters.get(i).setBrandlist(brandList); + + + } } @@ -245,6 +249,9 @@ public class T2PComplianceActivity extends AppCompatActivity { /* Typeface iconFont = FontManager.getTypeface(getApplicationContext(), FontManager.FONTAWESOME); FontManager.markAsIconContainer(findViewById(R.id.icons_container), iconFont); */ + + + holder.btn_gaps.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -415,9 +422,9 @@ public class T2PComplianceActivity extends AppCompatActivity { holder.img_cam2.setBackgroundResource(R.mipmap.camera_green); } } else { - holder.img_cam.setBackgroundResource(R.mipmap.camera_grey); - holder.img_cam1.setBackgroundResource(R.mipmap.camera_grey); - holder.img_cam2.setBackgroundResource(R.mipmap.camera_grey); + // holder.img_cam.setBackgroundResource(R.mipmap.camera_grey); + // holder.img_cam1.setBackgroundResource(R.mipmap.camera_grey); + // holder.img_cam2.setBackgroundResource(R.mipmap.camera_grey); holder.img_cam1.setVisibility(View.INVISIBLE); holder.img_cam2.setVisibility(View.INVISIBLE); @@ -437,13 +444,31 @@ public class T2PComplianceActivity extends AppCompatActivity { } }); + + + if(mItem.getBrandlist().size()>0) + { + + holder.img_cam.setBackgroundResource(R.mipmap.new_no_camera_done_edit); + }else{ + + if (mItem.isPresent()) { + + holder.img_cam.setBackgroundResource(R.mipmap.new_no_camera_edit); + } else { + //if not present camera disabled + holder.img_cam.setBackgroundResource(R.mipmap.no_camera); + } + + } + } boolean is_enabled = mItem.isPresent(); holder.toggle_btn.setChecked(is_enabled); - // holder.img_cam.setEnabled(is_enabled); + holder.img_cam.setEnabled(is_enabled); holder.img_cam1.setEnabled(is_enabled); holder.img_cam2.setEnabled(is_enabled); holder.btn_gaps.setEnabled(is_enabled); diff --git a/GSKMTOrange/src/main/res/mipmap-xxxhdpi/new_no_camera_done_edit.png b/GSKMTOrange/src/main/res/mipmap-xxxhdpi/new_no_camera_done_edit.png new file mode 100644 index 0000000000000000000000000000000000000000..968f882c0e2bb945990d00371c938737d2f8391c GIT binary patch literal 4095 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 literal 0 HcmV?d00001 diff --git a/GSKMTOrange/src/main/res/mipmap-xxxhdpi/new_no_camera_edit.png b/GSKMTOrange/src/main/res/mipmap-xxxhdpi/new_no_camera_edit.png new file mode 100644 index 0000000000000000000000000000000000000000..40e27f817b94f7fd1e0a9e36b252163fa8bc7fcd GIT binary patch literal 3796 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 KMNUMnLSTZ*t^qm# literal 0 HcmV?d00001