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

# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java

GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java

@@ -11,6 +11,7 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.location.Location;
 import android.location.LocationListener;
+import android.os.Environment;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.design.widget.Snackbar;
@@ -44,6 +45,7 @@ import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 import org.xmlpull.v1.XmlPullParserFactory;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
 import java.net.MalformedURLException;
@@ -152,6 +154,10 @@ public class LoginActivity extends AppCompatActivity {
         mLoginFormView = findViewById(R.id.login_form);
         mProgressView = findViewById(R.id.login_progress);
 
+        File file = new File(Environment.getExternalStorageDirectory(), "GSK_MT_ORANGE_IMAGES");
+        if (!file.isDirectory()) {
+            file.mkdir();
+        }
     }
 
   /*  private void populateAutoComplete() {

GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java

@@ -1,5 +1,7 @@
 package cpm.com.gskmtorange.constant;
 
+import android.os.Environment;
+
 /**
  * Created by yadavendras on 19-12-2016.
  */
@@ -52,6 +54,11 @@ public class CommonString {
     public static final String MESSAGE_EXCEPTION = "Problem Occured : Report The Problem To Parinaam ";
     public static final String MESSAGE_SOCKETEXCEPTION = "Network Communication Failure. Check Your Network Connection";
 
+    //File Path
+    public static final String FILE_PATH = Environment.getExternalStorageDirectory() + "/GSK_MT_ORANGE_IMAGES/";
+
+
+    //Table
     public static final String TABLE_INSERT_MSL_AVAILABILITY = "Msl_Availability_Data";
 
     public static final String CREATE_TABLE_INSERT_MSL_AVAILABILITY = "CREATE TABLE IF NOT EXISTS "

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

@@ -29,6 +29,7 @@
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin"
         android:backgroundTint="@color/colorPrimary"
+        android:visibility="gone"
         app:srcCompat="@drawable/save_icon" />
 
 </android.support.design.widget.CoordinatorLayout>