From de4a87658e30a00a88124fa3c6b7bc8f532f8396 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 20 Oct 2020 11:13:19 +0200 Subject: [PATCH 1/2] Fix su click di bottom sheet dialog (contenuto LU). Ripristinato pulsante Chiudi LU in dialogInputQuantity. --- .../AccettazionePickingActivity.java | 3 ++- .../gest/spedizione/SpedizioneActivity.java | 3 ++- .../BottomSheetFragmentLUContentView.java | 9 +++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java index f8ccfce9..1c56bb46 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java @@ -498,7 +498,8 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta .setQtaCnfAvailable(qtaCnfAvailable) .setPartitaMag(partitaMag) .setDataScad(dataScad) - .setCanPartitaMagBeChanged(canPartitaMagBeChanged); + .setCanPartitaMagBeChanged(canPartitaMagBeChanged) + .setCanLUBeClosed(true); DialogInputQuantityV2 .newInstance(dialogInputQuantityV2DTO, (resultDTO, shouldCloseLU) -> { 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 13966557..3d9f610e 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 @@ -719,7 +719,8 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo .setQtaCnfAvailable(qtaCnfAvailable) .setPartitaMag(partitaMag) .setDataScad(dataScad) - .setCanOverflowOrderQuantity(canOverflowOrderQuantity); + .setCanOverflowOrderQuantity(canOverflowOrderQuantity) + .setCanLUBeClosed(true); DialogInputQuantityV2 .newInstance(dialogInputQuantityV2DTO, (resultDTO, shouldCloseLU) -> { diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentView.java b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentView.java index 9b4c1e7d..db114b7b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentView.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentView.java @@ -3,6 +3,7 @@ package it.integry.integrywmsnative.view.bottom_sheet__lu_content; import android.content.Context; import android.util.AttributeSet; import android.view.LayoutInflater; +import android.view.View; import androidx.annotation.Nullable; import androidx.databinding.DataBindingUtil; @@ -14,6 +15,7 @@ import java.util.List; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback; +import it.integry.integrywmsnative.core.expansion.OnSingleClickListener; import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.databinding.BottomSheetFragmentLuContentBinding; import it.integry.integrywmsnative.view.bottom_sheet__base.BottomSheetFragmentBaseView; @@ -42,6 +44,13 @@ public class BottomSheetFragmentLUContentView extends BottomSheetFragmentBaseVie mBinding.bottomSheetMtbColrEdit.setListener(this); mBinding.bottomSheetMtbColrEdit.init(mBinding.bottomSheetMtbColrEdit, mBinding.bottomSheetMtbColrEditBackground); + mBinding.titleLayout.setOnClickListener(new OnSingleClickListener() { + @Override + public void onSingleClick(View v) { + toggle(); + } + }); + this.initCallbacks(); } From 6a7f3ee2edf8888644e9faebc7c9a1a1421f4dd5 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 20 Oct 2020 11:13:52 +0200 Subject: [PATCH 2/2] -> v13.11.12 (158) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8d085b93..ff195891 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 157 - def appVersionName = '1.13.11' + def appVersionCode = 158 + def appVersionName = '1.13.12' signingConfigs { release {