From e2d02196c8b3e2c24e3dc9f49a203fd16fdd7566 Mon Sep 17 00:00:00 2001
From: Gagan290 <gagan290@gmail.com>
Date: Mon, 9 Jan 2017 13:30:29 +0530
Subject: [PATCH] Icons

---
 .../res/layout/content_promo_compliance.xml   | 470 +++++++++---------
 .../res/layout/item_additional_promo_list.xml |  12 +-
 .../main/res/layout/item_promo_sku_list.xml   |  20 +-
 GSKMTOrange/src/main/res/values/strings.xml   |  19 +-
 4 files changed, 277 insertions(+), 244 deletions(-)

diff --git a/GSKMTOrange/src/main/res/layout/content_promo_compliance.xml b/GSKMTOrange/src/main/res/layout/content_promo_compliance.xml
index b309b44..c8bc011 100644
--- a/GSKMTOrange/src/main/res/layout/content_promo_compliance.xml
+++ b/GSKMTOrange/src/main/res/layout/content_promo_compliance.xml
@@ -10,253 +10,271 @@
     tools:context="cpm.com.gskmtorange.gsk_dailyentry.PromoComplianceActivity"
     tools:showIn="@layout/activity_promo_compliance">
 
-    <ScrollView
-        android:id="@+id/scrollView_promoCompliance"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true">
+        android:orientation="vertical">
 
-        <LinearLayout
+        <TextView
+            android:id="@+id/txt_promoComplianceName"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="#FFF1710F"
+            android:paddingBottom="10dp"
+            android:paddingLeft="20dp"
+            android:paddingTop="10dp"
+            android:text="@string/title_activity_promo_compliance"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@android:color/black" />
+
+        <ScrollView
+            android:id="@+id/scrollView_promoCompliance"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true">
 
-            <!--Promo sku List-->
             <LinearLayout
-                android:id="@+id/lin_promo_sku"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical" />
-
-            <View
-                android:id="@+id/view_promo_sku"
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/colorPrimaryDark" />
-
-            <!--Add Additional layout-->
-            <android.support.v7.widget.CardView
-                android:id="@+id/card_view"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_margin="5dp"
-                card_view:cardCornerRadius="10dp">
+                android:orientation="vertical">
 
+                <!--Promo sku List-->
                 <LinearLayout
+                    android:id="@+id/lin_promo_sku"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:weightSum="4">
+                    android:orientation="vertical" />
+
+                <View
+                    android:id="@+id/view_promo_sku"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/colorPrimaryDark" />
+
+                <!--Add Additional layout-->
+                <android.support.v7.widget.CardView
+                    android:id="@+id/card_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_margin="5dp"
+                    card_view:cardCornerRadius="10dp">
 
-                    <!--Additional Promo-->
                     <LinearLayout
                         android:layout_width="match_parent"
-                        android:layout_height="0dp"
-                        android:layout_weight="1"
-                        android:background="#70888888"
-                        android:orientation="vertical">
-
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:paddingBottom="5dp"
-                            android:paddingLeft="10dp"
-                            android:paddingTop="5dp"
-                            android:text="Additional Promos"
-                            android:textAppearance="?android:attr/textAppearanceSmall"
-                            android:textColor="@color/black" />
-                    </LinearLayout>
-
-                    <!--Promo Spinner-->
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="0dp"
-                        android:layout_marginTop="5dp"
-                        android:layout_weight="1"
-                        android:orientation="horizontal"
-                        android:weightSum="2">
-
-                        <TextView
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:layout_weight=".8"
-                            android:paddingBottom="5dp"
-                            android:paddingLeft="10dp"
-                            android:paddingTop="5dp"
-                            android:text="Promos"
-                            android:textAppearance="?android:attr/textAppearanceSmall"
-                            android:textColor="@color/black" />
-
-                        <Spinner
-                            android:id="@+id/sp_promo"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1.2" />
-                    </LinearLayout>
-
-                    <!--InStock, Promo Announcer, Running on Pos-->
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="0dp"
-                        android:layout_marginTop="5dp"
-                        android:layout_weight="1"
-                        android:orientation="horizontal"
-                        android:weightSum="3">
-
-                        <LinearLayout
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:layout_weight="1"
-                            android:gravity="center"
-                            android:orientation="vertical"
-                            android:weightSum="5">
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="0dp"
-                                android:layout_weight="2"
-                                android:orientation="vertical">
-
-                                <TextView
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:paddingLeft="10dp"
-                                    android:text="In Stock"
-                                    android:textAppearance="?android:attr/textAppearanceSmall" />
-                            </LinearLayout>
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="0dp"
-                                android:layout_weight="3"
-                                android:gravity="center_horizontal"
-                                android:orientation="vertical">
-
-                                <ToggleButton
-                                    android:id="@+id/toggle_add_InStock"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:textOff="No"
-                                    android:textOn="Yes" />
-                            </LinearLayout>
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:layout_weight="1"
-                            android:gravity="center"
-                            android:orientation="vertical"
-                            android:weightSum="5">
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="0dp"
-                                android:layout_weight="2"
-                                android:orientation="vertical">
-
-                                <TextView
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:paddingLeft="10dp"
-                                    android:text="Promo Announcer"
-                                    android:textAppearance="?android:attr/textAppearanceSmall" />
-                            </LinearLayout>
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="0dp"
-                                android:layout_weight="3"
-                                android:gravity="center_horizontal"
-                                android:orientation="vertical">
-
-                                <ToggleButton
-                                    android:id="@+id/toggle_add_promoAnnouncer"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:textOff="No"
-                                    android:textOn="Yes" />
-                            </LinearLayout>
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:layout_weight="1"
-                            android:gravity="center"
-                            android:orientation="vertical"
-                            android:weightSum="5">
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="0dp"
-                                android:layout_weight="2"
-                                android:orientation="vertical">
-
-                                <TextView
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:paddingLeft="10dp"
-                                    android:text="Running on POS"
-                                    android:textAppearance="?android:attr/textAppearanceSmall" />
-                            </LinearLayout>
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="0dp"
-                                android:layout_weight="3"
-                                android:gravity="center_horizontal"
-                                android:orientation="vertical">
-
-                                <ToggleButton
-                                    android:id="@+id/toggle_add_runningPos"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:textOff="No"
-                                    android:textOn="Yes" />
-                            </LinearLayout>
-                        </LinearLayout>
-                    </LinearLayout>
-
-                    <!--Add Button-->
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="0dp"
-                        android:layout_marginTop="5dp"
-                        android:layout_weight="1"
+                        android:layout_height="wrap_content"
                         android:orientation="vertical"
-                        android:paddingRight="15dp">
+                        android:weightSum="4">
+
+                        <!--Additional Promo-->
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_weight="1"
+                            android:background="#70888888"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:paddingBottom="5dp"
+                                android:paddingLeft="10dp"
+                                android:paddingTop="5dp"
+                                android:text="@string/promo_compliance_additional_promo"
+                                android:textAppearance="?android:attr/textAppearanceSmall"
+                                android:textColor="@color/black" />
+                        </LinearLayout>
+
+                        <!--Promo Spinner-->
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_marginTop="5dp"
+                            android:layout_weight="1"
+                            android:orientation="horizontal"
+                            android:weightSum="2">
+
+                            <TextView
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_vertical"
+                                android:layout_weight=".8"
+                                android:paddingBottom="5dp"
+                                android:paddingLeft="10dp"
+                                android:paddingTop="5dp"
+                                android:text="@string/promo_compliance_promo"
+                                android:textAppearance="?android:attr/textAppearanceSmall"
+                                android:textColor="@color/black" />
+
+                            <Spinner
+                                android:id="@+id/sp_promo"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1.2" />
+                        </LinearLayout>
+
+                        <!--InStock, Promo Announcer, Running on Pos-->
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_marginTop="5dp"
+                            android:layout_weight="1"
+                            android:orientation="horizontal"
+                            android:weightSum="3">
+
+                            <LinearLayout
+                                android:layout_width="0dp"
+                                android:layout_height="match_parent"
+                                android:layout_weight="1"
+                                android:gravity="center"
+                                android:orientation="vertical"
+                                android:weightSum="5">
+
+                                <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="0dp"
+                                    android:layout_weight="2"
+                                    android:orientation="vertical">
+
+                                    <TextView
+                                        android:layout_width="match_parent"
+                                        android:layout_height="wrap_content"
+                                        android:paddingLeft="10dp"
+                                        android:text="@string/promo_compliance_inStock"
+                                        android:textAppearance="?android:attr/textAppearanceSmall" />
+                                </LinearLayout>
+
+                                <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="0dp"
+                                    android:layout_weight="3"
+                                    android:gravity="center_horizontal"
+                                    android:orientation="vertical">
+
+                                    <ToggleButton
+                                        android:id="@+id/toggle_add_InStock"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:textOff="@string/no"
+                                        android:textOn="@string/yes" />
+                                </LinearLayout>
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:layout_width="0dp"
+                                android:layout_height="match_parent"
+                                android:layout_weight="1"
+                                android:gravity="center"
+                                android:orientation="vertical"
+                                android:weightSum="5">
+
+                                <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="0dp"
+                                    android:layout_weight="2"
+                                    android:orientation="vertical">
+
+                                    <TextView
+                                        android:layout_width="match_parent"
+                                        android:layout_height="wrap_content"
+                                        android:paddingLeft="10dp"
+                                        android:text="@string/promo_compliance_promoAnnouncer"
+                                        android:textAppearance="?android:attr/textAppearanceSmall" />
+                                </LinearLayout>
+
+                                <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="0dp"
+                                    android:layout_weight="3"
+                                    android:gravity="center_horizontal"
+                                    android:orientation="vertical">
+
+                                    <ToggleButton
+                                        android:id="@+id/toggle_add_promoAnnouncer"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:textOff="@string/no"
+                                        android:textOn="@string/yes" />
+                                </LinearLayout>
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:layout_width="0dp"
+                                android:layout_height="match_parent"
+                                android:layout_weight="1"
+                                android:gravity="center"
+                                android:orientation="vertical"
+                                android:weightSum="5">
+
+                                <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="0dp"
+                                    android:layout_weight="2"
+                                    android:orientation="vertical">
+
+                                    <TextView
+                                        android:layout_width="match_parent"
+                                        android:layout_height="wrap_content"
+                                        android:paddingLeft="10dp"
+                                        android:text="@string/promo_compliance_runningPOS"
+                                        android:textAppearance="?android:attr/textAppearanceSmall" />
+                                </LinearLayout>
+
+                                <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="0dp"
+                                    android:layout_weight="3"
+                                    android:gravity="center_horizontal"
+                                    android:orientation="vertical">
+
+                                    <ToggleButton
+                                        android:id="@+id/toggle_add_runningPos"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:textOff="@string/no"
+                                        android:textOn="@string/yes" />
+                                </LinearLayout>
+                            </LinearLayout>
+                        </LinearLayout>
+
+                        <!--Add Button-->
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_marginTop="5dp"
+                            android:layout_weight="1"
+                            android:orientation="vertical"
+                            android:paddingRight="15dp">
+
+                            <Button
+                                android:id="@+id/btn_add"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="right"
+                                android:background="@color/colorPrimaryDark"
+                                android:text="@string/promo_compliance_add"
+                                android:textColor="@color/white" />
+                        </LinearLayout>
 
-                        <Button
-                            android:id="@+id/btn_add"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="right"
-                            android:background="@color/colorPrimaryDark"
-                            android:text="Add"
-                            android:textColor="@color/white" />
                     </LinearLayout>
+                </android.support.v7.widget.CardView>
 
-                </LinearLayout>
-            </android.support.v7.widget.CardView>
+                <!--Additional List-->
+                <View
+                    android:id="@+id/view_additional_promo"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/colorPrimaryDark" />
 
-            <!--Additional List-->
-            <View
-                android:id="@+id/view_additional_promo"
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/colorPrimaryDark" />
+                <LinearLayout
+                    android:id="@+id/lin_addtional_promo"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical" />
 
-            <LinearLayout
-                android:id="@+id/lin_addtional_promo"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical" />
+            </LinearLayout>
 
-        </LinearLayout>
-
-    </ScrollView>
+        </ScrollView>
+    </LinearLayout>
 </RelativeLayout>
diff --git a/GSKMTOrange/src/main/res/layout/item_additional_promo_list.xml b/GSKMTOrange/src/main/res/layout/item_additional_promo_list.xml
index 1bafad8..7fb435f 100644
--- a/GSKMTOrange/src/main/res/layout/item_additional_promo_list.xml
+++ b/GSKMTOrange/src/main/res/layout/item_additional_promo_list.xml
@@ -23,7 +23,7 @@
                 android:paddingBottom="5dp"
                 android:paddingLeft="10dp"
                 android:paddingTop="5dp"
-                android:text="Promos SKU"
+                android:text="@string/promo_compliance_promos_sku"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:textColor="@color/black" />
 
@@ -73,7 +73,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:paddingLeft="10dp"
-                            android:text="In Stock"
+                            android:text="@string/promo_compliance_inStock"
                             android:textAppearance="?android:attr/textAppearanceSmall" />
                     </LinearLayout>
 
@@ -94,7 +94,7 @@
                             android:id="@+id/txt_inStock"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="Yes"
+                            android:text="@string/yes"
                             android:textAppearance="?android:attr/textAppearanceSmall"
                             android:textColor="@color/black" />
                     </LinearLayout>
@@ -118,7 +118,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:paddingLeft="10dp"
-                            android:text="Promo Announcer"
+                            android:text="@string/promo_compliance_promoAnnouncer"
                             android:textAppearance="?android:attr/textAppearanceSmall" />
                     </LinearLayout>
 
@@ -139,7 +139,7 @@
                             android:id="@+id/txt_promoAnnouncer"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="Yes"
+                            android:text="@string/yes"
                             android:textAppearance="?android:attr/textAppearanceSmall"
                             android:textColor="@color/black" />
                     </LinearLayout>
@@ -184,7 +184,7 @@
                             android:id="@+id/txt_runningPos"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="Yes"
+                            android:text="@string/yes"
                             android:textAppearance="?android:attr/textAppearanceSmall"
                             android:textColor="@color/black" />
 
diff --git a/GSKMTOrange/src/main/res/layout/item_promo_sku_list.xml b/GSKMTOrange/src/main/res/layout/item_promo_sku_list.xml
index abc8498..0c4046f 100644
--- a/GSKMTOrange/src/main/res/layout/item_promo_sku_list.xml
+++ b/GSKMTOrange/src/main/res/layout/item_promo_sku_list.xml
@@ -23,7 +23,7 @@
                 android:paddingBottom="5dp"
                 android:paddingLeft="10dp"
                 android:paddingTop="5dp"
-                android:text="Promos SKU"
+                android:text="@string/promo_compliance_promos_sku"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:textColor="@color/black" />
 
@@ -73,7 +73,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:paddingLeft="10dp"
-                            android:text="In Stock"
+                            android:text="@string/promo_compliance_inStock"
                             android:textAppearance="?android:attr/textAppearanceSmall" />
                     </LinearLayout>
 
@@ -88,8 +88,8 @@
                             android:id="@+id/toggle_inStock"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textOff="No"
-                            android:textOn="Yes" />
+                            android:textOff="@string/no"
+                            android:textOn="@string/yes" />
                     </LinearLayout>
                 </LinearLayout>
 
@@ -111,7 +111,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:paddingLeft="10dp"
-                            android:text="Promo Announcer"
+                            android:text="@string/promo_compliance_promoAnnouncer"
                             android:textAppearance="?android:attr/textAppearanceSmall" />
                     </LinearLayout>
 
@@ -126,8 +126,8 @@
                             android:id="@+id/toggle_promoAnnouncer"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textOff="No"
-                            android:textOn="Yes" />
+                            android:textOff="@string/no"
+                            android:textOn="@string/yes"/>
                     </LinearLayout>
                 </LinearLayout>
 
@@ -149,7 +149,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:paddingLeft="10dp"
-                            android:text="Running on POS"
+                            android:text="@string/promo_compliance_runningPOS"
                             android:textAppearance="?android:attr/textAppearanceSmall" />
                     </LinearLayout>
 
@@ -164,8 +164,8 @@
                             android:id="@+id/toggle_runningPos"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textOff="No"
-                            android:textOn="Yes" />
+                            android:textOff="@string/no"
+                            android:textOn="@string/yes"/>
                     </LinearLayout>
                 </LinearLayout>
             </LinearLayout>
diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml
index a3cb639..3ff9dc3 100644
--- a/GSKMTOrange/src/main/res/values/strings.xml
+++ b/GSKMTOrange/src/main/res/values/strings.xml
@@ -34,6 +34,8 @@
     <string name="select">Select</string>
     <string name="add">Add</string>
     <string name="cancel">Cancel</string>
+    <string name="yes">Yes</string>
+    <string name="no">No</string>
 
     <string name="select_language">Please select language</string>
     <string name="title_activity_select_language">SelectLanguageActivity</string>
@@ -96,10 +98,23 @@
 
     <string name="title_store_list_checkout_current">Please checkout from current store</string>
     <string name="title_store_list_checkout_Already_filled">Data already filled</string>
-    <string name="title_activity_promo_compliance">PromoCompliance</string>
     <string name="title_store_list_download_data">Please Download Data First</string>
-
     <string name="enter_the_values">Enter the values</string>
 
 
+    <!--Gagan start new code 1-->
+    <string name="title_activity_promo_compliance">Promotion Compliance</string>
+
+    <string name="promo_compliance_additional_promo">Additional Promos</string>
+    <string name="promo_compliance_promo">Promos</string>
+    <string name="promo_compliance_promos_sku">Promos SKU</string>
+    <string name="promo_compliance_sku">SKU</string>
+    <string name="promo_compliance_inStock">In Stock</string>
+    <string name="promo_compliance_promoAnnouncer">Promo Announcer</string>
+    <string name="promo_compliance_runningPOS">Running on POS</string>
+    <string name="promo_compliance_add">Add</string>
+
+    <!--Gagan end new code 1-->
+
+
 </resources>