Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into NewCODE

GSKMTOrange/src/main/res/layout/activity_download.xml

@@ -1,13 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:id="@+id/activity_download"
+    android:id="@+id/coordinate"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="cpm.com.gskmtorange.download.DownloadActivity">
+    android:fitsSystemWindows="true"
+    tools:context="cpm.com.gskmtorange.MainActivity">
 
-</RelativeLayout>
+    <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>
+
+    <RelativeLayout
+        android:id="@+id/activity_download"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingBottom="@dimen/activity_vertical_margin"
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:paddingTop="@dimen/activity_vertical_margin"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        tools:context="cpm.com.gskmtorange.download.DownloadActivity">
+
+    </RelativeLayout>
+
+</android.support.design.widget.CoordinatorLayout>

GSKMTOrange/src/main/res/values/strings.xml

@@ -62,7 +62,7 @@
     <string name="menu_export">Data Export</string>
 
     <string name="menu_exit">Exit</string>
-    <string name="menu_setting">Setting</string>
+    <string name="menu_setting">Settings</string>
     <string name="menu_services">Services</string>
 
     <string name="title_activity_t2_pcompliance">T2P Compliance</string>
@@ -148,9 +148,9 @@
     <string name="Photo">Photo</string>
     <string name="title_activity_Additional_visibility">Additional Visibility</string>
 
-    <string name="title_activity_Want_save"> Are you sure You Want To Save</string>
+    <string name="title_activity_Want_save"> Are you sure you want to save</string>
     <string name="title_activity_Want_add"> Please Add Data</string>
-    <string name="title_activity_Want_to_add">Are you sure You Want To Add</string>
+    <string name="title_activity_Want_to_add">Are you sure 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>
@@ -173,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 Connection. Please check your Internet Connection</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>