diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 331366b..e5fc3fc 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle index 9b05de4..33eef1b 100644 --- a/GSKMTOrange/build.gradle +++ b/GSKMTOrange/build.gradle @@ -28,12 +28,12 @@ android { versionName "4.3"*/ //For UAE - versionCode 28 - versionName "4.0" + /* versionCode 28 + versionName "4.0"*/ //For Turkey - /* versionCode 26 - versionName "3.8"*/ + versionCode 26 + versionName "3.8" //For KSA /* versionCode 28 diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java index 8874f88..4e3733f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java @@ -204,6 +204,8 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. //UAE /* museridView.setText("testuae"); mPasswordView.setText("cpm123");*/ + /* museridView.setText("testuae1"); + mPasswordView.setText("cpm123");*/ //KSA /* museridView.setText("Esmail.d"); @@ -217,7 +219,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. //turkey - /* museridView.setText("testmer"); + /* museridView.setText("testmer"); mPasswordView.setText("cpm123");*/ //sa /* museridView.setText("testsa"); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/POGQuestionsActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/POGQuestionsActivity.java index 256bcf0..ec02691 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/POGQuestionsActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/POGQuestionsActivity.java @@ -152,7 +152,7 @@ public class POGQuestionsActivity extends AppCompatActivity { } }); - if (country_id.equals("2") && (storeType_id.equals("9") || storeType_id.equals("15"))) { + if (country_id.equals("2") && (storeType_id.equals("9") || storeType_id.equals("15")||storeType_id.equals("47"))) { linPlanogramType.setVisibility(View.VISIBLE); final ArrayAdapter planogramTypeAdapter = new ArrayAdapter(this, android.R.layout.simple_spinner_item); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java index 63d8ff3..724a259 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java @@ -306,7 +306,6 @@ public class UploadImageWithRetrofit { } -/* public File saveBitmapToFileSmaller(File file) { File file2 = file; try { @@ -334,7 +333,8 @@ public class UploadImageWithRetrofit { } return file2; } -*/ + +/* public File saveBitmapToFileSmaller(File file) { File file2 = file; try { @@ -380,6 +380,7 @@ public class UploadImageWithRetrofit { } return file2; } +*/ public void showAlert(final Context context, String str, final boolean flag) { diff --git a/library/build/generated/source/buildConfig/debug/com/androidbuts/multispinnerfilter/BuildConfig.java b/library/build/generated/source/buildConfig/debug/com/androidbuts/multispinnerfilter/BuildConfig.java new file mode 100644 index 0000000..b142466 --- /dev/null +++ b/library/build/generated/source/buildConfig/debug/com/androidbuts/multispinnerfilter/BuildConfig.java @@ -0,0 +1,12 @@ +/** + * Automatically generated file. DO NOT MODIFY + */ +package com.androidbuts.multispinnerfilter; + +public final class BuildConfig { + public static final boolean DEBUG = Boolean.parseBoolean("true"); + public static final String LIBRARY_PACKAGE_NAME = "com.androidbuts.multispinnerfilter"; + public static final String BUILD_TYPE = "debug"; + public static final int VERSION_CODE = 1; + public static final String VERSION_NAME = "1.0"; +}