From 029979c4631674ff83e20239b0440abe9a3ef9be Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 27 Mar 2023 11:40:32 +0200 Subject: [PATCH 1/2] Fix su cancelable del dialogProgress --- .../core/expansion/BaseDialogFragment.java | 14 ++++++++++++++ .../core/utility/UtilityProgress.java | 16 ---------------- .../dialog/DialogSelectDocInfoView.java | 8 ++++---- .../DialogAskInfoInventarioView.java | 6 +++--- .../DialogInfoSituazioneArticoloView.java | 6 +++--- .../view/dialogs/DialogProgressView.java | 2 ++ .../DialogChooseArtsFromMtbAartListView.java | 6 +++--- .../DialogChooseArtsFromMtbColrList.java | 6 +++--- .../input_peso_lu/DialogInputPesoLUView.java | 6 +++--- 9 files changed, 35 insertions(+), 35 deletions(-) delete mode 100644 app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityProgress.java 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 5eb85b89..00396013 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 @@ -27,6 +27,20 @@ public class BaseDialogFragment extends DialogFragment implements DialogInterfac private boolean mBarcodeListener = false; + private boolean cancelable = true; + + + @Override + public boolean isCancelable() { + return cancelable; + } + + + @Override + public void setCancelable(boolean cancelable) { + super.setCancelable(cancelable); + this.cancelable = cancelable; + } @Override public void show(FragmentManager manager, String tag) { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityProgress.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityProgress.java deleted file mode 100644 index 88197d06..00000000 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityProgress.java +++ /dev/null @@ -1,16 +0,0 @@ -package it.integry.integrywmsnative.core.utility; - -import androidx.fragment.app.FragmentActivity; - -import it.integry.integrywmsnative.view.dialogs.DialogProgressView; - -public class UtilityProgress { - - public static DialogProgressView createDefaultProgressDialog(FragmentActivity mContext) { - var progress = DialogProgressView.newInstance(null, null, true); - progress.show(mContext.getSupportFragmentManager(), "tag"); - return progress; - } - - -} 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 1f0ffbd5..ff08bcdd 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 @@ -90,17 +90,17 @@ public class DialogSelectDocInfoView extends BaseDialogFragment { .create() .inject(this); + setCancelable(false); + mBindings = DialogSelectDocInfoViewBinding.inflate(LayoutInflater.from(this.mContext), null, false); mBindings.setLifecycleOwner(this); mBindings.setView(this); mViewModel.setFornitori(mDocInputData.getFornitori()); - var cancelable = false; - var alertDialog = new MaterialAlertDialogBuilder(this.mContext) .setView(mBindings.getRoot()) - .setCancelable(cancelable) + .setCancelable(isCancelable()) .setPositiveButton(R.string.confirm, (dialog, which) -> { //Volutamente vuoto }) @@ -110,7 +110,7 @@ public class DialogSelectDocInfoView extends BaseDialogFragment { .create(); alertDialog.setOnShowListener(this); - alertDialog.setCanceledOnTouchOutside(cancelable); + alertDialog.setCanceledOnTouchOutside(isCancelable()); alertDialog.setOnDismissListener(this); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/dialogs/ask_info_inventario/DialogAskInfoInventarioView.java b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/dialogs/ask_info_inventario/DialogAskInfoInventarioView.java index 6d537e63..d61ca8ef 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/dialogs/ask_info_inventario/DialogAskInfoInventarioView.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/dialogs/ask_info_inventario/DialogAskInfoInventarioView.java @@ -63,11 +63,11 @@ public class DialogAskInfoInventarioView extends BaseDialogFragment { .create() .inject(this); - var cancelable = true; + setCancelable(true); var alertDialog = new MaterialAlertDialogBuilder(this.mContext) .setView(mBindings.getRoot()) - .setCancelable(cancelable) + .setCancelable(isCancelable()) .setPositiveButton(R.string.ok, (dialog, which) -> { var zone = UtilityString.empty2null(this.zone.get()); if(zone != null) zone = StringUtils.capitalize(zone); @@ -81,7 +81,7 @@ public class DialogAskInfoInventarioView extends BaseDialogFragment { }) .create(); - alertDialog.setCanceledOnTouchOutside(cancelable); + alertDialog.setCanceledOnTouchOutside(isCancelable()); alertDialog.setOnShowListener(this); return alertDialog; } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/dialogs/row_info/info_situazione_articolo/DialogInfoSituazioneArticoloView.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/dialogs/row_info/info_situazione_articolo/DialogInfoSituazioneArticoloView.java index 349259e7..e0add105 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/dialogs/row_info/info_situazione_articolo/DialogInfoSituazioneArticoloView.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/dialogs/row_info/info_situazione_articolo/DialogInfoSituazioneArticoloView.java @@ -62,15 +62,15 @@ public class DialogInfoSituazioneArticoloView extends BaseDialogRowInfoView { .create() .inject(this); - var cancelable = true; + setCancelable(true); var alertDialog = new MaterialAlertDialogBuilder(this.mContext) .setView(mBindings.getRoot()) .setNeutralButton(R.string.action_close, null) - .setCancelable(cancelable) + .setCancelable(isCancelable()) .create(); - alertDialog.setCanceledOnTouchOutside(cancelable); + alertDialog.setCanceledOnTouchOutside(isCancelable()); alertDialog.setOnShowListener(this); return alertDialog; } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java index 5fd6a1f4..6ec042e1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java @@ -56,6 +56,8 @@ public class DialogProgressView extends DialogFragment { .setCancelable(false) .create(); alertDialog.setCanceledOnTouchOutside(false); + + setCancelable(false); return alertDialog; } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromMtbAartListView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromMtbAartListView.java index 965ef399..042b573b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromMtbAartListView.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromMtbAartListView.java @@ -68,11 +68,11 @@ public class DialogChooseArtsFromMtbAartListView extends BaseDialogFragment impl .inject(this); - var cancelable = false; + setCancelable(false); var alertDialog = new MaterialAlertDialogBuilder(this.mContext) .setView(mBindings.getRoot()) - .setCancelable(cancelable) + .setCancelable(isCancelable()) .setPositiveButton(R.string.ok, (dialog, which) -> { var selectedArts = Stream.of(this.artsItemModels) .filter(x -> x.getSelected().get()) @@ -96,7 +96,7 @@ public class DialogChooseArtsFromMtbAartListView extends BaseDialogFragment impl alertDialog.setOnShowListener(this); - alertDialog.setCanceledOnTouchOutside(cancelable); + alertDialog.setCanceledOnTouchOutside(isCancelable()); return alertDialog; } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_mtbcolr_list/DialogChooseArtsFromMtbColrList.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_mtbcolr_list/DialogChooseArtsFromMtbColrList.java index 7b2dfd77..6bf86844 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_mtbcolr_list/DialogChooseArtsFromMtbColrList.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_mtbcolr_list/DialogChooseArtsFromMtbColrList.java @@ -111,11 +111,11 @@ public class DialogChooseArtsFromMtbColrList extends BaseDialogFragment implemen .create() .inject(this); - var cancelable = false; + setCancelable(false); var alertDialog = new MaterialAlertDialogBuilder(this.mContext) .setView(mBindings.getRoot()) - .setCancelable(cancelable) + .setCancelable(isCancelable()) .setPositiveButton(R.string.ok, (dialog, which) -> { var selectedArts = Stream.of(this.mtbColrItemModels) .filter(x -> x.getChecked().get()) @@ -137,7 +137,7 @@ public class DialogChooseArtsFromMtbColrList extends BaseDialogFragment implemen alertDialog.setOnShowListener(this); - alertDialog.setCanceledOnTouchOutside(cancelable); + alertDialog.setCanceledOnTouchOutside(isCancelable()); return alertDialog; } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUView.java index c70ee8a5..b2e7a787 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUView.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUView.java @@ -82,14 +82,14 @@ public class DialogInputPesoLUView extends BaseDialogFragment { this.init(); - var cancelable = false; + setCancelable(false); var alertDialog = new MaterialAlertDialogBuilder(this.mContext) .setView(mBindings.getRoot()) - .setCancelable(cancelable) + .setCancelable(isCancelable()) .create(); - alertDialog.setCanceledOnTouchOutside(cancelable); + alertDialog.setCanceledOnTouchOutside(isCancelable()); alertDialog.setOnShowListener(this); return alertDialog; } From 95f282cd4dceab95884019cc9943ccf42799a50c Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 27 Mar 2023 11:41:23 +0200 Subject: [PATCH 2/2] -> v1.32.20 (360) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index eb4b5704..989b3895 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 359 - def appVersionName = '1.32.19' + def appVersionCode = 360 + def appVersionName = '1.32.20' signingConfigs { release {