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

Merge remote-tracking branch 'origin/GeoT' into GeoT

Browse Source 
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
This commit is contained in:
ashishandroid
2017-01-05 10:52:09 +05:30
parent 95310c3375 0d750227f7
commit fb8a08a5cb
76 changed files with 7730 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/values/dimens.xml
+1 -1
View File
@@ -11,5 +11,5 @@
<dimen name="text_size_normal">20sp</dimen>
<dimen name="text_size_small">16sp</dimen>
<dimen name="store_entry_text_size">20sp</dimen>
</resources>
GSKMTOrange/src/main/res/values/strings.xml
+25
View File
@@ -39,4 +39,29 @@
<string name="menu_setting">Setting</string>
<string name="menu_services">Services</string>
<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">DailyMainMenuActivity</string>
<string name="title_activity_msl__availability">MSL_AvailabilityActivity</string>
<string name="title_geo_tag_activity_upload_data">Store Uploaded</string>
<string name="title_geo_tag_activity_geo_data">Store Geo Data Uploaded</string>
<string name="title_geo_tag_activity_geo_already_done">Store Already Geotagged</string>
<string name="title_store_list_activity_store_already_done">Store Already Uploaded</string>
<string name="title_store_list_activity_store_data_uploaded">Store Data Uploaded</string>
<string name="title_store_list_activity_store_already_checkout">Store Already Checkout</string>
<string name="title_store_list_activity_store_again_uploaded">Please Store data again Uploaded</string>
<string name="title_store_list_activity_store_closed">Store Closed</string>
<string name="save">SAVE</string>
<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>
</resources>
GSKMTOrange/src/main/res/values/styles.xml
+3
View File
@@ -17,4 +17,7 @@
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
<style name="AppTheme.NoActionBar.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
</resources>