From 2b12e7f68c840214b33e772032aff90b8e47b9e0 Mon Sep 17 00:00:00 2001 From: "Alberto Duarte (PWC)" Date: Thu, 6 Jul 2023 09:09:09 +0100 Subject: muchos cambios, tieen room y arquitectura mvvm pero aun tiene errores --- app/src/main/res/drawable/button_clicked.xml | 7 +- app/src/main/res/drawable/button_stand.xml | 5 +- app/src/main/res/drawable/ic_art.png | Bin 0 -> 7953 bytes app/src/main/res/drawable/ic_entertainment.png | Bin 0 -> 5359 bytes app/src/main/res/drawable/ic_general.png | Bin 0 -> 4697 bytes app/src/main/res/drawable/ic_geography.png | Bin 0 -> 8157 bytes app/src/main/res/drawable/ic_history.png | Bin 0 -> 4970 bytes app/src/main/res/drawable/ic_pop.png | Bin 0 -> 8274 bytes app/src/main/res/drawable/ic_science.png | Bin 0 -> 5670 bytes app/src/main/res/drawable/ic_sports.png | Bin 0 -> 7861 bytes app/src/main/res/drawable/input.xml | 11 +++ app/src/main/res/drawable/input_background.xml | 4 + app/src/main/res/layout/fragment_login.xml | 94 +++++++++++++++++---- .../main/res/layout/fragment_password_recovery.xml | 88 +++++++++++++++++-- app/src/main/res/layout/fragment_signin.xml | 89 ++++++++++++++++--- app/src/main/res/navigation/nav_graph.xml | 16 +++- app/src/main/res/values-es/strings.xml | 13 ++- app/src/main/res/values/strings.xml | 14 ++- 18 files changed, 290 insertions(+), 51 deletions(-) create mode 100644 app/src/main/res/drawable/ic_art.png create mode 100644 app/src/main/res/drawable/ic_entertainment.png create mode 100644 app/src/main/res/drawable/ic_general.png create mode 100644 app/src/main/res/drawable/ic_geography.png create mode 100644 app/src/main/res/drawable/ic_history.png create mode 100644 app/src/main/res/drawable/ic_pop.png create mode 100644 app/src/main/res/drawable/ic_science.png create mode 100644 app/src/main/res/drawable/ic_sports.png create mode 100644 app/src/main/res/drawable/input.xml create mode 100644 app/src/main/res/drawable/input_background.xml (limited to 'app/src/main/res') 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 @@ - + android:startColor="#008477" + android:endColor="#000000" /> \ 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 @@ - - + \ 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 new file mode 100644 index 0000000..77d0b8d Binary files /dev/null and b/app/src/main/res/drawable/ic_art.png differ diff --git a/app/src/main/res/drawable/ic_entertainment.png b/app/src/main/res/drawable/ic_entertainment.png new file mode 100644 index 0000000..5b7da48 Binary files /dev/null and b/app/src/main/res/drawable/ic_entertainment.png differ diff --git a/app/src/main/res/drawable/ic_general.png b/app/src/main/res/drawable/ic_general.png new file mode 100644 index 0000000..e837615 Binary files /dev/null and b/app/src/main/res/drawable/ic_general.png differ diff --git a/app/src/main/res/drawable/ic_geography.png b/app/src/main/res/drawable/ic_geography.png new file mode 100644 index 0000000..53b03e2 Binary files /dev/null and b/app/src/main/res/drawable/ic_geography.png differ diff --git a/app/src/main/res/drawable/ic_history.png b/app/src/main/res/drawable/ic_history.png new file mode 100644 index 0000000..608ff57 Binary files /dev/null and b/app/src/main/res/drawable/ic_history.png differ diff --git a/app/src/main/res/drawable/ic_pop.png b/app/src/main/res/drawable/ic_pop.png new file mode 100644 index 0000000..d67332a Binary files /dev/null and b/app/src/main/res/drawable/ic_pop.png differ diff --git a/app/src/main/res/drawable/ic_science.png b/app/src/main/res/drawable/ic_science.png new file mode 100644 index 0000000..c7b0ecd Binary files /dev/null and b/app/src/main/res/drawable/ic_science.png differ diff --git a/app/src/main/res/drawable/ic_sports.png b/app/src/main/res/drawable/ic_sports.png new file mode 100644 index 0000000..d3b83a4 Binary files /dev/null and b/app/src/main/res/drawable/ic_sports.png differ 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 @@ + + + + + + \ 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 @@ + + + + \ 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"> + + + + @@ -23,42 +51,74 @@ + android:textColor="@color/white" + android:textColorHint="@color/white" + android:hint="@string/field_password" /> +