diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000..d98839b Binary files /dev/null and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser new file mode 100644 index 0000000..60063de Binary files /dev/null and b/.idea/caches/gradle_models.ser differ diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..8d1cd7e --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle index 3cdf07b..270a232 100644 --- a/GSKMTOrange/build.gradle +++ b/GSKMTOrange/build.gradle @@ -34,8 +34,8 @@ android { versionName "3.7"*/ //For KSA - versionCode 26 - versionName "3.8" + versionCode 27 + versionName "3.9" //For SA /*versionCode 26 diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java index cc50cfc..ef2cb8e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java @@ -211,6 +211,8 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. //KSA /* museridView.setText("mohamed.o"); mPasswordView.setText("cpm@123");*/ + /* museridView.setText("testksa"); + mPasswordView.setText("cpm123");*/ //turkey diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java index 1709f30..37199aa 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java @@ -1014,7 +1014,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl holder.toggle_available = (ToggleButton) convertView.findViewById(R.id.toggle_available); holder.facing = (EditText) convertView.findViewById(R.id.ed_facing); - holder.facing.setFilters(new InputFilter[]{new DecimalDigitsInputFilter(6, 1)}); + holder.facing.setFilters(new InputFilter[]{new DecimalDigitsInputFilter(3, 1)}); holder.stock = (EditText) convertView.findViewById(R.id.ed_stock); holder.stock_view = convertView.findViewById(R.id.stock_view); diff --git a/GSKMTOrange/src/main/res/layout/item_msl_availability_stock_facing_child.xml b/GSKMTOrange/src/main/res/layout/item_msl_availability_stock_facing_child.xml index de0ce80..781bb3d 100644 --- a/GSKMTOrange/src/main/res/layout/item_msl_availability_stock_facing_child.xml +++ b/GSKMTOrange/src/main/res/layout/item_msl_availability_stock_facing_child.xml @@ -98,7 +98,7 @@ android:background="@null" android:gravity="center" android:inputType="numberDecimal" - android:maxLength="6" + android:maxLength="3" android:paddingBottom="5dp" android:paddingTop="5dp" android:textAppearance="?android:attr/textAppearanceSmall" 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 deleted file mode 100644 index 2a42394..0000000 --- a/library/build/generated/source/buildConfig/debug/com/androidbuts/multispinnerfilter/BuildConfig.java +++ /dev/null @@ -1,18 +0,0 @@ -/** - * 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"; - /** - * @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME - */ - @Deprecated - public static final String APPLICATION_ID = "com.androidbuts.multispinnerfilter"; - public static final String BUILD_TYPE = "debug"; - public static final String FLAVOR = ""; - public static final int VERSION_CODE = 1; - public static final String VERSION_NAME = "1.0"; -} diff --git a/library/build/outputs/logs/manifest-merger-debug-report.txt b/library/build/outputs/logs/manifest-merger-debug-report.txt deleted file mode 100644 index 4bbb248..0000000 --- a/library/build/outputs/logs/manifest-merger-debug-report.txt +++ /dev/null @@ -1,41 +0,0 @@ --- Merging decision tree log --- -manifest -ADDED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 -INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 -INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 -INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 -INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 -INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 -INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 - package - ADDED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:3:5-49 - INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml - INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml - android:versionName - INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml - ADDED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 - INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml - android:versionCode - INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml - ADDED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 - INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml - xmlns:android - ADDED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:11-69 -application -ADDED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:5:5-7:19 - android:allowBackup - ADDED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:5:18-44 -uses-sdk -INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml reason: use-sdk injection requested -INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml -INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml -INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml -INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml - android:targetSdkVersion - INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml - ADDED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml - INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml - android:minSdkVersion - INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml - ADDED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml - INJECTED from E:\AndroidProject\GSKORANGEV2\library\src\main\AndroidManifest.xml