From 79afe0155b51defe4ed1f3e93f5d8507943726e9 Mon Sep 17 00:00:00 2001 From: ValerioC Date: Thu, 6 Oct 2022 15:48:45 +0200 Subject: [PATCH 1/3] boh --- .../gest/rettifica_giacenze/RettificaGiacenzeFragment.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 3f19c8aa..ccbe0504 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,9 +215,7 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr private final RunnableArgs onScanSuccessful = data -> { this.onLoadingStarted(); - this.mViewModel.processBarcodeDTO(data, () -> { - this.onLoadingEnded(); - }); + this.mViewModel.processBarcodeDTO(data, this::onLoadingEnded); }; @@ -502,7 +500,7 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr @Override public void onPreDestroy(Runnable onComplete) { - if(mViewModel.getCurrentMtbColt() != null) + if (mViewModel.getCurrentMtbColt() != null) mViewModel.closeLU(false); else { BarcodeManager.removeCallback(barcodeScannerIstanceID); From 48548b7c92292ffef86e9623204eac6b73f5e1f9 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 6 Oct 2022 16:56:35 +0200 Subject: [PATCH 2/3] Prova fix su dialog progress --- .../integry/integrywmsnative/core/expansion/BaseFragment.java | 2 +- .../integrywmsnative/view/dialogs/DialogProgressView.java | 4 +++- app/src/main/res/layout/dialog_yes_no.xml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java index b3ac95dc..c18ae504 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java @@ -76,7 +76,7 @@ public abstract class BaseFragment extends Fragment { if (progressOpened) { this.progressOpened = false; requireActivity().runOnUiThread(() -> { - mCurrentProgress.dismiss(); + mCurrentProgress.dismissAllowingStateLoss(); }); } } 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 be4fabb7..5fd6a1f4 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 @@ -51,10 +51,12 @@ public class DialogProgressView extends DialogFragment { mBindings.progressBar.setIndeterminate(isIndeterminateProgress()); if (!isIndeterminateProgress()) mBindings.progressBar.setMax(100); - return new MaterialAlertDialogBuilder(requireContext()) + var alertDialog = new MaterialAlertDialogBuilder(requireContext()) .setView(mBindings.getRoot()) .setCancelable(false) .create(); + alertDialog.setCanceledOnTouchOutside(false); + return alertDialog; } public String getTitle() { diff --git a/app/src/main/res/layout/dialog_yes_no.xml b/app/src/main/res/layout/dialog_yes_no.xml index bef4c0de..1b25788f 100644 --- a/app/src/main/res/layout/dialog_yes_no.xml +++ b/app/src/main/res/layout/dialog_yes_no.xml @@ -5,7 +5,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - app:cardCornerRadius="12dp" + app:cardCornerRadius="16dp" app:cardElevation="0dp"> From 439eada61bbb5adf696a886edf08520422825850 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 6 Oct 2022 16:59:09 +0200 Subject: [PATCH 3/3] -> v1.29.8 (312) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bccc041d..3ae1b17c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 311 - def appVersionName = '1.29.7' + def appVersionCode = 312 + def appVersionName = '1.29.8' signingConfigs { release {