From 9372ba596f8f4839591076c9a63282d80de17cbb Mon Sep 17 00:00:00 2001
From: rishi <rishitiwari517@gmail.com>
Date: Sun, 3 May 2020 23:23:02 +0530
Subject: [PATCH 01/11] Complaint,vote and notice Ui

---
 app/src/main/AndroidManifest.xml              |   4 +
 app/src/main/res/drawable/arrow_1.xml         |  18 ++
 app/src/main/res/drawable/description_box.xml |  22 ++
 .../main/res/drawable/radio_button_check.xml  |  10 +
 .../res/drawable/radio_button_selector.xml    |   8 +
 .../res/drawable/radio_button_uncheck.xml     |  10 +
 .../main/res/drawable/white_background.xml    |   8 +
 app/src/main/res/font/josefin_sans_bold.xml   |   7 +
 .../main/res/font/josefin_sans_semibold.xml   |   7 +
 .../main/res/layout/activity_complaint.xml    | 110 +++++++++-
 app/src/main/res/layout/activity_notice.xml   |  57 +++++-
 app/src/main/res/layout/activity_vote.xml     | 146 ++++++++++++-
 app/src/main/res/values/font_certs.xml        |  17 ++
 app/src/main/res/values/preloaded_fonts.xml   |   7 +
 app/src/main/res/values/strings.xml           |  21 ++
 app/src/main/res/values/styles.xml            | 193 ++++++++++++++++++
 16 files changed, 636 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/res/drawable/arrow_1.xml
 create mode 100644 app/src/main/res/drawable/description_box.xml
 create mode 100644 app/src/main/res/drawable/radio_button_check.xml
 create mode 100644 app/src/main/res/drawable/radio_button_selector.xml
 create mode 100644 app/src/main/res/drawable/radio_button_uncheck.xml
 create mode 100644 app/src/main/res/drawable/white_background.xml
 create mode 100644 app/src/main/res/font/josefin_sans_bold.xml
 create mode 100644 app/src/main/res/font/josefin_sans_semibold.xml
 create mode 100644 app/src/main/res/values/font_certs.xml
 create mode 100644 app/src/main/res/values/preloaded_fonts.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d256de1..f897e1f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -23,6 +23,10 @@
         </activity>
         <activity
             android:name=".home.HomeActivity" />
+
+        <meta-data
+            android:name="preloaded_fonts"
+            android:resource="@array/preloaded_fonts" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/arrow_1.xml b/app/src/main/res/drawable/arrow_1.xml
new file mode 100644
index 0000000..b3d32be
--- /dev/null
+++ b/app/src/main/res/drawable/arrow_1.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="2450dp"
+    android:height="2400dp"
+    android:viewportWidth="2400"
+    android:viewportHeight="2400">
+
+    <group>
+
+        <clip-path
+            android:pathData="M623 1577 l-323 -323 0 -54 0 -54 323 -323 323 -323 50 0 c72 0 104 32 104 103 l0 50 -222 224 -222 223 696 0 695 0 27 26 c21 21 26 36 26 74 0 38 -5 53 -26 74 l-27 26 -695 0 -696 0 222 223 222 224 0 50 c0 71 -32 103 -104 103 l-50 0 -323 -323z"/>
+        <path
+            android:fillColor="#3F3D56"
+            android:strokeWidth="5"
+            android:strokeColor="#3F3D56"
+            android:pathData="M623 1577 l-323 -323 0 -54 0 -54 323 -323 323 -323 50 0 c72 0 104 32 104 103 l0 50 -222 224 -222 223 696 0 695 0 27 26 c21 21 26 36 26 74 0 38 -5 53 -26 74 l-27 26 -695 0 -696 0 222 223 222 224 0 50 c0 71 -32 103 -104 103 l-50 0 -323 -323z" />
+    </group>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/description_box.xml b/app/src/main/res/drawable/description_box.xml
new file mode 100644
index 0000000..ba60dd2
--- /dev/null
+++ b/app/src/main/res/drawable/description_box.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="300dp"
+    android:height="160dp"
+    android:viewportWidth="300"
+    android:viewportHeight="160">
+
+    <group>
+
+        <clip-path
+            android:pathData="M5 0H295C297.761 0 300 2.23858 300 5V155C300 157.761 297.761 160 295 160H5C2.23858 160 0 157.761 0 155V5C0 2.23858 2.23858 0 5 0Z"
+            />
+
+        <path
+            android:pathData="M5 0H295C297.761 0 300 2.23858 300 5V155C300 157.761 297.761 160 295 160H5C2.23858 160 0 157.761 0 155V5C0 2.23858 2.23858 0 5 0Z"
+            android:strokeWidth="2"
+            android:strokeColor="#3F3D56"
+            />
+
+    </group>
+
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/radio_button_check.xml b/app/src/main/res/drawable/radio_button_check.xml
new file mode 100644
index 0000000..309a255
--- /dev/null
+++ b/app/src/main/res/drawable/radio_button_check.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#373549"
+        android:strokeWidth="4"
+        android:pathData="M12,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5 5,-2.24 5,-5 -2.24,-5 -5,-5zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z" />
+</vector>
diff --git a/app/src/main/res/drawable/radio_button_selector.xml b/app/src/main/res/drawable/radio_button_selector.xml
new file mode 100644
index 0000000..4f93bfb
--- /dev/null
+++ b/app/src/main/res/drawable/radio_button_selector.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_checked="true"
+        android:drawable="@drawable/radio_button_check"/>
+    <item
+        android:drawable="@drawable/radio_button_uncheck"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/radio_button_uncheck.xml b/app/src/main/res/drawable/radio_button_uncheck.xml
new file mode 100644
index 0000000..cba32d7
--- /dev/null
+++ b/app/src/main/res/drawable/radio_button_uncheck.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#373549"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z" />
+</vector>
diff --git a/app/src/main/res/drawable/white_background.xml b/app/src/main/res/drawable/white_background.xml
new file mode 100644
index 0000000..eae598e
--- /dev/null
+++ b/app/src/main/res/drawable/white_background.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid
+        android:color="#FFFFFF"/>
+    <corners
+        android:radius="15dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/font/josefin_sans_bold.xml b/app/src/main/res/font/josefin_sans_bold.xml
new file mode 100644
index 0000000..4a46d74
--- /dev/null
+++ b/app/src/main/res/font/josefin_sans_bold.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
+        app:fontProviderAuthority="com.google.android.gms.fonts"
+        app:fontProviderPackage="com.google.android.gms"
+        app:fontProviderQuery="name=Josefin Sans&amp;weight=700"
+        app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
+</font-family>
diff --git a/app/src/main/res/font/josefin_sans_semibold.xml b/app/src/main/res/font/josefin_sans_semibold.xml
new file mode 100644
index 0000000..3b0ef75
--- /dev/null
+++ b/app/src/main/res/font/josefin_sans_semibold.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
+        app:fontProviderAuthority="com.google.android.gms.fonts"
+        app:fontProviderPackage="com.google.android.gms"
+        app:fontProviderQuery="name=Josefin Sans&amp;weight=600"
+        app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
+</font-family>
diff --git a/app/src/main/res/layout/activity_complaint.xml b/app/src/main/res/layout/activity_complaint.xml
index 3fcdb92..b617e52 100644
--- a/app/src/main/res/layout/activity_complaint.xml
+++ b/app/src/main/res/layout/activity_complaint.xml
@@ -1,9 +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"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".complaint.ComplaintActivity">
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:ignore="UselessParent">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="43dp">
+
+            <ImageView
+                android:id="@+id/arrow_1"
+                android:layout_width="35dp"
+                android:layout_height="35dp"
+                android:layout_marginStart="25dp"
+                android:layout_marginTop="20dp"
+                android:src="@drawable/arrow_1"
+                tools:ignore="ContentDescription" />
+
+            <TextView
+                android:id="@+id/complaint_s"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/arrow_1"
+                android:layout_marginStart="25dp"
+                android:layout_marginTop="30dp"
+                android:fontFamily="@font/josefin_sans_bold"
+                android:text="@string/complaint_s"
+                android:textAppearance="@style/complaint_s" />
+
+            <TextView
+                android:id="@+id/issue"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/complaint_s"
+                android:layout_marginStart="25dp"
+                android:layout_marginTop="52dp"
+                android:fontFamily="@font/josefin_sans_bold"
+                android:text="@string/issue"
+                android:textAppearance="@style/issue" />
+
+            <EditText
+                android:id="@+id/line_1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/issue"
+                android:layout_marginStart="25dp"
+                android:layout_marginEnd="30dp"
+                android:backgroundTint="#39374D"
+                android:inputType="text"
+                android:textColor="#000000"
+                tools:ignore="Autofill,LabelFor" />
+
+            <TextView
+                android:id="@+id/description"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/line_1"
+                android:layout_marginStart="25dp"
+                android:layout_marginTop="28dp"
+                android:fontFamily="@font/josefin_sans_bold"
+                android:text="@string/description"
+                android:textAppearance="@style/description" />
+
+            <ImageView
+                android:id="@+id/rectangle_4"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/description"
+                android:layout_centerHorizontal="true"
+                android:layout_marginStart="25dp"
+                android:layout_marginTop="4dp"
+                android:layout_marginEnd="30dp"
+                android:scaleType="fitXY"
+                android:src="@drawable/description_box"
+                tools:ignore="ContentDescription" />
+
+            <Button
+                android:id="@+id/upload_button"
+                android:layout_width="135dp"
+                android:layout_height="38dp"
+                android:layout_below="@id/rectangle_4"
+                android:layout_marginStart="25dp"
+                android:layout_marginTop="24dp"
+                android:background="@drawable/white_background"
+                android:elevation="12dp"
+                android:fontFamily="@font/josefin_sans_bold"
+                android:gravity="center"
+                android:text="@string/upload_image"
+                android:textAppearance="@style/upload_image" />
+
+            <Button
+                android:id="@+id/file_complaint_button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/upload_button"
+                android:layout_marginStart="35dp"
+                android:layout_marginTop="80dp"
+                android:layout_marginEnd="35dp"
+                android:background="@drawable/rectangle_1"
+                android:elevation="80dp"
+                android:fontFamily="@font/josefin_sans_bold"
+                android:text="@string/file_compla"
+                android:textAppearance="@style/file_compla" />
+        </RelativeLayout>
+    </ScrollView>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_notice.xml b/app/src/main/res/layout/activity_notice.xml
index c0cd0ae..09a8574 100644
--- a/app/src/main/res/layout/activity_notice.xml
+++ b/app/src/main/res/layout/activity_notice.xml
@@ -1,9 +1,60 @@
 <?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"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".complaint.NoticeActivity">
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:ignore="UselessParent">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="43dp">
+
+            <ImageView
+                android:id="@id/arrow_1"
+                android:layout_width="35dp"
+                android:layout_height="35dp"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentTop="true"
+                android:layout_marginStart="30dp"
+                android:layout_marginTop="20dp"
+                android:src="@drawable/arrow_1"
+                tools:ignore="ContentDescription" />
+
+            <TextView
+                android:id="@+id/notice"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/arrow_1"
+                android:layout_marginStart="30dp"
+                android:layout_alignParentStart="true"
+                android:layout_marginTop="30dp"
+                android:fontFamily="@font/josefin_sans_bold"
+                android:text="@string/notice"
+                android:textAppearance="@style/notice" />
+
+            <LinearLayout
+                android:layout_width="316dp"
+                android:layout_height="370dp"
+                android:layout_below="@id/notice"
+                android:layout_centerVertical="true"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="27dp"
+                android:background="#FFFFFF"
+                android:orientation="vertical"
+                android:padding="19dp">
+
+                <TextView
+                    android:id="@+id/to_all_the"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:textAppearance="@style/to_all_the_"
+                    android:text="@string/to_all_the_" />
+            </LinearLayout>
+        </RelativeLayout>
+    </ScrollView>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_vote.xml b/app/src/main/res/layout/activity_vote.xml
index 79edfb2..555ca70 100644
--- a/app/src/main/res/layout/activity_vote.xml
+++ b/app/src/main/res/layout/activity_vote.xml
@@ -1,9 +1,149 @@
 <?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"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".vote.VoteActivity">
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:ignore="UselessParent">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="43dp">
+
+            <ImageView
+                android:id="@id/arrow_1"
+                android:layout_width="35dp"
+                android:layout_height="35dp"
+                android:layout_marginStart="25dp"
+                android:layout_marginTop="20dp"
+                android:src="@drawable/arrow_1"
+                tools:ignore="ContentDescription" />
+
+            <TextView
+                android:id="@+id/vote_for_ch"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/arrow_1"
+                android:layout_marginStart="25dp"
+                android:layout_marginTop="30dp"
+                android:fontFamily="@font/josefin_sans_bold"
+                android:text="@string/vote_for_ch"
+                android:textAppearance="@style/vote_for_ch" />
+
+            <TextView
+                android:id="@+id/choose_meal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/vote_for_ch"
+                android:layout_marginStart="25dp"
+                android:layout_marginTop="60dp"
+                android:fontFamily="@font/josefin_sans_semibold"
+                android:text="@string/choose_meal"
+                android:textAppearance="@style/choose_meal" />
+
+            <RadioGroup
+                android:id="@+id/radio_buttom_group"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/choose_meal"
+                android:layout_marginStart="36dp"
+                android:layout_marginTop="19dp"
+                >
+                <RadioButton
+                    android:id="@+id/breakfast"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="@style/breakfast"
+                    android:button="@drawable/radio_button_selector"
+                    android:text="@string/breakfast"
+                    android:padding="8dp"
+                    android:fontFamily="@font/josefin_sans_semibold"/>
+                <RadioButton
+                    android:id="@+id/lunch"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="@style/lunch"
+                    android:layout_marginTop="9dp"
+                    android:padding="8dp"
+                    android:button="@drawable/radio_button_selector"
+                    android:text="@string/lunch"
+                    android:fontFamily="@font/josefin_sans_semibold"/>
+                <RadioButton
+                    android:id="@+id/dinner"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="@style/dinner"
+                    android:layout_marginTop="9dp"
+                    android:padding="8dp"
+                    android:button="@drawable/radio_button_selector"
+                    android:text="@string/dinner"
+                    android:fontFamily="@font/josefin_sans_semibold"/>
+            </RadioGroup>
+            <TextView
+                android:id="@+id/food_item"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/food_item"
+                android:layout_below="@id/radio_buttom_group"
+                android:textAppearance="@style/food_item"
+                android:fontFamily="@font/josefin_sans_semibold"
+                android:layout_marginTop="45dp"
+                android:layout_marginStart="25dp"/>
+
+            <EditText
+                android:id="@+id/enter_food_item"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginStart="25dp"
+                android:layout_below="@id/food_item"
+                android:backgroundTint="#39374D"
+                android:layout_marginEnd="30dp"
+                tools:ignore="Autofill,LabelFor,TextFields" />
+
+            <Button
+                android:id="@+id/vote_for_ad"
+                android:layout_width="130dp"
+                android:layout_height="37dp"
+                android:background="@drawable/white_background"
+                android:layout_below="@id/enter_food_item"
+                android:layout_marginStart="25dp"
+                android:elevation="8dp"
+                android:layout_marginTop="65dp"
+                android:fontFamily="@font/josefin_sans_semibold"
+                android:textAppearance="@style/vote_for_ad"
+                android:text="@string/vote_for_adding"/>
+
+            <Button
+                android:id="@+id/vote_for_re"
+                android:layout_width="130dp"
+                android:layout_height="37dp"
+                android:background="@drawable/white_background"
+                android:layout_below="@id/enter_food_item"
+                android:layout_alignParentEnd="true"
+                android:layout_marginEnd="30dp"
+                android:elevation="8dp"
+                android:fontFamily="@font/josefin_sans_semibold"
+                android:layout_marginTop="65dp"
+                android:textAppearance="@style/vote_for_re"
+                android:text="@string/vote_for_re"/>
+
+            <Button
+                android:id="@+id/submit_button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/vote_for_ad"
+                android:layout_marginStart="35dp"
+                android:layout_marginTop="85dp"
+                android:layout_marginEnd="35dp"
+                android:background="@drawable/rectangle_1"
+                android:elevation="8dp"
+                android:fontFamily="@font/josefin_sans_bold"
+                android:text="@string/submit"
+                android:textAppearance="@style/submit" />
+        </RelativeLayout>
+    </ScrollView>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/font_certs.xml b/app/src/main/res/values/font_certs.xml
new file mode 100644
index 0000000..d2226ac
--- /dev/null
+++ b/app/src/main/res/values/font_certs.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <array name="com_google_android_gms_fonts_certs">
+        <item>@array/com_google_android_gms_fonts_certs_dev</item>
+        <item>@array/com_google_android_gms_fonts_certs_prod</item>
+    </array>
+    <string-array name="com_google_android_gms_fonts_certs_dev">
+        <item>
+            MIIEqDCCA5CgAwIBAgIJANWFuGx90071MA0GCSqGSIb3DQEBBAUAMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAeFw0wODA0MTUyMzM2NTZaFw0zNTA5MDEyMzM2NTZaMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBANbOLggKv+IxTdGNs8/TGFy0PTP6DHThvbbR24kT9ixcOd9W+EaBPWW+wPPKQmsHxajtWjmQwWfna8mZuSeJS48LIgAZlKkpFeVyxW0qMBujb8X8ETrWy550NaFtI6t9+u7hZeTfHwqNvacKhp1RbE6dBRGWynwMVX8XW8N1+UjFaq6GCJukT4qmpN2afb8sCjUigq0GuMwYXrFVee74bQgLHWGJwPmvmLHC69EH6kWr22ijx4OKXlSIx2xT1AsSHee70w5iDBiK4aph27yH3TxkXy9V89TDdexAcKk/cVHYNnDBapcavl7y0RiQ4biu8ymM8Ga/nmzhRKya6G0cGw8CAQOjgfwwgfkwHQYDVR0OBBYEFI0cxb6VTEM8YYY6FbBMvAPyT+CyMIHJBgNVHSMEgcEwgb6AFI0cxb6VTEM8YYY6FbBMvAPyT+CyoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJANWFuGx90071MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBABnTDPEF+3iSP0wNfdIjIz1AlnrPzgAIHVvXxunW7SBrDhEglQZBbKJEk5kT0mtKoOD1JMrSu1xuTKEBahWRbqHsXclaXjoBADb0kkjVEJu/Lh5hgYZnOjvlba8Ld7HCKePCVePoTJBdI4fvugnL8TsgK05aIskyY0hKI9L8KfqfGTl1lzOv2KoWD0KWwtAWPoGChZxmQ+nBli+gwYMzM1vAkP+aayLe0a1EQimlOalO762r0GXO0ks+UeXde2Z4e+8S/pf7pITEI/tP+MxJTALw9QUWEv9lKTk+jkbqxbsh8nfBUapfKqYn0eidpwq2AzVp3juYl7//fKnaPhJD9gs=
+        </item>
+    </string-array>
+    <string-array name="com_google_android_gms_fonts_certs_prod">
+        <item>
+            MIIEQzCCAyugAwIBAgIJAMLgh0ZkSjCNMA0GCSqGSIb3DQEBBAUAMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDAeFw0wODA4MjEyMzEzMzRaFw0zNjAxMDcyMzEzMzRaMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBAKtWLgDYO6IIrgqWbxJOKdoR8qtW0I9Y4sypEwPpt1TTcvZApxsdyxMJZ2JORland2qSGT2y5b+3JKkedxiLDmpHpDsz2WCbdxgxRczfey5YZnTJ4VZbH0xqWVW/8lGmPav5xVwnIiJS6HXk+BVKZF+JcWjAsb/GEuq/eFdpuzSqeYTcfi6idkyugwfYwXFU1+5fZKUaRKYCwkkFQVfcAs1fXA5V+++FGfvjJ/CxURaSxaBvGdGDhfXE28LWuT9ozCl5xw4Yq5OGazvV24mZVSoOO0yZ31j7kYvtwYK6NeADwbSxDdJEqO4k//0zOHKrUiGYXtqw/A0LFFtqoZKFjnkCAQOjgdkwgdYwHQYDVR0OBBYEFMd9jMIhF1Ylmn/Tgt9r45jk14alMIGmBgNVHSMEgZ4wgZuAFMd9jMIhF1Ylmn/Tgt9r45jk14aloXikdjB0MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLR29vZ2xlIEluYy4xEDAOBgNVBAsTB0FuZHJvaWQxEDAOBgNVBAMTB0FuZHJvaWSCCQDC4IdGZEowjTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4IBAQBt0lLO74UwLDYKqs6Tm8/yzKkEu116FmH4rkaymUIE0P9KaMftGlMexFlaYjzmB2OxZyl6euNXEsQH8gjwyxCUKRJNexBiGcCEyj6z+a1fuHHvkiaai+KL8W1EyNmgjmyy8AW7P+LLlkR+ho5zEHatRbM/YAnqGcFh5iZBqpknHf1SKMXFh4dd239FJ1jWYfbMDMy3NS5CTMQ2XFI1MvcyUTdZPErjQfTbQe3aDQsQcafEQPD+nqActifKZ0Np0IS9L9kR/wbNvyz6ENwPiTrjV2KRkEjH78ZMcUQXg0L3BYHJ3lc69Vs5Ddf9uUGGMYldX3WfMBEmh/9iFBDAaTCK
+        </item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values/preloaded_fonts.xml b/app/src/main/res/values/preloaded_fonts.xml
new file mode 100644
index 0000000..dcd5829
--- /dev/null
+++ b/app/src/main/res/values/preloaded_fonts.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <array name="preloaded_fonts" translatable="false">
+        <item>@font/josefin_sans_bold</item>
+        <item>@font/josefin_sans_semibold</item>
+    </array>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f32e65b..fd879de 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,4 +6,25 @@
     <string name="sign_in">Sign in</string>
     <string name="forgot_pass">Forgot Password?</string>
     <string name="create_acco">Create Account</string>
+
+    <string name="complaint_s">Complaint Section</string>
+    <string name="issue">Issue</string>
+    <string name="description">Description</string>
+    <string name="upload_image">Upload Image</string>
+    <string name="file_compla">File Complaint</string>
+
+    <string name="vote_for_ch">Vote for change</string>
+    <string name="choose_meal">Choose meal type</string>
+    <string name="breakfast">Breakfast</string>
+    <string name="lunch">Lunch</string>
+    <string name="dinner">Dinner</string>
+    <string name="food_item">Food Item</string>
+    <string name="vote_for_adding">vote for adding</string>
+    <string name="vote_for_re">Vote for removing</string>
+    <string name="submit">Submit</string>
+
+    <string name="to_all_the_">
+        To all the students of Arya Mess :\nLet me set the scene: your friend John is rushing to get his daughter from school and his son to the soccer field, and he still needs to stop at the grocery store because there\'s nothing in the fridge. In the midst of this everyday madness, he gets a text message from Google with a verification code. He thinks,\"That\'s weird. Maybe I should log in to my email and see what\'s going on.\"
+    </string>
+    <string name="notice">Notice</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9a1b33f..9236d5b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -12,10 +12,12 @@
         <item name="android:textSize">24sp</item>
         <item name="android:textColor">#39374D</item>
     </style>
+
     <style name="email">
         <item name="android:textSize">12sp</item>
         <item name="android:textColor">#39374D</item>
     </style>
+
     <style name="password">
         <item name="android:textSize">12sp</item>
         <item name="android:textColor">#39374D</item>
@@ -37,4 +39,195 @@
         </item>
 
     </style>
+
+    <style name="complaint_s">
+
+        <item name="android:textSize">
+            22sp
+        </item>
+
+        <item name="android:textColor">
+            #000000
+        </item>
+
+    </style>
+
+    <style name="issue">
+        <item name="android:textSize">
+            15sp
+        </item>
+
+        <item name="android:textColor">
+            #39374D
+        </item>
+
+    </style>
+
+    <style name="description">
+
+        <item name="android:textSize">
+            15sp
+        </item>
+
+        <item name="android:textColor">
+            #39374D
+        </item>
+
+    </style>
+
+    <style name="upload_image">
+
+        <item name="android:textSize">
+            12sp
+        </item>
+
+        <item name="android:textColor">
+            #3B3950
+        </item>
+
+    </style>
+
+    <style name="file_compla">
+
+        <item name="android:textSize">
+            18sp
+        </item>
+
+        <item name="android:textColor">
+            #FFFFFF
+        </item>
+
+    </style>
+
+    <style name="vote_for_ch">
+
+        <item name="android:textSize">
+            22sp
+        </item>
+
+        <item name="android:textColor">
+            #000000
+        </item>
+
+    </style>
+
+    <style name="choose_meal">
+
+        <item name="android:textSize">
+            16sp
+        </item>
+
+        <item name="android:textColor">
+            #39374D
+        </item>
+
+    </style>
+
+    <style name="breakfast">
+
+        <item name="android:textSize">
+            14sp
+        </item>
+
+        <item name="android:textColor">
+            #39374D
+        </item>
+
+    </style>
+
+    <style name="lunch">
+
+        <item name="android:textSize">
+            14sp
+        </item>
+
+        <item name="android:textColor">
+            #39374D
+        </item>
+
+    </style>
+
+    <style name="dinner">
+
+        <item name="android:textSize">
+            14sp
+        </item>
+
+        <item name="android:textColor">
+            #39374D
+        </item>
+
+    </style>
+
+    <style name="food_item">
+
+        <item name="android:textSize">
+            14sp
+        </item>
+
+        <item name="android:textColor">
+            #39374D
+        </item>
+
+    </style>
+
+    <style name="vote_for_ad">
+
+        <item name="android:textSize">
+            12sp
+        </item>
+
+        <item name="android:textColor">
+            #3B3950
+        </item>
+
+    </style>
+
+    <style name="vote_for_re">
+
+        <item name="android:textSize">
+            12sp
+        </item>
+
+        <item name="android:textColor">
+            #3B3950
+        </item>
+
+    </style>
+
+    <style name="submit">
+
+        <item name="android:textSize">
+            18sp
+        </item>
+
+        <item name="android:textColor">
+            #FFFFFF
+        </item>
+
+    </style>
+
+    <style name="notice">
+
+        <item name="android:textSize">
+            22sp
+        </item>
+
+        <item name="android:textColor">
+            #000000
+        </item>
+
+    </style>
+
+    <style name="to_all_the_">
+
+        <item name="android:textSize">
+            16sp
+        </item>
+
+        <item name="android:textColor">
+            #000000
+        </item>
+
+    </style>
 </resources>

From 3a3b57118c1e770a1f6e5c963583986da75f5baa Mon Sep 17 00:00:00 2001
From: rishi <rishitiwari517@gmail.com>
Date: Mon, 4 May 2020 08:20:40 +0530
Subject: [PATCH 02/11] useless parent removed

---
 .../main/res/layout/activity_complaint.xml    | 191 +++++++-------
 app/src/main/res/layout/activity_notice.xml   |  89 +++----
 app/src/main/res/layout/activity_vote.xml     | 246 +++++++++---------
 3 files changed, 257 insertions(+), 269 deletions(-)

diff --git a/app/src/main/res/layout/activity_complaint.xml b/app/src/main/res/layout/activity_complaint.xml
index b617e52..ecc4606 100644
--- a/app/src/main/res/layout/activity_complaint.xml
+++ b/app/src/main/res/layout/activity_complaint.xml
@@ -1,113 +1,108 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".complaint.ComplaintActivity">
-    <ScrollView
+
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        tools:ignore="UselessParent">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingBottom="43dp">
+        android:paddingBottom="43dp">
 
-            <ImageView
-                android:id="@+id/arrow_1"
-                android:layout_width="35dp"
-                android:layout_height="35dp"
-                android:layout_marginStart="25dp"
-                android:layout_marginTop="20dp"
-                android:src="@drawable/arrow_1"
-                tools:ignore="ContentDescription" />
+        <ImageView
+            android:id="@+id/arrow_1"
+            android:layout_width="35dp"
+            android:layout_height="35dp"
+            android:layout_marginStart="25dp"
+            android:layout_marginTop="20dp"
+            android:src="@drawable/arrow_1"
+            tools:ignore="ContentDescription" />
 
-            <TextView
-                android:id="@+id/complaint_s"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/arrow_1"
-                android:layout_marginStart="25dp"
-                android:layout_marginTop="30dp"
-                android:fontFamily="@font/josefin_sans_bold"
-                android:text="@string/complaint_s"
-                android:textAppearance="@style/complaint_s" />
+        <TextView
+            android:id="@+id/complaint_s"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/arrow_1"
+            android:layout_marginStart="25dp"
+            android:layout_marginTop="30dp"
+            android:fontFamily="@font/josefin_sans_bold"
+            android:text="@string/complaint_s"
+            android:textAppearance="@style/complaint_s" />
 
-            <TextView
-                android:id="@+id/issue"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/complaint_s"
-                android:layout_marginStart="25dp"
-                android:layout_marginTop="52dp"
-                android:fontFamily="@font/josefin_sans_bold"
-                android:text="@string/issue"
-                android:textAppearance="@style/issue" />
+        <TextView
+            android:id="@+id/issue"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/complaint_s"
+            android:layout_marginStart="25dp"
+            android:layout_marginTop="52dp"
+            android:fontFamily="@font/josefin_sans_bold"
+            android:text="@string/issue"
+            android:textAppearance="@style/issue" />
 
-            <EditText
-                android:id="@+id/line_1"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/issue"
-                android:layout_marginStart="25dp"
-                android:layout_marginEnd="30dp"
-                android:backgroundTint="#39374D"
-                android:inputType="text"
-                android:textColor="#000000"
-                tools:ignore="Autofill,LabelFor" />
+        <EditText
+            android:id="@+id/line_1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/issue"
+            android:layout_marginStart="25dp"
+            android:layout_marginEnd="30dp"
+            android:backgroundTint="#39374D"
+            android:inputType="text"
+            android:textColor="#000000"
+            tools:ignore="Autofill,LabelFor" />
 
-            <TextView
-                android:id="@+id/description"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/line_1"
-                android:layout_marginStart="25dp"
-                android:layout_marginTop="28dp"
-                android:fontFamily="@font/josefin_sans_bold"
-                android:text="@string/description"
-                android:textAppearance="@style/description" />
+        <TextView
+            android:id="@+id/description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/line_1"
+            android:layout_marginStart="25dp"
+            android:layout_marginTop="28dp"
+            android:fontFamily="@font/josefin_sans_bold"
+            android:text="@string/description"
+            android:textAppearance="@style/description" />
 
-            <ImageView
-                android:id="@+id/rectangle_4"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/description"
-                android:layout_centerHorizontal="true"
-                android:layout_marginStart="25dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginEnd="30dp"
-                android:scaleType="fitXY"
-                android:src="@drawable/description_box"
-                tools:ignore="ContentDescription" />
+        <ImageView
+            android:id="@+id/rectangle_4"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/description"
+            android:layout_centerHorizontal="true"
+            android:layout_marginStart="25dp"
+            android:layout_marginTop="4dp"
+            android:layout_marginEnd="30dp"
+            android:scaleType="fitXY"
+            android:src="@drawable/description_box"
+            tools:ignore="ContentDescription" />
 
-            <Button
-                android:id="@+id/upload_button"
-                android:layout_width="135dp"
-                android:layout_height="38dp"
-                android:layout_below="@id/rectangle_4"
-                android:layout_marginStart="25dp"
-                android:layout_marginTop="24dp"
-                android:background="@drawable/white_background"
-                android:elevation="12dp"
-                android:fontFamily="@font/josefin_sans_bold"
-                android:gravity="center"
-                android:text="@string/upload_image"
-                android:textAppearance="@style/upload_image" />
+        <Button
+            android:id="@+id/upload_button"
+            android:layout_width="135dp"
+            android:layout_height="38dp"
+            android:layout_below="@id/rectangle_4"
+            android:layout_marginStart="25dp"
+            android:layout_marginTop="24dp"
+            android:background="@drawable/white_background"
+            android:elevation="12dp"
+            android:fontFamily="@font/josefin_sans_bold"
+            android:gravity="center"
+            android:text="@string/upload_image"
+            android:textAppearance="@style/upload_image" />
 
-            <Button
-                android:id="@+id/file_complaint_button"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/upload_button"
-                android:layout_marginStart="35dp"
-                android:layout_marginTop="80dp"
-                android:layout_marginEnd="35dp"
-                android:background="@drawable/rectangle_1"
-                android:elevation="80dp"
-                android:fontFamily="@font/josefin_sans_bold"
-                android:text="@string/file_compla"
-                android:textAppearance="@style/file_compla" />
-        </RelativeLayout>
-    </ScrollView>
-</RelativeLayout>
\ No newline at end of file
+        <Button
+            android:id="@+id/file_complaint_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/upload_button"
+            android:layout_marginStart="35dp"
+            android:layout_marginTop="80dp"
+            android:layout_marginEnd="35dp"
+            android:background="@drawable/rectangle_1"
+            android:elevation="80dp"
+            android:fontFamily="@font/josefin_sans_bold"
+            android:text="@string/file_compla"
+            android:textAppearance="@style/file_compla" />
+    </RelativeLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_notice.xml b/app/src/main/res/layout/activity_notice.xml
index 09a8574..e184e52 100644
--- a/app/src/main/res/layout/activity_notice.xml
+++ b/app/src/main/res/layout/activity_notice.xml
@@ -1,60 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".complaint.NoticeActivity">
-    <ScrollView
+
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        tools:ignore="UselessParent">
+        android:paddingBottom="43dp">
+
+        <ImageView
+            android:id="@id/arrow_1"
+            android:layout_width="35dp"
+            android:layout_height="35dp"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true"
+            android:layout_marginStart="30dp"
+            android:layout_marginTop="20dp"
+            android:src="@drawable/arrow_1"
+            tools:ignore="ContentDescription" />
 
-        <RelativeLayout
-            android:layout_width="match_parent"
+        <TextView
+            android:id="@+id/notice"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingBottom="43dp">
+            android:layout_below="@id/arrow_1"
+            android:layout_alignParentStart="true"
+            android:layout_marginStart="30dp"
+            android:layout_marginTop="30dp"
+            android:fontFamily="@font/josefin_sans_bold"
+            android:text="@string/notice"
+            android:textAppearance="@style/notice" />
 
-            <ImageView
-                android:id="@id/arrow_1"
-                android:layout_width="35dp"
-                android:layout_height="35dp"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentTop="true"
-                android:layout_marginStart="30dp"
-                android:layout_marginTop="20dp"
-                android:src="@drawable/arrow_1"
-                tools:ignore="ContentDescription" />
+        <LinearLayout
+            android:layout_width="316dp"
+            android:layout_height="370dp"
+            android:layout_below="@id/notice"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:layout_marginTop="27dp"
+            android:background="#FFFFFF"
+            android:orientation="vertical"
+            android:padding="19dp">
 
             <TextView
-                android:id="@+id/notice"
+                android:id="@+id/to_all_the"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/arrow_1"
-                android:layout_marginStart="30dp"
-                android:layout_alignParentStart="true"
-                android:layout_marginTop="30dp"
-                android:fontFamily="@font/josefin_sans_bold"
-                android:text="@string/notice"
-                android:textAppearance="@style/notice" />
-
-            <LinearLayout
-                android:layout_width="316dp"
-                android:layout_height="370dp"
-                android:layout_below="@id/notice"
-                android:layout_centerVertical="true"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="27dp"
-                android:background="#FFFFFF"
-                android:orientation="vertical"
-                android:padding="19dp">
-
-                <TextView
-                    android:id="@+id/to_all_the"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:textAppearance="@style/to_all_the_"
-                    android:text="@string/to_all_the_" />
-            </LinearLayout>
-        </RelativeLayout>
-    </ScrollView>
-</RelativeLayout>
\ No newline at end of file
+                android:layout_height="match_parent"
+                android:text="@string/to_all_the_"
+                android:textAppearance="@style/to_all_the_" />
+        </LinearLayout>
+    </RelativeLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_vote.xml b/app/src/main/res/layout/activity_vote.xml
index 555ca70..0b2aa0c 100644
--- a/app/src/main/res/layout/activity_vote.xml
+++ b/app/src/main/res/layout/activity_vote.xml
@@ -1,149 +1,147 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".vote.VoteActivity">
-    <ScrollView
+
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        tools:ignore="UselessParent">
+        android:paddingBottom="43dp">
 
-        <RelativeLayout
-            android:layout_width="match_parent"
+        <ImageView
+            android:id="@id/arrow_1"
+            android:layout_width="35dp"
+            android:layout_height="35dp"
+            android:layout_marginStart="25dp"
+            android:layout_marginTop="20dp"
+            android:src="@drawable/arrow_1"
+            tools:ignore="ContentDescription" />
+
+        <TextView
+            android:id="@+id/vote_for_ch"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingBottom="43dp">
+            android:layout_below="@id/arrow_1"
+            android:layout_marginStart="25dp"
+            android:layout_marginTop="30dp"
+            android:fontFamily="@font/josefin_sans_bold"
+            android:text="@string/vote_for_ch"
+            android:textAppearance="@style/vote_for_ch" />
 
-            <ImageView
-                android:id="@id/arrow_1"
-                android:layout_width="35dp"
-                android:layout_height="35dp"
-                android:layout_marginStart="25dp"
-                android:layout_marginTop="20dp"
-                android:src="@drawable/arrow_1"
-                tools:ignore="ContentDescription" />
+        <TextView
+            android:id="@+id/choose_meal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/vote_for_ch"
+            android:layout_marginStart="25dp"
+            android:layout_marginTop="60dp"
+            android:fontFamily="@font/josefin_sans_semibold"
+            android:text="@string/choose_meal"
+            android:textAppearance="@style/choose_meal" />
 
-            <TextView
-                android:id="@+id/vote_for_ch"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/arrow_1"
-                android:layout_marginStart="25dp"
-                android:layout_marginTop="30dp"
-                android:fontFamily="@font/josefin_sans_bold"
-                android:text="@string/vote_for_ch"
-                android:textAppearance="@style/vote_for_ch" />
+        <RadioGroup
+            android:id="@+id/radio_buttom_group"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/choose_meal"
+            android:layout_marginStart="36dp"
+            android:layout_marginTop="19dp">
 
-            <TextView
-                android:id="@+id/choose_meal"
+            <RadioButton
+                android:id="@+id/breakfast"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/vote_for_ch"
-                android:layout_marginStart="25dp"
-                android:layout_marginTop="60dp"
+                android:button="@drawable/radio_button_selector"
                 android:fontFamily="@font/josefin_sans_semibold"
-                android:text="@string/choose_meal"
-                android:textAppearance="@style/choose_meal" />
+                android:padding="8dp"
+                android:text="@string/breakfast"
+                android:textAppearance="@style/breakfast" />
 
-            <RadioGroup
-                android:id="@+id/radio_buttom_group"
+            <RadioButton
+                android:id="@+id/lunch"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/choose_meal"
-                android:layout_marginStart="36dp"
-                android:layout_marginTop="19dp"
-                >
-                <RadioButton
-                    android:id="@+id/breakfast"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="@style/breakfast"
-                    android:button="@drawable/radio_button_selector"
-                    android:text="@string/breakfast"
-                    android:padding="8dp"
-                    android:fontFamily="@font/josefin_sans_semibold"/>
-                <RadioButton
-                    android:id="@+id/lunch"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="@style/lunch"
-                    android:layout_marginTop="9dp"
-                    android:padding="8dp"
-                    android:button="@drawable/radio_button_selector"
-                    android:text="@string/lunch"
-                    android:fontFamily="@font/josefin_sans_semibold"/>
-                <RadioButton
-                    android:id="@+id/dinner"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="@style/dinner"
-                    android:layout_marginTop="9dp"
-                    android:padding="8dp"
-                    android:button="@drawable/radio_button_selector"
-                    android:text="@string/dinner"
-                    android:fontFamily="@font/josefin_sans_semibold"/>
-            </RadioGroup>
-            <TextView
-                android:id="@+id/food_item"
+                android:layout_marginTop="9dp"
+                android:button="@drawable/radio_button_selector"
+                android:fontFamily="@font/josefin_sans_semibold"
+                android:padding="8dp"
+                android:text="@string/lunch"
+                android:textAppearance="@style/lunch" />
+
+            <RadioButton
+                android:id="@+id/dinner"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/food_item"
-                android:layout_below="@id/radio_buttom_group"
-                android:textAppearance="@style/food_item"
+                android:layout_marginTop="9dp"
+                android:button="@drawable/radio_button_selector"
                 android:fontFamily="@font/josefin_sans_semibold"
-                android:layout_marginTop="45dp"
-                android:layout_marginStart="25dp"/>
+                android:padding="8dp"
+                android:text="@string/dinner"
+                android:textAppearance="@style/dinner" />
+        </RadioGroup>
 
-            <EditText
-                android:id="@+id/enter_food_item"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginStart="25dp"
-                android:layout_below="@id/food_item"
-                android:backgroundTint="#39374D"
-                android:layout_marginEnd="30dp"
-                tools:ignore="Autofill,LabelFor,TextFields" />
+        <TextView
+            android:id="@+id/food_item"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/radio_buttom_group"
+            android:layout_marginStart="25dp"
+            android:layout_marginTop="45dp"
+            android:fontFamily="@font/josefin_sans_semibold"
+            android:text="@string/food_item"
+            android:textAppearance="@style/food_item" />
 
-            <Button
-                android:id="@+id/vote_for_ad"
-                android:layout_width="130dp"
-                android:layout_height="37dp"
-                android:background="@drawable/white_background"
-                android:layout_below="@id/enter_food_item"
-                android:layout_marginStart="25dp"
-                android:elevation="8dp"
-                android:layout_marginTop="65dp"
-                android:fontFamily="@font/josefin_sans_semibold"
-                android:textAppearance="@style/vote_for_ad"
-                android:text="@string/vote_for_adding"/>
+        <EditText
+            android:id="@+id/enter_food_item"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/food_item"
+            android:layout_marginStart="25dp"
+            android:layout_marginEnd="30dp"
+            android:backgroundTint="#39374D"
+            tools:ignore="Autofill,LabelFor,TextFields" />
 
-            <Button
-                android:id="@+id/vote_for_re"
-                android:layout_width="130dp"
-                android:layout_height="37dp"
-                android:background="@drawable/white_background"
-                android:layout_below="@id/enter_food_item"
-                android:layout_alignParentEnd="true"
-                android:layout_marginEnd="30dp"
-                android:elevation="8dp"
-                android:fontFamily="@font/josefin_sans_semibold"
-                android:layout_marginTop="65dp"
-                android:textAppearance="@style/vote_for_re"
-                android:text="@string/vote_for_re"/>
+        <Button
+            android:id="@+id/vote_for_ad"
+            android:layout_width="130dp"
+            android:layout_height="37dp"
+            android:layout_below="@id/enter_food_item"
+            android:layout_marginStart="25dp"
+            android:layout_marginTop="65dp"
+            android:background="@drawable/white_background"
+            android:elevation="8dp"
+            android:fontFamily="@font/josefin_sans_semibold"
+            android:text="@string/vote_for_adding"
+            android:textAppearance="@style/vote_for_ad" />
 
-            <Button
-                android:id="@+id/submit_button"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/vote_for_ad"
-                android:layout_marginStart="35dp"
-                android:layout_marginTop="85dp"
-                android:layout_marginEnd="35dp"
-                android:background="@drawable/rectangle_1"
-                android:elevation="8dp"
-                android:fontFamily="@font/josefin_sans_bold"
-                android:text="@string/submit"
-                android:textAppearance="@style/submit" />
-        </RelativeLayout>
-    </ScrollView>
-</RelativeLayout>
\ No newline at end of file
+        <Button
+            android:id="@+id/vote_for_re"
+            android:layout_width="130dp"
+            android:layout_height="37dp"
+            android:layout_below="@id/enter_food_item"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="65dp"
+            android:layout_marginEnd="30dp"
+            android:background="@drawable/white_background"
+            android:elevation="8dp"
+            android:fontFamily="@font/josefin_sans_semibold"
+            android:text="@string/vote_for_re"
+            android:textAppearance="@style/vote_for_re" />
+
+        <Button
+            android:id="@+id/submit_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/vote_for_ad"
+            android:layout_marginStart="35dp"
+            android:layout_marginTop="85dp"
+            android:layout_marginEnd="35dp"
+            android:background="@drawable/rectangle_1"
+            android:elevation="8dp"
+            android:fontFamily="@font/josefin_sans_bold"
+            android:text="@string/submit"
+            android:textAppearance="@style/submit" />
+    </RelativeLayout>
+</ScrollView>
\ No newline at end of file

From f8c88f3e90113b1efd6287892729bf6d677b6c42 Mon Sep 17 00:00:00 2001
From: rishi <rishitiwari517@gmail.com>
Date: Sun, 3 May 2020 23:23:02 +0530
Subject: [PATCH 03/11] Complaint,vote and notice Ui

---
 .../main/res/layout/activity_complaint.xml    | 191 +++++++-------
 app/src/main/res/layout/activity_notice.xml   |  89 ++++---
 app/src/main/res/layout/activity_vote.xml     | 246 +++++++++---------
 app/src/main/res/values/strings.xml           |  29 ++-
 app/src/main/res/values/styles.xml            | 198 ++++++++++++--
 5 files changed, 465 insertions(+), 288 deletions(-)

diff --git a/app/src/main/res/layout/activity_complaint.xml b/app/src/main/res/layout/activity_complaint.xml
index ecc4606..b617e52 100644
--- a/app/src/main/res/layout/activity_complaint.xml
+++ b/app/src/main/res/layout/activity_complaint.xml
@@ -1,108 +1,113 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".complaint.ComplaintActivity">
-
-    <RelativeLayout
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingBottom="43dp">
-
-        <ImageView
-            android:id="@+id/arrow_1"
-            android:layout_width="35dp"
-            android:layout_height="35dp"
-            android:layout_marginStart="25dp"
-            android:layout_marginTop="20dp"
-            android:src="@drawable/arrow_1"
-            tools:ignore="ContentDescription" />
+        tools:ignore="UselessParent">
 
-        <TextView
-            android:id="@+id/complaint_s"
-            android:layout_width="wrap_content"
+        <RelativeLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@id/arrow_1"
-            android:layout_marginStart="25dp"
-            android:layout_marginTop="30dp"
-            android:fontFamily="@font/josefin_sans_bold"
-            android:text="@string/complaint_s"
-            android:textAppearance="@style/complaint_s" />
+            android:paddingBottom="43dp">
 
-        <TextView
-            android:id="@+id/issue"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/complaint_s"
-            android:layout_marginStart="25dp"
-            android:layout_marginTop="52dp"
-            android:fontFamily="@font/josefin_sans_bold"
-            android:text="@string/issue"
-            android:textAppearance="@style/issue" />
+            <ImageView
+                android:id="@+id/arrow_1"
+                android:layout_width="35dp"
+                android:layout_height="35dp"
+                android:layout_marginStart="25dp"
+                android:layout_marginTop="20dp"
+                android:src="@drawable/arrow_1"
+                tools:ignore="ContentDescription" />
 
-        <EditText
-            android:id="@+id/line_1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/issue"
-            android:layout_marginStart="25dp"
-            android:layout_marginEnd="30dp"
-            android:backgroundTint="#39374D"
-            android:inputType="text"
-            android:textColor="#000000"
-            tools:ignore="Autofill,LabelFor" />
+            <TextView
+                android:id="@+id/complaint_s"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/arrow_1"
+                android:layout_marginStart="25dp"
+                android:layout_marginTop="30dp"
+                android:fontFamily="@font/josefin_sans_bold"
+                android:text="@string/complaint_s"
+                android:textAppearance="@style/complaint_s" />
 
-        <TextView
-            android:id="@+id/description"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/line_1"
-            android:layout_marginStart="25dp"
-            android:layout_marginTop="28dp"
-            android:fontFamily="@font/josefin_sans_bold"
-            android:text="@string/description"
-            android:textAppearance="@style/description" />
+            <TextView
+                android:id="@+id/issue"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/complaint_s"
+                android:layout_marginStart="25dp"
+                android:layout_marginTop="52dp"
+                android:fontFamily="@font/josefin_sans_bold"
+                android:text="@string/issue"
+                android:textAppearance="@style/issue" />
 
-        <ImageView
-            android:id="@+id/rectangle_4"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/description"
-            android:layout_centerHorizontal="true"
-            android:layout_marginStart="25dp"
-            android:layout_marginTop="4dp"
-            android:layout_marginEnd="30dp"
-            android:scaleType="fitXY"
-            android:src="@drawable/description_box"
-            tools:ignore="ContentDescription" />
+            <EditText
+                android:id="@+id/line_1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/issue"
+                android:layout_marginStart="25dp"
+                android:layout_marginEnd="30dp"
+                android:backgroundTint="#39374D"
+                android:inputType="text"
+                android:textColor="#000000"
+                tools:ignore="Autofill,LabelFor" />
 
-        <Button
-            android:id="@+id/upload_button"
-            android:layout_width="135dp"
-            android:layout_height="38dp"
-            android:layout_below="@id/rectangle_4"
-            android:layout_marginStart="25dp"
-            android:layout_marginTop="24dp"
-            android:background="@drawable/white_background"
-            android:elevation="12dp"
-            android:fontFamily="@font/josefin_sans_bold"
-            android:gravity="center"
-            android:text="@string/upload_image"
-            android:textAppearance="@style/upload_image" />
+            <TextView
+                android:id="@+id/description"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/line_1"
+                android:layout_marginStart="25dp"
+                android:layout_marginTop="28dp"
+                android:fontFamily="@font/josefin_sans_bold"
+                android:text="@string/description"
+                android:textAppearance="@style/description" />
 
-        <Button
-            android:id="@+id/file_complaint_button"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/upload_button"
-            android:layout_marginStart="35dp"
-            android:layout_marginTop="80dp"
-            android:layout_marginEnd="35dp"
-            android:background="@drawable/rectangle_1"
-            android:elevation="80dp"
-            android:fontFamily="@font/josefin_sans_bold"
-            android:text="@string/file_compla"
-            android:textAppearance="@style/file_compla" />
-    </RelativeLayout>
-</ScrollView>
\ No newline at end of file
+            <ImageView
+                android:id="@+id/rectangle_4"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/description"
+                android:layout_centerHorizontal="true"
+                android:layout_marginStart="25dp"
+                android:layout_marginTop="4dp"
+                android:layout_marginEnd="30dp"
+                android:scaleType="fitXY"
+                android:src="@drawable/description_box"
+                tools:ignore="ContentDescription" />
+
+            <Button
+                android:id="@+id/upload_button"
+                android:layout_width="135dp"
+                android:layout_height="38dp"
+                android:layout_below="@id/rectangle_4"
+                android:layout_marginStart="25dp"
+                android:layout_marginTop="24dp"
+                android:background="@drawable/white_background"
+                android:elevation="12dp"
+                android:fontFamily="@font/josefin_sans_bold"
+                android:gravity="center"
+                android:text="@string/upload_image"
+                android:textAppearance="@style/upload_image" />
+
+            <Button
+                android:id="@+id/file_complaint_button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/upload_button"
+                android:layout_marginStart="35dp"
+                android:layout_marginTop="80dp"
+                android:layout_marginEnd="35dp"
+                android:background="@drawable/rectangle_1"
+                android:elevation="80dp"
+                android:fontFamily="@font/josefin_sans_bold"
+                android:text="@string/file_compla"
+                android:textAppearance="@style/file_compla" />
+        </RelativeLayout>
+    </ScrollView>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_notice.xml b/app/src/main/res/layout/activity_notice.xml
index e184e52..09a8574 100644
--- a/app/src/main/res/layout/activity_notice.xml
+++ b/app/src/main/res/layout/activity_notice.xml
@@ -1,55 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".complaint.NoticeActivity">
-
-    <RelativeLayout
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingBottom="43dp">
-
-        <ImageView
-            android:id="@id/arrow_1"
-            android:layout_width="35dp"
-            android:layout_height="35dp"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentTop="true"
-            android:layout_marginStart="30dp"
-            android:layout_marginTop="20dp"
-            android:src="@drawable/arrow_1"
-            tools:ignore="ContentDescription" />
+        tools:ignore="UselessParent">
 
-        <TextView
-            android:id="@+id/notice"
-            android:layout_width="wrap_content"
+        <RelativeLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@id/arrow_1"
-            android:layout_alignParentStart="true"
-            android:layout_marginStart="30dp"
-            android:layout_marginTop="30dp"
-            android:fontFamily="@font/josefin_sans_bold"
-            android:text="@string/notice"
-            android:textAppearance="@style/notice" />
+            android:paddingBottom="43dp">
 
-        <LinearLayout
-            android:layout_width="316dp"
-            android:layout_height="370dp"
-            android:layout_below="@id/notice"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
-            android:layout_marginTop="27dp"
-            android:background="#FFFFFF"
-            android:orientation="vertical"
-            android:padding="19dp">
+            <ImageView
+                android:id="@id/arrow_1"
+                android:layout_width="35dp"
+                android:layout_height="35dp"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentTop="true"
+                android:layout_marginStart="30dp"
+                android:layout_marginTop="20dp"
+                android:src="@drawable/arrow_1"
+                tools:ignore="ContentDescription" />
 
             <TextView
-                android:id="@+id/to_all_the"
+                android:id="@+id/notice"
                 android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:text="@string/to_all_the_"
-                android:textAppearance="@style/to_all_the_" />
-        </LinearLayout>
-    </RelativeLayout>
-</ScrollView>
\ No newline at end of file
+                android:layout_height="wrap_content"
+                android:layout_below="@id/arrow_1"
+                android:layout_marginStart="30dp"
+                android:layout_alignParentStart="true"
+                android:layout_marginTop="30dp"
+                android:fontFamily="@font/josefin_sans_bold"
+                android:text="@string/notice"
+                android:textAppearance="@style/notice" />
+
+            <LinearLayout
+                android:layout_width="316dp"
+                android:layout_height="370dp"
+                android:layout_below="@id/notice"
+                android:layout_centerVertical="true"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="27dp"
+                android:background="#FFFFFF"
+                android:orientation="vertical"
+                android:padding="19dp">
+
+                <TextView
+                    android:id="@+id/to_all_the"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:textAppearance="@style/to_all_the_"
+                    android:text="@string/to_all_the_" />
+            </LinearLayout>
+        </RelativeLayout>
+    </ScrollView>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_vote.xml b/app/src/main/res/layout/activity_vote.xml
index 0b2aa0c..555ca70 100644
--- a/app/src/main/res/layout/activity_vote.xml
+++ b/app/src/main/res/layout/activity_vote.xml
@@ -1,147 +1,149 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".vote.VoteActivity">
-
-    <RelativeLayout
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingBottom="43dp">
-
-        <ImageView
-            android:id="@id/arrow_1"
-            android:layout_width="35dp"
-            android:layout_height="35dp"
-            android:layout_marginStart="25dp"
-            android:layout_marginTop="20dp"
-            android:src="@drawable/arrow_1"
-            tools:ignore="ContentDescription" />
+        tools:ignore="UselessParent">
 
-        <TextView
-            android:id="@+id/vote_for_ch"
-            android:layout_width="wrap_content"
+        <RelativeLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@id/arrow_1"
-            android:layout_marginStart="25dp"
-            android:layout_marginTop="30dp"
-            android:fontFamily="@font/josefin_sans_bold"
-            android:text="@string/vote_for_ch"
-            android:textAppearance="@style/vote_for_ch" />
+            android:paddingBottom="43dp">
 
-        <TextView
-            android:id="@+id/choose_meal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/vote_for_ch"
-            android:layout_marginStart="25dp"
-            android:layout_marginTop="60dp"
-            android:fontFamily="@font/josefin_sans_semibold"
-            android:text="@string/choose_meal"
-            android:textAppearance="@style/choose_meal" />
+            <ImageView
+                android:id="@id/arrow_1"
+                android:layout_width="35dp"
+                android:layout_height="35dp"
+                android:layout_marginStart="25dp"
+                android:layout_marginTop="20dp"
+                android:src="@drawable/arrow_1"
+                tools:ignore="ContentDescription" />
 
-        <RadioGroup
-            android:id="@+id/radio_buttom_group"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/choose_meal"
-            android:layout_marginStart="36dp"
-            android:layout_marginTop="19dp">
-
-            <RadioButton
-                android:id="@+id/breakfast"
+            <TextView
+                android:id="@+id/vote_for_ch"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:button="@drawable/radio_button_selector"
-                android:fontFamily="@font/josefin_sans_semibold"
-                android:padding="8dp"
-                android:text="@string/breakfast"
-                android:textAppearance="@style/breakfast" />
+                android:layout_below="@id/arrow_1"
+                android:layout_marginStart="25dp"
+                android:layout_marginTop="30dp"
+                android:fontFamily="@font/josefin_sans_bold"
+                android:text="@string/vote_for_ch"
+                android:textAppearance="@style/vote_for_ch" />
 
-            <RadioButton
-                android:id="@+id/lunch"
+            <TextView
+                android:id="@+id/choose_meal"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="9dp"
-                android:button="@drawable/radio_button_selector"
+                android:layout_below="@id/vote_for_ch"
+                android:layout_marginStart="25dp"
+                android:layout_marginTop="60dp"
                 android:fontFamily="@font/josefin_sans_semibold"
-                android:padding="8dp"
-                android:text="@string/lunch"
-                android:textAppearance="@style/lunch" />
+                android:text="@string/choose_meal"
+                android:textAppearance="@style/choose_meal" />
 
-            <RadioButton
-                android:id="@+id/dinner"
+            <RadioGroup
+                android:id="@+id/radio_buttom_group"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/choose_meal"
+                android:layout_marginStart="36dp"
+                android:layout_marginTop="19dp"
+                >
+                <RadioButton
+                    android:id="@+id/breakfast"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="@style/breakfast"
+                    android:button="@drawable/radio_button_selector"
+                    android:text="@string/breakfast"
+                    android:padding="8dp"
+                    android:fontFamily="@font/josefin_sans_semibold"/>
+                <RadioButton
+                    android:id="@+id/lunch"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="@style/lunch"
+                    android:layout_marginTop="9dp"
+                    android:padding="8dp"
+                    android:button="@drawable/radio_button_selector"
+                    android:text="@string/lunch"
+                    android:fontFamily="@font/josefin_sans_semibold"/>
+                <RadioButton
+                    android:id="@+id/dinner"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="@style/dinner"
+                    android:layout_marginTop="9dp"
+                    android:padding="8dp"
+                    android:button="@drawable/radio_button_selector"
+                    android:text="@string/dinner"
+                    android:fontFamily="@font/josefin_sans_semibold"/>
+            </RadioGroup>
+            <TextView
+                android:id="@+id/food_item"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="9dp"
-                android:button="@drawable/radio_button_selector"
+                android:text="@string/food_item"
+                android:layout_below="@id/radio_buttom_group"
+                android:textAppearance="@style/food_item"
                 android:fontFamily="@font/josefin_sans_semibold"
-                android:padding="8dp"
-                android:text="@string/dinner"
-                android:textAppearance="@style/dinner" />
-        </RadioGroup>
+                android:layout_marginTop="45dp"
+                android:layout_marginStart="25dp"/>
 
-        <TextView
-            android:id="@+id/food_item"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/radio_buttom_group"
-            android:layout_marginStart="25dp"
-            android:layout_marginTop="45dp"
-            android:fontFamily="@font/josefin_sans_semibold"
-            android:text="@string/food_item"
-            android:textAppearance="@style/food_item" />
-
-        <EditText
-            android:id="@+id/enter_food_item"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/food_item"
-            android:layout_marginStart="25dp"
-            android:layout_marginEnd="30dp"
-            android:backgroundTint="#39374D"
-            tools:ignore="Autofill,LabelFor,TextFields" />
+            <EditText
+                android:id="@+id/enter_food_item"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginStart="25dp"
+                android:layout_below="@id/food_item"
+                android:backgroundTint="#39374D"
+                android:layout_marginEnd="30dp"
+                tools:ignore="Autofill,LabelFor,TextFields" />
 
-        <Button
-            android:id="@+id/vote_for_ad"
-            android:layout_width="130dp"
-            android:layout_height="37dp"
-            android:layout_below="@id/enter_food_item"
-            android:layout_marginStart="25dp"
-            android:layout_marginTop="65dp"
-            android:background="@drawable/white_background"
-            android:elevation="8dp"
-            android:fontFamily="@font/josefin_sans_semibold"
-            android:text="@string/vote_for_adding"
-            android:textAppearance="@style/vote_for_ad" />
+            <Button
+                android:id="@+id/vote_for_ad"
+                android:layout_width="130dp"
+                android:layout_height="37dp"
+                android:background="@drawable/white_background"
+                android:layout_below="@id/enter_food_item"
+                android:layout_marginStart="25dp"
+                android:elevation="8dp"
+                android:layout_marginTop="65dp"
+                android:fontFamily="@font/josefin_sans_semibold"
+                android:textAppearance="@style/vote_for_ad"
+                android:text="@string/vote_for_adding"/>
 
-        <Button
-            android:id="@+id/vote_for_re"
-            android:layout_width="130dp"
-            android:layout_height="37dp"
-            android:layout_below="@id/enter_food_item"
-            android:layout_alignParentEnd="true"
-            android:layout_marginTop="65dp"
-            android:layout_marginEnd="30dp"
-            android:background="@drawable/white_background"
-            android:elevation="8dp"
-            android:fontFamily="@font/josefin_sans_semibold"
-            android:text="@string/vote_for_re"
-            android:textAppearance="@style/vote_for_re" />
+            <Button
+                android:id="@+id/vote_for_re"
+                android:layout_width="130dp"
+                android:layout_height="37dp"
+                android:background="@drawable/white_background"
+                android:layout_below="@id/enter_food_item"
+                android:layout_alignParentEnd="true"
+                android:layout_marginEnd="30dp"
+                android:elevation="8dp"
+                android:fontFamily="@font/josefin_sans_semibold"
+                android:layout_marginTop="65dp"
+                android:textAppearance="@style/vote_for_re"
+                android:text="@string/vote_for_re"/>
 
-        <Button
-            android:id="@+id/submit_button"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/vote_for_ad"
-            android:layout_marginStart="35dp"
-            android:layout_marginTop="85dp"
-            android:layout_marginEnd="35dp"
-            android:background="@drawable/rectangle_1"
-            android:elevation="8dp"
-            android:fontFamily="@font/josefin_sans_bold"
-            android:text="@string/submit"
-            android:textAppearance="@style/submit" />
-    </RelativeLayout>
-</ScrollView>
\ No newline at end of file
+            <Button
+                android:id="@+id/submit_button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/vote_for_ad"
+                android:layout_marginStart="35dp"
+                android:layout_marginTop="85dp"
+                android:layout_marginEnd="35dp"
+                android:background="@drawable/rectangle_1"
+                android:elevation="8dp"
+                android:fontFamily="@font/josefin_sans_bold"
+                android:text="@string/submit"
+                android:textAppearance="@style/submit" />
+        </RelativeLayout>
+    </ScrollView>
+</RelativeLayout>
\ 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 44dc4e7..fd879de 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,14 +6,25 @@
     <string name="sign_in">Sign in</string>
     <string name="forgot_pass">Forgot Password?</string>
     <string name="create_acco">Create Account</string>
-    <string name="edit_your_details">Edit your details</string>
-    <string name="save_details">Save Details</string>
-    <string name="create_account">Create Account</string>
-    <string name="email_add">Email Address</string>
-    <string name="name">Name</string>
-    <string name="room_no">Room Number</string>
-    <string name="enter_password">Enter a password</string>
-    <string name="already_have_an_account">Already have an account?</string>
-    <string name="log_in">Log in</string>
 
+    <string name="complaint_s">Complaint Section</string>
+    <string name="issue">Issue</string>
+    <string name="description">Description</string>
+    <string name="upload_image">Upload Image</string>
+    <string name="file_compla">File Complaint</string>
+
+    <string name="vote_for_ch">Vote for change</string>
+    <string name="choose_meal">Choose meal type</string>
+    <string name="breakfast">Breakfast</string>
+    <string name="lunch">Lunch</string>
+    <string name="dinner">Dinner</string>
+    <string name="food_item">Food Item</string>
+    <string name="vote_for_adding">vote for adding</string>
+    <string name="vote_for_re">Vote for removing</string>
+    <string name="submit">Submit</string>
+
+    <string name="to_all_the_">
+        To all the students of Arya Mess :\nLet me set the scene: your friend John is rushing to get his daughter from school and his son to the soccer field, and he still needs to stop at the grocery store because there\'s nothing in the fridge. In the midst of this everyday madness, he gets a text message from Google with a verification code. He thinks,\"That\'s weird. Maybe I should log in to my email and see what\'s going on.\"
+    </string>
+    <string name="notice">Notice</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7aef979..9236d5b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -40,40 +40,194 @@
 
     </style>
 
-    <style name="name">
-        <item name="android:textSize">15sp</item>
-        <item name="android:textColor">#39374D</item>
+    <style name="complaint_s">
+
+        <item name="android:textSize">
+            22sp
+        </item>
+
+        <item name="android:textColor">
+            #000000
+        </item>
+
     </style>
 
-    <style name="email_add">
-        <item name="android:textSize">15sp</item>
-        <item name="android:textColor">#39374D</item>
+    <style name="issue">
+        <item name="android:textSize">
+            15sp
+        </item>
+
+        <item name="android:textColor">
+            #39374D
+        </item>
+
     </style>
 
-    <style name="room_no">
-        <item name="android:textSize">15sp</item>
-        <item name="android:textColor">#39374D</item>
+    <style name="description">
+
+        <item name="android:textSize">
+            15sp
+        </item>
+
+        <item name="android:textColor">
+            #39374D
+        </item>
+
     </style>
 
-    <style name="enter_password">
-        <item name="android:textSize">15sp</item>
-        <item name="android:textColor">#39374D</item>
+    <style name="upload_image">
+
+        <item name="android:textSize">
+            12sp
+        </item>
+
+        <item name="android:textColor">
+            #3B3950
+        </item>
+
     </style>
 
-    <style name="already_have_an_account">
-        <item name="android:textSize">15sp</item>
-        <item name="android:textColor">#39374D</item>
+    <style name="file_compla">
+
+        <item name="android:textSize">
+            18sp
+        </item>
+
+        <item name="android:textColor">
+            #FFFFFF
+        </item>
+
     </style>
 
-    <style name="log_in">
-        <item name="android:textSize">15sp</item>
-        <item name="android:textColor">#FFC400</item>
+    <style name="vote_for_ch">
+
+        <item name="android:textSize">
+            22sp
+        </item>
+
+        <item name="android:textColor">
+            #000000
+        </item>
+
     </style>
-    <style name="edit_your_details">
-        <item name="android:textSize">24sp</item>
-        <item name="android:textColor">#39374D</item>
 
-   </style>   
+    <style name="choose_meal">
+
+        <item name="android:textSize">
+            16sp
+        </item>
+
+        <item name="android:textColor">
+            #39374D
+        </item>
+
+    </style>
+
+    <style name="breakfast">
+
+        <item name="android:textSize">
+            14sp
+        </item>
 
+        <item name="android:textColor">
+            #39374D
+        </item>
+
+    </style>
+
+    <style name="lunch">
+
+        <item name="android:textSize">
+            14sp
+        </item>
 
+        <item name="android:textColor">
+            #39374D
+        </item>
+
+    </style>
+
+    <style name="dinner">
+
+        <item name="android:textSize">
+            14sp
+        </item>
+
+        <item name="android:textColor">
+            #39374D
+        </item>
+
+    </style>
+
+    <style name="food_item">
+
+        <item name="android:textSize">
+            14sp
+        </item>
+
+        <item name="android:textColor">
+            #39374D
+        </item>
+
+    </style>
+
+    <style name="vote_for_ad">
+
+        <item name="android:textSize">
+            12sp
+        </item>
+
+        <item name="android:textColor">
+            #3B3950
+        </item>
+
+    </style>
+
+    <style name="vote_for_re">
+
+        <item name="android:textSize">
+            12sp
+        </item>
+
+        <item name="android:textColor">
+            #3B3950
+        </item>
+
+    </style>
+
+    <style name="submit">
+
+        <item name="android:textSize">
+            18sp
+        </item>
+
+        <item name="android:textColor">
+            #FFFFFF
+        </item>
+
+    </style>
+
+    <style name="notice">
+
+        <item name="android:textSize">
+            22sp
+        </item>
+
+        <item name="android:textColor">
+            #000000
+        </item>
+
+    </style>
+
+    <style name="to_all_the_">
+
+        <item name="android:textSize">
+            16sp
+        </item>
+
+        <item name="android:textColor">
+            #000000
+        </item>
+
+    </style>
 </resources>

From 0fb9bbdf721057cd3232d4dbbd75280080238cfc Mon Sep 17 00:00:00 2001
From: rishi <rishitiwari517@gmail.com>
Date: Mon, 4 May 2020 08:20:40 +0530
Subject: [PATCH 04/11] useless parent removed

---
 .../main/res/layout/activity_complaint.xml    | 191 +++++++-------
 app/src/main/res/layout/activity_notice.xml   |  89 +++----
 app/src/main/res/layout/activity_vote.xml     | 246 +++++++++---------
 3 files changed, 257 insertions(+), 269 deletions(-)

diff --git a/app/src/main/res/layout/activity_complaint.xml b/app/src/main/res/layout/activity_complaint.xml
index b617e52..ecc4606 100644
--- a/app/src/main/res/layout/activity_complaint.xml
+++ b/app/src/main/res/layout/activity_complaint.xml
@@ -1,113 +1,108 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".complaint.ComplaintActivity">
-    <ScrollView
+
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        tools:ignore="UselessParent">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingBottom="43dp">
+        android:paddingBottom="43dp">
 
-            <ImageView
-                android:id="@+id/arrow_1"
-                android:layout_width="35dp"
-                android:layout_height="35dp"
-                android:layout_marginStart="25dp"
-                android:layout_marginTop="20dp"
-                android:src="@drawable/arrow_1"
-                tools:ignore="ContentDescription" />
+        <ImageView
+            android:id="@+id/arrow_1"
+            android:layout_width="35dp"
+            android:layout_height="35dp"
+            android:layout_marginStart="25dp"
+            android:layout_marginTop="20dp"
+            android:src="@drawable/arrow_1"
+            tools:ignore="ContentDescription" />
 
-            <TextView
-                android:id="@+id/complaint_s"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/arrow_1"
-                android:layout_marginStart="25dp"
-                android:layout_marginTop="30dp"
-                android:fontFamily="@font/josefin_sans_bold"
-                android:text="@string/complaint_s"
-                android:textAppearance="@style/complaint_s" />
+        <TextView
+            android:id="@+id/complaint_s"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/arrow_1"
+            android:layout_marginStart="25dp"
+            android:layout_marginTop="30dp"
+            android:fontFamily="@font/josefin_sans_bold"
+            android:text="@string/complaint_s"
+            android:textAppearance="@style/complaint_s" />
 
-            <TextView
-                android:id="@+id/issue"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/complaint_s"
-                android:layout_marginStart="25dp"
-                android:layout_marginTop="52dp"
-                android:fontFamily="@font/josefin_sans_bold"
-                android:text="@string/issue"
-                android:textAppearance="@style/issue" />
+        <TextView
+            android:id="@+id/issue"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/complaint_s"
+            android:layout_marginStart="25dp"
+            android:layout_marginTop="52dp"
+            android:fontFamily="@font/josefin_sans_bold"
+            android:text="@string/issue"
+            android:textAppearance="@style/issue" />
 
-            <EditText
-                android:id="@+id/line_1"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/issue"
-                android:layout_marginStart="25dp"
-                android:layout_marginEnd="30dp"
-                android:backgroundTint="#39374D"
-                android:inputType="text"
-                android:textColor="#000000"
-                tools:ignore="Autofill,LabelFor" />
+        <EditText
+            android:id="@+id/line_1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/issue"
+            android:layout_marginStart="25dp"
+            android:layout_marginEnd="30dp"
+            android:backgroundTint="#39374D"
+            android:inputType="text"
+            android:textColor="#000000"
+            tools:ignore="Autofill,LabelFor" />
 
-            <TextView
-                android:id="@+id/description"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/line_1"
-                android:layout_marginStart="25dp"
-                android:layout_marginTop="28dp"
-                android:fontFamily="@font/josefin_sans_bold"
-                android:text="@string/description"
-                android:textAppearance="@style/description" />
+        <TextView
+            android:id="@+id/description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/line_1"
+            android:layout_marginStart="25dp"
+            android:layout_marginTop="28dp"
+            android:fontFamily="@font/josefin_sans_bold"
+            android:text="@string/description"
+            android:textAppearance="@style/description" />
 
-            <ImageView
-                android:id="@+id/rectangle_4"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/description"
-                android:layout_centerHorizontal="true"
-                android:layout_marginStart="25dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginEnd="30dp"
-                android:scaleType="fitXY"
-                android:src="@drawable/description_box"
-                tools:ignore="ContentDescription" />
+        <ImageView
+            android:id="@+id/rectangle_4"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/description"
+            android:layout_centerHorizontal="true"
+            android:layout_marginStart="25dp"
+            android:layout_marginTop="4dp"
+            android:layout_marginEnd="30dp"
+            android:scaleType="fitXY"
+            android:src="@drawable/description_box"
+            tools:ignore="ContentDescription" />
 
-            <Button
-                android:id="@+id/upload_button"
-                android:layout_width="135dp"
-                android:layout_height="38dp"
-                android:layout_below="@id/rectangle_4"
-                android:layout_marginStart="25dp"
-                android:layout_marginTop="24dp"
-                android:background="@drawable/white_background"
-                android:elevation="12dp"
-                android:fontFamily="@font/josefin_sans_bold"
-                android:gravity="center"
-                android:text="@string/upload_image"
-                android:textAppearance="@style/upload_image" />
+        <Button
+            android:id="@+id/upload_button"
+            android:layout_width="135dp"
+            android:layout_height="38dp"
+            android:layout_below="@id/rectangle_4"
+            android:layout_marginStart="25dp"
+            android:layout_marginTop="24dp"
+            android:background="@drawable/white_background"
+            android:elevation="12dp"
+            android:fontFamily="@font/josefin_sans_bold"
+            android:gravity="center"
+            android:text="@string/upload_image"
+            android:textAppearance="@style/upload_image" />
 
-            <Button
-                android:id="@+id/file_complaint_button"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/upload_button"
-                android:layout_marginStart="35dp"
-                android:layout_marginTop="80dp"
-                android:layout_marginEnd="35dp"
-                android:background="@drawable/rectangle_1"
-                android:elevation="80dp"
-                android:fontFamily="@font/josefin_sans_bold"
-                android:text="@string/file_compla"
-                android:textAppearance="@style/file_compla" />
-        </RelativeLayout>
-    </ScrollView>
-</RelativeLayout>
\ No newline at end of file
+        <Button
+            android:id="@+id/file_complaint_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/upload_button"
+            android:layout_marginStart="35dp"
+            android:layout_marginTop="80dp"
+            android:layout_marginEnd="35dp"
+            android:background="@drawable/rectangle_1"
+            android:elevation="80dp"
+            android:fontFamily="@font/josefin_sans_bold"
+            android:text="@string/file_compla"
+            android:textAppearance="@style/file_compla" />
+    </RelativeLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_notice.xml b/app/src/main/res/layout/activity_notice.xml
index 09a8574..e184e52 100644
--- a/app/src/main/res/layout/activity_notice.xml
+++ b/app/src/main/res/layout/activity_notice.xml
@@ -1,60 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".complaint.NoticeActivity">
-    <ScrollView
+
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        tools:ignore="UselessParent">
+        android:paddingBottom="43dp">
+
+        <ImageView
+            android:id="@id/arrow_1"
+            android:layout_width="35dp"
+            android:layout_height="35dp"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true"
+            android:layout_marginStart="30dp"
+            android:layout_marginTop="20dp"
+            android:src="@drawable/arrow_1"
+            tools:ignore="ContentDescription" />
 
-        <RelativeLayout
-            android:layout_width="match_parent"
+        <TextView
+            android:id="@+id/notice"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingBottom="43dp">
+            android:layout_below="@id/arrow_1"
+            android:layout_alignParentStart="true"
+            android:layout_marginStart="30dp"
+            android:layout_marginTop="30dp"
+            android:fontFamily="@font/josefin_sans_bold"
+            android:text="@string/notice"
+            android:textAppearance="@style/notice" />
 
-            <ImageView
-                android:id="@id/arrow_1"
-                android:layout_width="35dp"
-                android:layout_height="35dp"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentTop="true"
-                android:layout_marginStart="30dp"
-                android:layout_marginTop="20dp"
-                android:src="@drawable/arrow_1"
-                tools:ignore="ContentDescription" />
+        <LinearLayout
+            android:layout_width="316dp"
+            android:layout_height="370dp"
+            android:layout_below="@id/notice"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:layout_marginTop="27dp"
+            android:background="#FFFFFF"
+            android:orientation="vertical"
+            android:padding="19dp">
 
             <TextView
-                android:id="@+id/notice"
+                android:id="@+id/to_all_the"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/arrow_1"
-                android:layout_marginStart="30dp"
-                android:layout_alignParentStart="true"
-                android:layout_marginTop="30dp"
-                android:fontFamily="@font/josefin_sans_bold"
-                android:text="@string/notice"
-                android:textAppearance="@style/notice" />
-
-            <LinearLayout
-                android:layout_width="316dp"
-                android:layout_height="370dp"
-                android:layout_below="@id/notice"
-                android:layout_centerVertical="true"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="27dp"
-                android:background="#FFFFFF"
-                android:orientation="vertical"
-                android:padding="19dp">
-
-                <TextView
-                    android:id="@+id/to_all_the"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:textAppearance="@style/to_all_the_"
-                    android:text="@string/to_all_the_" />
-            </LinearLayout>
-        </RelativeLayout>
-    </ScrollView>
-</RelativeLayout>
\ No newline at end of file
+                android:layout_height="match_parent"
+                android:text="@string/to_all_the_"
+                android:textAppearance="@style/to_all_the_" />
+        </LinearLayout>
+    </RelativeLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_vote.xml b/app/src/main/res/layout/activity_vote.xml
index 555ca70..0b2aa0c 100644
--- a/app/src/main/res/layout/activity_vote.xml
+++ b/app/src/main/res/layout/activity_vote.xml
@@ -1,149 +1,147 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".vote.VoteActivity">
-    <ScrollView
+
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        tools:ignore="UselessParent">
+        android:paddingBottom="43dp">
 
-        <RelativeLayout
-            android:layout_width="match_parent"
+        <ImageView
+            android:id="@id/arrow_1"
+            android:layout_width="35dp"
+            android:layout_height="35dp"
+            android:layout_marginStart="25dp"
+            android:layout_marginTop="20dp"
+            android:src="@drawable/arrow_1"
+            tools:ignore="ContentDescription" />
+
+        <TextView
+            android:id="@+id/vote_for_ch"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingBottom="43dp">
+            android:layout_below="@id/arrow_1"
+            android:layout_marginStart="25dp"
+            android:layout_marginTop="30dp"
+            android:fontFamily="@font/josefin_sans_bold"
+            android:text="@string/vote_for_ch"
+            android:textAppearance="@style/vote_for_ch" />
 
-            <ImageView
-                android:id="@id/arrow_1"
-                android:layout_width="35dp"
-                android:layout_height="35dp"
-                android:layout_marginStart="25dp"
-                android:layout_marginTop="20dp"
-                android:src="@drawable/arrow_1"
-                tools:ignore="ContentDescription" />
+        <TextView
+            android:id="@+id/choose_meal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/vote_for_ch"
+            android:layout_marginStart="25dp"
+            android:layout_marginTop="60dp"
+            android:fontFamily="@font/josefin_sans_semibold"
+            android:text="@string/choose_meal"
+            android:textAppearance="@style/choose_meal" />
 
-            <TextView
-                android:id="@+id/vote_for_ch"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/arrow_1"
-                android:layout_marginStart="25dp"
-                android:layout_marginTop="30dp"
-                android:fontFamily="@font/josefin_sans_bold"
-                android:text="@string/vote_for_ch"
-                android:textAppearance="@style/vote_for_ch" />
+        <RadioGroup
+            android:id="@+id/radio_buttom_group"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/choose_meal"
+            android:layout_marginStart="36dp"
+            android:layout_marginTop="19dp">
 
-            <TextView
-                android:id="@+id/choose_meal"
+            <RadioButton
+                android:id="@+id/breakfast"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/vote_for_ch"
-                android:layout_marginStart="25dp"
-                android:layout_marginTop="60dp"
+                android:button="@drawable/radio_button_selector"
                 android:fontFamily="@font/josefin_sans_semibold"
-                android:text="@string/choose_meal"
-                android:textAppearance="@style/choose_meal" />
+                android:padding="8dp"
+                android:text="@string/breakfast"
+                android:textAppearance="@style/breakfast" />
 
-            <RadioGroup
-                android:id="@+id/radio_buttom_group"
+            <RadioButton
+                android:id="@+id/lunch"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/choose_meal"
-                android:layout_marginStart="36dp"
-                android:layout_marginTop="19dp"
-                >
-                <RadioButton
-                    android:id="@+id/breakfast"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="@style/breakfast"
-                    android:button="@drawable/radio_button_selector"
-                    android:text="@string/breakfast"
-                    android:padding="8dp"
-                    android:fontFamily="@font/josefin_sans_semibold"/>
-                <RadioButton
-                    android:id="@+id/lunch"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="@style/lunch"
-                    android:layout_marginTop="9dp"
-                    android:padding="8dp"
-                    android:button="@drawable/radio_button_selector"
-                    android:text="@string/lunch"
-                    android:fontFamily="@font/josefin_sans_semibold"/>
-                <RadioButton
-                    android:id="@+id/dinner"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="@style/dinner"
-                    android:layout_marginTop="9dp"
-                    android:padding="8dp"
-                    android:button="@drawable/radio_button_selector"
-                    android:text="@string/dinner"
-                    android:fontFamily="@font/josefin_sans_semibold"/>
-            </RadioGroup>
-            <TextView
-                android:id="@+id/food_item"
+                android:layout_marginTop="9dp"
+                android:button="@drawable/radio_button_selector"
+                android:fontFamily="@font/josefin_sans_semibold"
+                android:padding="8dp"
+                android:text="@string/lunch"
+                android:textAppearance="@style/lunch" />
+
+            <RadioButton
+                android:id="@+id/dinner"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/food_item"
-                android:layout_below="@id/radio_buttom_group"
-                android:textAppearance="@style/food_item"
+                android:layout_marginTop="9dp"
+                android:button="@drawable/radio_button_selector"
                 android:fontFamily="@font/josefin_sans_semibold"
-                android:layout_marginTop="45dp"
-                android:layout_marginStart="25dp"/>
+                android:padding="8dp"
+                android:text="@string/dinner"
+                android:textAppearance="@style/dinner" />
+        </RadioGroup>
 
-            <EditText
-                android:id="@+id/enter_food_item"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginStart="25dp"
-                android:layout_below="@id/food_item"
-                android:backgroundTint="#39374D"
-                android:layout_marginEnd="30dp"
-                tools:ignore="Autofill,LabelFor,TextFields" />
+        <TextView
+            android:id="@+id/food_item"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/radio_buttom_group"
+            android:layout_marginStart="25dp"
+            android:layout_marginTop="45dp"
+            android:fontFamily="@font/josefin_sans_semibold"
+            android:text="@string/food_item"
+            android:textAppearance="@style/food_item" />
 
-            <Button
-                android:id="@+id/vote_for_ad"
-                android:layout_width="130dp"
-                android:layout_height="37dp"
-                android:background="@drawable/white_background"
-                android:layout_below="@id/enter_food_item"
-                android:layout_marginStart="25dp"
-                android:elevation="8dp"
-                android:layout_marginTop="65dp"
-                android:fontFamily="@font/josefin_sans_semibold"
-                android:textAppearance="@style/vote_for_ad"
-                android:text="@string/vote_for_adding"/>
+        <EditText
+            android:id="@+id/enter_food_item"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/food_item"
+            android:layout_marginStart="25dp"
+            android:layout_marginEnd="30dp"
+            android:backgroundTint="#39374D"
+            tools:ignore="Autofill,LabelFor,TextFields" />
 
-            <Button
-                android:id="@+id/vote_for_re"
-                android:layout_width="130dp"
-                android:layout_height="37dp"
-                android:background="@drawable/white_background"
-                android:layout_below="@id/enter_food_item"
-                android:layout_alignParentEnd="true"
-                android:layout_marginEnd="30dp"
-                android:elevation="8dp"
-                android:fontFamily="@font/josefin_sans_semibold"
-                android:layout_marginTop="65dp"
-                android:textAppearance="@style/vote_for_re"
-                android:text="@string/vote_for_re"/>
+        <Button
+            android:id="@+id/vote_for_ad"
+            android:layout_width="130dp"
+            android:layout_height="37dp"
+            android:layout_below="@id/enter_food_item"
+            android:layout_marginStart="25dp"
+            android:layout_marginTop="65dp"
+            android:background="@drawable/white_background"
+            android:elevation="8dp"
+            android:fontFamily="@font/josefin_sans_semibold"
+            android:text="@string/vote_for_adding"
+            android:textAppearance="@style/vote_for_ad" />
 
-            <Button
-                android:id="@+id/submit_button"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/vote_for_ad"
-                android:layout_marginStart="35dp"
-                android:layout_marginTop="85dp"
-                android:layout_marginEnd="35dp"
-                android:background="@drawable/rectangle_1"
-                android:elevation="8dp"
-                android:fontFamily="@font/josefin_sans_bold"
-                android:text="@string/submit"
-                android:textAppearance="@style/submit" />
-        </RelativeLayout>
-    </ScrollView>
-</RelativeLayout>
\ No newline at end of file
+        <Button
+            android:id="@+id/vote_for_re"
+            android:layout_width="130dp"
+            android:layout_height="37dp"
+            android:layout_below="@id/enter_food_item"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="65dp"
+            android:layout_marginEnd="30dp"
+            android:background="@drawable/white_background"
+            android:elevation="8dp"
+            android:fontFamily="@font/josefin_sans_semibold"
+            android:text="@string/vote_for_re"
+            android:textAppearance="@style/vote_for_re" />
+
+        <Button
+            android:id="@+id/submit_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/vote_for_ad"
+            android:layout_marginStart="35dp"
+            android:layout_marginTop="85dp"
+            android:layout_marginEnd="35dp"
+            android:background="@drawable/rectangle_1"
+            android:elevation="8dp"
+            android:fontFamily="@font/josefin_sans_bold"
+            android:text="@string/submit"
+            android:textAppearance="@style/submit" />
+    </RelativeLayout>
+</ScrollView>
\ No newline at end of file

From 028814010d4f183355fd565054826fa837f3199e Mon Sep 17 00:00:00 2001
From: rishi <rishitiwari517@gmail.com>
Date: Wed, 27 May 2020 20:48:31 +0530
Subject: [PATCH 05/11] Absence notification UI

---
 app/src/main/AndroidManifest.xml              |   3 +-
 .../hackslash/messsy/AbsenceNotification.java |  14 ++
 .../layout/activity_absence_notification.xml  | 182 ++++++++++++++++++
 app/src/main/res/values/strings.xml           |   7 +
 app/src/main/res/values/styles.xml            |  72 +++++++
 5 files changed, 277 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/in/hackslash/messsy/AbsenceNotification.java
 create mode 100644 app/src/main/res/layout/activity_absence_notification.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f897e1f..bd7ed97 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".complaint.NoticeActivity"></activity>
+        <activity android:name=".AbsenceNotification"></activity>
+        <activity android:name=".complaint.NoticeActivity" />
         <activity android:name=".vote.VoteActivity" />
         <activity android:name=".complaint.ComplaintActivity" />
         <activity android:name=".onboarding.EditProfileActivity" />
diff --git a/app/src/main/java/in/hackslash/messsy/AbsenceNotification.java b/app/src/main/java/in/hackslash/messsy/AbsenceNotification.java
new file mode 100644
index 0000000..4b6c4ca
--- /dev/null
+++ b/app/src/main/java/in/hackslash/messsy/AbsenceNotification.java
@@ -0,0 +1,14 @@
+package in.hackslash.messsy;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+
+public class AbsenceNotification extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_absence_notification);
+    }
+}
diff --git a/app/src/main/res/layout/activity_absence_notification.xml b/app/src/main/res/layout/activity_absence_notification.xml
new file mode 100644
index 0000000..c265a01
--- /dev/null
+++ b/app/src/main/res/layout/activity_absence_notification.xml
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".AbsenceNotification">
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true">
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="40dp">
+            <ImageView
+                android:id="@+id/arrow_2"
+                android:layout_width="35dp"
+                android:layout_height="35dp"
+                android:layout_marginStart="25dp"
+                android:layout_marginTop="20dp"
+                android:src="@drawable/arrow_1"
+                tools:ignore="ContentDescription"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"/>
+
+            <TextView
+                android:id="@+id/absence_not"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="25dp"
+                android:layout_marginTop="30dp"
+                android:fontFamily="@font/josefin_sans_bold"
+                android:text="@string/absence_not"
+                android:textAppearance="@style/absence_not"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/arrow_2"/>
+
+            <TextView
+                android:id="@+id/start_date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="25dp"
+                android:layout_marginTop="50dp"
+                android:fontFamily="@font/josefin_sans_semibold"
+                android:text="@string/start_date"
+                android:textAppearance="@style/start_date"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/absence_not"/>
+
+            <EditText
+                android:id="@+id/start_date_input"
+                android:layout_width="match_parent"
+                android:inputType="date"
+                android:textColor="#000000"
+                android:layout_height="wrap_content"
+                android:backgroundTint="#39374D"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/start_date"
+                android:layout_marginEnd="25dp"
+                android:layout_marginStart="25dp"/>
+
+            <TextView
+                android:id="@+id/end_date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="25dp"
+                android:layout_marginTop="20dp"
+                android:fontFamily="@font/josefin_sans_semibold"
+                android:text="@string/start_date"
+                android:textAppearance="@style/start_date"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/start_date_input"/>
+
+            <EditText
+                android:id="@+id/end_date_input"
+                android:layout_width="match_parent"
+                android:inputType="date"
+                android:textColor="#000000"
+                android:layout_height="wrap_content"
+                android:backgroundTint="#39374D"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/end_date"
+                android:layout_marginEnd="25dp"
+                android:layout_marginStart="25dp"/>
+
+            <TextView
+                android:id="@+id/meals_that_"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/meals_that_"
+                android:textAppearance="@style/meals_that_"
+                app:layout_constraintStart_toStartOf="parent"
+                android:fontFamily="@font/josefin_sans_semibold"
+                app:layout_constraintTop_toBottomOf="@id/end_date_input"
+                android:layout_marginStart="25dp"
+                android:layout_marginTop="30dp"/>
+
+            <RadioGroup
+                android:id="@+id/radio_buttom_group_a"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/meals_that_"
+                android:layout_marginStart="36dp"
+                android:layout_marginTop="19dp">
+
+                <RadioButton
+                    android:id="@+id/breakfast_a"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:button="@drawable/radio_button_selector"
+                    android:fontFamily="@font/josefin_sans_semibold"
+                    android:padding="5dp"
+                    android:text="@string/breakfast"
+                    android:textAppearance="@style/breakfast" />
+
+                <RadioButton
+                    android:id="@+id/lunch_a"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="9dp"
+                    android:button="@drawable/radio_button_selector"
+                    android:fontFamily="@font/josefin_sans_semibold"
+                    android:padding="8dp"
+                    android:text="@string/lunch"
+                    android:textAppearance="@style/lunch" />
+
+                <RadioButton
+                    android:id="@+id/dinner_a"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="9dp"
+                    android:button="@drawable/radio_button_selector"
+                    android:fontFamily="@font/josefin_sans_semibold"
+                    android:padding="8dp"
+                    android:text="@string/dinner"
+                    android:textAppearance="@style/dinner" />
+            </RadioGroup>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                android:layout_marginStart="25dp"
+                android:layout_marginTop="40dp"
+                android:layout_marginEnd="25dp"
+                app:layout_constraintTop_toBottomOf="@id/radio_buttom_group_a"
+                android:orientation="horizontal"
+                android:weightSum="2">
+                <Button
+                    android:id="@+id/cancel"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:elevation="10dp"
+                    android:layout_marginEnd="20dp"
+                    android:background="@drawable/white_background"
+                    android:fontFamily="@font/josefin_sans_semibold"
+                    android:text="@string/cancel"
+                    android:textAppearance="@style/cancel"
+                    android:textAllCaps="false"
+                    android:layout_weight="1"/>
+                <Button
+                    android:id="@+id/OK"
+                    android:layout_width="0dp"
+                    android:fontFamily="@font/josefin_sans_semibold"
+                    android:layout_height="wrap_content"
+                    android:elevation="10dp"
+                    android:background="@drawable/white_background"
+                    android:textAppearance="@style/ok"
+                    android:text="@string/ok"
+                    android:layout_weight="1"/>
+            </LinearLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </ScrollView>
+</RelativeLayout>
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fd879de..e028e65 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -27,4 +27,11 @@
         To all the students of Arya Mess :\nLet me set the scene: your friend John is rushing to get his daughter from school and his son to the soccer field, and he still needs to stop at the grocery store because there\'s nothing in the fridge. In the midst of this everyday madness, he gets a text message from Google with a verification code. He thinks,\"That\'s weird. Maybe I should log in to my email and see what\'s going on.\"
     </string>
     <string name="notice">Notice</string>
+    <string name="absence_not">Absence Notification</string>
+    <string name="start_date">Start Date</string>
+    <string name="end_date">End Date</string>
+
+    <string name="meals_that_">Meals that you\'ll miss</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Cancel</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9236d5b..2c48dab 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -230,4 +230,76 @@
         </item>
 
     </style>
+
+    <style name="absence_not">
+
+        <item name="android:textSize">
+            22sp
+        </item>
+
+        <item name="android:textColor">
+            #000000
+        </item>
+
+    </style>
+
+    <style name="start_date">
+
+        <item name="android:textSize">
+            14sp
+        </item>
+
+        <item name="android:textColor">
+            #39374D
+        </item>
+
+    </style>
+
+    <style name="end_date">
+
+        <item name="android:textSize">
+            14sp
+        </item>
+
+        <item name="android:textColor">
+            #39374D
+        </item>
+
+    </style>
+
+    <style name="meals_that_">
+
+        <item name="android:textSize">
+            17sp
+        </item>
+
+        <item name="android:textColor">
+            #39374D
+        </item>
+
+    </style>
+
+    <style name="cancel">
+
+        <item name="android:textSize">
+            16sp
+        </item>
+
+        <item name="android:textColor">
+            #3E3C54
+        </item>
+
+    </style>
+
+    <style name="ok">
+
+        <item name="android:textSize">
+            16sp
+        </item>
+
+        <item name="android:textColor">
+            #3E3C54
+        </item>
+
+    </style>
 </resources>

From 5f6ab23d62ade7d8ca78a8d8091ed888ffade8da Mon Sep 17 00:00:00 2001
From: rishi <rishitiwari517@gmail.com>
Date: Sun, 7 Jun 2020 17:44:32 +0530
Subject: [PATCH 06/11] Login Activity and User Modal class

---
 app/src/main/AndroidManifest.xml              |   1 -
 .../messsy/onboarding/LoginActivity.java      |  95 ++++++-
 .../in/hackslash/messsy/onboarding/User.java  |  34 +++
 app/src/main/res/layout/activity_login.xml    | 251 +++++++++---------
 4 files changed, 248 insertions(+), 133 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6f54a79..3f34d5c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,7 +15,6 @@
         <activity android:name=".complaint.NoticeActivity" />
 
         <activity android:name=".vote.VoteActivity" />
-        <activity android:name=".complaint.NoticeActivity" />
         <activity android:name=".onboarding.EditProfileActivity" />
         <activity android:name=".onboarding.CreateAccountActivity" />
         <activity android:name=".onboarding.LoginActivity" >
diff --git a/app/src/main/java/in/hackslash/messsy/onboarding/LoginActivity.java b/app/src/main/java/in/hackslash/messsy/onboarding/LoginActivity.java
index a4a6844..c8806ec 100644
--- a/app/src/main/java/in/hackslash/messsy/onboarding/LoginActivity.java
+++ b/app/src/main/java/in/hackslash/messsy/onboarding/LoginActivity.java
@@ -1,13 +1,26 @@
 package in.hackslash.messsy.onboarding;
 
-import androidx.appcompat.app.AppCompatActivity;
-
+import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.appcompat.app.AppCompatActivity;
 
 import in.hackslash.messsy.R;
+import in.hackslash.messsy.home.HomeActivity;
 
 public class LoginActivity extends AppCompatActivity {
     // TODO Declare instances for all UI elements
+    private EditText email_et, password_et;
+    private Button login;
+    private TextView create_account, forgot_pass;
+    private AccountsUtil accountsUtil;
+    private ProgressBar progressBar;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -21,6 +34,13 @@ protected void onCreate(Bundle savedInstanceState) {
 
     public void assignVariables() {
         // TODO initialize all fields here
+        email_et = findViewById(R.id.line_1);
+        password_et = findViewById(R.id.line_2);
+        login = findViewById(R.id.rectangle_1);
+        create_account = findViewById(R.id.create_account);
+        forgot_pass = findViewById(R.id.forgot_password);
+        progressBar=findViewById(R.id.login_progress);
+        accountsUtil = new AccountsUtil();
     }
 
     public void setup() {
@@ -31,20 +51,77 @@ public void setup() {
 
     private void handleCreateAccount() {
         // TODO define onclicklistener on Create Account button to navigate to CreateAccountActivity and close this activity
+        create_account.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(LoginActivity.this, CreateAccountActivity.class);
+                startActivity(intent);
+                finish();
+            }
+        });
     }
 
     private void handleForgotPassword() {
         // TODO Later
-    }
-
-    public void handleLogin(){
-        // TODO define onclicklistener on Sign In button to collect data from all edittexts and call ComplaintsUtil.loginUser
+        forgot_pass.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
 
-        // TODO Show an indefinite progress bar on the screen as soon as the submit button is clicked to denote that data is being processed
+            }
+        });
+    }
 
-        // TODO Pass a callback by loginUser().setOnCompleteListener() to handle the result from the update operation. Show a toast according to the result and also hide the progress bar.
+    public void handleLogin() {
+
+        //  define onclicklistener on Sign In button to collect data from all edittexts and call AccountUtil.loginUser
+
+
+        //  Show an indefinite progress bar on the screen as soon as the submit button is clicked to denote that data is being processed
+
+
+        //  Pass a callback by loginUser().setOnCompleteListener() to handle the result from the update operation. Show a toast according to the result and also hide the progress bar.
+
+
+        //  NOTE: If the result is SUCCESS, then close this activity and navigate to HomeActivity
+
+        login.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                progressBar.setVisibility(View.VISIBLE);
+                String email = email_et.getText().toString();
+                String password = password_et.getText().toString();
+                User user = new User();
+                user.setEmail(email);
+                accountsUtil.loginUser(user, password).setOnCompleteListener(new AccountsUtil.onCompleteListener() {
+                    @Override
+                    public void onComplete(AccountsUtil.Status status, User user) {
+                        if (status == AccountsUtil.Status.ALREADY_LOGGED_IN) {
+                            //user already logged in
+                            progressBar.setVisibility(View.INVISIBLE);
+                            Toast.makeText(LoginActivity.this, "Already Logged in", Toast.LENGTH_SHORT).show();
+                        } else if (status == AccountsUtil.Status.WRONG_INPUT) {
+                            //wrong input
+                            progressBar.setVisibility(View.INVISIBLE);
+                            Toast.makeText(LoginActivity.this, "wrong input", Toast.LENGTH_SHORT).show();
+                        } else if (status == AccountsUtil.Status.DUPLICATE_USER) {
+                            //user already exist
+                            progressBar.setVisibility(View.INVISIBLE);
+                            Toast.makeText(LoginActivity.this, "user with this email already exist", Toast.LENGTH_SHORT).show();
+                        } else if (status == AccountsUtil.Status.SUCCESS) {
+                            //logged in successful
+                            progressBar.setVisibility(View.INVISIBLE);
+                            Toast.makeText(LoginActivity.this, "login successful", Toast.LENGTH_SHORT).show();
+                            Intent intent = new Intent(LoginActivity.this, HomeActivity.class);
+                            startActivity(intent);
+                            finish();
+                        }
+                    }
+                });
+
+            }
+        });
 
-        // TODO NOTE: If the result is SUCCESS, then close this activity and navigate to HomeActivity
 
     }
+
 }
diff --git a/app/src/main/java/in/hackslash/messsy/onboarding/User.java b/app/src/main/java/in/hackslash/messsy/onboarding/User.java
index 0b17dd4..b70fd74 100644
--- a/app/src/main/java/in/hackslash/messsy/onboarding/User.java
+++ b/app/src/main/java/in/hackslash/messsy/onboarding/User.java
@@ -3,4 +3,38 @@
 public class User {
 
     // TODO add user fields here
+    private String email,name,roomno;
+
+    public User(){
+
+    }
+    public User(String email, String name, String roomno) {
+        this.email = email;
+        this.name = name;
+        this.roomno = roomno;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getRoomno() {
+        return roomno;
+    }
+
+    public void setRoomno(String roomno) {
+        this.roomno = roomno;
+    }
 }
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 386f84b..269ca07 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,130 +1,135 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 
-    <ScrollView
-        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:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context=".onboarding.LoginActivity">
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".onboarding.LoginActivity">
+
 
+    <RelativeLayout
+        android:id="@+id/sign_in"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#FFFFFF"
+        tools:context=".MainActivity">
 
-        <RelativeLayout
-            android:id="@+id/sign_in"
+        <ProgressBar
+            android:id="@+id/login_progress"
+            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
             android:layout_width="match_parent"
+            android:visibility="invisible"
+            android:layout_height="wrap_content"
+            android:indeterminate="true" />
+
+        <ImageView
+            android:id="@+id/img_1"
+            android:layout_width="wrap_content"
+            android:layout_height="320dp"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentEnd="true"
+            android:layout_marginStart="40dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginEnd="50dp"
+            android:src="@drawable/logo"
+            tools:ignore="ContentDescription" />
+
+        <TextView
+            android:id="@+id/welcome_to_"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/img_1"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="12dp"
+            android:text="@string/welcome_to_"
+            android:textAppearance="@style/welcome_to_"
+            android:textSize="32sp" />
+
+        <TextView
+            android:id="@+id/email"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/welcome_to_"
+            android:layout_alignStart="@id/line_1"
+            android:layout_marginStart="3dp"
+            android:layout_marginTop="16dp"
+            android:text="@string/email"
+            android:textAppearance="@style/email" />
+
+        <EditText
+            android:id="@+id/line_1"
+            android:layout_width="320dp"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/email"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="8dp"
+            android:backgroundTint="#39374D"
+            android:inputType="textEmailAddress"
+            android:textColor="#000000" />
+
+        <TextView
+            android:id="@+id/password"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/line_1"
+            android:layout_alignStart="@id/line_1"
+            android:layout_marginStart="3dp"
+            android:layout_marginTop="0dp"
+            android:text="@string/Password"
+            android:textAppearance="@style/password"
+            android:textSize="15sp" />
+
+        <EditText
+            android:id="@+id/line_2"
+            android:layout_width="320dp"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/password"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="8dp"
+            android:backgroundTint="#39374D"
+            android:inputType="textPassword"
+            android:textColor="#000000" />
+
+        <Button
+            android:id="@+id/rectangle_1"
+            android:layout_width="290dp"
+            android:layout_height="55dp"
+            android:layout_below="@id/line_2"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="32dp"
+            android:background="@drawable/curved_rectangle"
+            android:text="@string/sign_in"
+            android:textColor="#FFFFFF"
+            android:textSize="17sp" />
+
+        <TextView
+            android:id="@+id/forgot_password"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/rectangle_1"
+            android:layout_alignStart="@id/line_1"
+            android:layout_marginStart="3dp"
+            android:layout_marginTop="18dp"
+            android:layout_marginBottom="30dp"
+            android:text="@string/forgot_pass"
+            android:textAppearance="@style/forgot_pass"
+            android:textSize="15sp" />
+
+        <TextView
+            android:id="@+id/create_account"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="#FFFFFF"
-            tools:context=".MainActivity">
-
-
-            <ImageView
-                android:id="@+id/img_1"
-                android:layout_width="wrap_content"
-                android:layout_height="320dp"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentEnd="true"
-                android:layout_marginStart="40dp"
-                android:layout_marginTop="10dp"
-                android:layout_marginEnd="50dp"
-                android:src="@drawable/logo"
-                tools:ignore="ContentDescription" />
-
-            <TextView
-                android:id="@+id/welcome_to_"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/img_1"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="12dp"
-                android:text="@string/welcome_to_"
-                android:textAppearance="@style/welcome_to_"
-                android:textSize="32sp" />
-
-            <TextView
-                android:id="@+id/email"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/welcome_to_"
-                android:layout_marginStart="3dp"
-                android:layout_marginTop="16dp"
-                android:layout_alignStart="@id/line_1"
-                android:text="@string/email"
-                android:textAppearance="@style/email" />
-
-            <EditText
-                android:id="@+id/line_1"
-                android:layout_width="320dp"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/email"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="8dp"
-                android:textColor="#000000"
-                android:backgroundTint="#39374D"
-                android:inputType="textEmailAddress"/>
-
-            <TextView
-                android:id="@+id/password"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/line_1"
-                android:layout_alignStart="@id/line_1"
-                android:layout_marginStart="3dp"
-                android:layout_marginTop="0dp"
-                android:textSize="15sp"
-                android:text="@string/Password"
-                android:textAppearance="@style/password" />
-
-            <EditText
-                android:id="@+id/line_2"
-                android:layout_width="320dp"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/password"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="8dp"
-                android:textColor="#000000"
-                android:backgroundTint="#39374D"
-                android:inputType="textPassword"/>
-
-            <Button
-                android:id="@+id/rectangle_1"
-                android:layout_width="290dp"
-                android:layout_height="55dp"
-                android:layout_below="@id/line_2"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="32dp"
-                android:background="@drawable/curved_rectangle"
-                android:text="@string/sign_in"
-                android:textSize="17sp"
-                android:textColor="#FFFFFF" />
-
-            <TextView
-                android:id="@+id/forgot_password"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/rectangle_1"
-                android:layout_alignStart="@id/line_1"
-                android:layout_marginTop="18dp"
-                android:layout_marginStart="3dp"
-                android:layout_marginBottom="30dp"
-                android:textSize="15sp"
-                android:text="@string/forgot_pass"
-                android:textAppearance="@style/forgot_pass" />
-
-            <TextView
-                android:id="@+id/create_account"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/rectangle_1"
-                android:layout_alignEnd="@id/line_1"
-                android:layout_marginEnd="3dp"
-                android:layout_marginTop="18dp"
-                android:layout_marginBottom="30dp"
-                android:textSize="15sp"
-                android:text="@string/create_account"
-                android:textAppearance="@style/create_acco" />
-
-
-        </RelativeLayout>
-    </ScrollView>
+            android:layout_below="@id/rectangle_1"
+            android:layout_alignEnd="@id/line_1"
+            android:layout_marginTop="18dp"
+            android:layout_marginEnd="3dp"
+            android:layout_marginBottom="30dp"
+            android:text="@string/create_acco"
+            android:textAppearance="@style/create_acco"
+            android:textSize="15sp" />
+
+
+    </RelativeLayout>
+</ScrollView>

From 86e208675a49514705e6427588cc5858e873aad1 Mon Sep 17 00:00:00 2001
From: rishi <rishitiwari517@gmail.com>
Date: Mon, 8 Jun 2020 07:20:49 +0530
Subject: [PATCH 07/11] manifest issue solved

---
 app/src/main/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3f34d5c..6f54a79 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,6 +15,7 @@
         <activity android:name=".complaint.NoticeActivity" />
 
         <activity android:name=".vote.VoteActivity" />
+        <activity android:name=".complaint.NoticeActivity" />
         <activity android:name=".onboarding.EditProfileActivity" />
         <activity android:name=".onboarding.CreateAccountActivity" />
         <activity android:name=".onboarding.LoginActivity" >

From 0463439a76dd1babe4a9a7bf52a702d355b76146 Mon Sep 17 00:00:00 2001
From: rishi <rishitiwari517@gmail.com>
Date: Thu, 18 Jun 2020 21:46:47 +0530
Subject: [PATCH 08/11] AccountsUtil

---
 app/app.iml                                   |  21 +-
 app/build.gradle                              |   1 +
 .../messsy/onboarding/AccountsUtil.java       | 211 ++++++++++++++++--
 3 files changed, 212 insertions(+), 21 deletions(-)

diff --git a/app/app.iml b/app/app.iml
index 8bf2bcf..6df61cc 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -19,7 +19,7 @@
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/google-services/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/google-services/debug" />
         <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
@@ -97,7 +97,6 @@
     <orderEntry type="library" scope="TEST" name="Gradle: net.sf.kxml:kxml2:2.3.0@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.ext:junit:1.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.espresso:espresso-core:3.1.1@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:runner:1.1.1@aar" level="project" />
@@ -109,14 +108,31 @@
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.1.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout-solver:1.1.3@jar" level="project" />
+    <orderEntry type="library" name="Gradle: io.grpc:grpc-protobuf-lite:1.12.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.protobuf:protobuf-lite:3.0.1@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava@jar" level="project" />
+    <orderEntry type="library" name="Gradle: io.grpc:grpc-okhttp:1.12.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okhttp:okhttp:2.7.2@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.13.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: io.grpc:grpc-stub:1.12.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: io.grpc:grpc-core:1.12.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: io.grpc:grpc-context:1.12.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.7@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.guava:guava:20.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.errorprone:error_prone_annotations:2.1.2@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.findbugs:jsr305:3.0.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: io.opencensus:opencensus-contrib-grpc-metrics:0.11.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: io.opencensus:opencensus-api:0.11.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.0.2@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.recyclerview:recyclerview:1.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.firebase:firebase-auth:16.0.5@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-firestore:17.1.2@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-flags:16.0.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.firebase:firebase-auth-interop:16.0.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-base:16.0.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.firebase:firebase-common:16.0.3@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-tasks:16.0.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-database-collection:16.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement:16.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-v4:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.0.0@aar" level="project" />
@@ -146,5 +162,6 @@
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout:1.1.3@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:protolite-well-known-types:16.0.0@aar" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 7627860..f410b80 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,6 +25,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'com.google.firebase:firebase-auth:16.0.5'
+    implementation 'com.google.firebase:firebase-firestore:17.1.2'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
diff --git a/app/src/main/java/in/hackslash/messsy/onboarding/AccountsUtil.java b/app/src/main/java/in/hackslash/messsy/onboarding/AccountsUtil.java
index 4e581ac..40e9c71 100644
--- a/app/src/main/java/in/hackslash/messsy/onboarding/AccountsUtil.java
+++ b/app/src/main/java/in/hackslash/messsy/onboarding/AccountsUtil.java
@@ -1,39 +1,135 @@
 package in.hackslash.messsy.onboarding;
 
 
-public class AccountsUtil {
+import android.util.Log;
+import android.util.Patterns;
 
-    private onCompleteListener onCompleteListener;
+import androidx.annotation.NonNull;
 
-    public AccountsUtil createAccount(User user, String password){
+import com.google.android.gms.tasks.OnCompleteListener;
+import com.google.android.gms.tasks.Task;
+import com.google.firebase.auth.AuthResult;
+import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.auth.FirebaseAuthException;
+import com.google.firebase.auth.FirebaseUser;
+import com.google.firebase.firestore.DocumentSnapshot;
+import com.google.firebase.firestore.FirebaseFirestore;
 
-        // TODO Check if a user is logged in and return ALREADY_LOGGED_IN if a logged in user is found
+import java.util.HashMap;
 
-        // TODO Validate user here and return WRONG_INPUT if anything is wrong
+public class AccountsUtil {
 
-        // TODO Check DB if the user exists and return DUPLICATE_USER if user exists
+    private onCompleteListener onCompleteListener;
+
+    public AccountsUtil createAccount(final User user, String password) {
+
+        String email = user.getEmail();
+        final FirebaseUser currentUser = FirebaseAuth.getInstance().getCurrentUser();
+        final FirebaseFirestore firestore = FirebaseFirestore.getInstance();
+        //  Check if a user is logged in and return ALREADY_LOGGED_IN if a logged in user is found
+        if (currentUser != null) {
+            onCompleteListener.onComplete(Status.ALREADY_LOGGED_IN, user);
+        }
+        //  Validate user here and return WRONG_INPUT if anything is wrong
+        else if (!Patterns.EMAIL_ADDRESS.matcher(email).matches() || password.length() < 6) {
+            onCompleteListener.onComplete(Status.WRONG_INPUT, user);
+        }
+        //  Check DB if the user exists and return DUPLICATE_USER if user exists
+
+        //  Create new account using createUserWithEmailAndPassword and return SUCCESS if successful
+        else {
+            FirebaseAuth.getInstance().createUserWithEmailAndPassword(email, password)
+                    .addOnCompleteListener(new OnCompleteListener<AuthResult>() {
+                        @Override
+                        public void onComplete(@NonNull Task<AuthResult> task) {
+                            if (task.isSuccessful()) {
+                                //user account created
+                                String userid=currentUser.getUid();
+                                String name=user.getName();
+                                String rooomno=user.getRoomno();
+                                String email=user.getEmail();
+                                HashMap<String,Object> map=new HashMap<>();
+                                map.put("name",name);
+                                map.put("roomno",rooomno);
+                                map.put("email",email);
+                                firestore.collection("users").document(userid)
+                                        .set(map).addOnCompleteListener(new OnCompleteListener<Void>() {
+                                    @Override
+                                    public void onComplete(@NonNull Task<Void> task) {
+                                        if(task.isSuccessful()){
+                                            // user data written on DB
+                                            onCompleteListener.onComplete(Status.SUCCESS, user);
+                                        }
+                                    }
+                                });
+                            } else {
+                                String error_code = ((FirebaseAuthException) task.getException()).getErrorCode();
+                                if (error_code.equals("ERROR_EMAIL_ALREADY_IN_USE")) {
+                                    onCompleteListener.onComplete(Status.DUPLICATE_USER, user);
+                                }
+                            }
+                        }
+                    });
+        }
 
-        // TODO Create new account using createUserWithEmailAndPassword and return SUCCESS if successful
 
         // Leave as it is
         return this;
     }
 
-    public AccountsUtil loginUser(User user, String password) {
-
-        // TODO Check if a user is logged in and return ALREADY_LOGGED_IN if a logged in user is found
-
-        // TODO Validate user here and return WRONG_INPUT if anything is wrong
-
-        // TODO Check DB if the user exists and return USER_DOES_NOT_EXIST if user is not found
-
-        // TODO Login using the credentials and return SUCCESS if successful
+    public AccountsUtil loginUser(final User user, final String password) {
+
+        final String email = user.getEmail();
+        FirebaseUser currentUser = FirebaseAuth.getInstance().getCurrentUser();
+        final FirebaseFirestore firestore = FirebaseFirestore.getInstance();
+        //  Check if a user is logged in and return ALREADY_LOGGED_IN if a logged in user is found
+        if (currentUser != null) {
+            onCompleteListener.onComplete(Status.ALREADY_LOGGED_IN, user);
+        }
+        //  Validate user here and return WRONG_INPUT if anything is wrong
+        else if (!Patterns.EMAIL_ADDRESS.matcher(email).matches() || password.length() < 6) {
+            onCompleteListener.onComplete(Status.WRONG_INPUT, user);
+        }
+        //  Check DB if the user exists and return USER_DOES_NOT_EXIST if user is not found
+
+        //  Login using the credentials and return SUCCESS if successful
+
+        else{
+            FirebaseAuth.getInstance().signInWithEmailAndPassword(email,password).addOnCompleteListener(new OnCompleteListener<AuthResult>() {
+                @Override
+                public void onComplete(@NonNull Task<AuthResult> task) {
+                    if(task.isSuccessful()){
+                        // user logged in
+                        // checking user data in DB
+                        String user_id=FirebaseAuth.getInstance().getCurrentUser().getUid();
+                        firestore.collection("users").document(user_id).get().addOnCompleteListener(new OnCompleteListener<DocumentSnapshot>() {
+                            @Override
+                            public void onComplete(@NonNull Task<DocumentSnapshot> task) {
+                                if(task.isSuccessful()){
+                                    DocumentSnapshot doc=task.getResult();
+                                    if(doc.exists()){
+                                        //user exist
+                                        onCompleteListener.onComplete(Status.SUCCESS,user);
+                                    }
+                                    else{
+                                        onCompleteListener.onComplete(Status.USER_DOES_NOT_EXIST,user);
+                                    }
+                                }
+                            }
+                        });
+                    }
+                    else{
+                        Log.d("AccountsUtil", "onComplete: "+"login failed");
+                    }
+                }
+            });
+        }
 
         // Leave as it is
         return this;
     }
 
-    public AccountsUtil updateUser(User user, String password) {
+    public AccountsUtil updateUser(final User user, final String password) {
 
         // TODO Check DB if the user exists and return USER_DOES_NOT_EXIST if user is not found
 
@@ -42,18 +138,95 @@ public AccountsUtil updateUser(User user, String password) {
         // TODO Validate user here and return WRONG_INPUT if anything is wrong
 
         // TODO Update the user data on DB as well as Auth if required and return SUCCESS
-
+        final FirebaseUser currentuser=FirebaseAuth.getInstance().getCurrentUser();
+        final String user_id=currentuser.getUid();
+        final FirebaseFirestore firestore=FirebaseFirestore.getInstance();
+        FirebaseFirestore.getInstance().collection("users").document(user_id).get()
+                .addOnCompleteListener(new OnCompleteListener<DocumentSnapshot>() {
+                    @Override
+                    public void onComplete(@NonNull Task<DocumentSnapshot> task) {
+                        if(task.isSuccessful()){
+                            DocumentSnapshot doc=task.getResult();
+                            if(doc.exists()){
+                                //user exist
+                                String name_n=user.getName();
+                                String roomno_n=user.getRoomno();
+                                String email_n=user.getEmail();
+                                String name_old=doc.getString("name");
+                                String roomno_old=doc.getString("roomno");
+                                String email_old=currentuser.getEmail();
+                                if(roomno_n.length()==0 || name_n.length()==0){
+                                    onCompleteListener.onComplete(Status.WRONG_INPUT,user);
+                                }
+                                else if(roomno_n.equals(roomno_old) || name_n.equals(name_old)){
+                                    onCompleteListener.onComplete(Status.DUPLICATE_USER,user);
+                                }
+                                else{
+                                    HashMap<String,Object> map=new HashMap<>();
+                                    map.put("name",name_n);
+                                    map.put("roomno",roomno_n);
+                                    firestore.collection("users").document(user_id).update(map);
+                                    // if new email provided then updating it
+                                    if(!email_n.equals(email_old)){
+                                        currentuser.updateEmail(email_n).addOnCompleteListener(new OnCompleteListener<Void>() {
+                                            @Override
+                                            public void onComplete(@NonNull Task<Void> task) {
+                                                if(task.isSuccessful()){
+                                                    Log.d("AccountsUtil", "email updated ");
+                                                }
+                                            }
+                                        });
+                                    }
+                                    if(password.length()>=6){
+                                        currentuser.updatePassword(password).addOnCompleteListener(new OnCompleteListener<Void>() {
+                                            @Override
+                                            public void onComplete(@NonNull Task<Void> task) {
+                                                Log.d("AccountsUtil", "password updated");
+                                            }
+                                        });
+                                    }
+                                    onCompleteListener.onComplete(Status.SUCCESS,user);
+                                }
+                            }
+                            else{
+                                onCompleteListener.onComplete(Status.USER_DOES_NOT_EXIST,user);
+                            }
+                        }
+                    }
+                });
         // Leave as it is
         return this;
 
     }
 
-    public AccountsUtil fetchUser(String userID) {
+    public AccountsUtil fetchUser(final String userID) {
 
         // TODO Check DB if the user exists and return USER_DOES_NOT_EXIST if user is not found
 
         // TODO Return the user in a User object if found with a SUCCESS Status
 
+        FirebaseFirestore.getInstance().collection("users").document(userID).get()
+                .addOnCompleteListener(new OnCompleteListener<DocumentSnapshot>() {
+                    @Override
+                    public void onComplete(@NonNull Task<DocumentSnapshot> task) {
+                        if(task.isSuccessful()){
+                            DocumentSnapshot doc=task.getResult();
+                            if(doc.exists()){
+                                //user exist
+                                String name=doc.getString("name");
+                                String roomno=doc.getString("roomno");
+                                String email=doc.getString("email");
+                                User user=new User(email,name,roomno);
+                                onCompleteListener.onComplete(Status.SUCCESS,user);
+                            }
+                            else{
+                                User user=new User();
+                                onCompleteListener.onComplete(Status.USER_DOES_NOT_EXIST,user);
+                            }
+                        }
+                    }
+                });
+
         // Leave as it is
         return this;
     }

From 79fcabb430f6dbf3d83d5e87007f03468c4c1f57 Mon Sep 17 00:00:00 2001
From: rishi <rishitiwari517@gmail.com>
Date: Sat, 20 Jun 2020 22:52:38 +0530
Subject: [PATCH 09/11] AccountUtils changes

---
 .../in/hackslash/messsy/onboarding/AccountsUtil.java |  5 +++--
 .../java/in/hackslash/messsy/onboarding/User.java    | 12 ++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/in/hackslash/messsy/onboarding/AccountsUtil.java b/app/src/main/java/in/hackslash/messsy/onboarding/AccountsUtil.java
index 40e9c71..39487b3 100644
--- a/app/src/main/java/in/hackslash/messsy/onboarding/AccountsUtil.java
+++ b/app/src/main/java/in/hackslash/messsy/onboarding/AccountsUtil.java
@@ -31,7 +31,8 @@ public AccountsUtil createAccount(final User user, String password) {
             onCompleteListener.onComplete(Status.ALREADY_LOGGED_IN, user);
         }
         //  Validate user here and return WRONG_INPUT if anything is wrong
-        else if (!Patterns.EMAIL_ADDRESS.matcher(email).matches() || password.length() < 6) {
+        else if (!Patterns.EMAIL_ADDRESS.matcher(email).matches() || password.length() < 6
+                               || user.getName().length()==0 || user.getRoomno().length()==0) {
             onCompleteListener.onComplete(Status.WRONG_INPUT, user);
         }
         //  Check DB if the user exists and return DUPLICATE_USER if user exists
@@ -216,7 +217,7 @@ public void onComplete(@NonNull Task<DocumentSnapshot> task) {
                                 String name=doc.getString("name");
                                 String roomno=doc.getString("roomno");
                                 String email=doc.getString("email");
-                                User user=new User(email,name,roomno);
+                                User user=new User(email,name,roomno,userID);
                                 onCompleteListener.onComplete(Status.SUCCESS,user);
                             }
                             else{
diff --git a/app/src/main/java/in/hackslash/messsy/onboarding/User.java b/app/src/main/java/in/hackslash/messsy/onboarding/User.java
index b70fd74..2c9d6e6 100644
--- a/app/src/main/java/in/hackslash/messsy/onboarding/User.java
+++ b/app/src/main/java/in/hackslash/messsy/onboarding/User.java
@@ -3,17 +3,25 @@
 public class User {
 
     // TODO add user fields here
-    private String email,name,roomno;
+    private String email,name,roomno,uid;
 
     public User(){
 
     }
-    public User(String email, String name, String roomno) {
+    public User(String email, String name, String roomno,String uid) {
         this.email = email;
         this.name = name;
         this.roomno = roomno;
     }
 
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
     public String getEmail() {
         return email;
     }

From b2de2db33848ea565dae4ad2b287d572323d258c Mon Sep 17 00:00:00 2001
From: Rishikant Tiwari <rishitiwari517@gmail.com>
Date: Sat, 20 Jun 2020 22:58:46 +0530
Subject: [PATCH 10/11] Update User.java

---
 app/src/main/java/in/hackslash/messsy/onboarding/User.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/in/hackslash/messsy/onboarding/User.java b/app/src/main/java/in/hackslash/messsy/onboarding/User.java
index 2c9d6e6..7db477b 100644
--- a/app/src/main/java/in/hackslash/messsy/onboarding/User.java
+++ b/app/src/main/java/in/hackslash/messsy/onboarding/User.java
@@ -12,6 +12,7 @@ public User(String email, String name, String roomno,String uid) {
         this.email = email;
         this.name = name;
         this.roomno = roomno;
+        this.uid=uid;
     }
 
     public String getUid() {

From 7d832b65d7893b46856ddeb80c924b9c6cec9e52 Mon Sep 17 00:00:00 2001
From: rishi <rishitiwari517@gmail.com>
Date: Mon, 22 Jun 2020 17:47:36 +0530
Subject: [PATCH 11/11] CreateAccount Activity

---
 .../onboarding/CreateAccountActivity.java     |  93 +++++-
 .../res/layout/activity_create_account.xml    | 100 ++++---
 .../main/res/layout/activity_edit_profile.xml |  13 +-
 app/src/main/res/layout/activity_notice.xml   |   3 +-
 app/src/main/res/values/strings.xml           |   9 +
 app/src/main/res/values/styles.xml            | 278 +++++-------------
 6 files changed, 234 insertions(+), 262 deletions(-)

diff --git a/app/src/main/java/in/hackslash/messsy/onboarding/CreateAccountActivity.java b/app/src/main/java/in/hackslash/messsy/onboarding/CreateAccountActivity.java
index a0c87f8..60db54a 100644
--- a/app/src/main/java/in/hackslash/messsy/onboarding/CreateAccountActivity.java
+++ b/app/src/main/java/in/hackslash/messsy/onboarding/CreateAccountActivity.java
@@ -2,13 +2,25 @@
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import android.widget.Toast;
 
 import in.hackslash.messsy.R;
+import in.hackslash.messsy.home.HomeActivity;
 
 public class CreateAccountActivity extends AppCompatActivity {
-    // TODO Declare instances for all UI elements
-
+    //  Declare instances for all UI elements
+    EditText name,email,roomno,password;
+    TextView login;
+    Button create_account;
+    ProgressBar progress;
+    AccountsUtil accountsUtil;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -20,7 +32,15 @@ protected void onCreate(Bundle savedInstanceState) {
 
 
     public void assignVariables() {
-        // TODO initialize all fields here
+        //  initialize all fields here
+        name=findViewById(R.id.ca_name);
+        email=findViewById(R.id.ca_email);
+        roomno=findViewById(R.id.ca_roomno);
+        password=findViewById(R.id.ca_password);
+        login=findViewById(R.id.log_in);
+        create_account=findViewById(R.id.create_acc_button);
+        progress=findViewById(R.id.create_acc_progress);
+        accountsUtil=new AccountsUtil();
     }
 
     public void setup(){
@@ -29,18 +49,67 @@ public void setup(){
     }
 
     private void handleLogin() {
-        // TODO define onclicklistener on Sign in button to navigate to LoginActivity and close this activity
-
+        //  define onclicklistener on Sign in button to navigate to LoginActivity and close this activity
+        login.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                // navigate to login activity
+                Intent intent=new Intent(CreateAccountActivity.this,LoginActivity.class);
+                startActivity(intent);
+            }
+        });
     }
 
     public void handleCreateAccount() {
-        // TODO define onclicklistener on Save Details button to collect data from all edittexts and call ComplaintsUtil.createAccount
-
-        // TODO Show an indefinite progress bar on the screen as soon as the submit button is clicked to denote that data is being processed
-
-        // TODO Pass a callback by createAccount().setOnCompleteListener() to handle the result from the update operation. Show a toast according to the result and also hide the progress bar.
-
-        // TODO NOTE: If the result is SUCCESS, then close this activity and navigate to HomeActivity
+        //  define onclicklistener on Save Details button to collect data from all edittexts and call ComplaintsUtil.createAccount
+
+        //  Show an indefinite progress bar on the screen as soon as the submit button is clicked to denote that data is being processed
+
+        //  Pass a callback by createAccount().setOnCompleteListener() to handle the result from the update operation. Show a toast according to the result and also hide the progress bar.
+
+        //  NOTE: If the result is SUCCESS, then close this activity and navigate to HomeActivity
+        create_account.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                progress.setVisibility(View.VISIBLE);
+                String username=name.getText().toString();
+                String email_id=email.getText().toString();
+                String room_no=roomno.getText().toString();
+                String password_=password.getText().toString();
+                User user=new User();
+                user.setEmail(email_id);
+                user.setName(username);
+                user.setRoomno(room_no);
+                accountsUtil.createAccount(user,password_).setOnCompleteListener(new AccountsUtil.onCompleteListener() {
+                    @Override
+                    public void onComplete(AccountsUtil.Status status, User user) {
+                        if(status== AccountsUtil.Status.ALREADY_LOGGED_IN){
+                            progress.setVisibility(View.INVISIBLE);
+                            Toast.makeText(CreateAccountActivity.this, "Already Logged in", Toast.LENGTH_SHORT).show();
+                            Intent intent = new Intent(CreateAccountActivity.this, HomeActivity.class);
+                            startActivity(intent);
+                            finish();
+                        }
+                        else if(status== AccountsUtil.Status.WRONG_INPUT){
+                            //wrong input
+                            progress.setVisibility(View.INVISIBLE);
+                            Toast.makeText(CreateAccountActivity.this, "wrong input", Toast.LENGTH_SHORT).show();
+                        }
+                        else if(status== AccountsUtil.Status.DUPLICATE_USER){
+                            progress.setVisibility(View.INVISIBLE);
+                            Toast.makeText(CreateAccountActivity.this, "User already exist", Toast.LENGTH_SHORT).show();
+                        }
+                        else if(status== AccountsUtil.Status.SUCCESS){
+                            progress.setVisibility(View.INVISIBLE);
+                            Toast.makeText(CreateAccountActivity.this, "account created successful", Toast.LENGTH_SHORT).show();
+                            Intent intent = new Intent(CreateAccountActivity.this, HomeActivity.class);
+                            startActivity(intent);
+                            finish();
+                        }
+                    }
+                });
+            }
+        });
 
     }
 }
diff --git a/app/src/main/res/layout/activity_create_account.xml b/app/src/main/res/layout/activity_create_account.xml
index d27839e..a07ddd8 100644
--- a/app/src/main/res/layout/activity_create_account.xml
+++ b/app/src/main/res/layout/activity_create_account.xml
@@ -6,17 +6,24 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".onboarding.LoginActivity"
+    tools:context=".onboarding.CreateAccountActivity"
     app:layout_constraintStart_toStartOf="parent">
 
 
     <RelativeLayout
         android:id="@+id/create_account"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:background="#FFFFFF"
         android:orientation="vertical"
         tools:context=".MainActivity">
+        <ProgressBar
+            android:id="@+id/create_acc_progress"
+            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+            android:layout_width="match_parent"
+            android:visibility="invisible"
+            android:layout_height="wrap_content"
+            android:indeterminate="true" />
 
         <TextView
             android:id="@+id/welcome_to_"
@@ -25,6 +32,7 @@
             android:layout_alignParentTop="true"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="25dp"
+            android:fontFamily="@font/josefin_sans_bold"
             android:text="@string/welcome_to_"
             android:textAppearance="@style/welcome_to_"
             android:textSize="35sp" />
@@ -44,14 +52,15 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@id/breakfast_image"
-            android:layout_alignStart="@id/line_1"
+            android:layout_alignStart="@id/ca_name"
             android:layout_marginStart="3dp"
+            android:fontFamily="@font/josefin_sans_bold"
             android:layout_marginTop="28dp"
             android:text="@string/name"
             android:textAppearance="@style/name" />
 
         <EditText
-            android:id="@+id/line_1"
+            android:id="@+id/ca_name"
             android:layout_width="340dp"
             android:layout_height="wrap_content"
             android:layout_below="@id/name"
@@ -59,22 +68,23 @@
             android:layout_marginStart="40dp"
             android:layout_marginTop="0dp"
             android:backgroundTint="#39374D"
-            android:inputType="textEmailAddress"
+            android:inputType="text"
             android:textColor="#000000" />
 
         <TextView
             android:id="@+id/email_address"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/line_1"
-            android:layout_alignStart="@id/line_2"
+            android:layout_below="@id/ca_name"
+            android:fontFamily="@font/josefin_sans_bold"
+            android:layout_alignStart="@id/ca_email"
             android:layout_marginStart="3dp"
             android:layout_marginTop="0dp"
-            android:text="@string/email_add"
-            android:textAppearance="@style/email_add" />
+            android:text="@string/email"
+            android:textAppearance="@style/email" />
 
         <EditText
-            android:id="@+id/line_2"
+            android:id="@+id/ca_email"
             android:layout_width="340dp"
             android:layout_height="wrap_content"
             android:layout_below="@id/email_address"
@@ -89,15 +99,16 @@
             android:id="@+id/room_no"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/line_2"
-            android:layout_alignStart="@id/line_3"
+            android:layout_below="@id/ca_email"
+            android:layout_alignStart="@id/ca_roomno"
+            android:fontFamily="@font/josefin_sans_bold"
             android:layout_marginStart="3dp"
             android:layout_marginTop="0dp"
             android:text="@string/room_no"
             android:textAppearance="@style/room_no" />
 
         <EditText
-            android:id="@+id/line_3"
+            android:id="@+id/ca_roomno"
             android:layout_width="340dp"
             android:layout_height="wrap_content"
             android:layout_below="@id/room_no"
@@ -105,22 +116,23 @@
             android:layout_marginStart="40dp"
             android:layout_marginTop="0dp"
             android:backgroundTint="#39374D"
-            android:inputType="textEmailAddress"
+            android:inputType="number"
             android:textColor="#000000" />
 
         <TextView
             android:id="@+id/enter_password"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/line_3"
-            android:layout_alignStart="@id/line_4"
+            android:layout_below="@id/ca_roomno"
+            android:layout_alignStart="@id/ca_password"
+            android:fontFamily="@font/josefin_sans_bold"
             android:layout_marginStart="3dp"
             android:layout_marginTop="0dp"
             android:text="@string/enter_password"
             android:textAppearance="@style/enter_password" />
 
         <EditText
-            android:id="@+id/line_4"
+            android:id="@+id/ca_password"
             android:layout_width="340dp"
             android:layout_height="wrap_content"
             android:layout_below="@id/enter_password"
@@ -128,46 +140,50 @@
             android:layout_marginStart="40dp"
             android:layout_marginTop="0dp"
             android:backgroundTint="#39374D"
-            android:inputType="textEmailAddress"
+            android:inputType="textPassword"
             android:textColor="#000000" />
 
         <Button
-            android:id="@+id/rectangle_1"
+            android:id="@+id/create_acc_button"
             android:layout_width="290dp"
             android:layout_height="55dp"
-            android:layout_below="@id/line_4"
+            android:layout_below="@id/ca_password"
             android:layout_centerHorizontal="true"
             android:layout_marginStart="40dp"
+            android:textAllCaps="false"
             android:layout_marginTop="40dp"
             android:background="@drawable/rectangle_1"
             android:elevation="10dp"
-            android:text="@string/create_account"
+            android:text="@string/create_acco"
+            android:fontFamily="@font/josefin_sans_bold"
             android:textColor="#FFFFFF"
             android:textSize="18sp" />
 
-        <TextView
-            android:id="@+id/already_have_an_account"
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/rectangle_1"
-            android:layout_alignStart="@id/rectangle_1"
-            android:layout_marginStart="40dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="20dp"
-            android:text="@string/already_have_an_account"
-            android:textAppearance="@style/already_have_an_account" />
-
-        <TextView
-            android:id="@+id/log_in"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/rectangle_1"
-            android:layout_alignBaseline="@id/already_have_an_account"
-            android:layout_alignStart="@id/rectangle_1"
-            android:layout_marginStart="212dp"
-            android:layout_marginBottom="20dp"
-            android:text="@string/log_in"
-            android:textAppearance="@style/log_in" />
+            android:orientation="horizontal"
+            android:layout_below="@id/create_acc_button"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="7dp">
+            <TextView
+                android:id="@+id/already_have_an_account"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/already_have_an_account"
+                android:fontFamily="@font/josefin_sans_bold"
+                android:textAppearance="@style/already_have_an_account" />
+
+            <TextView
+                android:id="@+id/log_in"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/josefin_sans_bold"
+                android:text="@string/log_in"
+                android:layout_marginStart="3dp"
+                android:textColor="#F9A826"
+                android:textAppearance="@style/log_in" />
+        </LinearLayout>
 
 
     </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_edit_profile.xml b/app/src/main/res/layout/activity_edit_profile.xml
index 07ac519..a2a290b 100644
--- a/app/src/main/res/layout/activity_edit_profile.xml
+++ b/app/src/main/res/layout/activity_edit_profile.xml
@@ -11,7 +11,7 @@
     <RelativeLayout
         android:id="@+id/edit_profile"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:background="#FFFFFF"
         android:orientation="vertical"
         tools:context=".MainActivity">
@@ -23,6 +23,7 @@
             android:layout_centerHorizontal="true"
             android:layout_alignParentTop="true"
             android:layout_marginTop="30dp"
+            android:fontFamily="@font/josefin_sans_bold"
             android:layout_alignStart="@id/line_1"
             android:text="@string/edit_your_details"
             android:textAppearance="@style/edit_your_details"
@@ -40,6 +41,7 @@
         <TextView
             android:id="@+id/name"
             android:layout_width="wrap_content"
+            android:fontFamily="@font/josefin_sans_bold"
             android:layout_height="wrap_content"
             android:layout_below="@id/breakfast_image"
             android:layout_marginTop="28dp"
@@ -66,10 +68,11 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/line_1"
             android:layout_alignStart="@id/line_2"
+            android:fontFamily="@font/josefin_sans_bold"
             android:layout_marginStart="3dp"
             android:layout_marginTop="0dp"
-            android:text="@string/email_add"
-            android:textAppearance="@style/email_add" />
+            android:text="@string/email"
+            android:textAppearance="@style/email" />
 
         <EditText
             android:id="@+id/line_2"
@@ -87,6 +90,7 @@
             android:id="@+id/room_no"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:fontFamily="@font/josefin_sans_bold"
             android:layout_below="@id/line_2"
             android:layout_alignStart="@id/line_3"
             android:layout_marginStart="3dp"
@@ -113,6 +117,7 @@
             android:layout_below="@id/line_3"
             android:layout_alignStart="@id/line_4"
             android:layout_marginStart="3dp"
+            android:fontFamily="@font/josefin_sans_bold"
             android:layout_marginTop="0dp"
             android:text="@string/enter_password"
             android:textAppearance="@style/enter_password" />
@@ -135,8 +140,10 @@
             android:layout_height="55dp"
             android:layout_below="@id/line_4"
             android:layout_centerHorizontal="true"
+            android:fontFamily="@font/josefin_sans_bold"
             android:layout_marginTop="32dp"
             android:layout_marginBottom="40dp"
+            android:textAllCaps="false"
             android:background="@drawable/rectangle_1"
             android:elevation="10dp"
             android:text="@string/save_details"
diff --git a/app/src/main/res/layout/activity_notice.xml b/app/src/main/res/layout/activity_notice.xml
index 65fb8fa..e3addb6 100644
--- a/app/src/main/res/layout/activity_notice.xml
+++ b/app/src/main/res/layout/activity_notice.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".user.NoticeActivity">
+    tools:context=".complaint.NoticeActivity">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -48,6 +48,7 @@
             <TextView
                 android:id="@+id/to_all_the"
                 android:layout_width="wrap_content"
+                android:text="@string/to_all_the_"
                 android:layout_height="match_parent"
                 android:textColor="#000"/>
         </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e028e65..7e161f5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -34,4 +34,13 @@
     <string name="meals_that_">Meals that you\'ll miss</string>
     <string name="ok">OK</string>
     <string name="cancel">Cancel</string>
+
+    <string name="name">Name</string>
+    <string name="room_no">Room no</string>
+    <string name="enter_password">Password</string>
+    <string name="already_have_an_account">already have an account?</string>
+    <string name="log_in">Log in</string>
+
+    <string name="edit_your_details">Edit your details</string>
+    <string name="save_details">Save Details</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2c48dab..3f3b5c9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -14,12 +14,17 @@
     </style>
 
     <style name="email">
-        <item name="android:textSize">12sp</item>
+        <item name="android:textSize">14sp</item>
         <item name="android:textColor">#39374D</item>
     </style>
 
     <style name="password">
-        <item name="android:textSize">12sp</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">#39374D</item>
+    </style>
+
+    <style name="log_in">
+        <item name="android:textSize">14sp</item>
         <item name="android:textColor">#39374D</item>
     </style>
 
@@ -29,277 +34,142 @@
     </style>
 
     <style name="create_acco">
+        <item name="android:textSize">12sp</item>
+        <item name="android:textColor">#39374D</item>
+    </style>
 
-        <item name="android:textSize">
-            12sp
-        </item>
-
-        <item name="android:textColor">
-            #39374D
-        </item>
-
+    <style name="name">
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">#39374D</item>
     </style>
 
-    <style name="complaint_s">
+    <style name="room_no">
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">#39374D</item>
+    </style>
 
-        <item name="android:textSize">
-            22sp
-        </item>
+    <style name="enter_password">
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">#39374D</item>
+    </style>
 
-        <item name="android:textColor">
-            #000000
-        </item>
+    <style name="already_have_an_account">
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">#39374D</item>
+    </style>
 
+    <style name="complaint_s">
+        <item name="android:textSize">22sp</item>
+        <item name="android:textColor">#000000</item>
     </style>
 
     <style name="issue">
-        <item name="android:textSize">
-            15sp
-        </item>
-
-        <item name="android:textColor">
-            #39374D
-        </item>
-
+        <item name="android:textSize">15sp</item>
+        <item name="android:textColor">#39374D</item>
     </style>
 
     <style name="description">
-
-        <item name="android:textSize">
-            15sp
-        </item>
-
-        <item name="android:textColor">
-            #39374D
-        </item>
-
+        <item name="android:textSize">15sp</item>
+        <item name="android:textColor">#39374D</item>
     </style>
 
     <style name="upload_image">
-
-        <item name="android:textSize">
-            12sp
-        </item>
-
-        <item name="android:textColor">
-            #3B3950
-        </item>
-
+        <item name="android:textSize">12sp</item>
+        <item name="android:textColor">#3B3950</item>
     </style>
 
     <style name="file_compla">
-
-        <item name="android:textSize">
-            18sp
-        </item>
-
-        <item name="android:textColor">
-            #FFFFFF
-        </item>
-
+        <item name="android:textSize">18sp</item>
+        <item name="android:textColor">#FFFFFF</item>
     </style>
 
     <style name="vote_for_ch">
-
-        <item name="android:textSize">
-            22sp
-        </item>
-
-        <item name="android:textColor">
-            #000000
-        </item>
-
+        <item name="android:textSize">22sp</item>
+        <item name="android:textColor">#000000</item>
     </style>
 
     <style name="choose_meal">
-
-        <item name="android:textSize">
-            16sp
-        </item>
-
-        <item name="android:textColor">
-            #39374D
-        </item>
-
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">#39374D</item>
     </style>
 
     <style name="breakfast">
-
-        <item name="android:textSize">
-            14sp
-        </item>
-
-        <item name="android:textColor">
-            #39374D
-        </item>
-
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">#39374D</item>
     </style>
 
     <style name="lunch">
-
-        <item name="android:textSize">
-            14sp
-        </item>
-
-        <item name="android:textColor">
-            #39374D
-        </item>
-
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">#39374D</item>
     </style>
 
     <style name="dinner">
-
-        <item name="android:textSize">
-            14sp
-        </item>
-
-        <item name="android:textColor">
-            #39374D
-        </item>
-
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">#39374D</item>
     </style>
 
     <style name="food_item">
-
-        <item name="android:textSize">
-            14sp
-        </item>
-
-        <item name="android:textColor">
-            #39374D
-        </item>
-
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">#39374D</item>
     </style>
 
     <style name="vote_for_ad">
-
-        <item name="android:textSize">
-            12sp
-        </item>
-
-        <item name="android:textColor">
-            #3B3950
-        </item>
-
+        <item name="android:textSize">12sp</item>
+        <item name="android:textColor">#3B3950</item>
     </style>
 
     <style name="vote_for_re">
-
-        <item name="android:textSize">
-            12sp
-        </item>
-
-        <item name="android:textColor">
-            #3B3950
-        </item>
-
+        <item name="android:textSize">12sp</item>
+        <item name="android:textColor">#3B3950</item>
     </style>
 
     <style name="submit">
-
-        <item name="android:textSize">
-            18sp
-        </item>
-
-        <item name="android:textColor">
-            #FFFFFF
-        </item>
-
+        <item name="android:textSize">18sp</item>
+        <item name="android:textColor">#FFFFFF</item>
     </style>
 
     <style name="notice">
-
-        <item name="android:textSize">
-            22sp
-        </item>
-
-        <item name="android:textColor">
-            #000000
-        </item>
-
+        <item name="android:textSize">22sp</item>
+        <item name="android:textColor">#000000</item>
     </style>
 
     <style name="to_all_the_">
-
-        <item name="android:textSize">
-            16sp
-        </item>
-
-        <item name="android:textColor">
-            #000000
-        </item>
-
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">#000000</item>
     </style>
 
     <style name="absence_not">
-
-        <item name="android:textSize">
-            22sp
-        </item>
-
-        <item name="android:textColor">
-            #000000
-        </item>
-
+        <item name="android:textSize">22sp</item>
+        <item name="android:textColor">#000000</item>
     </style>
 
     <style name="start_date">
-
-        <item name="android:textSize">
-            14sp
-        </item>
-
-        <item name="android:textColor">
-            #39374D
-        </item>
-
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">#39374D</item>
     </style>
 
     <style name="end_date">
-
-        <item name="android:textSize">
-            14sp
-        </item>
-
-        <item name="android:textColor">
-            #39374D
-        </item>
-
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">#39374D</item>
     </style>
 
     <style name="meals_that_">
-
-        <item name="android:textSize">
-            17sp
-        </item>
-
-        <item name="android:textColor">
-            #39374D
-        </item>
-
+        <item name="android:textSize">17sp</item>
+        <item name="android:textColor">#39374D</item>
     </style>
 
     <style name="cancel">
-
-        <item name="android:textSize">
-            16sp
-        </item>
-
-        <item name="android:textColor">
-            #3E3C54
-        </item>
-
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">#3E3C54</item>
     </style>
 
     <style name="ok">
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">#3E3C54</item>
+    </style>
 
-        <item name="android:textSize">
-            16sp
-        </item>
-
-        <item name="android:textColor">
-            #3E3C54
-        </item>
-
+    <style name="edit_your_details">
+        <item name="android:textSize">24sp</item>
+        <item name="android:textColor">#3E3C54</item>
     </style>
 </resources>