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-07 16:55:53 +05:30
parent 734ddee591
commit 128eae193d
9 changed files with 644 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/layout/activity_stock_facing__planogram_tracker.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<include layout="@layout/content_stock_facing__planogram_tracker" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:id="@+id/fab_stockFacing_PlanogramTracker"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
GSKMTOrange/src/main/res/layout/content_stock_facing__planogram_tracker.xml
+1 -1
View File
@@ -55,7 +55,7 @@
android:layout_height="match_parent" />-->
<ExpandableListView
android:id="@+id/exp_stockFacing_PlanogramTrackerListView"
android:id="@+id/exp_PlanogramListView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:cacheColorHint="#00000000"
GSKMTOrange/src/main/res/layout/dialog_stock_facing_planogram_tracker_add_sku.xml
+77
View File
@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/card_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
card_view:cardBackgroundColor="@color/light_orange_background"
card_view:cardCornerRadius="20dp">
<!--android:background="@drawable/bg_boarder_orange_transparent"-->
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/light_orange_background"
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">
<LinearLayout
android:id="@+id/lin_addSku"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" />
</LinearLayout>
<!--Bottom Buttom-->
<RelativeLayout
android:id="@+id/rel_addSku_Cancel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="10dp">
<Button
android:id="@+id/dialog_btn_addSku_Shelf"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginLeft="10dp"
android:background="@color/colorPrimary"
android:padding="5dp"
android:text="Add SKU to Shelf"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/white" />
<Button
android:id="@+id/dialog_btn_cancel_addSku"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="10dp"
android:background="@color/colorPrimary"
android:padding="5dp"
android:text="Cancel"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/white" />
</RelativeLayout>
</LinearLayout>
</ScrollView>
</android.support.v7.widget.CardView>
</LinearLayout>
GSKMTOrange/src/main/res/layout/item_stock_facing_planogram_child.xml
+65
View File
@@ -0,0 +1,65 @@
<?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.6"
android:orientation="horizontal">
<TextView
android:id="@+id/txt_skuChild"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:paddingBottom="10dp"
android:paddingLeft="20dp"
android:paddingRight="5dp"
android:paddingTop="10dp"
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=".4"
android:gravity="center_vertical|center_horizontal"
android:orientation="horizontal"
android:padding="5dp">
<CheckBox
android:id="@+id/chk_sku"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/colorPrimary" />
<!--</android.support.v7.widget.CardView>-->
</LinearLayout>
GSKMTOrange/src/main/res/layout/item_stock_facing_planogram_header.xml
+3 -5
View File
@@ -45,18 +45,16 @@
android:layout_height="match_parent"
android:layout_weight=".8"
android:gravity="center_vertical|right"
android:orientation="horizontal"
android:padding="2dp">
android:orientation="horizontal">
<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:layout_marginRight="15dp"
android:text="Add SKU"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/white" />
android:textColor="@color/black" />
</LinearLayout>
</LinearLayout>