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

//Stock_FacingActivity Changes today

Browse Source
This commit is contained in:
Gagan290
2017-01-18 15:09:35 +05:30
parent dae31ebe51
commit 37aa966894
7 changed files with 111 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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/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
+20 -10
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>
@@ -163,6 +161,18 @@
<string name="delete">Delete</string>
<string name="adddatatoclick">Click Yes To Add Data</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
+1 -4
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,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>