From 7d130ae1ebc8a073e490335d8da4065fb71b9d4c Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 20 Jun 2025 09:54:43 +0200 Subject: [PATCH] Refactoring message dialog --- .../integrywmsnative/SplashActivity.java | 4 +- .../integrywmsnative/core/di/Converters.java | 39 +++--- .../core/utility/UtilityExceptions.java | 31 ++-- .../AccettazioneBollaPickingActivity.java | 50 ++++--- .../MainAccettazioneOrdiniElencoFragment.java | 45 +++--- .../AccettazioneOrdiniPickingActivity.java | 26 +++- .../DocInterniFragment.java | 7 +- .../edit_form/DocInterniEditFormActivity.java | 2 +- .../ContenutoBancaleActivity.java | 59 ++++---- .../gest/login/LoginActivity.java | 6 +- .../OrdiniUscitaElencoFragment.java | 47 ++++--- .../picking_libero/PickingLiberoFragment.java | 17 ++- .../picking_resi/PickingResiActivity.java | 27 ++-- .../ProdOrdineProduzioneElencoFragment.java | 45 +++--- .../ProdDettaglioLineaActivity.java | 24 ++-- .../ProdLineeProduzioneFragment.java | 7 +- .../ProdRecuperoMaterialeFragment.java | 32 +++-- .../ProdRientroMerceFragment.java | 18 +-- .../ProdVersamentoMaterialeFragment.java | 8 +- ...odVersamentoMaterialeInBufferFragment.java | 11 +- .../PVOrdineAcquistoEditActivity.java | 51 ++++--- .../edit_articolo/DialogEditArticoloView.java | 15 +- .../PVOrdiniAcquistoGrigliaFragment.java | 51 ++++--- .../RettificaGiacenzeFragment.java | 132 ++++++++++-------- .../gest/spedizione/SpedizioneActivity.java | 43 +++--- .../VersamentoMerceFragment.java | 21 +-- .../view/dialogs/DialogCommon.java | 21 ++- .../dialogs/base/DialogSimpleMessageView.java | 88 ++++++------ .../DialogChooseArtsFromMtbColrListView.java | 4 +- .../DialogInputQuantityV2View.java | 14 +- .../DialogScanOrCreateLUView.java | 17 ++- .../dialog_input_quantity_v2.xml | 1 - .../res/layout/dialog_input_quantity_v2.xml | 1 - .../layout/dialog_select_doc_info_view.xml | 3 +- ...dialog_ultime_consegne_filtro_avanzato.xml | 1 + ...ltimi_arrivi_fornitore_filtro_avanzato.xml | 3 +- 36 files changed, 543 insertions(+), 428 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java b/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java index 8527b644..838a517c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java @@ -156,11 +156,11 @@ public class SplashActivity extends BaseActivity implements MainContext.Listener @Override public void onError(Spanned message) { handler.post(() -> { - DialogSimpleMessageView.makeErrorDialog( + DialogSimpleMessageView.makeErrorDialog(this, message, null, this::finish, R.string.logout, () -> { this.mainContext.logout(MainApplication::exit); }) - .show(this.getSupportFragmentManager(), "tag"); + .show(); }); } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java b/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java index 7c2f695e..505e3837 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java @@ -25,7 +25,6 @@ import androidx.databinding.BindingAdapter; import androidx.databinding.BindingConversion; import androidx.databinding.Observable; import androidx.databinding.ObservableField; -import androidx.fragment.app.DialogFragment; import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; @@ -48,8 +47,8 @@ import java.util.Locale; import it.integry.integrywmsnative.MainApplication; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.expansion.BaseDialogFragment; import it.integry.integrywmsnative.core.expansion.RunnableArgs; +import it.integry.integrywmsnative.core.helper.ContextHelper; import it.integry.integrywmsnative.core.utility.UtilityBigDecimal; import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityNumber; @@ -476,8 +475,8 @@ public class Converters { } - @BindingAdapter(value = {"binding", "parentView", "warningOnOldDates"}, requireAll = false) - public static void bindTextInputEditTextDate(TextInputEditText view, final ObservableField observableDate, DialogFragment parentFragment, boolean warningOnOldDates) { + @BindingAdapter(value = {"binding", "warningOnOldDates"}, requireAll = false) + public static void bindTextInputEditTextDate(TextInputEditText view, final ObservableField observableDate, boolean warningOnOldDates) { Pair, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable); if (pair == null || pair.first != observableDate) { if (pair != null) { @@ -512,15 +511,15 @@ public class Converters { var calendar = UtilityDate.getCalendarInstance(); calendar.setTimeInMillis(timeInMillis); - if (parentFragment != null && warningOnOldDates && calendar.before(UtilityDate.getCalendarInstance())) { + if (warningOnOldDates && calendar.before(UtilityDate.getCalendarInstance())) { DialogSimpleMessageView - .makeWarningDialog(new SpannableString("Hai scelto una data precedente a quella odierna. Continuare?"), null, () -> { + .makeWarningDialog(view.getContext(), new SpannableString("Hai scelto una data precedente a quella odierna. Continuare?"), null, () -> { view.setText(UtilityDate.formatDate(calendar.getTime(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)); observableDate.set(calendar.getTime()); }, () -> { }) - .show(parentFragment.requireActivity().getSupportFragmentManager(), "tag"); + .show(); } else { view.setText(UtilityDate.formatDate(calendar.getTime(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)); observableDate.set(calendar.getTime()); @@ -532,7 +531,7 @@ public class Converters { } }); - datePicker.show(parentFragment.requireActivity().getSupportFragmentManager(), "tag"); + datePicker.show(ContextHelper.getFragmentManagerFromContext(view.getContext()), "tag"); }; //Adding click-listener @@ -547,8 +546,8 @@ public class Converters { } - @BindingAdapter(value = {"binding", "parentView", "warningOnOldDates"}, requireAll = false) - public static void bindTextInputEditTextDate(TextInputEditText view, final MutableLiveData liveDataDate, BaseDialogFragment parentFragment, boolean warningOnOldDates) { + @BindingAdapter(value = {"binding", "warningOnOldDates"}, requireAll = false) + public static void bindTextInputEditTextDate(TextInputEditText view, final MutableLiveData liveDataDate, boolean warningOnOldDates) { // Ottieni il LifecycleOwner dalla view LifecycleOwner lifecycleOwner = ViewTreeLifecycleOwner.get(view); if (lifecycleOwner == null) { @@ -592,14 +591,14 @@ public class Converters { calendar.setTimeInMillis(selection); Date selectedDate = calendar.getTime(); - if (parentFragment != null && warningOnOldDates && calendar.before(UtilityDate.getCalendarInstance())) { + if (warningOnOldDates && calendar.before(UtilityDate.getCalendarInstance())) { DialogSimpleMessageView - .makeWarningDialog(new SpannableString("Hai scelto una data precedente a quella odierna. Continuare?"), null, () -> { + .makeWarningDialog(view.getContext(), new SpannableString("Hai scelto una data precedente a quella odierna. Continuare?"), null, () -> { liveDataDate.postValue(selectedDate); }, () -> { // Non fare nulla se l'utente annulla }) - .show(parentFragment.requireActivity().getSupportFragmentManager(), "DatePickerWarningDialog"); + .show(); } else { liveDataDate.postValue(selectedDate); } @@ -612,7 +611,7 @@ public class Converters { }); - datePicker.show(parentFragment.requireActivity().getSupportFragmentManager(), "MaterialDatePicker"); + datePicker.show(ContextHelper.getFragmentManagerFromContext(view.getContext()), "MaterialDatePicker"); }; view.setOnClickListener(onClick::run); @@ -664,8 +663,8 @@ public class Converters { } - @BindingAdapter(value = {"binding", "parentView", "warningOnOldDates"}, requireAll = false) - public static void bindEditTextDate(EditText view, final ObservableField observableDate, BaseDialogFragment parentFragment, boolean warningOnOldDates) { + @BindingAdapter(value = {"binding", "warningOnOldDates"}, requireAll = false) + public static void bindEditTextDate(EditText view, final ObservableField observableDate, boolean warningOnOldDates) { Pair, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable); if (pair == null || pair.first != observableDate) { if (pair != null) { @@ -696,15 +695,15 @@ public class Converters { var nowTime = UtilityDate.millisTimeToLocalDate(selectedTimeInMillis, null); - if (parentFragment != null && warningOnOldDates && nowTime.isBefore(UtilityDate.getNow())) { + if (warningOnOldDates && nowTime.isBefore(UtilityDate.getNow())) { DialogSimpleMessageView - .makeWarningDialog(new SpannableString("Hai scelto una data precedente a quella odierna. Continuare?"), null, () -> { + .makeWarningDialog(view.getContext(), new SpannableString("Hai scelto una data precedente a quella odierna. Continuare?"), null, () -> { view.setText(UtilityDate.formatDate(nowTime, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)); observableDate.set(nowTime); }, () -> { }) - .show(parentFragment.requireActivity().getSupportFragmentManager(), "tag"); + .show(); } else { view.setText(UtilityDate.formatDate(nowTime, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)); observableDate.set(nowTime); @@ -716,7 +715,7 @@ public class Converters { } }); - datePicker.show(parentFragment.requireActivity().getSupportFragmentManager(), "tag"); + datePicker.show(ContextHelper.getFragmentManagerFromContext(view.getContext()), "tag"); }; //Adding click-listener diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java index 03f373b7..8c9c3ac0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java @@ -1,25 +1,27 @@ package it.integry.integrywmsnative.core.utility; import android.content.Context; +import android.os.Handler; +import android.os.Looper; import android.text.Html; -import androidx.fragment.app.FragmentManager; - -import com.annimon.stream.Stream; import com.google.firebase.crashlytics.FirebaseCrashlytics; import com.orhanobut.logger.Logger; +import java.util.Arrays; + import it.integry.integrywmsnative.BuildConfig; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.exception.InvalidConnectionException; import it.integry.integrywmsnative.core.exception.InvalidLUException; import it.integry.integrywmsnative.core.exception.InvalidLUGestioneException; -import it.integry.integrywmsnative.core.helper.ContextHelper; import it.integry.integrywmsnative.core.rest.CommonRESTException; import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; public class UtilityExceptions { + private static Handler handler = new Handler(Looper.getMainLooper()); + private static final Class[] FIREBASE_IGNORED_EXCEPTIONS = new Class[]{ InvalidConnectionException.class, InvalidLUGestioneException.class, @@ -46,19 +48,24 @@ public class UtilityExceptions { if (ex.getCause() != null) errorMessage += "
" + ex.getCause().getMessage(); } - FragmentManager fm = ContextHelper.getFragmentManagerFromContext(context); - if (fm != null) { - boolean isBarcodeEnabled = BarcodeManager.isLastCallbackEnabled(); - if (isBarcodeEnabled) BarcodeManager.disableLastCallback(); - DialogSimpleMessageView.makeErrorDialog(Html.fromHtml(errorMessage), null, () -> { +// FragmentManager fm = ContextHelper.getFragmentManagerFromContext(context); + +// if (fm != null) { + boolean isBarcodeEnabled = BarcodeManager.isLastCallbackEnabled(); + if (isBarcodeEnabled) BarcodeManager.disableLastCallback(); + + String finalErrorMessage = errorMessage; + handler.post(() -> { + DialogSimpleMessageView.makeErrorDialog(context, Html.fromHtml(finalErrorMessage), null, () -> { if (isBarcodeEnabled) BarcodeManager.enableLastCallback(); }) - .show(fm, "tag"); - } + .show(); + }); +// } boolean toIgnore = ex.getClass().getName().startsWith("it.integry.integrywmsnative") || - Stream.of(FIREBASE_IGNORED_EXCEPTIONS).anyMatch(x -> x.isAssignableFrom(ex.getClass())); + Arrays.stream(FIREBASE_IGNORED_EXCEPTIONS).anyMatch(x -> x.isAssignableFrom(ex.getClass())); if (!BuildConfig.DEBUG && !toIgnore) { if (sendEmail) UtilityLogger.error(ex); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java index 8730e93f..739842cb 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java @@ -478,13 +478,13 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac @Override public void onMtbColrDeleteRequest(RunnableArgs onComplete) { - runOnUiThread(() -> { + handler.post(() -> { String text = getResources().getString(R.string.alert_delete_mtb_colr); - DialogSimpleMessageView.makeWarningDialog(new SpannableString(text), + DialogSimpleMessageView.makeWarningDialog(this, new SpannableString(text), null, () -> onComplete.run(true), () -> onComplete.run(false) - ).show(getSupportFragmentManager(), "tag"); + ).show(); }); } @@ -522,11 +522,13 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac @Override public void onLUSuccessullyPrinted() { - Resources res = getResources(); - String errorMessage = res.getText(R.string.alert_print_completed_message).toString(); - DialogSimpleMessageView - .makeSuccessDialog(res.getText(R.string.completed).toString(), new SpannableString(errorMessage), null, null) - .show(getSupportFragmentManager(), "tag"); + handler.post(() -> { + Resources res = getResources(); + String errorMessage = res.getText(R.string.alert_print_completed_message).toString(); + DialogSimpleMessageView + .makeSuccessDialog(this, res.getText(R.string.completed).toString(), new SpannableString(errorMessage), null, null) + .show(); + }); } @Override @@ -538,13 +540,15 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac @Override public void onLUPrintError(Exception ex, Runnable onComplete) { this.onLoadingEnded(); - DialogSimpleMessageView.makeErrorDialog( - new SpannableString(ex.getMessage()), - null, - null, - R.string.button_ignore_print, - onComplete) - .show(getSupportFragmentManager(), "tag"); + handler.post(() -> { + DialogSimpleMessageView.makeErrorDialog(this, + new SpannableString(ex.getMessage()), + null, + null, + R.string.button_ignore_print, + onComplete) + .show(); + }); } @Override @@ -704,12 +708,14 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac @Override public void onConfirmAnomalie(int anomalie, RunnableArgs onConfirm) { - DialogSimpleMessageView.makeWarningDialog(new SpannableString(Html.fromHtml(String.format(getString(R.string.confirm_anomalie), anomalie))), - null, () -> { - onConfirm.run(true); - }, () -> { - onConfirm.run(false); - }) - .show(getSupportFragmentManager(), "tag"); + handler.post(() -> { + DialogSimpleMessageView.makeWarningDialog(this, new SpannableString(Html.fromHtml(String.format(getString(R.string.confirm_anomalie), anomalie))), + null, () -> { + onConfirm.run(true); + }, () -> { + onConfirm.run(false); + }) + .show(); + }); } } \ No newline at end of file diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_elenco/MainAccettazioneOrdiniElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_elenco/MainAccettazioneOrdiniElencoFragment.java index 95ae7fdd..94d76f8b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_elenco/MainAccettazioneOrdiniElencoFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_elenco/MainAccettazioneOrdiniElencoFragment.java @@ -275,32 +275,35 @@ public class MainAccettazioneOrdiniElencoFragment extends BaseFragment implement @Override public void onOrdersDispatched(List orders, List sitArts) { - long artsCounter = Stream.of(sitArts) - .filter(x -> UtilityBigDecimal.greaterThan(x.getQtaDaEvadere(), BigDecimal.ZERO)) - .map(SitArtOrdDTO::getCodMart) - .distinct() - .count(); + handler.post(() -> { - long ordsCounter = Stream.of(sitArts) - .distinctBy(x -> x.getDataOrd() + " " + x.getNumOrd() + " " + x.getGestione()) - .count(); + long artsCounter = sitArts.stream() + .filter(x -> UtilityBigDecimal.greaterThan(x.getQtaDaEvadere(), BigDecimal.ZERO)) + .map(SitArtOrdDTO::getCodMart) + .distinct() + .count(); + + long ordsCounter = Stream.of(sitArts) + .distinctBy(x -> x.getDataOrd() + " " + x.getNumOrd() + " " + x.getGestione()) + .count(); - DialogSimpleMessageView.makeInfoDialog(getText(R.string.orders).toString(), - Html.fromHtml(String.format(getActivity().getResources().getQuantityString(R.plurals.loaded_orders_message, (int) ordsCounter), ordsCounter) - + "

" + - "" + artsCounter + " " + getActivity().getResources().getQuantityString(R.plurals.ordered_articles, (int) artsCounter)), - null, - () -> { + DialogSimpleMessageView.makeInfoDialog(requireContext(), getText(R.string.orders).toString(), + Html.fromHtml(String.format(getActivity().getResources().getQuantityString(R.plurals.loaded_orders_message, (int) ordsCounter), ordsCounter) + + "

" + + "" + artsCounter + " " + getActivity().getResources().getQuantityString(R.plurals.ordered_articles, (int) artsCounter)), + null, + () -> { - String cacheSitArtItemID = DataCache.addItem(sitArts); - String cacheOrdersItemID = DataCache.addItem(orders); + String cacheSitArtItemID = DataCache.addItem(sitArts); + String cacheOrdersItemID = DataCache.addItem(orders); - Intent myIntent = new Intent(getActivity(), AccettazioneOrdiniPickingActivity.class); - myIntent.putExtra("keyOrders", cacheOrdersItemID); - myIntent.putExtra("keySitArts", cacheSitArtItemID); - getActivity().startActivity(myIntent); + Intent myIntent = new Intent(getActivity(), AccettazioneOrdiniPickingActivity.class); + myIntent.putExtra("keyOrders", cacheOrdersItemID); + myIntent.putExtra("keySitArts", cacheSitArtItemID); + getActivity().startActivity(myIntent); - }).show(getActivity().getSupportFragmentManager(), "tag"); + }).show(); + }); } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java index 48d6a249..18408d54 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java @@ -719,7 +719,12 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A public void onLUSuccessullyPrinted() { Resources res = getResources(); String errorMessage = res.getText(R.string.alert_print_completed_message).toString(); - DialogSimpleMessageView.makeSuccessDialog(res.getText(R.string.completed).toString(), new SpannableString(errorMessage), null, null).show(getSupportFragmentManager(), "tag"); + handler.post(() -> { + DialogSimpleMessageView.makeSuccessDialog(this, + res.getText(R.string.completed).toString(), + new SpannableString(errorMessage), null, null) + .show(); + }); } @Override @@ -730,7 +735,9 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A @Override public void onLUPrintError(Exception ex, Runnable onComplete) { this.onLoadingEnded(); - DialogSimpleMessageView.makeErrorDialog(new SpannableString(ex.getMessage()), null, null, R.string.button_ignore_print, onComplete).show(getSupportFragmentManager(), "tag"); + handler.post(() -> { + DialogSimpleMessageView.makeErrorDialog(this, new SpannableString(ex.getMessage()), null, null, R.string.button_ignore_print, onComplete).show(); + }); } @Override @@ -785,11 +792,11 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A @Override public void onWarning(String warningText, Runnable action) { - this.runOnUiThread(() -> { + handler.post(() -> { this.onLoadingEnded(); DialogSimpleMessageView - .makeWarningDialog(new SpannableString(Html.fromHtml(warningText)), null, action) - .show(getSupportFragmentManager(), "tag"); + .makeWarningDialog(this, new SpannableString(Html.fromHtml(warningText)), null, action) + .show(); }); } @@ -850,9 +857,14 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A @Override public void onMtbColrDeleteRequest(RunnableArgs onComplete) { - runOnUiThread(() -> { + handler.post(() -> { String text = getResources().getString(R.string.alert_delete_mtb_colr); - DialogSimpleMessageView.makeWarningDialog(new SpannableString(text), null, () -> onComplete.run(true), () -> onComplete.run(false)).show(getSupportFragmentManager(), "tag"); + DialogSimpleMessageView.makeWarningDialog(this, + new SpannableString(text), + null, + () -> onComplete.run(true), + () -> onComplete.run(false)) + .show(); }); } 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 9b9cc20b..ce0cb1c3 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 @@ -125,11 +125,12 @@ public class DocInterniFragment extends BaseFragment implements ITitledFragment, @Override public void onWarning(String warningText, Runnable action) { - this.requireActivity().runOnUiThread(() -> { + handler.post(() -> { this.onLoadingEnded(); DialogSimpleMessageView - .makeWarningDialog(new SpannableString(Html.fromHtml(warningText)), null, action) - .show(requireActivity().getSupportFragmentManager(), "tag"); + .makeWarningDialog(requireContext(), + new SpannableString(Html.fromHtml(warningText)), null, action) + .show(); }); } 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 7edb5890..7ec4684f 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 @@ -380,7 +380,7 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter @Override public void onDocExported() { - runOnUiThread(() -> { + handler.post(() -> { DialogCommon.showDataSaved(this, this::closeEdit); }); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java index 95a57a0b..aecc5d6c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java @@ -142,7 +142,7 @@ public class ContenutoBancaleActivity extends BaseActivity implements ContenutoB fabPopupMenu.getMenu().removeItem(R.id.delete_ul); } - if(!recoverFabMenuVisible) { + if (!recoverFabMenuVisible) { fabPopupMenu.getMenu().removeItem(R.id.recover_ul); } @@ -176,12 +176,14 @@ public class ContenutoBancaleActivity extends BaseActivity implements ContenutoB this.mPrinterRESTConsumer.printCollo(mtbColt.get(), () -> { this.onLoadingEnded(); - - Resources res = this.getResources(); - String errorMessage = res.getText(R.string.alert_print_completed_message).toString(); - DialogSimpleMessageView - .makeSuccessDialog(res.getText(R.string.completed).toString(), new SpannableString(errorMessage), null, null) - .show(getSupportFragmentManager(), "tag"); + handler.post(() -> { + Resources res = this.getResources(); + String errorMessage = res.getText(R.string.alert_print_completed_message).toString(); + DialogSimpleMessageView + .makeSuccessDialog(this, + res.getText(R.string.completed).toString(), new SpannableString(errorMessage), null, null) + .show(); + }); }, this::onError); } catch (Exception ex) { @@ -192,29 +194,32 @@ public class ContenutoBancaleActivity extends BaseActivity implements ContenutoB public void deleteUL() { String text = getResources().getString(R.string.alert_delete_UL); - DialogSimpleMessageView.makeWarningDialog(new SpannableString(Html.fromHtml(text)), null, () -> this.runOnUiThread(() -> { - this.onLoadingStarted(); + handler.post(() -> { + DialogSimpleMessageView.makeWarningDialog(this, + new SpannableString(Html.fromHtml(text)), null, () -> this.runOnUiThread(() -> { + this.onLoadingStarted(); - try { - DeleteULRequestDTO deleteULRequestDTO = new DeleteULRequestDTO() - .setMtbColt(this.mtbColt.get()); + try { + DeleteULRequestDTO deleteULRequestDTO = new DeleteULRequestDTO() + .setMtbColt(this.mtbColt.get()); - mColliMagazzinoRESTConsumer.deleteUL(deleteULRequestDTO, () -> { - Intent data = new Intent(); - String key = DataCache.addItem(this.mtbColt.get()); - String keyDeleteUL = DataCache.addItem(true); - data.putExtra("key", key) - .putExtra("keyDeleteUL", keyDeleteUL); + mColliMagazzinoRESTConsumer.deleteUL(deleteULRequestDTO, () -> { + Intent data = new Intent(); + String key = DataCache.addItem(this.mtbColt.get()); + String keyDeleteUL = DataCache.addItem(true); + data.putExtra("key", key) + .putExtra("keyDeleteUL", keyDeleteUL); - this.onLoadingEnded(); - this.setResult(RESULT_OK, data); - this.finish(); - }, this::onError); - } catch (Exception ex) { - this.onError(ex); - } - }), () -> { - }).show(this.getSupportFragmentManager(), "tag"); + this.onLoadingEnded(); + this.setResult(RESULT_OK, data); + this.finish(); + }, this::onError); + } catch (Exception ex) { + this.onError(ex); + } + }), () -> { + }).show(); + }); } public void showFabMenu() { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/LoginActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/LoginActivity.java index 190cfa64..c392074d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/login/LoginActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/LoginActivity.java @@ -6,8 +6,6 @@ import android.text.Html; import androidx.appcompat.app.AlertDialog; import androidx.databinding.DataBindingUtil; -import com.google.firebase.installations.FirebaseInstallations; - import java.util.List; import javax.inject.Inject; @@ -108,12 +106,12 @@ public class LoginActivity extends BaseActivity implements LoginViewModel.Listen public void onLoginCompleted(String fullName) { this.onLoadingEnded(); - runOnUiThread(() -> DialogSimpleMessageView.makeSuccessDialog( + handler.post(() -> DialogSimpleMessageView.makeSuccessDialog(this, "Benvenuto", Html.fromHtml("Ciao " + fullName + ", la Integry le augura di svolgere al meglio il suo lavoro"), null, this::startSplashActivity) - .show(getSupportFragmentManager(), "tag")); + .show()); } 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 9a2e6391..244e9f02 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 @@ -832,31 +832,34 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF @Override public void onOrdersDispatched(List orders, List sitArts, List alreadyRegisteredMtbColts) { - List codMarts = Stream.of(sitArts) - .distinctBy(SitArtOrdDTO::getCodMart) - .map(SitArtOrdDTO::getCodMart) - .toList(); + handler.post(() -> { - int alreadyRegisteredUL = alreadyRegisteredMtbColts.size(); + List codMarts = sitArts.stream() + .map(SitArtOrdDTO::getCodMart) + .distinct() + .toList(); - boolean divideByGrpMerc = SettingsManager.iDB().isGroupShippingByCommodityGroup(); + int alreadyRegisteredUL = alreadyRegisteredMtbColts.size(); - DialogSimpleMessageView.makeInfoDialog(getText(R.string.orders).toString(), - Html.fromHtml(String.format(getActivity().getResources().getQuantityString(R.plurals.loaded_orders_message, orders.size()), orders.size()) - + "
" + - "" + codMarts.size() + " " + getActivity().getResources().getQuantityString(R.plurals.ordered_articles, codMarts.size()) - + "
" + - "" + alreadyRegisteredUL + " " + getActivity().getResources().getQuantityString(R.plurals.already_registered_lu, alreadyRegisteredUL)), - null, - () -> SpedizioneActivity.startActivity(getActivity(), - sitArts, - orders, - mCurrentGestioneCol, - mCurrentSegnoCol, - MtbColr.Causale.DEFAULT, - mDialogRowInfo, - divideByGrpMerc) - ).show(getActivity().getSupportFragmentManager(), "tag"); + boolean divideByGrpMerc = SettingsManager.iDB().isGroupShippingByCommodityGroup(); + + DialogSimpleMessageView.makeInfoDialog(requireContext(), getText(R.string.orders).toString(), + Html.fromHtml(String.format(getActivity().getResources().getQuantityString(R.plurals.loaded_orders_message, orders.size()), orders.size()) + + "
" + + "" + codMarts.size() + " " + getActivity().getResources().getQuantityString(R.plurals.ordered_articles, codMarts.size()) + + "
" + + "" + alreadyRegisteredUL + " " + getActivity().getResources().getQuantityString(R.plurals.already_registered_lu, alreadyRegisteredUL)), + null, + () -> SpedizioneActivity.startActivity(getActivity(), + sitArts, + orders, + mCurrentGestioneCol, + mCurrentSegnoCol, + MtbColr.Causale.DEFAULT, + mDialogRowInfo, + divideByGrpMerc) + ).show(); + }); } @Override 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 d96f9642..5a15f11d 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 @@ -299,12 +299,15 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme @Override public void onMtbColrDeleteRequest(RunnableArgs onComplete) { - String text = getResources().getString(R.string.alert_delete_mtb_colr); - DialogSimpleMessageView.makeWarningDialog(new SpannableString(text), - null, - () -> onComplete.run(true), - () -> onComplete.run(false) - ).show(requireActivity().getSupportFragmentManager(), DialogSimpleMessageView.class.getName()); + handler.post(() -> { + String text = getResources().getString(R.string.alert_delete_mtb_colr); + DialogSimpleMessageView.makeWarningDialog(requireContext(), + new SpannableString(text), + null, + () -> onComplete.run(true), + () -> onComplete.run(false) + ).show(); + }); } @Override @@ -344,7 +347,7 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme public void onArtSelectionRequest(List mtbColrsToPick, MtbAart mtbAart, RunnableArgs> onComplete, Runnable onAbort) { DialogChooseArtsFromMtbColrListView .newInstance(mtbColrsToPick, mtbAart, result -> { - if(result == null || result.isAborted()) { + if (result == null || result.isAborted()) { onAbort.run(); BarcodeManager.enable(mBarcodeScannerInstanceID); return; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java index 34fe0317..9c30d2d0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java @@ -498,11 +498,11 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag public void onMtbColrDeleteRequest(RunnableArgs onComplete) { handler.post(() -> { String text = getResources().getString(R.string.alert_delete_mtb_colr); - DialogSimpleMessageView.makeWarningDialog(new SpannableString(text), + DialogSimpleMessageView.makeWarningDialog(this, new SpannableString(text), null, () -> onComplete.run(true), () -> onComplete.run(false) - ).show(getSupportFragmentManager(), "delete-row-dialog"); + ).show(); }); } @@ -535,8 +535,10 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag Resources res = getResources(); String errorMessage = res.getText(R.string.alert_print_completed_message).toString(); DialogSimpleMessageView - .makeSuccessDialog(res.getText(R.string.completed).toString(), new SpannableString(errorMessage), null, null) - .show(getSupportFragmentManager(), "dialog-print-completed"); + .makeSuccessDialog(this, + res.getText(R.string.completed).toString(), + new SpannableString(errorMessage), null, null) + .show(); }); } @@ -566,12 +568,15 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag @Override public void onLUPrintError(Exception ex, Runnable onComplete) { this.onLoadingEnded(); - DialogSimpleMessageView.makeErrorDialog(new SpannableString(ex.getMessage()), - null, - null, - R.string.button_ignore_print, - onComplete != null ? onComplete : () -> { - }) - .show(getSupportFragmentManager(), "tag"); + handler.post(() -> { + DialogSimpleMessageView.makeErrorDialog(this, + new SpannableString(ex.getMessage()), + null, + null, + R.string.button_ignore_print, + onComplete != null ? onComplete : () -> { + }) + .show(); + }); } } 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 e457ecc7..3c217416 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 @@ -348,33 +348,36 @@ public class ProdOrdineProduzioneElencoFragment extends BaseFragment implements @Override public void onOrdersDispatched(List orders, List sitArts) { - long artsCounter = Stream.of(sitArts) - .filter(x -> UtilityBigDecimal.greaterThan(x.getQtaDaEvadere(), BigDecimal.ZERO)) - .map(SitArtOrdDTO::getCodMart) - .distinct() - .count(); + handler.post(() -> { - long ordsCounter = Stream.of(sitArts) - .distinctBy(x -> x.getDataOrd() + " " + x.getNumOrd() + " " + x.getGestione()) - .count(); + long artsCounter = Stream.of(sitArts) + .filter(x -> UtilityBigDecimal.greaterThan(x.getQtaDaEvadere(), BigDecimal.ZERO)) + .map(SitArtOrdDTO::getCodMart) + .distinct() + .count(); + + long ordsCounter = Stream.of(sitArts) + .distinctBy(x -> x.getDataOrd() + " " + x.getNumOrd() + " " + x.getGestione()) + .count(); - DialogSimpleMessageView.makeInfoDialog(getText(R.string.orders).toString(), - Html.fromHtml(String.format(getActivity().getResources().getQuantityString(R.plurals.loaded_orders_message, (int) ordsCounter), ordsCounter) - + "

" + - "" + artsCounter + " " + getActivity().getResources().getQuantityString(R.plurals.ordered_articles, (int) artsCounter)), - null, - () -> { + DialogSimpleMessageView.makeInfoDialog(requireContext(), getText(R.string.orders).toString(), + Html.fromHtml(String.format(getActivity().getResources().getQuantityString(R.plurals.loaded_orders_message, (int) ordsCounter), ordsCounter) + + "

" + + "" + artsCounter + " " + getActivity().getResources().getQuantityString(R.plurals.ordered_articles, (int) artsCounter)), + null, + () -> { - String cacheSitArtItemID = DataCache.addItem(sitArts); - String cacheOrdersItemID = DataCache.addItem(orders); + String cacheSitArtItemID = DataCache.addItem(sitArts); + String cacheOrdersItemID = DataCache.addItem(orders); - Intent myIntent = new Intent(getActivity(), AccettazioneOrdiniPickingActivity.class); - myIntent.putExtra("keyOrders", cacheOrdersItemID); - myIntent.putExtra("keySitArts", cacheSitArtItemID); - getActivity().startActivity(myIntent); + Intent myIntent = new Intent(getActivity(), AccettazioneOrdiniPickingActivity.class); + myIntent.putExtra("keyOrders", cacheOrdersItemID); + myIntent.putExtra("keySitArts", cacheSitArtItemID); + getActivity().startActivity(myIntent); - }).show(getActivity().getSupportFragmentManager(), "tag"); + }).show(); + }); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_dettaglio_linea/ProdDettaglioLineaActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_dettaglio_linea/ProdDettaglioLineaActivity.java index d91ea254..3cbd5183 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_dettaglio_linea/ProdDettaglioLineaActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_dettaglio_linea/ProdDettaglioLineaActivity.java @@ -157,8 +157,8 @@ public class ProdDettaglioLineaActivity extends BaseActivity implements ProdDett @Override public void confirmInconsistentDeposit(Runnable onConfirm) { - this.runOnUiThread(() -> { - DialogSimpleMessageView.makeWarningDialog( + handler.post(() -> { + DialogSimpleMessageView.makeWarningDialog(this, Html.fromHtml("L'articolo che si vuole versare non è compatibile con nessun ordine presente sulla linea!" + "

" + "Vuoi versarlo comunque?"), @@ -168,7 +168,7 @@ public class ProdDettaglioLineaActivity extends BaseActivity implements ProdDett onLoadingEnded(); BarcodeManager.enable(mBarcodeScannerInstanceID); } - ).show(getSupportFragmentManager(), "confirmOrderClose"); + ).show(); }); } @@ -295,8 +295,11 @@ public class ProdDettaglioLineaActivity extends BaseActivity implements ProdDett public void successDialog(String message, Runnable onComplete) { BarcodeManager.disable(mBarcodeScannerInstanceID); - this.runOnUiThread(() -> DialogSimpleMessageView.makeSuccessDialog(getResources().getString(R.string.success), - new SpannableString(message), null, onComplete).show(getSupportFragmentManager(), "successDialog")); + handler.post(() -> DialogSimpleMessageView.makeSuccessDialog( + this, + getResources().getString(R.string.success), + new SpannableString(message), null, onComplete) + .show()); } @@ -318,15 +321,14 @@ public class ProdDettaglioLineaActivity extends BaseActivity implements ProdDett @Override public void confirmOrderClose(Runnable onConfirm) { this.onLoadingEnded(); - this.runOnUiThread(() -> { - DialogSimpleMessageView.makeWarningDialog( + handler.post(() -> { + DialogSimpleMessageView.makeWarningDialog(this, Html.fromHtml("Per completare l'operazione è necessario chiudere gli ordini attualmente aperti sulla linea." + "

" + "Continuare?"), null, () -> { - DialogSimpleMessageView.makeInfoDialog( - this, + DialogSimpleMessageView.makeInfoDialog(this, null, Html.fromHtml("Vuoi recuperare del materiale prima di chiudere gli ordini?"), null, @@ -335,10 +337,10 @@ public class ProdDettaglioLineaActivity extends BaseActivity implements ProdDett this.requestMaterialRecover(); }, onConfirm - ).show(getSupportFragmentManager(), "confirmOrderClose"); + ).show(); }, () -> BarcodeManager.enable(mBarcodeScannerInstanceID) - ).show(getSupportFragmentManager(), "confirmOrderClose"); + ).show(); }); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_linee_produzione/ProdLineeProduzioneFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_linee_produzione/ProdLineeProduzioneFragment.java index 3b8f0039..49a709f8 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_linee_produzione/ProdLineeProduzioneFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_linee_produzione/ProdLineeProduzioneFragment.java @@ -132,8 +132,11 @@ public class ProdLineeProduzioneFragment extends BaseFragment implements ITitled @Override public void successDialog(String message, Runnable onComplete) { BarcodeManager.disable(mBarcodeScannerInstanceID); - requireActivity().runOnUiThread(() -> DialogSimpleMessageView.makeSuccessDialog(getResources().getString(R.string.success), - new SpannableString(message), null, onComplete).show(getChildFragmentManager(), "successDialog")); + handler.post(() -> DialogSimpleMessageView.makeSuccessDialog( + requireContext(), + getResources().getString(R.string.success), + new SpannableString(message), null, onComplete) + .show()); } 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 896d81d3..519f9474 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 @@ -241,7 +241,7 @@ public class ProdRecuperoMaterialeFragment extends BaseFragment implements ITitl return null; }); itemType.areItemSame((item1, item2) -> - Objects.equals(item1.getNumCollo(), item2.getNumCollo()) && + Objects.equals(item1.getNumCollo(), item2.getNumCollo()) && Objects.equals(item1.getDataCollo(), item2.getDataCollo()) && Objects.equals(item1.getSerCollo(), item2.getSerCollo()) && Objects.equals(item1.getGestione(), item2.getGestione()) && @@ -251,7 +251,7 @@ public class ProdRecuperoMaterialeFragment extends BaseFragment implements ITitl Objects.equals(item1.getCodTagl(), item2.getCodTagl()) && Objects.equals(item1.getCodJcom(), item2.getCodJcom()) && Objects.equals(item1.getCodJfas(), item2.getCodJfas()) - ); + ); itemType.areContentsTheSame(HistoryVersamentoProdULDTO::equals); new LiveAdapter(this.filteredList, this) // Observe filteredList @@ -565,28 +565,32 @@ public class ProdRecuperoMaterialeFragment extends BaseFragment implements ITitl @Override public void onLUPrintError(Exception ex, Runnable onComplete) { this.onLoadingEnded(); - DialogSimpleMessageView.makeErrorDialog( - new SpannableString(ex.getMessage()), - null, - null, - R.string.button_ignore_print, - onComplete) - .show(requireActivity().getSupportFragmentManager(), "tag"); + handler.post(() -> { + DialogSimpleMessageView.makeErrorDialog(requireContext(), + new SpannableString(ex.getMessage()), + null, + null, + R.string.button_ignore_print, + onComplete) + .show(); + }); } @Override public void onNoLUFound(Runnable onComplete) { - String errorMessage = "Nessuna stampante configurata"; - DialogSimpleMessageView - .makeWarningDialog(new SpannableString(errorMessage), null, onComplete) - .show(requireActivity().getSupportFragmentManager(), "tag"); + handler.post(() -> { + String errorMessage = "Nessuna stampante configurata"; + DialogSimpleMessageView + .makeWarningDialog(requireContext(), new SpannableString(errorMessage), null, onComplete) + .show(); + }); } @Override public void onDataSaved() { this.onLoadingEnded(); - this.requireActivity().runOnUiThread(() -> { + handler.post(() -> { DialogCommon.showDataSaved(requireActivity(), this::popMe); }); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceFragment.java index 1aad29ff..82036404 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceFragment.java @@ -181,7 +181,7 @@ public class ProdRientroMerceFragment extends BaseFragment implements x.getGestione().equalsIgnoreCase(orderToRefresh.getGestione())) .findFirst(); - if(foundOrder.isPresent()) + if (foundOrder.isPresent()) mProdRientroMerceOrderDetailFragment.setOrder(foundOrder.get()); else mProdRientroMerceOrderDetailFragment.setOrder(null); @@ -201,13 +201,15 @@ public class ProdRientroMerceFragment extends BaseFragment implements @Override public void onMtbColrDelete(MtbColr mtbColr) { - String text = getResources().getString(R.string.alert_delete_mtb_colr); - DialogSimpleMessageView.makeWarningDialog(new SpannableString(text), - null, - () -> mProdRientroMerceOrderDetailFragment.deleteMtbColr(mtbColr), - () -> { - } - ).show(requireActivity().getSupportFragmentManager(), "tag"); + handler.post(() -> { + String text = getResources().getString(R.string.alert_delete_mtb_colr); + DialogSimpleMessageView.makeWarningDialog(requireContext(), new SpannableString(text), + null, + () -> mProdRientroMerceOrderDetailFragment.deleteMtbColr(mtbColr), + () -> { + } + ).show(); + }); } @Override 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 459c1e0c..28546a1e 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 @@ -430,15 +430,17 @@ public class ProdVersamentoMaterialeFragment extends BaseFragment implements Pro handler.post(() -> { this.onLoadingEnded(); DialogSimpleMessageView - .makeWarningDialog(new SpannableString(Html.fromHtml(warningText)), null, action) - .show(requireActivity().getSupportFragmentManager(), "tag"); + .makeWarningDialog( + requireContext(), + new SpannableString(Html.fromHtml(warningText)), null, action) + .show(); }); } @Override public void onDataSaved() { this.onLoadingEnded(); - this.requireActivity().runOnUiThread(() -> { + handler.post(() -> { DialogCommon.showDataSaved(requireActivity(), this::popMe); }); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale_su_mag_prossimita/ProdVersamentoMaterialeInBufferFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale_su_mag_prossimita/ProdVersamentoMaterialeInBufferFragment.java index 813afbf3..ccfceeb7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale_su_mag_prossimita/ProdVersamentoMaterialeInBufferFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale_su_mag_prossimita/ProdVersamentoMaterialeInBufferFragment.java @@ -80,10 +80,13 @@ public class ProdVersamentoMaterialeInBufferFragment extends BaseFragment implem mtbColt.getSegno() == 1) { if (mtbColt.getMtbColr() == null || mtbColt.getMtbColr().isEmpty()) { - DialogSimpleMessageView.makeWarningDialog( - new SpannableString(Html.fromHtml("E' stata scansionata una UL già vuota")), - null, this::openLU) - .show((requireActivity()).getSupportFragmentManager(), "tag"); + handler.post(() -> { + DialogSimpleMessageView.makeWarningDialog( + requireContext(), + new SpannableString(Html.fromHtml("E' stata scansionata una UL già vuota")), + null, this::openLU) + .show(); + }); } else { mViewModel.setMtbColt(mtbColt); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java index fc17ad4e..db814ee7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java @@ -175,13 +175,16 @@ public class PVOrdineAcquistoEditActivity extends BaseActivity implements PVOrdi } private void deleteArticolo(ArticoloOrdine articoloOrdine) { - String text = "Stai per eliminare l'articolo " + articoloOrdine.getDescrizione() + " dall'ordine,
sei sicuro?"; + handler.post(() -> { + String text = "Stai per eliminare l'articolo " + articoloOrdine.getDescrizione() + " dall'ordine,
sei sicuro?"; - DialogSimpleMessageView.makeWarningDialog(new SpannableString(Html.fromHtml(text)), null, () -> { - this.mViewModel.deleteArticolo(articoloOrdine); - }, () -> { + DialogSimpleMessageView.makeWarningDialog(this, + new SpannableString(Html.fromHtml(text)), null, () -> { + this.mViewModel.deleteArticolo(articoloOrdine); + }, () -> { - }).show(getSupportFragmentManager(), "tag"); + }).show(); + }); } private final RunnableArgs onScanSuccessful = data -> { @@ -201,20 +204,26 @@ public class PVOrdineAcquistoEditActivity extends BaseActivity implements PVOrdi @Override public void confirmExceedingQtyOrder(Runnable onSuccess) { - DialogSimpleMessageView.makeInfoDialog(getText(R.string.warning).toString(), - Html.fromHtml(getResources().getString(R.string.confirm_orderable_qty_exceeded)), - null, - onSuccess, this::onLoadingEnded).show(getSupportFragmentManager(), "confirmExceedingQtyOrder"); + handler.post(() -> { + DialogSimpleMessageView.makeInfoDialog(this, getText(R.string.warning).toString(), + Html.fromHtml(getResources().getString(R.string.confirm_orderable_qty_exceeded)), + null, + onSuccess, this::onLoadingEnded).show(); + }); } @Override public void confirmCheckForUnlistedProduct(String barcode, Runnable onComplete) { - DialogSimpleMessageView.makeInfoDialog(getText(R.string.info).toString(), - Html.fromHtml(getResources().getString(R.string.confirm_order_unlisted_item)), - null, - () -> { - this.mViewModel.loadArticolo(barcode, onComplete); - }, this::onLoadingEnded).show(getSupportFragmentManager(), "confirmExceedingQtyOrder"); + handler.post(() -> { + + + DialogSimpleMessageView.makeInfoDialog(this, getText(R.string.info).toString(), + Html.fromHtml(getResources().getString(R.string.confirm_order_unlisted_item)), + null, + () -> { + this.mViewModel.loadArticolo(barcode, onComplete); + }, this::onLoadingEnded).show(); + }); } @Override @@ -253,11 +262,13 @@ public class PVOrdineAcquistoEditActivity extends BaseActivity implements PVOrdi @Override public void confirmExportInvalidProducts(Runnable onConfirm) { - DialogSimpleMessageView.makeInfoDialog(getText(R.string.warning).toString(), - Html.fromHtml(getResources().getString(R.string.confirm_export_invalid_product)), - null, - onConfirm, - this::onLoadingEnded).show(getSupportFragmentManager(), "confirmExportInvalidProducts"); + handler.post(() -> { + DialogSimpleMessageView.makeInfoDialog(this, getText(R.string.warning).toString(), + Html.fromHtml(getResources().getString(R.string.confirm_export_invalid_product)), + null, + onConfirm, + this::onLoadingEnded).show(); + }); } @Override diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/dialog/edit_articolo/DialogEditArticoloView.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/dialog/edit_articolo/DialogEditArticoloView.java index 8ee1ce63..8b90f665 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/dialog/edit_articolo/DialogEditArticoloView.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/dialog/edit_articolo/DialogEditArticoloView.java @@ -189,12 +189,15 @@ public class DialogEditArticoloView extends BaseDialogFragment implements Dialog public void saveAndExit() { if (!UtilityBigDecimal.isNullOrZero(this.getArticolo().getCtMaxOrd()) && UtilityBigDecimal.greaterThan(this.mViewModel.getNumCnf(), this.getArticolo().getCtMaxOrd())) { - DialogSimpleMessageView.makeInfoDialog(getText(R.string.warning).toString(), - Html.fromHtml(getActivity().getResources().getString(R.string.confirm_orderable_qty_exceeded)), - null, - this::save, () -> { - this.mBindings.inputNumCnfText.requestFocus(); - }).show(getActivity().getSupportFragmentManager(), "confirmExceedingQtyOrder"); + handler.post(() -> { + + DialogSimpleMessageView.makeInfoDialog(requireContext(), getText(R.string.warning).toString(), + Html.fromHtml(getActivity().getResources().getString(R.string.confirm_orderable_qty_exceeded)), + null, + this::save, () -> { + this.mBindings.inputNumCnfText.requestFocus(); + }).show(); + }); } else { save(); } 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 92411937..7cc4f4bb 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 @@ -129,19 +129,21 @@ public class PVOrdiniAcquistoGrigliaFragment extends BaseFragment implements ITi Map downloadedGrids = Stream.of(mListArticoli).collect(Collectors.groupingBy(ArticoloOrdinabileDTO::getCodAlis, Collectors.counting())); if (downloadedGrids != null && !downloadedGrids.isEmpty()) { - List gridsDetails = Stream.of(downloadedGrids) - .map((el) -> "" + el.getKey() + ": " + el.getValue() + " " + getResources().getQuantityString(R.plurals.available_articles, el.getValue().intValue())) - .toList(); + handler.post(() -> { + List gridsDetails = Stream.of(downloadedGrids) + .map((el) -> "" + el.getKey() + ": " + el.getValue() + " " + getResources().getQuantityString(R.plurals.available_articles, el.getValue().intValue())) + .toList(); - DialogSimpleMessageView.makeInfoDialog(getText(R.string.grid_details).toString(), - Html.fromHtml( - String.format(getResources().getQuantityString(R.plurals.loaded_grids_message, (int) downloadedGrids.size()), downloadedGrids.size()) - + "

" + - StringUtils.join(gridsDetails, "
")), - null, - this::fetchOrders) - .show(requireActivity().getSupportFragmentManager(), "downloadedGridDetails"); + DialogSimpleMessageView.makeInfoDialog(requireContext(), getText(R.string.grid_details).toString(), + Html.fromHtml( + String.format(getResources().getQuantityString(R.plurals.loaded_grids_message, (int) downloadedGrids.size()), downloadedGrids.size()) + + "

" + + StringUtils.join(gridsDetails, "
")), + null, + this::fetchOrders) + .show(); + }); } else { fetchOrders(); } @@ -229,19 +231,22 @@ public class PVOrdiniAcquistoGrigliaFragment extends BaseFragment implements ITi } private void deleteOrdine(Ordine ordine) { - String text = "Stai per eliminare un ordine sei sicuro?"; + handler.post(() -> { + String text = "Stai per eliminare un ordine sei sicuro?"; - DialogSimpleMessageView.makeWarningDialog(new SpannableString(Html.fromHtml(text)), null, () -> requireActivity().runOnUiThread(() -> { - this.onLoadingStarted(); - mPvOrdiniAcquistoGrigliaViewModel.deleteOrder(ordine, () -> { - requireActivity().runOnUiThread(() -> { - this.onLoadingEnded(); - Toast.makeText(requireActivity(), "Ordine eliminato!", Toast.LENGTH_SHORT).show(); - fetchOrders(); - }); - }, this::onError); - }), () -> { - }).show(requireActivity().getSupportFragmentManager(), "tag"); + DialogSimpleMessageView.makeWarningDialog(requireContext(), + new SpannableString(Html.fromHtml(text)), null, () -> requireActivity().runOnUiThread(() -> { + this.onLoadingStarted(); + mPvOrdiniAcquistoGrigliaViewModel.deleteOrder(ordine, () -> { + requireActivity().runOnUiThread(() -> { + this.onLoadingEnded(); + Toast.makeText(requireActivity(), "Ordine eliminato!", Toast.LENGTH_SHORT).show(); + fetchOrders(); + }); + }, this::onError); + }), () -> { + }).show(); + }); } private void refreshRenderedOrdini(List ordini) { 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 db6caee7..944e8008 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 @@ -373,13 +373,16 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr @Override public void onMtbColrDeleteRequest(RunnableArgs onComplete) { - String text = getResources().getString(R.string.alert_delete_mtb_colr); - DialogSimpleMessageView.makeWarningDialog(new SpannableString(text), - null, - () -> onComplete.run(true), - () -> onComplete.run(false) - ) - .show(requireActivity().getSupportFragmentManager(), "tag"); + handler.post(() -> { + String text = getResources().getString(R.string.alert_delete_mtb_colr); + DialogSimpleMessageView.makeWarningDialog(requireContext(), + new SpannableString(text), + null, + () -> onComplete.run(true), + () -> onComplete.run(false) + ) + .show(); + }); } @Override @@ -459,12 +462,15 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr private void checkIfItemIsActive(String flagStato, String codMart, Runnable onContinue, Runnable onNegativeClick) { if (flagStato.equalsIgnoreCase("I")) { - DialogSimpleMessageView.makeWarningDialog( - new SpannableString(Html.fromHtml(String.format(UtilityResources.getString(R.string.item_not_enabled), codMart))), - null, - onContinue, - onNegativeClick) - .show(getActivity().getSupportFragmentManager(), "tag"); + handler.post(() -> { + DialogSimpleMessageView.makeWarningDialog( + requireContext(), + new SpannableString(Html.fromHtml(String.format(UtilityResources.getString(R.string.item_not_enabled), codMart))), + null, + onContinue, + onNegativeClick) + .show(); + }); } else { onContinue.run(); } @@ -512,32 +518,38 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr @Override public void onLUSuccessullyPrinted() { - Resources res = getResources(); - String errorMessage = res.getText(R.string.alert_print_completed_message).toString(); - DialogSimpleMessageView - .makeSuccessDialog(res.getText(R.string.completed).toString(), new SpannableString(errorMessage), null, null) - .show(getActivity().getSupportFragmentManager(), "tag"); + handler.post(() -> { + Resources res = getResources(); + String errorMessage = res.getText(R.string.alert_print_completed_message).toString(); + DialogSimpleMessageView + .makeSuccessDialog(requireContext(), + res.getText(R.string.completed).toString(), new SpannableString(errorMessage), null, null) + .show(); + }); } + @Override public boolean onLUPrintRequest() { AtomicReference resultPrintPackingList = new AtomicReference<>(); CountDownLatch countDownLatch = new CountDownLatch(1); + handler.post(() -> { - DialogSimpleMessageView.makeInfoDialog( - getActivity().getResources().getString(R.string.action_print_ul), - new SpannableString(getActivity().getResources().getString(R.string.ask_print_message)), - null, - () -> { - resultPrintPackingList.set(true); - countDownLatch.countDown(); - }, - () -> { - resultPrintPackingList.set(false); - countDownLatch.countDown(); - }) - .show(getActivity().getSupportFragmentManager(), "dialog-print"); - + DialogSimpleMessageView.makeInfoDialog(requireContext(), + getActivity().getResources().getString(R.string.action_print_ul), + new SpannableString(getActivity().getResources().getString(R.string.ask_print_message)), + null, + () -> { + resultPrintPackingList.set(true); + countDownLatch.countDown(); + }, + () -> { + resultPrintPackingList.set(false); + countDownLatch.countDown(); + }) + .show(); + + }); try { countDownLatch.await(); @@ -551,39 +563,43 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr @Override public void onLUPrintError(Exception ex, Runnable onComplete) { - DialogSimpleMessageView.makeErrorDialog( - new SpannableString(ex.getMessage()), - null, - null, - R.string.button_ignore_print, - onComplete) - .show(requireActivity().getSupportFragmentManager(), "tag"); + handler.post(() -> { + DialogSimpleMessageView.makeErrorDialog(requireContext(), + new SpannableString(ex.getMessage()), + null, + null, + R.string.button_ignore_print, + onComplete) + .show(); + }); } @Override public void onLUPositionChangeRequest(RunnableArgss onComplete) { - DialogYesNoView.newInstance(null, "Vuoi cambiare la posizione della UL corrente?", result -> { - switch (result) { - case YES: - DialogAskPositionOfLUView.newInstance(false, (status, mtbDepoPosizione) -> { - if (status == DialogConsts.Results.ABORT) { - onComplete.run(false, null); - } else { - if (mtbDepoPosizione != null) { - onComplete.run(true, mtbDepoPosizione); + handler.post(() -> { + DialogYesNoView.newInstance(null, "Vuoi cambiare la posizione della UL corrente?", result -> { + switch (result) { + case YES: + DialogAskPositionOfLUView.newInstance(false, (status, mtbDepoPosizione) -> { + if (status == DialogConsts.Results.ABORT) { + onComplete.run(false, null); } else { - onComplete.run(true, null); + if (mtbDepoPosizione != null) { + onComplete.run(true, mtbDepoPosizione); + } else { + onComplete.run(true, null); + } } - } - }) - .show(requireActivity().getSupportFragmentManager(), "tag"); - break; + }) + .show(requireActivity().getSupportFragmentManager(), "tag"); + break; - case NO: - onComplete.run(false, null); - break; - } - }).show(requireActivity().getSupportFragmentManager(), "tag"); + case NO: + onComplete.run(false, null); + break; + } + }).show(requireActivity().getSupportFragmentManager(), "tag"); + }); } @Override 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 91dca18e..a294cae8 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 @@ -268,7 +268,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo }); mViewmodel.isFilterApplied().observe(this, newValue -> { - if(newValue) { + if (newValue) { this.mBindings.filteredArtsInListExpandableLayout.expand(true); } else { this.mBindings.filteredArtsInListExpandableLayout.collapse(true); @@ -912,8 +912,9 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo Resources res = getResources(); String errorMessage = res.getText(R.string.alert_print_completed_message).toString(); DialogSimpleMessageView - .makeSuccessDialog(res.getText(R.string.completed).toString(), new SpannableString(errorMessage), null, null) - .show(getSupportFragmentManager(), "tag"); + .makeSuccessDialog(this, + res.getText(R.string.completed).toString(), new SpannableString(errorMessage), null, null) + .show(); }); } @@ -945,13 +946,15 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo @Override public void onLUPrintError(Exception ex, Runnable onComplete) { this.onLoadingEnded(); - DialogSimpleMessageView.makeErrorDialog( - new SpannableString(ex.getMessage()), - null, - null, - R.string.button_ignore_print, - onComplete) - .show(getSupportFragmentManager(), "tag"); + handler.post(() -> { + DialogSimpleMessageView.makeErrorDialog(this, + new SpannableString(ex.getMessage()), + null, + null, + R.string.button_ignore_print, + onComplete) + .show(); + }); } @Override @@ -972,12 +975,13 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo public void onMtbColrDeleteRequest(RunnableArgs onComplete) { handler.post(() -> { String text = getResources().getString(R.string.alert_delete_mtb_colr); - DialogSimpleMessageView.makeWarningDialog(new SpannableString(text), + DialogSimpleMessageView.makeWarningDialog(this, + new SpannableString(text), null, () -> onComplete.run(true), () -> onComplete.run(false) ) - .show(getSupportFragmentManager(), "tag"); + .show(); }); } @@ -1103,7 +1107,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo CountDownLatch countDownLatch = new CountDownLatch(1); handler.post(() -> { - DialogSimpleMessageView.makeInfoDialog( + DialogSimpleMessageView.makeInfoDialog(this, getResources().getString(R.string.action_close_order), new SpannableString(getResources().getString(R.string.message_print_packing_list_on_close_order)), null, @@ -1116,7 +1120,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo countDownLatch.countDown(); } ) - .show(getSupportFragmentManager(), "tag"); + .show(); }); @@ -1294,10 +1298,13 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo dialogInputQuantityToDuplicate(inputNumber -> { if (qtaTot != null && qtaEvasa != null && UtilityBigDecimal.equalsOrGreaterThan(qtaEvasa.multiply(BigDecimal.valueOf(inputNumber)), qtaTot)) { - DialogSimpleMessageView.makeWarningDialog(new SpannableString(Html.fromHtml(textWarning)), - null, - () -> this.onInputDuplicate(qtaTot, qtaEvasa, onComplete, onNegativeClick) - ).show(getSupportFragmentManager(), "tag"); + handler.post(() -> { + DialogSimpleMessageView.makeWarningDialog(this, + new SpannableString(Html.fromHtml(textWarning)), + null, + () -> this.onInputDuplicate(qtaTot, qtaEvasa, onComplete, onNegativeClick) + ).show(); + }); } else { onComplete.run(inputNumber); } 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 d9d1de8b..ca6692f2 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 @@ -118,10 +118,13 @@ public class VersamentoMerceFragment extends BaseFragment implements ITitledFrag } else if (mtbColt.getGestioneEnum() == GestioneEnum.VENDITA) { this.mViewModel.getCurrentMtbColt().postValue(mtbColt); } else { - DialogSimpleMessageView - .makeWarningDialog(new SpannableString(Html.fromHtml("Sono accettate solamente UL di Acquisto o Lavorazione di CARICO")), - null, this::openLU) - .show(getActivity().getSupportFragmentManager(), "tag"); + handler.post(() -> { + DialogSimpleMessageView + .makeWarningDialog(requireContext(), + new SpannableString(Html.fromHtml("Sono accettate solamente UL di Acquisto o Lavorazione di CARICO")), + null, this::openLU) + .show(); + }); } }).show(requireActivity().getSupportFragmentManager(), "tag"); } @@ -167,11 +170,13 @@ public class VersamentoMerceFragment extends BaseFragment implements ITitledFrag @Override public void onSpostamentoTraDepConfirmRequired(String sourceCodMdep, String destinationCodMdep, RunnableArgs onComplete) { handler.post(() -> { - DialogSimpleMessageView.makeWarningDialog(Html.fromHtml("Stai spostando una UL dal deposito " + sourceCodMdep + " al deposito " + destinationCodMdep + ""), + DialogSimpleMessageView.makeWarningDialog( + requireContext(), + Html.fromHtml("Stai spostando una UL dal deposito " + sourceCodMdep + " al deposito " + destinationCodMdep + ""), null, () -> onComplete.run(true), () -> onComplete.run(false)) - .show(requireActivity().getSupportFragmentManager(), "tag"); + .show(); }); } @@ -180,7 +185,7 @@ public class VersamentoMerceFragment extends BaseFragment implements ITitledFrag handler.post(() -> { DialogChooseArtsFromMtbColrListView .newInstance(mtbColrList, result -> { - if(result == null || result.isAborted() || result.getMtbColrList() == null || result.getMtbColrList().isEmpty()) { + if (result == null || result.isAborted() || result.getMtbColrList() == null || result.getMtbColrList().isEmpty()) { onAbort.run(); return; } @@ -247,7 +252,7 @@ public class VersamentoMerceFragment extends BaseFragment implements ITitledFrag @Override public void onDataSaved() { - this.requireActivity().runOnUiThread(() -> { + handler.post(() -> { DialogCommon.showDataSaved(requireActivity(), this::popMe); }); } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogCommon.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogCommon.java index 88844f46..582deb8a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogCommon.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogCommon.java @@ -3,7 +3,6 @@ package it.integry.integrywmsnative.view.dialogs; import android.content.Context; import android.text.SpannableString; -import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.FragmentActivity; import org.jetbrains.annotations.NotNull; @@ -17,33 +16,33 @@ public class DialogCommon { public static void showNoArtFoundDialog(@NotNull Context context, @Nullable Runnable onPositiveClick) { DialogSimpleMessageView - .makeWarningDialog(new SpannableString(context.getResources().getText(R.string.no_result_from_barcode)), + .makeWarningDialog(context, new SpannableString(context.getResources().getText(R.string.no_result_from_barcode)), null, onPositiveClick) - .show(((AppCompatActivity) context).getSupportFragmentManager(), "tag"); + .show(); } public static void showNoULFound(@NotNull Context context, @Nullable Runnable onPositiveClick) { - DialogSimpleMessageView.makeWarningDialog(new SpannableString(context.getResources().getText(R.string.no_lu_found_message)), + DialogSimpleMessageView.makeWarningDialog(context, new SpannableString(context.getResources().getText(R.string.no_lu_found_message)), null, onPositiveClick) - .show(((AppCompatActivity) context).getSupportFragmentManager(), "tag"); + .show(); } public static void showNoOrderFound(@NotNull Context context, @Nullable Runnable onPositiveClick) { - DialogSimpleMessageView.makeWarningDialog(new SpannableString(context.getResources().getText(R.string.no_orders_found_message)), + DialogSimpleMessageView.makeWarningDialog(context, new SpannableString(context.getResources().getText(R.string.no_orders_found_message)), null, onPositiveClick) - .show(((AppCompatActivity) context).getSupportFragmentManager(), "tag"); + .show(); ; } public static void showDataSaved(@NotNull FragmentActivity context, @Nullable Runnable onPositiveClick) { context.runOnUiThread(() -> { - DialogSimpleMessageView.makeSuccessDialog( + DialogSimpleMessageView.makeSuccessDialog(context, context.getResources().getString(R.string.completed), new SpannableString(context.getResources().getString(R.string.data_saved)), null, onPositiveClick) - .show(context.getSupportFragmentManager(), "tag"); + .show(); }); } @@ -51,7 +50,7 @@ public class DialogCommon { public static void showRestError(@NotNull Context context, Exception ex, @Nullable Runnable onPositiveClick) { DialogSimpleMessageView - .makeErrorDialog(new SpannableString(ex.getMessage()), null, onPositiveClick) - .show(((AppCompatActivity) context).getSupportFragmentManager(), "tag"); + .makeErrorDialog(context, new SpannableString(ex.getMessage()), null, onPositiveClick) + .show(); } } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleMessageView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleMessageView.java index 67bbda21..6e7d588f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleMessageView.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleMessageView.java @@ -1,15 +1,13 @@ package it.integry.integrywmsnative.view.dialogs.base; -import android.app.Activity; -import android.app.Dialog; import android.content.Context; import android.content.res.ColorStateList; import android.graphics.drawable.Drawable; +import android.os.Handler; +import android.os.Looper; import android.text.Spanned; -import android.util.DisplayMetrics; import android.view.LayoutInflater; import android.view.View; -import android.view.WindowManager; import android.widget.TextView; import androidx.annotation.NonNull; @@ -69,15 +67,16 @@ public class DialogSimpleMessageView extends MaterialAlertDialogBuilder { Integer mRNeutralButtonString; private final Runnable mOnNeutralClick; + private final Handler mHandler = new Handler(Looper.getMainLooper()); private String positiveButtonText; private String neutralButtonText; private String negativeButtonText; - private AlertDialog dialog; +// private AlertDialog dialog; - public static DialogSimpleMessageView newInstance(@NonNull Context context, @NonNull TYPE type, @NonNull String titleText, @NonNull Spanned messageText, HashMap hashmapContent, Runnable onPositiveClick, Runnable onNegativeClick, @StringRes Integer rNeutralButtonString, Runnable onNeutralClick) { + private static DialogSimpleMessageView newInstance(@NonNull Context context, @NonNull TYPE type, @NonNull String titleText, @NonNull Spanned messageText, HashMap hashmapContent, Runnable onPositiveClick, Runnable onNegativeClick, @StringRes Integer rNeutralButtonString, Runnable onNeutralClick) { return new DialogSimpleMessageView(context, type, titleText, messageText, hashmapContent, onPositiveClick, onNegativeClick, rNeutralButtonString, onNeutralClick); } @@ -93,7 +92,7 @@ public class DialogSimpleMessageView extends MaterialAlertDialogBuilder { this.mRNeutralButtonString = rNeutralButtonString; this.mOnNeutralClick = onNeutralClick; - DialogBaseBinding bindings = DialogBaseBinding.inflate(LayoutInflater.from(context), null, false); + DialogBaseBinding bindings = DialogBaseBinding.inflate(LayoutInflater.from(getContext()), null, false); setCancelable(false); @@ -115,47 +114,52 @@ public class DialogSimpleMessageView extends MaterialAlertDialogBuilder { setNegativeButton(getNegativeButtonText(), (dialog, which) -> { if (this.mOnNegativeClick != null) this.mOnNegativeClick.run(); }); + } @NonNull @Override public AlertDialog create() { - dialog = super.create(); +// var createdDialog = super.create(); + + + var createdDialog = super.create(); + // dialog.setCanceledOnTouchOutside(isCancelable()); - dialog.setOnShowListener(d -> { - if (mContext instanceof Activity) { - Dialog dialogToShow = (Dialog) d; - if (dialogToShow.getWindow() != null) { - DisplayMetrics displayMetrics = new DisplayMetrics(); - ((Activity) mContext).getWindowManager().getDefaultDisplay().getMetrics(displayMetrics); - int displayWidth = displayMetrics.widthPixels; - WindowManager.LayoutParams layoutParams = new WindowManager.LayoutParams(); - layoutParams.copyFrom(dialogToShow.getWindow().getAttributes()); - int dialogWindowWidth = (int) (displayWidth * 0.9f); - layoutParams.width = dialogWindowWidth; - dialogToShow.getWindow().setAttributes(layoutParams); - } - } - }); - return dialog; +// createdDialog.setOnShowListener(d -> { +// if (mContext instanceof Activity) { +// Dialog dialogToShow = (Dialog) d; +// if (dialogToShow.getWindow() != null) { +// DisplayMetrics displayMetrics = new DisplayMetrics(); +// ((Activity) mContext).getWindowManager().getDefaultDisplay().getMetrics(displayMetrics); +// int displayWidth = displayMetrics.widthPixels; +// WindowManager.LayoutParams layoutParams = new WindowManager.LayoutParams(); +// layoutParams.copyFrom(dialogToShow.getWindow().getAttributes()); +// int dialogWindowWidth = (int) (displayWidth * 0.9f); +// layoutParams.width = dialogWindowWidth; +// dialogToShow.getWindow().setAttributes(layoutParams); +// } +// } +// }); + return createdDialog; } - @Override - public AlertDialog show() { - if (dialog == null) { - dialog = create(); - } - if (!dialog.isShowing()) { - dialog.show(); - } - return dialog; - } +// @Override +// public AlertDialog show() { +// if (dialog == null) { +// dialog = create(); +// } +// if (!dialog.isShowing()) { +// dialog.show(); +// } +// return dialog; +// } - public void dismiss() { - if (dialog != null && dialog.isShowing()) { - dialog.dismiss(); - } - } +// public void dismiss() { +// if (dialog != null && dialog.isShowing()) { +// dialog.dismiss(); +// } +// } private void initContent(DialogBaseBinding mBindings) { int colorBackgroundTitle = -1; @@ -237,17 +241,17 @@ public class DialogSimpleMessageView extends MaterialAlertDialogBuilder { } public void onPositiveClick() { - dismiss(); +// dismiss(); if (mOnPositiveClick != null) mOnPositiveClick.run(); } public void onNeutralClick() { - dismiss(); +// dismiss(); if (mOnNeutralClick != null) mOnNeutralClick.run(); } public void onNegativeClick() { - dismiss(); +// dismiss(); if (mOnNegativeClick != null) mOnNegativeClick.run(); } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_mtbcolr_list/DialogChooseArtsFromMtbColrListView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_mtbcolr_list/DialogChooseArtsFromMtbColrListView.java index f8bf9d19..c2aa1bbe 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_mtbcolr_list/DialogChooseArtsFromMtbColrListView.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_mtbcolr_list/DialogChooseArtsFromMtbColrListView.java @@ -357,7 +357,9 @@ public class DialogChooseArtsFromMtbColrListView extends BaseDialogFragment impl private void showNoArtFoundDialog() throws InterruptedException { CountDownLatch countDownLatch = new CountDownLatch(1); - DialogCommon.showNoArtFoundDialog(mContext, countDownLatch::countDown); + handler.post(() -> { + DialogCommon.showNoArtFoundDialog(mContext, countDownLatch::countDown); + }); countDownLatch.await(); } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java index 21e3b37b..1821ca0e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java @@ -339,10 +339,12 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia LocalDate minDataScad = UtilityDate.getNow().plusDays(mtbAart.getGgScadPartita()); if (minDataScad.isAfter(value) && value.isAfter(UtilityDate.getNow())) { - DialogSimpleMessageView - .makeWarningDialog(new SpannableString("La data selezionata è precedente alla data di scadenza consigliata per l'articolo scelto ( " + mtbAart.getGgScadPartita() + " giorni) . Continuare?"), null, - () -> this.mViewModel.setDataScad(value), () -> this.currentDataScad.set(null)) - .show(requireActivity().getSupportFragmentManager(), "tag"); + handler.post(() -> { + DialogSimpleMessageView + .makeWarningDialog(context, new SpannableString("La data selezionata è precedente alla data di scadenza consigliata per l'articolo scelto ( " + mtbAart.getGgScadPartita() + " giorni) . Continuare?"), null, + () -> this.mViewModel.setDataScad(value), () -> this.currentDataScad.set(null)) + .show(); + }); } else { this.mViewModel.setDataScad(value); } @@ -563,11 +565,11 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia public void onWarning(String text, RunnableArgs result) { handler.post(() -> { - DialogSimpleMessageView.makeWarningDialog(new SpannableString(Html.fromHtml(text)), + DialogSimpleMessageView.makeWarningDialog(context, new SpannableString(Html.fromHtml(text)), null, () -> result.run(true), () -> result.run(false) - ).show(requireActivity().getSupportFragmentManager(), "tag"); + ).show(); }); } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUView.java index 01afdd2f..5d51a62b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUView.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUView.java @@ -167,13 +167,16 @@ public class DialogScanOrCreateLUView extends BaseDialogFragment implements Dial @Override public void onLUVenditaConfirmRequired(RunnableArgs onConfirm) { - DialogSimpleMessageView.makeWarningDialog(new SpannableString(getString(R.string.lu_gest_v_loading_alert)), - null, () -> { - onConfirm.run(true); - }, () -> { - onConfirm.run(false); - }) - .show(requireActivity().getSupportFragmentManager(), "tag"); + handler.post(() -> { + DialogSimpleMessageView.makeWarningDialog(requireContext(), + new SpannableString(getString(R.string.lu_gest_v_loading_alert)), + null, () -> { + onConfirm.run(true); + }, () -> { + onConfirm.run(false); + }) + .show(); + }); } @Override diff --git a/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml b/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml index 427a2582..0773289b 100644 --- a/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml +++ b/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml @@ -751,7 +751,6 @@ android:hint="@string/expire_date" android:inputType="text" app:binding="@{view.currentDataScad}" - app:parentView="@{view}" app:warningOnOldDates="@{true}" /> diff --git a/app/src/main/res/layout/dialog_input_quantity_v2.xml b/app/src/main/res/layout/dialog_input_quantity_v2.xml index 7b78d599..5975e668 100644 --- a/app/src/main/res/layout/dialog_input_quantity_v2.xml +++ b/app/src/main/res/layout/dialog_input_quantity_v2.xml @@ -762,7 +762,6 @@ android:hint="@string/expire_date" android:inputType="text" app:binding="@{view.currentDataScad}" - app:parentView="@{view}" app:warningOnOldDates="@{true}" /> diff --git a/app/src/main/res/layout/dialog_select_doc_info_view.xml b/app/src/main/res/layout/dialog_select_doc_info_view.xml index f71164c4..2857ae3b 100644 --- a/app/src/main/res/layout/dialog_select_doc_info_view.xml +++ b/app/src/main/res/layout/dialog_select_doc_info_view.xml @@ -142,8 +142,7 @@ android:focusableInTouchMode="false" android:hint="@string/document_date" android:inputType="none" - app:binding="@{view.selectedDataDoc}" - app:parentView="@{view}" /> + app:binding="@{view.selectedDataDoc}" /> diff --git a/app/src/main/res/layout/dialog_ultime_consegne_filtro_avanzato.xml b/app/src/main/res/layout/dialog_ultime_consegne_filtro_avanzato.xml index 05a86bcd..8d8adf53 100644 --- a/app/src/main/res/layout/dialog_ultime_consegne_filtro_avanzato.xml +++ b/app/src/main/res/layout/dialog_ultime_consegne_filtro_avanzato.xml @@ -81,6 +81,7 @@ android:singleLine="true" android:textAppearance="?attr/textAppearanceSubtitle1" android:minHeight="?attr/listPreferredItemHeightSmall" + app:binding="@{viewmodel.dataDocBindable}" /> diff --git a/app/src/main/res/layout/dialog_ultimi_arrivi_fornitore_filtro_avanzato.xml b/app/src/main/res/layout/dialog_ultimi_arrivi_fornitore_filtro_avanzato.xml index a8553708..340ddc96 100644 --- a/app/src/main/res/layout/dialog_ultimi_arrivi_fornitore_filtro_avanzato.xml +++ b/app/src/main/res/layout/dialog_ultimi_arrivi_fornitore_filtro_avanzato.xml @@ -81,8 +81,7 @@ android:singleLine="true" android:textAppearance="?attr/textAppearanceSubtitle1" android:minHeight="?attr/listPreferredItemHeightSmall" - app:binding="@{viewmodel.dataDocBindable}" - app:parentView="@{view}" /> + app:binding="@{viewmodel.dataDocBindable}" />