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

Merge branch 'master' into JioAC

Browse Source
This commit is contained in:
YadavendraSinghYaduvanshi
2017-01-18 17:33:03 +05:30
committed by GitHub
parent e7ca0ef7a5 e28cb3cdbd
commit 7d546d79db
36 changed files with 1018 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/layout/activity_service.xml
+35
View File
@@ -0,0 +1,35 @@
<?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"
android:fitsSystemWindows="true"
tools:context="cpm.com.gskmtorange.dailyentry.ServiceActivity">
<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_service" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:visibility="gone"
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.support.design.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/activity_settings.xml
+2 -1
View File
@@ -25,10 +25,11 @@
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:visibility="gone"
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" />
app:srcCompat="@mipmap/tick" />
</android.support.design.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/content_promo_compliance.xml
+1 -1
View File
@@ -76,7 +76,7 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="#70888888"
android:background="@color/colorPrimaryDark"
android:orientation="vertical">
<TextView
GSKMTOrange/src/main/res/layout/content_service.xml
+9
View File
@@ -0,0 +1,9 @@
<fragment 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/fragment"
android:name="cpm.com.gskmtorange.fragment.ServiceActivityFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:layout="@layout/fragment_service" />
GSKMTOrange/src/main/res/layout/fragment_select_language.xml
+3 -1
View File
@@ -16,6 +16,7 @@
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
android:background="@color/grey_background"
>
<android.support.v7.widget.CardView
@@ -26,7 +27,8 @@
android:layout_marginRight="5dp"
android:layout_marginTop="20dp"
card_view:cardBackgroundColor="@color/white"
card_view:cardCornerRadius="5dp">
card_view:cardCornerRadius="5dp"
app:cardElevation="2dp">
<LinearLayout
android:id="@+id/ans_layout"
GSKMTOrange/src/main/res/layout/fragment_service.xml
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/content_service"
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"
tools:context="cpm.com.gskmtorange.fragment.ServiceActivityFragment"
tools:showIn="@layout/activity_service">
<android.support.v7.widget.RecyclerView
android:id="@+id/rec_settings"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</RelativeLayout>
GSKMTOrange/src/main/res/layout/nonworking.xml
+1 -1
View File
@@ -73,7 +73,7 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:background="@null"
android:src="@drawable/cam_active" />
android:src="@mipmap/camera_orange" />
</RelativeLayout>
<RelativeLayout
GSKMTOrange/src/main/res/layout/planogram_dialog_layout.xml
+8 -2
View File
@@ -36,12 +36,18 @@
android:layout_height="match_parent"
android:orientation="vertical">
<ImageView
<!-- <ImageView
android:id="@+id/img_planogram"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="10dp"
android:src="@drawable/sad_cloud"/>
android:src="@drawable/sad_cloud" />-->
<WebView
android:id="@+id/webview"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
</LinearLayout>
GSKMTOrange/src/main/res/layout/service_item_layout.xml
+63
View File
@@ -0,0 +1,63 @@
<?xml version="1.0" encoding="utf-8"?>
<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.support.v7.widget.CardView
android:id="@+id/card_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/custom_margin"
android:layout_marginRight="@dimen/custom_margin"
android:layout_marginTop="@dimen/custom_margin"
card_view:cardBackgroundColor="@color/white"
card_view:cardCornerRadius="10dp"
>
<LinearLayout
android:id="@+id/parent_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_weight="3"
>
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="5dp"
>
<ImageView
android:id="@+id/btn_is_present"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textOn="@string/yes"
android:textOff="@string/no"
android:background="@mipmap/exit_grey"
android:layout_centerInParent="true"/>
</RelativeLayout>
<TextView
android:id="@+id/tv_settings"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="2"
android:text="Checklist"
android:textColor="@color/black"
android:textStyle="bold"
android:gravity="center_vertical"
android:paddingLeft="@dimen/custom_margin"/>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
GSKMTOrange/src/main/res/menu/menu_.xml
+10
View File
@@ -0,0 +1,10 @@
<menu 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"
tools:context="cpm.com.gskmtorange.dailyentry.ServiceActivity">
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
android:title="@string/action_settings"
app:showAsAction="never" />
</menu>
GSKMTOrange/src/main/res/menu/planogram.xml
+1 -1
View File
@@ -5,6 +5,6 @@
android:id="@+id/action_planogram"
android:icon="@mipmap/ref_images_white"
android:orderInCategory="100"
android:title="planogram"
android:title="@string/stock_facing_planogram_dialog_title"
app:showAsAction="always" />
</menu>
GSKMTOrange/src/main/res/mipmap-hdpi/export.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/language.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

GSKMTOrange/src/main/res/values-tr/string.xml
+47 -9
View File
@@ -73,20 +73,22 @@
<string name="daily_data_menu_additional_promotions">Promosyon</string>
<string name="msl_availability_sku">Ürün Adı</string>
<string name="msl_availability_mbq">MBQ</string>
<string name="msl_availability_mbq">X</string>
<string name="msl_availability_availability">Bulunurluk</string>
<string name="stock_facing_reference_image">Örnek Fotoğraf</string>
<string name="stock_facing_sku_name">Ürün Adı</string>
<string name="stock_facing_stock">Stock</string>
<string name="stock_facing_stock">Stock</string> <!--change string-->
<string name="stock_facing_faceup">Önyüz</string>
<string name="stock_facing_sos_target">Raf Payı Hedefi</string>
<string name="stock_facing_sos">Raf Payi</string>
<!--Gagan end code-->
<!--Gagan start new code 1-->
<string name="title_activity_promo_compliance">Promosyon</string>
<string name="promo_compliance_additional_promo">Additional Promos</string>
<string name="promo_compliance_promo">Promos</string>
<string name="promo_compliance_additional_promo">Ek Promosyon</string>
<string name="promo_compliance_promo">Promosyon</string>
<string name="promo_compliance_promos_sku">Promosyon Ürünü</string>
<string name="promo_compliance_sku">Promosyon Ürünü</string>
<string name="promo_compliance_inStock">Ürün Bulunuyor</string>
@@ -106,11 +108,7 @@
<string name="category_performance_lsv">Son Ziyaret</string>
<string name="title_activity_store_wise_performance">Mağaza Performansı</string>
<!--Gagan End Code -->
<!--Gagan start new code 2-->
<string name="stock_facing_planogram_dialog_title">Planogram</string>
<!--Gagan end new code 2-->
<!--Gagan end new code 1-->
<string name="stock">Stock</string>
<string name="AdditionalDisplay">Ek Teşhir</string>
@@ -128,6 +126,31 @@
<string name="title_activity_Want_to_delete1"> Verileri silmek istiyor musun</string>
<string name="title_activity_click_delete">Silme için Evet tıklayın</string>
<string name="title_activity_select_dropdown">Please Select dropdown</string>
<string name="title_activity_take_image">Please Take a image</string>
<string name="title_activity_fill_sku">Please fill sku data</string>
<string name="title_activity_enter_quantity">Please enter Quantity</string>
<string name="title_activity_save_data">Do you want to save the data</string>
<string name="clickimage">Please click the image</string>
<string name="gps">GPS IS DISABLED...</string>
<string name="gpsebale">Click ok to enable GPS.</string>
<string name="takeimage"> Please Take Image Before Save</string>
<string name="notsuppoted">This device is not supported.</string>
<string name="uploaddata">Uploading Data</string>
<string name="geotagdata">Uploading Geotag Data...</string>
<string name="failure">failure</string>
<string name="uploadimge">Uploading Geotag Images</string>
<string name="success">success</string>
<string name="wantcheckout">Are you sure you want to Checkout</string>
<string name="nonetwork"> No Network</string>
<string name="click_image">Please click image</string>
<string name="export_database">Veritabanı Aktar</string>
<string name="title_activity_service">Servisler</string>
<string name="title_activity_take_image">En az bir fotoğraf çekiniz</string>
<string name="title_activity_fill_sku">Ürün ekle</string>
@@ -163,6 +186,7 @@
<string name="delete">Sil</string>
<string name="adddatatoclick">Veri Eklemek İçin Evet tıklayın</string>
<string name="displayname">Teşhir Türü</string>
<string name="storefront">Click Store Front Image</string>
<string name="brandname">Brand Name</string>
<string name="skuname">SKU Name</string>
@@ -172,6 +196,20 @@
<string name="Remark">Remark</string>
<string name="pleaseenterRemarks">Please fill Remark</string>
<!--Gagan start new code 2-->
<string name="stock_facing_planogram_dialog_title">Örnek Fotoğraf</string>
<string name="title_activity_settings">Ayarlar</string>
<string name="ok">Tamam</string>
<string name="check_save_message">Veriyi saklamak istiyor musunuz?</string>
<string name="save_message">Veriler Kaydedildi</string>
<string name="update_message">Veriler Kaydedildi</string>
<string name="empty_field">Tüm alanlari doldurunuz </string>
<string name="fill_data">Tüm alanlari doldurunuz</string>
<string name="dialog_title">Parinaam</string>
<!--Gagan end new code 2-->
</resources>
GSKMTOrange/src/main/res/values/dimens.xml
+1 -1
View File
@@ -7,7 +7,7 @@
<dimen name="activity_vertical_margin">16dp</dimen>
<dimen name="fab_margin">16dp</dimen>
<dimen name="custom_margin">10dp</dimen>
<dimen name="custom_margin">5dp</dimen>
<dimen name="text_size_normal">20sp</dimen>
<dimen name="text_size_small">16sp</dimen>
GSKMTOrange/src/main/res/values/strings.xml
+8 -5
View File
@@ -68,7 +68,6 @@
<string name="title_activity_t2_pcompliance">T2P Compliance</string>
<!--Gagan start code-->
<string name="title_activity_category_list">Category List</string>
<string name="title_activity_category_wise_performance">Categorywise Performance</string>
<string name="title_activity_daily_main_menu">Daily Data Menu</string>
@@ -93,7 +92,6 @@
<string name="stock_facing_faceup">Facing</string>
<string name="stock_facing_sos_target">SOS Target</string>
<string name="stock_facing_sos">SOS</string>
<!--Gagan end code-->
<string name="title_geo_tag_activity_upload_data">Store Uploaded</string>
@@ -195,8 +193,8 @@
<string name="daily_activity_menu">Daily Data Menu</string>
<!--Gagan start new code 2-->
<string name="stock_facing_planogram_dialog_title">Planogram</string>
<string name="title_activity_settings">SettingsActivity</string>
<string name="stock_facing_planogram_dialog_title">Reference Image</string>
<string name="title_activity_settings">Settings</string>
<string name="ok">OK</string>
<string name="check_save_message">Are you sure you want to save</string>
@@ -205,7 +203,6 @@
<string name="empty_field">Fill the value </string>
<string name="fill_data">Please fill all the data</string>
<string name="dialog_title">Parinaam</string>
<!--Gagan end new code 2-->
<string name="select_language_item">Select language</string>
@@ -214,6 +211,7 @@
<string name="hello_blank_fragment">Hello blank fragment</string>
<string name="title_activity_checkout">CheckoutActivity</string>
<string name="checkout_successful">Checkout Success</string>
<string name="NetworkError">Network Error ,</string>
<string name="DataNot"> Data Not Uploaded ,</string>
<string name="displayname">Display Name</string>
@@ -221,5 +219,10 @@
<string name="Remark">Remark</string>
<string name="pleaseenterRemarks">Please fill Remark</string>
<string name="title_activity_service">Service</string>
<string name="data_downloaded_successfully">Data downloaded successfully</string>
<string name="export_database">Export Database</string>
<string name="data_exported_successfully">Database Exported Successfully</string>
</resources>