From 558e4ba04e4b0353a88cf00a829f2882452181b2 Mon Sep 17 00:00:00 2001 From: Michelle Lo Date: Mon, 19 Jun 2023 10:37:33 +0100 Subject: [PATCH 1/2] Capitalise society names for database --- app/src/main/java/com/example/drp25/Database.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/example/drp25/Database.kt b/app/src/main/java/com/example/drp25/Database.kt index 6df0275..fc05023 100644 --- a/app/src/main/java/com/example/drp25/Database.kt +++ b/app/src/main/java/com/example/drp25/Database.kt @@ -151,6 +151,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") + eventRef.child("society").setValue("Ballet") } } \ No newline at end of file From 7743107a0bd513c19c5ea3e1fd8d49310a03a6a7 Mon Sep 17 00:00:00 2001 From: Michelle Lo Date: Mon, 19 Jun 2023 11:04:17 +0100 Subject: [PATCH 2/2] change anna --- app/src/main/java/com/example/drp25/ChatActivity.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/example/drp25/ChatActivity.kt b/app/src/main/java/com/example/drp25/ChatActivity.kt index 4f83fa6..f820d10 100644 --- a/app/src/main/java/com/example/drp25/ChatActivity.kt +++ b/app/src/main/java/com/example/drp25/ChatActivity.kt @@ -42,9 +42,9 @@ class ChatActivity : AppCompatActivity() { name = "Felix", image = "upload.wikimedia.org/wikipedia/commons/thumb/b/bc/Flag_of_India.png/800px-Flag_of_India.png" ) - private val david = User( - id = "David", - name = "David", + private val anna = User( + id = "Anna", + name = "Anna", image = "img.freepik.com/premium-vector/german-flag-vector_230920-1254.jpg" ) @@ -53,10 +53,10 @@ class ChatActivity : AppCompatActivity() { fun setCurrentUser(name: String) { if (name == "kevin") { currentUser = kevin - potentialFriends = listOf(pierre, max, felix, david) + potentialFriends = listOf(pierre, max, felix, anna) } else { currentUser = max - potentialFriends = listOf(pierre, kevin, felix, david) + potentialFriends = listOf(pierre, kevin, felix, anna) } } }