From 2f84b3ecea730db023b637291f6befab134dd8aa Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Thu, 5 Jan 2017 09:58:16 +0530 Subject: [PATCH 1/2] 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/res/layout/content_stock_facing.xml | 9 ++++----- GSKMTOrange/src/main/res/values/strings.xml | 3 ++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/GSKMTOrange/src/main/res/layout/content_stock_facing.xml b/GSKMTOrange/src/main/res/layout/content_stock_facing.xml index 4d1552a..4c5e87c 100644 --- a/GSKMTOrange/src/main/res/layout/content_stock_facing.xml +++ b/GSKMTOrange/src/main/res/layout/content_stock_facing.xml @@ -5,8 +5,7 @@ android:id="@+id/content_msl__availability" android:layout_width="match_parent" android:layout_height="match_parent" - app:layout_behavior="@string/appbar_scrolling_view_behavior" - tools:showIn="@layout/activity_msl__availability"> + app:layout_behavior="@string/appbar_scrolling_view_behavior"> @@ -63,7 +62,7 @@ android:gravity="center" android:paddingBottom="5dp" android:paddingTop="5dp" - android:text="Stock" + android:text="@string/stock_facing_stock" android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="#222" /> @@ -80,7 +79,7 @@ android:gravity="center" android:paddingBottom="5dp" android:paddingTop="5dp" - android:text="Faceup" + android:text="@string/stock_facing_faceup" android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="#222" /> diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index f48146f..f349214 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -56,8 +56,9 @@ Availability Reference Image + SKU Name Stock - Facing + Facing SOS Target From 8bb793e0f50a234268c02303df84bfc0d240e346 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Thu, 5 Jan 2017 10:35:22 +0530 Subject: [PATCH 2/2] 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 --- .../src/main/java/cpm/com/gskmtorange/LoginActivity.java | 6 ++++++ .../java/cpm/com/gskmtorange/constant/CommonString.java | 7 +++++++ GSKMTOrange/src/main/res/layout/activity_category_list.xml | 1 + 3 files changed, 14 insertions(+) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java index 851abd0..fa29d4c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java +++ b/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() { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java index 0114124..b67b8c9 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java +++ b/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 " diff --git a/GSKMTOrange/src/main/res/layout/activity_category_list.xml b/GSKMTOrange/src/main/res/layout/activity_category_list.xml index 0b3ab65..4eb49f7 100644 --- a/GSKMTOrange/src/main/res/layout/activity_category_list.xml +++ b/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" />