Updated class 2/06/23

9 files changed, 91 insertions, 22 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 6079f28..8244d95 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -63,6 +63,7 @@ dependencies {
     implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3'
     implementation "androidx.fragment:fragment-ktx:1.5.7"
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'com.google.android.material:material:1.9.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
diff --git a/app/src/main/java/com/frannazario/proyectoandroid/LoginFragment.kt b/app/src/main/java/com/frannazario/proyectoandroid/LoginFragment.kt
index ee107a1..3bf3107 100644
--- a/app/src/main/java/com/frannazario/proyectoandroid/LoginFragment.kt
+++ b/app/src/main/java/com/frannazario/proyectoandroid/LoginFragment.kt
@@ -15,11 +15,14 @@ class LoginFragment: Fragment() {
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         binding = FragmentLoginBinding.inflate(inflater, container, false)
-        binding.button.setOnClickListener {
+        binding.signinBtn.setOnClickListener {
             findNavController().navigate(R.id.navigate_from_loginfragment_to_signinfragment)
         }
+        binding.forgetPasswordBtn.setOnClickListener {
+            findNavController().navigate(R.id.navigate_from_loginfragment_to_passwordrecoveryfragment)
+        }
         return binding.root
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/frannazario/proyectoandroid/PasswordRecoveryFragment.kt b/app/src/main/java/com/frannazario/proyectoandroid/PasswordRecoveryFragment.kt
new file mode 100644
index 0000000..f330279
--- /dev/null
+++ b/app/src/main/java/com/frannazario/proyectoandroid/PasswordRecoveryFragment.kt
@@ -0,0 +1,21 @@
+package com.frannazario.proyectoandroid
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import com.frannazario.proyectoandroid.databinding.FragmentPasswordRecoveryBinding
+
+class PasswordRecoveryFragment: Fragment() {
+    private lateinit var binding: FragmentPasswordRecoveryBinding
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = FragmentPasswordRecoveryBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/frannazario/proyectoandroid/SigninFragment.kt b/app/src/main/java/com/frannazario/proyectoandroid/SigninFragment.kt
index 91793e6..ccec5af 100644
--- a/app/src/main/java/com/frannazario/proyectoandroid/SigninFragment.kt
+++ b/app/src/main/java/com/frannazario/proyectoandroid/SigninFragment.kt
@@ -14,7 +14,7 @@ class SigninFragment: Fragment() {
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         binding = FragmentSigninBinding.inflate(inflater, container, false)
         return binding.root
     }
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index db2bfbb..ca2d5bc 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -3,30 +3,62 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:layout_margin="10dp"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <TextView
-        android:id="@+id/email_tv"
-        android:layout_width="wrap_content"
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/email_il"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/field_email"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"/>
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/field_email" />
+
+    </com.google.android.material.textfield.TextInputLayout>
 
-    <EditText
-        android:id="@+id/email_et"
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/password_il"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/email_tv"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintTop_toBottomOf="@id/email_il">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/field_signin" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <Button
+        android:id="@+id/login_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/login" />
+
+    <Button
+        android:id="@+id/forget_password_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/login_btn"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:text="@string/forgot_password" />
 
     <Button
-        android:id="@+id/button"
+        android:id="@+id/signin_btn"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/email_et"
+        app:layout_constraintTop_toBottomOf="@id/forget_password_btn"
         app:layout_constraintStart_toStartOf="parent"
-        android:text="Navegar" />
+        app:layout_constraintEnd_toEndOf="parent"
+        android:text="@string/signin" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 28b85fd..969031b 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -15,16 +15,22 @@
             android:id="@+id/navigate_from_loginfragment_to_signinfragment"
             app:destination="@id/signin_fragment" />
 
+        <action
+            android:id="@+id/navigate_from_loginfragment_to_passwordrecoveryfragment"
+            app:destination="@id/password_recovery_fragment" />
+
     </fragment>
 
     <fragment
         android:id="@+id/signin_fragment"
         android:name="com.frannazario.proyectoandroid.SigninFragment"
         android:label="Sign in"
-        tools:layout="@layout/fragment_signin">
-
-    </fragment>
-
+        tools:layout="@layout/fragment_signin" />
 
+    <fragment
+        android:id="@+id/password_recovery_fragment"
+        android:name="com.frannazario.proyectoandroid.PasswordRecoveryFragment"
+        android:label="Password recovery"
+        tools:layout="@layout/fragment_password_recovery" />
 
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index c81b8e1..1a2566e 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2,4 +2,7 @@
 <resources>
     <string name="field_email">Correo electronico</string>
     <string name="field_signin">Registro</string>
+    <string name="forgot_password">Olvidé la contraseña</string>
+    <string name="signin">Registrarte</string>
+    <string name="login">Acceder</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2447b7c..36859ed 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,4 +3,7 @@
 
     <string name="field_email">Email</string>
     <string name="field_signin">Sign in</string>
+    <string name="forgot_password">Forget password</string>
+    <string name="signin">Sign in</string>
+    <string name="login">Login</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 08a9cce..725c200 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <style name="Theme.ProyectoAndroid" parent="android:Theme.Material.Light.NoActionBar" />
+    <style name="Theme.ProyectoAndroid" parent="Theme.AppCompat.Light.DarkActionBar" />
+    <style name="Theme.ProyectoAndroidCompose" parent="android:Theme.Material.Light.NoActionBar" />
 </resources>
\ No newline at end of file