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-08 21:12:55 +05:30
parent 97d30b2f5b
commit 5b7dd648b7
24 changed files with 443 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/layout/additionallistlayout.xml
+2 -2
View File
@@ -3,7 +3,7 @@
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
@@ -11,7 +11,7 @@
android:layout_margin="5dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
card_view:cardCornerRadius="10dp"
card_view:cardCornerRadius="5dp"
android:elevation="5dp"
card_view:cardBackgroundColor="@color/white">
GSKMTOrange/src/main/res/layout/content_category_picture.xml
+3 -1
View File
@@ -90,7 +90,9 @@
<ListView
android:id="@+id/listview"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:divider="@null"
android:dividerHeight="0dp">
</ListView>
GSKMTOrange/src/main/res/layout/content_pogquestions.xml
+28 -1
View File
@@ -6,7 +6,34 @@
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context=".dailyentry.POGQuestionsActivity"
tools:showIn="@layout/activity_pogquestions">
tools:showIn="@layout/activity_pogquestions"
android:orientation="vertical"
android:background="@color/white">
<LinearLayout
android:id="@+id/lin_planogram_type"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_margin="5dp"
android:visibility="gone"
>
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/store_planogram_type"
android:textSize="@dimen/store_entry_text_size"
android:padding="5dp"
android:layout_weight="3"/>
<Spinner
android:id="@+id/spinner_planogram_type"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"></Spinner>
</LinearLayout>
<ExpandableListView
android:id="@+id/expandableListView"
GSKMTOrange/src/main/res/layout/content_promo_compliance.xml
+4 -3
View File
@@ -63,7 +63,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="5dp"
card_view:cardCornerRadius="10dp">
card_view:cardCornerRadius="5dp"
android:elevation="5dp">
<LinearLayout
android:layout_width="match_parent"
@@ -289,11 +290,11 @@
</android.support.v7.widget.CardView>
<!--Additional List-->
<View
<!--<View
android:id="@+id/view_additional_promo"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/colorPrimaryDark" />
android:background="@color/colorPrimaryDark" />-->
<LinearLayout
android:id="@+id/lin_addtional_promo"
GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml
+2 -2
View File
@@ -4,7 +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">
@@ -27,7 +27,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/grey_background"
card_view:cardCornerRadius="10dp"
card_view:cardCornerRadius="5dp"
android:elevation="5dp"
android:layout_margin="5dp"
>
GSKMTOrange/src/main/res/layout/daily_main_menu_row.xml
+1 -1
View File
@@ -8,7 +8,7 @@
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
card_view:cardBackgroundColor="@android:color/white"
card_view:cardUseCompatPadding="true">
GSKMTOrange/src/main/res/layout/item_msl_availability_stock_facing_child.xml
+5 -11
View File
@@ -6,19 +6,13 @@
android:background="@color/white"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_marginTop="5dp"
android:orientation="vertical">
<android.support.v7.widget.CardView
android:id="@+id/card_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
card_view:cardCornerRadius="10dp">
android:layout_height="wrap_content"
android:layout_margin="5dp"
card_view:cardCornerRadius="5dp"
android:elevation="4dp">
<LinearLayout
android:id="@+id/lin_category"
@@ -151,5 +145,5 @@
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
</LinearLayout>
GSKMTOrange/src/main/res/layout/item_msl_availability_stock_facing_header.xml
+2 -1
View File
@@ -11,7 +11,8 @@
android:layout_height="match_parent"
android:layout_margin="5dp"
card_view:cardBackgroundColor="@color/grey_background"
card_view:cardCornerRadius="10dp">
card_view:cardCornerRadius="5dp"
android:elevation="4dp">
<RelativeLayout
android:id="@+id/rel_categoryHeader"
GSKMTOrange/src/main/res/layout/item_pog_header.xml
+44
View File
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_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/colorOrange"
card_view:cardCornerRadius="5dp"
android:elevation="4dp">
<RelativeLayout
android:id="@+id/rel_categoryHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/txt_categoryHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="25dp"
android:text="Brand Name "
android:padding="7dp"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
<ImageView
android:id="@+id/img_camera"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="30dp"
android:src="@drawable/ic_menu_camera"
android:visibility="gone" />
</RelativeLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
GSKMTOrange/src/main/res/layout/pog_question.xml
+6 -4
View File
@@ -2,16 +2,18 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:orientation="horizontal"
android:background="@color/white">
<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_marginBottom="5dp"
android:layout_marginTop="5dp"
android:layout_margin="5dp"
card_view:cardBackgroundColor="#ffffff"
card_view:cardCornerRadius="5dp">
card_view:cardCornerRadius="5dp"
android:elevation="5dp"
>
<LinearLayout
android:layout_width="match_parent"