Merge branch 'fran_nazario' of github.com:Asturfran/Proyecto-android-formacion into alberto_duarte

 Conflicts:

	app/src/main/java/com/frannazario/proyectoandroid/data/utils/StringUtils.kt

	app/src/main/java/com/frannazario/proyectoandroid/data/viewmodels/SigninViewModel.kt

	app/src/main/java/com/frannazario/proyectoandroid/presentation/fragments/SigninFragment.kt

	app/src/main/res/layout/fragment_signin.xml

1 files changed, 3 insertions, 3 deletions

diff --git a/app/src/main/res/layout/fragment_signin.xml b/app/src/main/res/layout/fragment_signin.xml
index f88a274..ae1e7a3 100644
--- a/app/src/main/res/layout/fragment_signin.xml
+++ b/app/src/main/res/layout/fragment_signin.xml
@@ -4,7 +4,6 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/email_il"
         android:layout_width="match_parent"
@@ -34,13 +33,14 @@
             android:hint="@string/field_password" />
 
     </com.google.android.material.textfield.TextInputLayout>
+
     <Button
-        android:id="@+id/signup_btn"
+        android:id="@+id/signin_btn"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintTop_toBottomOf="@id/password_il"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        android:text="@string/signup" />
+        android:text="@string/signin" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file