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

Merge branch 'master' into ysy_t2p_valid

Browse Source
This commit is contained in:
YadavendraSinghYaduvanshi
2017-01-18 15:27:50 +05:30
committed by GitHub
parent 5eb8b67f24 f544705714
commit ff799a122f
21 changed files with 812 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/layout/additionallistlayout.xml
+3 -3
View File
@@ -30,7 +30,7 @@
android:layout_height="match_parent"
android:layout_weight="10"
android:text="Brand Name"
android:text="@string/brandname"
android:textStyle="bold" />
<TextView
@@ -59,7 +59,7 @@
android:layout_height="match_parent"
android:layout_weight="10"
android:text="SKU Name"
android:text="@string/displayname"
android:textStyle="bold" />
<TextView
@@ -118,7 +118,7 @@
android:layout_marginLeft="30dp"
android:layout_weight="10"
android:background="@color/grey_background"
android:text="Delete" />
android:text="@string/delete" />
</LinearLayout>
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/contentadditionalvisibility.xml
+6 -4
View File
@@ -154,14 +154,15 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/grey_background">
<ImageView
android:id="@+id/btn_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@mipmap/new_camera" />
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerInParent="true"
android:background="@mipmap/camera_orange" />
</RelativeLayout>
<RelativeLayout
@@ -228,6 +229,7 @@
android:padding="10dp"
card_view:cardBackgroundColor="@color/colorOrange"
card_view:cardCornerRadius="20dp"
android:visibility="gone"
>
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/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/values-tr/string.xml
+63 -17
View File
@@ -73,26 +73,28 @@
<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>
<string name="promo_compliance_promoAnnouncer">Duyuru Var</string>
<string name="promo_compliance_runningPOS">Kasa Okuyor</string>
<string name="promo_compliance_add">Add</string>
<string name="promo_compliance_add">Ekle</string>
<string name="category_performance_period">Zaman</string>
<string name="category_performance_msl_availability">Bulunurluk</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>
@@ -120,13 +118,13 @@
<string name="select_language_item">Dil Seçimi</string>
<string name="title_activity_Want_save"> Do You Want To Save</string>
<string name="title_activity_Want_add"> Please Add Data</string>
<string name="title_activity_Want_to_add">Do You Want To Add</string>
<string name="title_activity_Want_to_delete"> Do You Want To Delete Data</string>
<string name="store"> store</string>
<string name="title_activity_Want_to_delete1"> Do You Want To Delete</string>
<string name="title_activity_click_delete">Click Yes To Delete!</string>
<string name="title_activity_Want_save">Veriyi saklamak istiyor musunuz?</string>
<string name="title_activity_Want_add">Tüm alanlari doldurunuz</string>
<string name="title_activity_Want_to_add">Veri eklemek istiyor musun</string>
<string name="title_activity_Want_to_delete"> Verileri silmek istiyor musun</string>
<string name="store"> Mağazalar</string>
<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>
@@ -153,6 +151,54 @@
<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>
<string name="title_activity_enter_quantity">Teşhir Sayısı Doldur </string>
<string name="title_activity_save_data">Veriyi saklamak istiyor musunuz?</string>
<string name="clickimage">En az bir fotoğraf çekiniz</string>
<string name="gps">GPS devre dışı</string>
<string name="gpsebale">Etkinleştir GPS</string>
<string name="takeimage">En az bir fotoğraf çekiniz</string>
<string name="notsuppoted">Bu cihaz desteklenmiyor</string>
<string name="uploaddata">Veri paylaşılıyor</string>
<string name="geotagdata">Coğrafi Konum paylaşılıyor</string>
<string name="failure">Başarısızlık</string>
<string name="uploadimge">Fotoğraflar paylaşılıyor</string>
<string name="success">Başarı</string>
<string name="wantcheckout">Mağazadan çıkmak istiyor musunuz?</string>
<string name="nonetwork">Bağlantı kurulamıyor. İnternet bağlantınızı kontrol ediniz</string>
<string name="click_image">En az bir fotoğraf çekiniz</string>
<string name="title_store_list_activity_already_store_closed">Mağaza kapalı</string>
<string name="title_store_list_activity_store_closed">Mağaza kapalı</string>
<string name="title_store_list_activity_store_already_done">Paylaşılan mağaza</string>
<string name="title_store_list_activity_store_data_uploaded">Paylaşılan mağaza</string>
<string name="title_store_list_activity_store_already_checkout">Mağaza zaten çıkılmış</string>
<string name="title_store_list_activity_store_again_uploaded">Please Store data again Uploaded</string>
<string name="title_store_list_checkout_current">Lütfen önce mağazadan çık</string>
<string name="title_store_list_checkout_Already_filled">Doldurulmuş veriler</string>
<string name="NetworkError">Bağlantı kurulamıyor ,</string>
<string name="uploadeddata">Veriler Paylaşılıyor ,</string>
<string name="DataNot">Veriler Paylaşılmadı ,</string>
<string name="delete">Sil</string>
<string name="adddatatoclick">Click Yes To Add Data</string>
<string name="displayname">Teşhir Türü</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/strings.xml
+9 -6
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>
@@ -175,7 +173,7 @@
<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="nonetwork"> No Network Connection. Please check your Internet Connection</string>
<string name="title_activity_Non_Work">Non Working Reason</string>
<string name="closed">Close</string>
@@ -195,7 +193,7 @@
<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="stock_facing_planogram_dialog_title">Reference Image</string>
<string name="title_activity_settings">Settings</string>
<string name="ok">OK</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,8 +211,14 @@
<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="title_activity_service">Service</string>
<string name="NetworkError">Network Error ,</string>
<string name="DataNot"> Data Not Uploaded ,</string>
<string name="displayname">Display Name</string>
<string name="adddatatoclick">Click Yes To Add Data</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>