From e458d9f55df2f87bff693c025a059ad2bee5a560 Mon Sep 17 00:00:00 2001
From: Hazel Wright <hgw21@ic.ac.uk>
Date: Wed, 14 Jun 2023 14:25:49 +0100
Subject: [PATCH 01/17] Renamed ProfileActivity to UserProfileActivity.

---
 app/src/main/AndroidManifest.xml                   |  2 +-
 .../main/java/com/example/drp25/ChatActivity.kt    |  2 +-
 .../java/com/example/drp25/InterestActivity.kt     |  2 +-
 .../{ProfileActivity.kt => UserProfileActivity.kt} | 14 +++++++-------
 ...ivity_profile.xml => activity_user_profile.xml} |  4 ++--
 app/src/main/res/values/strings.xml                | 13 ++-----------
 6 files changed, 14 insertions(+), 23 deletions(-)
 rename app/src/main/java/com/example/drp25/{ProfileActivity.kt => UserProfileActivity.kt} (94%)
 rename app/src/main/res/layout/{activity_profile.xml => activity_user_profile.xml} (98%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3a96e98..c131309 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -36,7 +36,7 @@
             android:name=".InterestActivity"
             android:exported="false" />
         <activity
-            android:name=".ProfileActivity"
+            android:name=".UserProfileActivity"
             android:exported="false" />
         <activity
             android:name=".MatchActivity"
diff --git a/app/src/main/java/com/example/drp25/ChatActivity.kt b/app/src/main/java/com/example/drp25/ChatActivity.kt
index ec96a4e..1091ecb 100644
--- a/app/src/main/java/com/example/drp25/ChatActivity.kt
+++ b/app/src/main/java/com/example/drp25/ChatActivity.kt
@@ -146,7 +146,7 @@ class ChatActivity : AppCompatActivity() {
         }
 
         binding.channelListHeaderView.setOnUserAvatarClickListener{
-            val intent = Intent(this, ProfileActivity::class.java)
+            val intent = Intent(this, UserProfileActivity::class.java)
             startActivity(intent)
         }
 
diff --git a/app/src/main/java/com/example/drp25/InterestActivity.kt b/app/src/main/java/com/example/drp25/InterestActivity.kt
index 44d1b45..d7a707a 100644
--- a/app/src/main/java/com/example/drp25/InterestActivity.kt
+++ b/app/src/main/java/com/example/drp25/InterestActivity.kt
@@ -55,7 +55,7 @@ class InterestActivity : AppCompatActivity() {
         // Back button returns to profile
         val backButton = findViewById<Button>(R.id.back_button_interests)
         backButton.setOnClickListener {
-            val intent = Intent(this, ProfileActivity::class.java)
+            val intent = Intent(this, UserProfileActivity::class.java)
             startActivity(intent)
         }
     }
diff --git a/app/src/main/java/com/example/drp25/ProfileActivity.kt b/app/src/main/java/com/example/drp25/UserProfileActivity.kt
similarity index 94%
rename from app/src/main/java/com/example/drp25/ProfileActivity.kt
rename to app/src/main/java/com/example/drp25/UserProfileActivity.kt
index 92164b7..d33f96f 100644
--- a/app/src/main/java/com/example/drp25/ProfileActivity.kt
+++ b/app/src/main/java/com/example/drp25/UserProfileActivity.kt
@@ -14,7 +14,7 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TableRow
 import android.widget.TextView
-import com.example.drp25.databinding.ActivityProfileBinding
+import com.example.drp25.databinding.ActivityUserProfileBinding
 import com.google.firebase.database.DataSnapshot
 import com.google.firebase.database.DatabaseError
 import com.google.firebase.database.FirebaseDatabase
@@ -24,9 +24,9 @@ import java.io.FileOutputStream
 
 /** Retrieve user information using Stream SDK to personalise. */
 
-class ProfileActivity : AppCompatActivity() {
+class UserProfileActivity : AppCompatActivity() {
 
-    private lateinit var binding: ActivityProfileBinding
+    private lateinit var binding: ActivityUserProfileBinding
     private lateinit var stampLayout: LinearLayout
     private lateinit var noStampsTextView: TextView
     private lateinit var imageFile: File
@@ -38,13 +38,13 @@ class ProfileActivity : AppCompatActivity() {
     @SuppressLint("MissingInflatedId")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_profile)
+        setContentView(R.layout.activity_user_profile)
 
         // indicates this is the person logged in (currently Kevin)
         listenToUser(UNI_ID, USER_ID)
 
         /* inflate binding */
-        binding = ActivityProfileBinding.inflate(layoutInflater)
+        binding = ActivityUserProfileBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
         stampLayout = findViewById(R.id.stamp_layout)
@@ -81,7 +81,7 @@ class ProfileActivity : AppCompatActivity() {
                 })
 
                 for (interest in snapshot.child("interests").children) {
-                    val inflater = LayoutInflater.from(this@ProfileActivity)
+                    val inflater = LayoutInflater.from(this@UserProfileActivity)
                     val rowView = inflater.inflate(R.layout.profile_interest, binding.interestsTable, false) as TableRow
                     val interestNameView = rowView.findViewById<TextView>(R.id.interest_name)
                     interestNameView.text = interest.key
@@ -94,7 +94,7 @@ class ProfileActivity : AppCompatActivity() {
                     stampLayout.visibility = View.VISIBLE
 
                     for (stamp in snapshot.child("stamps").children) {
-                        val inflater = LayoutInflater.from(this@ProfileActivity)
+                        val inflater = LayoutInflater.from(this@UserProfileActivity)
                         val imgView = inflater.inflate(R.layout.stamp_view, stampLayout, false) as ImageView
                         stamp.getValue(Int::class.java)?.let { imgView.setImageResource(it) }
                         stampLayout.addView(imgView)
diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_user_profile.xml
similarity index 98%
rename from app/src/main/res/layout/activity_profile.xml
rename to app/src/main/res/layout/activity_user_profile.xml
index e41297f..b638ed6 100644
--- a/app/src/main/res/layout/activity_profile.xml
+++ b/app/src/main/res/layout/activity_user_profile.xml
@@ -5,7 +5,7 @@
     android:id="@+id/coordinatorLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ProfileActivity">
+    tools:context=".UserProfileActivity">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/profile_toolbar"
@@ -71,7 +71,7 @@
                 android:id="@+id/uploadButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Upload Profile Picture"
+                android:text="@string/profile_picture"
                 android:layout_gravity="center"
                 android:layout_margin="@dimen/text_margin_32"/>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 129725b..b7ce70b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -17,7 +17,8 @@
     <!--Interest selection page-->
     <string name="interest_prompt">Enter new interest</string>
 
-    <!-- Profile Page -->
+    <!-- User Profile Page -->
+    <string name="profile_picture">Upload Profile Picture</string>
     <string name="personal_info">Personal Info</string>
     <string name="interests">Interests</string>
     <string name="stamps">Stamps</string>
@@ -25,16 +26,6 @@
     <!-- Necessary Content Description(s) -->
     <string name="profile_picture_descr">profile picture placeholder</string>
     <string name="rating_descr">interest level rating</string>
-    <!-- Hardcoded Kevin Example -->
-    <string name="kevin">Kevin</string>
-    <string name="kevin_info">Year 1  |  Physics  |  Imperial College</string>
-    <string name="kevin_info_year">Year 1</string>
-    <string name="kevin_info_course">Physics</string>
-    <string name="kevin_info_uni">Imperial College</string>
-    <string name="kevin_interests">Ballet  |  Cooking  |  Football</string>
-    <string name="kevin_interest_1">Ballet</string>
-    <string name="kevin_interest_2">Cooking</string>
-    <string name="kevin_interest_3">Football</string>
 
     <string name="lorem_ipsum">
         Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam in scelerisque sem. Mauris

From 668e73b30f9b67a6eb28a1953930e5c86285be2c Mon Sep 17 00:00:00 2001
From: Hazel Wright <hgw21@ic.ac.uk>
Date: Wed, 14 Jun 2023 14:34:25 +0100
Subject: [PATCH 02/17] Created new activity CommitteeProfileActivity.

---
 app/src/main/AndroidManifest.xml              |   6 +-
 .../example/drp25/CommitteeProfileActivity.kt |  11 ++
 .../res/layout/activity_committee_profile.xml | 177 ++++++++++++++++++
 3 files changed, 193 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/com/example/drp25/CommitteeProfileActivity.kt
 create mode 100644 app/src/main/res/layout/activity_committee_profile.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c131309..e267593 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,7 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.example.drp25">
-    <uses-permission android:name="android.permission.INTERNET"/>
+
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <application
         android:allowBackup="true"
@@ -13,6 +14,9 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.DRP25"
         tools:targetApi="31">
+        <activity
+            android:name=".CommitteeProfileActivity"
+            android:exported="false" />
         <activity
             android:name=".SplashScreenActivity"
             android:exported="false">
diff --git a/app/src/main/java/com/example/drp25/CommitteeProfileActivity.kt b/app/src/main/java/com/example/drp25/CommitteeProfileActivity.kt
new file mode 100644
index 0000000..beaaf86
--- /dev/null
+++ b/app/src/main/java/com/example/drp25/CommitteeProfileActivity.kt
@@ -0,0 +1,11 @@
+package com.example.drp25
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+
+class CommitteeProfileActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_committee_profile)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_committee_profile.xml b/app/src/main/res/layout/activity_committee_profile.xml
new file mode 100644
index 0000000..92df134
--- /dev/null
+++ b/app/src/main/res/layout/activity_committee_profile.xml
@@ -0,0 +1,177 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".CommitteeProfileActivity">
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/profile_toolbar"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:background="?attr/colorPrimary"
+        android:minHeight="?attr/actionBarSize"
+        android:theme="?attr/actionBarTheme"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <Button
+            android:id="@+id/profile_back_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/button_send"
+            android:text="@string/back_button"
+            android:textAlignment="viewStart"
+            android:outlineProvider="none"/>
+
+        <!-- Determined by user profile. -->
+        <TextView
+            android:id="@+id/name_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:layout_marginEnd="@dimen/text_margin_16"
+            android:textSize="24sp"
+            android:textColor="@color/white"/>
+
+    </androidx.appcompat.widget.Toolbar>
+
+    <ScrollView
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/profile_toolbar">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="parent"
+            app:layout_constraintEnd_toStartOf="parent">
+
+            <!-- Determined by user profile. -->
+            <ImageView
+                android:id="@+id/profileImageView"
+                android:layout_width="125dp"
+                android:layout_height="125dp"
+                android:scaleType="centerCrop"
+                android:src="@drawable/stream_ui_picture_placeholder"
+                android:contentDescription="@string/profile_picture_descr"
+                android:layout_gravity="center"
+                android:layout_margin="@dimen/text_margin_32"/>
+
+            <Button
+                android:id="@+id/uploadButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/profile_picture"
+                android:layout_gravity="center"
+                android:layout_margin="@dimen/text_margin_32"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/text_margin_32"
+                android:layout_marginTop="@dimen/text_margin_32"
+                android:layout_marginBottom="@dimen/text_margin_16"
+                android:text="@string/personal_info"
+                android:textSize="24sp"/>
+
+            <!-- Determined by user profile. -->
+            <TextView
+                android:id="@+id/personal_info_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/text_margin_32"
+                android:layout_marginRight="@dimen/text_margin_32"
+                android:textSize="20sp"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/text_margin_32"
+                    android:layout_marginTop="@dimen/text_margin_32"
+                    android:layout_marginBottom="@dimen/text_margin_16"
+                    android:text="@string/interests"
+                    android:textSize="28sp"/>
+
+                <Button
+                    android:id="@+id/update_interests_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_margin="@dimen/text_margin_32"
+                    android:layout_marginHorizontal="@dimen/text_margin_32"
+                    android:layout_marginTop="@dimen/text_margin_32"
+                    android:layout_marginBottom="@dimen/text_margin_16"
+                    android:text="@string/update"
+                    android:textSize="16sp" />
+
+            </LinearLayout>
+
+            <!-- Determined by user profile. -->
+
+            <TableLayout
+                android:id="@+id/interests_table"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/text_margin_32"
+                android:layout_marginRight="@dimen/text_margin_32">
+            </TableLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/text_margin_32"
+                android:layout_marginTop="@dimen/text_margin_32"
+                android:layout_marginBottom="@dimen/text_margin_16"
+                android:text="@string/stamps"
+                android:textSize="28sp"/>
+
+            <!-- Determined by user stamps. -->
+
+            <TextView
+                android:id="@+id/no_stamps_prompt"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/text_margin_32"
+                android:layout_marginRight="@dimen/text_margin_32"
+                android:text="@string/stamps_prompt"
+                android:textSize="20sp"
+                android:textAlignment="center"
+                android:visibility="gone"/>
+
+            <LinearLayout
+                android:id="@+id/stamp_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/text_margin_32"
+                android:layout_marginRight="@dimen/text_margin_32"
+                android:orientation="horizontal"
+                android:visibility="gone"/>
+
+            <Button
+                android:id="@+id/profile_match_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/text_margin_32"
+                android:layout_gravity="center"
+                android:text="@string/meet_someone_button"
+                android:textSize="24sp" />
+
+        </LinearLayout>
+
+    </ScrollView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From a43ee48cd19955e9ad471a246f09392be24c9bb8 Mon Sep 17 00:00:00 2001
From: tda21 <tda21@ic.ac.uk>
Date: Wed, 14 Jun 2023 14:44:43 +0100
Subject: [PATCH 03/17] Committee button added to user profile page

---
 .../main/java/com/example/drp25/ChatActivity.kt   |  4 ++++
 app/src/main/res/layout/activity_user.xml         | 15 ++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/example/drp25/ChatActivity.kt b/app/src/main/java/com/example/drp25/ChatActivity.kt
index ec96a4e..226beee 100644
--- a/app/src/main/java/com/example/drp25/ChatActivity.kt
+++ b/app/src/main/java/com/example/drp25/ChatActivity.kt
@@ -150,6 +150,10 @@ class ChatActivity : AppCompatActivity() {
             startActivity(intent)
         }
 
+        binding.channelListHeaderView.setOnTitleLongClickListener {
+            // Broadcast to all channels.
+            //val intent = Intent(this, )
+        }
         setContentView(binding.root)
 
         binding.channelListHeaderView.setOnlineTitle("Globe Chatter")
diff --git a/app/src/main/res/layout/activity_user.xml b/app/src/main/res/layout/activity_user.xml
index 93dc34b..e9aaef8 100644
--- a/app/src/main/res/layout/activity_user.xml
+++ b/app/src/main/res/layout/activity_user.xml
@@ -14,8 +14,9 @@
         android:text="@string/enter_as_max"
         app:layout_constraintBottom_toTopOf="@+id/enter_kevin_button"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.496"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="@id/committee" />
 
     <Button
         android:id="@+id/enter_kevin_button"
@@ -28,4 +29,16 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/enter_max_button" />
 
+    <Button
+        android:id="@+id/committee"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="36dp"
+        android:backgroundTint="#9ACD32"
+        android:text="Enter as a committe member"
+        app:layout_constraintBottom_toTopOf="@+id/enter_max_button"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 1d986b3f5842e4a4779967d21775d6a91f9735be Mon Sep 17 00:00:00 2001
From: Hazel Wright <hgw21@ic.ac.uk>
Date: Wed, 14 Jun 2023 14:54:25 +0100
Subject: [PATCH 04/17] Added new activity CommitteeEventsActivity.

---
 app/src/main/AndroidManifest.xml              |  3 +
 .../example/drp25/CommitteeEventsActivity.kt  | 11 +++
 .../res/layout/activity_committee_events.xml  | 63 +++++++++++++
 .../res/layout/activity_committee_profile.xml | 88 ++++++-------------
 4 files changed, 104 insertions(+), 61 deletions(-)
 create mode 100644 app/src/main/java/com/example/drp25/CommitteeEventsActivity.kt
 create mode 100644 app/src/main/res/layout/activity_committee_events.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e267593..faa48d5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,6 +14,9 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.DRP25"
         tools:targetApi="31">
+        <activity
+            android:name=".CommitteeEventsActivity"
+            android:exported="false" />
         <activity
             android:name=".CommitteeProfileActivity"
             android:exported="false" />
diff --git a/app/src/main/java/com/example/drp25/CommitteeEventsActivity.kt b/app/src/main/java/com/example/drp25/CommitteeEventsActivity.kt
new file mode 100644
index 0000000..8bc003c
--- /dev/null
+++ b/app/src/main/java/com/example/drp25/CommitteeEventsActivity.kt
@@ -0,0 +1,11 @@
+package com.example.drp25
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+
+class CommitteeEventsActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_committee_events)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_committee_events.xml b/app/src/main/res/layout/activity_committee_events.xml
new file mode 100644
index 0000000..f92c90f
--- /dev/null
+++ b/app/src/main/res/layout/activity_committee_events.xml
@@ -0,0 +1,63 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".CommitteeEventsActivity">
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/profile_toolbar"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:background="@color/stream_ui_literal_transparent"
+        android:minHeight="?attr/actionBarSize"
+        android:theme="?attr/actionBarTheme"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <Button
+            android:id="@+id/profile_back_button"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_margin="@dimen/margin_16"
+            android:background="@drawable/arrow_back"
+            android:contentDescription="@string/back_to_chats"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <!-- Determined by user profile. -->
+        <TextView
+            android:id="@+id/name_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:layout_marginEnd="@dimen/text_margin_16"
+            android:textColor="@color/stream_ui_black"
+            android:textSize="24sp" />
+
+    </androidx.appcompat.widget.Toolbar>
+
+    <ScrollView
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/profile_toolbar">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="parent"
+            app:layout_constraintEnd_toStartOf="parent">
+
+        </LinearLayout>
+
+    </ScrollView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_committee_profile.xml b/app/src/main/res/layout/activity_committee_profile.xml
index 92df134..a42fc4d 100644
--- a/app/src/main/res/layout/activity_committee_profile.xml
+++ b/app/src/main/res/layout/activity_committee_profile.xml
@@ -10,7 +10,7 @@
         android:id="@+id/profile_toolbar"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:background="?attr/colorPrimary"
+        android:background="@color/stream_ui_literal_transparent"
         android:minHeight="?attr/actionBarSize"
         android:theme="?attr/actionBarTheme"
         app:layout_constraintEnd_toEndOf="parent"
@@ -19,12 +19,13 @@
 
         <Button
             android:id="@+id/profile_back_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="@dimen/button_send"
-            android:text="@string/back_button"
-            android:textAlignment="viewStart"
-            android:outlineProvider="none"/>
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_margin="@dimen/margin_16"
+            android:background="@drawable/arrow_back"
+            android:contentDescription="@string/back_to_chats"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <!-- Determined by user profile. -->
         <TextView
@@ -33,8 +34,8 @@
             android:layout_height="wrap_content"
             android:layout_gravity="end"
             android:layout_marginEnd="@dimen/text_margin_16"
-            android:textSize="24sp"
-            android:textColor="@color/white"/>
+            android:textColor="@color/stream_ui_black"
+            android:textSize="24sp" />
 
     </androidx.appcompat.widget.Toolbar>
 
@@ -58,8 +59,8 @@
             <!-- Determined by user profile. -->
             <ImageView
                 android:id="@+id/profileImageView"
-                android:layout_width="125dp"
-                android:layout_height="125dp"
+                android:layout_width="148dp"
+                android:layout_height="148dp"
                 android:scaleType="centerCrop"
                 android:src="@drawable/stream_ui_picture_placeholder"
                 android:contentDescription="@string/profile_picture_descr"
@@ -70,9 +71,10 @@
                 android:id="@+id/uploadButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/profile_picture"
-                android:layout_gravity="center"
-                android:layout_margin="@dimen/text_margin_32"/>
+                android:backgroundTint="@color/stream_ui_blue_alice"
+                android:textColor="@color/stream_ui_accent_blue"
+                android:text="@string/upload_profile_picture"
+                android:layout_gravity="center" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -81,6 +83,7 @@
                 android:layout_marginTop="@dimen/text_margin_32"
                 android:layout_marginBottom="@dimen/text_margin_16"
                 android:text="@string/personal_info"
+                android:textColor="@color/black"
                 android:textSize="24sp"/>
 
             <!-- Determined by user profile. -->
@@ -95,27 +98,30 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:layout_marginTop="@dimen/text_margin_32"
                 android:orientation="horizontal">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:minHeight="48dp"
+                    android:gravity="center_vertical"
                     android:layout_marginHorizontal="@dimen/text_margin_32"
-                    android:layout_marginTop="@dimen/text_margin_32"
-                    android:layout_marginBottom="@dimen/text_margin_16"
+                    android:layout_marginTop="0dp"
                     android:text="@string/interests"
-                    android:textSize="28sp"/>
+                    android:textColor="@color/black"
+                    android:textSize="24sp"/>
 
                 <Button
                     android:id="@+id/update_interests_button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:layout_margin="@dimen/text_margin_32"
-                    android:layout_marginHorizontal="@dimen/text_margin_32"
-                    android:layout_marginTop="@dimen/text_margin_32"
-                    android:layout_marginBottom="@dimen/text_margin_16"
+                    android:layout_marginHorizontal="0dp"
+                    android:layout_marginTop="0dp"
                     android:text="@string/update"
+                    android:textColor="@color/stream_ui_accent_blue"
+                    android:backgroundTint="@color/stream_ui_blue_alice"
                     android:textSize="16sp" />
 
             </LinearLayout>
@@ -130,46 +136,6 @@
                 android:layout_marginRight="@dimen/text_margin_32">
             </TableLayout>
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/text_margin_32"
-                android:layout_marginTop="@dimen/text_margin_32"
-                android:layout_marginBottom="@dimen/text_margin_16"
-                android:text="@string/stamps"
-                android:textSize="28sp"/>
-
-            <!-- Determined by user stamps. -->
-
-            <TextView
-                android:id="@+id/no_stamps_prompt"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/text_margin_32"
-                android:layout_marginRight="@dimen/text_margin_32"
-                android:text="@string/stamps_prompt"
-                android:textSize="20sp"
-                android:textAlignment="center"
-                android:visibility="gone"/>
-
-            <LinearLayout
-                android:id="@+id/stamp_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/text_margin_32"
-                android:layout_marginRight="@dimen/text_margin_32"
-                android:orientation="horizontal"
-                android:visibility="gone"/>
-
-            <Button
-                android:id="@+id/profile_match_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/text_margin_32"
-                android:layout_gravity="center"
-                android:text="@string/meet_someone_button"
-                android:textSize="24sp" />
-
         </LinearLayout>
 
     </ScrollView>

From 695aea5529a084dba3b665372098ef446d387ffc Mon Sep 17 00:00:00 2001
From: Hazel Wright <hgw21@ic.ac.uk>
Date: Wed, 14 Jun 2023 15:56:47 +0100
Subject: [PATCH 05/17] Implemented events page layout.

---
 .../java/com/example/drp25/UserActivity.kt    |   7 +-
 .../res/layout/activity_committee_events.xml  | 118 +++++++++++++++++-
 app/src/main/res/layout/activity_user.xml     |  15 ++-
 app/src/main/res/values/dimens.xml            |   1 +
 app/src/main/res/values/strings.xml           |  21 +++-
 5 files changed, 144 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/example/drp25/UserActivity.kt b/app/src/main/java/com/example/drp25/UserActivity.kt
index ae6ae63..77d79cf 100644
--- a/app/src/main/java/com/example/drp25/UserActivity.kt
+++ b/app/src/main/java/com/example/drp25/UserActivity.kt
@@ -3,7 +3,6 @@ package com.example.drp25
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import android.util.Log
 import android.widget.Button
 import com.example.drp25.ChatActivity.Companion.setCurrentUser
 
@@ -17,6 +16,7 @@ class UserActivity : AppCompatActivity() {
 
         val maxButton = findViewById<Button>(R.id.enter_max_button)
         val kevinButton = findViewById<Button>(R.id.enter_kevin_button)
+        val committeeButton = findViewById<Button>(R.id.enter_committee_button)
 
         maxButton.setOnClickListener {
             USER_ID = "-NXPnWs-phdiaSN_S87V"
@@ -33,5 +33,10 @@ class UserActivity : AppCompatActivity() {
             val intent = Intent(this, ChatActivity::class.java)
             startActivity(intent)
         }
+
+        committeeButton.setOnClickListener {
+            val intent = Intent(this, CommitteeEventsActivity::class.java)
+            startActivity(intent)
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_committee_events.xml b/app/src/main/res/layout/activity_committee_events.xml
index f92c90f..f11fb33 100644
--- a/app/src/main/res/layout/activity_committee_events.xml
+++ b/app/src/main/res/layout/activity_committee_events.xml
@@ -7,7 +7,7 @@
     tools:context=".CommitteeEventsActivity">
 
     <androidx.appcompat.widget.Toolbar
-        android:id="@+id/profile_toolbar"
+        android:id="@+id/committee_profile_toolbar"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:background="@color/stream_ui_literal_transparent"
@@ -22,21 +22,31 @@
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_margin="@dimen/margin_16"
-            android:background="@drawable/arrow_back"
-            android:contentDescription="@string/back_to_chats"
+            android:background="@drawable/stream_ui_icon_picture_placeholder"
+            android:contentDescription="@string/events_to_profile"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <!-- Determined by user profile. -->
+        <!-- Determined by committee profile. -->
         <TextView
             android:id="@+id/name_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="end"
+            android:layout_gravity="center"
             android:layout_marginEnd="@dimen/text_margin_16"
+            android:text="@string/events_page_title"
             android:textColor="@color/stream_ui_black"
             android:textSize="24sp" />
 
+        <Button
+            android:id="@+id/new_event_button"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_margin="@dimen/margin_16"
+            android:layout_gravity="end"
+            android:background="@drawable/stream_ui_ic_pen"
+            android:contentDescription="@string/back_to_chats" />
+
     </androidx.appcompat.widget.Toolbar>
 
     <ScrollView
@@ -45,7 +55,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/profile_toolbar">
+        app:layout_constraintTop_toBottomOf="@id/committee_profile_toolbar">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -56,6 +66,102 @@
             app:layout_constraintStart_toEndOf="parent"
             app:layout_constraintEnd_toStartOf="parent">
 
+            <androidx.cardview.widget.CardView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginHorizontal="@dimen/margin_16"
+                android:layout_marginVertical="@dimen/margin_8" >
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_margin="@dimen/text_margin_32"
+                    android:orientation="vertical" >
+
+                    <!-- Event name and broadcast button. -->
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginEnd="@dimen/text_margin_32"
+                            android:layout_marginTop="0dp"
+                            android:layout_centerVertical="true"
+                            android:text="@string/event_name"
+                            android:textColor="@color/black"
+                            android:textSize="24sp"/>
+
+                        <Button
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentEnd="true"
+                            android:backgroundTint="@color/stream_ui_blue_alice"
+                            android:text="@string/broadcast_event"
+                            android:textColor="@color/stream_ui_accent_blue"
+                            android:textSize="16sp"/>
+
+                    </RelativeLayout>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/event_descr"/>
+
+                </LinearLayout>
+
+            </androidx.cardview.widget.CardView>
+
+            <androidx.cardview.widget.CardView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginHorizontal="@dimen/margin_16"
+                android:layout_marginVertical="@dimen/margin_8" >
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_margin="@dimen/text_margin_32"
+                    android:orientation="vertical" >
+
+                    <!-- Event name and broadcast button. -->
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginEnd="@dimen/text_margin_32"
+                            android:layout_marginTop="0dp"
+                            android:layout_centerVertical="true"
+                            android:text="@string/event_name"
+                            android:textColor="@color/black"
+                            android:textSize="24sp"/>
+
+                        <Button
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentEnd="true"
+                            android:backgroundTint="@color/stream_ui_blue_alice"
+                            android:text="@string/broadcast_event"
+                            android:textColor="@color/stream_ui_accent_blue"
+                            android:textSize="16sp"/>
+
+                    </RelativeLayout>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/event_descr"/>
+
+                </LinearLayout>
+
+            </androidx.cardview.widget.CardView>
+
         </LinearLayout>
 
     </ScrollView>
diff --git a/app/src/main/res/layout/activity_user.xml b/app/src/main/res/layout/activity_user.xml
index e9aaef8..8cfda84 100644
--- a/app/src/main/res/layout/activity_user.xml
+++ b/app/src/main/res/layout/activity_user.xml
@@ -16,7 +16,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.496"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/committee" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <Button
         android:id="@+id/enter_kevin_button"
@@ -24,21 +24,20 @@
         android:layout_height="wrap_content"
         android:backgroundTint="#1F7AC3"
         android:text="@string/enter_as_kevin"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toBottomOf="@id/enter_committee_button"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/enter_max_button" />
 
     <Button
-        android:id="@+id/committee"
+        android:id="@+id/enter_committee_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="36dp"
-        android:backgroundTint="#9ACD32"
-        android:text="Enter as a committe member"
-        app:layout_constraintBottom_toTopOf="@+id/enter_max_button"
+        android:backgroundTint="#74A119"
+        android:text="@string/enter_as_committee"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@id/enter_kevin_button" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 5c39f8e..a128f18 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,5 +1,6 @@
 <resources>
     <dimen name="button_send">24dp</dimen>
+    <dimen name="margin_8">8dp</dimen>
     <dimen name="margin_16">16dp</dimen>
     <dimen name="text_margin_16">16dp</dimen>
     <dimen name="text_margin_32">32dp</dimen>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9976fdb..2ad16b5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,6 +6,11 @@
     <string name="meet_someone_button">meet someone new!</string>
     <string name="back_button">back</string>
 
+    <!-- Login Page -->
+    <string name="enter_as_committee">Enter as committee member</string>
+    <string name="enter_as_max">Enter as MAX</string>
+    <string name="enter_as_kevin">Enter as KEVIN</string>
+
     <!-- Match Page -->
     <string name="match_matched">matched!</string>
     <string name="match_caption">Swipe to see your matches.</string>
@@ -16,6 +21,7 @@
 
     <!--Interest selection page-->
     <string name="interest_prompt">Enter new interest</string>
+    <string name="back_to_profile">back to profile</string>
 
     <!-- User Profile Page -->
     <string name="upload_profile_picture">Upload Profile Picture</string>
@@ -28,6 +34,18 @@
     <string name="profile_picture_descr">profile picture placeholder</string>
     <string name="rating_descr">interest level rating</string>
 
+    <!-- Committee Profile Page -->
+
+    <!-- Committee Events Page -->
+    <string name="events_page_title">Upcoming Events</string>
+    <string name="broadcast_event">Broadcast</string>
+    <!-- Necessary Content Descriptions -->
+    <string name="events_to_profile">to profile page</string>
+
+    <!-- Hardcoded Content -->
+    <string name="event_name">Event</string>
+    <string name="event_descr">Description of the event.</string>
+
     <string name="lorem_ipsum">
         Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam in scelerisque sem. Mauris
         volutpat, dolor id interdum ullamcorper, risus dolor egestas lectus, sit amet mattis purus
@@ -69,8 +87,6 @@
     <string name="select_interest_s">Select interest(s)</string>
     <string name="update">Update</string>
     <string name="add_new_interest">Add new interest</string>
-    <string name="enter_as_max">Enter as MAX</string>
-    <string name="enter_as_kevin">Enter as KEVIN</string>
     <string-array name="interest_array">
         <item>Anime</item>
         <item>Archery</item>
@@ -214,7 +230,6 @@
         "when a user tries to pick up one of cards.\n\n"
     </string>
     <string name="action_settings">Settings</string>
-    <string name="back_to_profile">back to profile</string>
     <string name="please_choose_remove_your_interests_from_the_list_below">Please choose / remove your interests.</string>
     <string name="app_logo">app logo</string>
 </resources>
\ No newline at end of file

From c47ea188bbc21b92e140f73ee928419a250191ed Mon Sep 17 00:00:00 2001
From: Hazel Wright <hgw21@ic.ac.uk>
Date: Wed, 14 Jun 2023 16:12:54 +0100
Subject: [PATCH 06/17] Implemented functionality for buttons, so it's possible
 to navigate through committee activities.

---
 .../com/example/drp25/CommitteeEventsActivity.kt    | 13 +++++++++++++
 .../com/example/drp25/CommitteeProfileActivity.kt   |  8 ++++++++
 .../main/res/layout/activity_committee_events.xml   |  2 +-
 .../main/res/layout/activity_committee_profile.xml  |  2 +-
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/example/drp25/CommitteeEventsActivity.kt b/app/src/main/java/com/example/drp25/CommitteeEventsActivity.kt
index 8bc003c..a4f4fde 100644
--- a/app/src/main/java/com/example/drp25/CommitteeEventsActivity.kt
+++ b/app/src/main/java/com/example/drp25/CommitteeEventsActivity.kt
@@ -1,11 +1,24 @@
 package com.example.drp25
 
+import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.widget.Button
 
 class CommitteeEventsActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_committee_events)
+
+        val toProfile = findViewById<Button>(R.id.to_profile_button)
+        toProfile.setOnClickListener {
+            val intent = Intent(this, CommitteeProfileActivity::class.java)
+            startActivity(intent)
+        }
+
+        val newEvent = findViewById<Button>(R.id.new_event_button)
+        newEvent.setOnClickListener {
+            // Create new card & populate
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/drp25/CommitteeProfileActivity.kt b/app/src/main/java/com/example/drp25/CommitteeProfileActivity.kt
index beaaf86..16b1ba8 100644
--- a/app/src/main/java/com/example/drp25/CommitteeProfileActivity.kt
+++ b/app/src/main/java/com/example/drp25/CommitteeProfileActivity.kt
@@ -1,11 +1,19 @@
 package com.example.drp25
 
+import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.widget.Button
 
 class CommitteeProfileActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_committee_profile)
+
+        val backButton = findViewById<Button>(R.id.committee_profile_back_button)
+        backButton.setOnClickListener {
+            val intent = Intent(this, CommitteeEventsActivity::class.java)
+            startActivity(intent)
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_committee_events.xml b/app/src/main/res/layout/activity_committee_events.xml
index f11fb33..9869aa7 100644
--- a/app/src/main/res/layout/activity_committee_events.xml
+++ b/app/src/main/res/layout/activity_committee_events.xml
@@ -18,7 +18,7 @@
         app:layout_constraintTop_toTopOf="parent">
 
         <Button
-            android:id="@+id/profile_back_button"
+            android:id="@+id/to_profile_button"
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_margin="@dimen/margin_16"
diff --git a/app/src/main/res/layout/activity_committee_profile.xml b/app/src/main/res/layout/activity_committee_profile.xml
index a42fc4d..6ede0f8 100644
--- a/app/src/main/res/layout/activity_committee_profile.xml
+++ b/app/src/main/res/layout/activity_committee_profile.xml
@@ -18,7 +18,7 @@
         app:layout_constraintTop_toTopOf="parent">
 
         <Button
-            android:id="@+id/profile_back_button"
+            android:id="@+id/committee_profile_back_button"
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_margin="@dimen/margin_16"

From 3ef9cdae3cf06372ca6df5a9b95774971a23924f Mon Sep 17 00:00:00 2001
From: Hazel Wright <hgw21@ic.ac.uk>
Date: Wed, 14 Jun 2023 16:53:44 +0100
Subject: [PATCH 07/17] Implemented new event button to generate (hardcoded)
 new event.

---
 .../example/drp25/CommitteeEventsActivity.kt  | 21 ++++++++-
 .../res/layout/activity_committee_events.xml  |  9 ++--
 .../main/res/layout/committee_event_view.xml  | 47 +++++++++++++++++++
 app/src/main/res/layout/stamp_view.xml        |  2 +-
 app/src/main/res/values/strings.xml           |  3 ++
 5 files changed, 76 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/res/layout/committee_event_view.xml

diff --git a/app/src/main/java/com/example/drp25/CommitteeEventsActivity.kt b/app/src/main/java/com/example/drp25/CommitteeEventsActivity.kt
index a4f4fde..baeadab 100644
--- a/app/src/main/java/com/example/drp25/CommitteeEventsActivity.kt
+++ b/app/src/main/java/com/example/drp25/CommitteeEventsActivity.kt
@@ -3,22 +3,41 @@ package com.example.drp25
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.widget.Button
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.cardview.widget.CardView
+import androidx.core.view.allViews
 
 class CommitteeEventsActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_committee_events)
 
+        /* Functionality to reach profile page from events (home) page. */
         val toProfile = findViewById<Button>(R.id.to_profile_button)
         toProfile.setOnClickListener {
             val intent = Intent(this, CommitteeProfileActivity::class.java)
             startActivity(intent)
         }
 
+        /* LinearLayout containing the content. */
+        val eventsList = findViewById<LinearLayout>(R.id.committee_events)
+        /* Functionality for the New Event button. */
         val newEvent = findViewById<Button>(R.id.new_event_button)
         newEvent.setOnClickListener {
-            // Create new card & populate
+            val inflater = LayoutInflater.from(this@CommitteeEventsActivity)
+            val eventCard = inflater.inflate(
+                R.layout.committee_event_view, eventsList, false
+            ) as CardView
+            /* Sets the event title and description using predefined string
+             * resources. Modify to retrieve user-inputted text, if necessary. */
+            eventCard.findViewById<TextView>(R.id.new_event_title).text =
+                resources.getString(R.string.new_event_name)
+            eventCard.findViewById<TextView>(R.id.new_event_descr).text =
+                resources.getString(R.string.new_event_descr)
+            eventsList.addView(eventCard)
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_committee_events.xml b/app/src/main/res/layout/activity_committee_events.xml
index 9869aa7..2de5996 100644
--- a/app/src/main/res/layout/activity_committee_events.xml
+++ b/app/src/main/res/layout/activity_committee_events.xml
@@ -58,6 +58,7 @@
         app:layout_constraintTop_toBottomOf="@id/committee_profile_toolbar">
 
         <LinearLayout
+            android:id="@+id/committee_events"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
@@ -68,7 +69,7 @@
 
             <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/margin_16"
                 android:layout_marginVertical="@dimen/margin_8" >
 
@@ -81,7 +82,7 @@
                     <!-- Event name and broadcast button. -->
                     <RelativeLayout
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent"
+                        android:layout_height="wrap_content"
                         android:orientation="horizontal">
 
                         <TextView
@@ -116,7 +117,7 @@
 
             <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/margin_16"
                 android:layout_marginVertical="@dimen/margin_8" >
 
@@ -129,7 +130,7 @@
                     <!-- Event name and broadcast button. -->
                     <RelativeLayout
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent"
+                        android:layout_height="wrap_content"
                         android:orientation="horizontal">
 
                         <TextView
diff --git a/app/src/main/res/layout/committee_event_view.xml b/app/src/main/res/layout/committee_event_view.xml
new file mode 100644
index 0000000..5cbb892
--- /dev/null
+++ b/app/src/main/res/layout/committee_event_view.xml
@@ -0,0 +1,47 @@
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/margin_16"
+    android:layout_marginVertical="@dimen/margin_8">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_margin="@dimen/text_margin_32"
+            android:orientation="vertical" >
+
+            <!-- Event name and broadcast button. -->
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/new_event_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="@dimen/text_margin_32"
+                    android:layout_marginTop="0dp"
+                    android:layout_centerVertical="true"
+                    android:textColor="@color/black"
+                    android:textSize="24sp"/>
+
+                <Button
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:backgroundTint="@color/stream_ui_blue_alice"
+                    android:text="@string/broadcast_event"
+                    android:textColor="@color/stream_ui_accent_blue"
+                    android:textSize="16sp"/>
+
+            </RelativeLayout>
+
+            <TextView
+                android:id="@+id/new_event_descr"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+
+        </LinearLayout>
+
+    </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/stamp_view.xml b/app/src/main/res/layout/stamp_view.xml
index 5c106d2..8075e75 100644
--- a/app/src/main/res/layout/stamp_view.xml
+++ b/app/src/main/res/layout/stamp_view.xml
@@ -3,7 +3,7 @@
     android:layout_height="125dp"
     android:scaleType="centerCrop"
     android:layout_margin="@dimen/margin_16"
-    android:contentDescription="stamp image view"
+    android:contentDescription="@string/stamp_view_descr"
     android:scaleX="0.75"
     android:scaleY="0.75"
 />
\ 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 2ad16b5..888469d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -18,6 +18,7 @@
     <string name="match_send_button">send</string>
     <!-- Necessary Content Description(s) -->
     <string name="matches_descr">matches display</string>
+    <string name="stamp_view_descr">stamp image view</string>
 
     <!--Interest selection page-->
     <string name="interest_prompt">Enter new interest</string>
@@ -45,6 +46,8 @@
     <!-- Hardcoded Content -->
     <string name="event_name">Event</string>
     <string name="event_descr">Description of the event.</string>
+    <string name="new_event_name">New Event</string>
+    <string name="new_event_descr">This is the description for the new event.</string>
 
     <string name="lorem_ipsum">
         Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam in scelerisque sem. Mauris

From 935cc7d1730593c896ba58b167fe5b00bf60331e Mon Sep 17 00:00:00 2001
From: Hazel Wright <hgw21@ic.ac.uk>
Date: Wed, 14 Jun 2023 17:57:44 +0100
Subject: [PATCH 08/17] Modified layout of each event card and moved generation
 of cards into EventsActivity entirely.

---
 .../example/drp25/CommitteeEventsActivity.kt  |  17 +++
 .../res/layout/activity_committee_events.xml  |  97 -----------------
 .../res/layout/activity_committee_profile.xml | 103 +++++++++++-------
 .../main/res/layout/committee_event_view.xml  |  20 +++-
 app/src/main/res/values/strings.xml           |   9 +-
 5 files changed, 104 insertions(+), 142 deletions(-)

diff --git a/app/src/main/java/com/example/drp25/CommitteeEventsActivity.kt b/app/src/main/java/com/example/drp25/CommitteeEventsActivity.kt
index baeadab..ebe3631 100644
--- a/app/src/main/java/com/example/drp25/CommitteeEventsActivity.kt
+++ b/app/src/main/java/com/example/drp25/CommitteeEventsActivity.kt
@@ -24,6 +24,22 @@ class CommitteeEventsActivity : AppCompatActivity() {
 
         /* LinearLayout containing the content. */
         val eventsList = findViewById<LinearLayout>(R.id.committee_events)
+
+        /* Generate some static events. */
+        for (i in 1..2) {
+            val inflater = LayoutInflater.from(this)
+            val eventCard = inflater.inflate(
+                R.layout.committee_event_view, eventsList, false
+            ) as CardView
+            eventCard.findViewById<TextView>(R.id.new_event_title).text =
+                resources.getString(R.string.event_name)
+            eventCard.findViewById<TextView>(R.id.new_event_descr).text =
+                resources.getString(R.string.event_descr)
+            eventCard.findViewById<TextView>(R.id.new_event_date).text =
+                (14 + i * 5).toString() + "/06/23"
+            eventsList.addView(eventCard)
+        }
+
         /* Functionality for the New Event button. */
         val newEvent = findViewById<Button>(R.id.new_event_button)
         newEvent.setOnClickListener {
@@ -37,6 +53,7 @@ class CommitteeEventsActivity : AppCompatActivity() {
                 resources.getString(R.string.new_event_name)
             eventCard.findViewById<TextView>(R.id.new_event_descr).text =
                 resources.getString(R.string.new_event_descr)
+            eventCard.findViewById<TextView>(R.id.new_event_date).text = "29/06/23"
             eventsList.addView(eventCard)
         }
     }
diff --git a/app/src/main/res/layout/activity_committee_events.xml b/app/src/main/res/layout/activity_committee_events.xml
index 2de5996..22b3bd0 100644
--- a/app/src/main/res/layout/activity_committee_events.xml
+++ b/app/src/main/res/layout/activity_committee_events.xml
@@ -33,7 +33,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginEnd="@dimen/text_margin_16"
             android:text="@string/events_page_title"
             android:textColor="@color/stream_ui_black"
             android:textSize="24sp" />
@@ -67,102 +66,6 @@
             app:layout_constraintStart_toEndOf="parent"
             app:layout_constraintEnd_toStartOf="parent">
 
-            <androidx.cardview.widget.CardView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/margin_16"
-                android:layout_marginVertical="@dimen/margin_8" >
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_margin="@dimen/text_margin_32"
-                    android:orientation="vertical" >
-
-                    <!-- Event name and broadcast button. -->
-                    <RelativeLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginEnd="@dimen/text_margin_32"
-                            android:layout_marginTop="0dp"
-                            android:layout_centerVertical="true"
-                            android:text="@string/event_name"
-                            android:textColor="@color/black"
-                            android:textSize="24sp"/>
-
-                        <Button
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentEnd="true"
-                            android:backgroundTint="@color/stream_ui_blue_alice"
-                            android:text="@string/broadcast_event"
-                            android:textColor="@color/stream_ui_accent_blue"
-                            android:textSize="16sp"/>
-
-                    </RelativeLayout>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/event_descr"/>
-
-                </LinearLayout>
-
-            </androidx.cardview.widget.CardView>
-
-            <androidx.cardview.widget.CardView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/margin_16"
-                android:layout_marginVertical="@dimen/margin_8" >
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_margin="@dimen/text_margin_32"
-                    android:orientation="vertical" >
-
-                    <!-- Event name and broadcast button. -->
-                    <RelativeLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginEnd="@dimen/text_margin_32"
-                            android:layout_marginTop="0dp"
-                            android:layout_centerVertical="true"
-                            android:text="@string/event_name"
-                            android:textColor="@color/black"
-                            android:textSize="24sp"/>
-
-                        <Button
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentEnd="true"
-                            android:backgroundTint="@color/stream_ui_blue_alice"
-                            android:text="@string/broadcast_event"
-                            android:textColor="@color/stream_ui_accent_blue"
-                            android:textSize="16sp"/>
-
-                    </RelativeLayout>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/event_descr"/>
-
-                </LinearLayout>
-
-            </androidx.cardview.widget.CardView>
-
         </LinearLayout>
 
     </ScrollView>
diff --git a/app/src/main/res/layout/activity_committee_profile.xml b/app/src/main/res/layout/activity_committee_profile.xml
index 6ede0f8..5764109 100644
--- a/app/src/main/res/layout/activity_committee_profile.xml
+++ b/app/src/main/res/layout/activity_committee_profile.xml
@@ -34,6 +34,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="end"
             android:layout_marginEnd="@dimen/text_margin_16"
+            android:text="@string/ballet_society"
             android:textColor="@color/stream_ui_black"
             android:textSize="24sp" />
 
@@ -86,54 +87,76 @@
                 android:textColor="@color/black"
                 android:textSize="24sp"/>
 
-            <!-- Determined by user profile. -->
-            <TextView
-                android:id="@+id/personal_info_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/text_margin_32"
-                android:layout_marginRight="@dimen/text_margin_32"
-                android:textSize="20sp"/>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginTop="@dimen/text_margin_32"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:minHeight="48dp"
-                    android:gravity="center_vertical"
-                    android:layout_marginHorizontal="@dimen/text_margin_32"
-                    android:layout_marginTop="0dp"
-                    android:text="@string/interests"
-                    android:textColor="@color/black"
-                    android:textSize="24sp"/>
-
-                <Button
-                    android:id="@+id/update_interests_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginHorizontal="0dp"
-                    android:layout_marginTop="0dp"
-                    android:text="@string/update"
-                    android:textColor="@color/stream_ui_accent_blue"
-                    android:backgroundTint="@color/stream_ui_blue_alice"
-                    android:textSize="16sp" />
-
-            </LinearLayout>
+<!--            <LinearLayout-->
+<!--                android:layout_width="match_parent"-->
+<!--                android:layout_height="match_parent"-->
+<!--                android:layout_marginTop="@dimen/text_margin_32"-->
+<!--                android:orientation="horizontal">-->
+
+<!--                <TextView-->
+<!--                    android:layout_width="wrap_content"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:minHeight="48dp"-->
+<!--                    android:gravity="center_vertical"-->
+<!--                    android:layout_marginHorizontal="@dimen/text_margin_32"-->
+<!--                    android:layout_marginTop="0dp"-->
+<!--                    android:text="@string/interests"-->
+<!--                    android:textColor="@color/black"-->
+<!--                    android:textSize="24sp"/>-->
+
+<!--                <Button-->
+<!--                    android:id="@+id/update_interests_button"-->
+<!--                    android:layout_width="wrap_content"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_gravity="center"-->
+<!--                    android:layout_marginHorizontal="0dp"-->
+<!--                    android:layout_marginTop="0dp"-->
+<!--                    android:text="@string/update"-->
+<!--                    android:textColor="@color/stream_ui_accent_blue"-->
+<!--                    android:backgroundTint="@color/stream_ui_blue_alice"-->
+<!--                    android:textSize="16sp" />-->
+
+<!--            </LinearLayout>-->
 
             <!-- Determined by user profile. -->
 
             <TableLayout
-                android:id="@+id/interests_table"
+                android:id="@+id/media_table"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/text_margin_32"
                 android:layout_marginRight="@dimen/text_margin_32">
+
+                <TableRow>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="@dimen/text_margin_16"
+                        android:text="@string/media_instagram"
+                        android:textSize="20sp"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/ballet_soc_insta"
+                        android:textSize="20sp"/>
+                </TableRow>
+
+                <TableRow>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="@dimen/text_margin_16"
+                        android:text="@string/media_email"
+                        android:textSize="20sp"/>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/ballet_soc_email"
+                        android:textSize="20sp"/>
+                </TableRow>
+
             </TableLayout>
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/committee_event_view.xml b/app/src/main/res/layout/committee_event_view.xml
index 5cbb892..e98d0b0 100644
--- a/app/src/main/res/layout/committee_event_view.xml
+++ b/app/src/main/res/layout/committee_event_view.xml
@@ -17,16 +17,18 @@
                 android:orientation="horizontal">
 
                 <TextView
-                    android:id="@+id/new_event_title"
+                    android:id="@+id/new_event_date"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="@dimen/text_margin_32"
                     android:layout_marginTop="0dp"
                     android:layout_centerVertical="true"
-                    android:textColor="@color/black"
-                    android:textSize="24sp"/>
+                    android:layout_alignParentStart="true"
+                    android:layout_toStartOf="@id/broadcast_button"
+                    android:textSize="20sp"/>
 
                 <Button
+                    android:id="@+id/broadcast_button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
@@ -37,10 +39,20 @@
 
             </RelativeLayout>
 
+            <TextView
+                android:id="@+id/new_event_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/text_margin_32"
+                android:layout_marginTop="@dimen/text_margin_16"
+                android:textColor="@color/black"
+                android:textSize="24sp"/>
+
             <TextView
                 android:id="@+id/new_event_descr"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content"
+                android:layout_marginVertical="@dimen/text_margin_16"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 888469d..8c3ced0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -36,6 +36,12 @@
     <string name="rating_descr">interest level rating</string>
 
     <!-- Committee Profile Page -->
+    <string name="media_instagram">Instagram</string>
+    <string name="media_email">Email</string>
+    <!-- Hardcoded Content -->
+    <string name="ballet_society">BalletSoc</string>
+    <string name="ballet_soc_insta">\@balletsoc</string>
+    <string name="ballet_soc_email">balletsoc\@outlook.com</string>
 
     <!-- Committee Events Page -->
     <string name="events_page_title">Upcoming Events</string>
@@ -46,7 +52,7 @@
     <!-- Hardcoded Content -->
     <string name="event_name">Event</string>
     <string name="event_descr">Description of the event.</string>
-    <string name="new_event_name">New Event</string>
+    <string name="new_event_name">This is a new event with a super long title!</string>
     <string name="new_event_descr">This is the description for the new event.</string>
 
     <string name="lorem_ipsum">
@@ -97,6 +103,7 @@
         <item>Astronomy</item>
         <item>Badminton</item>
         <item>Baking</item>
+        <item>Ballet</item>
         <item>Baseball and Softball</item>
         <item>Basketball</item>
         <item>Bridge</item>

From 91b2d5fbe0bc0c20bfdcab3d611097716d8be34b Mon Sep 17 00:00:00 2001
From: hettysymes <hettysymes@users.noreply.github.com>
Date: Thu, 15 Jun 2023 12:01:35 +0100
Subject: [PATCH 09/17] stamps retrieved from image name rather than variable
 id

---
 .../main/java/com/example/drp25/Database.kt   |  4 +--
 .../java/com/example/drp25/ProfileActivity.kt |  3 +-
 .../java/com/example/drp25/StampActivity.kt   | 28 +++++++++----------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/example/drp25/Database.kt b/app/src/main/java/com/example/drp25/Database.kt
index f29a88d..1ad6f52 100644
--- a/app/src/main/java/com/example/drp25/Database.kt
+++ b/app/src/main/java/com/example/drp25/Database.kt
@@ -14,9 +14,9 @@ private val matcher: Matcher = RatingMatcherWithNationality()
 val matches = mutableSetOf<String>()
 val matchObservers = mutableListOf<Observer>()
 
-fun sendStamp(uniId: String, userId: String, imageId: Int) {
+fun sendStamp(uniId: String, userId: String, stampName: String) {
     val stampsRef = unisRef.child(uniId).child("users").child(userId).child("stamps")
-    stampsRef.push().setValue(imageId)
+    stampsRef.push().setValue(stampName)
 }
 
 fun updatePfp(uniId: String, userId: String, filepath: String) {
diff --git a/app/src/main/java/com/example/drp25/ProfileActivity.kt b/app/src/main/java/com/example/drp25/ProfileActivity.kt
index 92164b7..4e5f4cf 100644
--- a/app/src/main/java/com/example/drp25/ProfileActivity.kt
+++ b/app/src/main/java/com/example/drp25/ProfileActivity.kt
@@ -96,7 +96,8 @@ class ProfileActivity : AppCompatActivity() {
                     for (stamp in snapshot.child("stamps").children) {
                         val inflater = LayoutInflater.from(this@ProfileActivity)
                         val imgView = inflater.inflate(R.layout.stamp_view, stampLayout, false) as ImageView
-                        stamp.getValue(Int::class.java)?.let { imgView.setImageResource(it) }
+                        val stampName = stamp.value as String
+                        imgView.setImageResource(resources.getIdentifier(stampName, "drawable", packageName))
                         stampLayout.addView(imgView)
                     }
                 } else {
diff --git a/app/src/main/java/com/example/drp25/StampActivity.kt b/app/src/main/java/com/example/drp25/StampActivity.kt
index 55f02c5..43f5bda 100644
--- a/app/src/main/java/com/example/drp25/StampActivity.kt
+++ b/app/src/main/java/com/example/drp25/StampActivity.kt
@@ -21,14 +21,14 @@ class StampActivity : AppCompatActivity() {
         val selectedMatchName:String? = intent.getStringExtra("selectedMatchName")
 
         /* Functionality for SEND -> takes user to chat page. */
-        fun send(selectedStampId: Int) {
+        fun send(selectedStamp: String) {
             val intent = Intent(this, ChatActivity::class.java)
             intent.putExtra("fromMatch", true)
             intent.putExtra("matchedName", selectedMatchName)
 
             // send the stamp
             if (selectedMatchId != null) {
-                sendStamp(UNI_ID, selectedMatchId, selectedStampId)
+                sendStamp(UNI_ID, selectedMatchId, selectedStamp)
             }
 
             Toast.makeText(this, "Stamp sent!", Toast.LENGTH_SHORT).show()
@@ -47,23 +47,23 @@ class StampActivity : AppCompatActivity() {
         nationalityRef.addValueEventListener(object: ValueEventListener{
             override fun onDataChange(snapshot: DataSnapshot) {
                 val nationality = snapshot.value as String
-                var img1: Int? = null
-                var img2: Int? = null
-                var img3: Int? = null
+                var img1: String? = null
+                var img2: String? = null
+                var img3: String? = null
 
                 if (nationality == "Chinese") {
-                    img1 = R.drawable.china_flag_stamp
-                    img2 = R.drawable.china_tourist_stamp
-                    img3 = R.drawable.china_food_stamp
+                    img1 = "china_flag_stamp"
+                    img2 = "china_tourist_stamp"
+                    img3 = "china_food_stamp"
                 } else {
-                    img1 = R.drawable.britain_flag_stamp
-                    img2 = R.drawable.britain_tourist_stamp
-                    img3 = R.drawable.britain_food_stamp
+                    img1 = "britain_flag_stamp"
+                    img2 = "britain_tourist_stamp"
+                    img3 = "britain_food_stamp"
                 }
 
-                stamp1.setImageResource(img1)
-                stamp2.setImageResource(img2)
-                stamp3.setImageResource(img3)
+                stamp1.setImageResource(resources.getIdentifier(img1, "drawable", packageName))
+                stamp2.setImageResource(resources.getIdentifier(img2, "drawable", packageName))
+                stamp3.setImageResource(resources.getIdentifier(img3, "drawable", packageName))
 
                 stamp1.setOnClickListener{
                     send(img1)

From 4118f5ceae34438a5905be1f5d9d8df277fd7072 Mon Sep 17 00:00:00 2001
From: Michelle Lo <lomichelle42@gmail.com>
Date: Thu, 15 Jun 2023 12:13:42 +0100
Subject: [PATCH 10/17] Dynamically display list of activities

---
 .../example/drp25/CommitteeEventsActivity.kt  | 62 ++++++++++---------
 .../main/java/com/example/drp25/Database.kt   | 16 +++--
 2 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/app/src/main/java/com/example/drp25/CommitteeEventsActivity.kt b/app/src/main/java/com/example/drp25/CommitteeEventsActivity.kt
index ebe3631..e7a55dc 100644
--- a/app/src/main/java/com/example/drp25/CommitteeEventsActivity.kt
+++ b/app/src/main/java/com/example/drp25/CommitteeEventsActivity.kt
@@ -4,11 +4,14 @@ import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.LayoutInflater
-import android.widget.Button
-import android.widget.LinearLayout
-import android.widget.TextView
+import android.view.View
+import android.widget.*
 import androidx.cardview.widget.CardView
 import androidx.core.view.allViews
+import com.google.firebase.database.DataSnapshot
+import com.google.firebase.database.DatabaseError
+import com.google.firebase.database.FirebaseDatabase
+import com.google.firebase.database.ValueEventListener
 
 class CommitteeEventsActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -25,36 +28,37 @@ class CommitteeEventsActivity : AppCompatActivity() {
         /* LinearLayout containing the content. */
         val eventsList = findViewById<LinearLayout>(R.id.committee_events)
 
-        /* Generate some static events. */
-        for (i in 1..2) {
-            val inflater = LayoutInflater.from(this)
-            val eventCard = inflater.inflate(
-                R.layout.committee_event_view, eventsList, false
-            ) as CardView
-            eventCard.findViewById<TextView>(R.id.new_event_title).text =
-                resources.getString(R.string.event_name)
-            eventCard.findViewById<TextView>(R.id.new_event_descr).text =
-                resources.getString(R.string.event_descr)
-            eventCard.findViewById<TextView>(R.id.new_event_date).text =
-                (14 + i * 5).toString() + "/06/23"
-            eventsList.addView(eventCard)
-        }
+        /* Display events from database */
+        val eventsRef = FirebaseDatabase.getInstance().reference.child("universities")
+            .child(UNI_ID).child("events")
+
+        val inflater = LayoutInflater.from(this)
+        eventsRef.addValueEventListener(object: ValueEventListener {
+            override fun onDataChange(snapshot: DataSnapshot) {
+                for (event in snapshot.children) {
+                    val name: String = event.child("eventName").value as String
+                    val date = event.child("eventDate").value as String
+                    val desc = event.child("eventDesc").value as String
+
+                    val eventCard = inflater.inflate(
+                        R.layout.committee_event_view, eventsList, false
+                    ) as CardView
+                    eventCard.findViewById<TextView>(R.id.new_event_title).text = name
+                    eventCard.findViewById<TextView>(R.id.new_event_descr).text = desc
+                    eventCard.findViewById<TextView>(R.id.new_event_date).text = date
+                    eventsList.addView(eventCard)
+                }
+            }
+
+            override fun onCancelled(error: DatabaseError) {
+                TODO("Not yet implemented")
+            }
+        })
 
         /* Functionality for the New Event button. */
         val newEvent = findViewById<Button>(R.id.new_event_button)
         newEvent.setOnClickListener {
-            val inflater = LayoutInflater.from(this@CommitteeEventsActivity)
-            val eventCard = inflater.inflate(
-                R.layout.committee_event_view, eventsList, false
-            ) as CardView
-            /* Sets the event title and description using predefined string
-             * resources. Modify to retrieve user-inputted text, if necessary. */
-            eventCard.findViewById<TextView>(R.id.new_event_title).text =
-                resources.getString(R.string.new_event_name)
-            eventCard.findViewById<TextView>(R.id.new_event_descr).text =
-                resources.getString(R.string.new_event_descr)
-            eventCard.findViewById<TextView>(R.id.new_event_date).text = "29/06/23"
-            eventsList.addView(eventCard)
+            addEvent(UNI_ID, "Example Event Name", "15/06/2023", "Example description")
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/drp25/Database.kt b/app/src/main/java/com/example/drp25/Database.kt
index f29a88d..88f96ea 100644
--- a/app/src/main/java/com/example/drp25/Database.kt
+++ b/app/src/main/java/com/example/drp25/Database.kt
@@ -99,11 +99,6 @@ fun addUser(uniId: String, name: String, nationality: String, year: String, cour
     return userId
 }
 
-//fun putInterestRating(uniId: String, userId: String, interest: String) {
-//    val interestsRef = unisRef.child(uniId).child("users").child(userId).child("interests")
-//    interestsRef.child(interest).setValue(null)
-//}
-
 fun addInterest(uniId: String, userId: String, interest: String) {
     val interestsRef = unisRef.child(uniId).child("users").child(userId).child("interests")
     interestsRef.child(interest).setValue(5)
@@ -112,4 +107,15 @@ fun addInterest(uniId: String, userId: String, interest: String) {
 fun removeInterest(uniId: String, userId: String, interest: String) {
     val interestsRef = unisRef.child(uniId).child("users").child(userId).child("interests")
     interestsRef.child(interest).removeValue()
+}
+
+fun addEvent(uniId: String, eventName: String, eventDate: String, eventDesc: String) {
+    val eventsRef = unisRef.child(uniId).child("events")
+    val eventId = eventsRef.push().key
+    if (eventId != null) {
+        val eventRef = eventsRef.child(eventId)
+        eventRef.child("eventName").setValue(eventName)
+        eventRef.child("eventDate").setValue(eventDate)
+        eventRef.child("eventDesc").setValue(eventDesc)
+    }
 }
\ No newline at end of file

From 7a270651b82e34bd77801a413fbc7046610b1d88 Mon Sep 17 00:00:00 2001
From: hettysymes <hettysymes@users.noreply.github.com>
Date: Thu, 15 Jun 2023 12:14:04 +0100
Subject: [PATCH 11/17] added new matcher

---
 .../main/java/com/example/drp25/Database.kt   |  9 +++++-
 .../java/com/example/drp25/MatchActivity.kt   |  2 ++
 .../com/example/drp25/matchers/MyMatcher.kt   | 32 +++++++++++++++++++
 3 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/com/example/drp25/matchers/MyMatcher.kt

diff --git a/app/src/main/java/com/example/drp25/Database.kt b/app/src/main/java/com/example/drp25/Database.kt
index 1ad6f52..440c14c 100644
--- a/app/src/main/java/com/example/drp25/Database.kt
+++ b/app/src/main/java/com/example/drp25/Database.kt
@@ -2,6 +2,7 @@ package com.example.drp25
 
 import android.widget.LinearLayout
 import android.widget.RatingBar
+import com.example.drp25.matchers.MyMatcher
 import com.example.drp25.matchers.RatingMatcherWithNationality
 import com.google.firebase.database.DataSnapshot
 import com.google.firebase.database.DatabaseError
@@ -10,7 +11,7 @@ import com.google.firebase.database.ValueEventListener
 import com.google.gson.Gson
 
 private val unisRef = FirebaseDatabase.getInstance().reference.child("universities")
-private val matcher: Matcher = RatingMatcherWithNationality()
+private val matcher: Matcher = MyMatcher()
 val matches = mutableSetOf<String>()
 val matchObservers = mutableListOf<Observer>()
 
@@ -28,6 +29,12 @@ fun addMatchObserver(observer: Observer) {
     observer.notify(matches)
 }
 
+fun addMatched(uniId: String, user1Id: String, user2Id: String) {
+    val usersRef = unisRef.child(uniId).child("users")
+    usersRef.child(user1Id).child("matched").push().setValue(user2Id)
+    usersRef.child(user2Id).child("matched").push().setValue(user1Id)
+}
+
 fun listenToUser(uniId: String, userId: String) {
     val userRef = unisRef.child(uniId).child("users").child(userId)
     userRef.addValueEventListener(object: ValueEventListener {
diff --git a/app/src/main/java/com/example/drp25/MatchActivity.kt b/app/src/main/java/com/example/drp25/MatchActivity.kt
index c13de86..23e636c 100644
--- a/app/src/main/java/com/example/drp25/MatchActivity.kt
+++ b/app/src/main/java/com/example/drp25/MatchActivity.kt
@@ -67,6 +67,8 @@ class MatchActivity : AppCompatActivity() {
                         matchWithBtn.setOnClickListener {
                             selectedMatchId = matchId
                             selectedMatchName = name
+                            addMatched(UNI_ID, USER_ID, selectedMatchId!!)
+
                             val intent = Intent(this@MatchActivity, StampActivity::class.java)
                             intent.putExtra("selectedMatchId", selectedMatchId)
                             intent.putExtra("selectedMatchName", selectedMatchName)
diff --git a/app/src/main/java/com/example/drp25/matchers/MyMatcher.kt b/app/src/main/java/com/example/drp25/matchers/MyMatcher.kt
new file mode 100644
index 0000000..431a095
--- /dev/null
+++ b/app/src/main/java/com/example/drp25/matchers/MyMatcher.kt
@@ -0,0 +1,32 @@
+package com.example.drp25.matchers
+
+import com.example.drp25.Matcher
+import com.google.firebase.database.DataSnapshot
+
+class MyMatcher : Matcher {
+    override fun isMatch(user1Snapshot: DataSnapshot, user2Snapshot: DataSnapshot): Boolean {
+        // Check nationality is different
+        val nationality1 = user1Snapshot.child("nationality").value
+        val nationality2 = user2Snapshot.child("nationality").value
+        if (nationality1 == nationality2) return false
+
+        // Check not already matched
+        val user2Id = user2Snapshot.key
+        val matched1Ref = user1Snapshot.child("matches")
+        for (child in matched1Ref.children) {
+            if (child.value == user2Id) return false
+        }
+
+        val interests1Ref = user1Snapshot.child("interests")
+        val interests2Ref = user2Snapshot.child("interests")
+
+        // return true iff share at least one interest
+        for (child in interests1Ref.children) {
+            if (child.key?.let { interests2Ref.hasChild(it) } == true) {
+                return true
+            }
+        }
+        return false
+    }
+
+}
\ No newline at end of file

From b38f55ea39d09a505f97119c764df7de5b8aa43d Mon Sep 17 00:00:00 2001
From: hettysymes <hettysymes@users.noreply.github.com>
Date: Thu, 15 Jun 2023 12:16:02 +0100
Subject: [PATCH 12/17] fixed spelling error when accessing database

---
 app/src/main/java/com/example/drp25/matchers/MyMatcher.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/example/drp25/matchers/MyMatcher.kt b/app/src/main/java/com/example/drp25/matchers/MyMatcher.kt
index 431a095..0213c15 100644
--- a/app/src/main/java/com/example/drp25/matchers/MyMatcher.kt
+++ b/app/src/main/java/com/example/drp25/matchers/MyMatcher.kt
@@ -1,5 +1,6 @@
 package com.example.drp25.matchers
 
+import android.util.Log
 import com.example.drp25.Matcher
 import com.google.firebase.database.DataSnapshot
 
@@ -12,7 +13,7 @@ class MyMatcher : Matcher {
 
         // Check not already matched
         val user2Id = user2Snapshot.key
-        val matched1Ref = user1Snapshot.child("matches")
+        val matched1Ref = user1Snapshot.child("matched")
         for (child in matched1Ref.children) {
             if (child.value == user2Id) return false
         }

From dd795822b3ffc9b346483265344d815696612dd7 Mon Sep 17 00:00:00 2001
From: Michelle Lo <lomichelle42@gmail.com>
Date: Thu, 15 Jun 2023 12:48:29 +0100
Subject: [PATCH 13/17] Allow committee members to dynamically create new
 events

---
 app/src/main/AndroidManifest.xml              |   3 +
 .../example/drp25/CommitteeEventsActivity.kt  |   7 +-
 .../main/java/com/example/drp25/Database.kt   |   1 +
 .../com/example/drp25/NewEventActivity.kt     |  28 ++++
 .../main/res/layout/activity_new_event.xml    | 124 ++++++++++++++++++
 app/src/main/res/values/strings.xml           |   5 +
 6 files changed, 167 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/com/example/drp25/NewEventActivity.kt
 create mode 100644 app/src/main/res/layout/activity_new_event.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index faa48d5..fc3b440 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,6 +14,9 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.DRP25"
         tools:targetApi="31">
+        <activity
+            android:name=".NewEventActivity"
+            android:exported="false" />
         <activity
             android:name=".CommitteeEventsActivity"
             android:exported="false" />
diff --git a/app/src/main/java/com/example/drp25/CommitteeEventsActivity.kt b/app/src/main/java/com/example/drp25/CommitteeEventsActivity.kt
index e7a55dc..4ab7cef 100644
--- a/app/src/main/java/com/example/drp25/CommitteeEventsActivity.kt
+++ b/app/src/main/java/com/example/drp25/CommitteeEventsActivity.kt
@@ -46,6 +46,10 @@ class CommitteeEventsActivity : AppCompatActivity() {
                     eventCard.findViewById<TextView>(R.id.new_event_title).text = name
                     eventCard.findViewById<TextView>(R.id.new_event_descr).text = desc
                     eventCard.findViewById<TextView>(R.id.new_event_date).text = date
+                    val broadcastBtn = eventCard.findViewById<Button>(R.id.broadcast_button)
+                    broadcastBtn.setOnClickListener {
+                        // TODO: broadcast message
+                    }
                     eventsList.addView(eventCard)
                 }
             }
@@ -58,7 +62,8 @@ class CommitteeEventsActivity : AppCompatActivity() {
         /* Functionality for the New Event button. */
         val newEvent = findViewById<Button>(R.id.new_event_button)
         newEvent.setOnClickListener {
-            addEvent(UNI_ID, "Example Event Name", "15/06/2023", "Example description")
+            val intent = Intent(this, NewEventActivity::class.java)
+            startActivity(intent)
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/drp25/Database.kt b/app/src/main/java/com/example/drp25/Database.kt
index 88f96ea..c47394f 100644
--- a/app/src/main/java/com/example/drp25/Database.kt
+++ b/app/src/main/java/com/example/drp25/Database.kt
@@ -117,5 +117,6 @@ fun addEvent(uniId: String, eventName: String, eventDate: String, eventDesc: Str
         eventRef.child("eventName").setValue(eventName)
         eventRef.child("eventDate").setValue(eventDate)
         eventRef.child("eventDesc").setValue(eventDesc)
+        eventRef.child("society").setValue("ballet")
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/drp25/NewEventActivity.kt b/app/src/main/java/com/example/drp25/NewEventActivity.kt
new file mode 100644
index 0000000..21c9983
--- /dev/null
+++ b/app/src/main/java/com/example/drp25/NewEventActivity.kt
@@ -0,0 +1,28 @@
+package com.example.drp25
+
+import android.content.Intent
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import android.widget.Button
+import android.widget.EditText
+
+class NewEventActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_new_event)
+
+        val eventName = findViewById<EditText>(R.id.event_name_fill)
+        val eventDate = findViewById<EditText>(R.id.event_date_fill)
+        val eventDesc = findViewById<EditText>(R.id.event_desc_fill)
+        val submitEventBtn = findViewById<Button>(R.id.submit_event_button)
+
+        submitEventBtn.setOnClickListener {
+            addEvent(UNI_ID,
+                eventName.text.toString(),
+                eventDate.text.toString(),
+                eventDesc.text.toString())
+            val intent = Intent(this, CommitteeEventsActivity::class.java)
+            startActivity(intent)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_new_event.xml b/app/src/main/res/layout/activity_new_event.xml
new file mode 100644
index 0000000..66ee0c0
--- /dev/null
+++ b/app/src/main/res/layout/activity_new_event.xml
@@ -0,0 +1,124 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".NewEventActivity">
+
+    <TextView
+        android:id="@+id/new_event_prompt"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="24dp"
+        android:text="@string/create_a_new_event"
+        android:textColor="@color/stream_ui_accent_blue"
+        android:textSize="24sp"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/event_name_prompt"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="24dp"
+        android:text="@string/event_name_prompt"
+        android:textSize="16sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/society_desc" />
+
+    <EditText
+        android:id="@+id/event_name_fill"
+        android:hint="@string/event_name_prompt"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minHeight="48dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="8dp"
+        android:ems="10"
+        android:inputType="textPersonName"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/event_name_prompt"
+        android:autofillHints="Name" />
+
+    <TextView
+        android:id="@+id/event_date_prompt"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="36dp"
+        android:text="@string/event_date"
+        android:textSize="16sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/event_name_fill" />
+
+    <EditText
+        android:id="@+id/event_date_fill"
+        android:hint="@string/event_date"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minHeight="48dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="8dp"
+        android:ems="10"
+        android:inputType="textPersonName"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/event_date_prompt"
+        android:autofillHints="Date"
+        tools:ignore="TextFields" />
+
+    <TextView
+        android:id="@+id/event_desc_prompt"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="36dp"
+        android:text="@string/event_description"
+        android:textSize="16sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/event_date_fill" />
+
+    <EditText
+        android:id="@+id/event_desc_fill"
+        android:hint="@string/event_description"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minHeight="80dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="8dp"
+        android:ems="10"
+        android:gravity="start|top"
+        android:inputType="textMultiLine"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/event_desc_prompt"
+        android:autofillHints="Description" />
+
+    <Button
+        android:id="@+id/submit_event_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="24dp"
+        android:backgroundTint="@color/stream_ui_blue_alice"
+        android:text="@string/create_a_new_event"
+        android:textColor="@color/stream_ui_accent_blue"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/event_desc_fill" />
+
+    <TextView
+        android:id="@+id/society_desc"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="16dp"
+        android:text="@string/ballet_society"
+        android:textSize="20sp"
+        android:textStyle="bold|italic"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/new_event_prompt" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ 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 8c3ced0..0b8153b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -242,4 +242,9 @@
     <string name="action_settings">Settings</string>
     <string name="please_choose_remove_your_interests_from_the_list_below">Please choose / remove your interests.</string>
     <string name="app_logo">app logo</string>
+    <string name="create_a_new_event">Create a new event</string>
+    <string name="event_name_prompt">Event Name</string>
+    <string name="name">Name</string>
+    <string name="event_date">Event Date</string>
+    <string name="event_description">Event Description</string>
 </resources>
\ No newline at end of file

From 3f6dc59fc2ba56668ec1c14448e6da972617823a Mon Sep 17 00:00:00 2001
From: hettysymes <hettysymes@users.noreply.github.com>
Date: Thu, 15 Jun 2023 13:07:41 +0100
Subject: [PATCH 14/17] filtering by none ans sport works

---
 .../com/example/drp25/InterestActivity.kt     | 108 ++++++++++++++++++
 app/src/main/res/layout/activity_interest.xml |  17 ++-
 app/src/main/res/values/strings.xml           |   6 +-
 3 files changed, 128 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/example/drp25/InterestActivity.kt b/app/src/main/java/com/example/drp25/InterestActivity.kt
index 44d1b45..94c4800 100644
--- a/app/src/main/java/com/example/drp25/InterestActivity.kt
+++ b/app/src/main/java/com/example/drp25/InterestActivity.kt
@@ -1,5 +1,6 @@
 package com.example.drp25
 
+import android.annotation.SuppressLint
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
@@ -13,14 +14,97 @@ import com.google.firebase.database.DataSnapshot
 import com.google.firebase.database.DatabaseError
 import com.google.firebase.database.FirebaseDatabase
 import com.google.firebase.database.ValueEventListener
+import okhttp3.internal.notify
 
 class InterestActivity : AppCompatActivity() {
 
+    val allInterests = arrayOf(
+        "Anime",
+        "Archery",
+        "Art",
+        "Astronomy",
+        "Badminton",
+        "Baking",
+        "Baseball and Softball",
+        "Basketball",
+        "Bridge",
+        "Caving",
+        "Charity and Volunteering",
+        "Choir and Chamber Music",
+        "Chess",
+        "Cycling",
+        "Dance",
+        "Dogs",
+        "Drama",
+        "Environmental",
+        "Football",
+        "Fencing",
+        "Films and Movies",
+        "Gaming and E-sports",
+        "Golf",
+        "Hip Hop",
+        "History",
+        "Hockey",
+        "Jazz, Soul and Funk",
+        "K-pop",
+        "Knitting",
+        "Lacrosse",
+        "Martial Arts",
+        "Model United Nations",
+        "Mountaineering",
+        "Musical Theatre",
+        "Netball",
+        "Orchestra",
+        "Photography",
+        "Poker",
+        "Pokemon",
+        "Radio",
+        "Rail and Transport",
+        "Robotics",
+        "Rugby",
+        "Science Fiction and Fantasy",
+        "Skating",
+        "Snooker and Pool",
+        "Squash",
+        "Tabletop Gaming",
+        "Tennis",
+        "Volleyball"
+    )
+
+    val sportInterests = arrayOf(
+        "Archery",
+        "Badminton",
+        "Baseball and Softball",
+        "Basketball",
+        "Caving",
+        "Chess",
+        "Cycling",
+        "Dance",
+        "Football",
+        "Fencing",
+        "Gaming and E-sports",
+        "Golf",
+        "Hockey",
+        "Lacrosse",
+        "Martial Arts",
+        "Mountaineering",
+        "Netball",
+        "Rugby",
+        "Skating",
+        "Snooker and Pool",
+        "Squash",
+        "Tennis",
+        "Volleyball"
+    )
+
+    val displayedEntries = ArrayList<String>()
+
     @Deprecated("Deprecated in Java")
     override fun onBackPressed() {
         // Remove back press option, to prevent double updates to database
     }
 
+    @SuppressLint("MissingInflatedId")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_interest)
@@ -30,8 +114,14 @@ class InterestActivity : AppCompatActivity() {
         displayExistingInterests(interestsChipGroup)
 
         // Select interest from drop down list
+        allInterests.forEach { displayedEntries.add(it) }
+
         val spinner: Spinner = findViewById(R.id.spinner)
         var selectedInterest = ""
+        val adapter = ArrayAdapter(this, android.R.layout.simple_spinner_item, displayedEntries)
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+        spinner.adapter = adapter
+
         spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
             override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
                 selectedInterest = spinner.selectedItem as String
@@ -42,6 +132,24 @@ class InterestActivity : AppCompatActivity() {
             }
         }
 
+        val filterSpinner: Spinner = findViewById(R.id.filter_spinner)
+        filterSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+                val category = filterSpinner.selectedItem as String
+                displayedEntries.clear()
+                if (category == "None") {
+                    allInterests.forEach { displayedEntries.add(it) }
+                } else if (category == "Sport") {
+                    sportInterests.forEach { displayedEntries.add(it) }
+                }
+                adapter.notifyDataSetChanged()
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {
+                // Handle no selection
+            }
+        }
+
         // Add new interest to list of selected interests
         val addInterestButton = findViewById<Button>(R.id.add_new_interest_button)
         addInterestButton.setOnClickListener {
diff --git a/app/src/main/res/layout/activity_interest.xml b/app/src/main/res/layout/activity_interest.xml
index c5aa0d7..89d68fb 100644
--- a/app/src/main/res/layout/activity_interest.xml
+++ b/app/src/main/res/layout/activity_interest.xml
@@ -13,7 +13,6 @@
         android:layout_marginStart="56dp"
         android:layout_marginTop="32dp"
         android:layout_marginEnd="56dp"
-        android:entries="@array/interest_array"
         android:hint="@string/interest_prompt"
         android:maxWidth="360dp"
         android:minHeight="48dp"
@@ -21,6 +20,20 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/back_button_interests" />
 
+    <Spinner
+        android:id="@+id/filter_spinner"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="56dp"
+        android:layout_marginTop="32dp"
+        android:layout_marginEnd="56dp"
+        android:entries="@array/category_array"
+        android:hint="Choose a category to filter by"
+        android:maxWidth="360dp"
+        android:minHeight="48dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/spinner" />
 
     <com.google.android.material.chip.ChipGroup
         android:id="@+id/interests_group"
@@ -45,7 +58,7 @@
         android:text="@string/add_new_interest"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/spinner" />
+        app:layout_constraintTop_toBottomOf="@+id/filter_spinner" />
 
     <Button
         android:id="@+id/back_button_interests"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e598b19..74ff29b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -116,7 +116,7 @@
         <item>Musical Theatre</item>
         <item>Netball</item>
         <item>Orchestra</item>
-        <item>Photography</item>
+        <item>Ph otography</item>
         <item>Poker</item>
         <item>Pokemon</item>
         <item>Radio</item>
@@ -131,6 +131,10 @@
         <item>Tennis</item>
         <item>Volleyball</item>
     </string-array>
+    <string-array name="category_array">
+        <item>None</item>
+        <item>Sport</item>
+    </string-array>
     <string name="title_activity_club_interest">ClubInterestActivity</string>
     <string name="large_text">
         "Material is the metaphor.\n\n"

From 8dac6497258fcdfc6207c99ab2565cb54050dc1c Mon Sep 17 00:00:00 2001
From: hettysymes <hettysymes@users.noreply.github.com>
Date: Thu, 15 Jun 2023 13:26:38 +0100
Subject: [PATCH 15/17] interest filtering works

---
 .../com/example/drp25/InterestActivity.kt     | 177 +++++++++---------
 app/src/main/res/values/strings.xml           |   8 +-
 2 files changed, 99 insertions(+), 86 deletions(-)

diff --git a/app/src/main/java/com/example/drp25/InterestActivity.kt b/app/src/main/java/com/example/drp25/InterestActivity.kt
index 94c4800..ca500e9 100644
--- a/app/src/main/java/com/example/drp25/InterestActivity.kt
+++ b/app/src/main/java/com/example/drp25/InterestActivity.kt
@@ -18,87 +18,69 @@ import okhttp3.internal.notify
 
 class InterestActivity : AppCompatActivity() {
 
-    val allInterests = arrayOf(
-        "Anime",
-        "Archery",
-        "Art",
-        "Astronomy",
-        "Badminton",
-        "Baking",
-        "Baseball and Softball",
-        "Basketball",
-        "Bridge",
-        "Caving",
-        "Charity and Volunteering",
-        "Choir and Chamber Music",
-        "Chess",
-        "Cycling",
-        "Dance",
-        "Dogs",
-        "Drama",
-        "Environmental",
-        "Football",
-        "Fencing",
-        "Films and Movies",
-        "Gaming and E-sports",
-        "Golf",
-        "Hip Hop",
-        "History",
-        "Hockey",
-        "Jazz, Soul and Funk",
-        "K-pop",
-        "Knitting",
-        "Lacrosse",
-        "Martial Arts",
-        "Model United Nations",
-        "Mountaineering",
-        "Musical Theatre",
-        "Netball",
-        "Orchestra",
-        "Photography",
-        "Poker",
-        "Pokemon",
-        "Radio",
-        "Rail and Transport",
-        "Robotics",
-        "Rugby",
-        "Science Fiction and Fantasy",
-        "Skating",
-        "Snooker and Pool",
-        "Squash",
-        "Tabletop Gaming",
-        "Tennis",
-        "Volleyball"
-    )
+    enum class HobbyCategory {
+        ACADEMIC_RELATED,
+        ARTS_ENTERTAINMENT,
+        CHARITABLE,
+        INDOOR,
+        OUTDOOR,
+        SOCIAL,
+        SPORTS
+    }
 
-    val sportInterests = arrayOf(
-        "Archery",
-        "Badminton",
-        "Baseball and Softball",
-        "Basketball",
-        "Caving",
-        "Chess",
-        "Cycling",
-        "Dance",
-        "Football",
-        "Fencing",
-        "Gaming and E-sports",
-        "Golf",
-        "Hockey",
-        "Lacrosse",
-        "Martial Arts",
-        "Mountaineering",
-        "Netball",
-        "Rugby",
-        "Skating",
-        "Snooker and Pool",
-        "Squash",
-        "Tennis",
-        "Volleyball"
+    val hobbiesCategoriesMap = mapOf(
+        "Anime" to listOf(HobbyCategory.ARTS_ENTERTAINMENT),
+        "Archery" to listOf(HobbyCategory.SPORTS, HobbyCategory.OUTDOOR),
+        "Art" to listOf(HobbyCategory.ARTS_ENTERTAINMENT),
+        "Astronomy" to listOf(HobbyCategory.ACADEMIC_RELATED),
+        "Badminton" to listOf(HobbyCategory.SPORTS, HobbyCategory.INDOOR),
+        "Baking" to listOf(HobbyCategory.ARTS_ENTERTAINMENT),
+        "Baseball and Softball" to listOf(HobbyCategory.SPORTS, HobbyCategory.OUTDOOR),
+        "Basketball" to listOf(HobbyCategory.SPORTS, HobbyCategory.OUTDOOR),
+        "Bridge" to listOf(HobbyCategory.SOCIAL),
+        "Caving" to listOf(HobbyCategory.OUTDOOR),
+        "Charity and Volunteering" to listOf(HobbyCategory.CHARITABLE, HobbyCategory.SOCIAL),
+        "Choir and Chamber Music" to listOf(HobbyCategory.ARTS_ENTERTAINMENT),
+        "Chess" to listOf(HobbyCategory.SOCIAL),
+        "Cycling" to listOf(HobbyCategory.SPORTS, HobbyCategory.OUTDOOR),
+        "Dance" to listOf(HobbyCategory.ARTS_ENTERTAINMENT),
+        "Dogs" to listOf(HobbyCategory.SOCIAL),
+        "Drama" to listOf(HobbyCategory.ARTS_ENTERTAINMENT),
+        "Environmental" to listOf(HobbyCategory.CHARITABLE),
+        "Football" to listOf(HobbyCategory.SPORTS, HobbyCategory.OUTDOOR),
+        "Fencing" to listOf(HobbyCategory.SPORTS),
+        "Films and Movies" to listOf(HobbyCategory.ARTS_ENTERTAINMENT),
+        "Gaming and E-sports" to listOf(HobbyCategory.ARTS_ENTERTAINMENT),
+        "Golf" to listOf(HobbyCategory.SPORTS, HobbyCategory.OUTDOOR),
+        "Hip Hop" to listOf(HobbyCategory.ARTS_ENTERTAINMENT),
+        "History" to listOf(HobbyCategory.ACADEMIC_RELATED),
+        "Hockey" to listOf(HobbyCategory.SPORTS, HobbyCategory.OUTDOOR),
+        "Jazz, Soul and Funk" to listOf(HobbyCategory.ARTS_ENTERTAINMENT),
+        "K-pop" to listOf(HobbyCategory.ARTS_ENTERTAINMENT),
+        "Knitting" to listOf(HobbyCategory.ARTS_ENTERTAINMENT),
+        "Lacrosse" to listOf(HobbyCategory.SPORTS, HobbyCategory.OUTDOOR),
+        "Martial Arts" to listOf(HobbyCategory.SPORTS),
+        "Model United Nations" to listOf(HobbyCategory.ACADEMIC_RELATED),
+        "Mountaineering" to listOf(HobbyCategory.OUTDOOR),
+        "Musical Theatre" to listOf(HobbyCategory.ARTS_ENTERTAINMENT),
+        "Netball" to listOf(HobbyCategory.SPORTS, HobbyCategory.OUTDOOR),
+        "Orchestra" to listOf(HobbyCategory.ARTS_ENTERTAINMENT),
+        "Photography" to listOf(HobbyCategory.ARTS_ENTERTAINMENT),
+        "Poker" to listOf(HobbyCategory.SOCIAL),
+        "Pokemon" to listOf(HobbyCategory.SOCIAL),
+        "Radio" to listOf(HobbyCategory.ARTS_ENTERTAINMENT),
+        "Rail and Transport" to listOf(HobbyCategory.SOCIAL),
+        "Robotics" to listOf(HobbyCategory.ACADEMIC_RELATED),
+        "Rugby" to listOf(HobbyCategory.SPORTS, HobbyCategory.OUTDOOR),
+        "Science Fiction and Fantasy" to listOf(HobbyCategory.ARTS_ENTERTAINMENT),
+        "Skating" to listOf(HobbyCategory.SPORTS, HobbyCategory.OUTDOOR),
+        "Snooker and Pool" to listOf(HobbyCategory.SPORTS),
+        "Squash" to listOf(HobbyCategory.SPORTS),
+        "Tabletop Gaming" to listOf(HobbyCategory.ARTS_ENTERTAINMENT),
+        "Tennis" to listOf(HobbyCategory.SPORTS, HobbyCategory.OUTDOOR),
+        "Volleyball" to listOf(HobbyCategory.SPORTS, HobbyCategory.OUTDOOR)
     )
 
-    val displayedEntries = ArrayList<String>()
-
     @Deprecated("Deprecated in Java")
     override fun onBackPressed() {
         // Remove back press option, to prevent double updates to database
@@ -114,11 +96,9 @@ class InterestActivity : AppCompatActivity() {
         displayExistingInterests(interestsChipGroup)
 
         // Select interest from drop down list
-        allInterests.forEach { displayedEntries.add(it) }
-
         val spinner: Spinner = findViewById(R.id.spinner)
         var selectedInterest = ""
-        val adapter = ArrayAdapter(this, android.R.layout.simple_spinner_item, displayedEntries)
+        val adapter = ArrayAdapter(this, android.R.layout.simple_spinner_item, hobbiesCategoriesMap.keys.toList())
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
         spinner.adapter = adapter
 
@@ -136,11 +116,38 @@ class InterestActivity : AppCompatActivity() {
         filterSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
             override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
                 val category = filterSpinner.selectedItem as String
-                displayedEntries.clear()
                 if (category == "None") {
-                    allInterests.forEach { displayedEntries.add(it) }
-                } else if (category == "Sport") {
-                    sportInterests.forEach { displayedEntries.add(it) }
+                    val adapter = ArrayAdapter(this@InterestActivity, android.R.layout.simple_spinner_item, hobbiesCategoriesMap.keys.toList())
+                    adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+                    spinner.adapter = adapter
+                } else {
+                    var categoryToFilter: HobbyCategory? = null
+                    when (category) {
+                        "Academic related" -> {
+                            categoryToFilter = HobbyCategory.ACADEMIC_RELATED
+                        }
+                        "Arts & Entertainment" -> {
+                            categoryToFilter = HobbyCategory.ARTS_ENTERTAINMENT
+                        }
+                        "Charitable" -> {
+                            categoryToFilter = HobbyCategory.CHARITABLE
+                        }
+                        "Indoor" -> {
+                            categoryToFilter = HobbyCategory.INDOOR
+                        }
+                        "Outdoor" -> {
+                            categoryToFilter = HobbyCategory.OUTDOOR
+                        }
+                        "Social" -> {
+                            categoryToFilter = HobbyCategory.SOCIAL
+                        }
+                        "Sports" -> {
+                            categoryToFilter = HobbyCategory.SPORTS
+                        }
+                    }
+                    val adapter = ArrayAdapter(this@InterestActivity, android.R.layout.simple_spinner_item, hobbiesCategoriesMap.filter { it.value.contains(categoryToFilter) }.keys.toList())
+                    adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+                    spinner.adapter = adapter
                 }
                 adapter.notifyDataSetChanged()
             }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 74ff29b..60eb028 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -133,7 +133,13 @@
     </string-array>
     <string-array name="category_array">
         <item>None</item>
-        <item>Sport</item>
+        <item>Academic related</item>
+        <item>Arts &amp; Entertainment</item>
+        <item>Charitable</item>
+        <item>Indoor</item>
+        <item>Outdoor</item>
+        <item>Social</item>
+        <item>Sports</item>
     </string-array>
     <string name="title_activity_club_interest">ClubInterestActivity</string>
     <string name="large_text">

From cc42859aadcb69c29c59819c80de45bf6196bf77 Mon Sep 17 00:00:00 2001
From: hettysymes <hettysymes@users.noreply.github.com>
Date: Thu, 15 Jun 2023 13:44:47 +0100
Subject: [PATCH 16/17] added shared interests per each match

---
 .../main/java/com/example/drp25/Database.kt   | 31 +++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/example/drp25/Database.kt b/app/src/main/java/com/example/drp25/Database.kt
index 52dc9c2..6df0275 100644
--- a/app/src/main/java/com/example/drp25/Database.kt
+++ b/app/src/main/java/com/example/drp25/Database.kt
@@ -31,8 +31,35 @@ fun addMatchObserver(observer: Observer) {
 
 fun addMatched(uniId: String, user1Id: String, user2Id: String) {
     val usersRef = unisRef.child(uniId).child("users")
-    usersRef.child(user1Id).child("matched").push().setValue(user2Id)
-    usersRef.child(user2Id).child("matched").push().setValue(user1Id)
+    val key1 = usersRef.child(user1Id).child("matched").push()
+    val key2 = usersRef.child(user2Id).child("matched").push()
+    key1.child("matchId").setValue(user2Id)
+    key2.child("matchId").setValue(user1Id)
+
+    usersRef.child(user1Id).child("interests").addListenerForSingleValueEvent(object: ValueEventListener {
+        override fun onDataChange(snapshot1: DataSnapshot) {
+            usersRef.child(user2Id).child("interests").addListenerForSingleValueEvent(object: ValueEventListener {
+                override fun onDataChange(snapshot2: DataSnapshot) {
+                    for (child in snapshot1.children) {
+                        if (child.key?.let { snapshot2.hasChild(it) } == true) {
+                            key1.child("sharedInterests").push().setValue(child.key)
+                            key2.child("sharedInterests").push().setValue(child.key)
+                        }
+                    }
+                }
+
+                override fun onCancelled(error: DatabaseError) {
+                    TODO("Not yet implemented")
+                }
+
+            })
+        }
+
+        override fun onCancelled(error: DatabaseError) {
+            TODO("Not yet implemented")
+        }
+
+    })
 }
 
 fun listenToUser(uniId: String, userId: String) {

From 2909935fa4a27d9f50c58008f35e090c961c55e9 Mon Sep 17 00:00:00 2001
From: hettysymes <hettysymes@users.noreply.github.com>
Date: Thu, 15 Jun 2023 13:48:20 +0100
Subject: [PATCH 17/17] fixed matcher so that cannot match twice as a result of
 db schema change

---
 app/src/main/java/com/example/drp25/matchers/MyMatcher.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/example/drp25/matchers/MyMatcher.kt b/app/src/main/java/com/example/drp25/matchers/MyMatcher.kt
index 0213c15..844d4ec 100644
--- a/app/src/main/java/com/example/drp25/matchers/MyMatcher.kt
+++ b/app/src/main/java/com/example/drp25/matchers/MyMatcher.kt
@@ -14,8 +14,8 @@ class MyMatcher : Matcher {
         // Check not already matched
         val user2Id = user2Snapshot.key
         val matched1Ref = user1Snapshot.child("matched")
-        for (child in matched1Ref.children) {
-            if (child.value == user2Id) return false
+        for (match in matched1Ref.children) {
+            if (match.child("matchId").value == user2Id) return false
         }
 
         val interests1Ref = user1Snapshot.child("interests")