talksik/nirvana-ios
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

adding conditional tint and cleaning things. up

Browse Source
This commit is contained in:
talksik
2021-12-21 17:21:58 -08:00
parent fe83e2c3c2
commit 1f7c2e9b21
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nirvana-ios/Views/InnerCircle/CircleGridView.swift
+2 -4
View File
@@ -58,15 +58,13 @@ struct CircleGridView: View {
GeometryReader {gridProxy in GeometryReader {gridProxy in
let scale = getScale(proxy: gridProxy, itemNumber: value) let scale = getScale(proxy: gridProxy, itemNumber: value)
let messagesRelatedToFriend = self.authSessionStore.friendMessagesDict[friend.id!]
// TODO: sort the list but may already be sorted from the query and creation of the array of messages? // TODO: sort the list but may already be sorted from the query and creation of the array of messages?
// shouldn't be nil...hopefully // shouldn't be nil...hopefully
let userId = self.authSessionStore.user!.id
ZStack(alignment: .topTrailing) { ZStack(alignment: .topTrailing) {
// check if the last message in the conversation between me and my friend was me talking or him // check if the last message in the conversation between me and my friend was me talking or him
// also check if I have listened to it once or twice // also check if I have listened to it once or twice
if messagesRelatedToFriend?.last?.receiverId == userId && messagesRelatedToFriend?.last?.listenCount == 0 { // him talking if self.haveNewMessageFromFriend(friendDbId: friend.id!) { // him talking
Image(systemName: "wave.3.right.circle.fill") Image(systemName: "wave.3.right.circle.fill")
.foregroundColor(Color.orange) .foregroundColor(Color.orange)
.font(.title) .font(.title)
@@ -129,7 +127,7 @@ struct CircleGridView: View {
} }
private func haveNewMessageFromFriend(friendDbId: String) -> Bool { private func haveNewMessageFromFriend(friendDbId: String) -> Bool {
let userId = self.authSessionStore.user!.id // O(1) let userId = self.authSessionStore.user!.id // O(1) // currUser who is signed in
if let messagesRelatedToFriend = self.authSessionStore.friendMessagesDict[friendDbId] { // O(1) if let messagesRelatedToFriend = self.authSessionStore.friendMessagesDict[friendDbId] { // O(1)
return messagesRelatedToFriend.last?.receiverId == userId && messagesRelatedToFriend.last?.listenCount == 0 return messagesRelatedToFriend.last?.receiverId == userId && messagesRelatedToFriend.last?.listenCount == 0