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

Merge branch 'master' into GG_StorePerformance

Browse Source
This commit is contained in:
YadavendraSinghYaduvanshi
2017-01-12 10:07:23 +05:30
committed by GitHub
parent 5b080446e6 3fc2fe38b5
commit ba9b1f004c
34 changed files with 3203 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/values/colors.xml
+1
View File
@@ -13,4 +13,5 @@
<color name="colorOrange">#FFE0B2</color>
</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">5dp</dimen>
<dimen name="custom_margin">10dp</dimen>
<dimen name="text_size_normal">20sp</dimen>
<dimen name="text_size_small">16sp</dimen>
GSKMTOrange/src/main/res/values/icons.xml
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="fa_icon_areachart">&#xf1fe;</string>
<string name="fa_icon_piechart">&#xf200;</string>
<string name="fa_icon_linechart">&#xf201;</string>
</resources>
GSKMTOrange/src/main/res/values/strings.xml
+18 -2
View File
@@ -34,8 +34,6 @@
<string name="select">Select</string>
<string name="add">Add</string>
<string name="cancel">Cancel</string>
<string name="yes">Yes</string>
<string name="no">No</string>
<string name="select_language">Please select language</string>
<string name="title_activity_select_language">SelectLanguageActivity</string>
@@ -98,9 +96,14 @@
<string name="title_store_list_checkout_current">Please checkout from current store</string>
<string name="title_store_list_checkout_Already_filled">Data already filled</string>
<string name="title_store_list_download_data">Please Download Data First</string>
<string name="enter_the_values">Enter the values</string>
<string name="yes">Yes</string>
<string name="no">No</string>
<string name="title_activity_upload">Upload Data</string>
<string name="no_data_for_upload">No Data For Upload</string>
<string name="first_checkout_store">First checkout of store</string>
@@ -132,4 +135,17 @@
<!--Gagan end new code 1-->
<string name="AdditionalDisplay">Is there any Additional Display</string>
<string name="Display">Display</string>
<string name="Photo">Photo</string>
<string name="title_activity_Additional_visibility">Additional Visibility</string>
<string name="title_activity_Non_Work">Non-Work Reason</string>
<string name="closed">Close</string>
<string name="click_image">Please click image</string>
<string name="fill_sku_data">Please fill SKU data</string>
<string name="fill_gaps_data">Please fill GAP data</string>
<string name="data_will_be_lost">Want to proceed usaved data will be deleted</string>
</resources>