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

SecondCommit

Browse Source
This commit is contained in:
ravik
2024-12-03 17:27:57 +05:30
parent a6f3a3b931
commit c22ceebc17
467 changed files with 13357 additions and 3819 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/color/drawer_item.xml
+5
View File
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/colorPrimaryDark" android:state_checked="true" />
<item android:color="@color/black" />
</selector>
GSKMTOrange/src/main/res/drawable/camera_orange_star_green.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 8.4 KiB

GSKMTOrange/src/main/res/drawable/cardview_error_border.xml
+7
View File
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/white"/>
<stroke android:width="1dp"
android:color="@color/red" />
<corners android:radius="5dp"/>
</shape>
GSKMTOrange/src/main/res/drawable/category.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

GSKMTOrange/src/main/res/drawable/edit_text_round_corner_bg.xml
+10
View File
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="@dimen/custom_margin" />
<solid android:color="#FFF" />
<stroke
android:width="1dp"
android:color="@color/colorPrimary" />
</shape>
GSKMTOrange/src/main/res/drawable/gsklogo.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 65 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

GSKMTOrange/src/main/res/drawable/haleon_logo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.7 KiB

GSKMTOrange/src/main/res/drawable/haleon_splash_bg.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 67 KiB

GSKMTOrange/src/main/res/drawable/hfd.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

GSKMTOrange/src/main/res/drawable/hfd_done.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

GSKMTOrange/src/main/res/drawable/ohc.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

GSKMTOrange/src/main/res/drawable/ohc_done.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 9.2 KiB

GSKMTOrange/src/main/res/drawable/parinaam_logo.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

GSKMTOrange/src/main/res/drawable/pdr.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

GSKMTOrange/src/main/res/drawable/pdr_done.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 14 KiB

GSKMTOrange/src/main/res/drawable/performics_logo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

GSKMTOrange/src/main/res/drawable/primary_bay.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

GSKMTOrange/src/main/res/drawable/promotions.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

GSKMTOrange/src/main/res/drawable/right_arrow.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 431 B

GSKMTOrange/src/main/res/drawable/secondary_display.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.3 KiB

After

Width:  |  Height:  |  Size: 8.3 KiB

GSKMTOrange/src/main/res/drawable/side_nav_bar.xml
+11 -3
View File
@@ -2,8 +2,16 @@
android:shape="rectangle">
<gradient
android:angle="135"
android:centerColor="#FFCC80"
android:endColor="#E65100"
android:startColor="@color/colorPrimary"
android:centerColor="#DAFFD2"
android:endColor="#DAFFD2"
android:startColor="#DAFFD2"
android:type="linear" />
<!--<gradient
android:angle="180"
android:centerX="50%"
android:centerY="50%"
android:centerColor="@color/white"
android:endColor="#DAFFD2"
android:startColor="@color/white"
android:type="radial" />-->
</shape>
GSKMTOrange/src/main/res/drawable/touch_points.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.0 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

GSKMTOrange/src/main/res/layout/activity_additional_promo_skuwise.xml
+3 -1
View File
@@ -16,7 +16,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_audit.xml
+21 -1
View File
@@ -16,13 +16,33 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
<include layout="@layout/content_audit" />
<!--<cpm.com.gskmtorange.MovableFloatingActionButton
android:layout_width=""
android:layout_height="".MovableFloatingActionButton
android:id="@+id/btnFab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
android:src="@drawable/ic_navigate_next_white_24dp"/>-->
<!--<cpm.com.gskmtorange.MovableFloatingActionButton
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="@drawable/save_icon" />-->
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
GSKMTOrange/src/main/res/layout/activity_category_list.xml
+4 -2
View File
@@ -14,12 +14,14 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
<include layout="@layout/content_category_list" />
<include layout="@layout/content_category_list"/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab_category"
GSKMTOrange/src/main/res/layout/activity_category_picture.xml
+3 -1
View File
@@ -16,7 +16,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_category_wise_performance.xml
+4 -2
View File
@@ -15,8 +15,10 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay" />
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay"/>
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_change_password.xml
+3 -1
View File
@@ -15,7 +15,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_checkout.xml
+3 -1
View File
@@ -16,7 +16,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_coaching_visit.xml
+3 -1
View File
@@ -16,7 +16,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_coaching_visit_store.xml
+1 -1
View File
@@ -16,7 +16,7 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/grey_background"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_compition_promo.xml
+3 -1
View File
@@ -15,7 +15,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_conversation.xml
+3 -1
View File
@@ -16,7 +16,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_counterfeit_indicator_web.xml
+3 -1
View File
@@ -15,7 +15,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_counterfeit_products.xml
+3 -1
View File
@@ -15,7 +15,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/grey_background"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_create_self.xml
+3 -1
View File
@@ -17,7 +17,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_daily_data_menu.xml
+3 -1
View File
@@ -16,7 +16,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_delivery_call.xml
+3 -1
View File
@@ -16,7 +16,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_delivery_call_add_store.xml
+3 -1
View File
@@ -16,7 +16,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_download.xml
+3 -1
View File
@@ -17,7 +17,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_future_jcp.xml
+3 -1
View File
@@ -17,7 +17,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay">
<RelativeLayout
GSKMTOrange/src/main/res/layout/activity_geo_tag.xml
+3 -1
View File
@@ -16,7 +16,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_login.xml
+67 -17
View File
@@ -4,8 +4,8 @@
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:background="#F8F3F7"
android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
@@ -26,7 +26,7 @@
android:id="@+id/login_form"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/grey_background">
>
<LinearLayout
android:layout_width="match_parent"
@@ -36,6 +36,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_marginTop="20dp">
<ImageView
@@ -51,8 +52,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="20dp"
card_view:cardBackgroundColor="@color/white"
card_view:cardCornerRadius="5dp">
@@ -62,10 +63,43 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:orientation="vertical"
android:paddingBottom="40dp"
android:paddingTop="20dp">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="20dp"
android:layout_marginLeft="@dimen/button_radius_large"
android:layout_marginRight="@dimen/button_radius_large"
android:layout_marginTop="20dp">
<ImageView
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_centerInParent="true"
android:layout_gravity="center_vertical"
android:background="@drawable/parinaam_logo" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:layout_marginBottom="30dp">
<ImageView
android:layout_width="100dp"
android:layout_height="20dp"
android:layout_centerInParent="true"
android:layout_gravity="center_vertical"
android:background="@drawable/haleon_logo" />
</RelativeLayout>
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -76,6 +110,8 @@
android:id="@+id/userid"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColorHint="#738BAB"
android:textColor="@color/black"
android:hint="@string/prompt_userid"
android:maxLines="1"
android:singleLine="true" />
@@ -92,6 +128,8 @@
android:id="@+id/password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColorHint="#738BAB"
android:textColor="@color/black"
android:hint="@string/prompt_password"
android:imeActionId="@+id/login"
android:imeActionLabel="@string/action_sign_in_short"
@@ -103,16 +141,27 @@
</com.google.android.material.textfield.TextInputLayout>
<Button
<androidx.cardview.widget.CardView
android:id="@+id/user_login_button"
style="?android:textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
card_view:cardCornerRadius="8dp"
card_view:cardBackgroundColor="@color/grey_textview"
android:layout_height="50dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_marginTop="16dp"
android:text="@string/action_sign_in"
android:textStyle="bold" />
android:layout_marginTop="20dp"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:fontFamily="sans-serif-medium"
android:gravity="center"
android:layout_gravity="center"
android:text="@string/action_sign_in"/>
</androidx.cardview.widget.CardView>
</LinearLayout>
@@ -122,16 +171,16 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:layout_marginTop="40dp"
>
<ImageView
android:id="@+id/gsklogo"
android:layout_width="115dp"
android:layout_height="100dp"
android:layout_width="150dp"
android:layout_height="30dp"
android:layout_centerInParent="true"
android:background="@drawable/gsklogo"></ImageView>
android:background="@drawable/performics_logo"></ImageView>
</RelativeLayout>
@@ -146,8 +195,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:textColor="#787878"
android:text="Version/Versiyon"
android:textSize="@dimen/text_size_normal" />
android:textSize="@dimen/text_size_small" />
</RelativeLayout>
GSKMTOrange/src/main/res/layout/activity_main.xml
+2
View File
@@ -20,6 +20,8 @@
android:layout_height="match_parent"
android:layout_gravity="start"
android:fitsSystemWindows="true"
app:itemIconTint="@color/black"
app:itemTextColor="@color/black"
app:menu="@menu/activity_main_drawer" />
</androidx.drawerlayout.widget.DrawerLayout>
GSKMTOrange/src/main/res/layout/activity_message.xml
+3 -1
View File
@@ -16,7 +16,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_msl__availability.xml
+3 -1
View File
@@ -14,7 +14,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_msl__availability_stock_facing.xml
+4 -1
View File
@@ -14,11 +14,14 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/grey_background"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
<include layout="@layout/content_msl__availability_stock_facing" />
<!--<include layout="@layout/content_stock_entry" />-->
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"
GSKMTOrange/src/main/res/layout/activity_msl_availability_stock_entry.xml
+36
View File
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/grey_background"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
<!-- <include layout="@layout/content_msl__availability_stock_facing" />-->
<include layout="@layout/content_stock_entry" />
<com.google.android.material.floatingactionbutton.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"
android:scaleType="center"
app:srcCompat="@mipmap/save_icon" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/activity_new_stock_data.xml
+3 -1
View File
@@ -15,7 +15,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_no_camera.xml
+3 -1
View File
@@ -16,7 +16,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_order_confirm.xml
+69
View File
@@ -0,0 +1,69 @@
<!--<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/grey_background"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
<include layout="@layout/contentorderstatus"/>
&lt;!&ndash; <com.google.android.material.floatingactionbutton.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"
android:scaleType="center"
app:srcCompat="@mipmap/save_icon" />&ndash;&gt;
</androidx.coordinatorlayout.widget.CoordinatorLayout>-->
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
<include layout="@layout/contentorderstatus"/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
android:scaleType="center"
app:srcCompat="@mipmap/save_icon" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/activity_order_status_detail.xml
+167
View File
@@ -0,0 +1,167 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:layout_marginTop="60dp">
<!-- <View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/colorPrimary"/>-->
<LinearLayout
android:id="@+id/poLL"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:elevation="5dp"
app:cardCornerRadius="5dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:padding="5dp"
android:weightSum="2">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.8"
android:fontFamily="sans-serif-medium"
android:textSize="@dimen/store_entry_text_size"
android:layout_marginLeft="@dimen/text_size_small"
android:text="@string/system_po_num"
/>
<TextView
android:id="@+id/sys_gen_poTV"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.2"
android:fontFamily="sans-serif-medium"
android:textColor="@color/colorPrimary"
android:textSize="@dimen/store_entry_text_size"
android:text="1234-1234-1234"
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="5dp"
android:weightSum="2">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.8"
android:fontFamily="sans-serif-medium"
android:textSize="@dimen/store_entry_text_size"
android:layout_marginLeft="@dimen/text_size_small"
android:text="@string/store_po_num"
/>
<TextView
android:id="@+id/storepoTV"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.2"
android:fontFamily="sans-serif-medium"
android:textSize="@dimen/store_entry_text_size"
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="5dp"
android:weightSum="2">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.8"
android:fontFamily="sans-serif-medium"
android:textSize="@dimen/store_entry_text_size"
android:layout_marginLeft="@dimen/text_size_small"
android:text="@string/po_date"
/>
<TextView
android:id="@+id/podateTV"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.2"
android:text="07/12/2022"
android:fontFamily="sans-serif-medium"
android:textSize="@dimen/store_entry_text_size"
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="5dp"
android:weightSum="2">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.8"
android:fontFamily="sans-serif-medium"
android:textSize="@dimen/store_entry_text_size"
android:layout_marginLeft="@dimen/text_size_small"
android:text="@string/line_items"
/>
<TextView
android:id="@+id/lineitemTV"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.2"
android:text="13"
android:fontFamily="sans-serif-medium"
android:textSize="@dimen/store_entry_text_size"
/>
</LinearLayout>
</LinearLayout>
</androidx.cardview.widget.CardView>
<include layout="@layout/content_order_status_detail"/>
</LinearLayout>
</LinearLayout>
<com.google.android.material.floatingactionbutton.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"
android:scaleType="center"
app:srcCompat="@mipmap/save_icon" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/activity_order_taking.xml
+213
View File
@@ -0,0 +1,213 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:layout_marginTop="60dp">
<LinearLayout
android:id="@+id/sampingll"
android:padding="5dp"
android:weightSum="4"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<!-- <TextView
android:layout_weight="2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="Order given by store"
android:padding="10dp"
android:textSize="@dimen/store_entry_text_size"
android:textStyle="bold"/>-->
<TextView
android:layout_weight="2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/order_given_store"
android:padding="10dp"
android:textSize="@dimen/store_entry_text_size"
android:textStyle="bold"/>
<RadioGroup
android:id="@+id/radio_group"
android:layout_weight="2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_gravity="right"
android:layout_marginRight="10dp">
<RadioButton
android:id="@+id/radio_yes"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:button="@null"
android:background="@mipmap/yes_white"
android:checked="false" />
<RadioButton
android:id="@+id/radio_no"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:background="@mipmap/no_white"
android:button="@null"
android:checked="false" />
</RadioGroup>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/colorPrimary"/>
<LinearLayout
android:id="@+id/poLL"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:padding="5dp"
android:weightSum="2">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.8"
android:fontFamily="sans-serif-medium"
android:textSize="@dimen/store_entry_text_size"
android:layout_marginLeft="@dimen/text_size_small"
android:text="@string/system_po_num"
/>
<TextView
android:id="@+id/sys_gen_poTV"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.2"
android:fontFamily="sans-serif-medium"
android:textColor="@color/colorPrimary"
android:textSize="@dimen/store_entry_text_size"
android:text="1234-1234-1234"
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="5dp"
android:weightSum="2">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.8"
android:fontFamily="sans-serif-medium"
android:textSize="@dimen/store_entry_text_size"
android:layout_marginLeft="@dimen/text_size_small"
android:text="@string/store_po_num"
/>
<EditText
android:id="@+id/storepoET"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.2"
android:hint="@string/store_po_num"
android:inputType="text"
android:fontFamily="sans-serif-medium"
android:textSize="@dimen/store_entry_text_size"
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="5dp"
android:weightSum="2">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.8"
android:fontFamily="sans-serif-medium"
android:textSize="@dimen/store_entry_text_size"
android:layout_marginLeft="@dimen/text_size_small"
android:text="@string/po_date"
/>
<EditText
android:id="@+id/podateET"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.2"
android:enabled="false"
android:hint="PO Date"
android:fontFamily="sans-serif-medium"
android:textSize="@dimen/store_entry_text_size"
/>
</LinearLayout>
<LinearLayout
android:id="@+id/pocamLL"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical"
android:padding="5dp"
android:weightSum="2">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.8"
android:fontFamily="sans-serif-medium"
android:textSize="@dimen/store_entry_text_size"
android:layout_marginLeft="@dimen/text_size_small"
android:text="@string/po_image"
/>
<ImageView
android:id="@+id/poIV"
android:layout_width="50dp"
android:layout_height="50dp"
android:src="@mipmap/camera_orange_star_green"
android:layout_weight="1.2"
/>
</LinearLayout>
<include layout="@layout/content_order_taking"/>
</LinearLayout>
</LinearLayout>
<com.google.android.material.floatingactionbutton.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"
android:scaleType="center"
app:srcCompat="@mipmap/save_icon" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/activity_paharma.xml
+3 -1
View File
@@ -15,7 +15,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_planogram_pdf.xml
+3 -1
View File
@@ -16,7 +16,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_pogquestions.xml
+3 -1
View File
@@ -16,7 +16,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_promo_compliance.xml
+3 -1
View File
@@ -16,7 +16,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_select_language.xml
+4 -1
View File
@@ -17,7 +17,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
@@ -29,6 +31,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|center"
android:background="@color/colorPrimary"
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@drawable/right_arrow" />
GSKMTOrange/src/main/res/layout/activity_service.xml
+3 -1
View File
@@ -16,7 +16,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/grey_background"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_settings.xml
+3 -1
View File
@@ -16,7 +16,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_splash_screen.xml
+7 -7
View File
@@ -6,11 +6,11 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_gravity="center"
android:background="@drawable/gradient_background"
android:background="@drawable/haleon_splash_bg"
android:orientation="vertical"
android:weightSum="10">
<RelativeLayout
<!--<RelativeLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="4">
@@ -18,6 +18,7 @@
<ImageView
android:layout_width="match_parent"
android:layout_height="50dp"
android:visibility="gone"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_marginTop="10dp"
@@ -29,17 +30,16 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="6"
>
<ImageView
android:id="@+id/logo"
android:layout_width="153dp"
android:layout_height="133dp"
android:layout_width="155dp"
android:layout_height="50dp"
android:visibility="gone"
android:layout_centerHorizontal="true"
android:background="@drawable/gsklogo" />
</RelativeLayout>
</RelativeLayout>-->
</LinearLayout>
GSKMTOrange/src/main/res/layout/activity_stock.xml
+3 -1
View File
@@ -15,7 +15,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_stock_data.xml
+3 -1
View File
@@ -16,7 +16,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_stock_entry.xml
+10
View File
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout 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/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".gsk_dailyentry.StockEntryActivity">
</androidx.constraintlayout.widget.ConstraintLayout>
GSKMTOrange/src/main/res/layout/activity_stock_facing.xml
+3 -1
View File
@@ -14,7 +14,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_stock_facing__planogram_tracker.xml
+3 -1
View File
@@ -16,7 +16,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_stock_pricing.xml
+3 -1
View File
@@ -15,7 +15,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_store_checkout_image.xml
+3 -1
View File
@@ -15,7 +15,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.NoActionBar.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_store_wise_performance.xml
+4 -1
View File
@@ -15,7 +15,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
@@ -27,6 +29,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:backgroundTint="@color/colorPrimary"
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@drawable/right_arrow" />
GSKMTOrange/src/main/res/layout/activity_storeimage.xml
+3 -1
View File
@@ -16,7 +16,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.NoActionBar.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_t2_pcompliance.xml
+3 -1
View File
@@ -16,7 +16,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_t2p_brand__avaibility.xml
+3 -1
View File
@@ -16,7 +16,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/activity_visit_type_status.xml
+22
View File
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.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=".dailyentry.VisitTypeStatusActivity">
<include layout="@layout/storelist" />
<com.google.android.material.floatingactionbutton.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="@mipmap/download"
app:backgroundTint="@color/colorPrimary"
android:visibility="gone"
/>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/app_bar_main.xml
+3 -1
View File
@@ -17,7 +17,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
GSKMTOrange/src/main/res/layout/audit_question_list_item.xml
+2 -1
View File
@@ -4,7 +4,8 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<androidx.cardview.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
<androidx.cardview.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"
GSKMTOrange/src/main/res/layout/category_menu_row.xml
+1 -1
View File
@@ -43,7 +43,7 @@
android:padding="10dp"
android:text="Category List"
android:textAppearance="?android:textAppearanceSmall"
android:textColor="#f2711f"
android:textColor="@color/black"
android:textStyle="bold" />
</LinearLayout>
</LinearLayout>
GSKMTOrange/src/main/res/layout/content_additional_promo_skuwise.xml
+24 -28
View File
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/lin_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/lin_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/grey_background"
android:orientation="vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context=".dailyentry.AdditionalPromoSKUwiseActivity"
tools:showIn="@layout/activity_additional_promo_skuwise"
android:orientation="vertical"
android:background="@color/grey_background">
tools:showIn="@layout/activity_additional_promo_skuwise">
<androidx.cardview.widget.CardView
android:id="@+id/card_view"
@@ -27,18 +27,18 @@
<!--Additional Promo-->
<LinearLayout
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorPrimaryDark"
android:orientation="vertical">
android:orientation="vertical"
android:visibility="gone">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:text="@string/promo_compliance_additional_promo"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" />
@@ -64,10 +64,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>
@@ -90,9 +90,9 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight=".8"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:text="@string/sub_category"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" />
@@ -117,9 +117,9 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight=".8"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:text="@string/brand"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" />
@@ -144,8 +144,8 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight=".8"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingBottom="5dp"
android:text="@string/sku"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" />
@@ -169,9 +169,9 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight=".8"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:text="@string/price"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" />
@@ -181,14 +181,11 @@
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"/>
android:inputType="number|numberDecimal"
android:maxLength="5"
android:textSize="@dimen/text_size_xsmall" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -210,10 +207,10 @@
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"/>
android:inputType="number"
android:maxLength="5"
android:textSize="@dimen/text_size_xsmall" />
</LinearLayout>
<LinearLayout
@@ -228,9 +225,9 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:text="@string/price_flasher_available"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" />
@@ -252,7 +249,7 @@
android:layout_height="35dp"
android:layout_centerInParent="true"
android:layout_margin="5dp"
android:background="@mipmap/camera_orange"/>
android:background="@mipmap/camera_orange" />
</RelativeLayout>
@@ -275,7 +272,6 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rec_added_promo_skuwise"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
android:layout_height="wrap_content" />
</LinearLayout>
GSKMTOrange/src/main/res/layout/content_audit.xml
+12
View File
@@ -26,9 +26,21 @@
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:paddingBottom="55dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" />
<!--<androidx.recyclerview.widget.RecyclerView
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/list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" />-->
<LinearLayout
android:id="@+id/no_data_lay"
android:layout_width="match_parent"
GSKMTOrange/src/main/res/layout/content_category_picture.xml
+32 -15
View File
@@ -22,15 +22,15 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:padding="5dp"
android:layout_weight="25">
<ImageView
android:id="@+id/image1"
android:layout_width="50dp"
android:layout_height="match_parent"
android:layout_marginLeft="5dp"
android:background="@mipmap/camera_orange" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
</LinearLayout>
@@ -38,14 +38,21 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="5dp"
android:layout_weight="25">
<ImageView
<!-- <ImageView
android:id="@+id/image2"
android:layout_width="50dp"
android:layout_height="match_parent"
android:layout_marginLeft="5dp"
android:background="@mipmap/camera_orange" />
android:background="@mipmap/camera_orange" />-->
<ImageView
android:id="@+id/image2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
</LinearLayout>
@@ -53,14 +60,21 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="5dp"
android:layout_weight="25">
<ImageView
<!--<ImageView
android:id="@+id/image3"
android:layout_width="50dp"
android:layout_height="match_parent"
android:layout_marginLeft="5dp"
android:background="@mipmap/camera_orange" />
android:background="@mipmap/camera_orange" />-->
<ImageView
android:id="@+id/image3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
</LinearLayout>
@@ -68,14 +82,21 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="5dp"
android:layout_weight="25">
<ImageView
<!-- <ImageView
android:id="@+id/image4"
android:layout_width="50dp"
android:layout_height="match_parent"
android:layout_marginLeft="5dp"
android:background="@mipmap/camera_orange" />
android:background="@mipmap/camera_orange" />-->
<ImageView
android:id="@+id/image4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
</LinearLayout>
@@ -95,9 +116,5 @@
android:dividerHeight="0dp">
</ListView>
</LinearLayout>
</LinearLayout>
GSKMTOrange/src/main/res/layout/content_compition_promo.xml
+1 -1
View File
@@ -48,7 +48,7 @@
android:orientation="horizontal"
android:padding="5dp"
android:weightSum="2"
android:background="@color/light_orange_background">
android:background="@color/light_store_list">
<TextView
android:id="@+id/tv_"
GSKMTOrange/src/main/res/layout/content_counterfeit_products.xml
+1 -1
View File
@@ -48,7 +48,7 @@
android:orientation="horizontal"
android:padding="5dp"
android:weightSum="2"
android:background="@color/light_orange_background">
android:background="@color/light_store_list">
<TextView
android:id="@+id/tv_"
GSKMTOrange/src/main/res/layout/content_main.xml
+2 -2
View File
@@ -49,8 +49,8 @@
<ImageView
android:id="@+id/img_main"
android:layout_width="153dp"
android:layout_height="133dp"
android:layout_width="200dp"
android:layout_height="150dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:src="@drawable/gsklogo"
GSKMTOrange/src/main/res/layout/content_mpin.xml
+1
View File
@@ -17,6 +17,7 @@
android:id="@+id/image_1"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorPrimary"
android:scaleType="centerCrop"/>
<TextView
GSKMTOrange/src/main/res/layout/content_msl__availability_stock_facing.xml
+2 -1
View File
@@ -207,7 +207,9 @@
android:textColor="#222" />
</LinearLayout>
<LinearLayout
android:id="@+id/pricingLL"
android:layout_width="0dp"
android:visibility="visible"
android:layout_height="match_parent"
android:layout_weight=".20"
android:orientation="vertical">
@@ -218,7 +220,6 @@
android:gravity="center"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:text="@string/pricing"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
GSKMTOrange/src/main/res/layout/content_order_status_detail.xml
+240
View File
@@ -0,0 +1,240 @@
<?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:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:showIn="@layout/activity_order_status_detail">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true">
<TextView
android:id="@+id/txt_mslAvailabilityName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#FFF1710F"
android:paddingBottom="10dp"
android:paddingLeft="20dp"
android:paddingTop="10dp"
android:text="Must Have Availability"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@android:color/black"
android:visibility="gone" />
<!--Camera Layout-->
<LinearLayout
android:id="@+id/lin_camera"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:orientation="horizontal"
android:weightSum="4">
<!--camera 1-->
<LinearLayout
android:id="@+id/lin_camera1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:visibility="gone"
android:background="@drawable/layout_click_background_effect"
android:gravity="center_horizontal"
android:padding="5dp">
<ImageView
android:id="@+id/img_camera1"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginRight="10dp" />
<!--android:src="@mipmap/camera_orange"-->
</LinearLayout>
<!-- <View
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/grey_dark_background" />-->
<!--camera 2-->
<LinearLayout
android:id="@+id/lin_camera2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/layout_click_background_effect"
android:gravity="center_horizontal"
android:padding="5dp">
<ImageView
android:id="@+id/img_camera2"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginRight="10dp" />
</LinearLayout>
<!-- <View
android:id="@+id/view_camera2"
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/grey_dark_background" />-->
<!--camera 3-->
<LinearLayout
android:id="@+id/lin_camera3"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/layout_click_background_effect"
android:gravity="center_horizontal"
android:padding="5dp">
<ImageView
android:id="@+id/img_camera3"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginRight="10dp" />
</LinearLayout>
<!-- <View
android:id="@+id/view_camera3"
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/grey_dark_background" />-->
<!--camera 4-->
<LinearLayout
android:id="@+id/lin_camera4"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/layout_click_background_effect"
android:gravity="center_horizontal"
android:padding="5dp">
<ImageView
android:id="@+id/img_camera4"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginRight="10dp" />
</LinearLayout>
</LinearLayout>
<!-- <View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/grey_dark_background" />-->
<LinearLayout
android:id="@+id/lin_category"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="gone"
android:padding="5dp"
android:weightSum="1">
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".20"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/msl_availability_mbq"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".20"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/msl_availability_availability"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".20"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/stock_facing_faceup"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".20"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/stock_facing_stock"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".20"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:text="@string/pricing"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
</LinearLayout>
</LinearLayout>
<ExpandableListView
android:id="@+id/expandableListView"
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/content_order_taking.xml
+241
View File
@@ -0,0 +1,241 @@
<?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_msl__availability"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:showIn="@layout/activity_order_taking">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true">
<TextView
android:id="@+id/txt_mslAvailabilityName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#FFF1710F"
android:paddingBottom="10dp"
android:paddingLeft="20dp"
android:paddingTop="10dp"
android:text="Must Have Availability"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@android:color/black"
android:visibility="gone" />
<!--Camera Layout-->
<LinearLayout
android:id="@+id/lin_camera"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:orientation="horizontal"
android:weightSum="4">
<!--camera 1-->
<LinearLayout
android:id="@+id/lin_camera1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:visibility="gone"
android:background="@drawable/layout_click_background_effect"
android:gravity="center_horizontal"
android:padding="5dp">
<ImageView
android:id="@+id/img_camera1"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginRight="10dp" />
<!--android:src="@mipmap/camera_orange"-->
</LinearLayout>
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/grey_dark_background" />
<!--camera 2-->
<LinearLayout
android:id="@+id/lin_camera2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/layout_click_background_effect"
android:gravity="center_horizontal"
android:padding="5dp">
<ImageView
android:id="@+id/img_camera2"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginRight="10dp" />
</LinearLayout>
<View
android:id="@+id/view_camera2"
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/grey_dark_background" />
<!--camera 3-->
<LinearLayout
android:id="@+id/lin_camera3"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/layout_click_background_effect"
android:gravity="center_horizontal"
android:padding="5dp">
<ImageView
android:id="@+id/img_camera3"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginRight="10dp" />
</LinearLayout>
<View
android:id="@+id/view_camera3"
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/grey_dark_background" />
<!--camera 4-->
<LinearLayout
android:id="@+id/lin_camera4"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/layout_click_background_effect"
android:gravity="center_horizontal"
android:padding="5dp">
<ImageView
android:id="@+id/img_camera4"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginRight="10dp" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/grey_dark_background" />
<LinearLayout
android:id="@+id/lin_category"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="gone"
android:padding="5dp"
android:weightSum="1">
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".20"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/msl_availability_mbq"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".20"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/msl_availability_availability"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".20"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/stock_facing_faceup"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".20"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/stock_facing_stock"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".20"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:text="@string/pricing"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
</LinearLayout>
</LinearLayout>
<ExpandableListView
android:id="@+id/expandableListView"
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/content_stock_entry.xml
+243
View File
@@ -0,0 +1,243 @@
<?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_msl__availability"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:showIn="@layout/activity_msl_availability_stock_entry">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true">
<TextView
android:id="@+id/txt_mslAvailabilityName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#FFF1710F"
android:paddingBottom="10dp"
android:paddingLeft="20dp"
android:paddingTop="10dp"
android:text="Must Have Availability"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@android:color/black"
android:visibility="gone" />
<!--Camera Layout-->
<LinearLayout
android:id="@+id/lin_camera"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="4">
<!--camera 1-->
<LinearLayout
android:id="@+id/lin_camera1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/layout_click_background_effect"
android:gravity="center_horizontal"
android:padding="5dp">
<ImageView
android:id="@+id/img_camera1"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginRight="10dp" />
<!--android:src="@mipmap/camera_orange"-->
</LinearLayout>
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/grey_dark_background" />
<!--camera 2-->
<LinearLayout
android:id="@+id/lin_camera2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/layout_click_background_effect"
android:gravity="center_horizontal"
android:padding="5dp">
<ImageView
android:id="@+id/img_camera2"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginRight="10dp" />
</LinearLayout>
<View
android:id="@+id/view_camera2"
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/grey_dark_background" />
<!--camera 3-->
<LinearLayout
android:id="@+id/lin_camera3"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/layout_click_background_effect"
android:gravity="center_horizontal"
android:padding="5dp">
<ImageView
android:id="@+id/img_camera3"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginRight="10dp" />
</LinearLayout>
<View
android:id="@+id/view_camera3"
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/grey_dark_background" />
<!--camera 4-->
<LinearLayout
android:id="@+id/lin_camera4"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/layout_click_background_effect"
android:gravity="center_horizontal"
android:padding="5dp">
<ImageView
android:id="@+id/img_camera4"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginRight="10dp" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/grey_dark_background" />
<LinearLayout
android:id="@+id/lin_category"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="5dp"
android:weightSum="1">
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".5"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/posm_stock"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".5"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginLeft="10dp"
android:layout_marginRight="20dp"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/warehouse_stock"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
</LinearLayout>
<!--<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:visibility="gone"
android:layout_weight=".20"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/stock_facing_faceup"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
</LinearLayout>-->
<!-- <LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".20"
android:visibility="gone"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/stock_facing_stock"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
</LinearLayout>-->
<!-- <LinearLayout
android:id="@+id/pricingLL"
android:layout_width="0dp"
android:visibility="gone"
android:layout_height="match_parent"
android:layout_weight=".20"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:text="@string/pricing"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
</LinearLayout>-->
</LinearLayout>
<ExpandableListView
android:id="@+id/expandableListView"
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/content_t2_pcompliance.xml
+3 -1
View File
@@ -17,6 +17,8 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rec_t2p"
android:layout_width="match_parent"
android:layout_height="wrap_content"></androidx.recyclerview.widget.RecyclerView>
android:layout_height="wrap_content">
</androidx.recyclerview.widget.RecyclerView>
</RelativeLayout>
GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml
+4 -2
View File
@@ -4,7 +4,6 @@
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:weightSum="100">
@@ -17,7 +16,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:background="@color/white"
android:elevation="8dp"
app:theme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
@@ -247,6 +248,7 @@
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:background="@color/colorPrimary"
android:textColor="@color/white"
android:text="@string/add_sku" />
<Button
GSKMTOrange/src/main/res/layout/contentcatgoryadpterlayout.xml
+2 -1
View File
@@ -13,7 +13,7 @@
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:layout_marginTop="2dp"
card_view:cardBackgroundColor="@color/colorOrange"
card_view:cardBackgroundColor="@color/light_store_list"
card_view:cardCornerRadius="10dp">
<RelativeLayout
@@ -34,6 +34,7 @@
android:layout_marginRight="6sp"
android:layout_marginTop="7dp"
android:gravity="center"
android:textColor="@color/colorPrimary"
android:text="Text View "
android:textSize="15sp"
android:textStyle="bold" />
GSKMTOrange/src/main/res/layout/contentorderstatus.xml
+22
View File
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout 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:showIn="@layout/activity_order_confirm">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
tools:ignore="MissingConstraints">
<androidx.recyclerview.widget.RecyclerView
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/recyclerview"/>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
GSKMTOrange/src/main/res/layout/contentstore_checkout_image.xml
+2 -2
View File
@@ -70,8 +70,8 @@
<ImageView
android:id="@+id/img_cam_selfie"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_centerInParent="true"
android:background="@mipmap/camera_orange" />
GSKMTOrange/src/main/res/layout/contentstoreimage.xml
+2 -2
View File
@@ -77,8 +77,8 @@
<ImageView
android:id="@+id/img_cam_selfie"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="100dp"
android:layout_height="100dp"
android:background="@mipmap/camera_orange"
android:layout_centerInParent="true"
/>
GSKMTOrange/src/main/res/layout/create_self_dialog_layout.xml
+3 -3
View File
@@ -9,7 +9,7 @@
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
card_view:cardBackgroundColor="@color/colorPrimary"
card_view:cardBackgroundColor="@color/light_green_background"
card_view:cardCornerRadius="10dp"
>
@@ -32,7 +32,7 @@
android:paddingBottom="20dp"
android:text="@string/sub_category"
android:layout_marginLeft="5dp"
android:textColor="@color/white"
android:textColor="@color/black"
android:textSize="@dimen/text_size_normal" />
<Spinner
@@ -57,7 +57,7 @@
android:paddingBottom="20dp"
android:text="@string/no_of_rows_on_shelf"
android:layout_marginLeft="5dp"
android:textColor="@color/white"
android:textColor="@color/black"
android:textSize="@dimen/text_size_normal" />
<Spinner
GSKMTOrange/src/main/res/layout/custom_dialog_progress.xml
+1 -1
View File
@@ -9,7 +9,7 @@
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
card_view:cardBackgroundColor="@color/colorPrimary"
card_view:cardBackgroundColor="@color/light_store_list"
card_view:cardCornerRadius="20dp">
<LinearLayout
GSKMTOrange/src/main/res/layout/daily_main_menu_row.xml
+1 -1
View File
@@ -43,7 +43,7 @@
android:padding="10dp"
android:text="Category List"
android:textAppearance="?android:textAppearanceSmall"
android:textColor="@color/colorPrimaryDark"
android:textColor="@color/black"
android:textStyle="bold" />
</LinearLayout>
</LinearLayout>
GSKMTOrange/src/main/res/layout/dialogbox.xml
+5 -3
View File
@@ -29,8 +29,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/yes"
android:textColor="#000000"
android:background="@color/colorPrimary"/>
android:buttonTint="@color/white"
android:textColor="@color/white"
android:background="@color/store_list_color"/>
<View
android:layout_width="match_parent"
@@ -43,7 +44,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/no"
android:textColor="#000000"
android:buttonTint="@color/white"
android:textColor="@color/white"
android:background="@color/colorPrimary"/>
</RadioGroup>
GSKMTOrange/src/main/res/layout/geotagstorelist.xml
+1 -1
View File
@@ -51,7 +51,7 @@
android:id="@+id/geolistviewxml_storename"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="GSK MT ORANGE STORE"
android:text="Haleon Perfect Store"
android:textColor="#1F3A6C"
android:textSize="12sp"
android:textStyle="bold" />
GSKMTOrange/src/main/res/layout/item_msl_availability_stock_facing_child.xml
+1 -1
View File
@@ -158,7 +158,7 @@
android:background="@null"
android:gravity="center"
android:inputType="numberDecimal"
android:maxLength="3"
android:maxLength="7"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:textAppearance="?android:attr/textAppearanceSmall"
GSKMTOrange/src/main/res/layout/item_msl_availability_stock_facing_child_data.xml
+1 -1
View File
@@ -159,7 +159,7 @@
android:background="@null"
android:gravity="center"
android:inputType="numberDecimal"
android:maxLength="3"
android:maxLength="7"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:textAppearance="?android:attr/textAppearanceSmall"

Some files were not shown because too many files have changed in this diff Show More