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

//PromoCompliance Default Toggle Changes

Browse Source
This commit is contained in:
Gagan290
2017-02-03 18:05:52 +05:30
parent 15b06c26c7
commit 734ddee591
11 changed files with 642 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/layout/content_stock_facing__planogram_tracker.xml
+13 -4
View File
@@ -31,7 +31,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/white" />
<Button
<!--<Button
android:id="@+id/btn_addSKU"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -41,7 +41,7 @@
android:padding="5dp"
android:text="Add SKU"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/white" />
android:textColor="@color/white" />-->
</RelativeLayout>
<View
@@ -49,9 +49,18 @@
android:layout_height="1dp"
android:background="@color/grey_dark_background" />
<android.support.v7.widget.RecyclerView
<!--<android.support.v7.widget.RecyclerView
android:id="@+id/recyclerView_stockFacingPlanogramTracker"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent" />-->
<ExpandableListView
android:id="@+id/exp_stockFacing_PlanogramTrackerListView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:cacheColorHint="#00000000"
android:divider="@null"
android:dividerHeight="0dp"
android:scrollingCache="false" />
</LinearLayout>
</RelativeLayout>
GSKMTOrange/src/main/res/layout/dialog_stock_facing_planogram_tracker.xml
+57 -20
View File
@@ -41,7 +41,6 @@
</LinearLayout>
<View
android:id="@+id/view_divider"
android:layout_width="match_parent"
android:layout_height="2dp"
android:background="@color/colorPrimary" />
@@ -50,21 +49,22 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:orientation="vertical">
<!--Add Shelf View-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="horizontal"
android:padding="10dp"
android:weightSum="2">
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="vertical"
android:padding="10dp">
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
@@ -129,44 +129,81 @@
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/colorPrimary" />
</LinearLayout>
</LinearLayout>
<View
android:id="@+id/view_divider1"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginBottom="5dp"
android:background="@color/colorPrimary" />
<!--Add Shelf and Shelf Position-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="2">
<!--Add Shelf-->
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="vertical"
android:padding="10dp">
android:paddingLeft="10dp"
android:paddingRight="10dp">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingTop="5dp"
android:text="Add Shelf"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/colorPrimary" />
<Spinner
android:id="@+id/sp_addShelf"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
<!--Shelf Position-->
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="vertical"
android:paddingLeft="10dp"
android:paddingRight="10dp">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingTop="5dp"
android:text="Position on Shelf"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/colorPrimary" />
<EditText
android:id="@+id/ed_shelf_position"
<Spinner
android:id="@+id/sp_shelfPosition"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:gravity="center_horizontal"
android:hint=""
android:maxLength="10"
android:inputType="number"
android:paddingBottom="10dp"
android:paddingTop="10dp"
android:textColorHint="@color/colorPrimary" />
android:layout_height="match_parent" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<View
android:id="@+id/view_divider1"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="5dp"
android:background="@color/colorPrimary" />
<!--Bottom Buttom-->
GSKMTOrange/src/main/res/layout/item_stock_facing_planogram_header.xml
+64
View File
@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical">
<android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:id="@+id/card_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="5dp"
card_view:cardBackgroundColor="@color/light_orange_background"
card_view:cardCornerRadius="10dp">
<LinearLayout
android:id="@+id/lin_stockFaceupHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="2">
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1.2"
android:orientation="horizontal"
android:weightSum="2">
<TextView
android:id="@+id/txt_shelfHeader"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:paddingLeft="20dp"
android:paddingRight="5dp"
android:text="Brand Name"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/colorPrimaryDark" />
</LinearLayout>
<!--Camera Images-->
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".8"
android:gravity="center_vertical|right"
android:orientation="horizontal"
android:padding="2dp">
<Button
android:id="@+id/btn_addSku"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:background="@color/colorPrimary"
android:text="Add SKU"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/white" />
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
GSKMTOrange/src/main/res/values/colors.xml
+1 -1
View File
@@ -8,7 +8,7 @@
<color name="black">#000000</color>
<color name="grey_background">#EEEEEE</color>
<color name="grey_dark_background">#888</color>
<color name="light_orange_background">#FFF4D19D</color>
<color name="light_orange_background">#FFF9E0BA</color>
<color name="green">#FF27A404</color>
<color name="blue">#2196F3</color>