diff --git a/app/build.gradle b/app/build.gradle index 75059e7d..cadf3583 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 492 - def appVersionName = '1.46.04' + def appVersionCode = 493 + def appVersionName = '1.46.05' signingConfigs { release { 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 1acacb2f..141958e0 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 @@ -4,6 +4,8 @@ import android.content.Context; import android.content.Intent; import android.content.res.Resources; import android.os.Bundle; +import android.os.Handler; +import android.text.InputType; import android.text.SpannableString; import androidx.databinding.DataBindingUtil; @@ -51,6 +53,7 @@ import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO; import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentView; import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentViewModel; import it.integry.integrywmsnative.view.dialogs.DialogConsts; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleInputHelper; import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.DialogInfoAggiuntiveLUView; import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO; @@ -68,6 +71,9 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag @Inject DialogInputQuantityV2View mDialogInputQuantityV2View; + @Inject + Handler handler; + private BottomSheetFragmentLUContentViewModel mBottomSheetFragmentLUContentViewModel; private ObservableArrayList mPickingResiMutableData = new ObservableArrayList<>(); @@ -250,10 +256,7 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag public void createNewLU() { this.mBindings.mainFab.close(true); this.onLoadingStarted(); - - this.mViewmodel.createNewLU(null, null, () -> { - this.onLoadingEnded(); - }); + this.mViewmodel.createNewLU(null, null, this::onLoadingEnded); } public void removeListFilter() { @@ -333,7 +336,7 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag mDialogInputQuantityV2View .setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO) .setOnComplete(resultDTO -> { - if(resultDTO == null || resultDTO.isAborted()) { + if (resultDTO == null || resultDTO.isAborted()) { this.mViewmodel.resetMatchedRows(); return; } @@ -369,7 +372,7 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag @Override public void onRowSaved() { Snackbar.make(mBindings.getRoot(), R.string.data_saved, Snackbar.LENGTH_SHORT) - .setBackgroundTint(getResources().getColor(R. color. green_500)) + .setBackgroundTint(getResources().getColor(R.color.green_500)) .show(); } @@ -385,21 +388,25 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag @Override public void onLUOpened(MtbColt mtbColt) { - noLUPresent.set(false); + handler.post(() -> { + noLUPresent.set(false); - Snackbar.make(mBindings.getRoot(), R.string.data_saved, Snackbar.LENGTH_SHORT) - .setBackgroundTint(getResources().getColor(R. color. green_500)) - .show(); + Snackbar.make(mBindings.getRoot(), R.string.data_saved, Snackbar.LENGTH_SHORT) + .setBackgroundTint(getResources().getColor(R.color.green_500)) + .show(); - this.mBottomSheetFragmentLUContentViewModel.setMtbColt(mtbColt); + this.mBottomSheetFragmentLUContentViewModel.setMtbColt(mtbColt); + }); } @Override public void onLUClosed() { - noLUPresent.set(true); - this.mBottomSheetFragmentLUContentViewModel.setMtbColt(null); + handler.post(() -> { + noLUPresent.set(true); + this.mBottomSheetFragmentLUContentViewModel.setMtbColt(null); - if (this.mShouldCloseActivity) super.onBackPressed(); + if (this.mShouldCloseActivity) super.onBackPressed(); + }); } @Override diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLUModule.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLUModule.java index b8714c7c..31639926 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLUModule.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLUModule.java @@ -1,5 +1,7 @@ package it.integry.integrywmsnative.view.dialogs.basket_lu; +import android.os.Handler; + import dagger.Module; import dagger.Provides; import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; @@ -10,8 +12,8 @@ import it.integry.integrywmsnative.view.dialogs.basket_lu.pages.page2.DialogBask public class DialogBasketLUModule { @Provides - DialogBasketLU_Page1_ViewModel providesDialogBasketLUPage1ViewModel(ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer) { - return new DialogBasketLU_Page1_ViewModel(colliMagazzinoRESTConsumer); + DialogBasketLU_Page1_ViewModel providesDialogBasketLUPage1ViewModel(ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer, Handler handler) { + return new DialogBasketLU_Page1_ViewModel(colliMagazzinoRESTConsumer, handler); } @Provides diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLUView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLUView.java index 7c6d90c2..cf737bcb 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLUView.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLUView.java @@ -2,6 +2,7 @@ package it.integry.integrywmsnative.view.dialogs.basket_lu; import android.app.Dialog; import android.os.Bundle; +import android.os.Handler; import android.view.LayoutInflater; import androidx.annotation.NonNull; @@ -36,7 +37,8 @@ public class DialogBasketLUView extends BaseDialogFragment { private final RunnableArgs mOnComplete; private DialogBasketLuBinding mBindings; - + @Inject + Handler handler; public DialogBasketLUView(RunnableArgs onComplete) { mOnComplete = onComplete; @@ -52,7 +54,7 @@ public class DialogBasketLUView extends BaseDialogFragment { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { mBindings = DialogBasketLuBinding.inflate(LayoutInflater.from(requireContext()), null, false); - var alertDialog = new MaterialAlertDialogBuilder(requireContext()) + var alertDialog = new MaterialAlertDialogBuilder(requireContext()) .setView(mBindings.getRoot()) .setCancelable(false) .create(); diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page1/DialogBasketLU_Page1_ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page1/DialogBasketLU_Page1_ViewModel.java index d71dff93..4e7627a9 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page1/DialogBasketLU_Page1_ViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page1/DialogBasketLU_Page1_ViewModel.java @@ -1,6 +1,7 @@ package it.integry.integrywmsnative.view.dialogs.basket_lu.pages.page1; import android.content.Context; +import android.os.Handler; import android.view.View; import androidx.core.content.ContextCompat; @@ -30,9 +31,12 @@ public class DialogBasketLU_Page1_ViewModel extends DialogBasketLU_BaseViewModel private final ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer; + private final Handler handler; + @Inject - public DialogBasketLU_Page1_ViewModel(ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer) { + public DialogBasketLU_Page1_ViewModel(ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer, Handler handler) { this.colliMagazzinoRESTConsumer = colliMagazzinoRESTConsumer; + this.handler = handler; } @Override @@ -53,16 +57,19 @@ public class DialogBasketLU_Page1_ViewModel extends DialogBasketLU_BaseViewModel @Override public void onShow() { this.mBinding.getRoot().requestLayout(); - mBinding.constraintLayout.setMaxHeight((int) (mContext.getResources().getDisplayMetrics().heightPixels * 0.75)); colliMagazzinoRESTConsumer.retrieveBasketColli(mtbColts -> { - availableMtbColts = mtbColts; - if(mtbColts != null && !mtbColts.isEmpty()) initRecyclerView(availableMtbColts); + handler.post(() -> { + availableMtbColts = mtbColts; + if(mtbColts != null && !mtbColts.isEmpty()) initRecyclerView(availableMtbColts); - mBinding.emptyView.setVisibility(mtbColts != null && !mtbColts.isEmpty() ? View.GONE : View.VISIBLE); + mBinding.emptyView.setVisibility(mtbColts != null && !mtbColts.isEmpty() ? View.GONE : View.VISIBLE); + }); }, ex -> { - mBinding.emptyView.setVisibility(View.VISIBLE); + handler.post(() -> { + mBinding.emptyView.setVisibility(View.VISIBLE); + }); }); }