From d044c2ab264d362ab2fdf0cebf6af4b2da08e117 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Wed, 24 Feb 2021 12:47:33 +0100 Subject: [PATCH 1/2] Fix su dialog dismiss in DialogScanArt. Rivista implementazione di destroy fragment. --- .../integrywmsnative/MainActivity.java | 6 +++- .../core/expansion/BaseDialogFragment.java | 1 + .../core/interfaces/IDestroyableFragment.java | 7 +++++ .../core/interfaces/IScrollableFragment.java | 4 +-- .../core/interfaces/ITitledFragment.java | 4 +-- .../MainAccettazioneFragment.java | 14 +++------ .../gest/main/MainFragment.java | 17 ++++------ .../OrdiniUscitaElencoFragment.java | 31 +++++++++---------- .../picking_libero/PickingLiberoFragment.java | 19 +++++------- .../ProdOrdineProduzioneElencoFragment.java | 16 +++------- .../ProdFabbisognoLineeProdFragment.java | 19 +++++------- .../ProdRecuperoMaterialeFragment.java | 12 +++---- .../ProdVersamentoMaterialeFragment.java | 6 ++-- .../PVOrdiniAcquistoGrigliaFragment.java | 17 ++++------ .../RettificaGiacenzeFragment.java | 12 +++---- .../gest/settings/MainSettingsFragment.java | 9 +++--- .../UltimeConsegneClienteFragment.java | 15 +++------ .../UltimiArriviFornitoreFragment.java | 16 +++------- .../VersamentoMerceFragment.java | 6 ++-- .../dialogs/scan_art/DialogScanArtView.java | 15 +++++---- 20 files changed, 106 insertions(+), 140 deletions(-) create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/interfaces/IDestroyableFragment.java diff --git a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java index 3a68b859..84cdd772 100644 --- a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java @@ -289,6 +289,10 @@ public class MainActivity extends BaseActivity mBinding.appBarMain.toolbarTitleCenteredLayout.setVisibility(View.GONE); mBinding.appBarMain.toolbarTitleLeft.setVisibility(View.VISIBLE); ((ITitledFragment) fragment).onCreateActionBar(mBinding.appBarMain.toolbarTitleLeft, this); + ((IScrollableFragment) fragment).addOnPreDestroy(() -> { + mBinding.appBarMain.toolbarTitleCenteredLayout.setVisibility(View.VISIBLE); + mBinding.appBarMain.toolbarTitleLeft.setVisibility(View.GONE); + }); } else { mBinding.appBarMain.toolbarTitleCenteredLayout.setVisibility(View.VISIBLE); mBinding.appBarMain.toolbarTitleLeft.setVisibility(View.GONE); @@ -296,7 +300,7 @@ public class MainActivity extends BaseActivity if(fragment instanceof IScrollableFragment) { ((IScrollableFragment) fragment).setScrollToolbar(mBinding.appBarMain.elevatedToolbar); - ((IScrollableFragment) fragment).setScrollableOnPreDestroy(() -> { + ((IScrollableFragment) fragment).addOnPreDestroy(() -> { mBinding.appBarMain.elevatedToolbar.resetAll(); }); } 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 040932b7..5c7fc6d2 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 @@ -25,6 +25,7 @@ public class BaseDialogFragment extends DialogFragment { } } + private boolean isControlKey(KeyEvent keyEvent) { int keyCode = keyEvent.getKeyCode(); return ( diff --git a/app/src/main/java/it/integry/integrywmsnative/core/interfaces/IDestroyableFragment.java b/app/src/main/java/it/integry/integrywmsnative/core/interfaces/IDestroyableFragment.java new file mode 100644 index 00000000..c49cc63a --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/core/interfaces/IDestroyableFragment.java @@ -0,0 +1,7 @@ +package it.integry.integrywmsnative.core.interfaces; + +public interface IDestroyableFragment { + + void addOnPreDestroy(Runnable onPreDestroy); + +} diff --git a/app/src/main/java/it/integry/integrywmsnative/core/interfaces/IScrollableFragment.java b/app/src/main/java/it/integry/integrywmsnative/core/interfaces/IScrollableFragment.java index 8d425605..39cd7123 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/interfaces/IScrollableFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/interfaces/IScrollableFragment.java @@ -2,10 +2,8 @@ package it.integry.integrywmsnative.core.interfaces; import it.integry.integrywmsnative.ui.ElevatedToolbar; -public interface IScrollableFragment { +public interface IScrollableFragment extends IDestroyableFragment { void setScrollToolbar(ElevatedToolbar toolbar); - void setScrollableOnPreDestroy(Runnable onPreDestroy); - } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/interfaces/ITitledFragment.java b/app/src/main/java/it/integry/integrywmsnative/core/interfaces/ITitledFragment.java index b09cfc92..fbe45e8b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/interfaces/ITitledFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/interfaces/ITitledFragment.java @@ -8,10 +8,8 @@ import androidx.appcompat.widget.AppCompatTextView; * Created by GiuseppeS on 07/03/2018. */ -public interface ITitledFragment { +public interface ITitledFragment extends IDestroyableFragment { void onCreateActionBar(AppCompatTextView titleText, Context context); - void onActionBarPreDestroy(Runnable onActionBarPreDestroy); - } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java index cb5e2dd7..49744814 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java @@ -45,7 +45,7 @@ import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; public class MainAccettazioneFragment extends Fragment implements ISearcableFragment, ITitledFragment, IScrollableFragment { - private List mOnPreDestroyList = new ArrayList<>(); + private final List mOnPreDestroyList = new ArrayList<>(); private ElevatedToolbar mToolbar; private FragmentMainAccettazioneBinding mBinding; @@ -54,7 +54,7 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag private MainListAccettazioneAdapter mAdapter; private List mOriginalOrderList; - private List mRenderedOrderList = new ArrayList<>(); + private final List mRenderedOrderList = new ArrayList<>(); private AppCompatTextView mAppBarTitle; @@ -81,11 +81,6 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag mAppBarTitle.setText(context.getText(R.string.accettazione_title_fragment).toString()); } - @Override - public void onActionBarPreDestroy(Runnable onActionBarPreDestroy) { - this.mOnPreDestroyList.add(onActionBarPreDestroy); - } - @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -154,7 +149,7 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag - private RunnableArgs onSingleSelectionChanged = dto -> { + private final RunnableArgs onSingleSelectionChanged = dto -> { List selectedOrders = mHelper.getSelectedOrders(mOriginalOrderList); if(dto.isSelected()) { @@ -249,8 +244,9 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag mToolbar = toolbar; } + @Override - public void setScrollableOnPreDestroy(Runnable onPreDestroy) { + public void addOnPreDestroy(Runnable onPreDestroy) { this.mOnPreDestroyList.add(onPreDestroy); } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java index 10f68457..ab5304ed 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java @@ -50,7 +50,7 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab private FragmentMainBinding mBindings; - private List mOnPreDestroyList = new ArrayList<>(); + private final List mOnPreDestroyList = new ArrayList<>(); private ElevatedToolbar mToolbar; private LayoutInflater mLayoutInflater; @@ -210,21 +210,11 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab titleText.setText(context.getText(R.string.app_name).toString()); } - @Override - public void onActionBarPreDestroy(Runnable onActionBarPreDestroy) { - this.mOnPreDestroyList.add(onActionBarPreDestroy); - } - @Override public void setScrollToolbar(ElevatedToolbar toolbar) { mToolbar = toolbar; } - @Override - public void setScrollableOnPreDestroy(Runnable onPreDestroy) { - mOnPreDestroyList.add(onPreDestroy); - } - private void initGestMenu() { ICustomConfiguration customConfiguration = ClassRouter.getInstance(ClassRouter.PATH.CUSTOM_CONFIGURATION); @@ -264,4 +254,9 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab String appVersion = UtilityResources.getAppVersion(); mBindings.currentAppVersionName.setText("v" + appVersion); } + + @Override + public void addOnPreDestroy(Runnable onPreDestroy) { + this.mOnPreDestroyList.add(onPreDestroy); + } } 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 f120be33..16b6fc43 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 @@ -64,14 +64,14 @@ public class OrdiniUscitaElencoFragment extends Fragment implements ITitledFragm private FragmentMainOrdiniUscitaBinding mBindings = null; - private ObservableArrayList mOrdiniInevasiMutableData = new ObservableArrayList<>(); + private final ObservableArrayList mOrdiniInevasiMutableData = new ObservableArrayList<>(); private GestioneEnum mCurrentGestioneOrd = null; private GestioneEnum mCurrentGestioneCol = null; private int mCurrentSegnoCol = 0; private ElevatedToolbar mToolbar; - private List mOnPreDestroyList = new ArrayList<>(); + private final List mOnPreDestroyList = new ArrayList<>(); private int barcodeScannerIstanceID = -1; private Dialog mCurrentProgress; @@ -133,6 +133,14 @@ public class OrdiniUscitaElencoFragment extends Fragment implements ITitledFragm mViewModel.init(codMdep, mCurrentGestioneOrd, mCurrentGestioneCol, mCurrentSegnoCol); } + @Override + public void onDestroy() { + for (Runnable onPreDestroy : mOnPreDestroyList) { + onPreDestroy.run(); + } + super.onDestroy(); + } + private void initRecyclerView() { boolean canSelectMultipleOrdini = SettingsManager.iDB().isFlagSpedizioneCanSelectMultipleOrders(); @@ -247,10 +255,6 @@ public class OrdiniUscitaElencoFragment extends Fragment implements ITitledFragm @Override public void onPreDestroy(Runnable onComplete) { - for (Runnable onPreDestroy : mOnPreDestroyList) { - onPreDestroy.run(); - } - BarcodeManager.removeCallback(barcodeScannerIstanceID); onComplete.run(); } @@ -260,11 +264,6 @@ public class OrdiniUscitaElencoFragment extends Fragment implements ITitledFragm titleText.setText(context.getText(R.string.prod_ordine_lavorazione_title_fragment).toString()); } - @Override - public void onActionBarPreDestroy(Runnable onActionBarPreDestroy) { - this.mOnPreDestroyList.add(onActionBarPreDestroy); - } - public void dispatchOrders() { List selectedOrders = Stream.of(this.mOrdiniInevasiMutableData) @@ -345,11 +344,6 @@ public class OrdiniUscitaElencoFragment extends Fragment implements ITitledFragm mToolbar = toolbar; } - @Override - public void setScrollableOnPreDestroy(Runnable onPreDestroy) { - this.mOnPreDestroyList.add(onPreDestroy); - } - @Override public boolean isSelectAllButtonEnabled() { return SettingsManager.iDB().isFlagMultiClienteOrdV(); @@ -389,4 +383,9 @@ public class OrdiniUscitaElencoFragment extends Fragment implements ITitledFragm }).show(); } + + @Override + public void addOnPreDestroy(Runnable onPreDestroy) { + this.mOnPreDestroyList.add(onPreDestroy); + } } 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 bee7a7d6..1e8c5749 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 @@ -108,11 +108,6 @@ public class PickingLiberoFragment extends Fragment implements ITitledFragment, mToolbarTitleText.setText(context.getText(R.string.free_picking_title_fragment).toString()); } - @Override - public void onActionBarPreDestroy(Runnable onActionBarPreDestroy) { - this.mOnPreDestroyList.add(onActionBarPreDestroy); - } - @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -236,11 +231,11 @@ public class PickingLiberoFragment extends Fragment implements ITitledFragment, } @Override - public void onDestroyView() { + public void onDestroy() { for (Runnable onPreDestroy : mOnPreDestroyList) { onPreDestroy.run(); } - super.onDestroyView(); + super.onDestroy(); } @Override @@ -248,11 +243,6 @@ public class PickingLiberoFragment extends Fragment implements ITitledFragment, mToolbar = toolbar; } - @Override - public void setScrollableOnPreDestroy(Runnable onPreDestroy) { - mOnPreDestroyList.add(onPreDestroy); - } - @Override public void onLoadingStarted() { @@ -413,4 +403,9 @@ public class PickingLiberoFragment extends Fragment implements ITitledFragment, if(thereIsAnOpenedUL.get()) mViewModel.closeLU(onComplete); else onComplete.run(); } + + @Override + public void addOnPreDestroy(Runnable onPreDestroy) { + this.mOnPreDestroyList.add(onPreDestroy); + } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java index 654be68a..1cdc39ef 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java @@ -117,11 +117,6 @@ public class ProdOrdineProduzioneElencoFragment extends Fragment implements ITit mAppBarTitle.setText(context.getText(R.string.prod_ordine_produzione_title_fragment).toString()); } - @Override - public void onActionBarPreDestroy(Runnable onActionBarPreDestroy) { - this.mOnPreDestroyList.add(onActionBarPreDestroy); - } - private void init() { final Dialog progress = UtilityProgress.createDefaultProgressDialog(getActivity()); @@ -152,12 +147,6 @@ public class ProdOrdineProduzioneElencoFragment extends Fragment implements ITit mToolbar = toolbar; } - @Override - public void setScrollableOnPreDestroy(Runnable onPreDestroy) { - mOnPreDestroyList.add(onPreDestroy); - } - - private void initRecyclerView() { mAdapter = new OrdineProduzioneListAdapter(getActivity(), mRenderedOrderList, onSingleSelectionChanged); mBinding.ordineProduzioneMainList.setAdapter(mAdapter); @@ -260,4 +249,9 @@ public class ProdOrdineProduzioneElencoFragment extends Fragment implements ITit mRenderedOrderList.clear(); mRenderedOrderList.addAll(ordini); } + + @Override + public void addOnPreDestroy(Runnable onPreDestroy) { + this.mOnPreDestroyList.add(onPreDestroy); + } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java index ddd08305..d4b63ed8 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java @@ -20,7 +20,6 @@ import javax.inject.Inject; import it.integry.integrywmsnative.MainApplication; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.expansion.BaseFragment; -import it.integry.integrywmsnative.core.interfaces.ILifecycleFragment; import it.integry.integrywmsnative.core.interfaces.IPoppableActivity; import it.integry.integrywmsnative.core.interfaces.ITitledFragment; import it.integry.integrywmsnative.core.model.MtbColr; @@ -38,12 +37,12 @@ import it.integry.integrywmsnative.gest.spedizione.SpedizioneActivity; * Use the {@link ProdFabbisognoLineeProdFragment#newInstance} factory method to * create an instance of this fragment. */ -public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITitledFragment, ILifecycleFragment, ProdFabbisognoLineeProdViewModel.Listener { +public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITitledFragment, ProdFabbisognoLineeProdViewModel.Listener { @Inject ProdFabbisognoLineeProdViewModel mViewModel; - private ArrayList mOnPreDestroyList = new ArrayList<>(); + private final ArrayList mOnPreDestroyList = new ArrayList<>(); private FragmentProdFabbisognoLineeProdBinding mBindings; @@ -97,10 +96,6 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi .show(getActivity().getSupportFragmentManager(), "tag"); } - @Override - public void onPreDestroy(Runnable onPreDestroy) { - this.mOnPreDestroyList.add(onPreDestroy); - } @Override public void onDestroy() { @@ -116,11 +111,6 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi titleText.setText(context.getText(R.string.prod_fabbisogno_linee_prod_title).toString()); } - @Override - public void onActionBarPreDestroy(Runnable onActionBarPreDestroy) { - this.mOnPreDestroyList.add(onActionBarPreDestroy); - } - @Override public void onError(Exception ex) { @@ -159,4 +149,9 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi ((IPoppableActivity) getActivity()).pop(); } + + @Override + public void addOnPreDestroy(Runnable onPreDestroy) { + this.mOnPreDestroyList.add(onPreDestroy); + } } \ No newline at end of file diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java index 3252de17..3fa9b3d9 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java @@ -29,7 +29,7 @@ public class ProdRecuperoMaterialeFragment extends Fragment implements ITitledFr private ProdRecuperoMaterialeViewModel mViewmodel; private ProdRecuperoMaterialeHelper mHelper; - private List mOnPreDestroyList = new ArrayList<>(); + private final List mOnPreDestroyList = new ArrayList<>(); public ProdRecuperoMaterialeFragment() { // Required empty public constructor @@ -72,12 +72,6 @@ public class ProdRecuperoMaterialeFragment extends Fragment implements ITitledFr titleText.setText(context.getText(R.string.prod_recupero_materiale_title_fragment).toString()); } - @Override - public void onActionBarPreDestroy(Runnable onActionBarPreDestroy) { - this.mOnPreDestroyList.add(onActionBarPreDestroy); - } - - @Override public void onDestroy() { for (Runnable onPreDestroy : mOnPreDestroyList) { @@ -86,4 +80,8 @@ public class ProdRecuperoMaterialeFragment extends Fragment implements ITitledFr super.onDestroy(); } + @Override + public void addOnPreDestroy(Runnable onPreDestroy) { + this.mOnPreDestroyList.add(onPreDestroy); + } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeFragment.java index b704c7d2..3f941bf7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeFragment.java @@ -26,7 +26,7 @@ public class ProdVersamentoMaterialeFragment extends Fragment implements ITitled private ProdVersamentoMaterialViewModel mViewmodel; private ProdVersamentoMaterialHelper mHelper; - private List mOnPreDestroyList = new ArrayList<>(); + private final List mOnPreDestroyList = new ArrayList<>(); public ProdVersamentoMaterialeFragment() { // Required empty public constructor @@ -87,7 +87,7 @@ public class ProdVersamentoMaterialeFragment extends Fragment implements ITitled } @Override - public void onActionBarPreDestroy(Runnable onActionBarPreDestroy) { - this.mOnPreDestroyList.add(onActionBarPreDestroy); + public void addOnPreDestroy(Runnable onPreDestroy) { + this.mOnPreDestroyList.add(onPreDestroy); } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/PVOrdiniAcquistoGrigliaFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/PVOrdiniAcquistoGrigliaFragment.java index d2cdddbe..951b1313 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/PVOrdiniAcquistoGrigliaFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/PVOrdiniAcquistoGrigliaFragment.java @@ -55,7 +55,7 @@ public class PVOrdiniAcquistoGrigliaFragment extends Fragment implements ITitled private OrdineAcquistoPvHelper mHelper; private Griglia mGriglia; private OrdineAcquistoPvOpenListAdapter mAdapter; - private List mRenderedOrderList = new ArrayList<>(); + private final List mRenderedOrderList = new ArrayList<>(); private boolean mRedirectToNewOrder = true; private final List mOnPreDestroyList = new ArrayList<>(); @@ -122,11 +122,6 @@ public class PVOrdiniAcquistoGrigliaFragment extends Fragment implements ITitled titleText.setText(context.getText(R.string.pv_elenco_ordiniA_title_fragment).toString()); } - @Override - public void onActionBarPreDestroy(Runnable onActionBarPreDestroy) { - this.mOnPreDestroyList.add(onActionBarPreDestroy); - } - private void setGriglia(Griglia griglia) { mGriglia = griglia; mBinding.fabNewOrder.setVisibility(View.VISIBLE); @@ -238,11 +233,6 @@ public class PVOrdiniAcquistoGrigliaFragment extends Fragment implements ITitled } - @Override - public void setScrollableOnPreDestroy(Runnable onPreDestroy) { - this.mOnPreDestroyList.add(onPreDestroy); - } - @Override public void onResume() { super.onResume(); @@ -259,4 +249,9 @@ public class PVOrdiniAcquistoGrigliaFragment extends Fragment implements ITitled onPreDestroy.run(); } } + + @Override + public void addOnPreDestroy(Runnable onPreDestroy) { + this.mOnPreDestroyList.add(onPreDestroy); + } } 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 6cdeb3a4..9d5a3a84 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 @@ -215,11 +215,6 @@ public class RettificaGiacenzeFragment extends Fragment implements ITitledFragme titleText.setText(context.getText(R.string.rettifica_giacenze_fragment_title).toString()); } - @Override - public void onActionBarPreDestroy(Runnable onActionBarPreDestroy) { - this.mOnPreDestroyList.add(onActionBarPreDestroy); - } - private final RunnableArgs onScanSuccessful = data -> { BarcodeManager.disable(); @@ -527,7 +522,12 @@ public class RettificaGiacenzeFragment extends Fragment implements ITitledFragme @Override public void onPreDestroy(Runnable onComplete) { - mViewModel.closeLU(false, onComplete); BarcodeManager.removeCallback(barcodeScannerIstanceID); + mViewModel.closeLU(false, onComplete); + } + + @Override + public void addOnPreDestroy(Runnable onPreDestroy) { + this.mOnPreDestroyList.add(onPreDestroy); } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java index 1da7d703..2d2e612a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java @@ -18,14 +18,13 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT titleText.setText(context.getText(R.string.settings_category).toString()); } - @Override - public void onActionBarPreDestroy(Runnable onActionBarPreDestroy) { - - } - @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { setPreferencesFromResource(R.xml.app_preferences, rootKey); } + @Override + public void addOnPreDestroy(Runnable onPreDestroy) { + + } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteFragment.java index 6290cdcf..084b8c01 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteFragment.java @@ -71,23 +71,18 @@ public class UltimeConsegneClienteFragment extends Fragment implements ITitledFr titleText.setText(context.getText(R.string.ultime_consegne_cliente_title).toString()); } - @Override - public void onActionBarPreDestroy(Runnable onActionBarPreDestroy) { - this.mOnPreDestroyList.add(onActionBarPreDestroy); - } - @Override public void setScrollToolbar(ElevatedToolbar toolbar) { mToolbar = toolbar; } - @Override - public void setScrollableOnPreDestroy(Runnable onPreDestroy) { - this.mOnPreDestroyList.add(onPreDestroy); - } - @Override public void onFilterClick() { mViewModel.openFilterDialog(); } + + @Override + public void addOnPreDestroy(Runnable onPreDestroy) { + this.mOnPreDestroyList.add(onPreDestroy); + } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/UltimiArriviFornitoreFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/UltimiArriviFornitoreFragment.java index 592be001..a5716dd9 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/UltimiArriviFornitoreFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/UltimiArriviFornitoreFragment.java @@ -27,7 +27,7 @@ import it.integry.integrywmsnative.ui.ElevatedToolbar; */ public class UltimiArriviFornitoreFragment extends Fragment implements ITitledFragment, IScrollableFragment, IFilterableFragment { - private List mOnPreDestroyList = new ArrayList<>(); + private final List mOnPreDestroyList = new ArrayList<>(); private ElevatedToolbar mToolbar; private UltimiArriviFornitoreViewModel mViewModel; @@ -74,20 +74,11 @@ public class UltimiArriviFornitoreFragment extends Fragment implements ITitledFr titleText.setText(context.getText(R.string.ultime_arrivi_fornitore_title).toString()); } - @Override - public void onActionBarPreDestroy(Runnable onActionBarPreDestroy) { - this.mOnPreDestroyList.add(onActionBarPreDestroy); - } - @Override public void setScrollToolbar(ElevatedToolbar toolbar) { mToolbar = toolbar; } - @Override - public void setScrollableOnPreDestroy(Runnable onPreDestroy) { - this.mOnPreDestroyList.add(onPreDestroy); - } @@ -98,5 +89,8 @@ public class UltimiArriviFornitoreFragment extends Fragment implements ITitledFr } - + @Override + public void addOnPreDestroy(Runnable onPreDestroy) { + this.mOnPreDestroyList.add(onPreDestroy); + } } 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 40123dfd..81f39127 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 @@ -29,7 +29,7 @@ public class VersamentoMerceFragment extends Fragment implements ITitledFragment private VersamentoMerceViewModel mVersamentoMerceViewModel; private VersamentoMerceHelper mHelper; - private List mOnPreDestroyList = new ArrayList<>(); + private final List mOnPreDestroyList = new ArrayList<>(); private int barcodeScannerIstanceID = -1; @@ -92,7 +92,7 @@ public class VersamentoMerceFragment extends Fragment implements ITitledFragment } @Override - public void onActionBarPreDestroy(Runnable onActionBarPreDestroy) { - this.mOnPreDestroyList.add(onActionBarPreDestroy); + public void addOnPreDestroy(Runnable onPreDestroy) { + this.mOnPreDestroyList.add(onPreDestroy); } } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtView.java index 5586b4c4..16ce8a63 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtView.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtView.java @@ -1,6 +1,7 @@ package it.integry.integrywmsnative.view.dialogs.scan_art; import android.content.Context; +import android.content.DialogInterface; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; @@ -79,17 +80,19 @@ public class DialogScanArtView extends BaseDialogFragment implements DialogScanA dismiss(); }); - - getDialog().setOnDismissListener(dialog -> { - BarcodeManager.removeCallback(mBarcodeScannerIstanceID); - BarcodeManager.enable(); - }); - return mBindings.getRoot(); } + @Override + public void onDismiss(@NonNull DialogInterface dialog) { + BarcodeManager.removeCallback(mBarcodeScannerIstanceID); + BarcodeManager.enable(); + super.onDismiss(dialog); + } + + private void initBarcode() { mBarcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO() .setOnScanSuccessfull(onScanSuccessfull) From e9230aba11f8091a7c963d1a079c1dc61a7ae5ed Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Wed, 24 Feb 2021 12:48:03 +0100 Subject: [PATCH 2/2] -> v1.16.9 (191) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bcdb4a76..f2ccdbd3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 190 - def appVersionName = '1.16.8' + def appVersionCode = 191 + def appVersionName = '1.16.9' signingConfigs { release {