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 171cedc6..3dbac6b5 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 @@ -52,9 +52,12 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia @Inject DialogInputQuantityV2ViewModel mViewModel; - private DialogInputQuantityV2DTO mDialogInputQuantityV2DTO; - private RunnableArgss mOnComplete; - private Runnable mOnAbort; + private final DialogInputQuantityV2DTO mDialogInputQuantityV2DTO; + private final RunnableArgss mOnComplete; + private final Runnable mOnAbort; + + public ObservableField currentTextNumCnfToTake = new ObservableField<>(0); + public ObservableField currentTextNumPezziToTake = new ObservableField<>(0); public ObservableField currentPartitaMag = new ObservableField<>(); public ObservableField currentNotes = new ObservableField<>(); @@ -215,12 +218,6 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia } }); - UtilityObservable.addPropertyChanged(this.currentNotes, (value) -> { - if (this.mEnableDataCallback) { - this.mViewModel.setNote(value); - } - }); - UtilityObservable.addPropertyChanged(this.currentDataScad, (value) -> { if (this.mEnableDataCallback) { MtbAart mtbAart = this.mViewModel.getMtbAart(); @@ -246,6 +243,12 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia } }); + UtilityObservable.addPropertyChanged(this.currentNotes, (value) -> { + if (this.mEnableDataCallback) { + this.mViewModel.setNote(value); + } + }); + UtilityObservable.addPropertyChanged(this.currentNumCnf, (value) -> { if (this.mEnableDataCallback) { this.mViewModel.setNumCnf(value); @@ -374,6 +377,10 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia this.enabledNotes.set(this.mDialogInputQuantityV2DTO.isNotesAllowed()); this.enabledLUCloseButton.set(this.mDialogInputQuantityV2DTO.isCanLUBeClosed()); this.currentTaraArticolo.set(this.mViewModel.getMtbAart().getTaraKg()); + + this.currentTextNumCnfToTake.set(this.mDialogInputQuantityV2DTO.getTotalNumCnfOrd().intValue()); + int qtaText = this.mDialogInputQuantityV2DTO.getTotalQtaOrd().intValue() % this.mDialogInputQuantityV2DTO.getTotalNumCnfOrd().intValue(); + this.currentTextNumPezziToTake.set(qtaText); } 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 bda17d94..688eaf0e 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 @@ -31,10 +31,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" + android:background="@android:color/white" android:orientation="vertical" app:cardCornerRadius="12dp" - app:cardElevation="0dp" - android:background="@android:color/white"> + app:cardElevation="0dp"> + + + + + + + + + + + + + + + + + + + + + + @@ -557,12 +645,12 @@ @@ -580,13 +668,13 @@ @@ -609,8 +697,8 @@ android:layout_height="wrap_content" android:hint="@string/LU_weight" android:inputType="number" - android:visibility="@{view.enabledNotes ? View.VISIBLE : View.GONE }" android:textColor="@{ContextCompat.getColor(context, view.enabledQtaCnf ? android.R.color.black : R.color.gray_400)}" + android:visibility="@{view.enabledNotes ? View.VISIBLE : View.GONE }" app:binding="@{view.currentPesoLordo}" /> 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 43788fa8..6f0683a7 100644 --- a/app/src/main/res/layout/dialog_input_quantity_v2.xml +++ b/app/src/main/res/layout/dialog_input_quantity_v2.xml @@ -75,15 +75,15 @@ tools:text="COD MART (Partita mag)" /> @@ -195,6 +195,95 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -518,9 +607,9 @@ android:layout_height="wrap_content" android:hint="@string/qty_x_pck" android:imeOptions="actionDone" - android:selectAllOnFocus="true" - android:nextFocusForward="@+id/input_qta_tot_text" android:inputType="numberDecimal" + android:nextFocusForward="@+id/input_qta_tot_text" + android:selectAllOnFocus="true" app:binding="@{view.currentQtaCnf}" /> @@ -574,12 +663,12 @@ @@ -597,13 +686,13 @@ @@ -617,6 +706,7 @@ android:enabled="@{view.enabledPesoLordo}" android:focusableInTouchMode="false" android:imeOptions="actionDone" + tools:enabled="false" tools:layout_weight="1"> pezzi - collo - colli + confezione + confezioni Unt mis col diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 4959bd0d..f896ab54 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -46,6 +46,9 @@ #BBDEFB #64B5F6 + #42A5F5 + #2196F3 + #1E88E5 #1976D2 #1565C0