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

fixing bug to show my own icon in the convo bubble

Browse Source
This commit is contained in:
talksik
2022-01-01 19:18:39 -08:00
parent f497740c75
commit 398185dac0
3 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nirvana-ios/Services/AuthSessionStore.swift
+2
View File
@@ -227,6 +227,8 @@ extension AuthSessionStore {
print("up to date user: \(realtimeUpdatedUser)") print("up to date user: \(realtimeUpdatedUser)")
self?.user = realtimeUpdatedUser self?.user = realtimeUpdatedUser
self?.objectWillChange.send() self?.objectWillChange.send()
self?.relevantUsersDict[currUserId!] = realtimeUpdatedUser
} }
} }
nirvana-ios/Views/Convos/ConvoFooterView.swift
+1 -1
View File
@@ -111,7 +111,7 @@ struct ConvoFooterView: View {
x:0, x:0,
y:self.convoVM.selectedConvoId == nil ? 150 : 0 y:self.convoVM.selectedConvoId == nil ? 150 : 0
) )
.onReceive(self.convoVM.$selectedConvoId) {newConvoId in .onChange(of: self.convoVM.selectedConvoId) {newConvoId in
// update meta data based on which convo was selected // update meta data based on which convo was selected
// reset the selected options to start fresh // reset the selected options to start fresh
nirvana-ios/Views/InnerCircle/CircleGridView.swift
+16 -20
View File
@@ -94,23 +94,19 @@ struct CircleGridView: View {
.shadow(color: Color.black.opacity(0.2), radius: 10, x: 0, y: 20) .shadow(color: Color.black.opacity(0.2), radius: 10, x: 0, y: 20)
} }
Text("\(convoUsers.count)") // top right number or people in convo
Circle()
.frame(width: 20, height: 20)
.foregroundColor(Color.green)
.font(.title2)
.padding(5) .padding(5)
.font(.caption) .overlay(
.foregroundColor(Color.white) Text("\(convoUsers.count)")
.background(NirvanaColor.dimTeal) .foregroundColor(Color.white)
.cornerRadius(100) .font(.caption2)
)
// ZStack(alignment: .bottom) {
// Color.clear
//
// Text("kev, sarth...")
// .foregroundColor(NirvanaColor.teal)
// .font(.caption)
// }
} }
.scaleEffect(self.animateLiveConvos ? scale + 0.2 : scale) .scaleEffect(scale)
.padding(scale * 5) .padding(scale * 5)
} // geometry reader } // geometry reader
.offset( .offset(
@@ -137,11 +133,11 @@ struct CircleGridView: View {
} }
} }
.animation( // .animation(
Animation.easeInOut(duration: self.convoVM.selectedConvoId == currConvo.id ? 2 : 4 // Animation.easeInOut(duration: 4).repeatForever(autoreverses: true),
).repeatForever(autoreverses: true), // value: self.animateLiveConvos
value: self.animateLiveConvos // )
) .animation(Animation.spring())
} }
// active friends // active friends