From f053c776a3460b9d596508dc44831fc10d369b26 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 9 Jun 2020 12:44:35 +0200 Subject: [PATCH] Fix library update on textInputLayout --- app/build.gradle | 6 +++--- .../viewmodel/RettificaGiacenzeViewModel.java | 1 + .../dialogs/DialogAskLivelloPosizione.java | 1 + .../DialogAskCliente_Page1ViewModel.java | 1 + .../DialogAskCliente_Page2ViewModel.java | 1 + .../DialogAskPositionOfLU.java | 1 + .../input_quantity/DialogInputQuantity.java | 1 + .../layout/dialog_input_quantity_articolo.xml | 12 +++++++---- .../fragment_main_rettifica_giacenze.xml | 21 +++++++++++++------ .../res/values/text_input_layout_style.xml | 6 ++++++ 10 files changed, 38 insertions(+), 13 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4d6d2c0b..a96a156e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -88,13 +88,13 @@ dependencies { }) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'com.orhanobut:logger:2.2.0' - implementation 'com.google.firebase:firebase-core:17.4.2' + implementation 'com.google.firebase:firebase-core:17.4.3' implementation 'com.google.firebase:firebase-crash:16.2.1' implementation 'com.google.firebase:firebase-perf:19.0.7' - implementation 'com.google.firebase:firebase-crashlytics:17.0.0' + implementation 'com.google.firebase:firebase-crashlytics:17.0.1' implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'com.google.android.material:material:1.1.0' + implementation 'com.google.android.material:material:1.3.0-alpha01' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta6' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.recyclerview:recyclerview:1.1.0' diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java index b0be33ba..2b707914 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java @@ -289,6 +289,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked private void setError(TextInputLayout textInputLayout, String message) { textInputLayout.setErrorEnabled(true); textInputLayout.setError(message); + textInputLayout.setErrorIconDrawable(null); } private void resetAllError() { diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogAskLivelloPosizione.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogAskLivelloPosizione.java index c0cb755b..a9e9b0d9 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogAskLivelloPosizione.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogAskLivelloPosizione.java @@ -135,6 +135,7 @@ public class DialogAskLivelloPosizione { private void setLevelError(String message){ livelloTextInputLayout.setErrorEnabled(true); livelloTextInputLayout.setError(message); + livelloTextInputLayout.setErrorIconDrawable(null); } private void resetLevelError() { diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java index 3d29a549..5c53062b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java @@ -113,6 +113,7 @@ public class DialogAskCliente_Page1ViewModel implements IDialogAskClienteViewMod private void setClienteError(String message){ mBinding.inputCliente.setErrorEnabled(true); mBinding.inputCliente.setError(message); + mBinding.inputCliente.setErrorIconDrawable(null); } private void resetClienteError() { mBinding.inputCliente.setError(null); diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2ViewModel.java index 3eaea8fb..febc4065 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2ViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2ViewModel.java @@ -117,6 +117,7 @@ public class DialogAskCliente_Page2ViewModel implements IDialogAskClienteViewMod private void setClienteError(String message){ mBinding.inputDestinatario.setErrorEnabled(true); mBinding.inputDestinatario.setError(message); + mBinding.inputDestinatario.setErrorIconDrawable(null); } private void resetClienteError() { mBinding.inputDestinatario.setError(null); diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java index 522e436b..1a9ae416 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java @@ -237,6 +237,7 @@ public class DialogAskPositionOfLU { private void setLevelError(String message){ livelloTextInputLayout.setErrorEnabled(true); livelloTextInputLayout.setError(message); + livelloTextInputLayout.setErrorIconDrawable(null); } private void resetLevelError() { diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java index e9210524..54eb2890 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java @@ -606,6 +606,7 @@ public class DialogInputQuantity { textInputLayout.setError(" "); textInputLayout.getEditText().setTextColor(ContextCompat.getColor(currentContext, R.color.red_600)); textInputLayout.setHintTextAppearance(R.style.ErrorFloatingLabel); + textInputLayout.setErrorIconDrawable(null); if (textInputLayout.getChildCount() == 2) { textInputLayout.getChildAt(1).setVisibility(View.GONE); diff --git a/app/src/main/res/layout/dialog_input_quantity_articolo.xml b/app/src/main/res/layout/dialog_input_quantity_articolo.xml index 568f1441..6fa87917 100644 --- a/app/src/main/res/layout/dialog_input_quantity_articolo.xml +++ b/app/src/main/res/layout/dialog_input_quantity_articolo.xml @@ -246,7 +246,8 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/guideline_partita_data" - android:nextFocusRight="@+id/input_data_scad"> + android:nextFocusRight="@+id/input_data_scad" + style="@style/TextInputLayout.NoLine"> + android:enabled="@{!(quantityViewModel.blockedQtaTot.get() && quantityViewModel.blockedQtaPerCnf.get())}" + style="@style/TextInputLayout.NoLine"> + android:enabled="@{!(quantityViewModel.blockedQtaTot.get() && quantityViewModel.blockedNumDiCnf.get())}" + style="@style/TextInputLayout.NoLine"> + android:enabled="@{!(quantityViewModel.blockedNumDiCnf.get() && quantityViewModel.blockedQtaPerCnf.get())}" + style="@style/TextInputLayout.NoLine"> + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@id/guide_line_fornitore" + style="@style/TextInputLayout.NoLine"> + android:hint="@string/supplier" + android:paddingStart="12dp"/> @@ -136,7 +140,9 @@ app:hintTextAppearance="@style/hint_text" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toEndOf="@id/guide_line_fornitore" - app:layout_constraintEnd_toEndOf="parent"> + app:layout_constraintEnd_toEndOf="parent" + android:layout_marginStart="8dp" + style="@style/TextInputLayout.NoLine"> @@ -185,7 +192,8 @@ app:hintTextAppearance="@style/hint_text" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toEndOf="parent"> + app:layout_constraintEnd_toEndOf="parent" + style="@style/TextInputLayout.NoLine"> diff --git a/app/src/main/res/values/text_input_layout_style.xml b/app/src/main/res/values/text_input_layout_style.xml index b5cfadf6..d43afb5c 100644 --- a/app/src/main/res/values/text_input_layout_style.xml +++ b/app/src/main/res/values/text_input_layout_style.xml @@ -1,5 +1,11 @@ + +