From a9f187943c59004d856421659ea90f47c08b720b Mon Sep 17 00:00:00 2001
From: Gagan290 <gagan290@gmail.com>
Date: Fri, 13 Jan 2017 12:12:46 +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
---
 .../gsk_dailyentry/MSL_AvailabilityActivity.java   |  3 +--
 .../main/res/layout/content_promo_compliance.xml   | 14 +++++++-------
 .../main/res/layout/item_stock_facing_child.xml    |  2 ++
 3 files changed, 10 insertions(+), 9 deletions(-)

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 fd4338f..ae5fa09 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
@@ -400,8 +400,6 @@ 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);
@@ -414,6 +412,7 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
                 holder = (ViewHolder) convertView.getTag();
             }
 
+            holder.txt_skuName.setTextColor(getResources().getColor(R.color.colorPrimary));
             holder.txt_skuName.setText(childData.getSku());
             holder.txt_mbq.setText(childData.getMbq());
 
diff --git a/GSKMTOrange/src/main/res/layout/content_promo_compliance.xml b/GSKMTOrange/src/main/res/layout/content_promo_compliance.xml
index f6d49c0..99f3139 100644
--- a/GSKMTOrange/src/main/res/layout/content_promo_compliance.xml
+++ b/GSKMTOrange/src/main/res/layout/content_promo_compliance.xml
@@ -157,9 +157,9 @@
                                         android:id="@+id/toggle_add_InStock"
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
+                                        android:background="@drawable/toggle_selector_background"
                                         android:textOff="@string/no"
-                                        android:textOn="@string/yes"
-                                        android:background="@drawable/toggle_selector_background"/>
+                                        android:textOn="@string/yes"/>
                                 </LinearLayout>
                             </LinearLayout>
 
@@ -196,9 +196,9 @@
                                         android:id="@+id/toggle_add_promoAnnouncer"
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
+                                        android:background="@drawable/toggle_selector_background"
                                         android:textOff="@string/no"
-                                        android:textOn="@string/yes"
-                                        android:background="@drawable/toggle_selector_background" />
+                                        android:textOn="@string/yes" />
                                 </LinearLayout>
                             </LinearLayout>
 
@@ -235,9 +235,9 @@
                                         android:id="@+id/toggle_add_runningPos"
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
+                                        android:background="@drawable/toggle_selector_background"
                                         android:textOff="@string/no"
-                                        android:textOn="@string/yes"
-                                        android:background="@drawable/toggle_selector_background" />
+                                        android:textOn="@string/yes" />
                                 </LinearLayout>
                             </LinearLayout>
                         </LinearLayout>
@@ -255,7 +255,7 @@
                                 android:id="@+id/btn_add"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_gravity="right"
+                                android:layout_gravity="center"
                                 android:background="@color/colorPrimaryDark"
                                 android:text="@string/promo_compliance_add"
                                 android:textColor="@color/white" />
diff --git a/GSKMTOrange/src/main/res/layout/item_stock_facing_child.xml b/GSKMTOrange/src/main/res/layout/item_stock_facing_child.xml
index b728bd5..74c3c02 100644
--- a/GSKMTOrange/src/main/res/layout/item_stock_facing_child.xml
+++ b/GSKMTOrange/src/main/res/layout/item_stock_facing_child.xml
@@ -77,6 +77,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:gravity="center_horizontal"
+                        android:hint="@string/stock_facing_stock"
                         android:inputType="number"
                         android:maxLength="7"
                         android:textAppearance="?android:attr/textAppearanceSmall"
@@ -105,6 +106,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:gravity="center_horizontal"
+                        android:hint="@string/stock_facing_faceup"
                         android:inputType="number"
                         android:maxLength="7"
                         android:textAppearance="?android:attr/textAppearanceSmall"