From 4c9a1bbaa99b5ef67b4e7db58d7b4a56fcd9ab57 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 20 May 2021 15:09:51 +0200 Subject: [PATCH 1/2] Implementata barra di ricerca nel dialog di selezione articoli da prelevare --- .../picking_libero/PickingLiberoFragment.java | 55 ++--- .../PickingLiberoViewModel.java | 52 +++-- .../ask_cliente/DialogAskClienteAdapter.java | 5 + .../ask_cliente/DialogAskClienteView.java | 1 + .../DialogAskCliente_Page1ViewModel.java | 9 +- .../DialogAskCliente_Page2ViewModel.java | 4 + .../viewmodel/IDialogAskClienteViewModel.java | 2 + .../DialogChooseArtsFromListaArts.java | 157 ++++++++++---- ...log_choose_arts_from_lista_arts_layout.xml | 195 +++++++++--------- build.gradle | 10 +- 10 files changed, 287 insertions(+), 203 deletions(-) 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 8e71e26c..59b9a6f3 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 @@ -190,7 +190,6 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme private final RunnableArgs onScanSuccessful = data -> { BarcodeManager.disable(); - this.openProgress(); this.mViewModel.processBarcodeDTO(data, () -> { @@ -238,30 +237,34 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme @Override public void onLUOpened(MtbColt mtbColt) { - mToolbarTitleText.setText(String.format(getActivity().getText(R.string.lu_number_text).toString(), mtbColt.getNumCollo())); + getActivity().runOnUiThread(() -> { + mToolbarTitleText.setText(String.format(getActivity().getText(R.string.lu_number_text).toString(), mtbColt.getNumCollo())); - initAdapter(); + initAdapter(); - thereIsAnOpenedUL.set(true); - thereIsAnyRowInUL.set(mtbColt.getMtbColr().size() > 0, true); + thereIsAnOpenedUL.set(true); + thereIsAnyRowInUL.set(mtbColt.getMtbColr().size() > 0, true); - mtbColt.getMtbColr().addOnListChangedCallback(new OnListGeneralChangedCallback() { - @Override - public void onChanged(ObservableList sender) { - thereIsAnyRowInUL.set(mtbColt.getMtbColr().size() > 0, true); - } + mtbColt.getMtbColr().addOnListChangedCallback(new OnListGeneralChangedCallback() { + @Override + public void onChanged(ObservableList sender) { + thereIsAnyRowInUL.set(mtbColt.getMtbColr().size() > 0, true); + } + }); + + FBToast.successToast(getActivity(), getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT); }); - - FBToast.successToast(getActivity(), getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT); } @Override public void onLUClosed() { - mToolbarTitleText.setText(getActivity().getText(R.string.free_picking_title_fragment).toString()); - destroyAdapter(); + getActivity().runOnUiThread(() -> { + mToolbarTitleText.setText(getActivity().getText(R.string.free_picking_title_fragment).toString()); + destroyAdapter(); - thereIsAnyRowInUL.set(false); - thereIsAnOpenedUL.set(false); + thereIsAnyRowInUL.set(false); + thereIsAnOpenedUL.set(false); + }); } @Override @@ -276,15 +279,17 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme @Override public void onError(Exception ex) { - this.closeProgress(); + getActivity().runOnUiThread(() -> { + this.closeProgress(); - if (ex instanceof InvalidPesoKGException) { - UtilityToast.showToast(ex.getMessage()); - } else { - UtilityExceptions.defaultException(getActivity(), ex, mCurrentProgress); - } + if (ex instanceof InvalidPesoKGException) { + UtilityToast.showToast(ex.getMessage()); + } else { + UtilityExceptions.defaultException(getActivity(), ex, mCurrentProgress); + } - BarcodeManager.enable(); + BarcodeManager.enable(); + }); } @Override @@ -357,7 +362,9 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme @Override public void onRowSaved() { - FBToast.successToast(getActivity(), getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT); + getActivity().runOnUiThread(() -> { + FBToast.successToast(getActivity(), getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT); + }); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java index 91cb7838..bec3a20e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java @@ -181,15 +181,18 @@ public class PickingLiberoViewModel { if (this.mFlagAskCliente) { this.sendOnLoadingEnded(); this.sendLUClienteRequired((vtbDest, codJcom) -> { - this.sendOnLoadingStarted(); createNewLU_PostClienteAsk(customNumCollo, customSerCollo, vtbDest, codJcom, onComplete); - }, onComplete); + }, () -> { + + }); } else { createNewLU_PostClienteAsk(customNumCollo, customSerCollo, null, null, onComplete); } } private void createNewLU_PostClienteAsk(Integer customNumCollo, String customSerCollo, VtbDest vtbDest, String codJcom, Runnable onComplete) { + this.sendOnLoadingStarted(); + MtbColt mtbColt = new MtbColt(); mtbColt.initDefaultFields(); mtbColt.setGestione(mDefaultGestione) @@ -211,7 +214,7 @@ public class PickingLiberoViewModel { mtbColt.setCodVdes(vtbDest.getCodVdes()); } - if(!UtilityString.isNullOrEmpty(codJcom)) { + if (!UtilityString.isNullOrEmpty(codJcom)) { mtbColt.setCodJcom(codJcom); } @@ -378,38 +381,29 @@ public class PickingLiberoViewModel { this.sendOnLoadingStarted(); - mColliMagazzinoRESTConsumer.saveCollo(clonedTestata, value -> { - for (int i = 0; i < mtbColrObservableField.size(); i++) { - MtbColr initialMtbColr = mtbColrObservableField.get(i); + new Thread(() -> { + mColliMagazzinoRESTConsumer.saveCollo(clonedTestata, value -> { + for (int i = 0; i < mtbColrObservableField.size(); i++) { + MtbColr initialMtbColr = mtbColrObservableField.get(i); - initialMtbColr - .setDataCollo(value.getDataColloS()) - .setNumCollo(value.getNumCollo()) - .setGestione(value.getGestione()) - .setSerCollo(value.getSerCollo()); + initialMtbColr + .setDataCollo(value.getDataColloS()) + .setNumCollo(value.getNumCollo()) + .setGestione(value.getGestione()) + .setSerCollo(value.getSerCollo()); - initialMtbColr.setRiga(value.getMtbColr().get(i).getRiga()); + initialMtbColr.setRiga(value.getMtbColr().get(i).getRiga()); + mCurrentMtbColt.getMtbColr().add(mtbColrObservableField.get(i)); + } -// for (int j = 0; j < value.getMtbColr().size(); j++) { -// MtbColr savedMtbColr = value.getMtbColr().get(j); -// if (savedMtbColr.getCodMart().equals(initialMtbColr.getCodMart()) && -// UtilityString.equalsIgnoreCase(savedMtbColr.getPartitaMag(), initialMtbColr.getPartitaMag()) && -// UtilityString.equalsIgnoreCase(savedMtbColr.getCodCol(), initialMtbColr.getCodCol()) && -// UtilityString.equalsIgnoreCase(savedMtbColr.getCodTagl(), initialMtbColr.getCodTagl()) && -// savedMtbColr.getQtaCol().equals(initialMtbColr.getQtaCol()) && -// savedMtbColr.getNumCnf().equals(initialMtbColr.getNumCnf())) { -// initialMtbColr.setRiga(savedMtbColr.getRiga()); -// } -// } + this.sendOnRowSaved(); + this.sendOnLoadingEnded(); - mCurrentMtbColt.getMtbColr().add(mtbColrObservableField.get(i)); - } + onComplete.run(); - this.sendOnRowSaved(); - this.sendOnLoadingEnded(); + }, this::sendError); - onComplete.run(); - }, this::sendError); + }).start(); } }, onComplete); } else { diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/DialogAskClienteAdapter.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/DialogAskClienteAdapter.java index 05477fd1..21db78f8 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/DialogAskClienteAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/DialogAskClienteAdapter.java @@ -96,6 +96,7 @@ public class DialogAskClienteAdapter extends PagerAdapter implements ViewPager.O @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { if(position != lastPage) { + if(lastPage != -1) mDatasetViews.get(lastPage).getValue().onDismiss(); viewPager.onPageChanged(mDatasetViews.get(position).getKey().getRoot()); mDatasetViews.get(position).getValue().onShow(); lastPage = position; @@ -111,4 +112,8 @@ public class DialogAskClienteAdapter extends PagerAdapter implements ViewPager.O public void onPageScrollStateChanged(int state) { } + + public void onDismiss() { + if(lastPage != -1) mDatasetViews.get(lastPage).getValue().onDismiss(); + } } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/DialogAskClienteView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/DialogAskClienteView.java index ccd1b16a..cbd5f1d8 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/DialogAskClienteView.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/DialogAskClienteView.java @@ -133,6 +133,7 @@ public class DialogAskClienteView extends BaseDialogFragment { @Override public void onDismiss(@NonNull DialogInterface dialog) { + mAdapter.onDismiss(); if(!mIsClienteSelected) { this.mOnAbort.run(); } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java index 799ee055..608c2269 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java @@ -66,8 +66,8 @@ public class DialogAskCliente_Page1ViewModel implements IDialogAskClienteViewMod "WHERE vtb_clie.flag_stato = 'A' " + "ORDER BY rag_soc"; - Type typeOfObjectsList = new TypeToken>>() { - }.getType(); + Type typeOfObjectsList = new TypeToken>>() { }.getType(); + SystemRESTConsumer.processSqlStatic(sql, typeOfObjectsList, new ISimpleOperationCallback>>() { @Override public void onSuccess(ArrayList> value) { @@ -106,6 +106,11 @@ public class DialogAskCliente_Page1ViewModel implements IDialogAskClienteViewMod } + @Override + public void onDismiss() { + BarcodeManager.removeCallback(mBarcodeScannerInstanceID); + } + @Override public void setOnConfirmClickListener(Runnable onConfirm) { this.mBinding.buttonYes.setOnClickListener(v -> { diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2ViewModel.java index f5f6a7c5..2d4afc7b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2ViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2ViewModel.java @@ -71,6 +71,10 @@ public class DialogAskCliente_Page2ViewModel implements IDialogAskClienteViewMod }); } + @Override + public void onDismiss() { + } + @Override public void setOnConfirmClickListener(Runnable onConfirm) { this.mOnConfirm = onConfirm; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/IDialogAskClienteViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/IDialogAskClienteViewModel.java index 57271d6d..b154c11a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/IDialogAskClienteViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/IDialogAskClienteViewModel.java @@ -12,6 +12,8 @@ public interface IDialogAskClienteViewModel { void onShow(); + void onDismiss(); + void setOnConfirmClickListener(Runnable onConfirm); void setOnAbortClickListener(Runnable onAbort); 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 9d91b99a..16023666 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 @@ -7,6 +7,7 @@ import android.graphics.drawable.ColorDrawable; import android.view.LayoutInflater; import android.view.View; +import androidx.appcompat.widget.SearchView; import androidx.databinding.DataBindingUtil; import androidx.fragment.app.FragmentActivity; import androidx.recyclerview.widget.LinearLayoutManager; @@ -22,7 +23,6 @@ import it.integry.barcode_base_android_library.model.BarcodeScanDTO; 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.di.BindableBoolean; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.model.MtbColr; @@ -42,13 +42,13 @@ public class DialogChooseArtsFromListaArts { private Context currentContext; private Dialog mDialog; + private DialogChooseArtsFromListaArtsLayoutBinding mBindings; private DialogChooseArtsFromListaArtsAdapter currentAdapter; private RunnableArgs> mOnItemsChoosed; private Runnable mOnAbort; private List mDataset; - private BindableBoolean filterStatus = new BindableBoolean(false); public static void make(@NotNull final FragmentActivity activity, List listaMtbColr, RunnableArgs> onItemsChoosed, Runnable onAbort) { activity.runOnUiThread(() -> { @@ -64,9 +64,9 @@ public class DialogChooseArtsFromListaArts { mDataset = new ArrayList<>(); - if(listaMtbColr != null){ + if (listaMtbColr != null) { for (MtbColr mtbColr : listaMtbColr) { - if(UtilityString.isNullOrEmpty(mtbColr.getUntMis()) && mtbColr.getMtbAart() != null){ + if (UtilityString.isNullOrEmpty(mtbColr.getUntMis()) && mtbColr.getMtbAart() != null) { mtbColr.setUntMis(mtbColr.getMtbAart().getUntMis()); } @@ -75,56 +75,131 @@ 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); + mBindings = DataBindingUtil.inflate(inflater, R.layout.dialog_choose_arts_from_lista_arts_layout, null, false); - binding.setFilterStatus(filterStatus); - binding.emptyView.setVisibility(listaMtbColr != null && listaMtbColr.size() > 0 ? View.GONE : View.VISIBLE); + mBindings.emptyView.setVisibility(listaMtbColr != null && listaMtbColr.size() > 0 ? View.GONE : View.VISIBLE); mDialog = new Dialog(context); - mDialog.setContentView(binding.getRoot()); + mDialog.setContentView(mBindings.getRoot()); mDialog.setCanceledOnTouchOutside(false); mDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); mDialog.setOnCancelListener(dialog -> { - if(this.mOnAbort != null) this.mOnAbort.run(); + if (this.mOnAbort != null) this.mOnAbort.run(); }); UtilityDialog.setTo90PercentWidth(context, mDialog); - initRecyclerView(binding); + initRecyclerView(); - initRemoveFilterButton(binding); + initFilter(); setupBarcode(); - binding.positiveButton.setOnClickListener(v -> { + mBindings.positiveButton.setOnClickListener(v -> { mDialog.dismiss(); onPositiveClick(); }); - binding.negativeButton.setOnClickListener(v -> { + mBindings.negativeButton.setOnClickListener(v -> { mDialog.dismiss(); onNegativeClick(); }); } - private void initRecyclerView(DialogChooseArtsFromListaArtsLayoutBinding binding) { - binding.dialogChooseArtsFromListaArtMainList.setNestedScrollingEnabled(false); + private void initRecyclerView() { + mBindings.dialogChooseArtsFromListaArtMainList.setNestedScrollingEnabled(false); - binding.dialogChooseArtsFromListaArtMainList.setHasFixedSize(true); + mBindings.dialogChooseArtsFromListaArtMainList.setHasFixedSize(true); - binding.dialogChooseArtsFromListaArtMainList.setLayoutManager(new LinearLayoutManager(currentContext)); + mBindings.dialogChooseArtsFromListaArtMainList.setLayoutManager(new LinearLayoutManager(currentContext)); currentAdapter = new DialogChooseArtsFromListaArtsAdapter(currentContext, mDataset); - binding.dialogChooseArtsFromListaArtMainList.setAdapter(currentAdapter); + mBindings.dialogChooseArtsFromListaArtMainList.setAdapter(currentAdapter); } - private void initRemoveFilterButton(DialogChooseArtsFromListaArtsLayoutBinding binding) { - binding.buttonRemoveFilter.setOnClickListener(v -> { - removeListFilter(); + private void initFilter() { + mBindings.mainSearch.setOnCloseListener(() -> { + this.removeListFilter(); + return true; + }); + + mBindings.mainSearch.setOnQueryTextListener(new SearchView.OnQueryTextListener() { + @Override + public boolean onQueryTextSubmit(String query) { +// removeListFilter(); +// +// if (!UtilityString.isNullOrEmpty(query) && query.trim().length() > 3) { +// List foundRowsList = Stream.of(mDataset) +// .filter(x -> { +// String codMart = x.getMtbColr().getMtbAart().getCodMart(); +// String descrizioneArt = x.getMtbColr().getMtbAart().getDescrizioneEstesa(); +// String diacod = x.getMtbColr().getMtbAart().getDiacod(); +// +// return ((codMart.startsWith(query) || +// codMart.endsWith(query) || +// codMart.contains(query) || +// codMart.equalsIgnoreCase(query)) || +// (descrizioneArt.startsWith(query) || +// descrizioneArt.endsWith(query) || +// descrizioneArt.contains(query) || +// descrizioneArt.equalsIgnoreCase(query)) || +// (diacod.startsWith(query) || +// diacod.endsWith(query) || +// diacod.contains(query) || +// diacod.equalsIgnoreCase(query))) && +// !x.isHidden(); +// }) +// .toList(); +// +// for (int i = 0; i < mDataset.size(); i++) { +// mDataset.get(i).setHidden(!foundRowsList.contains(mDataset.get(i))); +// } +// } + + return true; + } + + @Override + public boolean onQueryTextChange(String newText) { + removeListFilter(); + + newText = newText.toLowerCase(); + + if (!UtilityString.isNullOrEmpty(newText) && newText.trim().length() > 2) { + String finalNewText = newText; + List foundRowsList = Stream.of(mDataset) + .filter(x -> { + String codMart = x.getMtbColr().getMtbAart().getCodMart().toLowerCase(); + String descrizioneArt = x.getMtbColr().getMtbAart().getDescrizioneEstesa().toLowerCase(); + String diacod = x.getMtbColr().getMtbAart().getDiacod().toLowerCase(); + + return ((codMart.startsWith(finalNewText) || + codMart.endsWith(finalNewText) || + codMart.contains(finalNewText) || + codMart.equalsIgnoreCase(finalNewText)) || + (descrizioneArt.startsWith(finalNewText) || + descrizioneArt.endsWith(finalNewText) || + descrizioneArt.contains(finalNewText) || + descrizioneArt.equalsIgnoreCase(finalNewText)) || + (diacod.startsWith(finalNewText) || + diacod.endsWith(finalNewText) || + diacod.contains(finalNewText) || + diacod.equalsIgnoreCase(finalNewText))) && + !x.isHidden(); + }) + .toList(); + + for (int i = 0; i < mDataset.size(); i++) { + mDataset.get(i).setHidden(!foundRowsList.contains(mDataset.get(i))); + } + } + + return true; + } }); } @@ -147,9 +222,9 @@ public class DialogChooseArtsFromListaArts { Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(currentContext); - if(UtilityBarcode.isEan13(data)){ + if (UtilityBarcode.isEan13(data)) { this.loadArticolo(data.getStringValue(), null, progressDialog); - } else if(UtilityBarcode.isEtichetta128(data)) { + } else if (UtilityBarcode.isEtichetta128(data)) { this.executeEtichettaEan128(data, progressDialog); } else { progressDialog.dismiss(); @@ -165,14 +240,15 @@ public class DialogChooseArtsFromListaArts { String barcodeProd = null; - if(!UtilityString.isNullOrEmpty(ean128Model.Sscc)) barcodeProd = ean128Model.Sscc; - if(!UtilityString.isNullOrEmpty(ean128Model.Gtin)) barcodeProd = ean128Model.Gtin; - if(!UtilityString.isNullOrEmpty(ean128Model.Content)) barcodeProd = ean128Model.Content; + if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) barcodeProd = ean128Model.Sscc; + if (!UtilityString.isNullOrEmpty(ean128Model.Gtin)) barcodeProd = ean128Model.Gtin; + if (!UtilityString.isNullOrEmpty(ean128Model.Content)) + barcodeProd = ean128Model.Content; - if(!UtilityString.isNullOrEmpty(barcodeProd)) { + if (!UtilityString.isNullOrEmpty(barcodeProd)) { - if(!UtilityString.isNullOrEmpty(ean128Model.Gtin) || !UtilityString.isNullOrEmpty(ean128Model.Content)){ + if (!UtilityString.isNullOrEmpty(ean128Model.Gtin) || !UtilityString.isNullOrEmpty(ean128Model.Content)) { this.loadArticolo(barcodeProd, ean128Model, progressDialog); } else { DialogCommon.showNoArtFoundDialog(currentContext, () -> { @@ -191,22 +267,23 @@ public class DialogChooseArtsFromListaArts { }); } - }, ex-> { + }, ex -> { UtilityExceptions.defaultException(currentContext, ex, progressDialog); BarcodeManager.enable(); }); } - private void loadArticolo(String barcodeProd, Ean128Model ean128Model, Dialog progressDialog) { - if(barcodeProd.length() == 14) { + if (barcodeProd.length() == 14) { barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd); } + String finalBarcodeProd = barcodeProd; ArticoloRESTConsumer.getByBarcodeProdStatic(barcodeProd, mtbAartList -> { - if(mtbAartList != null && mtbAartList.size() > 0) { + if (mtbAartList != null && mtbAartList.size() > 0) { + this.mBindings.mainSearch.setQuery(finalBarcodeProd, false); this.searchArtInList(mtbAartList.get(0), ean128Model); @@ -236,42 +313,34 @@ public class DialogChooseArtsFromListaArts { !x.isHidden()) .toList(); - if(foundRowsList.size() == 0) { + if (foundRowsList.size() == 0) { DialogCommon.showNoArtFoundDialog(currentContext, null); } else { - for(int i = 0; i < mDataset.size(); i++) { + for (int i = 0; i < mDataset.size(); i++) { mDataset.get(i).setHidden(!foundRowsList.contains(mDataset.get(i))); } - - filterStatus.set(true); - } } - - private void removeListFilter() { - filterStatus.set(false); for (DialogChooseArtsFromListaArtsItemModel itemModel : mDataset) { itemModel.setHidden(false); } } - private void onPositiveClick() { - if(mOnItemsChoosed != null) { + if (mOnItemsChoosed != null) { mOnItemsChoosed.run(currentAdapter.getSelectedItems()); } } private void onNegativeClick() { - if(this.mOnAbort != null) mOnAbort.run(); + if (this.mOnAbort != null) mOnAbort.run(); } - } 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 568167a9..5088ac7c 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,171 +3,168 @@ xmlns:tools="http://schemas.android.com/tools"> + - - - + android:orientation="vertical" + android:paddingStart="8dp" + android:paddingTop="24dp" + android:paddingEnd="8dp" + android:paddingBottom="8dp"> - - - - - - - - - - - - + android:layout_above="@id/buttons" + android:layout_below="@id/title_container" + android:paddingTop="8dp"> + android:layout_marginTop="16dp" + android:layout_marginBottom="16dp" + android:gravity="center" + android:padding="16dp"> - - - - - - - - + android:text="@string/no_item_to_pick_text" + android:textColor="@color/empty_view_gray" + android:textSize="20sp" /> + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + android:paddingBottom="8dp"> + app:layout_constraintGuide_percent="0.5" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintStart_toStartOf="@id/center_guideline" + app:layout_constraintTop_toTopOf="parent" /> - + diff --git a/build.gradle b/build.gradle index 02f7745c..240d4432 100644 --- a/build.gradle +++ b/build.gradle @@ -31,11 +31,11 @@ allprojects { } - gradle.projectsEvaluated { - tasks.withType(JavaCompile) { - options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" - } - } +// gradle.projectsEvaluated { +// tasks.withType(JavaCompile) { +// options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" +// } +// } } task clean(type: Delete) { From c167893544d33bc5cb04ee77a9dd35b2bada8454 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 20 May 2021 15:10:55 +0200 Subject: [PATCH 2/2] -> v1.17.0 (218) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 29f82aa6..8b753440 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 217 - def appVersionName = '1.16.35' + def appVersionCode = 218 + def appVersionName = '1.17.0' signingConfigs { release {