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

YSY commit

Browse Source
This commit is contained in:
yadavendras
2019-07-04 19:37:24 +05:30
parent aa51c3570e
commit aff5b24204
32 changed files with 1942 additions and 837 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/layout/activity_counterfeit_indicator_web.xml
+34
View File
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".dailyentry.CounterfeitIndicatorWebActivity">
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</android.support.design.widget.AppBarLayout>
<include layout="@layout/content_counterfeit_indicator_web" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@android:drawable/ic_dialog_email"
android:visibility="gone"/>
</android.support.design.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/activity_stock_pricing.xml
+33
View File
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".dailyentry.StockPricingActivity">
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</android.support.design.widget.AppBarLayout>
<include layout="@layout/content_stock_pricing" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@mipmap/save_icon"/>
</android.support.design.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/content_counterfeit_indicator_web.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.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:context=".dailyentry.CounterfeitIndicatorWebActivity"
tools:showIn="@layout/activity_counterfeit_indicator_web">
<WebView
android:id="@+id/webview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="invisible"></WebView>
</android.support.constraint.ConstraintLayout>
GSKMTOrange/src/main/res/layout/content_stock_pricing.xml
+65
View File
@@ -0,0 +1,65 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context=".dailyentry.StockPricingActivity"
tools:showIn="@layout/activity_stock_pricing"
android:orientation="vertical">
<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/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=".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/price"
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>
GSKMTOrange/src/main/res/layout/item_stock_pricing.xml
+87
View File
@@ -0,0 +1,87 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical">
<android.support.v7.widget.CardView
android:id="@+id/card_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
card_view:cardCornerRadius="5dp"
android:elevation="4dp">
<LinearLayout
android:id="@+id/lin_category"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="5dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:weightSum="5">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="1">
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".7"
android:orientation="vertical">
<TextView
android:id="@+id/txt_skuName"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="SKU Name Value "
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222"
android:textColorHint="#666"
/>
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_weight=".3"
android:gravity="center_vertical"
android:orientation="vertical">
<EditText
android:id="@+id/et_price"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:gravity="center"
android:inputType="numberDecimal"
android:maxLength="6"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222"
android:textColorHint="#666" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/black" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
GSKMTOrange/src/main/res/layout/t2p_item_layout.xml
+28
View File
@@ -64,6 +64,7 @@
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -117,6 +118,33 @@
</LinearLayout>
<LinearLayout
android:id="@+id/ly_allowqty"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:orientation="horizontal"
android:weightSum="3">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="@dimen/custom_margin"
android:text="@string/quantity"
android:textStyle="bold" />
<EditText
android:id="@+id/edtallow_qty"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:inputType="number"
android:maxLength="3"
android:padding="@dimen/custom_margin"
android:text="@string/quantity" />
</LinearLayout>
<LinearLayout
android:id="@+id/layout_t2p_non_reason"
android:layout_width="match_parent"
GSKMTOrange/src/main/res/menu/activity_main_drawer.xml
+7
View File
@@ -62,6 +62,13 @@
android:visible="false"
/>
<item
android:id="@+id/nav_counterfeit_indicator"
android:icon="@mipmap/outline_report_black_48"
android:title="@string/title_activity_counterfeit_indicator_web"
android:visible="false"
/>
<item
android:id="@+id/nav_exit"
android:icon="@mipmap/exit_grey"
GSKMTOrange/src/main/res/mipmap-xhdpi/outline_report_black_48.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 421 B

GSKMTOrange/src/main/res/values-ar/string.xml
+12
View File
@@ -321,4 +321,16 @@
<string name="incorrect_mpin_limit_reached">الرقم السري غير صحيح, تم بلوغ الحد لإدخال الرقم السري</string>
<string name="need_to_reset_mpin">تحتاج إلى إعادة تعيين الرقم السري</string>
<!--MPin-->
<string name="forget_mpin">هل نسيت الرقم السري</string>
<string name="pls_enter_four_digit_mpin"> الرجاء إدخال 4 رموز للرقم السري</string>
<string name="set_mpin"> تعيين الرقم السري</string>
<string name="pls_set_four_digit_mpin"> الرجاء تعيين 4 رموز للرقم السري</string>
<string name="attempt_left"> محاولة متبيقة</string>
<string name="reset"> إعادة تعيين </string>
<string name="clear">مسح</string>
<string name="additional_stores">إضافي محل</string>
<string name="title_activity_counterfeit_indicator_web">الأدوية او المنتجات المقلدة</string>
</resources>
GSKMTOrange/src/main/res/values/strings.xml
+8 -1
View File
@@ -387,7 +387,6 @@
<string name="select_coach">Select Coach</string>
<string name="title_activity_additional_promo_skuwise">AdditionalPromoSKUwiseActivity</string>
<string name="discount_value">Discount Percentage</string>
<string name="price">Price</string>
<string name="pls_select_sub_category">Please select Sub category</string>
<string name="pls_select_brand">Please select Brand</string>
<string name="pls_select_sku">Please select SKU</string>
@@ -427,6 +426,7 @@
<string name="pls_enter_sku">Please enter SKU name</string>
<string name="pls_enter_stock">Please enter Stock</string>
<!--MPin-->
<string name="forget_mpin">Forgot MPin</string>
<string name="pls_enter_four_digit_mpin">Please Enter Four Digit MPin</string>
<string name="set_mpin">Set MPin</string>
@@ -444,5 +444,12 @@
<string name="gsk">GSK</string>
<string name="competitor">Competitor</string>
<string name="sos_detail">SOS Detail</string>
<string name="title_activity_stock_pricing">Stock Pricing</string>
<!--Stock Pricing-->
<string name="price">Price</string>
<!--Audit Turkey Number Input-->
<string name="pls_fill_stock_count">Please fill Stock Count</string>
<string name="title_activity_counterfeit_indicator_web">Counterfeit Indicators</string>
</resources>