AndroidNative2026/Haleon_All_Country
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Icons

Browse Source
This commit is contained in:
Gagan290
2017-01-09 13:30:29 +05:30
parent 0c30da48e7
commit e2d02196c8
4 changed files with 277 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/layout/content_promo_compliance.xml
+32 -14
View File
@@ -10,13 +10,30 @@
tools:context="cpm.com.gskmtorange.gsk_dailyentry.PromoComplianceActivity" tools:context="cpm.com.gskmtorange.gsk_dailyentry.PromoComplianceActivity"
tools:showIn="@layout/activity_promo_compliance"> tools:showIn="@layout/activity_promo_compliance">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<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 <ScrollView
android:id="@+id/scrollView_promoCompliance" android:id="@+id/scrollView_promoCompliance"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"> android:layout_alignParentStart="true"
android:layout_alignParentTop="true">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -64,7 +81,7 @@
android:paddingBottom="5dp" android:paddingBottom="5dp"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:text="Additional Promos" android:text="@string/promo_compliance_additional_promo"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" /> android:textColor="@color/black" />
</LinearLayout> </LinearLayout>
@@ -86,7 +103,7 @@
android:paddingBottom="5dp" android:paddingBottom="5dp"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:text="Promos" android:text="@string/promo_compliance_promo"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" /> android:textColor="@color/black" />
@@ -124,7 +141,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:text="In Stock" android:text="@string/promo_compliance_inStock"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout> </LinearLayout>
@@ -139,8 +156,8 @@
android:id="@+id/toggle_add_InStock" android:id="@+id/toggle_add_InStock"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textOff="No" android:textOff="@string/no"
android:textOn="Yes" /> android:textOn="@string/yes" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@@ -162,7 +179,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:text="Promo Announcer" android:text="@string/promo_compliance_promoAnnouncer"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout> </LinearLayout>
@@ -177,8 +194,8 @@
android:id="@+id/toggle_add_promoAnnouncer" android:id="@+id/toggle_add_promoAnnouncer"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textOff="No" android:textOff="@string/no"
android:textOn="Yes" /> android:textOn="@string/yes" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@@ -200,7 +217,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:text="Running on POS" android:text="@string/promo_compliance_runningPOS"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout> </LinearLayout>
@@ -215,8 +232,8 @@
android:id="@+id/toggle_add_runningPos" android:id="@+id/toggle_add_runningPos"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textOff="No" android:textOff="@string/no"
android:textOn="Yes" /> android:textOn="@string/yes" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@@ -236,7 +253,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="right" android:layout_gravity="right"
android:background="@color/colorPrimaryDark" android:background="@color/colorPrimaryDark"
android:text="Add" android:text="@string/promo_compliance_add"
android:textColor="@color/white" /> android:textColor="@color/white" />
</LinearLayout> </LinearLayout>
@@ -259,4 +276,5 @@
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
</LinearLayout>
</RelativeLayout> </RelativeLayout>
GSKMTOrange/src/main/res/layout/item_additional_promo_list.xml
+6 -6
View File
@@ -23,7 +23,7 @@
android:paddingBottom="5dp" android:paddingBottom="5dp"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:text="Promos SKU" android:text="@string/promo_compliance_promos_sku"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" /> android:textColor="@color/black" />
@@ -73,7 +73,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:text="In Stock" android:text="@string/promo_compliance_inStock"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout> </LinearLayout>
@@ -94,7 +94,7 @@
android:id="@+id/txt_inStock" android:id="@+id/txt_inStock"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Yes" android:text="@string/yes"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" /> android:textColor="@color/black" />
</LinearLayout> </LinearLayout>
@@ -118,7 +118,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:text="Promo Announcer" android:text="@string/promo_compliance_promoAnnouncer"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout> </LinearLayout>
@@ -139,7 +139,7 @@
android:id="@+id/txt_promoAnnouncer" android:id="@+id/txt_promoAnnouncer"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Yes" android:text="@string/yes"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" /> android:textColor="@color/black" />
</LinearLayout> </LinearLayout>
@@ -184,7 +184,7 @@
android:id="@+id/txt_runningPos" android:id="@+id/txt_runningPos"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Yes" android:text="@string/yes"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" /> android:textColor="@color/black" />
GSKMTOrange/src/main/res/layout/item_promo_sku_list.xml
+10 -10
View File
@@ -23,7 +23,7 @@
android:paddingBottom="5dp" android:paddingBottom="5dp"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:text="Promos SKU" android:text="@string/promo_compliance_promos_sku"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" /> android:textColor="@color/black" />
@@ -73,7 +73,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:text="In Stock" android:text="@string/promo_compliance_inStock"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout> </LinearLayout>
@@ -88,8 +88,8 @@
android:id="@+id/toggle_inStock" android:id="@+id/toggle_inStock"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textOff="No" android:textOff="@string/no"
android:textOn="Yes" /> android:textOn="@string/yes" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@@ -111,7 +111,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:text="Promo Announcer" android:text="@string/promo_compliance_promoAnnouncer"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout> </LinearLayout>
@@ -126,8 +126,8 @@
android:id="@+id/toggle_promoAnnouncer" android:id="@+id/toggle_promoAnnouncer"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textOff="No" android:textOff="@string/no"
android:textOn="Yes" /> android:textOn="@string/yes"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@@ -149,7 +149,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:text="Running on POS" android:text="@string/promo_compliance_runningPOS"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout> </LinearLayout>
@@ -164,8 +164,8 @@
android:id="@+id/toggle_runningPos" android:id="@+id/toggle_runningPos"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textOff="No" android:textOff="@string/no"
android:textOn="Yes" /> android:textOn="@string/yes"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
GSKMTOrange/src/main/res/values/strings.xml
+17 -2
View File
@@ -34,6 +34,8 @@
<string name="select">Select</string> <string name="select">Select</string>
<string name="add">Add</string> <string name="add">Add</string>
<string name="cancel">Cancel</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="select_language">Please select language</string>
<string name="title_activity_select_language">SelectLanguageActivity</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_current">Please checkout from current store</string>
<string name="title_store_list_checkout_Already_filled">Data already filled</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="title_store_list_download_data">Please Download Data First</string>
<string name="enter_the_values">Enter the values</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> </resources>