diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml index b268ef36..f23a4811 100644 --- a/.idea/deploymentTargetSelector.xml +++ b/.idea/deploymentTargetSelector.xml @@ -4,6 +4,14 @@ diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 00000000..16660f1d --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 197a06ff..4b483430 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 449 - def appVersionName = '1.41.01' + def appVersionCode = 451 + def appVersionName = '1.41.03' signingConfigs { release { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java index 448b2349..7fbc2ab9 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java @@ -6,6 +6,8 @@ import android.view.KeyEvent; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; +import java.util.concurrent.ExecutorService; + import javax.inject.Inject; import it.integry.integrywmsnative.MainApplication; @@ -18,7 +20,8 @@ public class BaseActivity extends AppCompatActivity { @Inject public DialogProgressView mCurrentProgress; - private boolean progressOpened; + @Inject + public ExecutorService executorService; @Override protected void onCreate(@Nullable Bundle savedInstanceState) { @@ -47,28 +50,19 @@ public class BaseActivity extends AppCompatActivity { } + private void openProgress() { BarcodeManager.disable(); - if (!progressOpened && !this.mCurrentProgress.isAdded() && !this.mCurrentProgress.isInLayout()) { - this.progressOpened = true; - runOnUiThread(() -> { - try { - this.mCurrentProgress.show(getSupportFragmentManager(), "tag"); - } catch (IllegalStateException ise) { - //ignored - } - }); - } + executorService.execute(() -> { + this.mCurrentProgress.show(getSupportFragmentManager()); + }); } private void closeProgress() { BarcodeManager.enable(); - if (progressOpened) { - this.progressOpened = false; - runOnUiThread(() -> { - mCurrentProgress.dismiss(); - }); - } + executorService.execute(() -> { + mCurrentProgress.dismissAllowingStateLoss(); + }); } @Override 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 34c53671..8a426227 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 @@ -13,6 +13,8 @@ import androidx.fragment.app.DialogFragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; +import java.util.concurrent.ExecutorService; + import javax.inject.Inject; import it.integry.integrywmsnative.MainApplication; @@ -24,7 +26,9 @@ public abstract class BaseDialogFragment extends DialogFragment implements Dialo @Inject public DialogProgressView mCurrentProgress; - private boolean progressOpened; + + @Inject + public ExecutorService executorService; private boolean mBarcodeListener = false; @@ -70,22 +74,19 @@ public abstract class BaseDialogFragment extends DialogFragment implements Dialo BarcodeManager.enable(); } + private void openProgress() { - if (!progressOpened && !this.mCurrentProgress.isAdded() && !this.mCurrentProgress.isInLayout()) { - this.progressOpened = true; - requireActivity().runOnUiThread(() -> { - this.mCurrentProgress.show(requireActivity().getSupportFragmentManager(), "tag"); - }); - } + BarcodeManager.disable(); + executorService.execute(() -> { + this.mCurrentProgress.show(requireActivity().getSupportFragmentManager()); + }); } private void closeProgress() { - if (progressOpened) { - this.progressOpened = false; - requireActivity().runOnUiThread(() -> { - mCurrentProgress.dismiss(); - }); - } + BarcodeManager.enable(); + executorService.execute(() -> { + mCurrentProgress.dismissAllowingStateLoss(); + }); } 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 5423d71e..78c75012 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 @@ -33,7 +33,6 @@ public abstract class BaseFragment extends Fragment { protected ElevatedToolbar mToolbar; protected final List mOnPreDestroyList = new ArrayList<>(); - private boolean progressOpened; public void setScrollToolbar(ElevatedToolbar toolbar) { @@ -67,22 +66,16 @@ public abstract class BaseFragment extends Fragment { private void openProgress() { BarcodeManager.disable(); - if (!progressOpened && !this.mCurrentProgress.isAdded() && !this.mCurrentProgress.isInLayout()) { - this.progressOpened = true; - executorService.execute(() -> { - this.mCurrentProgress.show(requireActivity().getSupportFragmentManager(), "tag"); - }); - } + executorService.execute(() -> { + this.mCurrentProgress.show(requireActivity().getSupportFragmentManager()); + }); } private void closeProgress() { BarcodeManager.enable(); - if (progressOpened) { - this.progressOpened = false; - executorService.execute(() -> { - mCurrentProgress.dismissAllowingStateLoss(); - }); - } + executorService.execute(() -> { + mCurrentProgress.dismissAllowingStateLoss(); + }); } public void onError(Exception ex) { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java index aaec3140..d0e0c679 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java @@ -81,6 +81,7 @@ public class DBSettingsModel { private boolean flagPickingLiberoEnableScanArt = false; private boolean flagAskDuplicateUDSSpedizione = false; private boolean suggestDataScad = false; + private boolean flagPositionChangeRequest = false; private String docInterniRequestNumDoc; public boolean isFlagSpedizioneEnableFakeGiacenza() { @@ -703,4 +704,13 @@ public class DBSettingsModel { this.docInterniRequestNumDoc = docInterniRequestNumDoc; return this; } + + public boolean isFlagPositionChangeRequest() { + return flagPositionChangeRequest; + } + + public DBSettingsModel setFlagPositionChangeRequest(boolean flagPositionChangeRequest) { + this.flagPositionChangeRequest = flagPositionChangeRequest; + return this; + } } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java index af8b9d70..6350c3da 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java @@ -540,6 +540,12 @@ public class SettingsManager { .setKeySection("ENABLE_SCAN_ART") .setSetter(dbSettingsModelIstance::setFlagPickingLiberoEnableScanArt) .setDefaultValue(true)); + stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class) + .setGestName("PICKING") + .setSection("SETUP") + .setKeySection("ENABLE_POSITION_CHANGE_REQUEST") + .setSetter(dbSettingsModelIstance::setFlagPositionChangeRequest) + .setDefaultValue(true)); stbGestSetupReaderList.add(new StbGestSetupReader<>(String.class) .setGestName("PICKING") diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java index 8ea43452..0e48affd 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java @@ -329,9 +329,7 @@ public class PickingLiberoViewModel { this.sendLULineaProdRequired(response -> { createNewLU_PostLineaProdAsk(customNumCollo, customSerCollo, vtbDest, response.getPosizione(), response.getIdLotto(), onComplete); - }, () -> { - this.sendOnLoadingEnded(); - }); + }, this::sendOnLoadingEnded); } else { createNewLU_PostLineaProdAsk(customNumCollo, customSerCollo, vtbDest, null, null, onComplete); } 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 c2f844f9..f136e32e 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 @@ -88,10 +88,7 @@ public class PVOrdiniAcquistoGrigliaFragment extends BaseFragment implements ITi } public static PVOrdiniAcquistoGrigliaFragment newInstance() { - PVOrdiniAcquistoGrigliaFragment fragment = new PVOrdiniAcquistoGrigliaFragment(); - Bundle args = new Bundle(); - fragment.setArguments(args); - return fragment; + return new PVOrdiniAcquistoGrigliaFragment(); } @Override diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java index b8266759..3f2a77b6 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java @@ -29,6 +29,7 @@ import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsume import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel; import it.integry.integrywmsnative.core.rest.model.uds.DeleteULRequestDTO; +import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityBarcode; import it.integry.integrywmsnative.core.utility.UtilityBigDecimal; import it.integry.integrywmsnative.core.utility.UtilityDate; @@ -435,7 +436,7 @@ public class RettificaGiacenzeViewModel { private void askPostionChange(MtbColt mtbColt, Runnable onComplete) { - if (mtbColt.getGestioneEnum() == GestioneEnum.VENDITA || mtbColt.getSegno() == -1) { + if (mtbColt.getGestioneEnum() == GestioneEnum.VENDITA || mtbColt.getSegno() == -1 || !SettingsManager.iDB().isFlagPositionChangeRequest()) { onComplete.run(); return; } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java index 5590dbd4..71d6f300 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java @@ -307,22 +307,17 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT } + private void openProgress() { - if (!progressOpened && !this.mCurrentProgress.isAdded()) { - this.progressOpened = true; - requireActivity().runOnUiThread(() -> { - this.mCurrentProgress.show(requireActivity().getSupportFragmentManager(), "tag"); - }); - } + executorService.execute(() -> { + this.mCurrentProgress.show(requireActivity().getSupportFragmentManager()); + }); } private void closeProgress() { - if (progressOpened) { - this.progressOpened = false; - requireActivity().runOnUiThread(() -> { - mCurrentProgress.dismiss(); - }); - } + executorService.execute(() -> { + 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 6ec042e1..0d33ce4c 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 @@ -3,11 +3,11 @@ package it.integry.integrywmsnative.view.dialogs; import android.app.Dialog; import android.os.Build; import android.os.Bundle; -import android.view.LayoutInflater; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.FragmentManager; import com.google.android.material.dialog.MaterialAlertDialogBuilder; @@ -26,6 +26,8 @@ public class DialogProgressView extends DialogFragment { private String subtitle; private boolean indeterminateProgress; + private boolean progressOpened; + public static DialogProgressView newInstance(String title, String subtitle, boolean indeterminate) { return new DialogProgressView(title, subtitle, indeterminate); } @@ -43,7 +45,7 @@ public class DialogProgressView extends DialogFragment { @NonNull @Override public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { - mBindings = DialogProgressBinding.inflate(LayoutInflater.from(requireContext())); + mBindings = DialogProgressBinding.inflate(getLayoutInflater()); mBindings.setTitle(UtilityString.isNullOrEmpty(title) ? requireContext().getString(R.string.loading) : title); if (!UtilityString.isNullOrEmpty(subtitle)) mBindings.setSubtitle(subtitle); @@ -61,6 +63,21 @@ public class DialogProgressView extends DialogFragment { return alertDialog; } + public void show(@NonNull FragmentManager manager) { + if (!progressOpened && !isAdded() && !isInLayout()) { + this.progressOpened = true; + super.show(manager, "loading-dialog"); + } + } + + @Override + public void dismiss() { + if (progressOpened) { + this.progressOpened = false; + super.dismissAllowingStateLoss(); + } + } + public String getTitle() { return title; } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/DialogAskClienteView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/DialogAskClienteView.java index 22491d4f..42ceaa18 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/DialogAskClienteView.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/DialogAskClienteView.java @@ -145,7 +145,7 @@ public class DialogAskClienteView extends BaseDialogFragment { viewModel2.setOnAbortClickListener(this::dismiss); - this.dialogProgressView.show(this.getParentFragmentManager(), "tag"); + this.dialogProgressView.show(this.getParentFragmentManager()); this.initClienti(viewModel1, () -> { this.initDestinatari(viewModel2, () -> { diff --git a/app/src/main/res/drawable/logo_integry_full_white.xml b/app/src/main/res/drawable/logo_integry_full_white.xml index 486c595d..c7444ae2 100644 --- a/app/src/main/res/drawable/logo_integry_full_white.xml +++ b/app/src/main/res/drawable/logo_integry_full_white.xml @@ -1,61 +1,42 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file + android:width="646.51dp" + android:height="154.53dp" + android:viewportWidth="646.51" + android:viewportHeight="154.53"> + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/logo_integry_testo.xml b/app/src/main/res/drawable/logo_integry_testo.xml index 32918cc6..d8714fea 100644 --- a/app/src/main/res/drawable/logo_integry_testo.xml +++ b/app/src/main/res/drawable/logo_integry_testo.xml @@ -1,41 +1,42 @@ - - - - - - - - - - - - - - \ No newline at end of file + android:width="646.51dp" + android:height="154.53dp" + android:viewportWidth="646.51" + android:viewportHeight="154.53"> + + + + + + + + + + + + + diff --git a/app/src/main/res/raw/error_mail.html b/app/src/main/res/raw/error_mail.html deleted file mode 100644 index c11e6997..00000000 --- a/app/src/main/res/raw/error_mail.html +++ /dev/null @@ -1,287 +0,0 @@ - - - - - - - - *|Mail peppino|* - - - - - - - - -
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - -
- - - - - - - -
-
- -
-
-
- __APP_NAME__ - - ยท - __APP_PACKAGE__ v__APP_VERSION__ (__APP_VERSION_CODE__) -
Nuova segnalazione (__CUSTOMER_NAME__) -
- -
- - - - - - - - - - - - -
-
- - - -
Dai forza! È stato riscontrato un problema fatale: __ERROR_TITLE__ -
-
- __ERROR_DETAIL__ (__ERROR_DATE__) - 
__ERROR_STACKTRACE__
-
- -
- -
-
-
- Questa email è solo una notifica riguardo un errore che si è verificato in un progetto -
- -
-
- -
- - - - \ No newline at end of file diff --git a/build.gradle b/build.gradle index d0fd349c..aeeee85b 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { ext { kotlin_version = '1.9.20' - agp_version = '8.4.0' + agp_version = '8.7.1' } repositories { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0b456dee..af8dff6c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Feb 13 15:14:43 CET 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME