diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 13f3b93a..0baeb2a5 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
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 @@
+
-
-
+
+
@@ -43,10 +44,12 @@
-
+
-
+
+
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 0bb09def..43b6d04b 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'
@@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
android {
- def appVersionCode = 24
- def appVersionName = '1.0.21'
+ def appVersionCode = 25
+ def appVersionName = '1.0.22'
signingConfigs {
release {
@@ -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/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4db6c11f..bca4665b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -76,12 +76,6 @@
android:resource="@xml/provider_paths" />
-
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
index 1ff3cada..99d90405 100644
--- a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
@@ -26,6 +26,7 @@ import android.widget.TextView;
import androidx.fragment.app.FragmentTransaction;
import it.integry.integrywmsnative.core.REST.watcher.ServerStatusChecker;
import it.integry.integrywmsnative.core.interfaces.IFilterableFragment;
+import it.integry.integrywmsnative.core.interfaces.IPoppableActivity;
import it.integry.integrywmsnative.core.interfaces.IRecyclerFragment;
import it.integry.integrywmsnative.core.interfaces.ISelectAllFragment;
import it.integry.integrywmsnative.core.settings.SettingsManager;
@@ -43,7 +44,7 @@ import it.integry.integrywmsnative.gest.vendita.MainVenditaFragment;
import it.integry.integrywmsnative.gest.versamento_merce.VersamentoMerceFragment;
public class MainActivity extends AppCompatActivity
- implements NavigationView.OnNavigationItemSelectedListener {
+ implements NavigationView.OnNavigationItemSelectedListener, IPoppableActivity {
private ActivityMainBinding mBinding;
@@ -74,7 +75,7 @@ public class MainActivity extends AppCompatActivity
mBinding.navView.setNavigationItemSelectedListener(this);
mBinding.appBarMain.mainSearch.setVisibility(View.GONE);
- popToMain();
+ pop();
init();
}
@@ -99,7 +100,7 @@ public class MainActivity extends AppCompatActivity
if (count == 0) {
super.onBackPressed();
} else {
- getSupportFragmentManager().popBackStack();
+ pop();
}
}
}
@@ -131,7 +132,7 @@ public class MainActivity extends AppCompatActivity
int id = item.getItemId();
if (id == R.id.nav_home) {
- this.popToMain();
+ this.pop();
} else if (id == R.id.nav_accettazione) {
fragment = MainAccettazioneFragment.newInstance();
this.adaptViewToFragment(fragment);
@@ -166,12 +167,14 @@ public class MainActivity extends AppCompatActivity
return true;
}
- public void popToMain() {
+ @Override
+ public void pop() {
MainFragment mainFragment = MainFragment.newInstance();
adaptViewToFragment(mainFragment);
changeContentFragment(mainFragment, false);
+ mBinding.navView.setCheckedItem(R.id.nav_home);
}
private void adaptViewToFragment(Fragment fragment){
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> callback) {
+ String printerTypeStr = printerType != null ? printerType.toString() : null;
+
PrinterRESTConsumerService printerService = RESTBuilder.getService(PrinterRESTConsumerService.class);
- printerService.getAvailablePrinters(codMdep, printerType.toString()).enqueue(new Callback>>() {
+ printerService.getAvailablePrinters(codMdep, printerTypeStr).enqueue(new Callback>>() {
@Override
public void onResponse(Call>> call, Response>> 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/interfaces/IPoppableActivity.java b/app/src/main/java/it/integry/integrywmsnative/core/interfaces/IPoppableActivity.java
new file mode 100644
index 00000000..e993074f
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/interfaces/IPoppableActivity.java
@@ -0,0 +1,7 @@
+package it.integry.integrywmsnative.core.interfaces;
+
+public interface IPoppableActivity {
+
+ void pop();
+
+}
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 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
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
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>() {
+ PrinterRESTConsumer.getAvailablePrinters(SettingsManager.i().userSession.depo.getCodMdep(), mPrinterType, new ISimpleOperationCallback>() {
@Override
public void onSuccess(List 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 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 mtbColts = (ArrayList)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 mtbColts = (ArrayList)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/picking_libero/PickingLiberoActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoActivity.java
deleted file mode 100644
index 03e9e151..00000000
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoActivity.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package it.integry.integrywmsnative.gest.picking_libero;
-
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.databinding.DataBindingUtil;
-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.utility.UtilityExceptions;
-import it.integry.integrywmsnative.databinding.ActivityPickingLiberoBinding;
-import it.integry.integrywmsnative.gest.picking_libero.core.PickingLiberoHelper;
-import it.integry.integrywmsnative.gest.picking_libero.viewmodel.PickingLiberoViewModel;
-
-import android.os.Bundle;
-
-public class PickingLiberoActivity extends AppCompatActivity {
-
- private ActivityPickingLiberoBinding mBindings;
-
- private PickingLiberoHelper mHelper;
- private PickingLiberoViewModel mViewModel;
-
- private int barcodeScannerIstanceID = -1;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- mBindings = DataBindingUtil.setContentView(this, R.layout.activity_picking_libero);
-
- mHelper = new PickingLiberoHelper(this);
-/*
- mViewModel = new PickingLiberoViewModel();
- mViewModel.init(this, mBindings, mHelper, getSupportActionBar());
-
- mBindings.setViewmodel(mViewModel);
-
- setSupportActionBar(this.mBindings.layout.toolbar);
- getSupportActionBar().setDisplayHomeAsUpEnabled(true);
- getSupportActionBar().setDisplayShowTitleEnabled(false);
-
- barcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
- .setOnScanSuccessfull(mViewModel.onScanSuccessfull)
- .setOnScanFailed(ex -> UtilityExceptions.defaultException(this, ex, false)));
-
-
- mBindings.layout.waterfallToolbar.setNestedScrollView(mBindings.layout.scrollView);
- */
- }
-
- public void setTitle(String title) {
- mBindings.layout.toolbarTitle.setText(title);
- }
-
- @Override
- public boolean onSupportNavigateUp() {
- onBackPressed();
- return true;
- }
-
- @Override
- public void onBackPressed() {
- mViewModel.onBackPressed();
-
- BarcodeManager.removeCallback(barcodeScannerIstanceID);
- super.onBackPressed();
- }
-}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java
index c0b3916a..c4b990e4 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java
@@ -80,4 +80,10 @@ public class PickingLiberoFragment extends Fragment implements ITitledFragment {
return mBindings.getRoot();
}
+ @Override
+ public void onDetach() {
+ BarcodeManager.removeCallback(barcodeScannerIstanceID);
+ super.onDetach();
+ }
+
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java
index 87aba666..d9fc57d5 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java
@@ -25,19 +25,14 @@ import androidx.databinding.ObservableList;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import it.integry.integrywmsnative.R;
-import it.integry.integrywmsnative.core.CommonConst;
-import it.integry.integrywmsnative.core.REST.consumers.ArticoloRESTConsumer;
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.model.Ean128Model;
-import it.integry.integrywmsnative.core.REST.model.Ean13PesoModel;
import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
import it.integry.integrywmsnative.core.di.BindableBoolean;
import it.integry.integrywmsnative.core.expansion.RunnableArgs;
import it.integry.integrywmsnative.core.interfaces.IRecyclerItemClicked;
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.secondary.GestioneEnum;
@@ -46,17 +41,13 @@ import it.integry.integrywmsnative.core.utility.UtilityExceptions;
import it.integry.integrywmsnative.core.utility.UtilityNumber;
import it.integry.integrywmsnative.core.utility.UtilityProgress;
import it.integry.integrywmsnative.core.utility.UtilityString;
-import it.integry.integrywmsnative.databinding.ActivityPickingLiberoBinding;
import it.integry.integrywmsnative.databinding.FragmentPickingLiberoBinding;
-import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoActivity;
import it.integry.integrywmsnative.gest.picking_libero.core.PickingLiberoHelper;
import it.integry.integrywmsnative.gest.picking_libero.core.PickingLiberoListAdapter;
-import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTO;
import it.integry.integrywmsnative.ui.StatusBarAlert;
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.plugins.barcode_base_library.model.BarcodeScanDTO;
public class PickingLiberoViewModel implements IRecyclerItemClicked {
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 a51fb212..a1222b72 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
@@ -32,6 +32,7 @@ import it.integry.integrywmsnative.core.REST.consumers.PrinterRESTConsumer;
import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
import it.integry.integrywmsnative.core.di.BindableBoolean;
import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.interfaces.IPoppableActivity;
import it.integry.integrywmsnative.core.interfaces.IRecyclerItemClicked;
import it.integry.integrywmsnative.core.model.CommonModelConsts;
import it.integry.integrywmsnative.core.model.MtbAart;
@@ -379,7 +380,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked
public void openLU() {
DialogScanOrCreateLU.make(mContext, mtbColt -> {
if(mtbColt == null) {
- ((MainActivity)mContext).popToMain();
+ ((IPoppableActivity)mContext).pop();
} else {
setMtbColt(mtbColt);
}
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 c103f461..8149c432 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
@@ -39,7 +39,6 @@ import it.integry.integrywmsnative.core.utility.UtilityExceptions;
import it.integry.integrywmsnative.core.utility.UtilityToast;
import it.integry.integrywmsnative.databinding.FragmentMainVenditaBinding;
import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
-import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoActivity;
import it.integry.integrywmsnative.gest.vendita.core.MainListVenditaAdapter;
import it.integry.integrywmsnative.gest.vendita.core.VenditaHelper;
import it.integry.integrywmsnative.gest.vendita.dialogs.DialogVenditaFiltroAvanzato;
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..37d9df78 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 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.PRIMARIA);
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/gest/versamento_merce/VersamentoMerceFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java
index f7ec7157..fd2ef14c 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
@@ -10,9 +10,11 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import it.integry.integrywmsnative.MainActivity;
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.IPoppableActivity;
import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
import it.integry.integrywmsnative.core.utility.UtilityExceptions;
import it.integry.integrywmsnative.databinding.FragmentMainVersamentoMerceBinding;
@@ -69,7 +71,9 @@ public class VersamentoMerceFragment extends Fragment implements ITitledFragment
private void init() {
mHelper = new VersamentoMerceHelper(getActivity());
- mVersamentoMerceViewModel.init(getActivity(), mBinding, mHelper);
+ mVersamentoMerceViewModel.init(getActivity(), mBinding, mHelper, () -> {
+ ((IPoppableActivity) getActivity()).pop();
+ });
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 3a761688..b13b7843 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
@@ -23,6 +23,7 @@ import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsume
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.interfaces.IPoppableActivity;
import it.integry.integrywmsnative.core.model.CommonModelConsts;
import it.integry.integrywmsnative.core.model.MtbColr;
import it.integry.integrywmsnative.core.model.MtbColt;
@@ -53,16 +54,20 @@ public class VersamentoMerceViewModel {
public ObservableField mtbColt = new ObservableField<>();
- public void init(Activity context, FragmentMainVersamentoMerceBinding binding, VersamentoMerceHelper helper) {
+
+ private Runnable mOnVersamentoCompleted;
+
+ public void init(Activity context, FragmentMainVersamentoMerceBinding binding, VersamentoMerceHelper helper, Runnable onVersamentoCompleted) {
mContext = context;
mBinding = binding;
mHelper = helper;
+ mOnVersamentoCompleted = onVersamentoCompleted;
}
public void openLU() {
DialogScanOrCreateLU.make(mContext, true, mtbColt -> {
if(mtbColt == null) {
- ((MainActivity)mContext).popToMain();
+ ((IPoppableActivity)mContext).pop();
} else if((mtbColt.getGestioneEnum() == GestioneEnum.ACQUISTO || mtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE) && mtbColt.getSegno().equals(+1)){
setMtbColt(mtbColt);
} else {
@@ -227,7 +232,7 @@ public class VersamentoMerceViewModel {
progressDialog.dismiss();
BarcodeManager.enable();
- showDataSavedDialog();
+ showDataSavedDialog(mOnVersamentoCompleted);
}, ex -> {
UtilityExceptions.defaultException(mContext, ex, progressDialog);
BarcodeManager.enable();
@@ -361,7 +366,9 @@ public class VersamentoMerceViewModel {
ColliMagazzinoRESTConsumer.saveCollo(mtbColt, value -> {
- showDataSavedDialog();
+ showDataSavedDialog(() -> {
+ mOnVersamentoCompleted.run();
+ });
}, ex -> {
UtilityExceptions.defaultException(mContext, ex);
});
@@ -369,14 +376,15 @@ public class VersamentoMerceViewModel {
}
- private void showDataSavedDialog() {
+ private void showDataSavedDialog(Runnable onComplete) {
DialogSimpleMessageHelper.makeSuccessDialog(
mContext,
mContext.getResources().getString(R.string.completed),
new SpannableString(mContext.getResources().getString(R.string.data_saved)),
null, () -> {
- resetMtbColt();
+ onComplete.run();
+ //resetMtbColt();
}).show();
}
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/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 c5fce61e..32a91c65 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
@@ -8,6 +8,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import android.view.LayoutInflater;
+import android.view.View;
import java.util.List;
@@ -48,6 +49,7 @@ public class DialogChooseArtsFromListaArts {
LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
DialogChooseArtsFromListaArtsLayoutBinding binding = DataBindingUtil.inflate(inflater, R.layout.dialog_choose_arts_from_lista_arts_layout, null, false);
+ binding.emptyView.setVisibility(listaMtbColr != null && listaMtbColr.size() > 0 ? View.GONE : View.VISIBLE);
final AlertDialog.Builder alertDialog = new AlertDialog.Builder(context)
.setView(binding.getRoot())
diff --git a/app/src/main/res/layout/activity_picking_libero.xml b/app/src/main/res/layout/activity_picking_libero.xml
index 48476662..ce5a952b 100644
--- a/app/src/main/res/layout/activity_picking_libero.xml
+++ b/app/src/main/res/layout/activity_picking_libero.xml
@@ -1,8 +1,7 @@
+ xmlns:app="http://schemas.android.com/apk/res-auto">
@@ -15,15 +14,42 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
\ No newline at end of file
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 5ec6d44f..e7d4b923 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
@@ -2,6 +2,10 @@
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
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