AndroidNative2026/Haleon-Egypt-PD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initial_Commit

Browse Source
This commit is contained in:
Ravi Kumar
2026-05-19 12:36:21 +05:30
parent aaec7b4768
commit 1fbb7ebadf
564 changed files with 3701 additions and 25276 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/drawable/rounded_bg.xml
+3
View File
@@ -0,0 +1,3 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="16dp"/>
</shape>
GSKMTOrange/src/main/res/layout-sw600dp/content_main.xml
+75
View File
@@ -0,0 +1,75 @@
<?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_main"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/custom_margin"
android:paddingLeft="@dimen/custom_margin"
android:paddingRight="@dimen/custom_margin"
android:paddingTop="@dimen/custom_margin"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context="cpm.com.gskmtorange.MainActivity"
tools:showIn="@layout/app_bar_main">
<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"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
card_view:cardBackgroundColor="@color/white"
card_view:cardCornerRadius="12dp" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<!-- ViewPager + Dots -->
<FrameLayout
android:layout_width="match_parent"
android:layout_height="300dp"
android:background="@android:color/transparent">
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/viewPager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/transparent"/>
<!-- ✅ Custom Dots -->
</FrameLayout>
<LinearLayout
android:id="@+id/dotsLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_gravity="bottom|center_horizontal"
android:layout_marginBottom="10dp"/>
<ImageView
android:id="@+id/img_main"
android:layout_width="200dp"
android:layout_height="150dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:visibility="gone"
android:src="@drawable/gsklogo"
/>
<WebView
android:id="@+id/webview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/custom_margin"
android:visibility="gone">
</WebView>
</LinearLayout>
</androidx.cardview.widget.CardView>
</RelativeLayout>
GSKMTOrange/src/main/res/layout/activity_order_confirm.xml
+1 -32
View File
@@ -1,4 +1,4 @@
<!--<?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"
@@ -6,37 +6,6 @@
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"
GSKMTOrange/src/main/res/layout/activity_order_status_detail.xml
+1 -106
View File
@@ -28,12 +28,6 @@
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"
@@ -48,107 +42,7 @@
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"/>
@@ -160,6 +54,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:visibility="gone"
android:layout_margin="@dimen/fab_margin"
android:scaleType="center"
app:srcCompat="@mipmap/save_icon" />
GSKMTOrange/src/main/res/layout/activity_order_taking.xml
+215 -15
View File
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
<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"
@@ -30,19 +31,11 @@
android:id="@+id/sampingll"
android:padding="5dp"
android:weightSum="4"
android:visibility="gone"
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"
@@ -52,8 +45,6 @@
android:textSize="@dimen/store_entry_text_size"
android:textStyle="bold"/>
<RadioGroup
android:id="@+id/radio_group"
android:layout_weight="2"
@@ -62,7 +53,6 @@
android:orientation="horizontal"
android:layout_gravity="right"
android:layout_marginRight="10dp">
<RadioButton
android:id="@+id/radio_yes"
android:layout_width="wrap_content"
@@ -71,7 +61,6 @@
android:button="@null"
android:background="@mipmap/yes_white"
android:checked="false" />
<RadioButton
android:id="@+id/radio_no"
android:layout_width="wrap_content"
@@ -80,9 +69,220 @@
android:background="@mipmap/no_white"
android:button="@null"
android:checked="false" />
</RadioGroup>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<androidx.cardview.widget.CardView
android:id="@+id/card_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
app:cardCornerRadius="10dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:weightSum="4">
<!--Additional Promo-->
<LinearLayout
android:id="@+id/lin_parent_promo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:orientation="horizontal"
android:weightSum="2">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight=".8"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingTop="5dp"
android:text="@string/sub_category"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" />
<Spinner
android:id="@+id/sp_subcategory"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.2" />
</LinearLayout>
<!-- Divider -->
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="@dimen/custom_margin"
android:layout_marginRight="@dimen/custom_margin"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:background="#EEEEEE" />
<LinearLayout
android:id="@+id/lay_competitor_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:visibility="visible"
android:orientation="horizontal"
android:weightSum="2">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight=".8"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingTop="5dp"
android:text="Brand"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" />
<Spinner
android:id="@+id/sp_brand"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.2" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="@dimen/custom_margin"
android:layout_marginRight="@dimen/custom_margin"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:background="#EEEEEE" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:orientation="horizontal"
android:weightSum="2">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight=".8"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingTop="5dp"
android:text="SKU"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" />
<com.toptoche.searchablespinnerlibrary.SearchableSpinner
android:id="@+id/sp_promotion_typ"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.2" />
<!--<com.google.android.material.textfield.TextInputLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.2"
android:layout_marginEnd="10dp"
app:boxBackgroundMode="outline"
app:boxCornerRadiusBottomEnd="4dp"
app:boxCornerRadiusBottomStart="4dp"
app:boxCornerRadiusTopEnd="4dp"
app:boxCornerRadiusTopStart="4dp"
app:boxStrokeColor="@color/black">
<AutoCompleteTextView
android:id="@+id/sp_promotion_typ"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/select"
android:inputType="text"
android:completionThreshold="1"
android:textSize="14sp"/>
</com.google.android.material.textfield.TextInputLayout>-->
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="@dimen/custom_margin"
android:layout_marginRight="@dimen/custom_margin"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:background="#EEEEEE" />
<!--Brand Spinner-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:orientation="horizontal"
android:weightSum="2">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight=".8"
android:paddingLeft="10dp"
android:text="@string/order_qty"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black"
android:textAllCaps="false"/>
<EditText
android:id="@+id/editText_QTY"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="@dimen/text_size_xsmall"
android:inputType="numberDecimal"
android:layout_weight="1.2"
/>
</LinearLayout>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab_add"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:fabSize="mini"
app:maxImageSize="26dp"
android:layout_gravity="right"
android:layout_margin="5dp"
app:srcCompat="@drawable/add"
app:tint="@android:color/white"
app:shapeAppearanceOverlay="@style/RoundedFabShape"/>
</LinearLayout>
</LinearLayout>
</androidx.cardview.widget.CardView>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rec_added_counterfeit_product"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
GSKMTOrange/src/main/res/layout/activity_webview.xml
+5 -3
View File
@@ -52,12 +52,14 @@
android:visibility="gone"/>
<!-- Video -->
<VideoView
<androidx.media3.ui.PlayerView
android:id="@+id/videoView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/custom_margin"
android:visibility="gone"/>
android:visibility="gone"
app:resize_mode="fit"
app:use_controller="true"/>
</FrameLayout>
GSKMTOrange/src/main/res/layout/banner_item.xml
+2 -4
View File
@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="5dp"
card_view:cardCornerRadius="12dp"
card_view:cardElevation="0dp">
@@ -12,6 +10,6 @@
android:id="@+id/bannerImage"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop" />
android:scaleType="fitXY" />
</androidx.cardview.widget.CardView>
GSKMTOrange/src/main/res/layout/content_compition_promo.xml
+1 -1
View File
@@ -283,7 +283,7 @@
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_margin="5dp"
app:srcCompat="@drawable/add" />
app:srcCompat="@drawable/add"/>
</LinearLayout>
GSKMTOrange/src/main/res/layout/content_ir_picture.xml
+1
View File
@@ -26,6 +26,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="gone"
android:weightSum="2">
<TextView
GSKMTOrange/src/main/res/layout/content_ir_visibility.xml
+1
View File
@@ -26,6 +26,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="gone"
android:weightSum="2">
<TextView
GSKMTOrange/src/main/res/layout/content_order_status_detail.xml
-1
View File
@@ -220,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/custom_spinner_item.xml
+1 -4
View File
@@ -2,7 +2,6 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:orientation="horizontal"
android:background="@android:color/transparent">
@@ -12,7 +11,6 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
>
<TextView
android:id="@+id/tv_text"
android:layout_width="match_parent"
@@ -21,7 +19,7 @@
android:textColor="@color/black"
android:textStyle="bold"
android:gravity="center_vertical"
android:paddingTop="2dp"
android:paddingTop="2dp"
android:paddingBottom="@dimen/custom_margin"
android:padding="10dp"
android:textSize="@dimen/text_size_xsmall"
@@ -30,7 +28,6 @@
</LinearLayout>
</LinearLayout>
GSKMTOrange/src/main/res/layout/custom_spinner_item_new.xml
+27
View File
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="6dp"
android:layout_marginVertical="3dp"
card_view:cardCornerRadius="8dp"
card_view:cardElevation="1dp"
card_view:cardBackgroundColor="@android:color/white">
<TextView
android:id="@+id/tv_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="14dp"
android:paddingVertical="10dp"
android:textColor="#212121"
android:textSize="14sp"
android:fontFamily="sans-serif-medium"
android:maxLines="2"
android:ellipsize="end"
android:gravity="center_vertical"/>
</androidx.cardview.widget.CardView>
GSKMTOrange/src/main/res/layout/item_order_received_status_child.xml
+65 -1
View File
@@ -18,6 +18,51 @@
android:id="@+id/lin_category"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingBottom="5dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:weightSum="2">
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:layout_weight="1.5"
android:orientation="vertical">
<TextView
android:id="@+id/txt_skuName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/custom_margin"
android:text="SKU Name Value "
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
android:id="@+id/orderqtyTV"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/custom_margin"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222"
/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/lin_category1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:orientation="vertical"
android:paddingBottom="5dp"
android:paddingLeft="5dp"
@@ -31,7 +76,7 @@
android:orientation="vertical">
<TextView
android:id="@+id/txt_skuName"
android:id="@+id/txt_skuName1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="5dp"
@@ -43,6 +88,22 @@
android:textColor="#222" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_marginLeft="@dimen/margin_10dp"
android:orientation="vertical">
<TextView
android:id="@+id/orderqtyTV1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222"
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -53,6 +114,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".20"
android:visibility="gone"
android:layout_marginLeft="5dp"
android:orientation="vertical">
@@ -71,6 +133,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".20"
android:visibility="gone"
android:layout_marginLeft="40dp"
android:orientation="vertical">
@@ -118,6 +181,7 @@
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="5dp"
android:visibility="gone"
android:layout_weight=".20"
android:gravity="center_vertical"
android:orientation="vertical">
GSKMTOrange/src/main/res/layout/item_order_taking.xml
+2 -1
View File
@@ -5,7 +5,8 @@
android:background="@color/white"
android:orientation="vertical">
<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/item_order_taking_new.xml
+184
View File
@@ -0,0 +1,184 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:paddingTop="4dp"
android:paddingBottom="4dp">
view
<androidx.cardview.widget.CardView
android:id="@+id/card_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
app:cardBackgroundColor="@android:color/white"
app:cardCornerRadius="16dp"
app:cardElevation="4dp"
app:strokeColor="#EAEAEA"
app:strokeWidth="1dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="16dp">
<!-- Header -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/order_details"
android:textColor="#1F1F1F"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:id="@+id/tv_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="10dp"
android:paddingTop="4dp"
android:paddingEnd="10dp"
android:paddingBottom="4dp"
android:text=""
android:textColor="#2E7D32"
android:textSize="12sp"
android:textStyle="bold" />
</LinearLayout>
<!-- Divider -->
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"
android:background="#EEEEEE" />
<!-- Promotion Type -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:orientation="horizontal">
<TextView
android:layout_width="120dp"
android:layout_height="wrap_content"
android:text="@string/sub_category"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_brand"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="NA"
android:textColor="#212121"
android:textSize="14sp"
android:textStyle="bold" />
</LinearLayout>
<!-- Competitor -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:orientation="horizontal">
<TextView
android:layout_width="120dp"
android:layout_height="wrap_content"
android:text="@string/brand"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_competitor"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="#212121"
android:textSize="14sp"
android:textStyle="bold" />
</LinearLayout>
<!-- Comment -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:orientation="horizontal">
<TextView
android:layout_width="120dp"
android:layout_height="wrap_content"
android:text="@string/sku"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_sku_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Shelf branding visible near counter."
android:textColor="#212121"
android:textSize="14sp"
android:textStyle="bold" />
</LinearLayout>
<!-- Order Qty -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="120dp"
android:layout_height="wrap_content"
android:text="Order Qty"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_order_qty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="#E8F5E9"
android:paddingStart="12dp"
android:paddingTop="6dp"
android:paddingEnd="12dp"
android:paddingBottom="6dp"
android:text="12"
android:textColor="#2E7D32"
android:textSize="14sp"
android:textStyle="bold" />
</LinearLayout>
</LinearLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
GSKMTOrange/src/main/res/layout/order_status_item_layout.xml
+166 -90
View File
@@ -1,27 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<!--<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_marginTop="5dp"
android:layout_height="wrap_content"
android:orientation="vertical"
>
<androidx.cardview.widget.CardView
&lt;!&ndash;<androidx.cardview.widget.CardView
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:id="@+id/cardview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
card_view:cardCornerRadius="5dp"
android:elevation="5dp"
android:elevation="4dp"
card_view:cardBackgroundColor="@color/cardview_light_background"
card_view:cardUseCompatPadding="true">
card_view:cardUseCompatPadding="true">&ndash;&gt;
<androidx.cardview.widget.CardView
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:id="@+id/cardview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
card_view:cardCornerRadius="5dp"
android:elevation="4dp">
<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:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="5dp"
android:weightSum="2">
@@ -29,8 +36,8 @@
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:fontFamily="sans-serif"
android:textSize="14sp"
android:layout_marginLeft="@dimen/text_size_small"
android:text="@string/system_po_num"
/>
@@ -39,61 +46,9 @@
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:id="@+id/storepoLL"
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:text="PO-1234"
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"
android:textSize="14sp"
/>
</LinearLayout>
@@ -107,8 +62,34 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.8"
android:fontFamily="sans-serif"
android:textSize="14sp"
android:layout_marginLeft="@dimen/text_size_small"
android:text="@string/order_date"
/>
<TextView
android:id="@+id/podateTV"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.2"
android:textColor="@color/colorPrimary"
android:fontFamily="sans-serif-medium"
android:textSize="@dimen/store_entry_text_size"
android:textSize="14sp"
/>
</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"
android:textSize="14sp"
android:layout_marginLeft="@dimen/text_size_small"
android:text="@string/line_items"
/>
@@ -117,38 +98,133 @@
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
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/status"
/>
<TextView
android:id="@+id/statusTV"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.2"
android:text="Pending"
android:textColor="@color/colorPrimary"
android:fontFamily="sans-serif-medium"
android:textSize="@dimen/store_entry_text_size"
android:textSize="14sp"
/>
</LinearLayout>
</LinearLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:orientation="vertical"
android:paddingStart="8dp"
android:paddingEnd="8dp">
<androidx.cardview.widget.CardView
android:id="@+id/cardview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
android:elevation="3dp"
card_view:cardBackgroundColor="#FFFFFF"
card_view:cardCornerRadius="14dp"
card_view:cardUseCompatPadding="true">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="16dp">
<!-- System PO Number -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="14dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="120dp"
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:text="@string/system_po_num"
android:textColor="#6B7280"
android:textSize="13sp" />
<TextView
android:id="@+id/sys_gen_poTV"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:fontFamily="sans-serif-medium"
android:textColor="@color/colorPrimary"
android:textSize="14sp"
/>
</LinearLayout>
<!-- Order Date -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="14dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="120dp"
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:text="@string/order_date"
android:textColor="#6B7280"
android:textSize="13sp" />
<TextView
android:id="@+id/podateTV"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:fontFamily="sans-serif-medium"
android:textColor="@color/colorPrimary"
android:textSize="14sp"
/>
</LinearLayout>
<!-- Line Items -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="120dp"
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:text="@string/line_items"
android:textColor="#6B7280"
android:textSize="13sp" />
<TextView
android:id="@+id/lineItemTV"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="#DCFCE7"
android:fontFamily="sans-serif-medium"
android:paddingStart="12dp"
android:paddingTop="4dp"
android:paddingEnd="12dp"
android:paddingBottom="4dp"
android:textColor="@color/colorPrimary"
android:textSize="13sp"
/>
</LinearLayout>
</LinearLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
GSKMTOrange/src/main/res/values/strings.xml
+7 -1
View File
@@ -299,11 +299,12 @@
<string name="audit">Audit</string>
<string name="order_taking">Order Taking</string>
<string name="order_confirm">Order Status</string>
<string name="order_confirm">Order History</string>
<string name="order_given_store">Order given by store</string>
<string name="system_po_num">System PO Number</string>
<string name="store_po_num">Store PO Number</string>
<string name="po_date">PO Date</string>
<string name="order_date">Order Date</string>
<string name="po_image">PO Image</string>
<string name="order_qty">Order Qty</string>
<string name="pls_fill_order_qty">Please fill Order Quantity</string>
@@ -313,7 +314,9 @@
<string name="confirmed">Confirmed</string>
<string name="pending">Pending</string>
<string name="order_status_polist">Order Status-PO List</string>
<string name="order_history">Order History</string>
<string name="order_status_entry">Order Status-Entry</string>
<string name="order_history_detail">Order History Detail</string>
<string name="po_qty">PO Qty</string>
<string name="status">Status</string>
@@ -463,6 +466,9 @@
<string name="ir_data_upload">IR Category Data Uploading</string>
<string name="ir_visibility_data_upload">IR Visibilty Images Data Uploading</string>
<string name="view_report_pd">View Report</string>
<string name="please_enter_order_qty">Please enter order qty</string>
<string name="add_different_sku">This SKU has already been added. Please add a different SKU.</string>
<string name="order_details">Order Details</string>
</resources>
GSKMTOrange/src/main/res/values/styles.xml
+42 -4
View File
@@ -8,22 +8,60 @@
<item name="colorAccent">@color/colorAccent</item>
</style>
<style name="RoundedImage">
<item name="cornerFamily">rounded</item>
<item name="cornerSize">12dp</item>
</style>
<style name="AppTheme.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<!--<item name="alertDialogTheme">
@style/CustomSearchDialogTheme
</item>-->
</style>
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
<style name="AppTheme.NoActionBar.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
<style name="roundedCornersImageView" parent="">
<item name="cornerFamily">rounded</item>
<item name="cornerSize">@dimen/margin_10dp</item>
</style>
<style name="CustomSearchDialogTheme"
parent="Theme.AppCompat.Light.Dialog.Alert">
<!-- Dialog Background -->
<item name="android:windowBackground">
@android:color/white
</item>
<!-- Remove default ugly dividers -->
<item name="android:listDivider">
@android:color/transparent
</item>
<item name="android:dividerHeight">
0dp
</item>
<!-- Text -->
<item name="android:textColorPrimary">
#212121
</item>
<!-- Search Hint -->
<item name="android:textColorHint">
#9E9E9E
</item>
</style>
<style name="RoundedFabShape">
<item name="cornerFamily">rounded</item>
<item name="cornerSize">14dp</item>
</style>
</resources>