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

Deepak_commit_31_05_2018

Browse Source
This commit is contained in:
yadavendras
2018-10-08 18:46:28 +05:30
parent 34d8473e33
commit b0e2e05501
30 changed files with 841 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/drawable/add.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

GSKMTOrange/src/main/res/layout/activity_delivery_call.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.DeliveryCallActivity">
<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_delivery_call" />
<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="@drawable/save_icon" />
</android.support.design.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/activity_delivery_call_add_store.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.DeliveryCallAddStoreActivity">
<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_delivery_call_add_store" />
<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="@drawable/save_icon" />
</android.support.design.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/content_delivery_call.xml
+11
View File
@@ -0,0 +1,11 @@
<?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.DeliveryCallActivity"
tools:showIn="@layout/activity_delivery_call">
</android.support.constraint.ConstraintLayout>
GSKMTOrange/src/main/res/layout/content_delivery_call_add_store.xml
+124
View File
@@ -0,0 +1,124 @@
<?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.DeliveryCallAddStoreActivity"
tools:showIn="@layout/activity_delivery_call_add_store"
android:background="@color/grey_background">
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:elevation="5dp">
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:id="@+id/tv_customer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/customer_store_name"
android:textSize="@dimen/text_size_normal"
android:padding="5dp"
/>
<EditText
android:id="@+id/et_customer_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/tv_customer"
android:padding="5dp"
/>
<TextView
android:id="@+id/tv_address"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
app:layout_constraintTop_toBottomOf="@+id/et_customer_name"
android:text="@string/address"
android:textSize="@dimen/text_size_normal"
android:padding="5dp"
/>
<EditText
android:id="@+id/et_address"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/tv_address"
android:padding="5dp"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintTop_toBottomOf="@+id/et_address"
android:layout_marginTop="10dp">
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
>
<TextView
android:id="@+id/tv_intime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/intime_image"
android:textSize="@dimen/text_size_small"
android:layout_centerHorizontal="true"/>
<ImageView
android:id="@+id/img_checkin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@mipmap/camera_orange"
android:layout_centerInParent="true"
android:layout_below="@+id/tv_intime"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
>
<TextView
android:id="@+id/tv_outtime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/outtime_image"
android:textSize="@dimen/text_size_small"
android:layout_centerHorizontal="true"/>
<ImageView
android:id="@+id/img_checkout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@mipmap/camera_orange"
android:layout_centerInParent="true"
android:layout_below="@+id/tv_outtime"
/>
</RelativeLayout>
</LinearLayout>
</android.support.constraint.ConstraintLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
GSKMTOrange/src/main/res/menu/activity_main_drawer.xml
+7
View File
@@ -28,6 +28,13 @@
android:title="@string/menu_deviation_data"
android:visible="false"/>
<item
android:id="@+id/nav_delivery_call"
android:icon="@mipmap/baseline_local_shipping_black_48"
android:title="@string/delivery_call"
android:visible="false"
/>
<item
android:id="@+id/nav_future_jcp"
android:icon="@drawable/ic_date_range_black"
GSKMTOrange/src/main/res/mipmap-xhdpi/baseline_local_shipping_black_48.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 992 B

GSKMTOrange/src/main/res/values-ar-rAE/string.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<string name="availability_data_uploading">توافر تحميل البيانات</string>
<string name="brand">العلامة التجارية</string>
<string name="brandname">اسم العلامة التجارية</string>
<string name="address">C 126, Okhla II,</string>
<string name="camera">الكاميرا</string>
<string name="cancel">إلغاء الأمر</string>
<string name="title_activity_category_list">قائمة الفئات</string>
GSKMTOrange/src/main/res/values-ar-rEG/string.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<string name="availability_data_uploading">توافر تحميل البيانات</string>
<string name="brand">العلامة التجارية</string>
<string name="brandname">اسم العلامة التجارية</string>
<string name="address">C 126, Okhla II,</string>
<string name="camera">الكاميرا</string>
<string name="cancel">إلغاء الأمر</string>
<string name="title_activity_category_list">قائمة الفئات</string>
GSKMTOrange/src/main/res/values-ar-rSA/string.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<string name="availability_data_uploading">توافر تحميل البيانات</string>
<string name="brand">العلامة التجارية</string>
<string name="brandname">اسم العلامة التجارية</string>
<string name="address">C 126, Okhla II,</string>
<string name="camera">الكاميرا</string>
<string name="cancel">إلغاء الأمر</string>
<string name="title_activity_category_list">قائمة الفئات</string>
GSKMTOrange/src/main/res/values-ar/string.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<string name="availability_data_uploading">توافر تحميل البيانات</string>
<string name="brand">العلامة التجارية</string>
<string name="brandname">اسم العلامة التجارية</string>
<string name="address">C 126, Okhla II,</string>
<string name="camera">الكاميرا</string>
<string name="cancel">إلغاء الأمر</string>
<string name="title_activity_category_list">قائمة الفئات</string>
GSKMTOrange/src/main/res/values/strings.xml
+10 -1
View File
@@ -44,7 +44,7 @@
<string name="delete">Delete</string>
<string name="StoreVisited"> Store Visited</string>
<string name="GSKMT">GSK MT ORANGE STORE</string>
<string name="address">C 126, Okhla II,</string>
<string name="storefront">Click Store Front Image</string>
<string name="select_language">Please select language</string>
@@ -376,5 +376,14 @@
<string name="select_supervisor">Select Supervisor</string>
<string name="coaching_visit">Coaching Visit</string>
<string name="please_save_data">Please save data</string>
<string name="delivery_call">Delivery Call</string>
<string name="add_store">Add Store</string>
<string name="please_fill">Please fill</string>
<string name="address">Address</string>
<string name="customer_store_name">Customer Store Name</string>
<string name="please_click">Please click</string>
<string name="intime_image">In time image</string>
<string name="outtime_image">Out time image</string>
</resources>