Refactoring login

This commit is contained in:
2022-01-04 15:06:35 +01:00
parent e3ebfcb27d
commit 55c1cb40a2
19 changed files with 502 additions and 323 deletions

View File

@@ -5,8 +5,8 @@
<data>
<variable
name="loginViewModel"
type="it.integry.integrywmsnative.gest.login.viewmodel.LoginViewModel" />
name="view"
type="it.integry.integrywmsnative.gest.login.LoginActivity" />
</data>
@@ -36,7 +36,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
app:errorText="@{loginViewModel.usernameError}"
app:errorText="@{view.usernameError}"
app:hintTextAppearance="@style/hint_text"
style="@style/TextInputLayout.OutlinePrimary">
@@ -46,7 +46,7 @@
android:layout_height="wrap_content"
android:hint="Username"
android:inputType="textEmailAddress"
app:binding="@{loginViewModel.username}" />
app:binding="@{view.username}" />
</com.google.android.material.textfield.TextInputLayout>
<!-- Password Label -->
@@ -55,7 +55,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
app:errorText="@{loginViewModel.passwordError}"
app:errorText="@{view.passwordError}"
app:hintTextAppearance="@style/hint_text"
app:passwordToggleEnabled="true"
style="@style/TextInputLayout.OutlinePrimary">
@@ -66,16 +66,16 @@
android:layout_height="wrap_content"
android:hint="Password"
android:inputType="textPassword"
app:binding="@{loginViewModel.password}" />
app:binding="@{view.password}" />
</com.google.android.material.textfield.TextInputLayout>
<androidx.appcompat.widget.AppCompatCheckBox
android:id="@+id/login_checkbox_custom_server"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:enabled="@{loginViewModel.customSettingsCheckboxEnabled}"
android:enabled="@{view.customSettingsCheckboxEnabled}"
android:text="@string/action_customize_server_settings"
app:checked="@{loginViewModel.customSettingsCheckboxChecked}" />
app:checked="@{view.customSettingsCheckboxChecked}" />
<net.cachapa.expandablelayout.ExpandableLayout
android:id="@+id/login_layout_server_details"
@@ -84,7 +84,7 @@
android:paddingTop="6dp"
android:paddingBottom="12dp"
app:el_duration="400"
app:el_expanded_bind="@{loginViewModel.customSettingsCheckboxChecked}">
app:el_expanded_bind="@{view.customSettingsCheckboxChecked}">
<LinearLayout
android:layout_width="match_parent"
@@ -96,7 +96,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
app:errorText="@{loginViewModel.codAziendaError}"
app:errorText="@{view.codAziendaError}"
app:hintTextAppearance="@style/hint_text"
style="@style/TextInputLayout.OutlinePrimary">
@@ -106,7 +106,7 @@
android:layout_height="wrap_content"
android:hint="Codice azienda"
android:inputType="text"
app:binding="@{loginViewModel.codAzienda}" />
app:binding="@{view.codAzienda}" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
@@ -121,9 +121,9 @@
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:layout_marginBottom="24dp"
android:enabled="@{loginViewModel.loginButtonEnabled}"
android:enabled="@{view.loginButtonEnabled}"
android:text="@string/login"
app:onClick="@{() -> loginViewModel.login(loginViewModel.validate())}" />
app:onClick="@{() -> view.login()}" />
</androidx.appcompat.widget.LinearLayoutCompat>