diff --git a/app/build.gradle b/app/build.gradle index c502f789..7452a357 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 248 - def appVersionName = '1.20.1' + def appVersionCode = 249 + def appVersionName = '1.20.2' signingConfigs { release { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java index 7285449f..b79eadab 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java @@ -264,7 +264,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF List filterList = Stream.of(OrdiniUscitaElencoBindings.AVAILABLE_FILTERS.entrySet()).map(Map.Entry::getValue).sortBy(FilterChipDTO::getPosizione).toList(); - for (FilterChipDTO filterChipDTO : filterList){ + for (FilterChipDTO filterChipDTO : filterList) { FilterChipView filterChipView = new FilterChipView( requireActivity(), @@ -697,28 +697,29 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF //new Thread(() -> { -// requireActivity().runOnUiThread(() -> { - List tmpList; + requireActivity().runOnUiThread(() -> { + List tmpList; - if (filteredList != null) { - tmpList = filteredList; - } else if (mAppliedFilterViewModel != null) { - mAppliedFilterViewModel.applyAllTests(); - tmpList = mAppliedFilterViewModel.getMutableFilteredOrderList().getValue(); - } else { - tmpList = mViewModel.getOrderList().getValue(); - } + if (filteredList != null) { + tmpList = filteredList; + } else if (mAppliedFilterViewModel != null) { + mAppliedFilterViewModel.applyAllTests(); + tmpList = mAppliedFilterViewModel.getMutableFilteredOrderList().getValue(); + } else { + tmpList = mViewModel.getOrderList().getValue(); + } - var list = convertDataModelToListModel(tmpList); + var list = convertDataModelToListModel(tmpList); - this.mOrdiniInevasiMutableData.clear(); - this.mOrdiniInevasiMutableData.addAll(list); + this.mOrdiniInevasiMutableData.clear(); + this.mOrdiniInevasiMutableData.addAll(list); - fabVisible.set(Stream.of(mOrdiniInevasiMutableData) - .anyMatch(y -> y.getSelectedObservable().get())); -// }); + fabVisible.set(Stream.of(mOrdiniInevasiMutableData) + .anyMatch(y -> y.getSelectedObservable().get())); this.onLoadingEnded(); + }); + //}).start(); } @@ -831,7 +832,6 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF } - @Override public void addOnPreDestroy(Runnable onPreDestroy) { this.mOnPreDestroyList.add(onPreDestroy);