From caccb9bcdfce62527e46fa9bd2e37e4bdf83c8a7 Mon Sep 17 00:00:00 2001
From: SubsTheTechnomancer
 <54163143+SubsTheTechnomancer@users.noreply.github.com>
Date: Thu, 29 Oct 2020 20:48:08 +0530
Subject: [PATCH 1/5] Transferred the themes to current commits and updated
 strings and colors.xml

---
 .../main/res/layout/activity_dashboard.xml    |   7 +-
 .../main/res/layout/activity_email_verify.xml | 101 ++++++-------
 .../main/res/layout/activity_ph_no_otp.xml    | 139 +++++++++---------
 app/src/main/res/values-night/themes.xml      |  32 +++-
 app/src/main/res/values/colors.xml            |   8 +
 app/src/main/res/values/strings.xml           |  10 +-
 app/src/main/res/values/themes.xml            |  62 +++++++-
 7 files changed, 227 insertions(+), 132 deletions(-)

diff --git a/app/src/main/res/layout/activity_dashboard.xml b/app/src/main/res/layout/activity_dashboard.xml
index 413971d..0e49982 100644
--- a/app/src/main/res/layout/activity_dashboard.xml
+++ b/app/src/main/res/layout/activity_dashboard.xml
@@ -4,11 +4,16 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:theme="@style/Theme.TrackAndTriggerDark"
     tools:context=".dashboard.DashboardActivity">
 
     <TextView
         android:id="@+id/textView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="DashboardActivity" />
+        android:text="DashboardActivity"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_email_verify.xml b/app/src/main/res/layout/activity_email_verify.xml
index c81f92c..50032b2 100644
--- a/app/src/main/res/layout/activity_email_verify.xml
+++ b/app/src/main/res/layout/activity_email_verify.xml
@@ -1,62 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- @subs make this seski-->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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/relativeLayout2"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    tools:context=".regandlogin.EmailVerifyActivitiy"
-    android:gravity="center">
+    android:gravity="center"
+    tools:context=".regandlogin.EmailVerifyActivitiy">
 
 
-    <LinearLayout
+    <TextView
+        android:id="@+id/gmailIdLabel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:gravity="center">
-
-            <TextView
-                android:id="@+id/gmailIdLabel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/gmail_label"
-                />
-
-            <EditText
-                android:id="@+id/gmailIdField"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:inputType="textEmailAddress"
-                android:hint="@string/gmail_id_hint"
-                android:maxEms="10"
-                android:minEms="10" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="end"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/getOtpButton"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:text="@string/get_verification_link_label" />
-
-            <Button
-                android:id="@+id/nextButton"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:text="@string/next_label" />
-        </LinearLayout>
+        android:text="@string/gmail_label"
+        app:layout_constraintBaseline_toBaselineOf="@+id/gmailIdField"
+        app:layout_constraintEnd_toStartOf="@+id/gmailIdField"
+        app:layout_constraintHorizontal_bias="0.829"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <EditText
+        android:id="@+id/gmailIdField"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="56dp"
+        android:autofillHints=""
+        android:hint="@string/gmail_id_hint"
+        android:inputType="textEmailAddress"
+        android:maxEms="10"
+        android:minEms="10"
+        app:layout_constraintBottom_toTopOf="@+id/nextButton"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed" />
+
+    <Button
+        android:id="@+id/getOtpButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="100dp"
+        android:text="@string/get_verification_link_label"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="@+id/gmailIdField"
+        app:layout_constraintTop_toBottomOf="@+id/gmailIdField"
+        app:layout_constraintVertical_bias="0.0" />
+
+    <Button
+        android:id="@+id/nextButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="59dp"
+        android:text="@string/next_label"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/gmailIdField" />
 
-    </LinearLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_ph_no_otp.xml b/app/src/main/res/layout/activity_ph_no_otp.xml
index 0f62af8..11cf993 100644
--- a/app/src/main/res/layout/activity_ph_no_otp.xml
+++ b/app/src/main/res/layout/activity_ph_no_otp.xml
@@ -1,85 +1,92 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- @subs make this seski-->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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/relativeLayout"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    tools:context=".regandlogin.EmailVerifyActivitiy"
-    android:gravity="center">
+    android:gravity="center"
+    android:theme="@style/Theme.TrackAndTriggerDark"
+    tools:context=".regandlogin.EmailVerifyActivitiy">
 
 
-    <LinearLayout
+    <TextView
+        android:id="@+id/phnoLabel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:text="@string/phno_label"
+        app:layout_constraintBaseline_toBaselineOf="@+id/phnoField"
+        app:layout_constraintEnd_toStartOf="@+id/phnoField"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toStartOf="parent" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:gravity="end">
-
-            <TextView
-                android:id="@+id/phnoLabel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/phno_label" />
-
-            <EditText
-                android:id="@+id/phnoField"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:hint="@string/phno_hint"
-                android:inputType="phone"
-                android:maxEms="10"
-                android:minEms="10" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:gravity="end">
+    <EditText
+        android:id="@+id/phnoField"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="1dp"
+        android:layout_marginBottom="13dp"
+        android:hint="@string/phno_hint"
+        android:inputType="phone"
+        android:maxEms="10"
+        android:minEms="10"
+        app:layout_constraintBottom_toTopOf="@+id/otpLabel"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/phnoLabel"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed" />
 
-            <TextView
-                android:id="@+id/otpLabel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/otp_label" />
 
-            <EditText
-                android:id="@+id/otpField"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:inputType="number"
-                android:hint="@string/otp_hint"
-                android:maxEms="10"
-                android:minEms="10" />
+    <TextView
+        android:id="@+id/otpLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="121dp"
+        android:layout_marginLeft="121dp"
+        android:layout_marginEnd="121dp"
+        android:layout_marginRight="121dp"
+        android:layout_marginBottom="13dp"
+        android:text="@string/otp_label"
+        app:layout_constraintBottom_toTopOf="@+id/nextButton"
+        app:layout_constraintEnd_toEndOf="@+id/getOtpButton"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/phnoField" />
 
-        </LinearLayout>
+    <EditText
+        android:id="@+id/otpField"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:hint="@string/otp_hint"
+        android:inputType="number"
+        android:maxEms="10"
+        android:minEms="10"
+        app:layout_constraintStart_toStartOf="@+id/phnoField"
+        app:layout_constraintTop_toBottomOf="@+id/phnoField" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="end"
-            android:orientation="horizontal">
 
-            <Button
-                android:id="@+id/getOtpButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0.5"
-                android:text="@string/get_otp_label" />
+    <Button
+        android:id="@+id/getOtpButton"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="54dp"
+        android:layout_marginLeft="54dp"
+        android:text="@string/get_otp_label"
+        app:layout_constraintBaseline_toBaselineOf="@+id/nextButton"
+        app:layout_constraintEnd_toStartOf="@+id/nextButton"
+        app:layout_constraintStart_toStartOf="parent" />
 
-            <Button
-                android:id="@+id/nextButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/next_label" />
-        </LinearLayout>
+    <Button
+        android:id="@+id/nextButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="54dp"
+        android:layout_marginRight="54dp"
+        android:text="@string/next_label"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/getOtpButton"
+        app:layout_constraintTop_toBottomOf="@+id/otpLabel" />
 
-    </LinearLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index d220fb1..5388c3f 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,10 +1,32 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.TrackAndTrigger" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="Theme.TrackAndTriggerDark" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryDark">@color/purple_700</item>
-        <item name="colorAccent">@color/teal_200</item>
-        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/Light_grey</item>
+        <item name="colorPrimaryDark">@color/black</item>
+        <item name="colorAccent">@color/Dark_blue</item>
+        <item name="android:windowBackground">@color/Dark_grey</item>
+        <item name="android:textColorPrimary">@color/Dark_bittersweet</item>
+        <item name="android:textColorSecondary">@color/Mountbatten_pink</item>
+        <item name="android:colorBackground">@color/Dark_grey</item>
+        <item name="android:panelBackground">@color/Dark_bittersweet</item>
+        <item name="android:buttonStyle">@style/Buttons</item>
+        <item name="editTextStyle">@style/EditTexts</item>
+        <item name="android:textViewStyle">@style/TextViews</item>
+    </style>
+
+    <style name="TextViews" parent="Widget.AppCompat.TextView">
+        <item name="android:textColor">@color/Dark_bittersweet</item>
+    </style>
+
+    <style name="EditTexts" parent="Widget.AppCompat.EditText">
+        <item name="background">@color/Bittersweet</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:textColorHint">@color/Dark_blue</item>
+    </style>
+
+    <style name="Buttons" parent="Widget.AppCompat.Button.Colored">
+        <item name="android:textColor">@color/white</item>
+        <item name="colorButtonNormal">@color/Dark_grey</item>
     </style>
 </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..cc2941c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,4 +7,12 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="Gunmetal">#2C3539</color>
+    <color name="Bittersweet">#FE6F5E</color>
+    <color name="Medium_turquoise">#48D1CC</color>
+    <color name="Mountbatten_pink">#997A8D</color>
+    <color name="Dark_grey">#FF222222</color>
+    <color name="Light_grey">#FF666666</color>
+    <color name="Dark_blue">#0F3460</color>
+    <color name="Dark_bittersweet">#E94560</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 faf55b0..7ab1337 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -8,16 +8,16 @@
     <string name="signin_label">Sign In</string>
     <string name="next_label">Next</string>
     <string name="otp_label">OTP</string>
-    <string name="get_otp_label">Get OTP</string>
+    <string name="get_otp_label">Get OTP!</string>
     <string name="reg_and_login_label">Register and Login</string>
-    <string name="g_signin_suggestion">Use Google Sign-in to login to your registered account</string>
+    <string name="g_signin_suggestion">Use Google Sign-in to login to your registered account!</string>
     <string name="g_siginin_fail">Google Sign-in failed</string>
     <string name="username_hint">Username</string>
     <string name="password_hint">Password</string>
     <string name="confirm_password_hint">Confirm Password</string>
-    <string name="gmail_id_hint">Gmail ID here</string>
-    <string name="phno_hint">Phone Number here</string>
-    <string name="otp_hint">OTP here</string>
+    <string name="gmail_id_hint">xyz@gmail.com</string>
+    <string name="phno_hint">123456789</string>
+    <string name="otp_hint">****</string>
     <string name="get_verification_link_label">Get Verification Link</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 9aafa4e..70bc400 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,10 +1,62 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.TrackAndTrigger" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="Theme.TrackAndTrigger" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryDark">@color/purple_700</item>
-        <item name="colorAccent">@color/teal_200</item>
-        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/Medium_turquoise</item>
+        <item name="colorPrimaryDark">@color/Gunmetal</item>
+        <item name="colorAccent">@color/Bittersweet</item>
+        <item name="android:windowBackground">@color/white</item>
+        <item name="android:textColorPrimary">@color/Gunmetal</item>
+        <item name="android:textColorSecondary">@color/Mountbatten_pink</item>
+        <item name="android:colorBackground">@color/white</item>
+        <item name="android:panelBackground">@color/Medium_turquoise</item>
+        <item name="android:buttonStyle">@style/Buttons</item>
+        <item name="editTextStyle">@style/EditTexts</item>
+        <item name="android:textViewStyle">@style/TextViews</item>
+    </style>
+
+    <style name="TextViews" parent="Widget.AppCompat.TextView">
+        <item name="android:textColor">@color/Mountbatten_pink</item>
+    </style>
+
+    <style name="EditTexts" parent="Widget.AppCompat.EditText">
+        <item name="background">@color/white</item>
+        <item name="android:textColor">@color/Bittersweet</item>
+        <item name="android:textColorHint">@color/Mountbatten_pink</item>
+    </style>
+
+    <style name="Buttons" parent="Widget.AppCompat.Button.Colored">
+        <item name="android:textColor">@color/white</item>
+        <item name="colorButtonNormal">@color/Gunmetal</item>
+    </style>
+
+    <style name="Theme.TrackAndTriggerDark" parent="Theme.AppCompat.NoActionBar">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/Light_grey</item>
+        <item name="colorPrimaryDark">@color/black</item>
+        <item name="colorAccent">@color/Dark_blue</item>
+        <item name="android:windowBackground">@color/Dark_grey</item>
+        <item name="android:textColorPrimary">@color/Dark_bittersweet</item>
+        <item name="android:textColorSecondary">@color/Mountbatten_pink</item>
+        <item name="android:colorBackground">@color/Dark_grey</item>
+        <item name="android:panelBackground">@color/Dark_bittersweet</item>
+        <item name="android:buttonStyle">@style/ButtonsDark</item>
+        <item name="editTextStyle">@style/EditTextsDark</item>
+        <item name="android:textViewStyle">@style/TextViewsDark</item>
+    </style>
+
+    <style name="TextViewsDark" parent="Widget.AppCompat.TextView">
+        <item name="android:textColor">@color/Light_grey</item>
+    </style>
+
+    <style name="EditTextsDark" parent="Widget.AppCompat.EditText">
+        <item name="background">@color/Bittersweet</item>
+        <item name="android:textColor">@color/Dark_bittersweet</item>
+        <item name="android:textColorHint">@color/Light_grey</item>
+    </style>
+
+    <style name="ButtonsDark" parent="Widget.AppCompat.Button.Colored">
+        <item name="android:textColor">@color/white</item>
+        <item name="colorButtonNormal">@color/Dark_grey</item>
     </style>
 </resources>
\ No newline at end of file

From 3e80e01dc186e5afaed78d78eec03e1820d1db7c Mon Sep 17 00:00:00 2001
From: SubsTheTechnomancer
 <54163143+SubsTheTechnomancer@users.noreply.github.com>
Date: Fri, 20 Nov 2020 17:52:28 +0530
Subject: [PATCH 2/5] Popping stashed changes

---
 .idea/render.experimental.xml                 |  6 ++
 app/build.gradle                              |  1 +
 app/src/main/res/layout/activity_login.xml    | 78 +++++++++++++++++--
 .../main/res/layout/activity_ph_no_otp.xml    | 61 +++++++++++++++
 app/src/main/res/values-night/themes.xml      | 32 --------
 app/src/main/res/values/styles.xml            | 34 ++++++++
 app/src/main/res/values/themes.xml            | 31 +-------
 7 files changed, 173 insertions(+), 70 deletions(-)
 create mode 100644 .idea/render.experimental.xml
 delete mode 100644 app/src/main/res/values-night/themes.xml
 create mode 100644 app/src/main/res/values/styles.xml

diff --git a/.idea/render.experimental.xml b/.idea/render.experimental.xml
new file mode 100644
index 0000000..8ec256a
--- /dev/null
+++ b/.idea/render.experimental.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RenderSettings">
+    <option name="showDecorations" value="true" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 82827be..822d3da 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -64,6 +64,7 @@ dependencies {
     implementation 'com.android.support.constraint:constraint-layout:2.0.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
+    implementation 'com.google.android.material:material:1.3.0-alpha03'
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 2d41a79..003c24c 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -9,8 +9,8 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/lin_all"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="200dp"
+        android:layout_height="320dp"
         android:layout_centerInParent="true">
 
 
@@ -18,11 +18,18 @@
             android:id="@+id/registerOrSignInButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+<<<<<<< Updated upstream
             android:text="@string/register_or_sign_in_label"
             app:layout_constraintEnd_toEndOf="parent"
+=======
+            android:layout_marginTop="8dp"
+            android:text="@string/register_label"
+            app:layout_constraintEnd_toStartOf="@+id/signInButton"
+>>>>>>> Stashed changes
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/passwordField" />
+            app:layout_constraintTop_toBottomOf="@+id/passwordContainer" />
 
+<<<<<<< Updated upstream
         <EditText
             android:id="@+id/usernameField"
             android:layout_width="wrap_content"
@@ -43,15 +50,41 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="132dp"
             android:autofillHints="otp"
+=======
+
+        <Button
+            android:id="@+id/signInButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/signin_label"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/registerButton"
+            app:layout_constraintTop_toBottomOf="@+id/passwordContainer" />
+
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/passwordContainer"
+            android:layout_width="186dp"
+            android:layout_height="58dp"
+            android:layout_marginBottom="188dp"
+            android:autofillHints="password"
+>>>>>>> Stashed changes
             android:hint="@string/password_hint"
             android:inputType="textPassword"
             android:maxEms="10"
             android:minEms="10"
             android:textSize="14sp"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent">
 
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/passwordField"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
 
+<<<<<<< Updated upstream
         <TextView
             android:id="@+id/passwordLabel"
             android:layout_width="wrap_content"
@@ -69,25 +102,54 @@
             android:text="@string/username_label"
             app:layout_constraintBottom_toTopOf="@+id/passwordField"
             app:layout_constraintEnd_toStartOf="@+id/usernameField" />
+=======
+        </com.google.android.material.textfield.TextInputLayout>
+>>>>>>> Stashed changes
 
         <com.google.android.gms.common.SignInButton
             android:id="@+id/g_sign_in_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="56dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.506"
             app:layout_constraintStart_toStartOf="parent" />
 
         <TextView
             android:id="@+id/errorLabel"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            android:layout_width="185dp"
+            android:layout_height="0dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
             android:scrollHorizontally="false"
             android:textAlignment="center"
             android:textColor="@android:color/holo_red_dark"
-            app:layout_constraintBottom_toTopOf="@+id/g_sign_in_button"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintHorizontal_bias="0.466"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/g_sign_in_button" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/usernameContainer"
+            android:layout_width="186dp"
+            android:layout_height="58dp"
+            android:autofillHints="username"
+            android:hint="@string/username_hint"
+            android:inputType="textPersonName"
+            android:maxEms="10"
+            android:minEms="10"
+            android:textSize="14sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/usernameField"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.google.android.material.textfield.TextInputLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/activity_ph_no_otp.xml b/app/src/main/res/layout/activity_ph_no_otp.xml
index f8b4b79..00cdd9d 100644
--- a/app/src/main/res/layout/activity_ph_no_otp.xml
+++ b/app/src/main/res/layout/activity_ph_no_otp.xml
@@ -5,8 +5,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+<<<<<<< Updated upstream
     tools:context=".regandlogin.EmailVerifyActivitiy"
     android:gravity="center">
+=======
+    android:gravity="center"
+    tools:context=".regandlogin.EmailVerifyActivitiy">
+>>>>>>> Stashed changes
 
 
     <LinearLayout
@@ -14,11 +19,30 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
+<<<<<<< Updated upstream
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:gravity="end">
+=======
+    <EditText
+        android:id="@+id/phnoField"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="1dp"
+        android:layout_marginBottom="13dp"
+        android:hint="@string/phno_hint"
+        android:inputType="phone"
+        android:maxEms="10"
+        android:minEms="10"
+        app:layout_constraintBottom_toTopOf="@+id/otpLabel"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/phnoLabel"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        android:autofillHints="" />
+>>>>>>> Stashed changes
 
             <TextView
                 android:id="@+id/phnoLabel"
@@ -35,7 +59,21 @@
                 android:maxEms="10"
                 android:minEms="10" />
 
+<<<<<<< Updated upstream
         </LinearLayout>
+=======
+    <EditText
+        android:id="@+id/otpField"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:hint="@string/otp_hint"
+        android:inputType="number"
+        android:maxEms="10"
+        android:minEms="10"
+        app:layout_constraintStart_toStartOf="@+id/phnoField"
+        app:layout_constraintTop_toBottomOf="@+id/phnoField"
+        android:autofillHints="" />
+>>>>>>> Stashed changes
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -43,6 +81,7 @@
             android:orientation="horizontal"
             android:gravity="end">
 
+<<<<<<< Updated upstream
             <TextView
                 android:id="@+id/otpLabel"
                 android:layout_width="wrap_content"
@@ -80,6 +119,28 @@
                 android:layout_weight="0.5"
                 android:text="@string/next_label" />
         </LinearLayout>
+=======
+    <Button
+        android:id="@+id/getOtpButton"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="54dp"
+        android:text="@string/get_otp_label"
+        app:layout_constraintBaseline_toBaselineOf="@+id/nextButton"
+        app:layout_constraintEnd_toStartOf="@+id/nextButton"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <Button
+        android:id="@+id/nextButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="54dp"
+        android:text="@string/next_label"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/getOtpButton"
+        app:layout_constraintTop_toBottomOf="@+id/otpLabel" />
+>>>>>>> Stashed changes
 
     </LinearLayout>
 
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
deleted file mode 100644
index 5388c3f..0000000
--- a/app/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.TrackAndTriggerDark" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/Light_grey</item>
-        <item name="colorPrimaryDark">@color/black</item>
-        <item name="colorAccent">@color/Dark_blue</item>
-        <item name="android:windowBackground">@color/Dark_grey</item>
-        <item name="android:textColorPrimary">@color/Dark_bittersweet</item>
-        <item name="android:textColorSecondary">@color/Mountbatten_pink</item>
-        <item name="android:colorBackground">@color/Dark_grey</item>
-        <item name="android:panelBackground">@color/Dark_bittersweet</item>
-        <item name="android:buttonStyle">@style/Buttons</item>
-        <item name="editTextStyle">@style/EditTexts</item>
-        <item name="android:textViewStyle">@style/TextViews</item>
-    </style>
-
-    <style name="TextViews" parent="Widget.AppCompat.TextView">
-        <item name="android:textColor">@color/Dark_bittersweet</item>
-    </style>
-
-    <style name="EditTexts" parent="Widget.AppCompat.EditText">
-        <item name="background">@color/Bittersweet</item>
-        <item name="android:textColor">@color/white</item>
-        <item name="android:textColorHint">@color/Dark_blue</item>
-    </style>
-
-    <style name="Buttons" parent="Widget.AppCompat.Button.Colored">
-        <item name="android:textColor">@color/white</item>
-        <item name="colorButtonNormal">@color/Dark_grey</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
new file mode 100644
index 0000000..cb6aed8
--- /dev/null
+++ b/app/src/main/res/values/styles.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="TextViews" parent="android:Widget.Material.TextView">
+        <item name="android:textColor">@color/Mountbatten_pink</item>
+    </style>
+
+    <style name="EditTexts" parent="android:Widget.Material.EditText">
+        <item name="background">@color/Gunmetal</item>
+        <item name="android:textColor">@color/Bittersweet</item>
+        <item name="android:textColorHint">@color/Mountbatten_pink</item>
+    </style>
+
+    <style name="Buttons" parent="android:Widget.Material.Button">
+        <item name="android:textColor">@color/Gunmetal</item>
+        <item name="backgroundTint">@color/Bittersweet</item>
+    </style>
+
+    <style name="TextViewsDark" parent="android:Widget.Material.TextView">
+        <item name="android:textColor">@color/Light_grey</item>
+    </style>
+
+    <style name="EditTextsDark" parent="android:Widget.Material.EditText">
+        <item name="background">@color/Bittersweet</item>
+        <item name="android:textColor">@color/Dark_bittersweet</item>
+        <item name="android:textColorHint">@color/Light_grey</item>
+    </style>
+
+    <style name="ButtonsDark" parent="android:Widget.Material.Button">
+        <item name="android:textColor">@color/white</item>
+        <item name="backgroundTint">@color/Dark_blue</item>
+    </style>
+
+</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 70bc400..ed0f874 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -11,25 +11,10 @@
         <item name="android:colorBackground">@color/white</item>
         <item name="android:panelBackground">@color/Medium_turquoise</item>
         <item name="android:buttonStyle">@style/Buttons</item>
-        <item name="editTextStyle">@style/EditTexts</item>
+        <item name="android:editTextStyle">@style/EditTexts</item>
         <item name="android:textViewStyle">@style/TextViews</item>
     </style>
 
-    <style name="TextViews" parent="Widget.AppCompat.TextView">
-        <item name="android:textColor">@color/Mountbatten_pink</item>
-    </style>
-
-    <style name="EditTexts" parent="Widget.AppCompat.EditText">
-        <item name="background">@color/white</item>
-        <item name="android:textColor">@color/Bittersweet</item>
-        <item name="android:textColorHint">@color/Mountbatten_pink</item>
-    </style>
-
-    <style name="Buttons" parent="Widget.AppCompat.Button.Colored">
-        <item name="android:textColor">@color/white</item>
-        <item name="colorButtonNormal">@color/Gunmetal</item>
-    </style>
-
     <style name="Theme.TrackAndTriggerDark" parent="Theme.AppCompat.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/Light_grey</item>
@@ -45,18 +30,4 @@
         <item name="android:textViewStyle">@style/TextViewsDark</item>
     </style>
 
-    <style name="TextViewsDark" parent="Widget.AppCompat.TextView">
-        <item name="android:textColor">@color/Light_grey</item>
-    </style>
-
-    <style name="EditTextsDark" parent="Widget.AppCompat.EditText">
-        <item name="background">@color/Bittersweet</item>
-        <item name="android:textColor">@color/Dark_bittersweet</item>
-        <item name="android:textColorHint">@color/Light_grey</item>
-    </style>
-
-    <style name="ButtonsDark" parent="Widget.AppCompat.Button.Colored">
-        <item name="android:textColor">@color/white</item>
-        <item name="colorButtonNormal">@color/Dark_grey</item>
-    </style>
 </resources>
\ No newline at end of file

From f67fda6a64d3354437edb0c461721629265f910b Mon Sep 17 00:00:00 2001
From: SubsTheTechnomancer
 <54163143+SubsTheTechnomancer@users.noreply.github.com>
Date: Fri, 20 Nov 2020 17:56:30 +0530
Subject: [PATCH 3/5] Revert "Appropriate buttons now show up based on the
 profession, removed username field from the chooseProfession fragment"

This reverts commit 67f868a300db105156f694993f60103182b28401.
---
 .../dashboard/DashboardActivity.java          | 31 +++++--------------
 ...ment.java => PersonalDetailsFragment.java} | 20 ++++++------
 ...del.java => PersonalDetailsViewModel.java} |  4 +--
 .../main/res/layout/activity_dashboard.xml    | 28 +++++++++++------
 ...ment.xml => personal_details_fragment.xml} | 16 ++++++++++
 5 files changed, 53 insertions(+), 46 deletions(-)
 rename app/src/main/java/com/oopcows/trackandtrigger/dashboard/{ProfessionChooseFragment.java => PersonalDetailsFragment.java} (63%)
 rename app/src/main/java/com/oopcows/trackandtrigger/dashboard/{ProfessionChooseViewModel.java => PersonalDetailsViewModel.java} (84%)
 rename app/src/main/res/layout/{profession_choose_fragment.xml => personal_details_fragment.xml} (63%)

diff --git a/app/src/main/java/com/oopcows/trackandtrigger/dashboard/DashboardActivity.java b/app/src/main/java/com/oopcows/trackandtrigger/dashboard/DashboardActivity.java
index c3e5e1a..4d6b6a0 100644
--- a/app/src/main/java/com/oopcows/trackandtrigger/dashboard/DashboardActivity.java
+++ b/app/src/main/java/com/oopcows/trackandtrigger/dashboard/DashboardActivity.java
@@ -13,14 +13,12 @@
 
 import static com.oopcows.trackandtrigger.helpers.CowConstants.USER_ACCOUNT_INTENT_KEY;
 
-public class DashboardActivity extends AppCompatActivity implements ProfessionChooseFragment.PersonalDetailsFillable {
+public class DashboardActivity extends AppCompatActivity implements PersonalDetailsFragment.PersonalDetailsFillable {
 
     private UserAccount userAccount;
     private DatabaseHelper dh;
+    private PersonalDetailsFragment personalDetailsFragment;
     private ActivityDashboardBinding binding;
-    private View homeMaintenanceButton, kitchenApplianceButton;
-    // @subs dashboardActivity should be in a sort of shadow while the dialogue is open
-    // so that it is not visible until the profession has been chosen
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -30,13 +28,8 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(view);
 
         userAccount = getIntent().getExtras().getParcelable(USER_ACCOUNT_INTENT_KEY);
-        dh = DatabaseHelper.getInstance(this);
 
-        View groceryButton = binding.groceryListButton;
-        homeMaintenanceButton = binding.mainatenanceListButton;
-        kitchenApplianceButton = binding.kitchenAppliancesButton;
-        binding.specialButtons.removeAllViews();
-        binding.specialButtons.addView(groceryButton);
+        dh = DatabaseHelper.getInstance(this);
     }
 
     @Override
@@ -45,27 +38,17 @@ protected void onStart(){
         if(userAccount.getProfession() == Profession.nullProfession) {
             displayDialogue();
         }
-        else addAppropriateButtons();
     }
 
     private void displayDialogue() {
         FragmentManager fm = getSupportFragmentManager();
-        ProfessionChooseFragment.newInstance().show(fm, null);
+        personalDetailsFragment = PersonalDetailsFragment.newInstance();
+        personalDetailsFragment.show(fm, null);
     }
 
     @Override
-    public void fillDetails(Profession profession) {
-        userAccount = new UserAccount(userAccount.getUsername(), userAccount.getGmailId(), userAccount.getPhno(), profession);
+    public void fillDetails(String username, Profession profession) {
+        userAccount = new UserAccount(username, userAccount.getGmailId(), userAccount.getPhno(), profession);
         dh.updateUser(userAccount);
-        addAppropriateButtons();
-    }
-
-    private void addAppropriateButtons() {
-        if(!userAccount.getProfession().equals(Profession.jobSeeker)) {
-            binding.specialButtons.addView(homeMaintenanceButton);
-        }
-        if(userAccount.getProfession().equals(Profession.homeMaker)) {
-            binding.specialButtons.addView(kitchenApplianceButton);
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/oopcows/trackandtrigger/dashboard/ProfessionChooseFragment.java b/app/src/main/java/com/oopcows/trackandtrigger/dashboard/PersonalDetailsFragment.java
similarity index 63%
rename from app/src/main/java/com/oopcows/trackandtrigger/dashboard/ProfessionChooseFragment.java
rename to app/src/main/java/com/oopcows/trackandtrigger/dashboard/PersonalDetailsFragment.java
index 0f0d5da..c7b8f5e 100644
--- a/app/src/main/java/com/oopcows/trackandtrigger/dashboard/ProfessionChooseFragment.java
+++ b/app/src/main/java/com/oopcows/trackandtrigger/dashboard/PersonalDetailsFragment.java
@@ -12,18 +12,18 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.oopcows.trackandtrigger.databinding.ProfessionChooseFragmentBinding;
+import com.oopcows.trackandtrigger.databinding.PersonalDetailsFragmentBinding;
 import com.oopcows.trackandtrigger.helpers.Profession;
 
 import java.util.Objects;
 
-public class ProfessionChooseFragment extends DialogFragment {
+public class PersonalDetailsFragment extends DialogFragment {
 
-    private ProfessionChooseViewModel mViewModel;
-    private ProfessionChooseFragmentBinding binding;
+    private PersonalDetailsViewModel mViewModel;
+    private PersonalDetailsFragmentBinding binding;
 
     public interface PersonalDetailsFillable {
-        void fillDetails(Profession profession);
+        void fillDetails(String username, Profession profession);
     }
 
     @Override
@@ -31,15 +31,15 @@ public void onStart() {
         super.onStart();
     }
 
-    public static ProfessionChooseFragment newInstance() {
-        return new ProfessionChooseFragment();
+    public static PersonalDetailsFragment newInstance() {
+        return new PersonalDetailsFragment();
     }
 
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
                              @Nullable Bundle savedInstanceState) {
-        binding = ProfessionChooseFragmentBinding.inflate(inflater);
+        binding = PersonalDetailsFragmentBinding.inflate(inflater);
         View view = binding.getRoot();
         return view;
     }
@@ -47,11 +47,11 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
     @Override
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-        mViewModel = new ViewModelProvider(this).get(ProfessionChooseViewModel.class);
+        mViewModel = new ViewModelProvider(this).get(PersonalDetailsViewModel.class);
 
         binding.chooseProfessionSpinner.setAdapter(mViewModel.getSpinnerAdapter(this));
         binding.confirmProfessionButton.setOnClickListener((v)-> {
-            ((PersonalDetailsFillable) Objects.requireNonNull(getActivity())).fillDetails(Profession.valueOf((String) binding.chooseProfessionSpinner.getSelectedItem()));
+            ((PersonalDetailsFillable) Objects.requireNonNull(getActivity())).fillDetails(String.valueOf(binding.usernameField.getText()), Profession.valueOf((String) binding.chooseProfessionSpinner.getSelectedItem()));
             dismiss();
         });
         setCancelable(false);
diff --git a/app/src/main/java/com/oopcows/trackandtrigger/dashboard/ProfessionChooseViewModel.java b/app/src/main/java/com/oopcows/trackandtrigger/dashboard/PersonalDetailsViewModel.java
similarity index 84%
rename from app/src/main/java/com/oopcows/trackandtrigger/dashboard/ProfessionChooseViewModel.java
rename to app/src/main/java/com/oopcows/trackandtrigger/dashboard/PersonalDetailsViewModel.java
index 9e7130e..bb3d7fb 100644
--- a/app/src/main/java/com/oopcows/trackandtrigger/dashboard/ProfessionChooseViewModel.java
+++ b/app/src/main/java/com/oopcows/trackandtrigger/dashboard/PersonalDetailsViewModel.java
@@ -9,9 +9,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class ProfessionChooseViewModel extends ViewModel {
+public class PersonalDetailsViewModel extends ViewModel {
 
-    public ArrayAdapter<String> getSpinnerAdapter(ProfessionChooseFragment fragment) {
+    public ArrayAdapter<String> getSpinnerAdapter(PersonalDetailsFragment fragment) {
         List<String> professions = new ArrayList<String>();
         for(Profession p : Profession.values()) {
             if(p == Profession.nullProfession) continue;
diff --git a/app/src/main/res/layout/activity_dashboard.xml b/app/src/main/res/layout/activity_dashboard.xml
index 88c69a5..afd899b 100644
--- a/app/src/main/res/layout/activity_dashboard.xml
+++ b/app/src/main/res/layout/activity_dashboard.xml
@@ -13,42 +13,50 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         android:padding="10dp"
-        android:id="@+id/special_buttons"
         android:orientation="horizontal">
 
         <Button
             android:id="@+id/grocery_list_button"
             style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
-            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_weight="0.33"
+            android:layout_width="match_parent"
             android:contentDescription="@string/groceries"
+            android:layout_gravity="center"
             android:elevation="5dp"
+            android:layout_weight="0.33"
             app:icon="@drawable/ic_launcher_foreground" />
 
         <Button
             android:id="@+id/mainatenance_list_button"
             style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
-            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:contentDescription="@string/groceries"
             android:layout_gravity="center"
-            android:layout_weight="0.33"
-            android:contentDescription="@string/home_maintenance"
             android:elevation="5dp"
+            android:layout_weight="0.33"
             app:icon="@drawable/ic_launcher_foreground" />
 
         <Button
             android:id="@+id/kitchen_appliances_button"
             style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
-            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:contentDescription="@string/groceries"
             android:layout_gravity="center"
-            android:layout_weight="0.33"
-            android:contentDescription="@string/kitchen_appliances"
             android:elevation="5dp"
+            android:layout_weight="0.33"
             app:icon="@drawable/ic_launcher_foreground" />
 
     </LinearLayout>
 
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/floatingActionButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:clickable="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:srcCompat="@android:drawable/ic_input_add" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/profession_choose_fragment.xml b/app/src/main/res/layout/personal_details_fragment.xml
similarity index 63%
rename from app/src/main/res/layout/profession_choose_fragment.xml
rename to app/src/main/res/layout/personal_details_fragment.xml
index 2c03036..dd9591a 100644
--- a/app/src/main/res/layout/profession_choose_fragment.xml
+++ b/app/src/main/res/layout/personal_details_fragment.xml
@@ -6,6 +6,22 @@
     android:orientation="vertical"
     android:padding="10dp">
 
+    <TextView
+        android:id="@+id/usernameLabel"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/username_label" />
+
+    <EditText
+        android:id="@+id/usernameField"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:autofillHints=""
+        android:ems="10"
+        android:hint="@string/username_hint"
+        android:inputType="textPersonName"
+        android:textSize="14sp" />
+
     <TextView
         android:id="@+id/chooseProfessionLabel"
         android:layout_width="wrap_content"

From b196ded9040171dbb7328eeee6f18139eee767a0 Mon Sep 17 00:00:00 2001
From: SubsTheTechnomancer
 <54163143+SubsTheTechnomancer@users.noreply.github.com>
Date: Fri, 20 Nov 2020 18:56:52 +0530
Subject: [PATCH 4/5] Restored main changes

---
 .../regandlogin/LoginActivity.java            |  2 +-
 app/src/main/res/layout/activity_login.xml    | 36 ++-----------
 .../main/res/layout/activity_ph_no_otp.xml    | 54 +------------------
 app/src/main/res/values/strings.xml           | 19 +++++--
 4 files changed, 20 insertions(+), 91 deletions(-)

diff --git a/app/src/main/java/com/oopcows/trackandtrigger/regandlogin/LoginActivity.java b/app/src/main/java/com/oopcows/trackandtrigger/regandlogin/LoginActivity.java
index 0038352..886a23f 100644
--- a/app/src/main/java/com/oopcows/trackandtrigger/regandlogin/LoginActivity.java
+++ b/app/src/main/java/com/oopcows/trackandtrigger/regandlogin/LoginActivity.java
@@ -34,7 +34,7 @@ protected void onCreate(Bundle savedInstanceState) {
         View view = binding.getRoot();
         setContentView(view);
 
-        binding.registerOrSignInButton.setOnClickListener(registerOrSignInButtonListener());
+        binding.registerButton.setOnClickListener(registerOrSignInButtonListener());
 
         GoogleSignInOptions gso = new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN).requestEmail().build();
         mGoogleSignInClient = GoogleSignIn.getClient(this, gso);
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 003c24c..b6f1931 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -15,43 +15,16 @@
 
 
         <Button
-            android:id="@+id/registerOrSignInButton"
+            android:id="@+id/registerButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-<<<<<<< Updated upstream
-            android:text="@string/register_or_sign_in_label"
             app:layout_constraintEnd_toEndOf="parent"
-=======
             android:layout_marginTop="8dp"
             android:text="@string/register_label"
             app:layout_constraintEnd_toStartOf="@+id/signInButton"
->>>>>>> Stashed changes
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/passwordContainer" />
 
-<<<<<<< Updated upstream
-        <EditText
-            android:id="@+id/usernameField"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:autofillHints="@string/auto_username_hint"
-            android:hint="@string/username_hint"
-            android:inputType="text"
-            android:maxEms="10"
-            android:minEms="10"
-            android:textSize="14sp"
-            app:layout_constraintBaseline_toBaselineOf="@+id/usernameLabel"
-            app:layout_constraintEnd_toEndOf="parent" />
-
-
-        <EditText
-            android:id="@+id/passwordField"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="132dp"
-            android:autofillHints="otp"
-=======
-
         <Button
             android:id="@+id/signInButton"
             android:layout_width="wrap_content"
@@ -69,7 +42,6 @@
             android:layout_height="58dp"
             android:layout_marginBottom="188dp"
             android:autofillHints="password"
->>>>>>> Stashed changes
             android:hint="@string/password_hint"
             android:inputType="textPassword"
             android:maxEms="10"
@@ -84,7 +56,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />
 
-<<<<<<< Updated upstream
         <TextView
             android:id="@+id/passwordLabel"
             android:layout_width="wrap_content"
@@ -102,9 +73,8 @@
             android:text="@string/username_label"
             app:layout_constraintBottom_toTopOf="@+id/passwordField"
             app:layout_constraintEnd_toStartOf="@+id/usernameField" />
-=======
         </com.google.android.material.textfield.TextInputLayout>
->>>>>>> Stashed changes
+
 
         <com.google.android.gms.common.SignInButton
             android:id="@+id/g_sign_in_button"
@@ -119,7 +89,7 @@
         <TextView
             android:id="@+id/errorLabel"
             android:layout_width="185dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:layout_marginBottom="8dp"
             android:scrollHorizontally="false"
diff --git a/app/src/main/res/layout/activity_ph_no_otp.xml b/app/src/main/res/layout/activity_ph_no_otp.xml
index 00cdd9d..ba9274a 100644
--- a/app/src/main/res/layout/activity_ph_no_otp.xml
+++ b/app/src/main/res/layout/activity_ph_no_otp.xml
@@ -5,27 +5,20 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-<<<<<<< Updated upstream
     tools:context=".regandlogin.EmailVerifyActivitiy"
     android:gravity="center">
-=======
     android:gravity="center"
     tools:context=".regandlogin.EmailVerifyActivitiy">
->>>>>>> Stashed changes
-
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical">
-
-<<<<<<< Updated upstream
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:gravity="end">
-=======
     <EditText
         android:id="@+id/phnoField"
         android:layout_width="wrap_content"
@@ -42,7 +35,6 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
         android:autofillHints="" />
->>>>>>> Stashed changes
 
             <TextView
                 android:id="@+id/phnoLabel"
@@ -50,18 +42,9 @@
                 android:layout_height="wrap_content"
                 android:text="@string/phno_label" />
 
-            <EditText
-                android:id="@+id/phnoField"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:hint="@string/phno_hint"
-                android:inputType="phone"
-                android:maxEms="10"
-                android:minEms="10" />
-
-<<<<<<< Updated upstream
         </LinearLayout>
-=======
+
+
     <EditText
         android:id="@+id/otpField"
         android:layout_width="wrap_content"
@@ -73,7 +56,6 @@
         app:layout_constraintStart_toStartOf="@+id/phnoField"
         app:layout_constraintTop_toBottomOf="@+id/phnoField"
         android:autofillHints="" />
->>>>>>> Stashed changes
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -81,22 +63,12 @@
             android:orientation="horizontal"
             android:gravity="end">
 
-<<<<<<< Updated upstream
             <TextView
                 android:id="@+id/otpLabel"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/otp_label" />
 
-            <EditText
-                android:id="@+id/otpField"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:inputType="number"
-                android:hint="@string/otp_hint"
-                android:maxEms="10"
-                android:minEms="10" />
-
         </LinearLayout>
 
         <LinearLayout
@@ -119,28 +91,6 @@
                 android:layout_weight="0.5"
                 android:text="@string/next_label" />
         </LinearLayout>
-=======
-    <Button
-        android:id="@+id/getOtpButton"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="54dp"
-        android:text="@string/get_otp_label"
-        app:layout_constraintBaseline_toBaselineOf="@+id/nextButton"
-        app:layout_constraintEnd_toStartOf="@+id/nextButton"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <Button
-        android:id="@+id/nextButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="54dp"
-        android:text="@string/next_label"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/getOtpButton"
-        app:layout_constraintTop_toBottomOf="@+id/otpLabel" />
->>>>>>> Stashed changes
 
     </LinearLayout>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7ab1337..aa26817 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -8,16 +8,25 @@
     <string name="signin_label">Sign In</string>
     <string name="next_label">Next</string>
     <string name="otp_label">OTP</string>
-    <string name="get_otp_label">Get OTP!</string>
+    <string name="get_otp_label">Get OTP</string>
     <string name="reg_and_login_label">Register and Login</string>
-    <string name="g_signin_suggestion">Use Google Sign-in to login to your registered account!</string>
+    <string name="g_signin_suggestion">Use Google Sign-in to Register/Sign in to your registered account</string>
     <string name="g_siginin_fail">Google Sign-in failed</string>
     <string name="username_hint">Username</string>
+    <string name="auto_username_hint">iampanner69</string>
     <string name="password_hint">Password</string>
     <string name="confirm_password_hint">Confirm Password</string>
-    <string name="gmail_id_hint">xyz@gmail.com</string>
-    <string name="phno_hint">123456789</string>
-    <string name="otp_hint">****</string>
+    <string name="gmail_id_hint">Gmail ID here</string>
+    <string name="phno_hint">Phone Number here</string>
+    <string name="otp_sent">OTP sent!</string>
+    <string name="wrong_otp">Wrong OTP entered!</string>
+    <string name="otp_hint">OTP here</string>
     <string name="get_verification_link_label">Get Verification Link</string>
+    <string name="choose_profession_label">Choose Profession</string>
+    <string name="confirm_profession_button">OK</string>
+    <string name="register_or_sign_in_label">Register / Sign In</string>
+    <string name="groceries">Groceries</string>
+    <string name="kitchen_appliances">Kitchen Appliances</string>
+    <string name="home_maintenance">Home Maintenance</string>
 
 </resources>
\ No newline at end of file

From fb9253e36f6965fa7d70b063c3109195951d7c63 Mon Sep 17 00:00:00 2001
From: SubsTheTechnomancer
 <54163143+SubsTheTechnomancer@users.noreply.github.com>
Date: Fri, 20 Nov 2020 19:18:31 +0530
Subject: [PATCH 5/5] Doing funs and redoing commit of paneer

---
 .../dashboard/DashboardActivity.java          | 31 ++++++++++++++-----
 ...ent.java => ProfessionChooseFragment.java} | 20 ++++++------
 ...el.java => ProfessionChooseViewModel.java} |  4 +--
 .../main/res/layout/activity_dashboard.xml    | 28 ++++++-----------
 ...ent.xml => profession_choose_fragment.xml} | 16 ----------
 5 files changed, 46 insertions(+), 53 deletions(-)
 rename app/src/main/java/com/oopcows/trackandtrigger/dashboard/{PersonalDetailsFragment.java => ProfessionChooseFragment.java} (63%)
 rename app/src/main/java/com/oopcows/trackandtrigger/dashboard/{PersonalDetailsViewModel.java => ProfessionChooseViewModel.java} (84%)
 rename app/src/main/res/layout/{personal_details_fragment.xml => profession_choose_fragment.xml} (63%)

diff --git a/app/src/main/java/com/oopcows/trackandtrigger/dashboard/DashboardActivity.java b/app/src/main/java/com/oopcows/trackandtrigger/dashboard/DashboardActivity.java
index 4d6b6a0..c3e5e1a 100644
--- a/app/src/main/java/com/oopcows/trackandtrigger/dashboard/DashboardActivity.java
+++ b/app/src/main/java/com/oopcows/trackandtrigger/dashboard/DashboardActivity.java
@@ -13,12 +13,14 @@
 
 import static com.oopcows.trackandtrigger.helpers.CowConstants.USER_ACCOUNT_INTENT_KEY;
 
-public class DashboardActivity extends AppCompatActivity implements PersonalDetailsFragment.PersonalDetailsFillable {
+public class DashboardActivity extends AppCompatActivity implements ProfessionChooseFragment.PersonalDetailsFillable {
 
     private UserAccount userAccount;
     private DatabaseHelper dh;
-    private PersonalDetailsFragment personalDetailsFragment;
     private ActivityDashboardBinding binding;
+    private View homeMaintenanceButton, kitchenApplianceButton;
+    // @subs dashboardActivity should be in a sort of shadow while the dialogue is open
+    // so that it is not visible until the profession has been chosen
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -28,8 +30,13 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(view);
 
         userAccount = getIntent().getExtras().getParcelable(USER_ACCOUNT_INTENT_KEY);
-
         dh = DatabaseHelper.getInstance(this);
+
+        View groceryButton = binding.groceryListButton;
+        homeMaintenanceButton = binding.mainatenanceListButton;
+        kitchenApplianceButton = binding.kitchenAppliancesButton;
+        binding.specialButtons.removeAllViews();
+        binding.specialButtons.addView(groceryButton);
     }
 
     @Override
@@ -38,17 +45,27 @@ protected void onStart(){
         if(userAccount.getProfession() == Profession.nullProfession) {
             displayDialogue();
         }
+        else addAppropriateButtons();
     }
 
     private void displayDialogue() {
         FragmentManager fm = getSupportFragmentManager();
-        personalDetailsFragment = PersonalDetailsFragment.newInstance();
-        personalDetailsFragment.show(fm, null);
+        ProfessionChooseFragment.newInstance().show(fm, null);
     }
 
     @Override
-    public void fillDetails(String username, Profession profession) {
-        userAccount = new UserAccount(username, userAccount.getGmailId(), userAccount.getPhno(), profession);
+    public void fillDetails(Profession profession) {
+        userAccount = new UserAccount(userAccount.getUsername(), userAccount.getGmailId(), userAccount.getPhno(), profession);
         dh.updateUser(userAccount);
+        addAppropriateButtons();
+    }
+
+    private void addAppropriateButtons() {
+        if(!userAccount.getProfession().equals(Profession.jobSeeker)) {
+            binding.specialButtons.addView(homeMaintenanceButton);
+        }
+        if(userAccount.getProfession().equals(Profession.homeMaker)) {
+            binding.specialButtons.addView(kitchenApplianceButton);
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/oopcows/trackandtrigger/dashboard/PersonalDetailsFragment.java b/app/src/main/java/com/oopcows/trackandtrigger/dashboard/ProfessionChooseFragment.java
similarity index 63%
rename from app/src/main/java/com/oopcows/trackandtrigger/dashboard/PersonalDetailsFragment.java
rename to app/src/main/java/com/oopcows/trackandtrigger/dashboard/ProfessionChooseFragment.java
index c7b8f5e..0f0d5da 100644
--- a/app/src/main/java/com/oopcows/trackandtrigger/dashboard/PersonalDetailsFragment.java
+++ b/app/src/main/java/com/oopcows/trackandtrigger/dashboard/ProfessionChooseFragment.java
@@ -12,18 +12,18 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.oopcows.trackandtrigger.databinding.PersonalDetailsFragmentBinding;
+import com.oopcows.trackandtrigger.databinding.ProfessionChooseFragmentBinding;
 import com.oopcows.trackandtrigger.helpers.Profession;
 
 import java.util.Objects;
 
-public class PersonalDetailsFragment extends DialogFragment {
+public class ProfessionChooseFragment extends DialogFragment {
 
-    private PersonalDetailsViewModel mViewModel;
-    private PersonalDetailsFragmentBinding binding;
+    private ProfessionChooseViewModel mViewModel;
+    private ProfessionChooseFragmentBinding binding;
 
     public interface PersonalDetailsFillable {
-        void fillDetails(String username, Profession profession);
+        void fillDetails(Profession profession);
     }
 
     @Override
@@ -31,15 +31,15 @@ public void onStart() {
         super.onStart();
     }
 
-    public static PersonalDetailsFragment newInstance() {
-        return new PersonalDetailsFragment();
+    public static ProfessionChooseFragment newInstance() {
+        return new ProfessionChooseFragment();
     }
 
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
                              @Nullable Bundle savedInstanceState) {
-        binding = PersonalDetailsFragmentBinding.inflate(inflater);
+        binding = ProfessionChooseFragmentBinding.inflate(inflater);
         View view = binding.getRoot();
         return view;
     }
@@ -47,11 +47,11 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
     @Override
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-        mViewModel = new ViewModelProvider(this).get(PersonalDetailsViewModel.class);
+        mViewModel = new ViewModelProvider(this).get(ProfessionChooseViewModel.class);
 
         binding.chooseProfessionSpinner.setAdapter(mViewModel.getSpinnerAdapter(this));
         binding.confirmProfessionButton.setOnClickListener((v)-> {
-            ((PersonalDetailsFillable) Objects.requireNonNull(getActivity())).fillDetails(String.valueOf(binding.usernameField.getText()), Profession.valueOf((String) binding.chooseProfessionSpinner.getSelectedItem()));
+            ((PersonalDetailsFillable) Objects.requireNonNull(getActivity())).fillDetails(Profession.valueOf((String) binding.chooseProfessionSpinner.getSelectedItem()));
             dismiss();
         });
         setCancelable(false);
diff --git a/app/src/main/java/com/oopcows/trackandtrigger/dashboard/PersonalDetailsViewModel.java b/app/src/main/java/com/oopcows/trackandtrigger/dashboard/ProfessionChooseViewModel.java
similarity index 84%
rename from app/src/main/java/com/oopcows/trackandtrigger/dashboard/PersonalDetailsViewModel.java
rename to app/src/main/java/com/oopcows/trackandtrigger/dashboard/ProfessionChooseViewModel.java
index bb3d7fb..9e7130e 100644
--- a/app/src/main/java/com/oopcows/trackandtrigger/dashboard/PersonalDetailsViewModel.java
+++ b/app/src/main/java/com/oopcows/trackandtrigger/dashboard/ProfessionChooseViewModel.java
@@ -9,9 +9,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class PersonalDetailsViewModel extends ViewModel {
+public class ProfessionChooseViewModel extends ViewModel {
 
-    public ArrayAdapter<String> getSpinnerAdapter(PersonalDetailsFragment fragment) {
+    public ArrayAdapter<String> getSpinnerAdapter(ProfessionChooseFragment fragment) {
         List<String> professions = new ArrayList<String>();
         for(Profession p : Profession.values()) {
             if(p == Profession.nullProfession) continue;
diff --git a/app/src/main/res/layout/activity_dashboard.xml b/app/src/main/res/layout/activity_dashboard.xml
index afd899b..88c69a5 100644
--- a/app/src/main/res/layout/activity_dashboard.xml
+++ b/app/src/main/res/layout/activity_dashboard.xml
@@ -13,50 +13,42 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         android:padding="10dp"
+        android:id="@+id/special_buttons"
         android:orientation="horizontal">
 
         <Button
             android:id="@+id/grocery_list_button"
             style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:contentDescription="@string/groceries"
             android:layout_gravity="center"
-            android:elevation="5dp"
             android:layout_weight="0.33"
+            android:contentDescription="@string/groceries"
+            android:elevation="5dp"
             app:icon="@drawable/ic_launcher_foreground" />
 
         <Button
             android:id="@+id/mainatenance_list_button"
             style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:contentDescription="@string/groceries"
             android:layout_gravity="center"
-            android:elevation="5dp"
             android:layout_weight="0.33"
+            android:contentDescription="@string/home_maintenance"
+            android:elevation="5dp"
             app:icon="@drawable/ic_launcher_foreground" />
 
         <Button
             android:id="@+id/kitchen_appliances_button"
             style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:contentDescription="@string/groceries"
             android:layout_gravity="center"
-            android:elevation="5dp"
             android:layout_weight="0.33"
+            android:contentDescription="@string/kitchen_appliances"
+            android:elevation="5dp"
             app:icon="@drawable/ic_launcher_foreground" />
 
     </LinearLayout>
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/floatingActionButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:clickable="true"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:srcCompat="@android:drawable/ic_input_add" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/personal_details_fragment.xml b/app/src/main/res/layout/profession_choose_fragment.xml
similarity index 63%
rename from app/src/main/res/layout/personal_details_fragment.xml
rename to app/src/main/res/layout/profession_choose_fragment.xml
index dd9591a..2c03036 100644
--- a/app/src/main/res/layout/personal_details_fragment.xml
+++ b/app/src/main/res/layout/profession_choose_fragment.xml
@@ -6,22 +6,6 @@
     android:orientation="vertical"
     android:padding="10dp">
 
-    <TextView
-        android:id="@+id/usernameLabel"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/username_label" />
-
-    <EditText
-        android:id="@+id/usernameField"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:autofillHints=""
-        android:ems="10"
-        android:hint="@string/username_hint"
-        android:inputType="textPersonName"
-        android:textSize="14sp" />
-
     <TextView
         android:id="@+id/chooseProfessionLabel"
         android:layout_width="wrap_content"