diff --git a/app/build.gradle b/app/build.gradle index f9d42142..6eb20766 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 348 - def appVersionName = '1.32.08' + def appVersionCode = 350 + def appVersionName = '1.32.10' signingConfigs { release { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java index 530aff5d..5eb85b89 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java @@ -115,4 +115,6 @@ public class BaseDialogFragment extends DialogFragment implements DialogInterfac }); } } + + } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniFragment.java index f894e7fc..891988ca 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniFragment.java @@ -48,7 +48,6 @@ public class DocInterniFragment extends BaseFragment implements ITitledFragment, private FragmentDocInterniBinding mBinding; private DocInterniSetupDTO mDocInterniSetupDTO; private final List mOnPreDestroyList = new ArrayList<>(); - private boolean dialogInitialized = false; public DocInterniFragment() { @@ -80,8 +79,10 @@ public class DocInterniFragment extends BaseFragment implements ITitledFragment, mViewModel.setListeners(this); mBinding.setLifecycleOwner(this); + mBinding.setView(this); mBinding.setViewModel(mViewModel); + mViewModel.mtbGrup.observe(getViewLifecycleOwner(), mtbGrup -> mViewModel.fetchProducts()); mViewModel.dtbTipi.observe(getViewLifecycleOwner(), dtbTipi -> mViewModel.fetchDocuments()); this.initRecyclerView(); @@ -110,8 +111,7 @@ public class DocInterniFragment extends BaseFragment implements ITitledFragment, @Override public void onDocInterniSetupFetched(DocInterniSetupDTO docInterniSetupDTO) { this.mDocInterniSetupDTO = docInterniSetupDTO; - this.dialogInitialized = true; - this.selectDocInfo(); + this.openDocumentSelectionDialog(); } @Override @@ -125,11 +125,11 @@ public class DocInterniFragment extends BaseFragment implements ITitledFragment, } - if (selection.getGruppoArt() != null) { - mBinding.mtbGrpContainer.setVisibility(View.VISIBLE); - } else { - mBinding.mtbGrpContainer.setVisibility(View.GONE); - } +// if (selection.getGruppoArt() != null) { +// mBinding.mtbGrpContainer.setVisibility(View.VISIBLE); +// } else { +// mBinding.mtbGrpContainer.setVisibility(View.GONE); +// } if (selection.isDocumentRequired()) { mBinding.docContainer.setVisibility(View.VISIBLE); @@ -150,15 +150,16 @@ public class DocInterniFragment extends BaseFragment implements ITitledFragment, this.mOnPreDestroyList.add(onPreDestroy); } - public void selectDocInfo() { - if (this.dialogInitialized) { + public void openDocumentSelectionDialog() { + DialogSelectDocInfoView.newInstance( + mDocInterniSetupDTO, + this::onDocDetailsChanged, + this::popMe) + .show(requireActivity().getSupportFragmentManager(), "tag"); + } + + public void showInfoArtDialog() { - DialogSelectDocInfoView.newInstance( - mDocInterniSetupDTO, - this::onDocDetailsChanged, - this::popMe) - .show(requireActivity().getSupportFragmentManager(), "tag"); - } } private void initRecyclerView() { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoView.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoView.java index f5f6e760..1f0ffbd5 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoView.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoView.java @@ -50,6 +50,7 @@ public class DialogSelectDocInfoView extends BaseDialogFragment { private final RunnableArgs onConfirm; private final Runnable onAbort; + private boolean completed = false; public ObservableField selectedTipoDoc = new ObservableField<>(); public ObservableField selectedGroupArt = new ObservableField<>(); @@ -95,7 +96,7 @@ public class DialogSelectDocInfoView extends BaseDialogFragment { mViewModel.setFornitori(mDocInputData.getFornitori()); - var cancelable = true; + var cancelable = false; var alertDialog = new MaterialAlertDialogBuilder(this.mContext) .setView(mBindings.getRoot()) @@ -110,6 +111,8 @@ public class DialogSelectDocInfoView extends BaseDialogFragment { alertDialog.setOnShowListener(this); alertDialog.setCanceledOnTouchOutside(cancelable); + alertDialog.setOnDismissListener(this); + return alertDialog; } @@ -135,6 +138,7 @@ public class DialogSelectDocInfoView extends BaseDialogFragment { mBindings.inputNoteLayout.setError(null); mViewModel.validate(); + completed = true; alertDialog.dismiss(); if (this.onConfirm != null) @@ -174,6 +178,7 @@ public class DialogSelectDocInfoView extends BaseDialogFragment { } + private void initBindings() { this.isFornitoreRequired.set(mViewModel.isFornitoreRequired().getValue()); mViewModel.isFornitoreRequired().observe(this, val -> this.isFornitoreRequired.set(val)); @@ -227,7 +232,7 @@ public class DialogSelectDocInfoView extends BaseDialogFragment { .getOriginalModel()); }); - var arrayAdapterFornitori = new DialogSelectDocInfo_FornitoreAdapter(mContext, R.layout.array_adapter_single_item, mDocInputData.getFornitori()); + var arrayAdapterFornitori = new DialogSelectDocInfo_FornitoreAdapter(mContext, R.layout.array_adapter_single_item, mViewModel.getAvailableFornitori()); mBindings.filledExposedDropdownCodAnagList.setAdapter(arrayAdapterFornitori); mBindings.filledExposedDropdownCodAnagList.setOnItemClickListener((adapterView, view, i, l) -> { this.selectedFornitore.set( @@ -239,4 +244,11 @@ public class DialogSelectDocInfoView extends BaseDialogFragment { mBindings.filledExposedDropdownNote.setAdapter(arrayAdapterNote); } + @Override + public void onDismiss(@NonNull DialogInterface dialog) { + super.onDismiss(dialog); + + if(!completed) + this.onAbort.run(); + } } \ No newline at end of file diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoViewModel.java index 17fa4087..10e059c1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/DialogSelectDocInfoViewModel.java @@ -54,6 +54,10 @@ public class DialogSelectDocInfoViewModel extends ViewModel { val.getGestione().equals("L"))); } + public MutableLiveData> getAvailableFornitori() { + return availableFornitori; + } + public void setFornitori(List fornitori) { tipoDoc.observeForever(val -> { availableFornitori.postValue(Stream.of(fornitori) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/adapter/DialogSelectDocInfo_FornitoreAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/adapter/DialogSelectDocInfo_FornitoreAdapter.java index 7b394ab2..d06aa76e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/adapter/DialogSelectDocInfo_FornitoreAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/adapter/DialogSelectDocInfo_FornitoreAdapter.java @@ -4,6 +4,7 @@ import android.content.Context; import android.widget.ArrayAdapter; import androidx.annotation.NonNull; +import androidx.lifecycle.MutableLiveData; import com.annimon.stream.Stream; @@ -13,17 +14,20 @@ import it.integry.integrywmsnative.gest.contab_doc_interni.dto.FornitoreDTO; public class DialogSelectDocInfo_FornitoreAdapter extends ArrayAdapter { - public DialogSelectDocInfo_FornitoreAdapter(@NonNull Context context, int resource, List inputData) { + public DialogSelectDocInfo_FornitoreAdapter(@NonNull Context context, int resource, MutableLiveData> inputData) { super(context, resource); if (inputData == null) return; - List mDataset = Stream.of(inputData) - .map(x -> new ListModel() - .setOriginalModel(x)) - .toList(); + inputData.observeForever(data -> { + List mDataset = Stream.of(data) + .map(x -> new ListModel() + .setOriginalModel(x)) + .toList(); - addAll(mDataset); + clear(); + addAll(mDataset); + }); } public static class ListModel { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java index 950dcf03..4666d634 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java @@ -47,6 +47,7 @@ import it.integry.integrywmsnative.ui.FabMenuCustomAnimations; import it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetMtbColrEditModalView; import it.integry.integrywmsnative.view.dialogs.DialogCommon; import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleInputHelper; +import it.integry.integrywmsnative.view.dialogs.choose_art_from_lista_arts.DialogChooseArtFromListaArtsView; import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO; import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View; @@ -94,10 +95,12 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); binding = DataBindingUtil.setContentView(this, R.layout.activity_contab_doc_interni_edit); + MainApplication.appComponent .docInterniEditFormComponent() .create() .inject(this); + SqlMtbColt document = DataCache.retrieveItem(getIntent().getStringExtra(DATA_KEY_DOCUMENT)); List productList = DataCache.retrieveItem(getIntent().getStringExtra(DATA_KEY_PRODUCTS_LIST)); TipoDocDTO docType = DataCache.retrieveItem(getIntent().getStringExtra(DATA_KEY_TIPO_DOC)); @@ -117,11 +120,11 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter SqlMtbColt document = this.viewModel.getDocument(); this.codDtip.set(document.getCodDtipProvv()); this.note.set(document.getAnnotazioni()); + if (document.getCodMgrp() != null) { this.codMgrp.set(document.getCodMgrp()); - } else { - binding.mtbGrupContainer.setVisibility(View.GONE); } + if (document.getCodAnag() != null) { this.codAnag.set(document.getCodAnag() + (document.getCodVdes() != null ? " - " + document.getCodVdes() : "")); } else { @@ -131,7 +134,7 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter this.documentHeader.set(String.format(this.getString(R.string.doc_interni_doc_header), document.getId(), document.getCodDtipProvv())); if (document.getNumDoc() != null && document.getDataDoc() != null) { - this.documentRifHeader.set(String.format(this.getString(R.string.doc_testata), document.getNumDoc().toString(), document.getDataDoc())); + this.documentRifHeader.set(String.format(this.getString(R.string.doc_testata), document.getNumDoc().toString(), UtilityDate.formatDate(document.getDataDoc(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN))); } else { this.binding.docRifLayout.setVisibility(View.GONE); } @@ -349,4 +352,20 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter .findFirstOrElse(null); } + + + public void showInfoArtDialog() { + var listaMtbAart = Stream.of(this.viewModel.getProductsList()) + .map(x -> new MtbAart() + .setCodMart(x.getCodMart()) + .setUntMis(x.getUntMis()) + .setDescrizione(x.getDescrizione()) + .setDescrizioneEstesa(x.getDescrizione()) + .setQtaCnf(x.getQtaCnf())) + .toList(); + + new DialogChooseArtFromListaArtsView(false, listaMtbAart, null) + .show(getSupportFragmentManager(), "tag"); + } + } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java index 9fb28742..df5e9620 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java @@ -264,6 +264,10 @@ public class DocInterniEditFormViewModel { return document.getValue(); } + public List getProductsList() { + return productsList; + } + public void setProductsList(List productsList) { this.productsList = productsList; this.flattedBarcodesCodMarts = new HashMap<>(); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioActivity.java index d3e73335..95a97e31 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioActivity.java @@ -8,6 +8,7 @@ import android.view.Menu; import androidx.annotation.Nullable; import androidx.databinding.DataBindingUtil; +import com.annimon.stream.Stream; import com.ravikoradiya.liveadapter.LiveAdapter; import com.ravikoradiya.liveadapter.Type; @@ -38,6 +39,7 @@ import it.integry.integrywmsnative.gest.inventario.bottom_sheet__inventario_row_ import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO; import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO; import it.integry.integrywmsnative.view.dialogs.DialogConsts; +import it.integry.integrywmsnative.view.dialogs.choose_art_from_lista_arts.DialogChooseArtFromListaArtsView; import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO; import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View; import it.integry.integrywmsnative.view.dialogs.yes_no.DialogYesNoView; @@ -229,4 +231,13 @@ public class PickingInventarioActivity extends BaseActivity implements PickingIn }) .show(getSupportFragmentManager(), "tag"); } + + public void showAvailableArts() { + var listaMtbAart = Stream.of(this.mViewModel.getAvailableArts()) + .map(InventarioArtDTO::toMtbAart) + .toList(); + + new DialogChooseArtFromListaArtsView(false, listaMtbAart, null) + .show(getSupportFragmentManager(), "tag"); + } } \ No newline at end of file diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java index f83182fa..4b6bd4a9 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java @@ -138,7 +138,6 @@ public class PVOrdineAcquistoEditViewModel { } catch (Exception e) { this.sendError(e); BarcodeManager.enable(); - } finally { } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java index 2dc39ce2..8470117d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java @@ -301,7 +301,7 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr @Override public void onArtListLoaded(ArrayList artList, RunnableArgs onArtChoosed) { - new DialogChooseArtFromListaArtsView(artList, onArtChoosed) + new DialogChooseArtFromListaArtsView(true, artList, onArtChoosed) .show(requireActivity().getSupportFragmentManager(), "tag"); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java index 91bad773..c932a287 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java @@ -941,7 +941,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo @Override public void onChooseArtRequest(List artsList, RunnableArgs onComplete) { - new DialogChooseArtFromListaArtsView(artsList, onComplete) + new DialogChooseArtFromListaArtsView(true, artsList, onComplete) .show(getSupportFragmentManager(), "tag"); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java index d5334f0a..f034c1c8 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java @@ -1240,9 +1240,12 @@ public class SpedizioneViewModel { return; } - var clonedSourceMtbColr = (MtbColr) mtbColrToDispatch.clone(); - clonedSourceMtbColr.setMtbPartitaMag(null) - .setMtbAart(null); + MtbColr clonedSourceMtbColr = null; + if (mtbColrToDispatch != null) { + clonedSourceMtbColr = (MtbColr) mtbColrToDispatch.clone(); + clonedSourceMtbColr.setMtbPartitaMag(null) + .setMtbAart(null); + } var clonedTargetMtbColt = (MtbColt) mCurrentMtbColt.clone(); clonedTargetMtbColt.setMtbColr(null); @@ -1341,7 +1344,6 @@ public class SpedizioneViewModel { }, this::sendError); - // MtbColt mtbColt = new MtbColt() // .setNumCollo(mtbColrToUpdate.getNumCollo()) // .setDataCollo(mtbColrToUpdate.getDataColloS()) diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArtsAdapter.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArtsAdapter.java index 7afe84e6..6fa91617 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArtsAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArtsAdapter.java @@ -1,11 +1,12 @@ package it.integry.integrywmsnative.view.dialogs.choose_art_from_lista_arts; import android.content.Context; -import androidx.databinding.DataBindingUtil; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.ViewGroup; +import androidx.databinding.DataBindingUtil; +import androidx.recyclerview.widget.RecyclerView; + import java.util.List; import it.integry.integrywmsnative.R; @@ -18,7 +19,7 @@ public class DialogChooseArtFromListaArtsAdapter extends RecyclerView.Adapter mDataset; - private IRecyclerItemClicked mOnItemClickListener; + private final IRecyclerItemClicked mOnItemClickListener; public static class ViewHolder extends RecyclerView.ViewHolder { protected DialogChooseArtFromListaArtItemModelBinding mViewDataBinding; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArtsView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArtsView.java index 67c9becb..08fd76e1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArtsView.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArtsView.java @@ -16,6 +16,7 @@ import java.util.List; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.expansion.BaseDialogFragment; import it.integry.integrywmsnative.core.expansion.RunnableArgs; +import it.integry.integrywmsnative.core.interfaces.IRecyclerItemClicked; import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.databinding.DialogChooseArtFromListaArtBinding; import it.integry.integrywmsnative.ui.SimpleDividerItemDecoration; @@ -23,12 +24,15 @@ import it.integry.integrywmsnative.ui.SimpleDividerItemDecoration; public class DialogChooseArtFromListaArtsView extends BaseDialogFragment { + private final boolean mEnableSelection; private final List mListaArts; private final RunnableArgs mOnItemChoosed; - public DialogChooseArtFromListaArtsView(List listaArts, RunnableArgs onItemChoosed) { + public DialogChooseArtFromListaArtsView(boolean enableSelection, List listaArts, RunnableArgs onItemChoosed) { super(); + + this.mEnableSelection = enableSelection; this.mListaArts = listaArts; this.mOnItemChoosed = onItemChoosed; } @@ -39,6 +43,9 @@ public class DialogChooseArtFromListaArtsView extends BaseDialogFragment { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { var binding = DialogChooseArtFromListaArtBinding.inflate(LayoutInflater.from(requireContext())); + binding.titleText.setText(this.mEnableSelection ? R.string.dialog_choose_art_from_lista_art : + R.string.articoli_disponibili); + initRecyclerView(binding, mListaArts); var alertDialog = new MaterialAlertDialogBuilder(requireContext()) @@ -60,14 +67,16 @@ public class DialogChooseArtFromListaArtsView extends BaseDialogFragment { itemDecorator.setDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.divider)); binding.dialogChooseArtFromListaArtMainList.addItemDecoration(itemDecorator); - DialogChooseArtFromListaArtsAdapter mCurrentAdapter = new DialogChooseArtFromListaArtsAdapter(requireContext(), dataset, - ((item, position) -> { - if (mOnItemChoosed != null) { - mOnItemChoosed.run(item); - } + IRecyclerItemClicked onItemClickListener = (item, position) -> { + if (mOnItemChoosed != null) { + mOnItemChoosed.run(item); + } - dismiss(); - })); + dismiss(); + }; + + DialogChooseArtFromListaArtsAdapter mCurrentAdapter = new DialogChooseArtFromListaArtsAdapter( + requireContext(), dataset, this.mEnableSelection ? onItemClickListener : null); binding.dialogChooseArtFromListaArtMainList.setAdapter(mCurrentAdapter); } diff --git a/app/src/main/res/layout/activity_contab_doc_interni_edit.xml b/app/src/main/res/layout/activity_contab_doc_interni_edit.xml index d8eef804..18b4e323 100644 --- a/app/src/main/res/layout/activity_contab_doc_interni_edit.xml +++ b/app/src/main/res/layout/activity_contab_doc_interni_edit.xml @@ -1,9 +1,9 @@ - + xmlns:fab="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools"> @@ -24,15 +24,15 @@ android:layout_height="match_parent"> - + android:descendantFocusability="blocksDescendants" + android:orientation="vertical"> - + android:layout_gravity="start" + tools:text="@string/edit_doc" /> - - + android:orientation="vertical" + android:layout_toStartOf="@id/info_arts_button" + android:layout_alignParentStart="true"> - + android:orientation="horizontal"> - + + + + + - + android:orientation="horizontal"> - + + + + + + + + + + + + + + + + + + + + + + + + android:layout_alignParentEnd="true" + android:src="@drawable/ic_information_outline_24dp" + app:singleClick="@{() -> view.showInfoArtDialog()}" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + android:orientation="horizontal" + android:visibility="visible"> - + android:text="@string/scan_item" + android:textSize="16sp" /> + - + - + + android:orientation="horizontal" + app:singleClick="@{() -> view.showAvailableArts()}"> - - - + diff --git a/app/src/main/res/layout/fragment_doc_interni.xml b/app/src/main/res/layout/fragment_doc_interni.xml index 5be54fa0..05b3d5fe 100644 --- a/app/src/main/res/layout/fragment_doc_interni.xml +++ b/app/src/main/res/layout/fragment_doc_interni.xml @@ -38,176 +38,142 @@ android:orientation="vertical" android:paddingTop="8dp"> - + android:orientation="vertical"> - + android:orientation="horizontal"> - + + + + + + + + android:orientation="horizontal"> - + + + + + - + android:orientation="horizontal"> - + - + + + + + android:orientation="horizontal"> - + - - - - - - - - - - - - - - - + + - - - - - - - - - + + android:layout_height="match_parent"> + app:srcCompat="@drawable/ic_add_24dp" /> \ No newline at end of file diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 76d9f72e..a2bcc347 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -393,7 +393,7 @@ Fornitore Fornitore Elimina documento - Documento rif. : + Rif: Shelf life: Previsione di vendita Giacenza diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 10f3e776..b0093a67 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -399,7 +399,7 @@ Supplier Supplier Elimina documento - Reference doc.: + Ref: Shelf life: Sales prediction Stock