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

YSY commit

Browse Source
This commit is contained in:
yadavendras
2019-03-01 20:32:01 +05:30
parent 863ac18681
commit 97d30b2f5b
170 changed files with 8407 additions and 943 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/drawable/add.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

GSKMTOrange/src/main/res/drawable/big_button_background.xml
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:state_pressed="true" >
<shape android:shape="oval" >
</shape>
</item>
<item android:state_focused="true">
<shape android:shape="oval" >
<stroke android:width="1.5dip" android:color="@color/default_button_press" />
<solid android:color="@android:color/transparent"/>
</shape>
</item>
<item >
<shape android:shape="oval" >
<stroke android:width="1.5dip" android:color="@color/default_button_press" />
<solid android:color="@android:color/transparent"/>
</shape>
</item>
</selector>
GSKMTOrange/src/main/res/drawable/big_button_effect.xml
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item >
<shape android:shape="oval" >
<solid android:color="@color/default_button_press"/>
</shape>
</item>
</selector>
GSKMTOrange/src/main/res/drawable/cancel.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.8 KiB

GSKMTOrange/src/main/res/drawable/circle.xml
+10
View File
@@ -0,0 +1,10 @@
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<stroke
android:width="2dp"
android:color="#6ab17b" />
<size
android:width="25dp"
android:height="25dp" />
</shape>
GSKMTOrange/src/main/res/drawable/current_location_marker_small.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.9 KiB

GSKMTOrange/src/main/res/drawable/indicator_background.xml
+9
View File
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item >
<shape android:shape="oval" >
<stroke android:width="1dip" android:color="@color/default_indicator" />
<solid android:color="@android:color/transparent"/>
</shape>
</item>
</selector>
GSKMTOrange/src/main/res/drawable/indicator_effect.xml
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item >
<shape android:shape="oval" >
<solid android:color="@color/default_indicator"/>
</shape>
</item>
</selector>
GSKMTOrange/src/main/res/drawable/save_icon.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

GSKMTOrange/src/main/res/drawable/small_button_background.xml
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:state_pressed="true" >
<shape android:shape="oval" >
</shape>
</item>
<item android:state_focused="true">
<shape android:shape="oval" >
<stroke android:width="1dip" android:color="@color/default_button_press" />
<solid android:color="@android:color/transparent"/>
</shape>
</item>
<item >
<shape android:shape="oval" >
<stroke android:width="1dip" android:color="@color/default_button_press" />
<solid android:color="@android:color/transparent"/>
</shape>
</item>
</selector>
GSKMTOrange/src/main/res/drawable/small_button_effect.xml
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item >
<shape android:shape="oval" >
<solid android:color="@color/default_button_press"/>
</shape>
</item>
</selector>
GSKMTOrange/src/main/res/drawable/store_location_mark_small.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.0 KiB

GSKMTOrange/src/main/res/layout/activity_additional_promo_skuwise.xml
+1 -7
View File
@@ -31,12 +31,6 @@
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@drawable/save_icon" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab_add"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|start"
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@drawable/add" />
</android.support.design.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/activity_change_password.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"
tools:context=".password.ChangePasswordActivity">
<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_change_password" />
<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_dialog_email"
android:visibility="gone"/>
</android.support.design.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/activity_geo_tag.xml
+1 -1
View File
@@ -38,7 +38,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|left"
android:layout_margin="@dimen/fab_margin"
android:src="@mipmap/camera_orange"
android:src="@mipmap/camera_white"
app:backgroundTint="@color/colorAccent" />
</android.support.design.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/activity_mpin.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"
tools:context=".password.MPinActivity">
<!--<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_mpin" />
<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_dialog_email"
android:visibility="gone"/>
</android.support.design.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/activity_msl__availability_stock_facing.xml
+2 -1
View File
@@ -26,6 +26,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@drawable/save_icon" />
android:scaleType="center"
app:srcCompat="@mipmap/save_icon" />
</android.support.design.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/activity_store_route.xml
+35 -5
View File
@@ -1,9 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<fragment xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:map="http://schemas.android.com/apk/res-auto"
<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:id="@+id/map"
android:name="com.google.android.gms.maps.SupportMapFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".storeinmap.StoreRouteActivity" />
android:fitsSystemWindows="true"
tools:context="cpm.com.gskmtorange.storeinmap.StoreRouteActivity">
<!-- <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_store_route" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|center"
android:layout_margin="8dp"
android:src="@mipmap/cancel"
app:fabSize="mini"
android:scaleType="center"
app:backgroundTint="@color/colorAccent" />
</android.support.design.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/additionallistlayout.xml
+17 -2
View File
@@ -2,14 +2,26 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:background="@color/grey_background"
android:orientation="vertical">
<android.support.v7.widget.CardView
android:id="@+id/card_view"
android:layout_margin="5dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
card_view:cardCornerRadius="10dp"
android:elevation="5dp"
card_view:cardBackgroundColor="@color/white">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="5dp"
android:paddingRight="5dp">
android:paddingRight="5dp"
>
<LinearLayout
android:layout_width="match_parent"
@@ -112,7 +124,8 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal">
android:orientation="horizontal"
android:layout_marginBottom="5dp">
<Button
android:id="@+id/delete_btn"
@@ -126,4 +139,6 @@
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
GSKMTOrange/src/main/res/layout/audit_question_list_item.xml
+2
View File
@@ -58,6 +58,8 @@
android:layout_height="match_parent"
android:focusable="true"
android:visibility="gone"
android:inputType="number"
android:maxLength="5"
/>
</LinearLayout>
GSKMTOrange/src/main/res/layout/big_button_view.xml
+45
View File
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/frame_layout"
android:layout_width="@dimen/default_big_button_width"
android:layout_height="@dimen/default_big_button_height"
android:background="@drawable/big_button_background"
android:clickable="true"
>
<View
android:id="@+id/click_effect"
android:layout_width="@dimen/default_big_button_width"
android:layout_height="@dimen/default_big_button_height"
android:background="@drawable/big_button_effect"
/>
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="vertical"
android:layout_gravity="center"
>
<TextView
android:id="@+id/text"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="5"
android:textSize="35sp"
android:gravity="center_horizontal|bottom"
/>
<TextView
android:id="@+id/sub_text"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginTop="-8dp"
android:text="ABC"
android:gravity="center_horizontal|top"
/>
</LinearLayout>
</FrameLayout>
GSKMTOrange/src/main/res/layout/category_menu_row.xml
+8 -18
View File
@@ -8,7 +8,6 @@
<android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
card_view:cardBackgroundColor="@android:color/white"
card_view:cardUseCompatPadding="true">
@@ -21,33 +20,24 @@
android:weightSum="2">
<!--android:weightSum="10"-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:id="@+id/categoryIcon"
android:layout_width="80dp"
android:layout_height="80dp"
android:src="@drawable/category" />
</LinearLayout>
<ImageView
android:id="@+id/categoryIcon"
android:layout_width="100dp"
android:layout_height="100dp"
android:src="@mipmap/analgesics_tick"
android:layout_gravity="center"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:orientation="vertical"
android:weightSum="1">
>
<TextView
android:id="@+id/categoryName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_weight="1"
android:background="#FFF"
android:ellipsize="end"
android:gravity="center"
GSKMTOrange/src/main/res/layout/content_additional_promo_skuwise.xml
+203 -157
View File
@@ -9,7 +9,8 @@
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context=".dailyentry.AdditionalPromoSKUwiseActivity"
tools:showIn="@layout/activity_additional_promo_skuwise"
android:orientation="vertical">
android:orientation="vertical"
android:background="@color/grey_background">
<android.support.v7.widget.CardView
android:id="@+id/card_view"
@@ -43,186 +44,231 @@
android:textColor="@color/black" />
</LinearLayout>
<!--Sub Category Spinner-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:orientation="horizontal"
android:padding="5dp"
android:weightSum="2">
<TextView
android:id="@+id/tv_"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1.5"
android:gravity="center_vertical"
android:paddingLeft="5dp"
android:text="@string/is_there_promo_compliance" />
<ToggleButton
android:id="@+id/btntoggle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight=".8"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingTop="5dp"
android:text="@string/sub_category"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" />
android:textOn="@string/yes"
android:textOff="@string/no"
android:background="@drawable/toggle_selector_background"
android:layout_weight=".5" />
<Spinner
android:id="@+id/sp_sub_category"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.2" />
</LinearLayout>
<!--Brand Spinner-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:orientation="horizontal"
android:weightSum="2">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight=".8"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingTop="5dp"
android:text="@string/brand"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" />
<Spinner
android:id="@+id/sp_brand"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.2" />
</LinearLayout>
<!--SKU Spinner-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:orientation="horizontal"
android:weightSum="2">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight=".8"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:text="@string/sku"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" />
<Spinner
android:id="@+id/sp_sku"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.2" />
</LinearLayout>
<LinearLayout
android:id="@+id/lin_parent_promo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:orientation="horizontal"
android:weightSum="2">
android:orientation="vertical">
<TextView
android:layout_width="0dp"
<!--Sub Category Spinner-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight=".8"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingTop="5dp"
android:text="@string/price"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" />
android:layout_marginTop="2dp"
android:orientation="horizontal"
android:weightSum="2">
<EditText
android:id="@+id/et_price"
android:layout_width="0dp"
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight=".8"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingTop="5dp"
android:text="@string/sub_category"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" />
<Spinner
android:id="@+id/sp_sub_category"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.2" />
</LinearLayout>
<!--Brand Spinner-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.2"
android:textSize="@dimen/text_size_xsmall"
android:inputType="numberDecimal"
android:maxLength="5"/>
android:layout_marginTop="2dp"
android:orientation="horizontal"
android:weightSum="2">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight=".8"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingTop="5dp"
android:text="@string/brand"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" />
<Spinner
android:id="@+id/sp_brand"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.2" />
</LinearLayout>
<!--SKU Spinner-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:orientation="horizontal"
android:weightSum="2">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight=".8"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:text="@string/sku"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" />
<Spinner
android:id="@+id/sp_sku"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.2" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:orientation="horizontal"
android:weightSum="2">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight=".8"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingTop="5dp"
android:text="@string/price"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" />
<EditText
android:id="@+id/et_price"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.2"
android:textSize="@dimen/text_size_xsmall"
android:inputType="numberDecimal"
android:maxLength="5"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:orientation="horizontal"
android:weightSum="2">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight=".8"
android:paddingLeft="10dp"
android:text="@string/discount_value"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" />
<EditText
android:id="@+id/et_discount"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="@dimen/text_size_xsmall"
android:inputType="number"
android:layout_weight="1.2"
android:maxLength="5"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:orientation="horizontal"
android:weightSum="2">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingTop="5dp"
android:text="@string/price_flasher_available"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" />
<Spinner
android:id="@+id/sp_flasher"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight=".6" />
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.4">
<ImageView
android:id="@+id/img_promotion_add"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_centerInParent="true"
android:layout_margin="5dp"
android:background="@mipmap/camera_orange"/>
</RelativeLayout>
</LinearLayout>
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab_add"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_margin="5dp"
app:srcCompat="@drawable/add" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:orientation="horizontal"
android:weightSum="2">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight=".8"
android:paddingLeft="10dp"
android:text="@string/discount_value"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" />
<EditText
android:id="@+id/et_discount"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="@dimen/text_size_xsmall"
android:inputType="number"
android:layout_weight="1.2"
android:maxLength="5"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:orientation="horizontal"
android:weightSum="2">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingTop="5dp"
android:text="@string/price_flasher_available"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" />
<Spinner
android:id="@+id/sp_flasher"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight=".6" />
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.4">
<ImageView
android:id="@+id/img_promotion_add"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_centerInParent="true"
android:layout_margin="5dp"
android:background="@mipmap/camera_orange"/>
</RelativeLayout>
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
GSKMTOrange/src/main/res/layout/content_change_password.xml
+149
View File
@@ -0,0 +1,149 @@
<?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:card_view="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:background="@color/grey_background"
android:gravity="center_horizontal"
android:orientation="vertical"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
tools:context=".password.ChangePasswordActivity"
tools:showIn="@layout/activity_change_password">
<!-- Login progress -->
<ProgressBar
android:id="@+id/login_progress"
style="?android:attr/progressBarStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_marginBottom="8dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_centerInParent="true">
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginTop="20dp"
android:layout_marginRight="5dp"
android:layout_marginBottom="5dp"
card_view:cardBackgroundColor="@color/white"
card_view:cardCornerRadius="5dp"
>
<LinearLayout
android:id="@+id/email_login_form"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical"
android:paddingTop="20dp"
android:paddingBottom="40dp">
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="5dp"
android:paddingRight="5dp"
app:passwordToggleEnabled="true">
<EditText
android:id="@+id/et_old_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/old_password"
android:imeActionLabel="@string/action_sign_in_short"
android:imeOptions="actionUnspecified"
android:inputType="textPassword"
android:maxLines="1"
android:singleLine="true"
android:drawableStart="@android:drawable/ic_lock_idle_lock"
android:drawableLeft="@android:drawable/ic_lock_idle_lock"/>
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="5dp"
android:paddingRight="5dp"
app:passwordToggleEnabled="true">
<EditText
android:id="@+id/et_new_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/new_password"
android:imeActionLabel="@string/action_sign_in_short"
android:imeOptions="actionUnspecified"
android:inputType="textPassword"
android:maxLines="1"
android:singleLine="true"
android:drawableStart="@android:drawable/ic_lock_idle_lock"
android:drawableLeft="@android:drawable/ic_lock_idle_lock"/>
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="5dp"
android:paddingRight="5dp"
app:passwordToggleEnabled="true">
<EditText
android:id="@+id/et_confirm_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/confirm_password"
android:imeActionLabel="@string/action_sign_in_short"
android:imeOptions="actionUnspecified"
android:inputType="textPassword"
android:maxLines="1"
android:singleLine="true"
android:drawableStart="@android:drawable/ic_lock_idle_lock"
android:drawableLeft="@android:drawable/ic_lock_idle_lock"/>
</android.support.design.widget.TextInputLayout>
<Button
android:id="@+id/btn_submit"
style="?android:textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginTop="16dp"
android:layout_marginRight="5dp"
android:text="@string/submit"
android:textStyle="bold" />
<ImageView
android:id="@+id/img_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@mipmap/outline_info_black_36"
android:layout_gravity="right"
android:layout_marginTop="5dp"
android:layout_marginRight="10dp"/>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
</RelativeLayout>
GSKMTOrange/src/main/res/layout/content_mpin.xml
+40
View File
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context=".password.MPinActivity"
tools:showIn="@layout/activity_mpin">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true">
<ImageView
android:id="@+id/image_1"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="100dp"
android:text="Click to show"
android:layout_gravity="bottom"
android:textColor="@android:color/white"
android:gravity="center"
android:textSize="18sp"
/>
<cpm.com.gskmtorange.blurlockview.BlurLockView
android:id="@+id/blurlockview"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
</FrameLayout>
</LinearLayout>
GSKMTOrange/src/main/res/layout/content_promo_compliance.xml
+15 -5
View File
@@ -242,21 +242,21 @@
android:paddingRight="15dp"
android:weightSum="1">
<LinearLayout
<RelativeLayout
android:id="@+id/lin_promotion"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".5"
android:orientation="vertical">
>
<ImageView
android:id="@+id/img_addPromotion"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_gravity="center"
android:layout_centerInParent="true"
android:layout_margin="5dp" />
<!--android:src="@mipmap/camera_grey"-->
</LinearLayout>
</RelativeLayout>
<LinearLayout
android:layout_width="0dp"
@@ -271,7 +271,17 @@
android:layout_gravity="center"
android:background="@color/colorPrimaryDark"
android:text="@string/promo_compliance_add"
android:textColor="@color/white" />
android:textColor="@color/white"
android:visibility="gone"/>
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab_add"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_margin="5dp"
app:backgroundTint="@color/colorAccent"
app:srcCompat="@drawable/add" />
</LinearLayout>
</LinearLayout>
GSKMTOrange/src/main/res/layout/content_store_route.xml
+9
View File
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<fragment xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:map="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/map"
android:name="com.google.android.gms.maps.SupportMapFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".storeinmap.StoreRouteActivity" />
GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml
+57 -43
View File
@@ -4,6 +4,7 @@
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/grey_background"
android:orientation="vertical"
android:weightSum="100">
@@ -25,25 +26,22 @@
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/grey_background"
card_view:cardCornerRadius="20dp"
card_view:cardCornerRadius="10dp"
android:elevation="5dp"
android:layout_margin="5dp"
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@color/grey_background"
>
android:background="@color/white"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/grey_background"
android:orientation="horizontal"
android:padding="5dp"
android:weightSum="2">
@@ -61,10 +59,10 @@
android:id="@+id/btntoggle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textOn="@string/yes"
android:textOff="@string/no"
android:layout_weight=".5"
android:background="@drawable/toggle_selector_background"
android:layout_weight=".5" />
android:textOff="@string/no"
android:textOn="@string/yes" />
</LinearLayout>
@@ -75,8 +73,8 @@
android:background="@color/grey_background"
android:orientation="horizontal"
android:padding="5dp"
android:weightSum="3"
android:visibility="gone">
android:visibility="gone"
android:weightSum="3">
<TextView
android:id="@+id/tv_brand"
@@ -100,7 +98,7 @@
android:id="@+id/tv_displaylayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/grey_background"
android:orientation="horizontal"
android:padding="5dp"
android:weightSum="3">
@@ -118,33 +116,31 @@
android:id="@+id/spinner_SkuMaster"
android:layout_width="0dp"
android:layout_height="50dp"
android:layout_weight="1.5"
/>
android:layout_weight="1.5" />
<RelativeLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".5">
android:layout_weight=".5"
>
<ImageView
android:id="@+id/img_planogram"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="53dp"
android:layout_height="40dp"
android:layout_centerInParent="true"
android:background="@mipmap/baseline_photo_black_18"
/>
android:background="@mipmap/refrence_orange" />
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/tv_cameralayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/grey_background"
android:orientation="horizontal"
android:padding="5dp"
android:weightSum="5">
@@ -152,8 +148,7 @@
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:background="@color/grey_background">
android:layout_weight="1.5">
<TextView
android:layout_width="wrap_content"
@@ -170,7 +165,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/grey_background">
>
<ImageView
android:id="@+id/btn_image"
@@ -179,12 +174,13 @@
android:layout_centerInParent="true"
android:background="@drawable/camera_orange_star_green" />
</RelativeLayout>
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/grey_background">
>
<ImageView
android:id="@+id/btn_image2"
@@ -193,12 +189,13 @@
android:layout_centerInParent="true"
android:background="@mipmap/camera_orange" />
</RelativeLayout>
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/grey_background">
>
<ImageView
android:id="@+id/btn_image3"
@@ -207,11 +204,11 @@
android:layout_centerInParent="true"
android:background="@mipmap/camera_orange" />
</RelativeLayout>
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight=".5"
android:background="@color/grey_background">
android:layout_weight=".5">
<ImageView
android:id="@+id/btn_edit"
@@ -220,7 +217,7 @@
android:layout_weight="1"
android:background="@mipmap/new_no_camera"
android:inputType="number"
android:visibility="invisible"/>
android:visibility="invisible" />
</RelativeLayout>
</LinearLayout>
@@ -240,53 +237,70 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/grey_background"
android:padding="5dp">
<Button
android:id="@+id/btn_sku"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:background="@color/colorPrimary"
android:text="@string/sku" />
android:text="@string/add_sku" />
<Button
android:id="@+id/btadd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:background="@color/colorPrimary"
android:text="@string/add" />
android:text="@string/add"
android:visibility="gone" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab_add"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_margin="5dp"
app:backgroundTint="@color/colorAccent"
app:srcCompat="@drawable/add" />
</RelativeLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
<android.support.v7.widget.CardView
<!--<android.support.v7.widget.CardView
android:id="@+id/cardviewid"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:padding="10dp"
card_view:cardBackgroundColor="@color/colorOrange"
card_view:cardCornerRadius="20dp"
android:visibility="gone"
>
card_view:cardBackgroundColor="@color/white"
card_view:cardCornerRadius="10dp">-->
<ListView
android:id="@+id/listviewlv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:cacheColorHint="#00000000"
android:choiceMode="singleChoice"
android:divider="#ff9933"
android:dividerHeight="2dp"
android:dividerHeight="0dp"
android:divider="@null"
android:fastScrollEnabled="true"
android:smoothScrollbar="true"></ListView>
</android.support.v7.widget.CardView>
<!-- </android.support.v7.widget.CardView>-->
</LinearLayout>
GSKMTOrange/src/main/res/layout/current_marker_view.xml
+29
View File
@@ -0,0 +1,29 @@
<?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="match_parent">
<ImageView
android:src="@drawable/current_location_marker_small"
android:layout_width="50dp"
android:layout_height="50dp"
/>
<android.support.v7.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:elevation="5dp"
android:layout_marginLeft="20dp"
android:visibility="gone">
<TextView
android:id="@+id/tv_desc"
android:text="test"
android:textSize="14sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="2dp"
android:textColor="#000000"/>
</android.support.v7.widget.CardView>
</LinearLayout>
GSKMTOrange/src/main/res/layout/daily_main_menu_row.xml
+8 -18
View File
@@ -4,12 +4,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:weightSum="1">
>
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
card_view:cardBackgroundColor="@android:color/white"
card_view:cardUseCompatPadding="true">
@@ -19,36 +18,27 @@
android:layout_height="match_parent"
android:layout_marginTop="5dp"
android:orientation="vertical"
android:weightSum="2">
>
<!--android:weightSum="10"-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:id="@+id/categoryIcon"
android:layout_width="80dp"
android:layout_height="80dp"
android:src="@drawable/category" />
</LinearLayout>
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_gravity="center"
android:src="@mipmap/picturecatogory" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:orientation="vertical"
android:weightSum="1">
>
<TextView
android:id="@+id/categoryName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_weight="1"
android:background="#FFF"
android:ellipsize="end"
android:gravity="center"
GSKMTOrange/src/main/res/layout/dot_view.xml
+21
View File
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<View
android:id="@+id/selected"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/indicator_effect"
/>
<View
android:id="@+id/unselected"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/indicator_background"
/>
</FrameLayout>
GSKMTOrange/src/main/res/layout/item_added_promo.xml
+3 -2
View File
@@ -3,7 +3,7 @@
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:background="@color/grey_background"
android:orientation="vertical">
<android.support.v7.widget.CardView
@@ -11,7 +11,8 @@
android:layout_margin="5dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
card_view:cardCornerRadius="10dp">
card_view:cardCornerRadius="10dp"
android:elevation="5dp">
<LinearLayout
android:layout_width="match_parent"
GSKMTOrange/src/main/res/layout/marker_layout_2.xml
+31
View File
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="#00ffffff"
>
<android.support.v7.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:elevation="5dp"
android:layout_marginLeft="20dp">
<TextView
android:id="@+id/tv_desc"
android:text="test"
android:textSize="16sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="2dp"
android:textColor="#000000"/>
</android.support.v7.widget.CardView>
<ImageView
android:src="@mipmap/twotone_location_on_black_18"
android:layout_width="30dp"
android:layout_height="30dp"
/>
</LinearLayout>
GSKMTOrange/src/main/res/layout/marker_view.xml
+9 -8
View File
@@ -2,30 +2,31 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="100dp"
android:layout_height="100dp"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:background="#00ffffff"
>
android:background="#00ffffff">
<android.support.v7.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:elevation="5dp"
android:layout_marginLeft="20dp">
android:layout_marginLeft="20dp"
app:cardBackgroundColor="@color/colorPrimary">
<TextView
android:id="@+id/tv_desc"
android:text="test"
android:textSize="16sp"
android:textSize="14sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="2dp"
android:textColor="#000000"/>
android:textColor="@color/white"/>
</android.support.v7.widget.CardView>
<ImageView
android:src="@drawable/baseline_store_black_18dp"
android:layout_width="30dp"
android:layout_height="30dp"
android:src="@drawable/store_location_mark_small"
android:layout_width="50dp"
android:layout_height="50dp"
/>
</LinearLayout>
GSKMTOrange/src/main/res/layout/mpin_input.xml
+80
View File
@@ -0,0 +1,80 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/grey_background"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_margin="10dp"
android:text="Enter MPIN"
android:textSize="18dp"
android:textStyle="bold" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:orientation="horizontal">
<ImageView
android:id="@+id/imageview_circle1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="6dp"
android:src="@drawable/circle" />
<ImageView
android:id="@+id/imageview_circle2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="6dp"
android:src="@drawable/circle" />
<ImageView
android:id="@+id/imageview_circle3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="6dp"
android:src="@drawable/circle" />
<ImageView
android:id="@+id/imageview_circle4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="6dp"
android:src="@drawable/circle" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/grey_dark_background"
android:orientation="vertical">
<EditText
android:id="@+id/editText_enter_mpin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:inputType="number"
android:maxLength="4"
android:visibility="visible"></EditText>
</LinearLayout>
</LinearLayout>
</LinearLayout>
GSKMTOrange/src/main/res/layout/nav_header_main.xml
+12 -8
View File
@@ -6,17 +6,21 @@
android:background="@drawable/side_nav_bar"
android:gravity="bottom"
android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="5dp"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
android:theme="@style/ThemeOverlay.AppCompat.Dark">
<!-- <ImageView
android:layout_width="match_parent"
android:layout_height="35dp"
android:background="@drawable/rtretail"
android:visibility="gone"/>-->
<ImageView
android:id="@+id/img_change_password"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_gravity="right"
android:layout_margin="5dp"
android:background="@android:drawable/ic_lock_idle_lock"
android:visibility="visible"
/>
<ImageView
@@ -38,6 +42,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="android.studio@android.com"
android:visibility="gone"/>
android:visibility="gone" />
</LinearLayout>
GSKMTOrange/src/main/res/layout/number_lock_view.xml
+221
View File
@@ -0,0 +1,221 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/grey_dark_background">
<cpm.com.gskmtorange.blurlockview.BlurView
android:id="@+id/blurview"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_above="@+id/layout_123"
>
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="Input Password"
android:textSize="20sp"
android:layout_marginBottom="15dp"
android:layout_marginTop="56dp"
/>
<cpm.com.gskmtorange.blurlockview.Indicator
android:id="@+id/indicator"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginBottom="30dp"
/>
</LinearLayout>
<RelativeLayout
android:id="@+id/layout_123"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/layout_456"
>
<cpm.com.gskmtorange.blurlockview.BigButtonView
android:id="@+id/button_1"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_toStartOf="@+id/button_2"
android:layout_marginEnd="@dimen/button_margin"
/>
<cpm.com.gskmtorange.blurlockview.BigButtonView
android:id="@+id/button_2"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/button_margin"
/>
<cpm.com.gskmtorange.blurlockview.BigButtonView
android:id="@+id/button_3"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_toEndOf="@id/button_2"
android:layout_marginStart="@dimen/button_margin"
/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/layout_456"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
>
<cpm.com.gskmtorange.blurlockview.BigButtonView
android:id="@+id/button_4"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_toStartOf="@+id/button_5"
android:layout_marginEnd="@dimen/button_margin"
/>
<cpm.com.gskmtorange.blurlockview.BigButtonView
android:id="@+id/button_5"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/button_margin"
/>
<cpm.com.gskmtorange.blurlockview.BigButtonView
android:id="@+id/button_6"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_toEndOf="@id/button_5"
android:layout_marginStart="@dimen/button_margin"
/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/layout_789"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/layout_456"
>
<cpm.com.gskmtorange.blurlockview.BigButtonView
android:id="@+id/button_7"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_toStartOf="@+id/button_8"
android:layout_marginEnd="@dimen/button_margin"
/>
<cpm.com.gskmtorange.blurlockview.BigButtonView
android:id="@+id/button_8"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/button_margin"
/>
<cpm.com.gskmtorange.blurlockview.BigButtonView
android:id="@+id/button_9"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_toEndOf="@id/button_8"
android:layout_marginStart="@dimen/button_margin"
/>
</RelativeLayout>
<cpm.com.gskmtorange.blurlockview.BigButtonView
android:id="@+id/button_0"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_centerHorizontal="true"
android:layout_below="@+id/layout_789"
/>
</RelativeLayout>
<LinearLayout
android:id="@+id/text_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_gravity="bottom"
android:layout_marginBottom="80dp"
>
<LinearLayout
android:id="@+id/line_1"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:orientation="horizontal"
android:layout_gravity="center_horizontal"
/>
<LinearLayout
android:id="@+id/line_2"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:orientation="horizontal"
android:layout_gravity="center_horizontal"
/>
<LinearLayout
android:id="@+id/line_3"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:orientation="horizontal"
android:layout_gravity="center_horizontal"
/>
<LinearLayout
android:id="@+id/line_4"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:orientation="horizontal"
android:layout_gravity="center_horizontal"
/>
</LinearLayout>
<TextView
android:id="@+id/left_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="set pin"
android:gravity="center"
android:layout_gravity="bottom|start"
android:layout_marginStart="20dp"
android:layout_marginBottom="15dp"
/>
<TextView
android:id="@+id/right_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="clear"
android:gravity="center"
android:layout_gravity="bottom|end"
android:layout_marginEnd="20dp"
android:layout_marginBottom="15dp"
/>
</FrameLayout>
GSKMTOrange/src/main/res/layout/password_rule_dialog.xml
+46
View File
@@ -0,0 +1,46 @@
<?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="match_parent"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:orientation="vertical">
<android.support.v7.widget.CardView
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
card_view:cardBackgroundColor="@color/colorPrimary"
card_view:cardCornerRadius="20dp"
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/password_rules"
android:padding="10dp"
android:textSize="@dimen/text_size_normal"
android:textStyle="bold"
android:textColor="@color/white"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pw_rules"
android:padding="10dp"
android:textSize="@dimen/text_size_normal"
android:textColor="@color/white"
/>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
GSKMTOrange/src/main/res/layout/progress_layout.xml
+33
View File
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@color/grey_dark_background"
android:padding="10dp">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_centerInParent="true">
<cpm.com.gskmtorange.progressbar.CircularProgressBar
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_centerInParent="true"
android:layout_gravity="center"
app:cpb_backgroundColor="@color/colorPrimary"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Loading..."
android:textSize="@dimen/text_size_normal"
android:textColor="@color/white"
android:layout_margin="5dp"
android:layout_gravity="center"/>
</LinearLayout>
</RelativeLayout>
GSKMTOrange/src/main/res/layout/small_button_view.xml
+27
View File
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/frame_layout"
android:layout_width="@dimen/default_small_button_width"
android:layout_height="@dimen/default_small_button_height"
android:background="@drawable/small_button_background"
android:clickable="true"
>
<View
android:id="@+id/click_effect"
android:layout_width="@dimen/default_small_button_width"
android:layout_height="@dimen/default_small_button_height"
android:background="@drawable/small_button_effect"
/>
<TextView
android:id="@+id/text"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:text="5"
android:textSize="12sp"
android:gravity="center"
/>
</FrameLayout>
GSKMTOrange/src/main/res/layout/store_marker_view.xml
+12
View File
@@ -0,0 +1,12 @@
<?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="match_parent">
<ImageView
android:src="@drawable/store_location_mark_small"
android:layout_width="50dp"
android:layout_height="50dp"
/>
</LinearLayout>
GSKMTOrange/src/main/res/layout/storelist_child.xml
+2 -1
View File
@@ -82,7 +82,8 @@
android:layout_height="30dp"
android:layout_centerInParent="true"
android:background="@mipmap/baseline_directions_black_48"
android:visibility="invisible"/>
android:visibility="visible"
/>
</RelativeLayout>
GSKMTOrange/src/main/res/layout/t2p_item_layout.xml
+34 -33
View File
@@ -63,39 +63,6 @@
android:text="@string/display" />
</LinearLayout>
<LinearLayout
android:id="@+id/layout_t2p_non_reason"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="3"
android:visibility="gone">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="@dimen/custom_margin"
android:text="@string/reason"
android:textStyle="bold" />
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2">
<Spinner
android:id="@+id/spinner_t2p_non_reason"
android:background="@drawable/spinner_bg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
/>
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
@@ -150,6 +117,40 @@
</LinearLayout>
<LinearLayout
android:id="@+id/layout_t2p_non_reason"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="3"
android:visibility="gone">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="@dimen/custom_margin"
android:text="@string/reason"
android:textStyle="bold" />
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2">
<Spinner
android:id="@+id/spinner_t2p_non_reason"
android:background="@drawable/spinner_bg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
/>
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
GSKMTOrange/src/main/res/menu/activity_main_drawer.xml
+3 -1
View File
@@ -20,7 +20,9 @@
<item
android:id="@+id/nav_geotag"
android:icon="@mipmap/geotag_grey"
android:title="@string/menu_geotag" />
android:title="@string/menu_geotag"
android:visible="false"
/>
<item
android:id="@+id/nav_deviation"
GSKMTOrange/src/main/res/menu/menu_promo_skuwise.xml
+2 -1
View File
@@ -7,5 +7,6 @@
android:title="@string/exists"
android:checked="true"
app:actionViewClass="android.widget.CheckBox"
app:showAsAction="ifRoom|withText" />
app:showAsAction="ifRoom|withText"
android:visible="false"/>
</menu>
GSKMTOrange/src/main/res/menu/planogram.xml
+1 -1
View File
@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_planogram"
android:icon="@mipmap/ref_images_white"
android:icon="@mipmap/refrence"
android:orderInCategory="100"
android:title="@string/stock_facing_planogram_dialog_title"
app:showAsAction="always" />
GSKMTOrange/src/main/res/mipmap-hdpi/additional_visibility_done.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.3 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/analgesics.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 82 KiB

After

Width:  |  Height:  |  Size: 26 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/analgesics_tick.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 26 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/cancel.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 995 B

After

Width:  |  Height:  |  Size: 1.3 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/cough_n_cold.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 18 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/cough_n_cold_tick.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 20 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/first_aid.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/first_aid_tick.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/gastro_n_indigestion.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 76 KiB

After

Width:  |  Height:  |  Size: 20 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/gastro_n_indigestion_tick.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 80 KiB

After

Width:  |  Height:  |  Size: 20 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/health_food_drink.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/health_food_drink_tick.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 11 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/msl_availability_done.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/nutritionals_tick.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/oralcare_tick.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/promo_compliance_done.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/refrence.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/save_icon.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/t2p_compliance_done.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.0 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/tick_close.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/wellness_tick.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 10 KiB

GSKMTOrange/src/main/res/mipmap-xhdpi/baseline_lock_white_36.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 482 B

GSKMTOrange/src/main/res/mipmap-xhdpi/outline_info_black_36.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 856 B

GSKMTOrange/src/main/res/mipmap-xhdpi/outline_info_white_36.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 830 B

GSKMTOrange/src/main/res/mipmap-xhdpi/twotone_location_on_black_18.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 499 B

GSKMTOrange/src/main/res/mipmap-xxhdpi/tick.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.0 KiB

GSKMTOrange/src/main/res/mipmap-xxxhdpi/picturecatogory.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.3 KiB

GSKMTOrange/src/main/res/mipmap-xxxhdpi/picturecatogory_done.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.4 KiB

GSKMTOrange/src/main/res/mipmap-xxxhdpi/picturecatogory_grey.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.3 KiB

GSKMTOrange/src/main/res/values/attrs.xml
+32
View File
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<declare-styleable name="CircularProgressBar">
<attr name="cpb_hasShadow" format="boolean"/>
<attr name="cpb_progressColor" format="string"/>
<attr name="cpb_backgroundColor" format="string"/>
<attr name="cpb_title" format="string"/>
<attr name="cpb_titleColor" format="string"/>
<attr name="cpb_subtitle" format="string"/>
<attr name="cpb_subtitleColor" format="string"/>
<attr name="cpb_strokeWidth" format="integer"/>
</declare-styleable>
<declare-styleable name="BlurView">
<attr name="blurRadius" format="integer"/>
<attr name="downsampleFactor" format="integer"/>
<attr name="overlayColor" format="color"/>
</declare-styleable>
<declare-styleable name="BigButtonView">
<attr name="text" format="string"/>
<attr name="subText" format="string"/>
</declare-styleable>
<declare-styleable name="BlurLockView">
<attr name="password_type" format="string"/>
</declare-styleable>
<attr name="catalogToolbarStyle" format="reference"/>
<attr name="catalogToolbarWithCloseButtonStyle" format="reference"/>
</resources>
GSKMTOrange/src/main/res/values/colors.xml
+5
View File
@@ -19,4 +19,9 @@
<color name="transparent">#00FFFFFF</color>
<color name="char_card_bg">#b7ffa1</color>
<color name="circular_progress_default_progress">#bada55</color>
<color name="circular_progress_default_background">#787878</color>
<color name="circular_progress_default_title">#bada55</color>
<color name="circular_progress_default_subtitle">#D1D1D1</color>
</resources>
GSKMTOrange/src/main/res/values/defaults.xml
+58
View File
@@ -0,0 +1,58 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="default_big_button_width">80dp</dimen>
<dimen name="default_big_button_height">80dp</dimen>
<color name="default_big_button_text_color">#ffffff</color>
<integer name="default_big_button_text_size">35</integer>
<color name="default_big_button_sub_text_color">#ffffff</color>
<integer name="default_big_button_sub_text_size">12</integer>
<dimen name="default_small_button_width">40dp</dimen>
<dimen name="default_small_button_height">40dp</dimen>
<color name="default_small_button_text_color">#ffffff</color>
<integer name="default_small_button_text_size">12</integer>
<integer name="default_title_text_size">20</integer>
<color name="default_title_text_color">#ffffff</color>
<integer name="default_left_button_text_size">20</integer>
<color name="default_left_button_text_color">#ffffff</color>
<integer name="default_right_button_text_size">20</integer>
<color name="default_right_button_text_color">#ffffff</color>
<string-array
name="default_big_button_text">
<item>0</item>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
<item>6</item>
<item>7</item>
<item>8</item>
<item>9</item>
</string-array>
<string-array
name="default_big_button_sub_text">
<item>0</item>
<item>1</item>
<item>ABC</item>
<item>DEF</item>
<item>GHI</item>
<item>JKL</item>
<item>MNO</item>
<item>PQRS</item>
<item>TUV</item>
<item>WXYZ</item>
</string-array>
<integer name="default_blur_radius">11</integer>
<integer name="default_downsample_factor">6</integer>
<color name="default_overlay_color">#99999999</color>
<color name="default_button_press">#66ffffff</color>
<color name="default_indicator">#99ffffff</color>
</resources>
GSKMTOrange/src/main/res/values/dimens.xml
+9 -2
View File
@@ -1,7 +1,7 @@
<resources>
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="nav_header_vertical_spacing">16dp</dimen>
<dimen name="nav_header_height">160dp</dimen>
<dimen name="nav_header_height">170dp</dimen>
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">5dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
@@ -16,4 +16,11 @@
<dimen name="text_size_xsmall">12sp</dimen>
<dimen name="button_radius_large">10dp</dimen>
<dimen name="button_margin">15dp</dimen>
<!--Floating action button-->
<dimen name="design_fab_image_size" tools:override="true">36dp</dimen>
</resources>
GSKMTOrange/src/main/res/values/strings.xml
+25 -1
View File
@@ -288,7 +288,7 @@
<string name="stock_planogram_shelf">Shelf </string>
<string name="stock_planogram_shelf_position"> Position </string>
<string name="stock_planogram_already_exists">is already exists</string>
<string name="stock_planogram_data_select_one_sku">Please select atleast one sku</string>
<string name="stock_planogram_data_select_one_sku">Please select at least one sku</string>
<string name="stock_planogram_data_add_shelf">Add sku, shelf can not be empty</string>
<string name="stock_planogram_data_add_shelf_position_already_exists">Shelf/ Position already exists</string>
@@ -396,5 +396,29 @@
<string name="pls_select_price">Please select price flasher</string>
<string name="exists">Exists</string>
<string name="price_flasher_available">Price flasher available?</string>
<string name="title_activity_change_password">Change Password</string>
<string name="want_to_download">Do you want to download data</string>
<string name="want_to_upload">Do you want to upload data</string>
<string name="want_to_exit">Do you want to exit</string>
<!-- Change Password-->
<string name="submit">Submit</string>
<string name="old_password">Old Password</string>
<string name="new_password">New Password</string>
<string name="confirm_password">Confirm Password</string>
<string name="password_rules">Password Rules</string>
<string name="pw_rules">1. Must be between 6 to 8 characters long. \n\n 2. Must contain following combinations \n\n a. Uppercase characters(A-Z) \n b. Lowercase characters(a-z) \n c. Numbers(0-9) \n d. Special characters(@#$%)</string>
<string name="invalid_password">Invalid Password</string>
<string name="password_and_confirm_password_not_match">Password and confirm password does not match</string>
<string name="space_not_allowed_in_password">Space is not allowed in password</string>
<string name="new_password_not_equal_to_old_password">New password should not be equal to old password</string>
<string name="password_updated_successfully">Password updated successfully</string>
<string name="title_activity_mpin">MPin</string>
<string name="error_incorrect_pin">This pin is incorrect</string>
<string name="add_sku">Add SKU</string>
<string name="is_there_promo_compliance">Is there any Promo running</string>
<string name="first_click_compulsory_image">First click compulsory image</string>
</resources>