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

Merge branch 'master' into ysy_checkout_new

Browse Source
This commit is contained in:
YadavendraSinghYaduvanshi
2017-01-13 19:19:02 +05:30
committed by GitHub
parent e6ec42a521 b5f5d600d2
commit 9722cd7bac
36 changed files with 1464 additions and 605 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/layout/additionaldialoglayout.xml
+4 -4
View File
@@ -30,7 +30,7 @@
android:layout_height="match_parent"
android:layout_weight="10"
android:text="Brand Name"
android:text="@string/brandname"
android:textStyle="bold" />
<TextView
@@ -59,7 +59,7 @@
android:layout_height="match_parent"
android:layout_weight="10"
android:text="SKU Name"
android:text="@string/skuname"
android:textStyle="bold" />
<TextView
@@ -88,7 +88,7 @@
android:layout_height="match_parent"
android:layout_weight="10"
android:text="Quantity"
android:text="@string/quantity"
android:textStyle="bold" />
<TextView
@@ -118,7 +118,7 @@
android:layout_weight="10"
android:background="@color/grey_background"
android:layout_marginLeft="30dp"
android:text="Delete" />
android:text="@string/delete" />
</LinearLayout>
GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml
+9
View File
@@ -9,6 +9,15 @@
<include layout="@layout/contentadditionalvisibility" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@android:drawable/ic_menu_save"
app:backgroundTint="@color/colorPrimary"
/>
GSKMTOrange/src/main/res/layout/content_promo_compliance.xml
+7 -7
View File
@@ -160,9 +160,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>
@@ -199,9 +199,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>
@@ -238,9 +238,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>
@@ -258,7 +258,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" />
GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml
+2 -2
View File
@@ -62,8 +62,8 @@
android:id="@+id/btntoggle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textOn="Yes"
android:textOff="No"
android:textOn="@string/yes"
android:textOff="@string/no"
android:layout_weight=".5" />
</LinearLayout>
GSKMTOrange/src/main/res/layout/contentstoreimage.xml
+1 -3
View File
@@ -24,7 +24,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/store_image"
android:text="@string/storefront"
android:textSize="@dimen/store_entry_text_size"
android:layout_centerInParent="true"
android:textColor="@color/white"
@@ -90,8 +90,6 @@
<Button
android:id="@+id/btn_save_selfie"
android:layout_width="match_parent"
GSKMTOrange/src/main/res/layout/dialogbox.xml
+1 -1
View File
@@ -11,7 +11,7 @@
android:layout_height="wrap_content"
android:text="@string/store_visited"
android:textColor="@color/black"
android:textSize="25sp" />
android:textSize="18sp" />
<View
android:layout_width="match_parent"
GSKMTOrange/src/main/res/layout/item_stock_facing_child.xml
+2
View File
@@ -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"
GSKMTOrange/src/main/res/layout/storeviewlist.xml
+6 -6
View File
@@ -44,7 +44,7 @@
android:layout_height="wrap_content"
android:layout_alignTop="@+id/storelistviewxml_storeico"
android:layout_toRightOf="@+id/storelistviewxml_storeico"
android:text="GSK MT ORANGE STORE"
android:text="@string/GSKMT"
android:textColor="#1F3A6C"
android:textSize="16sp"
android:textStyle="bold" />
@@ -55,19 +55,20 @@
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/storelistviewxml_storename"
android:layout_below="@+id/storelistviewxml_storename"
android:text="C 126, Okhla II, "
android:text="@string/address"
android:textColor="#666666"
android:textSize="10sp"
android:textStyle="normal" />
<Button
android:id="@+id/chkout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:focusable="false"
android:visibility="invisible" />
android:background="@mipmap/checkout"
/>
<ImageView
android:id="@+id/imageView2"
@@ -76,7 +77,6 @@
android:layout_alignBottom="@+id/storelistviewxml_storeico"
android:layout_alignParentRight="true"
android:background="@mipmap/tick_c"
android:visibility="gone"
/>