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

MSL Availability Stock Facing Changes upload

Browse Source
This commit is contained in:
gagangoel290
2017-04-27 10:57:04 +05:30
parent 780a136904
commit e30f6dc189
5 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/layout/content_promo_compliance.xml
+8 -6
View File
@@ -13,10 +13,10 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true">
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:orientation="vertical">
<TextView
android:id="@+id/txt_promoComplianceName"
@@ -125,7 +125,7 @@
android:layout_marginTop="5dp"
android:layout_weight="1"
android:orientation="horizontal"
android:weightSum="3">
android:weightSum="2">
<LinearLayout
android:layout_width="0dp"
@@ -162,7 +162,7 @@
android:layout_height="wrap_content"
android:background="@drawable/toggle_selector_background"
android:textOff="@string/no"
android:textOn="@string/yes"/>
android:textOn="@string/yes" />
</LinearLayout>
</LinearLayout>
@@ -211,6 +211,7 @@
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone"
android:weightSum="5">
<LinearLayout
@@ -278,7 +279,8 @@
android:id="@+id/lin_addtional_promo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" />
android:orientation="vertical"
android:paddingBottom="10dp" />
</LinearLayout>
GSKMTOrange/src/main/res/layout/item_additional_promo_list.xml
+6 -2
View File
@@ -9,6 +9,7 @@
android:id="@+id/card_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_marginTop="5dp"
@@ -53,9 +54,10 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:layout_marginTop="5dp"
android:orientation="horizontal"
android:weightSum="3">
android:weightSum="2">
<LinearLayout
android:layout_width="0dp"
@@ -153,6 +155,7 @@
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone"
android:weightSum="5">
<LinearLayout
@@ -192,9 +195,10 @@
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
GSKMTOrange/src/main/res/layout/item_promo_sku_list.xml
+9 -7
View File
@@ -53,7 +53,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:orientation="horizontal"
android:weightSum="3">
android:weightSum="2">
<LinearLayout
android:layout_width="0dp"
@@ -88,9 +88,9 @@
android:id="@+id/toggle_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>
@@ -127,18 +127,20 @@
android:id="@+id/toggle_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>
<!--Running on Pos-->
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone"
android:weightSum="5">
<LinearLayout
@@ -166,9 +168,9 @@
android:id="@+id/toggle_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>