diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index f32d8f4d..b8559cdc 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/build.gradle b/app/build.gradle index 636a418b..3a856170 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,10 +9,11 @@ android { applicationId "it.integry.integrywmsnative" minSdkVersion 21 targetSdkVersion 28 - versionCode 4 - versionName "1.0.1" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + versionCode 7 + versionName "1.0.4" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + buildTypes { release { minifyEnabled false @@ -31,33 +32,41 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.1', { exclude group: 'com.android.support', module: 'support-annotations' }) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'com.orhanobut:logger:2.2.0' - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support:support-v4:28.0.0' - implementation 'com.android.support:design:28.0.0' - implementation 'com.android.support.constraint:constraint-layout:1.1.3' - implementation 'com.android.support:cardview-v7:28.0.0' - implementation 'com.android.support:recyclerview-v7:28.0.0' - implementation 'com.android.support:preference-v7:28.0.0' + implementation 'androidx.appcompat:appcompat:1.1.0-alpha01' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'com.google.android.material:material:1.1.0-alpha01' + implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha01' + implementation 'androidx.preference:preference:1.1.0-alpha01' implementation 'com.squareup.retrofit2:retrofit:2.3.0' implementation 'com.squareup.retrofit2:converter-gson:2.0.0' implementation 'org.parceler:parceler-api:1.1.10' annotationProcessor 'org.parceler:parceler:1.1.10' implementation 'com.annimon:stream:1.2.1' + + implementation "androidx.lifecycle:lifecycle-runtime:2.0.0" + implementation "androidx.lifecycle:lifecycle-extensions:2.0.0" + implementation "androidx.lifecycle:lifecycle-common-java8:2.0.0" + kapt "androidx.lifecycle:lifecycle-compiler:2.0.0" + + implementation "com.emreeran.permissionlivedata:permissionlivedata:1.0.4" + //MVVM - implementation 'android.arch.lifecycle:extensions:1.1.1' - annotationProcessor "android.arch.lifecycle:compiler:1.1.1" + implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0' + annotationProcessor "androidx.lifecycle:lifecycle-compiler:2.0.0" implementation 'com.jakewharton.rxbinding2:rxbinding:2.1.1' implementation 'com.jakewharton.rxbinding2:rxbinding-support-v4:2.1.1' implementation 'com.jakewharton.rxbinding2:rxbinding-appcompat-v7:2.1.1' implementation 'com.jakewharton.rxbinding2:rxbinding-design:2.1.1' implementation 'com.jakewharton.rxbinding2:rxbinding-recyclerview-v7:2.1.1' - implementation 'com.jakewharton:butterknife:8.8.1' - annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1' + implementation 'com.jakewharton:butterknife:9.0.0-rc2' + annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0-rc2' implementation 'br.com.zbra:android-linq:1.1.0' //FAB //implementation 'com.getbase:floatingactionbutton:1.10.1' diff --git a/app/src/androidTest/java/it/integry/integrywmsnative/ExampleInstrumentedTest.java b/app/src/androidTest/java/it/integry/integrywmsnative/ExampleInstrumentedTest.java index 7f8abc7d..fc3a233a 100644 --- a/app/src/androidTest/java/it/integry/integrywmsnative/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/it/integry/integrywmsnative/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package it.integry.integrywmsnative; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 062f1753..25f07acc 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -4,6 +4,8 @@ + + onFailed) { String currentAzienda = UtilityString.isNullOrEmpty(SettingsManager.i().userSession.profileDB) ? "" : " [" + SettingsManager.i().userSession.profileDB + "]"; @@ -129,8 +133,11 @@ public class SystemRESTConsumer extends _BaseRESTConsumer { .setMsgText(message) .setHtml(true); - sendMail(mailDTO, null, ex -> { + sendMail(mailDTO, () -> { + if(onComplete != null) onComplete.run(); + }, ex -> { Log.e(SystemRESTConsumer.class.getName(), "", ex); + if(onFailed != null) onFailed.run(ex); }); } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/BindableBoolean.java b/app/src/main/java/it/integry/integrywmsnative/core/di/BindableBoolean.java index fe2013ca..3280d7a0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/di/BindableBoolean.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/di/BindableBoolean.java @@ -1,6 +1,6 @@ package it.integry.integrywmsnative.core.di; -import android.databinding.BaseObservable; +import androidx.databinding.BaseObservable; import org.parceler.Parcel; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/BindableFloat.java b/app/src/main/java/it/integry/integrywmsnative/core/di/BindableFloat.java index 44993c4e..9c3c873f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/di/BindableFloat.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/di/BindableFloat.java @@ -1,6 +1,6 @@ package it.integry.integrywmsnative.core.di; -import android.databinding.BaseObservable; +import androidx.databinding.BaseObservable; import org.parceler.Parcel; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/BindableInteger.java b/app/src/main/java/it/integry/integrywmsnative/core/di/BindableInteger.java index 4a509d0a..5be038d5 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/di/BindableInteger.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/di/BindableInteger.java @@ -1,6 +1,6 @@ package it.integry.integrywmsnative.core.di; -import android.databinding.BaseObservable; +import androidx.databinding.BaseObservable; import org.parceler.Parcel; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/BindableString.java b/app/src/main/java/it/integry/integrywmsnative/core/di/BindableString.java index 0a3a9a7b..ce8f2bc2 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/di/BindableString.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/di/BindableString.java @@ -1,7 +1,7 @@ package it.integry.integrywmsnative.core.di; -import android.databinding.BaseObservable; -import android.databinding.Observable; +import androidx.databinding.BaseObservable; +import androidx.databinding.Observable; import org.parceler.Parcel; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java b/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java index 746fc636..9d10a038 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java @@ -1,20 +1,18 @@ package it.integry.integrywmsnative.core.di; -import android.databinding.BindingAdapter; -import android.databinding.BindingConversion; -import android.support.constraint.Guideline; -import android.support.design.widget.TextInputEditText; -import android.support.v4.util.Pair; -import android.support.v7.widget.AppCompatCheckBox; -import android.support.v7.widget.AppCompatTextView; +import androidx.databinding.BindingAdapter; +import androidx.databinding.BindingConversion; +import androidx.constraintlayout.widget.Guideline; +import com.google.android.material.textfield.TextInputEditText; +import androidx.core.util.Pair; +import androidx.appcompat.widget.AppCompatCheckBox; +import androidx.appcompat.widget.AppCompatTextView; import android.util.Log; import android.view.View; import android.widget.CheckBox; -import android.widget.CompoundButton; import android.widget.EditText; import android.widget.RadioButton; import android.widget.RadioGroup; -import android.widget.Toast; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/binders/ExpandableLayoutBinders.java b/app/src/main/java/it/integry/integrywmsnative/core/di/binders/ExpandableLayoutBinders.java index 4077a281..6bf97479 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/di/binders/ExpandableLayoutBinders.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/di/binders/ExpandableLayoutBinders.java @@ -1,8 +1,7 @@ package it.integry.integrywmsnative.core.di.binders; -import android.databinding.BindingAdapter; -import android.support.design.widget.TextInputEditText; -import android.support.v4.util.Pair; +import androidx.databinding.BindingAdapter; +import androidx.core.util.Pair; import net.cachapa.expandablelayout.ExpandableLayout; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/binders/RecyclerViewAdapterBinders.java b/app/src/main/java/it/integry/integrywmsnative/core/di/binders/RecyclerViewAdapterBinders.java index 3afa44fe..891010cd 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/di/binders/RecyclerViewAdapterBinders.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/di/binders/RecyclerViewAdapterBinders.java @@ -1,11 +1,7 @@ package it.integry.integrywmsnative.core.di.binders; -import android.databinding.BindingAdapter; -import android.databinding.ObservableArrayList; -import android.support.v7.widget.RecyclerView; -import android.view.ViewGroup; - -import java.util.List; +import androidx.databinding.BindingAdapter; +import androidx.databinding.ObservableArrayList; public class RecyclerViewAdapterBinders { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/binders/TextInputLayoutBinders.java b/app/src/main/java/it/integry/integrywmsnative/core/di/binders/TextInputLayoutBinders.java index ad2e5294..852a3132 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/di/binders/TextInputLayoutBinders.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/di/binders/TextInputLayoutBinders.java @@ -1,7 +1,7 @@ package it.integry.integrywmsnative.core.di.binders; -import android.databinding.BindingAdapter; -import android.support.design.widget.TextInputLayout; +import androidx.databinding.BindingAdapter; +import com.google.android.material.textfield.TextInputLayout; public class TextInputLayoutBinders { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/binders/recyclerview/BindingRecyclerViewAdapter.java b/app/src/main/java/it/integry/integrywmsnative/core/di/binders/recyclerview/BindingRecyclerViewAdapter.java index 654e0e0c..78996906 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/di/binders/recyclerview/BindingRecyclerViewAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/di/binders/recyclerview/BindingRecyclerViewAdapter.java @@ -1,11 +1,11 @@ package it.integry.integrywmsnative.core.di.binders.recyclerview; -import android.databinding.DataBindingUtil; -import android.databinding.ObservableArrayList; -import android.databinding.ObservableList; -import android.databinding.ViewDataBinding; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.databinding.DataBindingUtil; +import androidx.databinding.ObservableArrayList; +import androidx.databinding.ObservableList; +import androidx.databinding.ViewDataBinding; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/binders/recyclerview/RecyclerViewBindings.java b/app/src/main/java/it/integry/integrywmsnative/core/di/binders/recyclerview/RecyclerViewBindings.java index 43aa99c5..25889a54 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/di/binders/recyclerview/RecyclerViewBindings.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/di/binders/recyclerview/RecyclerViewBindings.java @@ -1,7 +1,7 @@ package it.integry.integrywmsnative.core.di.binders.recyclerview; -import android.databinding.BindingAdapter; -import android.support.v7.widget.RecyclerView; +import androidx.databinding.BindingAdapter; +import androidx.recyclerview.widget.RecyclerView; import java.util.Collection; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/exception/ExceptionsHandler.java b/app/src/main/java/it/integry/integrywmsnative/core/exception/ExceptionsHandler.java index c87d9a82..a4b0f9bd 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/exception/ExceptionsHandler.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/exception/ExceptionsHandler.java @@ -1,382 +1,69 @@ package it.integry.integrywmsnative.core.exception; import android.app.Activity; -import android.app.ActivityManager; -import android.app.ApplicationErrorReport; import android.content.Context; -import android.content.pm.ApplicationInfo; -import android.content.pm.PackageManager; -import android.os.Build; -import android.os.Debug; -import android.support.annotation.NonNull; +import android.os.Environment; +import android.os.Looper; import android.util.Log; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; import java.io.PrintWriter; -import java.io.StringWriter; -public class ExceptionsHandler implements Thread.UncaughtExceptionHandler{ +import it.integry.integrywmsnative.MainApplication; +import it.integry.integrywmsnative.core.utility.UtilityLogger; +import it.integry.integrywmsnative.view.dialogs.exception.DialogException; +public class ExceptionsHandler implements Thread.UncaughtExceptionHandler { - private ExceptionsHandler(Activity activity){ + private final static String TAG = ExceptionsHandler.class.getSimpleName(); - mPackageName = getPackageName(activity); + private final Activity context; + private final Thread.UncaughtExceptionHandler rootHandler; + + public ExceptionsHandler(Activity context) { + this.context = context; + // we should store the current exception handler -- to invoke it for all not handled exceptions ... + rootHandler = Thread.getDefaultUncaughtExceptionHandler(); + // we replace the exception handler now with us -- we will properly dispatch the exceptions ... + Thread.setDefaultUncaughtExceptionHandler(this); } - - - public static ExceptionsHandler getINSTANCE(Activity activity){ - - if (mExceptionsHandler == null){ - - mExceptionsHandler = new ExceptionsHandler(activity); - } - - return mExceptionsHandler; - } - - - private static String getPackageName(Context pContext){ - - String packageName = ""; - - try{ - - ActivityManager activityManager = (ActivityManager) pContext - .getSystemService(Context.ACTIVITY_SERVICE); - - if (Build.VERSION.SDK_INT > 20){ - - packageName = activityManager.getRunningAppProcesses().get(0).processName; - }else{ - - // - packageName = activityManager.getRunningTasks(1).get(0).topActivity - .getPackageName(); - } - - // There is a limit to the tag length of 23. - packageName = packageName - .substring(0, packageName.length() > 22 ? 22 : packageName.length()); - - }catch (Exception ex){ - } - - if (packageName.isEmpty()){ - packageName = pContext.getPackageName(); - } - - return packageName; - } - - - - - public static void toCatch(Activity activity){ - - Thread.setDefaultUncaughtExceptionHandler(getINSTANCE(activity)); - } - - - - - - - - public static void logError(String message){ - - if (message.isEmpty()){ - - return; - } - - logError(new Throwable(message.trim())); - } - - - - - public static void logError(Throwable exception){ - - try{ - - logCrash(exception); - - }catch (Exception e){ - - Log.e(mPackageName, e.getMessage()); - } - } - - - - // Return the last error message - public static String getErrorMessage(){ - - return mErrorMessage; - } - - - - - public static void setErrorMessage(String errMsg){ - - mErrorMessage = errMsg; - } - - - - // Return the last crash information - public static ApplicationErrorReport.CrashInfo crashInfo(){ - - return mCrashInfo; - } - - - - - private static String getAppLabel(Context pContext){ - - PackageManager lPackageManager = pContext.getPackageManager(); - - ApplicationInfo lApplicationInfo = null; - - try{ - - lApplicationInfo = lPackageManager - .getApplicationInfo(pContext.getApplicationInfo().packageName, 0); - - }catch (final PackageManager.NameNotFoundException e){ - } - - return (String) (lApplicationInfo != null ? lPackageManager - .getApplicationLabel(lApplicationInfo) : "Unknown"); - } - - - - public static boolean inDebugger(){ - - // If in Debugger Environment - boolean debugging = Debug.isDebuggerConnected(); - - return debugging; - } - - - @NonNull - private static String errorMsg(Throwable exception, String exceptError){ - - if (!exceptError.contains("error")){ - - mReportBuilder.append(reportError(exception)); - } - - if (!exceptError.contains("callstack")){ - - mReportBuilder.append(reportCallStack(exception)); - } - - if (!exceptError.contains("deviceinfo")){ - - mReportBuilder.append(reportDeviceInfo()); - } - - if (!exceptError.contains("firmware")){ - - mReportBuilder.append(reportFirmware()); - } - - return mReportBuilder.toString(); - } - - - - - private static String reportError(Throwable exception){ - - mCrashInfo = new ApplicationErrorReport.CrashInfo(exception); - - if (mCrashInfo.exceptionMessage == null){ - - mErrorMessage = ""; - }else{ - - mErrorMessage = mCrashInfo.exceptionMessage - .replace(": " + mCrashInfo.exceptionClassName, ""); - } - - String throwFile = mCrashInfo.throwFileName == null ? "" - : mCrashInfo.throwFileName; - - return "\n************ " + mCrashInfo.exceptionClassName + " ************\n" - + mErrorMessage + LINE_SEPARATOR - + "\n File: " + throwFile - + "\n Method: " + mCrashInfo.throwMethodName + "()" - + "\n Line No.: " + Integer.toString(mCrashInfo.throwLineNumber) - + LINE_SEPARATOR; - // + "Class: " + crashInfo.throwClassName + LINE_SEPARATOR - } - - - - - private static String reportCallStack(Throwable exception){ - - StringWriter stackTrace = new StringWriter(); - - exception.printStackTrace(new PrintWriter(stackTrace)); - - String callStack = stackTrace.toString(); - - String errMsg = exception.toString(); - - return "\n************ CALLSTACK ************\n" - + callStack.replace(errMsg, "") - + LINE_SEPARATOR; - } - - - - - private static String reportDeviceInfo(){ - - return "\n************ DEVICE INFORMATION ***********\n" - + "Brand: " - + Build.BRAND - + LINE_SEPARATOR - + "Device: " - + Build.DEVICE - + LINE_SEPARATOR - + "Model: " - + Build.MODEL - + LINE_SEPARATOR - + "Id: " - + Build.ID - + LINE_SEPARATOR - + "Product: " - + Build.PRODUCT - + LINE_SEPARATOR; - } - - - - - private static String reportFirmware(){ - - return "\n************ FIRMWARE ************\n" - + "SDK: " - + Build.VERSION.SDK_INT - + LINE_SEPARATOR - + "Release: " - + Build.VERSION.RELEASE - + LINE_SEPARATOR - + "Incremental: " - + Build.VERSION.INCREMENTAL - + LINE_SEPARATOR; - } - - - - - // Empty the report as it is begin re-populated. - private static void reportEmptied(){ - - // No need to empty - if (mReportBuilder.length() == 0){ - - return; - } - - mReportBuilder.setLength(0); - - mReportBuilder.trimToSize(); - } - - - - @Override - public void uncaughtException(Thread thread, Throwable exception){ - - // Don't re-enter -- avoid infinite loops if crash-reporting crashes. - if (mCrashing) return; - - mCrashing = true; - - catchException(thread, exception); - - defaultExceptionHandler(thread, exception); - } - - - - - public String catchException(Thread thread, Throwable exception){ - - String errorMsg = ""; - - try{ - - errorMsg = logCrash(exception); - - }catch (Exception ex){ - - Log.e(mPackageName, ex.getMessage()); + public void uncaughtException(final Thread thread, final Throwable ex) { + try { + UtilityLogger.errorMe(new Exception(ex)); + } catch (Exception e) { + Log.e(TAG, "Exception Logger failed!", e); + System.exit(0); } - return errorMsg; - } - - - - - public static void defaultExceptionHandler(Thread thread, Throwable exception){ - - try{ - - // Execute the old handler. - if (mOldHandler != null){ - - mOldHandler.uncaughtException(thread, exception); + appendToFile(new Exception(ex)); + new Thread() { + @Override + public void run() { + Looper.prepare(); + DialogException.make(context, context::finish).show(); + Looper.loop(); } + }.start(); - }catch (Exception ex){ - Log.e(mPackageName, ex.getMessage()); + + } + + public void appendToFile(Exception e) { + try { + File yourFile = new File(Environment.getExternalStorageDirectory(), "log.txt"); + + FileWriter fstream = new FileWriter(yourFile.getPath(), true); + BufferedWriter out = new BufferedWriter(fstream); + PrintWriter pWriter = new PrintWriter(out, true); + e.printStackTrace(pWriter); + } + catch (Exception ie) { + throw new RuntimeException("Could not write Exception to file", ie); } } - - - - - public static String logCrash(Throwable exception){ - - return errorMsg(exception, "deviceinfo firmware"); - } - - - - - public void onDestroy(){ - - mExceptionsHandler = null; - } - - // Prevents infinite loops. - private static volatile boolean mCrashing = false; - - private static final StringBuilder mReportBuilder = new StringBuilder(); - - private static final String LINE_SEPARATOR = "\n"; - - private static final Thread.UncaughtExceptionHandler mOldHandler = Thread - .getDefaultUncaughtExceptionHandler(); - - private static ExceptionsHandler mExceptionsHandler; - - private static String mPackageName; - - private static ApplicationErrorReport.CrashInfo mCrashInfo; - - private static String mErrorMessage = ""; } \ No newline at end of file diff --git a/app/src/main/java/it/integry/integrywmsnative/core/interfaces/IRecyclerFragment.java b/app/src/main/java/it/integry/integrywmsnative/core/interfaces/IRecyclerFragment.java index 61f8146d..ef17dcba 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/interfaces/IRecyclerFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/interfaces/IRecyclerFragment.java @@ -1,7 +1,5 @@ package it.integry.integrywmsnative.core.interfaces; -import android.support.v7.widget.RecyclerView; - import it.integry.plugins.waterfalltoolbar.WaterfallToolbar; public interface IRecyclerFragment { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java index 24826a57..429a7e88 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java @@ -1,17 +1,14 @@ package it.integry.integrywmsnative.core.model; -import android.databinding.ObservableArrayList; +import androidx.databinding.ObservableArrayList; import android.os.Parcel; import android.os.Parcelable; -import com.annimon.stream.Stream; - import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; -import java.util.concurrent.atomic.AtomicReference; import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; import it.integry.integrywmsnative.core.settings.SettingsManager; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbDepoPosizione.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbDepoPosizione.java index f67b8e3b..73c5d4d8 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbDepoPosizione.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbDepoPosizione.java @@ -1,5 +1,8 @@ package it.integry.integrywmsnative.core.model; +import it.integry.integrywmsnative.core.utility.UtilityExceptions; +import it.integry.integrywmsnative.core.utility.UtilityLogger; + public class MtbDepoPosizione { private String codMdep; @@ -7,6 +10,19 @@ public class MtbDepoPosizione { private String descrizione; private String flagMonoCollo; + + + public MtbDepoPosizione clone() { + try { + return (MtbDepoPosizione) super.clone(); + } catch (CloneNotSupportedException e) { + e.printStackTrace(); + UtilityLogger.errorMe(e); + } + + return null; + } + public String getCodMdep() { return codMdep; } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/PermissionsHelper.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/PermissionsHelper.java new file mode 100644 index 00000000..5f45c3cb --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/PermissionsHelper.java @@ -0,0 +1,38 @@ +package it.integry.integrywmsnative.core.utility; + +import android.Manifest; +import android.app.Activity; + +import com.emreeran.permissionlivedata.PermissionLiveData; +import com.emreeran.permissionlivedata.Status; + +import java.util.ArrayList; + +import androidx.appcompat.app.AppCompatActivity; + +public class PermissionsHelper { + + public static void askPermissions(AppCompatActivity activity) { + + PermissionLiveData permissionLiveData = PermissionLiveData.create( + activity, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ); + + permissionLiveData.observe(activity, permission -> { + if (permission.getStatus() == Status.RECEIVED) { + if (permission.getGranted()) { + //UtilityToast.showToast("Permission " + permission.getName() + " was granted."); + } else if (permission.getShouldShowRequestPermissionRationale()) { + UtilityToast.showToast("Permission " + permission.getName() + " was denied without ask never again checked."); + } else { + UtilityToast.showToast("Permission " + permission.getName() + " was denied."); + } + } else if (permission.getStatus() == Status.PENDING) { + UtilityToast.showToast(String.format("Pending request for %s", permission.getName())); + } + }); + } + +} diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityFAB.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityFAB.java index c3388622..ca48ffd7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityFAB.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityFAB.java @@ -1,10 +1,9 @@ package it.integry.integrywmsnative.core.utility; import android.content.Context; -import android.support.design.widget.FloatingActionButton; -import android.view.animation.AccelerateInterpolator; +import com.google.android.material.floatingactionbutton.FloatingActionButton; + import android.view.animation.AnimationUtils; -import android.view.animation.DecelerateInterpolator; import it.integry.integrywmsnative.R; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java index c5413c93..e19f4a59 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java @@ -12,6 +12,7 @@ import java.util.Date; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.REST.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.settings.SettingsManager; import okhttp3.internal.Util; @@ -34,8 +35,10 @@ public class UtilityLogger { } public static void errorMe(Exception ex) { - //ex.printStackTrace(); //Default log + errorMe(ex, null, null); + } + public static void errorMe(Exception ex, Runnable onComplete, RunnableArgs onFailed) { String message = UtilityResources.readRawTextFile(R.raw.error_mail); message = message.replace("#exception_name#", ex.getMessage()); @@ -50,9 +53,7 @@ public class UtilityLogger { SimpleDateFormat sdf = new SimpleDateFormat("dd MMM yyyy HH:mm:ss"); message = message.replace("#current_date#", sdf.format(new Date())); - SystemRESTConsumer.sendErrorLogMail(message); - - + SystemRESTConsumer.sendErrorLogMail(message, onComplete, onFailed); } } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityPosizione.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityPosizione.java index a7ba71c9..617edbf7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityPosizione.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityPosizione.java @@ -1,6 +1,11 @@ package it.integry.integrywmsnative.core.utility; +import com.annimon.stream.Stream; + +import java.util.List; + import it.integry.integrywmsnative.core.model.MtbDepoPosizione; +import it.integry.integrywmsnative.core.settings.SettingsManager; public class UtilityPosizione { @@ -21,4 +26,12 @@ public class UtilityPosizione { return false; } + public static MtbDepoPosizione getFromCache(String posizione) { + List tmpList = Stream.of(SettingsManager.iDB().getAvailablePosizioni()) + .filter(x -> x.getPosizione().equalsIgnoreCase(posizione)).toList(); + + if(tmpList != null && tmpList.size() > 0) return tmpList.get(0); + else return null; + } + } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityResources.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityResources.java index 0642284b..05743354 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityResources.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityResources.java @@ -1,7 +1,7 @@ package it.integry.integrywmsnative.core.utility; import android.content.Context; -import android.support.annotation.RawRes; +import androidx.annotation.RawRes; import java.io.BufferedReader; import java.io.IOException; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java index be466f8b..994a339c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java @@ -4,12 +4,11 @@ package it.integry.integrywmsnative.gest.accettazione; import android.app.ProgressDialog; import android.content.Context; import android.content.Intent; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.SearchView; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.appcompat.widget.SearchView; import android.text.Html; import android.text.SpannableString; import android.view.LayoutInflater; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/MainListAccettazioneAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/MainListAccettazioneAdapter.java index 036482ad..231eef66 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/MainListAccettazioneAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/MainListAccettazioneAdapter.java @@ -1,8 +1,8 @@ package it.integry.integrywmsnative.gest.accettazione.core; import android.content.Context; -import android.support.v4.util.Pools; -import android.support.v7.widget.RecyclerView; +import androidx.core.util.Pools; +import androidx.recyclerview.widget.RecyclerView; import android.text.Html; import android.view.LayoutInflater; import android.view.View; @@ -16,10 +16,8 @@ import java.util.List; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.expansion.RunnableArgs; -import it.integry.integrywmsnative.core.interfaces.ICheckBoxCallback; import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneGroupedInevasoDTO; -import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.core.MainListOrdineAccettazioneAdapter; /** * Created by GiuseppeS on 06/03/2018. diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/AccettazioneOrdineInevasoActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/AccettazioneOrdineInevasoActivity.java index 8e66e0c3..6a8485d5 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/AccettazioneOrdineInevasoActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/AccettazioneOrdineInevasoActivity.java @@ -1,8 +1,8 @@ package it.integry.integrywmsnative.gest.accettazione_ordine_inevaso; import android.content.Intent; -import android.databinding.DataBindingUtil; -import android.support.v7.app.AppCompatActivity; +import androidx.databinding.DataBindingUtil; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.view.Menu; import android.view.MenuItem; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/AccettazioneOrdineInevasoHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/AccettazioneOrdineInevasoHelper.java index bffb15dc..0c54fe57 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/AccettazioneOrdineInevasoHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/AccettazioneOrdineInevasoHelper.java @@ -1,23 +1,19 @@ package it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.core; import android.content.Context; -import android.databinding.ObservableArrayList; +import androidx.databinding.ObservableArrayList; import android.view.View; import com.annimon.stream.Stream; -import com.orhanobut.logger.Logger; import java.math.BigDecimal; -import java.text.DecimalFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collections; -import java.util.Comparator; import java.util.List; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.CommonConst; -import it.integry.integrywmsnative.core.coollection.Coollection; import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneDTO; import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.dto.AccettazioneOrdineInevasoListViewModel; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/MainListOrdineAccettazioneAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/MainListOrdineAccettazioneAdapter.java index 5b78e721..15738f79 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/MainListOrdineAccettazioneAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/MainListOrdineAccettazioneAdapter.java @@ -1,11 +1,11 @@ package it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.core; import android.content.Context; -import android.databinding.ObservableArrayList; -import android.databinding.ObservableList; +import androidx.databinding.ObservableArrayList; +import androidx.databinding.ObservableList; import android.graphics.Color; -import android.support.v4.util.Pools; -import android.support.v7.widget.RecyclerView; +import androidx.core.util.Pools; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java index 7b138bfb..e37c9478 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java @@ -1,10 +1,10 @@ package it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.viewmodel; import android.app.ProgressDialog; -import android.databinding.ObservableArrayList; -import android.databinding.ObservableField; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.LinearLayoutManager; +import androidx.databinding.ObservableArrayList; +import androidx.databinding.ObservableField; +import androidx.appcompat.app.AlertDialog; +import androidx.recyclerview.widget.LinearLayoutManager; import android.text.SpannableString; import com.annimon.stream.Stream; @@ -55,7 +55,6 @@ import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper; import it.integry.integrywmsnative.view.dialogs.input_quantity.DialogInputQuantity; import it.integry.integrywmsnative.view.dialogs.input_quantity.QuantityDTO; import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO; -import it.integry.plugins.barcode_base_library.model.BarcodeType; import static br.com.zbra.androidlinq.Linq.stream; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/views/NoteAggiuntiveNuovaULDialog.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/views/NoteAggiuntiveNuovaULDialog.java index e5fa8788..79e5a62d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/views/NoteAggiuntiveNuovaULDialog.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/views/NoteAggiuntiveNuovaULDialog.java @@ -1,8 +1,8 @@ package it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.views; import android.content.Context; -import android.support.design.widget.TextInputEditText; -import android.support.v7.app.AlertDialog; +import com.google.android.material.textfield.TextInputEditText; +import androidx.appcompat.app.AlertDialog; import android.view.ViewGroup; import android.widget.RelativeLayout; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java index 7433436c..4ba8a770 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java @@ -1,8 +1,7 @@ package it.integry.integrywmsnative.gest.contenuto_bancale; -import android.content.Intent; -import android.databinding.DataBindingUtil; -import android.support.v7.app.AppCompatActivity; +import androidx.databinding.DataBindingUtil; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import it.integry.integrywmsnative.R; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/core/ContenutoBancaleListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/core/ContenutoBancaleListAdapter.java index 2671d178..2444c4d6 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/core/ContenutoBancaleListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/core/ContenutoBancaleListAdapter.java @@ -1,10 +1,10 @@ package it.integry.integrywmsnative.gest.contenuto_bancale.core; import android.content.Context; -import android.databinding.DataBindingUtil; -import android.databinding.ObservableArrayList; -import android.databinding.ObservableList; -import android.support.v7.widget.RecyclerView; +import androidx.databinding.DataBindingUtil; +import androidx.databinding.ObservableArrayList; +import androidx.databinding.ObservableList; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.ViewGroup; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java index 56ecc53a..398d0763 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java @@ -1,13 +1,12 @@ package it.integry.integrywmsnative.gest.contenuto_bancale.viewmodel; -import android.app.AlertDialog; import android.app.ProgressDialog; import android.content.Intent; import android.content.res.Resources; -import android.databinding.ObservableField; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.DividerItemDecoration; -import android.support.v7.widget.LinearLayoutManager; +import androidx.databinding.ObservableField; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; import android.text.SpannableString; import java.util.List; @@ -17,7 +16,6 @@ import it.integry.integrywmsnative.core.REST.consumers.DepositoRESTConsumer; import it.integry.integrywmsnative.core.REST.consumers.ISimpleOperationCallback; import it.integry.integrywmsnative.core.REST.consumers.PrinterRESTConsumer; import it.integry.integrywmsnative.core.di.BindableString; -import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.interfaces.IRecyclerItemClicked; import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColt; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java index 472f0c95..0d42f5e1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java @@ -1,8 +1,8 @@ package it.integry.integrywmsnative.gest.lista_bancali; import android.content.Intent; -import android.databinding.DataBindingUtil; -import android.support.v7.app.AppCompatActivity; +import androidx.databinding.DataBindingUtil; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import java.util.ArrayList; @@ -10,7 +10,6 @@ import java.util.List; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.model.MtbColt; -import it.integry.integrywmsnative.core.utility.UtilityLogger; import it.integry.integrywmsnative.databinding.ActivityListaBancaliBinding; import it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleActivity; import it.integry.integrywmsnative.gest.lista_bancali.viewmodel.ListaBancaliViewModel; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/core/MainListListaColliAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/core/MainListListaColliAdapter.java index 24f09a27..04a125a1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/core/MainListListaColliAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/core/MainListListaColliAdapter.java @@ -1,10 +1,10 @@ package it.integry.integrywmsnative.gest.lista_bancali.core; import android.content.Context; -import android.databinding.DataBindingUtil; -import android.databinding.ObservableArrayList; -import android.databinding.ObservableList; -import android.support.v7.widget.RecyclerView; +import androidx.databinding.DataBindingUtil; +import androidx.databinding.ObservableArrayList; +import androidx.databinding.ObservableList; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.ViewGroup; import android.view.View; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/viewmodel/ListaBancaliViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/viewmodel/ListaBancaliViewModel.java index c5d58de9..a5f0d4dd 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/viewmodel/ListaBancaliViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/viewmodel/ListaBancaliViewModel.java @@ -1,41 +1,23 @@ package it.integry.integrywmsnative.gest.lista_bancali.viewmodel; import android.app.ProgressDialog; -import android.content.Intent; -import android.databinding.ObservableArrayList; -import android.support.annotation.NonNull; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.DividerItemDecoration; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.view.View; -import android.widget.AdapterView; -import android.widget.LinearLayout; -import com.google.gson.reflect.TypeToken; +import androidx.databinding.ObservableArrayList; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; -import java.lang.reflect.Type; -import java.text.ParseException; -import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.REST.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.REST.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.core.interfaces.IRecyclerItemClicked; import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColt; -import it.integry.integrywmsnative.core.utility.UtilityDB; -import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityExceptions; -import it.integry.integrywmsnative.core.utility.UtilityLogger; -import it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleActivity; import it.integry.integrywmsnative.gest.lista_bancali.ListaBancaliActivity; import it.integry.integrywmsnative.gest.lista_bancali.core.MainListListaColliAdapter; -import static android.app.Activity.RESULT_OK; - public class ListaBancaliViewModel implements IRecyclerItemClicked { private ListaBancaliActivity mContext; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/LoginActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/LoginActivity.java index 83338988..9ceffa58 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/login/LoginActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/LoginActivity.java @@ -1,10 +1,9 @@ package it.integry.integrywmsnative.gest.login; -import android.databinding.DataBindingUtil; -import android.support.v7.app.AppCompatActivity; +import androidx.databinding.DataBindingUtil; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; -import it.integry.integrywmsnative.BR; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.utility.UtilityWindow; import it.integry.integrywmsnative.databinding.ActivityLoginBinding; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java index ad86982b..5da0036b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java @@ -1,9 +1,8 @@ package it.integry.integrywmsnative.gest.login.viewmodel; import android.app.ProgressDialog; -import android.content.DialogInterface; import android.content.Intent; -import android.support.v7.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.text.Html; import android.text.SpannableString; import android.text.Spanned; @@ -15,7 +14,6 @@ import java.util.List; import it.integry.integrywmsnative.MainActivity; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.REST.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.REST.consumers.ISingleValueOperationCallback; import it.integry.integrywmsnative.core.REST.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.core.REST.model.AvailableCodMdepsDTO; import it.integry.integrywmsnative.core.di.BindableBoolean; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java index 86681ef1..f0f0061f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java @@ -3,7 +3,7 @@ package it.integry.integrywmsnative.gest.main; import android.content.Context; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -14,8 +14,6 @@ import net.cachapa.expandablelayout.ExpandableLayout; import butterknife.BindView; import butterknife.ButterKnife; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.REST.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.REST.consumers.ISingleValueOperationCallback; import it.integry.integrywmsnative.core.REST.watcher.ServerStatusChecker; import it.integry.integrywmsnative.core.interfaces.ITitledFragment; import it.integry.integrywmsnative.core.settings.SettingsManager; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java index 466cc490..23b0e531 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java @@ -2,25 +2,23 @@ package it.integry.integrywmsnative.gest.rettifica_giacenze; import android.content.Context; import android.content.res.ColorStateList; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import butterknife.ButterKnife; -import it.integry.integrywmsnative.MainActivity; +import com.google.android.material.bottomsheet.BottomSheetBehavior; + import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.interfaces.ITitledFragment; import it.integry.integrywmsnative.core.utility.UtilityExceptions; -import it.integry.integrywmsnative.databinding.DialogScanOrCreateLuBinding; import it.integry.integrywmsnative.databinding.FragmentMainRettificaGiacenzeBinding; import it.integry.integrywmsnative.gest.rettifica_giacenze.core.RettificaGiacenzeHelper; import it.integry.integrywmsnative.gest.rettifica_giacenze.viewmodel.RettificaGiacenzeViewModel; -import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLU; public class RettificaGiacenzeFragment extends Fragment implements ITitledFragment { @@ -57,6 +55,7 @@ public class RettificaGiacenzeFragment extends Fragment implements ITitledFragme mBinding.setViewmodel(mRettificaGiacenzeViewModel); init(); + return mBinding.getRoot(); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/RettificaGiacenzeHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/RettificaGiacenzeHelper.java index 59cade51..e4f5e192 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/RettificaGiacenzeHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/RettificaGiacenzeHelper.java @@ -2,13 +2,12 @@ package it.integry.integrywmsnative.gest.rettifica_giacenze.core; import android.app.ProgressDialog; import android.content.Context; -import android.databinding.ObservableArrayList; +import androidx.databinding.ObservableArrayList; import com.google.gson.reflect.TypeToken; import java.lang.reflect.Type; import java.util.ArrayList; -import java.util.List; import it.integry.integrywmsnative.core.REST.consumers.ISimpleOperationCallback; import it.integry.integrywmsnative.core.REST.consumers.SystemRESTConsumer; @@ -18,7 +17,6 @@ import it.integry.integrywmsnative.core.model.MtbAartWithFornitore; import it.integry.integrywmsnative.core.utility.UtilityDB; import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityProgress; -import it.integry.integrywmsnative.gest.rettifica_giacenze.dto.ArticoloFornitoreDTO; import it.integry.integrywmsnative.gest.rettifica_giacenze.dto.FornitoreDTO; public class RettificaGiacenzeHelper { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/adapter/AutoCompleteFornitoreAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/adapter/AutoCompleteFornitoreAdapter.java index a371282a..b7821cac 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/adapter/AutoCompleteFornitoreAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/adapter/AutoCompleteFornitoreAdapter.java @@ -1,22 +1,19 @@ package it.integry.integrywmsnative.gest.rettifica_giacenze.core.adapter; import android.content.Context; -import android.databinding.DataBindingUtil; -import android.databinding.ObservableArrayList; -import android.databinding.ObservableList; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.databinding.DataBindingUtil; +import androidx.databinding.ObservableArrayList; +import androidx.databinding.ObservableList; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; import android.widget.Filter; -import android.widget.TextView; import java.util.ArrayList; import java.util.ConcurrentModificationException; -import java.util.Iterator; -import java.util.List; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.databinding.RettificaGiacenzeAutocompleteFornitoreLayoutBinding; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/adapter/RettificaGiacenzeMainListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/adapter/RettificaGiacenzeMainListAdapter.java index b59eac86..da93abde 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/adapter/RettificaGiacenzeMainListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/adapter/RettificaGiacenzeMainListAdapter.java @@ -1,10 +1,10 @@ package it.integry.integrywmsnative.gest.rettifica_giacenze.core.adapter; import android.content.Context; -import android.databinding.DataBindingUtil; -import android.databinding.ObservableArrayList; -import android.databinding.ObservableList; -import android.support.v7.widget.RecyclerView; +import androidx.databinding.DataBindingUtil; +import androidx.databinding.ObservableArrayList; +import androidx.databinding.ObservableList; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java index 7029c785..0a8b62f3 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java @@ -3,14 +3,14 @@ package it.integry.integrywmsnative.gest.rettifica_giacenze.viewmodel; import android.app.Activity; import android.app.ProgressDialog; import android.content.res.Resources; -import android.databinding.ObservableArrayList; -import android.databinding.ObservableField; -import android.support.annotation.NonNull; -import android.support.design.widget.BottomSheetBehavior; -import android.support.design.widget.TextInputLayout; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.DividerItemDecoration; -import android.support.v7.widget.LinearLayoutManager; +import androidx.databinding.ObservableArrayList; +import androidx.databinding.ObservableField; +import androidx.annotation.NonNull; +import com.google.android.material.bottomsheet.BottomSheetBehavior; +import com.google.android.material.textfield.TextInputLayout; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; import android.text.SpannableString; import android.view.View; import android.view.inputmethod.EditorInfo; @@ -26,7 +26,6 @@ import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.REST.CommonRESTException; import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsumer; import it.integry.integrywmsnative.core.REST.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.REST.consumers.ISingleValueOperationCallback; import it.integry.integrywmsnative.core.REST.consumers.PrinterRESTConsumer; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.di.BindableBoolean; @@ -37,7 +36,6 @@ import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbCols; import it.integry.integrywmsnative.core.model.MtbColt; -import it.integry.integrywmsnative.core.model.MtbDepoPosizione; import it.integry.integrywmsnative.core.report.ReportManager; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityExceptions; @@ -481,12 +479,16 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked } private void posizionaCollo(Runnable onComplete, RunnableArgs onFailed) { - /*DialogAskPositionOfLU.makeBase(mContext, mtbColt.get(), () -> { + DialogAskPositionOfLU.makeBase(mContext, mtbColt.get(), mtbDepoPosizione -> { + if(mtbDepoPosizione != null) { + mtbColt.get().setPosizione(mtbDepoPosizione.getPosizione()); + onComplete.run(); + } else { + onFailed.run(null); + } - }, ex -> { - }).show();*/ - onComplete.run(); + }, onFailed).show(); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java index 9fc12e0a..6c100d67 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java @@ -1,9 +1,9 @@ package it.integry.integrywmsnative.gest.settings; import android.content.Context; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/settings/SettingsPreferenceFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/settings/SettingsPreferenceFragment.java index 26abb8aa..6b52e234 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/settings/SettingsPreferenceFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/settings/SettingsPreferenceFragment.java @@ -2,13 +2,13 @@ package it.integry.integrywmsnative.gest.settings; import android.content.Context; import android.os.Bundle; -import android.support.v7.preference.CheckBoxPreference; -import android.support.v7.preference.EditTextPreference; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceCategory; -import android.support.v7.preference.PreferenceFragmentCompat; -import android.support.v7.preference.PreferenceScreen; -import android.support.v7.view.ContextThemeWrapper; +import androidx.preference.CheckBoxPreference; +import androidx.preference.EditTextPreference; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceFragmentCompat; +import androidx.preference.PreferenceScreen; +import androidx.appcompat.view.ContextThemeWrapper; import android.util.TypedValue; import java.util.List; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java index a6eeb72e..2750abea 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java @@ -3,16 +3,15 @@ package it.integry.integrywmsnative.gest.vendita; import android.app.ProgressDialog; import android.content.Context; import android.content.Intent; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v7.widget.LinearLayoutManager; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; import android.text.Html; import android.text.SpannableString; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.Toast; import com.annimon.stream.Stream; @@ -45,7 +44,6 @@ import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTO; import it.integry.integrywmsnative.gest.vendita.viewmodel.VenditaViewModel; import it.integry.integrywmsnative.gest.vendita_ordine_inevaso.VenditaOrdineInevasoActivity; import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper; -import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO; import it.integry.plugins.waterfalltoolbar.WaterfallToolbar; public class MainVenditaFragment extends Fragment implements ITitledFragment, IRecyclerFragment, ISelectAllFragment, IFilterableFragment { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/MainListVenditaAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/MainListVenditaAdapter.java index 846ba592..709d8e18 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/MainListVenditaAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/MainListVenditaAdapter.java @@ -1,8 +1,8 @@ package it.integry.integrywmsnative.gest.vendita.core; import android.content.Context; -import android.support.v4.util.Pools; -import android.support.v7.widget.RecyclerView; +import androidx.core.util.Pools; +import androidx.recyclerview.widget.RecyclerView; import android.text.Html; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java index 1ef63220..e7b2cbe5 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java @@ -3,11 +3,10 @@ package it.integry.integrywmsnative.gest.vendita.dialogs; import android.app.AlertDialog; import android.app.DatePickerDialog; import android.content.Context; -import android.content.DialogInterface; -import android.databinding.DataBindingUtil; -import android.support.design.widget.BottomSheetBehavior; + +import androidx.databinding.DataBindingUtil; + import android.view.LayoutInflater; -import android.view.View; import android.widget.ArrayAdapter; import android.widget.Button; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzatoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzatoViewModel.java index 22bb6a58..c50d513d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzatoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzatoViewModel.java @@ -1,11 +1,7 @@ package it.integry.integrywmsnative.gest.vendita.dialogs; -import android.support.design.widget.BottomSheetBehavior; - import java.util.Date; -import it.integry.integrywmsnative.core.di.BindableFloat; -import it.integry.integrywmsnative.core.di.BindableInteger; import it.integry.integrywmsnative.core.di.BindableString; public class DialogVenditaFiltroAvanzatoViewModel { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/VenditaOrdineInevasoActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/VenditaOrdineInevasoActivity.java index 0bda6a5f..35f5313b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/VenditaOrdineInevasoActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/VenditaOrdineInevasoActivity.java @@ -1,8 +1,8 @@ package it.integry.integrywmsnative.gest.vendita_ordine_inevaso; import android.content.Intent; -import android.databinding.DataBindingUtil; -import android.support.v7.app.AppCompatActivity; +import androidx.databinding.DataBindingUtil; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.view.Menu; import android.view.MenuItem; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/MainListOrdineVenditaInevasoAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/MainListOrdineVenditaInevasoAdapter.java index 56c9577b..9ce8c64e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/MainListOrdineVenditaInevasoAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/MainListOrdineVenditaInevasoAdapter.java @@ -1,11 +1,11 @@ package it.integry.integrywmsnative.gest.vendita_ordine_inevaso.core; import android.content.Context; -import android.databinding.ObservableArrayList; -import android.databinding.ObservableList; +import androidx.databinding.ObservableArrayList; +import androidx.databinding.ObservableList; import android.graphics.Color; -import android.support.v4.util.Pools; -import android.support.v7.widget.RecyclerView; +import androidx.core.util.Pools; +import androidx.recyclerview.widget.RecyclerView; import android.text.Html; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java index e2317fa8..d053558a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java @@ -1,13 +1,12 @@ package it.integry.integrywmsnative.gest.vendita_ordine_inevaso.core; import android.content.Context; -import android.databinding.ObservableArrayList; +import androidx.databinding.ObservableArrayList; import android.view.View; import com.annimon.stream.Stream; import java.math.BigDecimal; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java index 4698b6b4..2f7d03c1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java @@ -1,9 +1,9 @@ package it.integry.integrywmsnative.gest.vendita_ordine_inevaso.viewmodel; import android.app.ProgressDialog; -import android.databinding.ObservableArrayList; -import android.databinding.ObservableField; -import android.support.v7.widget.LinearLayoutManager; +import androidx.databinding.ObservableArrayList; +import androidx.databinding.ObservableField; +import androidx.recyclerview.widget.LinearLayoutManager; import android.text.SpannableString; import com.annimon.stream.Stream; @@ -50,7 +50,6 @@ import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper; import it.integry.integrywmsnative.view.dialogs.input_quantity.DialogInputQuantity; import it.integry.integrywmsnative.view.dialogs.input_quantity.QuantityDTO; import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO; -import it.integry.plugins.barcode_base_library.model.BarcodeType; public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IOnOrdineVenditaRowDispatched { @@ -387,7 +386,6 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO private void loadArticolo(String barcodeProd, PickingObjectDTO.PickData pickData, ProgressDialog progressDialog) { if(barcodeProd.length() == 14) { -// barcodeProd = UtilityBarcode.convertITF14toNeutral(barcodeProd); barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd); } @@ -831,7 +829,9 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO x.getGestioneRif() != null && x.getGestioneRif().equalsIgnoreCase(item.getGestione()) && Objects.equals(x.getNumColloRif(), item.getNumCollo()) && x.getSerColloRif() != null && x.getSerColloRif().equalsIgnoreCase(item.getSerCollo()) && - x.getDataColloRifD() != null && x.getDataColloRifD().equals(item.getDataColloD()) + x.getDataColloRifD() != null && x.getDataColloRifD().equals(item.getDataColloD()) && + x.getCodMart() != null && x.getCodMart().equalsIgnoreCase(item.getCodMart()) && + (!SettingsManager.iDB().isEnableCheckPartitaMagCheckPickingV() || (SettingsManager.iDB().isEnableCheckPartitaMagCheckPickingV() && ((x.getPartitaMag() == null && item.getPartitaMag() == null) || (x.getPartitaMag() != null && x.getPartitaMag().equalsIgnoreCase(item.getPartitaMag()))))) ).toList(); float qtaEvasaCurrentULInMtbColr = 0; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java index c9efd572..8a354e1c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java @@ -1,9 +1,9 @@ package it.integry.integrywmsnative.gest.versamento_merce; import android.content.Context; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java index 7c346f9b..bc8ac9d2 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java @@ -3,8 +3,8 @@ package it.integry.integrywmsnative.gest.versamento_merce.viewmodel; import android.app.Activity; import android.app.ProgressDialog; import android.content.Context; -import android.databinding.ObservableArrayList; -import android.databinding.ObservableField; +import androidx.databinding.ObservableArrayList; +import androidx.databinding.ObservableField; import android.text.Html; import android.text.SpannableString; @@ -19,13 +19,10 @@ import it.integry.integrywmsnative.MainActivity; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.REST.consumers.BarcodeRESTConsumer; import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.REST.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.REST.consumers.ISingleValueOperationCallback; import it.integry.integrywmsnative.core.REST.consumers.PosizioneRESTonsumer; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.CommonModelConsts; -import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.model.MtbDepoPosizione; @@ -33,18 +30,15 @@ import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityBarcode; import it.integry.integrywmsnative.core.utility.UtilityExceptions; -import it.integry.integrywmsnative.core.utility.UtilityLogger; import it.integry.integrywmsnative.core.utility.UtilityPosizione; import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.core.utility.UtilityString; -import it.integry.integrywmsnative.core.utility.UtilityToast; import it.integry.integrywmsnative.databinding.FragmentMainVersamentoMerceBinding; import it.integry.integrywmsnative.gest.versamento_merce.core.VersamentoMerceHelper; import it.integry.integrywmsnative.view.dialogs.DialogAskLivelloPosizione; import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper; import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromListaArts; import it.integry.integrywmsnative.view.dialogs.input_quantity.DialogInputQuantity; -import it.integry.integrywmsnative.view.dialogs.input_quantity.QuantityDTO; import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLU; import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO; import it.integry.plugins.barcode_base_library.model.BarcodeType; diff --git a/app/src/main/java/it/integry/integrywmsnative/ui/DeactivatableViewPager.java b/app/src/main/java/it/integry/integrywmsnative/ui/DeactivatableViewPager.java index 7b8b3c7e..3f437bb9 100644 --- a/app/src/main/java/it/integry/integrywmsnative/ui/DeactivatableViewPager.java +++ b/app/src/main/java/it/integry/integrywmsnative/ui/DeactivatableViewPager.java @@ -1,7 +1,7 @@ package it.integry.integrywmsnative.ui; import android.content.Context; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.ViewPager; import android.util.AttributeSet; import android.view.MotionEvent; diff --git a/app/src/main/java/it/integry/integrywmsnative/ui/StatusBarAlert.java b/app/src/main/java/it/integry/integrywmsnative/ui/StatusBarAlert.java index c6227862..0a7e1ed4 100644 --- a/app/src/main/java/it/integry/integrywmsnative/ui/StatusBarAlert.java +++ b/app/src/main/java/it/integry/integrywmsnative/ui/StatusBarAlert.java @@ -1,14 +1,13 @@ package it.integry.integrywmsnative.ui; import android.animation.Animator; -import android.animation.TimeInterpolator; import android.app.Activity; import android.content.ComponentName; import android.content.Context; import android.content.res.Resources; import android.graphics.PorterDuff; import android.os.Build; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.view.View; import android.view.ViewGroup; import android.view.ViewPropertyAnimator; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/WrapContentHeightViewPager.java b/app/src/main/java/it/integry/integrywmsnative/view/WrapContentHeightViewPager.java index f6d96eb6..00b43df7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/WrapContentHeightViewPager.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/WrapContentHeightViewPager.java @@ -1,7 +1,7 @@ package it.integry.integrywmsnative.view; import android.content.Context; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.ViewPager; import android.util.AttributeSet; import android.view.View; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/ArticoliInColloBottomSheetHelper.java b/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/ArticoliInColloBottomSheetHelper.java index ac29cb8c..07197496 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/ArticoliInColloBottomSheetHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/ArticoliInColloBottomSheetHelper.java @@ -1,24 +1,19 @@ package it.integry.integrywmsnative.view.bottomsheet; -import android.support.annotation.NonNull; -import android.support.design.widget.AppBarLayout; -import android.support.design.widget.BottomSheetBehavior; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; -import android.text.SpannableString; +import androidx.annotation.NonNull; +import com.google.android.material.appbar.AppBarLayout; +import com.google.android.material.bottomsheet.BottomSheetBehavior; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; + import android.view.View; import android.widget.RelativeLayout; -import java.text.ParseException; -import java.text.SimpleDateFormat; - import butterknife.BindView; import butterknife.ButterKnife; -import butterknife.OnClick; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.databinding.FragmentArticoliInColloBottomSheetBinding; -import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper; public class ArticoliInColloBottomSheetHelper extends BottomSheetBehavior.BottomSheetCallback { diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/ArticoliInColloBottomSheetViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/ArticoliInColloBottomSheetViewModel.java index 2ced9461..c8a46db5 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/ArticoliInColloBottomSheetViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/ArticoliInColloBottomSheetViewModel.java @@ -2,15 +2,15 @@ package it.integry.integrywmsnative.view.bottomsheet.viewmodel; import android.app.ProgressDialog; import android.content.Context; -import android.databinding.DataBindingUtil; -import android.databinding.Observable; -import android.databinding.ObservableArrayList; -import android.databinding.ObservableField; -import android.databinding.ObservableList; -import android.databinding.ViewDataBinding; -import android.support.annotation.NonNull; -import android.support.design.widget.BottomSheetBehavior; -import android.support.v7.app.AppCompatActivity; +import androidx.databinding.DataBindingUtil; +import androidx.databinding.Observable; +import androidx.databinding.ObservableArrayList; +import androidx.databinding.ObservableField; +import androidx.databinding.ObservableList; +import androidx.databinding.ViewDataBinding; +import androidx.annotation.NonNull; +import com.google.android.material.bottomsheet.BottomSheetBehavior; +import androidx.appcompat.app.AppCompatActivity; import android.text.SpannableString; import android.view.LayoutInflater; import android.view.View; @@ -23,15 +23,12 @@ import java.math.BigDecimal; import it.integry.integrywmsnative.BR; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.REST.consumers.ISimpleOperationCallback; import it.integry.integrywmsnative.core.expansion.RunnableArgs; -import it.integry.integrywmsnative.core.model.CommonModelConsts; import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityNumber; import it.integry.integrywmsnative.databinding.FragmentArticoliInColloBottomSheetBinding; -import it.integry.integrywmsnative.ui.StatusBarAlert; import it.integry.integrywmsnative.view.bottomsheet.ArticoliInColloBottomSheetHelper; import it.integry.integrywmsnative.view.bottomsheet.interfaces.IOnColloClosedCallback; import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/SimpleListChangedCallback.java b/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/SimpleListChangedCallback.java index f2770b0c..6d741f86 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/SimpleListChangedCallback.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/SimpleListChangedCallback.java @@ -1,6 +1,6 @@ package it.integry.integrywmsnative.view.bottomsheet.viewmodel; -import android.databinding.ObservableList; +import androidx.databinding.ObservableList; import it.integry.integrywmsnative.view.bottomsheet.interfaces.IOnSimpleListChangedCallback; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogAskLivelloPosizione.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogAskLivelloPosizione.java index 89f379e7..2e0797f3 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogAskLivelloPosizione.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogAskLivelloPosizione.java @@ -1,8 +1,8 @@ package it.integry.integrywmsnative.view.dialogs; import android.content.Context; -import android.content.DialogInterface; -import android.support.v7.app.AlertDialog; + +import androidx.appcompat.app.AlertDialog; import android.text.InputType; import android.widget.EditText; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogSimpleMessageHelper.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogSimpleMessageHelper.java index 132fd247..67780561 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogSimpleMessageHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogSimpleMessageHelper.java @@ -4,9 +4,9 @@ import android.app.AlertDialog; import android.content.Context; import android.content.res.ColorStateList; import android.graphics.drawable.Drawable; -import android.support.annotation.StringRes; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.AppCompatImageView; +import androidx.annotation.StringRes; +import androidx.core.content.ContextCompat; +import androidx.appcompat.widget.AppCompatImageView; import android.text.Spanned; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java index b1cf9db6..0b15341b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java @@ -3,19 +3,13 @@ package it.integry.integrywmsnative.view.dialogs.ask_position_of_lu; import android.app.Dialog; import android.app.ProgressDialog; import android.content.Context; -import android.databinding.DataBindingUtil; -import android.os.Handler; -import android.os.Looper; -import android.support.annotation.LayoutRes; -import android.support.v7.app.AlertDialog; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.view.Window; -import android.widget.Button; -import android.widget.LinearLayout; -import com.annimon.stream.Stream; +import androidx.databinding.DataBindingUtil; +import com.google.android.material.textfield.TextInputLayout; +import android.text.Editable; +import android.text.TextWatcher; +import android.view.LayoutInflater; +import android.widget.TextView; import java.util.ArrayList; import java.util.List; @@ -27,7 +21,6 @@ import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.model.MtbDepoPosizione; -import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityBarcode; import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityPosizione; @@ -42,16 +35,20 @@ public class DialogAskPositionOfLU { private DialogAskPositionOfLuBinding mBinding; private MtbColt mtbColt; + private MtbDepoPosizione currentMtbDepoPosizione; + private Dialog mDialog; - private Runnable onComplete; + private RunnableArgs onComplete; private RunnableArgs onFailed; - public static Dialog makeBase(final Context context, MtbColt mtbColtToUpdate, Runnable onComplete, RunnableArgs onFailed) { + private TextInputLayout livelloTextInputLayout; + + public static Dialog makeBase(final Context context, MtbColt mtbColtToUpdate, RunnableArgs onComplete, RunnableArgs onFailed) { return new DialogAskPositionOfLU(context, mtbColtToUpdate, onComplete, onFailed).mDialog; } - public DialogAskPositionOfLU(Context context, MtbColt mtbColtToUpdate, Runnable onComplete, RunnableArgs onFailed) { + public DialogAskPositionOfLU(Context context, MtbColt mtbColtToUpdate, RunnableArgs onComplete, RunnableArgs onFailed) { mContext = context; mtbColt = mtbColtToUpdate; @@ -66,16 +63,47 @@ public class DialogAskPositionOfLU { views.add(R.layout.dialog_ask_position_of_lu__page1); views.add(R.layout.dialog_ask_position_of_lu__page2); - DialogAskPositionOfLUAdapter myadapter = new DialogAskPositionOfLUAdapter(mContext, views); - mBinding.viewpager.setAdapter(myadapter); + DialogAskPositionOfLUAdapter adapter = new DialogAskPositionOfLUAdapter(mContext, views); + mBinding.viewpager.setAdapter(adapter); mBinding.viewpager.beginFakeDrag(); - mDialog = new Dialog(mContext); mDialog.setContentView(mBinding.getRoot()); mDialog.setCanceledOnTouchOutside(false); + mDialog.setOnShowListener(dialog -> { + adapter.getPage(1).findViewById(R.id.button_confirm).setOnClickListener(v -> { + String levelNumber = ((TextView)adapter.getPage(1).findViewById(R.id.level_number)).getText().toString(); + onLevelConfirm(levelNumber); + }); + + adapter.getPage(1).findViewById(R.id.button_abort).setOnClickListener(v -> { + onLevelAbort(); + }); + + livelloTextInputLayout = adapter.getPage(1).findViewById(R.id.level_number_layout); + + livelloTextInputLayout.getEditText().addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + + } + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + if(livelloTextInputLayout.getEditText().getText() != null) { + validateLevel(livelloTextInputLayout.getEditText().getText().toString()); + } else resetLevelError(); + } + + @Override + public void afterTextChanged(Editable s) { + + } + }); + }); + setupBarcode(); } @@ -109,16 +137,15 @@ public class DialogAskPositionOfLU { if (UtilityBarcode.isEtichettaPosizione(data)) { - MtbDepoPosizione foundPosizione = Stream.of(SettingsManager.iDB().getAvailablePosizioni()) - .filter(x -> x.getPosizione().equalsIgnoreCase(data.getStringValue())) - .single(); + MtbDepoPosizione foundPosizione = UtilityPosizione.getFromCache(data.getStringValue()); + currentMtbDepoPosizione = foundPosizione; if (UtilityPosizione.isPosizioneWithLivello(foundPosizione)) { askLivello(); } else { updatePosizione(foundPosizione, () -> { - if(onComplete != null) onComplete.run(); + if(onComplete != null) onComplete.run(foundPosizione); }, onFailed); } @@ -129,6 +156,56 @@ public class DialogAskPositionOfLU { }; + private void onLevelConfirm(String levelString) { + + String newPosizione = currentMtbDepoPosizione.getPosizione().substring(0, currentMtbDepoPosizione.getPosizione().length()-1); + newPosizione += levelString; + + MtbDepoPosizione foundPosizione = UtilityPosizione.getFromCache(newPosizione); + + if(foundPosizione != null) { + resetLevelError(); + ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); + + ColliMagazzinoRESTConsumer.changePosizione(mtbColt, foundPosizione, () -> { + progressDialog.dismiss(); + onComplete.run(foundPosizione); + mDialog.dismiss(); + }, ex -> { + UtilityExceptions.defaultException(mContext, ex, progressDialog); + onFailed.run(ex); + mDialog.dismiss(); + }); + + } else { + setLevelError(mContext.getResources().getString(R.string.not_valid)); + } + } + + private void validateLevel(String levelString) { + String newPosizione = currentMtbDepoPosizione.getPosizione().substring(0, currentMtbDepoPosizione.getPosizione().length()-1); + newPosizione += levelString; + + if(UtilityPosizione.getFromCache(newPosizione) != null) { + resetLevelError(); + } else setLevelError(mContext.getResources().getString(R.string.not_valid)); + } + + private void setLevelError(String message){ + livelloTextInputLayout.setErrorEnabled(true); + livelloTextInputLayout.setError(message); + } + + private void resetLevelError() { + livelloTextInputLayout.setError(null); + } + + + private void onLevelAbort() { + onComplete.run(null); + mDialog.dismiss(); + } + private void updatePosizione(MtbDepoPosizione mtbDepoPosizione, Runnable onComplete, RunnableArgs onFailed) { final ProgressDialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); @@ -144,4 +221,6 @@ public class DialogAskPositionOfLU { } + + } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLUAdapter.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLUAdapter.java index 42c5c7f0..8e3dd457 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLUAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLUAdapter.java @@ -1,24 +1,28 @@ package it.integry.integrywmsnative.view.dialogs.ask_position_of_lu; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.v4.view.PagerAdapter; +import androidx.annotation.NonNull; +import androidx.viewpager.widget.PagerAdapter; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; +import java.util.ArrayList; import java.util.List; public class DialogAskPositionOfLUAdapter extends PagerAdapter { private Context mContext; private List mDatasetLayout; + private List mDatasetViews; public DialogAskPositionOfLUAdapter(Context context, List datasetView) { this.mContext = context; this.mDatasetLayout = datasetView; + + this.mDatasetViews = new ArrayList<>(); } @Override @@ -32,6 +36,7 @@ public class DialogAskPositionOfLUAdapter extends PagerAdapter { View view = inflater.inflate(mDatasetLayout.get(position), container, false); container.addView(view); + this.mDatasetViews.add(view); return view; } @@ -47,4 +52,8 @@ public class DialogAskPositionOfLUAdapter extends PagerAdapter { } + public View getPage(int index) { + return this.mDatasetViews.get(index); + } + } \ No newline at end of file diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArts.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArts.java index 22cf6a0f..78d25df7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArts.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArts.java @@ -1,11 +1,11 @@ package it.integry.integrywmsnative.view.dialogs.choose_art_from_lista_arts; import android.content.Context; -import android.databinding.DataBindingUtil; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.DividerItemDecoration; -import android.support.v7.widget.LinearLayoutManager; +import androidx.databinding.DataBindingUtil; +import androidx.core.content.ContextCompat; +import androidx.appcompat.app.AlertDialog; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; import android.view.LayoutInflater; import java.util.List; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArtsAdapter.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArtsAdapter.java index 96af4c8c..7afe84e6 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArtsAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArtsAdapter.java @@ -1,8 +1,8 @@ package it.integry.integrywmsnative.view.dialogs.choose_art_from_lista_arts; import android.content.Context; -import android.databinding.DataBindingUtil; -import android.support.v7.widget.RecyclerView; +import androidx.databinding.DataBindingUtil; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.ViewGroup; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java index 7689211c..c5fce61e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java @@ -1,22 +1,18 @@ package it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts; import android.content.Context; -import android.content.DialogInterface; -import android.databinding.DataBindingUtil; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.DividerItemDecoration; -import android.support.v7.widget.LinearLayoutManager; -import android.view.LayoutInflater; -import com.annimon.stream.Stream; +import androidx.databinding.DataBindingUtil; +import androidx.core.content.ContextCompat; +import androidx.appcompat.app.AlertDialog; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import android.view.LayoutInflater; import java.util.List; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.expansion.RunnableArgs; -import it.integry.integrywmsnative.core.interfaces.IRecyclerItemClicked; -import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.DialogChooseArtsFromListaArtsLayoutBinding; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArtsAdapter.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArtsAdapter.java index 81d0e4c2..277f90da 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArtsAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArtsAdapter.java @@ -1,8 +1,8 @@ package it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts; import android.content.Context; -import android.databinding.DataBindingUtil; -import android.support.v7.widget.RecyclerView; +import androidx.databinding.DataBindingUtil; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.ViewGroup; @@ -11,9 +11,7 @@ import com.annimon.stream.Stream; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.model.CheckableMtbAart; import it.integry.integrywmsnative.core.model.CheckableMtbColr; -import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.databinding.DialogChooseArtsFromListaArtsItemModelBinding; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/exception/DialogException.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/exception/DialogException.java new file mode 100644 index 00000000..abcab3b3 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/exception/DialogException.java @@ -0,0 +1,50 @@ +package it.integry.integrywmsnative.view.dialogs.exception; + +import android.content.Context; +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; +import android.view.LayoutInflater; +import android.view.View; + +import androidx.appcompat.app.AlertDialog; +import androidx.databinding.DataBindingUtil; +import it.integry.integrywmsnative.R; +import it.integry.integrywmsnative.databinding.DialogExceptionBinding; + +public class DialogException { + + private Context mContext; + private DialogExceptionBinding mBinding; + private AlertDialog mAlert; + + private Runnable mOnConfirm; + + + public static AlertDialog make(Context context, Runnable onConfirm) { + return new DialogException(context, onConfirm).mAlert; + } + + public DialogException(Context context, Runnable onConfirm) { + mContext = context; + mOnConfirm = onConfirm; + + LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE ); + + mBinding = DataBindingUtil.inflate(inflater, R.layout.dialog_exception, null, false); + + final AlertDialog.Builder alertDialog = new AlertDialog.Builder(context) + .setView(mBinding.getRoot()); + + mAlert = alertDialog.create(); + mAlert.setCanceledOnTouchOutside(false); + mAlert.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); + + + mBinding.buttonConfirm.setOnClickListener(v -> { + onConfirm.run(); + mAlert.dismiss(); + }); + } + + +} diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java index 0565f750..ff9b2a80 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java @@ -4,15 +4,14 @@ import android.app.AlertDialog; import android.app.DatePickerDialog; import android.app.ProgressDialog; import android.content.Context; -import android.content.DialogInterface; import android.content.res.ColorStateList; -import android.databinding.DataBindingUtil; -import android.databinding.Observable; -import android.databinding.ViewDataBinding; +import androidx.databinding.DataBindingUtil; +import androidx.databinding.Observable; +import androidx.databinding.ViewDataBinding; import android.os.Handler; -import android.support.design.widget.TextInputLayout; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.AppCompatTextView; +import com.google.android.material.textfield.TextInputLayout; +import androidx.core.content.ContextCompat; +import androidx.appcompat.widget.AppCompatTextView; import android.text.Html; import android.text.SpannableString; import android.util.Log; @@ -27,7 +26,6 @@ import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; -import it.integry.integrywmsnative.BR; import it.integry.integrywmsnative.MainApplication; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.REST.consumers.BarcodeRESTConsumer; @@ -46,7 +44,6 @@ import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.DialogInputQuantityArticoloBinding; import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper; import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO; -import it.integry.plugins.barcode_base_library.model.BarcodeType; public class DialogInputQuantity { diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/QuantityDTO.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/QuantityDTO.java index e5dbe9d3..a5a1cc46 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/QuantityDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/QuantityDTO.java @@ -1,12 +1,7 @@ package it.integry.integrywmsnative.view.dialogs.input_quantity; -import android.graphics.Color; -import android.support.v4.content.ContextCompat; - import java.util.Date; -import it.integry.integrywmsnative.MainApplication; -import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.di.BindableBoolean; import it.integry.integrywmsnative.core.di.BindableFloat; import it.integry.integrywmsnative.core.di.BindableString; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java index 65a9012a..d3034bb1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java @@ -2,9 +2,9 @@ package it.integry.integrywmsnative.view.dialogs.scan_or_create_lu; import android.app.ProgressDialog; import android.content.Context; -import android.databinding.DataBindingUtil; -import android.databinding.ViewDataBinding; -import android.support.v7.app.AlertDialog; +import androidx.databinding.DataBindingUtil; +import androidx.databinding.ViewDataBinding; +import androidx.appcompat.app.AlertDialog; import android.text.SpannableString; import android.view.LayoutInflater; import android.view.View; @@ -15,8 +15,6 @@ import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.REST.consumers.BarcodeRESTConsumer; import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsumer; import it.integry.integrywmsnative.core.REST.consumers.PosizioneRESTonsumer; -import it.integry.integrywmsnative.core.REST.consumers.SystemRESTConsumer; -import it.integry.integrywmsnative.core.REST.model.Ean128Model; import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.expansion.RunnableArgs; @@ -26,14 +24,11 @@ import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityBarcode; import it.integry.integrywmsnative.core.utility.UtilityExceptions; -import it.integry.integrywmsnative.core.utility.UtilityLogger; import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.core.utility.UtilityString; -import it.integry.integrywmsnative.core.utility.UtilityToast; import it.integry.integrywmsnative.databinding.DialogScanOrCreateLuBinding; import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper; import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO; -import it.integry.plugins.barcode_base_library.model.BarcodeType; public class DialogScanOrCreateLU { diff --git a/app/src/main/res/layout/accettazione_main_list_model.xml b/app/src/main/res/layout/accettazione_main_list_model.xml index cdfd46a0..4f70e1dd 100644 --- a/app/src/main/res/layout/accettazione_main_list_model.xml +++ b/app/src/main/res/layout/accettazione_main_list_model.xml @@ -4,7 +4,7 @@ android:layout_height="wrap_content"> - - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_accettazione_ordine_inevaso.xml b/app/src/main/res/layout/activity_accettazione_ordine_inevaso.xml index 5bdcb713..d61929db 100644 --- a/app/src/main/res/layout/activity_accettazione_ordine_inevaso.xml +++ b/app/src/main/res/layout/activity_accettazione_ordine_inevaso.xml @@ -9,7 +9,7 @@ - - - - - + - + - - - - - - - - - + - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_contenuto_bancale.xml b/app/src/main/res/layout/activity_contenuto_bancale.xml index 964e0fca..f7570ca5 100644 --- a/app/src/main/res/layout/activity_contenuto_bancale.xml +++ b/app/src/main/res/layout/activity_contenuto_bancale.xml @@ -13,7 +13,7 @@ - @@ -30,7 +30,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - - - + - + @@ -248,5 +248,5 @@ fab:fab_label="@string/action_print_ul" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_lista_bancali.xml b/app/src/main/res/layout/activity_lista_bancali.xml index 7887f849..2b008e17 100644 --- a/app/src/main/res/layout/activity_lista_bancali.xml +++ b/app/src/main/res/layout/activity_lista_bancali.xml @@ -17,7 +17,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - @@ -29,7 +29,7 @@ android:layout_height="match_parent"> - - - - - - - - + diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index c9e0bf28..9d8811bf 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -28,24 +28,24 @@ android:layout_gravity="center_horizontal" /> - - - + - - - + - - - - + @@ -134,7 +134,7 @@ - - - - + diff --git a/app/src/main/res/layout/activity_vendita_ordine_inevaso.xml b/app/src/main/res/layout/activity_vendita_ordine_inevaso.xml index d44f534f..562c74ec 100644 --- a/app/src/main/res/layout/activity_vendita_ordine_inevaso.xml +++ b/app/src/main/res/layout/activity_vendita_ordine_inevaso.xml @@ -9,7 +9,7 @@ - - - - - + - + - - - - - - - - - + - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml index 71e83c92..4d0cb088 100644 --- a/app/src/main/res/layout/app_bar_main.xml +++ b/app/src/main/res/layout/app_bar_main.xml @@ -15,12 +15,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - - + diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml index 9f598de0..83adfe14 100644 --- a/app/src/main/res/layout/content_main.xml +++ b/app/src/main/res/layout/content_main.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/main/res/layout/dialog_ask_position_of_lu.xml b/app/src/main/res/layout/dialog_ask_position_of_lu.xml index a114866d..ecc2bc56 100644 --- a/app/src/main/res/layout/dialog_ask_position_of_lu.xml +++ b/app/src/main/res/layout/dialog_ask_position_of_lu.xml @@ -9,7 +9,7 @@ type="android.content.Context" /> - @@ -21,7 +21,7 @@ android:padding="16dp" android:layout_gravity="center"> - - + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_ask_position_of_lu__page1.xml b/app/src/main/res/layout/dialog_ask_position_of_lu__page1.xml index c45228ea..4407e7a6 100644 --- a/app/src/main/res/layout/dialog_ask_position_of_lu__page1.xml +++ b/app/src/main/res/layout/dialog_ask_position_of_lu__page1.xml @@ -19,7 +19,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"/> - - - - + @@ -32,8 +33,8 @@ android:gravity="bottom|center_horizontal"> - - - @@ -14,7 +14,7 @@ android:orientation="vertical" android:layout_margin="16dp"> - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_choose_art_from_lista_art__item_model.xml b/app/src/main/res/layout/dialog_choose_art_from_lista_art__item_model.xml index 1237983f..ddc3f1d2 100644 --- a/app/src/main/res/layout/dialog_choose_art_from_lista_art__item_model.xml +++ b/app/src/main/res/layout/dialog_choose_art_from_lista_art__item_model.xml @@ -12,7 +12,7 @@ type="it.integry.integrywmsnative.core.model.MtbAart"/> - - --> - + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_choose_arts_from_lista_arts__item_model.xml b/app/src/main/res/layout/dialog_choose_arts_from_lista_arts__item_model.xml index 07bfb696..85b0ccb2 100644 --- a/app/src/main/res/layout/dialog_choose_arts_from_lista_arts__item_model.xml +++ b/app/src/main/res/layout/dialog_choose_arts_from_lista_arts__item_model.xml @@ -19,7 +19,7 @@ android:layout_height="wrap_content" android:orientation="horizontal"> - - - - - + diff --git a/app/src/main/res/layout/dialog_choose_arts_from_lista_arts_layout.xml b/app/src/main/res/layout/dialog_choose_arts_from_lista_arts_layout.xml index cabe6fd4..5ec6d44f 100644 --- a/app/src/main/res/layout/dialog_choose_arts_from_lista_arts_layout.xml +++ b/app/src/main/res/layout/dialog_choose_arts_from_lista_arts_layout.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools"> - @@ -14,7 +14,7 @@ android:orientation="vertical" android:layout_margin="16dp"> - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_custom_content.xml b/app/src/main/res/layout/dialog_custom_content.xml index 51690596..913f476c 100644 --- a/app/src/main/res/layout/dialog_custom_content.xml +++ b/app/src/main/res/layout/dialog_custom_content.xml @@ -6,7 +6,7 @@ android:paddingLeft="12dp" android:paddingRight="12dp"> - - - - + diff --git a/app/src/main/res/layout/dialog_custom_header.xml b/app/src/main/res/layout/dialog_custom_header.xml index 799faad1..f92f7db9 100644 --- a/app/src/main/res/layout/dialog_custom_header.xml +++ b/app/src/main/res/layout/dialog_custom_header.xml @@ -11,7 +11,7 @@ android:id="@+id/llsubhead" > - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_input_quantity_articolo.xml b/app/src/main/res/layout/dialog_input_quantity_articolo.xml index 66bbbbd4..278f9fe3 100644 --- a/app/src/main/res/layout/dialog_input_quantity_articolo.xml +++ b/app/src/main/res/layout/dialog_input_quantity_articolo.xml @@ -12,19 +12,19 @@ name="quantityViewModel" type="it.integry.integrywmsnative.view.dialogs.input_quantity.QuantityDTO"/> - + - + - @@ -38,7 +38,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - - - - - - - - - - - - - - - - - - + - + - - - - + + - - - + - - - + @@ -335,5 +335,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_scan_or_create_lu.xml b/app/src/main/res/layout/dialog_scan_or_create_lu.xml index ea02e853..a0049a81 100644 --- a/app/src/main/res/layout/dialog_scan_or_create_lu.xml +++ b/app/src/main/res/layout/dialog_scan_or_create_lu.xml @@ -1,7 +1,7 @@ - @@ -25,7 +25,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"/> - - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_vendita_filtro_avanzato.xml b/app/src/main/res/layout/dialog_vendita_filtro_avanzato.xml index 1661e884..a830ff45 100644 --- a/app/src/main/res/layout/dialog_vendita_filtro_avanzato.xml +++ b/app/src/main/res/layout/dialog_vendita_filtro_avanzato.xml @@ -11,7 +11,7 @@ - @@ -21,7 +21,7 @@ android:orientation="vertical" android:layout_margin="16dp"> - - - - + - - - + - - - + - - - + - - - + - + diff --git a/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet.xml b/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet.xml index 5e6b84f9..03bbee62 100644 --- a/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet.xml @@ -11,14 +11,14 @@ - - - @@ -101,7 +101,7 @@ android:layout_height="match_parent"> - - - - - + - - - - + - - - - + @@ -240,10 +240,10 @@ - + - - - - + - + @@ -326,7 +326,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - - - - + - + - + @@ -385,9 +385,9 @@ android:padding="16dp" app:behavior_hideable="true" app:behavior_peekHeight="0dp" - app:layout_behavior="android.support.design.widget.BottomSheetBehavior"> + app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"> - - - - + - - - - @@ -481,7 +481,7 @@ app:layout_constraintStart_toStartOf="@id/guideline_action" android:gravity="center"> - - - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet__mtbcolr_item.xml b/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet__mtbcolr_item.xml index 0fd3e7c2..d0008eee 100644 --- a/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet__mtbcolr_item.xml +++ b/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet__mtbcolr_item.xml @@ -12,7 +12,7 @@ type="it.integry.integrywmsnative.core.model.MtbColr"/> - @@ -27,7 +27,7 @@ app:layout_constraintStart_toStartOf="parent"> - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_contenuto_bancale.xml b/app/src/main/res/layout/fragment_contenuto_bancale.xml index 45ebdd37..29e26859 100644 --- a/app/src/main/res/layout/fragment_contenuto_bancale.xml +++ b/app/src/main/res/layout/fragment_contenuto_bancale.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index 5fea7e3c..2b4bf032 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -40,7 +40,7 @@ - - - - + - - - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_main_accettazione.xml b/app/src/main/res/layout/fragment_main_accettazione.xml index 5184d180..084b0ba5 100644 --- a/app/src/main/res/layout/fragment_main_accettazione.xml +++ b/app/src/main/res/layout/fragment_main_accettazione.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> - + @@ -19,7 +19,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - + @@ -21,7 +21,7 @@ tools:context=".gest.rettifica_giacenze.RettificaGiacenzeFragment" android:clipToPadding="false"> - - - - - + - - - + - + - - - - + - + @@ -208,28 +208,28 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - - - - + - - + app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"> - - - - + - - - - @@ -399,7 +399,7 @@ app:layout_constraintStart_toStartOf="@id/guideline_action" android:gravity="center"> - - - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_main_settings.xml b/app/src/main/res/layout/fragment_main_settings.xml index 5ee8a8ca..c6d6c21b 100644 --- a/app/src/main/res/layout/fragment_main_settings.xml +++ b/app/src/main/res/layout/fragment_main_settings.xml @@ -1,8 +1,8 @@ - - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_main_vendita.xml b/app/src/main/res/layout/fragment_main_vendita.xml index 8f8703ce..0a667508 100644 --- a/app/src/main/res/layout/fragment_main_vendita.xml +++ b/app/src/main/res/layout/fragment_main_vendita.xml @@ -5,7 +5,7 @@ xmlns:tools="http://schemas.android.com/tools"> - + @@ -19,7 +19,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml b/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml index 58927aa0..b0c8e852 100644 --- a/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml +++ b/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml @@ -11,7 +11,7 @@ type="it.integry.integrywmsnative.core.model.MtbColr" /> - - - - + diff --git a/app/src/main/res/layout/lista_rettifica_giacenze_model.xml b/app/src/main/res/layout/lista_rettifica_giacenze_model.xml index a4302647..a4a07a79 100644 --- a/app/src/main/res/layout/lista_rettifica_giacenze_model.xml +++ b/app/src/main/res/layout/lista_rettifica_giacenze_model.xml @@ -11,7 +11,7 @@ type="it.integry.integrywmsnative.core.model.MtbColr" /> - - - - - + diff --git a/app/src/main/res/layout/rettifica_giacenze_autocomplete_fornitore_layout.xml b/app/src/main/res/layout/rettifica_giacenze_autocomplete_fornitore_layout.xml index 889b002a..dab7ff0c 100644 --- a/app/src/main/res/layout/rettifica_giacenze_autocomplete_fornitore_layout.xml +++ b/app/src/main/res/layout/rettifica_giacenze_autocomplete_fornitore_layout.xml @@ -17,7 +17,7 @@ android:paddingTop="16dp" android:paddingBottom="16dp"> - - - + \ No newline at end of file diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 4c17bd56..67ffcef4 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -22,6 +22,8 @@ Resetta Evasi + Questi permessi sono necessari al funzionamento dell\'app + Impostazioni Personalizza impostazioni azienda @@ -159,5 +161,6 @@ Scansiona il codice a barre di una Posizione Livello + Non valido \ No newline at end of file diff --git a/app/src/main/res/values/buttons_style.xml b/app/src/main/res/values/buttons_style.xml index fd8ab363..3a524e4c 100644 --- a/app/src/main/res/values/buttons_style.xml +++ b/app/src/main/res/values/buttons_style.xml @@ -1,6 +1,6 @@ -ì + - - - diff --git a/app/src/main/res/values/textview_style.xml b/app/src/main/res/values/textview_style.xml index 1701d556..8286fd23 100644 --- a/app/src/main/res/values/textview_style.xml +++ b/app/src/main/res/values/textview_style.xml @@ -7,7 +7,7 @@ \ No newline at end of file diff --git a/app/src/main/res/xml/app_preferences.xml b/app/src/main/res/xml/app_preferences.xml index 1abea50f..fcf353ac 100644 --- a/app/src/main/res/xml/app_preferences.xml +++ b/app/src/main/res/xml/app_preferences.xml @@ -1,7 +1,7 @@ - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 703e4837..53464802 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ buildscript { google() } dependencies { - classpath "com.android.tools.build:gradle:$gradle_version" + classpath "com.android.tools.build:gradle:3.2.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle.properties b/gradle.properties index 368076fd..65313856 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,6 +13,8 @@ org.gradle.jvmargs=-Xmx1536m android.databinding.enableV2=true +android.useAndroidX=true +android.enableJetifier=true # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit diff --git a/pointmobilescannerlibrary/build.gradle b/pointmobilescannerlibrary/build.gradle index e8596ef8..20849513 100644 --- a/pointmobilescannerlibrary/build.gradle +++ b/pointmobilescannerlibrary/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 27 + compileSdkVersion 28 @@ -11,7 +11,7 @@ android { versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -26,9 +26,9 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'androidx.appcompat:appcompat:1.1.0-alpha01' testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + androidTestImplementation 'androidx.test:runner:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' implementation project(':barcode_base_library') } diff --git a/pointmobilescannerlibrary/src/androidTest/java/it/integry/pointmobilescannerlibrary/ExampleInstrumentedTest.java b/pointmobilescannerlibrary/src/androidTest/java/it/integry/pointmobilescannerlibrary/ExampleInstrumentedTest.java index 03c3c049..7d5c3ead 100644 --- a/pointmobilescannerlibrary/src/androidTest/java/it/integry/pointmobilescannerlibrary/ExampleInstrumentedTest.java +++ b/pointmobilescannerlibrary/src/androidTest/java/it/integry/pointmobilescannerlibrary/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package it.integry.pointmobilescannerlibrary; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/waterfall_toolbar/build.gradle b/waterfall_toolbar/build.gradle index 7fc11da6..ad7742b7 100644 --- a/waterfall_toolbar/build.gradle +++ b/waterfall_toolbar/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdkVersion 27 + compileSdkVersion 28 @@ -12,7 +12,7 @@ android { versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -26,16 +26,14 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - + implementation fileTree(include: ['*.jar'], dir: 'libs') // google - implementation "com.android.support:cardview-v7:27.1.1" - implementation "com.android.support:design:27.1.1" - implementation 'com.android.support:appcompat-v7:27.1.1' - + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'com.google.android.material:material:1.1.0-alpha01' + implementation 'androidx.appcompat:appcompat:1.1.0-alpha01' testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + androidTestImplementation 'androidx.test:runner:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } repositories { diff --git a/waterfall_toolbar/src/androidTest/java/it/integry/plugins/waterfalltoolbar/ExampleInstrumentedTest.java b/waterfall_toolbar/src/androidTest/java/it/integry/plugins/waterfalltoolbar/ExampleInstrumentedTest.java index d53437a3..bb422285 100644 --- a/waterfall_toolbar/src/androidTest/java/it/integry/plugins/waterfalltoolbar/ExampleInstrumentedTest.java +++ b/waterfall_toolbar/src/androidTest/java/it/integry/plugins/waterfalltoolbar/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package it.integry.plugins.waterfalltoolbar; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/waterfall_toolbar/src/main/java/it/integry/plugins/waterfalltoolbar/WaterfallToolbar.kt b/waterfall_toolbar/src/main/java/it/integry/plugins/waterfalltoolbar/WaterfallToolbar.kt index e93d57c1..b2222c6f 100644 --- a/waterfall_toolbar/src/main/java/it/integry/plugins/waterfalltoolbar/WaterfallToolbar.kt +++ b/waterfall_toolbar/src/main/java/it/integry/plugins/waterfalltoolbar/WaterfallToolbar.kt @@ -4,13 +4,12 @@ import android.content.Context import android.os.Build import android.os.Parcel import android.os.Parcelable -import android.support.annotation.RequiresApi -import android.support.v4.widget.NestedScrollView -import android.support.v7.widget.CardView -import android.support.v7.widget.RecyclerView +import androidx.annotation.RequiresApi +import androidx.core.widget.NestedScrollView import android.util.AttributeSet import android.view.View import android.widget.ScrollView +import androidx.recyclerview.widget.RecyclerView /** * Created by Hugo Castelani @@ -18,7 +17,7 @@ import android.widget.ScrollView * Time: 19:30 */ -open class WaterfallToolbar : CardView { +open class WaterfallToolbar : androidx.cardview.widget.CardView { init { // set density to be able to use DimensionUnits // this code must run before all the signings using DimensionUnits @@ -28,7 +27,7 @@ open class WaterfallToolbar : CardView { /** * The recycler view whose scroll is going to be listened */ - var recyclerView: RecyclerView? = null + var recyclerView: androidx.recyclerview.widget.RecyclerView? = null set(value) { field = value addRecyclerViewScrollListener() @@ -185,7 +184,7 @@ open class WaterfallToolbar : CardView { private fun addRecyclerViewScrollListener() { recyclerView?.addOnScrollListener(object : RecyclerView.OnScrollListener() { - override fun onScrolled(recyclerView: RecyclerView?, dx: Int, dy: Int) { + override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { super.onScrolled(recyclerView, dx, dy) // real position must always get updated realPosition.value = realPosition.value + dy