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/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java

@@ -119,12 +119,35 @@ public class CategoryListActivity extends AppCompatActivity {
             //holder.categoryIcon.setImageResource(R.drawable.category);
 
             if (categoryData.getCategory().equalsIgnoreCase("Oral Health")) {
+                if (db.checkMsl_AvailabilityData(store_id, categoryData.getCategory_id())
+                        && db.checkStockAndFacingData(store_id, categoryData.getCategory_id())
+                        && db.checkPromoComplianceData(store_id, categoryData.getCategory_id())) {
+
+                    holder.categoryIcon.setImageResource(R.drawable.ohc_done);
+                } else {
                     holder.categoryIcon.setImageResource(R.drawable.ohc);
+                }
             } else if (categoryData.getCategory().equalsIgnoreCase("Wellness")) {
+                if (db.checkMsl_AvailabilityData(store_id, categoryData.getCategory_id())
+                        && db.checkStockAndFacingData(store_id, categoryData.getCategory_id())
+                        && db.checkPromoComplianceData(store_id, categoryData.getCategory_id())) {
+
+                    holder.categoryIcon.setImageResource(R.drawable.pdr_done);
+                } else {
+
                     holder.categoryIcon.setImageResource(R.drawable.pdr);
+                }
             } else if (categoryData.getCategory().equalsIgnoreCase("Nutritionals")) {
+
+                if (db.checkMsl_AvailabilityData(store_id, categoryData.getCategory_id())
+                        && db.checkStockAndFacingData(store_id, categoryData.getCategory_id())
+                        && db.checkPromoComplianceData(store_id, categoryData.getCategory_id())) {
+
+                    holder.categoryIcon.setImageResource(R.drawable.hfd_done);
+                } else {
                     holder.categoryIcon.setImageResource(R.drawable.hfd);
                 }
+            }
 
 
             holder.lay_menu.setOnClickListener(new View.OnClickListener() {

GSKMTOrange/src/main/res/drawable/toggle_selector_background.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="false" android:drawable="@color/grey_background"  />
+    <item android:state_checked="true" android:drawable="@color/green"  />
+</selector>

GSKMTOrange/src/main/res/layout/content_promo_compliance.xml

@@ -158,7 +158,8 @@
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:textOff="@string/no"
-                                        android:textOn="@string/yes" />
+                                        android:textOn="@string/yes"
+                                        android:background="@drawable/toggle_selector_background"/>
                                 </LinearLayout>
                             </LinearLayout>
 
@@ -196,7 +197,8 @@
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:textOff="@string/no"
-                                        android:textOn="@string/yes" />
+                                        android:textOn="@string/yes"
+                                        android:background="@drawable/toggle_selector_background" />
                                 </LinearLayout>
                             </LinearLayout>
 
@@ -234,7 +236,8 @@
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:textOff="@string/no"
-                                        android:textOn="@string/yes" />
+                                        android:textOn="@string/yes"
+                                        android:background="@drawable/toggle_selector_background" />
                                 </LinearLayout>
                             </LinearLayout>
                         </LinearLayout>

GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml

@@ -92,7 +92,8 @@
                         android:id="@+id/toggle_available"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center" />
+                        android:layout_gravity="center"
+                        android:background="@drawable/toggle_selector_background" />
                 </LinearLayout>
             </LinearLayout>
 

GSKMTOrange/src/main/res/layout/item_promo_sku_list.xml

@@ -89,7 +89,8 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:textOff="@string/no"
-                            android:textOn="@string/yes" />
+                            android:textOn="@string/yes"
+                            android:background="@drawable/toggle_selector_background" />
                     </LinearLayout>
                 </LinearLayout>
 
@@ -127,7 +128,8 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:textOff="@string/no"
-                            android:textOn="@string/yes"/>
+                            android:textOn="@string/yes"
+                            android:background="@drawable/toggle_selector_background"/>
                     </LinearLayout>
                 </LinearLayout>
 
@@ -165,7 +167,8 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:textOff="@string/no"
-                            android:textOn="@string/yes"/>
+                            android:textOn="@string/yes"
+                            android:background="@drawable/toggle_selector_background"/>
                     </LinearLayout>
                 </LinearLayout>
             </LinearLayout>

GSKMTOrange/src/main/res/values/colors.xml

@@ -7,7 +7,7 @@
     <color name="white">#FFFFFF</color>
     <color name="black">#000000</color>
     <color name="grey_background">#EEEEEE</color>
-
+    <color name="green">#FF27A404</color>
     <color name="blue">#2196F3</color>
 
     <color name="colorOrange">#FFE0B2</color>