From 90b751fbc8b2a2f04a29625d6ff42b3c5feced24 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Wed, 16 Jan 2019 15:41:11 +0100
Subject: [PATCH] =?UTF-8?q?Aggiornato=20gradle=20e=20sistemata=20stampa=20?=
 =?UTF-8?q?in=20modalit=C3=A0=20Recupera=20UL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/caches/build_file_checksums.ser         | Bin 729 -> 729 bytes
 .idea/runConfigurations/app.xml               |  11 +++---
 app/build.gradle                              |  14 +++++---
 .../REST/consumers/DepositoRESTConsumer.java  |   1 -
 .../REST/consumers/GestSetupRESTConsumer.java |   1 -
 .../REST/consumers/PrinterRESTConsumer.java   |   4 ++-
 .../core/di/BindableBoolean.java              |   3 --
 .../core/di/BindableFloat.java                |   3 --
 .../core/di/BindableInteger.java              |   3 --
 .../core/di/BindableString.java               |   3 --
 .../core/report/ReportManager.java            |   1 -
 .../AccettazioneOrdineInevasoActivity.java    |   5 ++-
 ...eOnOrdineAccettazioneInevasoViewModel.java |   3 +-
 .../ContenutoBancaleActivity.java             |  34 ++++++++++++++----
 .../viewmodel/ContenutoBancaleViewModel.java  |   7 ++--
 .../lista_bancali/ListaBancaliActivity.java   |  34 +++++++++++++-----
 .../VenditaOrdineInevasoActivity.java         |   5 ++-
 .../VenditaOrdineInevasoViewModel.java        |   4 +--
 .../ArticoliInColloBottomSheetViewModel.java  |   6 ++--
 build.gradle                                  |   2 +-
 gradle.properties                             |   1 +
 gradle/wrapper/gradle-wrapper.properties      |   4 +--
 .../waterfalltoolbar/WaterfallToolbar.kt      |   2 +-
 23 files changed, 90 insertions(+), 61 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 13f3b93a4a9e6b0e9b1bad6fd21857a20ed00acb..dda08da8c8717308a9ee7743c61a547108181ab8 100644
GIT binary patch
delta 74
zcmV-Q0JZ<w1=$6Vm;_f8Qc97WwGgCTwppj|rjyz_i1)bd85NUZ0ge!TR`&QQyAn~e
giX85JN$>5G{{hJn?WzE+8kMS!YElx!!Dr%Zcsn>G!vFvP

delta 74
zcmV-Q0JZ<w1=$6Vm;_R3yw{POwGcW}=(uLXH*F^{6jGemv2c@N0ge#UJ6doQ4E6%R
g;hllfW1mfv{{hJnuRp?4gI{O6wy?8F(Ol=Bcm??**8l(j

diff --git a/.idea/runConfigurations/app.xml b/.idea/runConfigurations/app.xml
index fc61716a..28ffe8c9 100644
--- a/.idea/runConfigurations/app.xml
+++ b/.idea/runConfigurations/app.xml
@@ -3,13 +3,14 @@
     <module name="app" />
     <option name="DEPLOY" value="true" />
     <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
+    <option name="DEPLOY_AS_INSTANT" value="false" />
     <option name="ARTIFACT_NAME" value="" />
     <option name="PM_INSTALL_OPTIONS" value="" />
     <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
     <option name="ACTIVITY_EXTRA_FLAGS" value="" />
     <option name="MODE" value="default_activity" />
-    <option name="CLEAR_LOGCAT" value="false" />
-    <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
+    <option name="CLEAR_LOGCAT" value="true" />
+    <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
     <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
     <option name="FORCE_STOP_RUNNING_APP" value="true" />
     <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
@@ -43,10 +44,12 @@
     <Profilers>
       <option name="ADVANCED_PROFILING_ENABLED" value="false" />
       <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sampled (Java)" />
+      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
     </Profilers>
     <option name="DEEP_LINK" value="" />
     <option name="ACTIVITY_CLASS" value="" />
-    <method />
+    <method v="2">
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    </method>
   </configuration>
 </component>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 0bb09def..aeb53d20 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,7 +9,7 @@ buildscript {
 }
 apply plugin: 'com.android.application'
 apply plugin: 'com.google.firebase.firebase-perf'
-apply plugin: 'io.fabric'
+//apply plugin: 'io.fabric'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'com.google.gms.google-services'
@@ -70,6 +70,12 @@ android {
             file("$projectDir/build/outputs/apk/release/version_v2.txt").text = appVersionCode + '\n' + appVersionName
         }
     }
+
+    gradle.projectsEvaluated {
+        tasks.withType(JavaCompile.class) {
+            options.compilerArgs << "-Xmaxerrs" << "10000"
+        }
+    }
 }
 
 dependencies {
@@ -92,8 +98,6 @@ dependencies {
     implementation 'androidx.preference:preference:1.1.0-alpha02'
     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'
@@ -109,8 +113,8 @@ dependencies {
     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:9.0.0-rc2'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0-rc2'
+    implementation 'com.jakewharton:butterknife:10.0.0'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:10.0.0'
     implementation 'br.com.zbra:android-linq:1.1.0'
     //FAB
     //implementation 'com.getbase:floatingactionbutton:1.10.1'
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/DepositoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/DepositoRESTConsumer.java
index 7e69f23a..1f019140 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/DepositoRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/DepositoRESTConsumer.java
@@ -6,7 +6,6 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.CommonModelConsts;
 import it.integry.integrywmsnative.core.model.MtbDepo;
 import it.integry.integrywmsnative.core.utility.UtilityLogger;
-import it.integry.integrywmsnative.generated.callback.Runnable;
 
 public class DepositoRESTConsumer {
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/GestSetupRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/GestSetupRESTConsumer.java
index dc0c96a7..bdd51609 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/GestSetupRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/GestSetupRESTConsumer.java
@@ -7,7 +7,6 @@ import it.integry.integrywmsnative.core.REST.model.GestSetupDTO;
 import it.integry.integrywmsnative.core.REST.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.utility.UtilityLogger;
-import it.integry.integrywmsnative.generated.callback.Runnable;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/PrinterRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/PrinterRESTConsumer.java
index e2282f7c..900bdad9 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/PrinterRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/PrinterRESTConsumer.java
@@ -72,8 +72,10 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
 
     public static void getAvailablePrinters(String codMdep, Type printerType, final ISimpleOperationCallback<List<String>> callback) {
 
+        String printerTypeStr = printerType != null ? printerType.toString() : null;
+
         PrinterRESTConsumerService printerService = RESTBuilder.getService(PrinterRESTConsumerService.class);
-        printerService.getAvailablePrinters(codMdep, printerType.toString()).enqueue(new Callback<ServiceRESTResponse<List<String>>>() {
+        printerService.getAvailablePrinters(codMdep, printerTypeStr).enqueue(new Callback<ServiceRESTResponse<List<String>>>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<List<String>>> call, Response<ServiceRESTResponse<List<String>>> response) {
                 analyzeAnswer(response, "GetAvailablePrinters", callback);
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 3280d7a0..d9009fe2 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
@@ -2,9 +2,6 @@ package it.integry.integrywmsnative.core.di;
 
 import androidx.databinding.BaseObservable;
 
-import org.parceler.Parcel;
-
-@Parcel
 public class BindableBoolean extends BaseObservable {
     boolean mValue;
 
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 9c3c873f..13f4a569 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
@@ -2,9 +2,6 @@ package it.integry.integrywmsnative.core.di;
 
 import androidx.databinding.BaseObservable;
 
-import org.parceler.Parcel;
-
-@Parcel
 public class BindableFloat extends BaseObservable {
     Float value;
 
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 5be038d5..5541bd46 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
@@ -2,9 +2,6 @@ package it.integry.integrywmsnative.core.di;
 
 import androidx.databinding.BaseObservable;
 
-import org.parceler.Parcel;
-
-@Parcel
 public class BindableInteger  extends BaseObservable {
     Integer value;
 
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 ce8f2bc2..27bad837 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
@@ -3,11 +3,8 @@ package it.integry.integrywmsnative.core.di;
 import androidx.databinding.BaseObservable;
 import androidx.databinding.Observable;
 
-import org.parceler.Parcel;
-
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 
-@Parcel
 public class BindableString extends BaseObservable {
     String value;
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/report/ReportManager.java b/app/src/main/java/it/integry/integrywmsnative/core/report/ReportManager.java
index 37bdf05f..598ed761 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/report/ReportManager.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/report/ReportManager.java
@@ -3,7 +3,6 @@ package it.integry.integrywmsnative.core.report;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
-import it.integry.integrywmsnative.generated.callback.Runnable;
 
 public class ReportManager {
 
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 6a8485d5..dfeba83b 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
@@ -11,6 +11,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.REST.consumers.PrinterRESTConsumer;
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO;
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.model.MtbColt;
@@ -108,9 +109,7 @@ public class AccettazioneOrdineInevasoActivity extends AppCompatActivity {
 
 
     public void startListaBancaliRegistratiActivity(ArrayList<MtbColt> mtbColts){
-        Intent myIntent = new Intent(this, ListaBancaliActivity.class);
-        myIntent.putExtra("key", mtbColts); //Optional parameters
-        myIntent.putExtra(ListaBancaliActivity.Key.CanRecoverUL, true);
+        Intent myIntent = ListaBancaliActivity.createIntent(this, mtbColts, true, PrinterRESTConsumer.Type.SECONDARIA);
         this.startActivityForResult(myIntent, PICK_UL_REQUEST);
     }
 
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 805b6e0d..fe7ff7f9 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
@@ -15,7 +15,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
-import it.integry.integrywmsnative.BR;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.CommonConst;
 import it.integry.integrywmsnative.core.REST.consumers.ArticoloRESTConsumer;
@@ -82,7 +81,7 @@ public class AccettazioneOnOrdineAccettazioneInevasoViewModel implements IOnColl
 
         this.isFabVisible.set(true);
 
-        this.mActivity.bindings.setVariable(BR.viewmodel, this);
+        this.mActivity.bindings.setViewmodel(this);
 
         this.init();
     }
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 4ba8a770..a15db8d7 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
@@ -2,14 +2,17 @@ package it.integry.integrywmsnative.gest.contenuto_bancale;
 
 import androidx.databinding.DataBindingUtil;
 import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
 
 import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.REST.consumers.PrinterRESTConsumer;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.databinding.ActivityContenutoBancaleBinding;
 import it.integry.integrywmsnative.gest.contenuto_bancale.viewmodel.ContenutoBancaleViewModel;
-
-import static it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleActivity.Key.CanRecoverUL;
+import it.integry.integrywmsnative.gest.lista_bancali.ListaBancaliActivity;
 
 public class ContenutoBancaleActivity extends AppCompatActivity {
 
@@ -17,8 +20,19 @@ public class ContenutoBancaleActivity extends AppCompatActivity {
 
     private ContenutoBancaleViewModel mViewModel;
 
-    public static class Key {
-        public static final String CanRecoverUL = "canRecoverUL";
+    private static class Key {
+        private static final String MtbColtKey = "mtbColtKey";
+        private static final String CanRecoverUL = "canRecoverUL";
+        private static final String PrinterType = "printerType";
+    }
+
+    public static Intent createIntent(Context context, MtbColt item, boolean canRecoverUl, PrinterRESTConsumer.Type printerType) {
+        Intent myIntent = new Intent(context, ContenutoBancaleActivity.class);
+        myIntent.putExtra(Key.MtbColtKey, item);
+        myIntent.putExtra(Key.CanRecoverUL, canRecoverUl);
+        myIntent.putExtra(Key.PrinterType, printerType);
+
+        return myIntent;
     }
 
     @Override
@@ -27,9 +41,15 @@ public class ContenutoBancaleActivity extends AppCompatActivity {
 
         bindings = DataBindingUtil.setContentView(this, R.layout.activity_contenuto_bancale);
 
-        boolean canRecoverUL = getIntent().getBooleanExtra(CanRecoverUL, false);
-        MtbColt mtbColt = getIntent().getParcelableExtra("key");
-        mViewModel = new ContenutoBancaleViewModel(this, mtbColt, canRecoverUL);
+        boolean canRecoverUL = getIntent().getBooleanExtra(Key.CanRecoverUL, false);
+        MtbColt mtbColt = getIntent().getParcelableExtra(Key.MtbColtKey);
+
+        PrinterRESTConsumer.Type mPrinterType;
+        if(getIntent().hasExtra(Key.PrinterType)) {
+            mPrinterType = (PrinterRESTConsumer.Type) getIntent().getSerializableExtra(Key.PrinterType);
+        } else mPrinterType = null;
+
+        mViewModel = new ContenutoBancaleViewModel(this, mtbColt, canRecoverUL, mPrinterType);
 
         bindings.waterfallToolbar.setNestedScrollView(bindings.scrollView);
 
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 398d0763..1043b7b0 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
@@ -40,11 +40,14 @@ public class ContenutoBancaleViewModel implements IRecyclerItemClicked<MtbColr>
 
     private ContenutoBancaleListAdapter mAdapter;
 
-    public ContenutoBancaleViewModel(ContenutoBancaleActivity context, MtbColt mtbColt, boolean canRecoverUL){
+    private PrinterRESTConsumer.Type mPrinterType;
+
+    public ContenutoBancaleViewModel(ContenutoBancaleActivity context, MtbColt mtbColt, boolean canRecoverUL, PrinterRESTConsumer.Type printerType){
         mContext = context;
         this.mtbColt = new ObservableField<>(mtbColt);
         this.isFabVisible.set(true);
         this.isRecoverFabMenuVisible.set(canRecoverUL);
+        this.mPrinterType = printerType;
 
         mContext.bindings.setViewModel(this);
 
@@ -97,7 +100,7 @@ public class ContenutoBancaleViewModel implements IRecyclerItemClicked<MtbColr>
         final ProgressDialog progress = ProgressDialog.show(mContext, mContext.getText(R.string.waiting),
                 mContext.getText(R.string.loading) + " ...", true);
 
-        PrinterRESTConsumer.getAvailablePrinters(SettingsManager.i().userSession.depo.getCodMdep(), new ISimpleOperationCallback<List<String>>() {
+        PrinterRESTConsumer.getAvailablePrinters(SettingsManager.i().userSession.depo.getCodMdep(), mPrinterType, new ISimpleOperationCallback<List<String>>() {
             @Override
             public void onSuccess(List<String> value) {
 
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 b652a836..d3d597a1 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,5 +1,6 @@
 package it.integry.integrywmsnative.gest.lista_bancali;
 
+import android.content.Context;
 import android.content.Intent;
 import androidx.databinding.DataBindingUtil;
 import androidx.appcompat.app.AppCompatActivity;
@@ -9,17 +10,18 @@ import java.util.ArrayList;
 import java.util.List;
 
 import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.REST.consumers.PrinterRESTConsumer;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.databinding.ActivityListaBancaliBinding;
 import it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleActivity;
 import it.integry.integrywmsnative.gest.lista_bancali.viewmodel.ListaBancaliViewModel;
 
-import static it.integry.integrywmsnative.gest.lista_bancali.ListaBancaliActivity.Key.CanRecoverUL;
-
 public class ListaBancaliActivity extends AppCompatActivity {
 
-    public static class Key {
-        public static final String CanRecoverUL = "canRecoverUL";
+    private static class Key {
+        private static final String MtbColtsKey = "mtbColtsKey";
+        private static final String CanRecoverUL = "canRecoverUL";
+        private static final String PrinterType = "printerType";
     }
 
     public ActivityListaBancaliBinding bindings;
@@ -27,18 +29,34 @@ public class ListaBancaliActivity extends AppCompatActivity {
     private ListaBancaliViewModel mViewModel;
 
     private boolean mCanRecoverUl;
+    private PrinterRESTConsumer.Type mPrinterType;
 
     private static final int PICK_UL_REQUEST = 1;  // The request code
 
 
+
+    public static Intent createIntent(Context context, ArrayList<MtbColt> items, boolean canRecoverUl, PrinterRESTConsumer.Type printerType) {
+        Intent myIntent = new Intent(context, ListaBancaliActivity.class);
+        myIntent.putExtra(Key.MtbColtsKey, items);
+        myIntent.putExtra(Key.CanRecoverUL, canRecoverUl);
+        myIntent.putExtra(Key.PrinterType, printerType);
+
+        return myIntent;
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         bindings = DataBindingUtil.setContentView(this, R.layout.activity_lista_bancali);
 
 
-        mCanRecoverUl = getIntent().getBooleanExtra(CanRecoverUL, false);
-        List<MtbColt> mtbColts = (ArrayList<MtbColt>)getIntent().getSerializableExtra("key");
+        mCanRecoverUl = getIntent().getBooleanExtra(Key.CanRecoverUL, false);
+
+        if(getIntent().hasExtra(Key.PrinterType)) {
+            mPrinterType = (PrinterRESTConsumer.Type) getIntent().getSerializableExtra(Key.PrinterType);
+        } else mPrinterType = null;
+
+        List<MtbColt> mtbColts = (ArrayList<MtbColt>)getIntent().getSerializableExtra(Key.MtbColtsKey);
         mViewModel = new ListaBancaliViewModel(this, mtbColts);
 
 
@@ -55,9 +73,7 @@ public class ListaBancaliActivity extends AppCompatActivity {
     }
 
     public void startContenutoBancaleActivity(MtbColt item){
-        Intent myIntent = new Intent(this, ContenutoBancaleActivity.class);
-        myIntent.putExtra("key", item); //Optional parameters
-        myIntent.putExtra(ContenutoBancaleActivity.Key.CanRecoverUL, mCanRecoverUl);
+        Intent myIntent = ContenutoBancaleActivity.createIntent(this, item, mCanRecoverUl, mPrinterType);
         startActivityForResult(myIntent, PICK_UL_REQUEST);
     }
 
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 35f5313b..4ac28e25 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
@@ -11,6 +11,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.REST.consumers.PrinterRESTConsumer;
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO;
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.model.MtbColt;
@@ -98,9 +99,7 @@ public class VenditaOrdineInevasoActivity extends AppCompatActivity {
 
 
     public void startListaBancaliRegistratiActivity(ArrayList<MtbColt> mtbColts){
-        Intent myIntent = new Intent(this, ListaBancaliActivity.class);
-        myIntent.putExtra("key", mtbColts); //Optional parameters
-        myIntent.putExtra(ListaBancaliActivity.Key.CanRecoverUL, true);
+        Intent myIntent = ListaBancaliActivity.createIntent(this, mtbColts, true, PrinterRESTConsumer.Type.SECONDARIA);
         this.startActivityForResult(myIntent, PICK_UL_REQUEST);
     }
 
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 00ab4d09..7201ad52 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
@@ -46,8 +46,6 @@ import it.integry.integrywmsnative.ui.StatusBarAlert;
 import it.integry.integrywmsnative.view.bottomsheet.interfaces.IOnColloClosedCallback;
 import it.integry.integrywmsnative.view.bottomsheet.viewmodel.ArticoliInColloBottomSheetViewModel;
 
-import it.integry.integrywmsnative.BR;
-import it.integry.integrywmsnative.view.dialogs.DialogAskLivelloPosizione;
 import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper;
 import it.integry.integrywmsnative.view.dialogs.ask_should_print.DialogAskShouldPrint;
 import it.integry.integrywmsnative.view.dialogs.input_quantity.DialogInputQuantity;
@@ -85,7 +83,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
 
         this.isFabVisible.set(true);
 
-        this.mActivity.bindings.setVariable(BR.viewmodel, this);
+        this.mActivity.bindings.setViewmodel(this);
 
         this.init();
         this.initDatiPicking();
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 d60d31e5..7486f38d 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
@@ -20,7 +20,6 @@ import android.widget.BaseAdapter;
 import java.lang.ref.WeakReference;
 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.expansion.RunnableArgs;
@@ -30,6 +29,7 @@ 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.databinding.FragmentArticoliInColloBottomSheetMtbcolrItemBinding;
 import it.integry.integrywmsnative.view.bottomsheet.ArticoliInColloBottomSheetHelper;
 import it.integry.integrywmsnative.view.bottomsheet.interfaces.IOnColloClosedCallback;
 import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper;
@@ -235,10 +235,10 @@ public class ArticoliInColloBottomSheetViewModel {
 
             LayoutInflater inflater = LayoutInflater.from(parent.getContext());
 
-            ViewDataBinding binding = DataBindingUtil.inflate(inflater, R.layout.fragment_articoli_in_collo_bottom_sheet__mtbcolr_item, parent, false);
+            FragmentArticoliInColloBottomSheetMtbcolrItemBinding binding = DataBindingUtil.inflate(inflater, R.layout.fragment_articoli_in_collo_bottom_sheet__mtbcolr_item, parent, false);
 
             final MtbColr item = mtbColt.get().getMtbColr().get(position);
-            binding.setVariable(BR.mtbColr, item);
+            binding.setMtbColr(item);
             binding.executePendingBindings();
 
             if(position % 2 == 1) binding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG));
diff --git a/build.gradle b/build.gradle
index 36d077cd..df7f4a2f 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.3.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.2.0'
         classpath 'com.google.firebase:firebase-plugins:1.1.5'
diff --git a/gradle.properties b/gradle.properties
index 65313856..69dd6cc4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,6 +16,7 @@ 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
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 26e5a1e4..4d36ac1b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jan 09 16:56:36 CET 2019
+#Wed Jan 16 12:23:01 CET 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
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 72a64f99..e2602a36 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
@@ -252,7 +252,7 @@ open class WaterfallToolbar : androidx.cardview.widget.CardView {
      * @return A parcelable with the saved data
      */
     override fun onSaveInstanceState(): Parcelable? {
-        val savedState = SavedState(super.onSaveInstanceState())
+        val savedState = SavedState(super.onSaveInstanceState() as Parcelable)
 
         savedState.elevation = cardElevation.toInt()
         savedState.orthodoxPosition = orthodoxPosition