Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Marco Elefante 2025-02-10 17:24:34 +01:00
commit d19f4de424
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java
View File

@ -3,6 +3,8 @@ package it.integry.integrywmsnative.view.dialogs;
import android.app.Dialog;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@ -28,6 +30,9 @@ public class DialogProgressView extends DialogFragment {
private boolean progressOpened;
private final Handler handler = new Handler(Looper.getMainLooper());
private boolean isPending = false;
public static DialogProgressView newInstance(String title, String subtitle, boolean indeterminate) {
return new DialogProgressView(title, subtitle, indeterminate);
}
@ -50,8 +55,6 @@ public class DialogProgressView extends DialogFragment {
mBindings.setTitle(UtilityString.isNullOrEmpty(title) ? requireContext().getString(R.string.loading) : title);
if (!UtilityString.isNullOrEmpty(subtitle)) mBindings.setSubtitle(subtitle);
mBindings.progressBar.setIndeterminate(isIndeterminateProgress());
if (!isIndeterminateProgress()) mBindings.progressBar.setMax(100);
var alertDialog = new MaterialAlertDialogBuilder(requireContext())
.setView(mBindings.getRoot())
@ -64,18 +67,31 @@ public class DialogProgressView extends DialogFragment {
}
public void show(@NonNull FragmentManager manager) {
if (!progressOpened && !isAdded() && !isInLayout()) {
this.progressOpened = true;
super.show(manager, "loading-dialog");
}
if (isPending) return;
isPending = true;
handler.postDelayed(() -> {
try {
if (!manager.isDestroyed() && !isAdded()) {
manager.executePendingTransactions();
showNow(manager, "loading-dialog");
mBindings.progressBar.setIndeterminate(isIndeterminateProgress());
if (!isIndeterminateProgress()) mBindings.progressBar.setMax(100);
}
} finally {
isPending = false;
}
}, 50);
}
@Override
public void dismiss() {
if (isAdded() || isInLayout() || progressOpened) {
this.progressOpened = false;
super.dismissAllowingStateLoss();
}
handler.post(() -> {
if (isAdded()) {
dismissAllowingStateLoss();
}
});
}
public String getTitle() {

1
app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUViewModel.java
View File

@ -124,6 +124,7 @@ public class DialogScanOrCreateLUViewModel {
}
var createUdcRequest = new CreateUDCRequestDTO()
.setBarcodeUl(barcodeScanDTO.getStringValue())
.setCodMdep(SettingsManager.i().getUserSession().getDepo().getCodMdep())
.setNumCollo(customNumCollo)
.setSerCollo(CommonConst.Config.DEFAULT_ANONYMOUS_UL_SERIE);