diff options
Diffstat (limited to 'app/src/main/res')
22 files changed, 713 insertions, 698 deletions
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml index 2b068d1..cc14f03 100644 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -1,30 +1,30 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:aapt="http://schemas.android.com/aapt" - android:width="108dp" - android:height="108dp" - android:viewportWidth="108" - android:viewportHeight="108"> - <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z"> - <aapt:attr name="android:fillColor"> - <gradient - android:endX="85.84757" - android:endY="92.4963" - android:startX="42.9492" - android:startY="49.59793" - android:type="linear"> - <item - android:color="#44000000" - android:offset="0.0" /> - <item - android:color="#00000000" - android:offset="1.0" /> - </gradient> - </aapt:attr> - </path> - <path - android:fillColor="#FFFFFF" - android:fillType="nonZero" - android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z" - android:strokeWidth="1" - android:strokeColor="#00000000" /> +<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:aapt="http://schemas.android.com/aapt"
+ android:width="108dp"
+ android:height="108dp"
+ android:viewportWidth="108"
+ android:viewportHeight="108">
+ <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:endX="85.84757"
+ android:endY="92.4963"
+ android:startX="42.9492"
+ android:startY="49.59793"
+ android:type="linear">
+ <item
+ android:color="#44000000"
+ android:offset="0.0" />
+ <item
+ android:color="#00000000"
+ android:offset="1.0" />
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:fillColor="#FFFFFF"
+ android:fillType="nonZero"
+ android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+ android:strokeWidth="1"
+ android:strokeColor="#00000000" />
</vector>
\ No newline at end of file diff --git a/app/src/main/res/drawable/baseline_edit_24.xml b/app/src/main/res/drawable/baseline_edit_24.xml new file mode 100644 index 0000000..1c9bd3e --- /dev/null +++ b/app/src/main/res/drawable/baseline_edit_24.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" android:tint="#000000" + android:viewportHeight="24" android:viewportWidth="24" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="@android:color/white" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/> +</vector> diff --git a/app/src/main/res/drawable/baseline_edit_off_24.xml b/app/src/main/res/drawable/baseline_edit_off_24.xml new file mode 100644 index 0000000..f03dc42 --- /dev/null +++ b/app/src/main/res/drawable/baseline_edit_off_24.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" android:tint="#000000" + android:viewportHeight="24" android:viewportWidth="24" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="@android:color/white" android:pathData="M12.126,8.125l1.937,-1.937 3.747,3.747 -1.937,1.938zM20.71,5.63l-2.34,-2.34a1,1 0,0 0,-1.41 0l-1.83,1.83 3.75,3.75L20.71,7a1,1 0,0 0,0 -1.37zM2,5l6.63,6.63L3,17.25V21h3.75l5.63,-5.62L18,21l2,-2L4,3 2,5z"/> +</vector> diff --git a/app/src/main/res/drawable/baseline_settings_24.xml b/app/src/main/res/drawable/baseline_settings_24.xml new file mode 100644 index 0000000..298a5a1 --- /dev/null +++ b/app/src/main/res/drawable/baseline_settings_24.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" android:tint="#000000" + android:viewportHeight="24" android:viewportWidth="24" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="@android:color/white" android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/> +</vector> diff --git a/app/src/main/res/drawable/button_background.xml b/app/src/main/res/drawable/button_background.xml index 1bd9052..e5c47ae 100644 --- a/app/src/main/res/drawable/button_background.xml +++ b/app/src/main/res/drawable/button_background.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="true" android:drawable="@drawable/button_clicked" /> - <item android:drawable="@drawable/button_stand" /> +<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_pressed="true" android:drawable="@drawable/button_clicked" />
+ <item android:drawable="@drawable/button_stand" />
</selector>
\ No newline at end of file diff --git a/app/src/main/res/drawable/button_clicked.xml b/app/src/main/res/drawable/button_clicked.xml index 30a43e9..55050c3 100644 --- a/app/src/main/res/drawable/button_clicked.xml +++ b/app/src/main/res/drawable/button_clicked.xml @@ -1,10 +1,10 @@ -<?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="#008477" - android:endColor="#000000" /> - <corners android:radius="15dp" /> +<?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="#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 d918a01..6b1b92d 100644 --- a/app/src/main/res/drawable/button_stand.xml +++ b/app/src/main/res/drawable/button_stand.xml @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle"> - <solid android:color="#008477" /> - <corners android:radius="15dp" /> +<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+ <solid android:color="#008477" />
+ <corners android:radius="15dp" />
</shape>
\ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index 07d5da9..a4f78de 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -1,170 +1,170 @@ -<?xml version="1.0" encoding="utf-8"?> -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="108dp" - android:height="108dp" - android:viewportWidth="108" - android:viewportHeight="108"> - <path - android:fillColor="#3DDC84" - android:pathData="M0,0h108v108h-108z" /> - <path - android:fillColor="#00000000" - android:pathData="M9,0L9,108" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M19,0L19,108" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M29,0L29,108" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M39,0L39,108" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M49,0L49,108" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M59,0L59,108" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M69,0L69,108" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M79,0L79,108" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M89,0L89,108" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M99,0L99,108" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M0,9L108,9" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M0,19L108,19" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M0,29L108,29" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M0,39L108,39" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M0,49L108,49" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M0,59L108,59" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M0,69L108,69" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M0,79L108,79" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M0,89L108,89" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M0,99L108,99" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M19,29L89,29" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M19,39L89,39" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M19,49L89,49" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M19,59L89,59" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M19,69L89,69" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M19,79L89,79" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M29,19L29,89" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M39,19L39,89" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M49,19L49,89" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M59,19L59,89" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M69,19L69,89" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> - <path - android:fillColor="#00000000" - android:pathData="M79,19L79,89" - android:strokeWidth="0.8" - android:strokeColor="#33FFFFFF" /> -</vector> +<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="108dp"
+ android:height="108dp"
+ android:viewportWidth="108"
+ android:viewportHeight="108">
+ <path
+ android:fillColor="#3DDC84"
+ android:pathData="M0,0h108v108h-108z" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M9,0L9,108"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M19,0L19,108"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M29,0L29,108"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M39,0L39,108"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M49,0L49,108"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M59,0L59,108"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M69,0L69,108"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M79,0L79,108"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M89,0L89,108"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M99,0L99,108"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M0,9L108,9"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M0,19L108,19"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M0,29L108,29"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M0,39L108,39"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M0,49L108,49"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M0,59L108,59"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M0,69L108,69"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M0,79L108,79"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M0,89L108,89"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M0,99L108,99"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M19,29L89,29"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M19,39L89,39"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M19,49L89,49"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M19,59L89,59"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M19,69L89,69"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M19,79L89,79"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M29,19L29,89"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M39,19L39,89"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M49,19L49,89"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M59,19L59,89"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M69,19L69,89"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M79,19L79,89"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+</vector>
diff --git a/app/src/main/res/drawable/input_background.xml b/app/src/main/res/drawable/input_background.xml index c810750..a133933 100644 --- a/app/src/main/res/drawable/input_background.xml +++ b/app/src/main/res/drawable/input_background.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@drawable/input" /> +<?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/activity_auth.xml b/app/src/main/res/layout/activity_auth.xml index 96c4e45..9ad87be 100644 --- a/app/src/main/res/layout/activity_auth.xml +++ b/app/src/main/res/layout/activity_auth.xml @@ -1,16 +1,16 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <androidx.fragment.app.FragmentContainerView - android:id="@+id/fragment_container" - android:name="androidx.navigation.fragment.NavHostFragment" - android:layout_width="match_parent" - android:layout_height="match_parent" - app:defaultNavHost="true" - app:navGraph="@navigation/nav_graph"/> - +<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <androidx.fragment.app.FragmentContainerView
+ android:id="@+id/fragment_container"
+ android:name="androidx.navigation.fragment.NavHostFragment"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ app:defaultNavHost="true"
+ app:navGraph="@navigation/nav_graph"/>
+
</LinearLayout>
\ 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 6360895..98a5a4a 100644 --- a/app/src/main/res/layout/fragment_login.xml +++ b/app/src/main/res/layout/fragment_login.xml @@ -1,124 +1,124 @@ -<?xml version="1.0" encoding="utf-8"?> -<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="@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> - - <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: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" - 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" /> - - - <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="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/Register" /> - </androidx.constraintlayout.widget.ConstraintLayout> -</androidx.constraintlayout.widget.ConstraintLayout> +<?xml version="1.0" encoding="utf-8"?>
+<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="@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>
+
+ <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: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"
+ 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" />
+
+
+ <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="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/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 ecc3cb2..f6b7c2e 100644 --- a/app/src/main/res/layout/fragment_password_recovery.xml +++ b/app/src/main/res/layout/fragment_password_recovery.xml @@ -1,95 +1,95 @@ -<?xml version="1.0" encoding="utf-8"?> -<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="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_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> - - <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> +<?xml version="1.0" encoding="utf-8"?>
+<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="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_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>
+
+ <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 5e0f99a..422a3f5 100644 --- a/app/src/main/res/layout/fragment_signin.xml +++ b/app/src/main/res/layout/fragment_signin.xml @@ -1,113 +1,113 @@ -<?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" - 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:textColor="@color/white" - android:textColorHint="@color/white"/> - - </com.google.android.material.textfield.TextInputLayout> - - <com.google.android.material.textfield.TextInputLayout - 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" - android:hint="@string/field_password" /> - - </com.google.android.material.textfield.TextInputLayout> - - <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> +<?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"
+ 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:textColor="@color/white"
+ android:textColorHint="@color/white"/>
+
+ </com.google.android.material.textfield.TextInputLayout>
+
+ <com.google.android.material.textfield.TextInputLayout
+ 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"
+ android:hint="@string/field_password" />
+
+ </com.google.android.material.textfield.TextInputLayout>
+
+ <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/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..3766e68 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="utf-8"?> -<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> - <background android:drawable="@drawable/ic_launcher_background" /> - <foreground android:drawable="@drawable/ic_launcher_foreground" /> - <monochrome android:drawable="@drawable/ic_launcher_foreground" /> +<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+ <background android:drawable="@drawable/ic_launcher_background" />
+ <foreground android:drawable="@drawable/ic_launcher_foreground" />
+ <monochrome android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>
\ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..3766e68 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="utf-8"?> -<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> - <background android:drawable="@drawable/ic_launcher_background" /> - <foreground android:drawable="@drawable/ic_launcher_foreground" /> - <monochrome android:drawable="@drawable/ic_launcher_foreground" /> +<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+ <background android:drawable="@drawable/ic_launcher_background" />
+ <foreground android:drawable="@drawable/ic_launcher_foreground" />
+ <monochrome android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>
\ 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 cd6c344..e924599 100644 --- a/app/src/main/res/navigation/nav_graph.xml +++ b/app/src/main/res/navigation/nav_graph.xml @@ -1,48 +1,48 @@ -<?xml version="1.0" encoding="utf-8"?> -<navigation xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/nav_graph" - app:startDestination="@id/login_fragment"> - - <fragment - android:id="@+id/login_fragment" - android:name="com.frannazario.proyectoandroid.presentation.fragments.LoginFragment" - android:label="Login" - tools:layout="@layout/fragment_login"> - - <action - 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.presentation.fragments.SigninFragment" - android:label="Sign in" - 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" > - - <action - android:id="@+id/navigate_from_passwordrecoveryfragment_to_loginfragment" - app:destination="@id/login_fragment" /> - - </fragment> - +<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/nav_graph"
+ app:startDestination="@id/login_fragment">
+
+ <fragment
+ android:id="@+id/login_fragment"
+ android:name="com.frannazario.proyectoandroid.presentation.fragments.LoginFragment"
+ android:label="Login"
+ tools:layout="@layout/fragment_login">
+
+ <action
+ 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.presentation.fragments.SigninFragment"
+ android:label="Sign in"
+ 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" >
+
+ <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 68fdc2f..378aef3 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1,17 +1,17 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <string name="field_email">Correo electronico</string> - <string name="field_password">Contrasena</string> - <string name="forgot_password">Olvidé la contraseña</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> +<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="field_email">Correo electronico</string>
+ <string name="field_password">Contrasena</string>
+ <string name="forgot_password">Olvidé la contraseña</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/colors.xml b/app/src/main/res/values/colors.xml index f8c6127..823492c 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,10 +1,10 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <color name="purple_200">#FFBB86FC</color> - <color name="purple_500">#FF6200EE</color> - <color name="purple_700">#FF3700B3</color> - <color name="teal_200">#FF03DAC5</color> - <color name="teal_700">#FF018786</color> - <color name="black">#FF000000</color> - <color name="white">#FFFFFFFF</color> +<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <color name="purple_200">#FFBB86FC</color>
+ <color name="purple_500">#FF6200EE</color>
+ <color name="purple_700">#FF3700B3</color>
+ <color name="teal_200">#FF03DAC5</color>
+ <color name="teal_700">#FF018786</color>
+ <color name="black">#FF000000</color>
+ <color name="white">#FFFFFFFF</color>
</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 4804cf2..9e2bb4b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,19 +1,19 @@ -<resources> - <string name="app_name" translatable="false">Proyecto android</string> - - <string name="field_email">Email</string> - <string name="field_password">Password</string> - <string name="forgot_password">Forget password</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>
+ <string name="app_name" translatable="false">Proyecto android</string>
+
+ <string name="field_email">Email</string>
+ <string name="field_password">Password</string>
+ <string name="forgot_password">Forget password</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 diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 725c200..16ba180 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="Theme.AppCompat.Light.DarkActionBar" /> - <style name="Theme.ProyectoAndroidCompose" parent="android:Theme.Material.Light.NoActionBar" /> +<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <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 diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml index fa0f996..07e7d14 100644 --- a/app/src/main/res/xml/backup_rules.xml +++ b/app/src/main/res/xml/backup_rules.xml @@ -1,13 +1,13 @@ -<?xml version="1.0" encoding="utf-8"?><!-- - Sample backup rules file; uncomment and customize as necessary. - See https://developer.android.com/guide/topics/data/autobackup - for details. - Note: This file is ignored for devices older that API 31 - See https://developer.android.com/about/versions/12/backup-restore ---> -<full-backup-content> - <!-- - <include domain="sharedpref" path="."/> - <exclude domain="sharedpref" path="device.xml"/> ---> +<?xml version="1.0" encoding="utf-8"?><!--
+ Sample backup rules file; uncomment and customize as necessary.
+ See https://developer.android.com/guide/topics/data/autobackup
+ for details.
+ Note: This file is ignored for devices older that API 31
+ See https://developer.android.com/about/versions/12/backup-restore
+-->
+<full-backup-content>
+ <!--
+ <include domain="sharedpref" path="."/>
+ <exclude domain="sharedpref" path="device.xml"/>
+-->
</full-backup-content>
\ No newline at end of file diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml index 9ee9997..0ee2a78 100644 --- a/app/src/main/res/xml/data_extraction_rules.xml +++ b/app/src/main/res/xml/data_extraction_rules.xml @@ -1,19 +1,19 @@ -<?xml version="1.0" encoding="utf-8"?><!-- - Sample data extraction rules file; uncomment and customize as necessary. - See https://developer.android.com/about/versions/12/backup-restore#xml-changes - for details. ---> -<data-extraction-rules> - <cloud-backup> - <!-- TODO: Use <include> and <exclude> to control what is backed up. - <include .../> - <exclude .../> - --> - </cloud-backup> - <!-- - <device-transfer> - <include .../> - <exclude .../> - </device-transfer> - --> +<?xml version="1.0" encoding="utf-8"?><!--
+ Sample data extraction rules file; uncomment and customize as necessary.
+ See https://developer.android.com/about/versions/12/backup-restore#xml-changes
+ for details.
+-->
+<data-extraction-rules>
+ <cloud-backup>
+ <!-- TODO: Use <include> and <exclude> to control what is backed up.
+ <include .../>
+ <exclude .../>
+ -->
+ </cloud-backup>
+ <!--
+ <device-transfer>
+ <include .../>
+ <exclude .../>
+ </device-transfer>
+ -->
</data-extraction-rules>
\ No newline at end of file |