Skip to content

Commit

Permalink
Merge pull request #26 from mee-kell/eventsPage
Browse files Browse the repository at this point in the history
minor updates
  • Loading branch information
mwmlo committed Jun 19, 2023
2 parents f151fa4 + 7743107 commit e83fe04
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions app/src/main/java/com/example/drp25/ChatActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand All @@ -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)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/example/drp25/Database.kt
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,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")
}
}

0 comments on commit e83fe04

Please sign in to comment.