diff options
Diffstat (limited to 'app/src/main/res')
18 files changed, 290 insertions, 51 deletions
diff --git a/app/src/main/res/drawable/button_clicked.xml b/app/src/main/res/drawable/button_clicked.xml index c39a7e3..30a43e9 100644 --- a/app/src/main/res/drawable/button_clicked.xml +++ b/app/src/main/res/drawable/button_clicked.xml @@ -1,13 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <stroke - android:width="5dp" - android:color="@color/black" /> <gradient android:type="linear" android:angle="45" - android:startColor="@color/purple_200" - android:endColor="@color/purple_700" /> + android:startColor="#008477" + android:endColor="#000000" /> <corners android:radius="15dp" /> </shape>
\ No newline at end of file diff --git a/app/src/main/res/drawable/button_stand.xml b/app/src/main/res/drawable/button_stand.xml index 5c58464..d918a01 100644 --- a/app/src/main/res/drawable/button_stand.xml +++ b/app/src/main/res/drawable/button_stand.xml @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <stroke - android:width="5dp" - android:color="@color/black" /> - <solid android:color="@color/purple_500" /> + <solid android:color="#008477" /> <corners android:radius="15dp" /> </shape>
\ No newline at end of file diff --git a/app/src/main/res/drawable/ic_art.png b/app/src/main/res/drawable/ic_art.png Binary files differnew file mode 100644 index 0000000..77d0b8d --- /dev/null +++ b/app/src/main/res/drawable/ic_art.png diff --git a/app/src/main/res/drawable/ic_entertainment.png b/app/src/main/res/drawable/ic_entertainment.png Binary files differnew file mode 100644 index 0000000..5b7da48 --- /dev/null +++ b/app/src/main/res/drawable/ic_entertainment.png diff --git a/app/src/main/res/drawable/ic_general.png b/app/src/main/res/drawable/ic_general.png Binary files differnew file mode 100644 index 0000000..e837615 --- /dev/null +++ b/app/src/main/res/drawable/ic_general.png diff --git a/app/src/main/res/drawable/ic_geography.png b/app/src/main/res/drawable/ic_geography.png Binary files differnew file mode 100644 index 0000000..53b03e2 --- /dev/null +++ b/app/src/main/res/drawable/ic_geography.png diff --git a/app/src/main/res/drawable/ic_history.png b/app/src/main/res/drawable/ic_history.png Binary files differnew file mode 100644 index 0000000..608ff57 --- /dev/null +++ b/app/src/main/res/drawable/ic_history.png diff --git a/app/src/main/res/drawable/ic_pop.png b/app/src/main/res/drawable/ic_pop.png Binary files differnew file mode 100644 index 0000000..d67332a --- /dev/null +++ b/app/src/main/res/drawable/ic_pop.png diff --git a/app/src/main/res/drawable/ic_science.png b/app/src/main/res/drawable/ic_science.png Binary files differnew file mode 100644 index 0000000..c7b0ecd --- /dev/null +++ b/app/src/main/res/drawable/ic_science.png diff --git a/app/src/main/res/drawable/ic_sports.png b/app/src/main/res/drawable/ic_sports.png Binary files differnew file mode 100644 index 0000000..d3b83a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_sports.png diff --git a/app/src/main/res/drawable/input.xml b/app/src/main/res/drawable/input.xml new file mode 100644 index 0000000..aa0bbc6 --- /dev/null +++ b/app/src/main/res/drawable/input.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <gradient + android:type="linear" + android:angle="45" + android:startColor="#444444" + android:endColor="#222222" /> + <corners android:radius="15dp" /> + +</shape>
\ No newline at end of file diff --git a/app/src/main/res/drawable/input_background.xml b/app/src/main/res/drawable/input_background.xml new file mode 100644 index 0000000..c810750 --- /dev/null +++ b/app/src/main/res/drawable/input_background.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@drawable/input" /> +</selector>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml index 61f0a8d..6360895 100644 --- a/app/src/main/res/layout/fragment_login.xml +++ b/app/src/main/res/layout/fragment_login.xml @@ -3,19 +3,47 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_margin="10dp" + android:background="#000000" xmlns:app="http://schemas.android.com/apk/res-auto"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/login" + android:textColor="@color/white" + android:textSize="40sp" + app:layout_constraintStart_toStartOf="parent" + android:textAllCaps="true" + android:textStyle="bold" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toTopOf="@id/layout"/> + + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/layout" + android:layout_width="300dp" + android:layout_height="wrap_content" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + > + <com.google.android.material.textfield.TextInputLayout android:id="@+id/email_il" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:background="@drawable/input_background" + android:textColorHint="#fff" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> <com.google.android.material.textfield.TextInputEditText + android:id="@+id/email_iet" android:layout_width="match_parent" android:layout_height="wrap_content" + android:textColor="@color/white" + android:textColorHint="@color/white" android:hint="@string/field_email" /> </com.google.android.material.textfield.TextInputLayout> @@ -23,42 +51,74 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/password_il" android:layout_width="match_parent" + android:layout_marginTop="16dp" android:layout_height="wrap_content" + android:background="@drawable/input_background" + android:textColorHint="#fff" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/email_il"> <com.google.android.material.textfield.TextInputEditText + android:id="@+id/password_iet" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="@string/field_signin" /> + android:textColor="@color/white" + android:textColorHint="@color/white" + android:hint="@string/field_password" /> </com.google.android.material.textfield.TextInputLayout> + <Button + android:id="@+id/forget_password_btn" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="#000000" + android:textColor="#aaaaaa" + app:layout_constraintEnd_toEndOf="@id/layout" + app:layout_constraintTop_toBottomOf="@id/password_il" + android:text="Forgot your password?" /> + <Button android:id="@+id/login_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" - app:layout_constraintTop_toBottomOf="@id/password_il" + android:background="@drawable/button_background" + android:textColor="@color/white" + android:paddingHorizontal="10dp" + app:layout_constraintTop_toBottomOf="@id/forget_password_btn" 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" /> + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/layout2" + android:layout_width="300dp" + android:layout_height="wrap_content" + app:layout_constraintStart_toStartOf="@id/layout" + app:layout_constraintTop_toBottomOf="@id/login_btn" + > + <TextView + android:id="@+id/text_passrcv" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Dont have an account?" + android:textColor="@color/white" + android:textSize="17sp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + /> <Button android:id="@+id/signin_btn" - android:layout_width="wrap_content" + android:layout_width="70dp" android:layout_height="wrap_content" - app:layout_constraintTop_toBottomOf="@id/forget_password_btn" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toEndOf="parent" - android:text="@string/signup" /> - + android:background="#000000" + android:textColor="#008477" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@id/text_passrcv" + android:text="@string/Register" /> + </androidx.constraintlayout.widget.ConstraintLayout> +</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_password_recovery.xml b/app/src/main/res/layout/fragment_password_recovery.xml index 22d7df4..ecc3cb2 100644 --- a/app/src/main/res/layout/fragment_password_recovery.xml +++ b/app/src/main/res/layout/fragment_password_recovery.xml @@ -1,17 +1,95 @@ <?xml version="1.0" encoding="utf-8"?> -<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.constraintlayout.widget.ConstraintLayout + xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="#000000" xmlns:app="http://schemas.android.com/apk/res-auto"> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="B" - android:textSize="200sp" + android:text="Recovery" + android:textColor="@color/white" + android:textAllCaps="true" + android:textStyle="bold" + android:textSize="40sp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toTopOf="@id/layout"/> + + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/layout" + android:layout_width="300dp" + android:layout_height="wrap_content" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toEndOf="parent" /> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + > + + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/email_il" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:background="@drawable/input_background" + android:textColorHint="#fff" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/email_iet" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textColor="@color/white" + android:textColorHint="@color/white" + android:hint="@string/field_email" /> + + </com.google.android.material.textfield.TextInputLayout> + + <Button + android:id="@+id/send_email_btn" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:background="@drawable/button_background" + android:textColor="@color/white" + android:paddingHorizontal="10dp" + app:layout_constraintTop_toBottomOf="@id/email_il" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + android:text="@string/send_email" /> + + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/layout2" + android:layout_width="300dp" + android:layout_height="wrap_content" + app:layout_constraintStart_toStartOf="@id/layout" + app:layout_constraintTop_toBottomOf="@id/send_email_btn" + > + <TextView + android:id="@+id/text_passrcv" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Did you remembered?" + android:textColor="@color/white" + android:textSize="17sp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + /> + <Button + android:id="@+id/login_btn" + android:layout_width="70dp" + android:layout_height="wrap_content" + android:textColor="#008477" + app:layout_constraintTop_toTopOf="parent" + android:background="#000000" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@id/text_passrcv" + android:text="@string/login" /> + </androidx.constraintlayout.widget.ConstraintLayout> + </androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_signin.xml b/app/src/main/res/layout/fragment_signin.xml index 362a731..5e0f99a 100644 --- a/app/src/main/res/layout/fragment_signin.xml +++ b/app/src/main/res/layout/fragment_signin.xml @@ -1,21 +1,49 @@ <?xml version="1.0" encoding="utf-8"?> <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - xmlns:app="http://schemas.android.com/apk/res-auto"> + android:background="#000000"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/Register" + android:textColor="@color/white" + android:textSize="40sp" + app:layout_constraintStart_toStartOf="parent" + android:textAllCaps="true" + android:textStyle="bold" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toTopOf="@id/layout"/> + + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/layout" + android:layout_width="300dp" + android:layout_height="wrap_content" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + > <com.google.android.material.textfield.TextInputLayout android:id="@+id/email_il" android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_constraintStart_toStartOf="parent" + android:background="@drawable/input_background" + android:layout_marginTop="16dp" + android:textColorHint="#fff" app:layout_constraintTop_toTopOf="parent"> <com.google.android.material.textfield.TextInputEditText android:id="@+id/email_iet" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="@string/field_email" /> + android:hint="@string/field_email" + android:textColor="@color/white" + android:textColorHint="@color/white"/> </com.google.android.material.textfield.TextInputLayout> @@ -23,10 +51,15 @@ android:id="@+id/password_il" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:textColorHint="#fff" + android:background="@drawable/input_background" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/email_il"> <com.google.android.material.textfield.TextInputEditText + android:textColor="#ffffff" + android:textColorHint="#ffffff" android:id="@+id/password_iet" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -34,15 +67,47 @@ </com.google.android.material.textfield.TextInputLayout> - <Button - 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:textColor="@color/white" - android:background="@drawable/button_background" - android:text="@string/signin" /> + <Button + android:id="@+id/signin_btn" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:paddingHorizontal="10dp" + android:background="@drawable/button_background" + android:textColor="@color/white" + android:text="@string/signup" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/password_il" /> + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/layout2" + android:layout_width="300dp" + android:layout_height="wrap_content" + app:layout_constraintStart_toStartOf="@id/layout" + app:layout_constraintTop_toBottomOf="@id/signin_btn" + > + <TextView + android:id="@+id/text_passrcv" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Already registered?" + android:textColor="@color/white" + android:textSize="17sp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + /> + <Button + android:id="@+id/login_btn" + android:layout_width="70dp" + android:layout_height="wrap_content" + android:background="#000000" + android:textColor="#008477" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@id/text_passrcv" + android:text="@string/login" /> + </androidx.constraintlayout.widget.ConstraintLayout> +</androidx.constraintlayout.widget.ConstraintLayout> </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 cb1a441..cd6c344 100644 --- a/app/src/main/res/navigation/nav_graph.xml +++ b/app/src/main/res/navigation/nav_graph.xml @@ -25,12 +25,24 @@ android:id="@+id/signin_fragment" android:name="com.frannazario.proyectoandroid.presentation.fragments.SigninFragment" android:label="Sign in" - tools:layout="@layout/fragment_signin" /> + tools:layout="@layout/fragment_signin" > + + <action + android:id="@+id/navigate_from_signinfragment_to_loginfragment" + app:destination="@id/login_fragment" /> + + </fragment> <fragment android:id="@+id/password_recovery_fragment" android:name="com.frannazario.proyectoandroid.presentation.fragments.PasswordRecoveryFragment" android:label="Password recovery" - tools:layout="@layout/fragment_password_recovery" /> + tools:layout="@layout/fragment_password_recovery" > + + <action + android:id="@+id/navigate_from_passwordrecoveryfragment_to_loginfragment" + app:destination="@id/login_fragment" /> + + </fragment> </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 a4a8581..68fdc2f 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2,9 +2,16 @@ <resources> <string name="field_email">Correo electronico</string> <string name="field_password">Contrasena</string> - <string name="field_signin">Registro</string> - <string name="field_password">Contraseña</string> <string name="forgot_password">Olvidé la contraseña</string> - <string name="signup">Registrarte</string> + <string name="Register">Registrate</string> <string name="login">Acceder</string> + <string name="send_email">Enviar Correo</string> + <string name="category_science">Ciencia</string> + <string name="category_art">Arte</string> + <string name="category_entertainment">Entretenimiento</string> + <string name="category_geography">Geografia</string> + <string name="category_history">Historia</string> + <string name="category_pop">Cultura Pop</string> + <string name="category_sports">Deportes</string> + <string name="category_general">Conocimiento general</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 b04b94d..4804cf2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3,9 +3,17 @@ <string name="field_email">Email</string> <string name="field_password">Password</string> - <string name="field_signin">Sign in</string> - <string name="field_password">Password</string> <string name="forgot_password">Forget password</string> - <string name="signup">Sign Up</string> + <string name="signup">SignUp</string> + <string name="Register">Register</string> <string name="login">Login</string> + <string name="send_email">Send Email</string> + <string name="category_science">Science</string> + <string name="category_art">Art</string> + <string name="category_entertainment">Entertainment</string> + <string name="category_geography">Geography</string> + <string name="category_history">History</string> + <string name="category_pop">Pop Culture</string> + <string name="category_sports">Sports</string> + <string name="category_general">General Knowledge</string> </resources>
\ No newline at end of file |
