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

Merge branch 'master' into CodeFire22

Browse Source
This commit is contained in:
YadavendraSinghYaduvanshi
2017-02-15 10:44:27 +05:30
committed by GitHub
parent 6799680555 2fe59a1f27
commit 64fb3f63f8
23 changed files with 2190 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/drawable/bg_boarder_orange.xml
+14
View File
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="2dp" />
<solid android:color="#FFF" />
<stroke
android:width="1dp"
android:color="@color/colorPrimary" />
</shape>
GSKMTOrange/src/main/res/drawable/bg_boarder_orange_transparent.xml
+11
View File
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="15dp" />
<!--<solid android:color="#FFF" />-->
<stroke
android:width="2dp"
android:color="@color/colorPrimary" />
</shape>
GSKMTOrange/src/main/res/layout/activity_stock_facing__planogram_tracker.xml
+34
View File
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context="cpm.com.gskmtorange.gsk_dailyentry.StockFacing_PlanogramTrackerActivity">
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</android.support.design.widget.AppBarLayout>
<include layout="@layout/content_stock_facing__planogram_tracker" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab_stockFacing_PlanogramTracker"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@drawable/save_icon" />
</android.support.design.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/content_stock_facing__planogram_tracker.xml
+66
View File
@@ -0,0 +1,66 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/content_stock_facing__planogram_tracker"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context="cpm.com.gskmtorange.gsk_dailyentry.StockFacing_PlanogramTrackerActivity"
tools:showIn="@layout/activity_stock_facing__planogram_tracker">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp">
<Button
android:id="@+id/btn_addShelf"
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 Shelf"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/white" />
<!--<Button
android:id="@+id/btn_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="Add SKU"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/white" />-->
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/grey_dark_background" />
<!--<android.support.v7.widget.RecyclerView
android:id="@+id/recyclerView_stockFacingPlanogramTracker"
android:layout_width="match_parent"
android:layout_height="match_parent" />-->
<ExpandableListView
android:id="@+id/exp_PlanogramListView"
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
+244
View File
@@ -0,0 +1,244 @@
<?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"-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/light_orange_background"
android:orientation="vertical">
<!--Dialog Title-->
<LinearLayout
android:id="@+id/lin_dialog_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="15dp"
android:paddingLeft="20dp"
android:paddingRight="10dp"
android:paddingTop="15dp"
android:text="Add Shelf"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/colorPrimary" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:background="@color/colorPrimary" />
<!--Add Shelf Position Value-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
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="wrap_content"
android:layout_weight="1.5"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_boarder_orange"
android:gravity="center"
android:text="7"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/colorPrimary" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_boarder_orange"
android:gravity="center"
android:text="6"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/colorPrimary" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_boarder_orange"
android:gravity="center"
android:text="5"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/colorPrimary" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_boarder_orange"
android:gravity="center"
android:text="4"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/colorPrimary" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_boarder_orange"
android:gravity="center"
android:text="3"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/colorPrimary" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_boarder_orange"
android:gravity="center"
android:text="2"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/colorPrimary" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_boarder_orange"
android:gravity="center"
android:text="1"
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: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" />
<Spinner
android:id="@+id/sp_shelfPosition"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="5dp"
android:background="@color/colorPrimary" />
<!--Bottom Buttom-->
<RelativeLayout
android:id="@+id/rel_addShelf_Cancel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:padding="10dp">
<Button
android:id="@+id/dialog_btn_addShelf"
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 Shelf"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/white" />
<Button
android:id="@+id/dialog_btn_cancel"
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>
</android.support.v7.widget.CardView>
</LinearLayout>
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
+62
View File
@@ -0,0 +1,62 @@
<?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">
<Button
android:id="@+id/btn_addSku"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="15dp"
android:text="Add SKU"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" />
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
GSKMTOrange/src/main/res/values/colors.xml
+2 -1
View File
@@ -7,11 +7,12 @@
<color name="white">#FFFFFF</color>
<color name="black">#000000</color>
<color name="grey_background">#EEEEEE</color>
<color name="grey_dark_background">#888</color>
<color name="light_orange_background">#FFF9E0BA</color>
<color name="green">#FF27A404</color>
<color name="blue">#2196F3</color>
<color name="colorOrange">#FFE0B2</color>
</resources>
GSKMTOrange/src/main/res/values/strings.xml
+8
View File
@@ -265,7 +265,15 @@
<string name="first_geotag_the_store">First geotag the store</string>
<string name="new_update_available">New Update Available \n\n Yeni güncelleme var</string>
<string name="title_activity_stock_facing__planogram_tracker">Planogram Tracker</string>
<string name="datanotfound">Data not found in</string>
<string name="title_activity_t2p_brand__avaibility">T2pBrand_Avaibility</string>
<string name="title_activity_fill_brand">Please fill brand data</string>
<!--Stock Facing Planogram Tracker-->
<string name="stock_planogram_data_uploading">Stock Planogram Data Uploading</string>
</resources>