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

fixing user status and making it universal

Browse Source
This commit is contained in:
talksik
2022-01-01 19:52:05 -08:00
parent c4d0e1bb07
commit 7a7bd7db15
4 changed files with 54 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nirvana-ios.xcodeproj/project.pbxproj
+4
View File
@@ -13,6 +13,7 @@
89091997277DDE030025F4BB /* ProfilePicturesOverlappedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89091996277DDE030025F4BB /* ProfilePicturesOverlappedView.swift */; };
89091999277EFDCC0025F4BB /* leaveSound.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 89091998277EFDCC0025F4BB /* leaveSound.mp3 */; };
8909199C277EFDF30025F4BB /* joinSound.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 8909199B277EFDF30025F4BB /* joinSound.mp3 */; };
8909199E278155920025F4BB /* UserStatusView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8909199D278155920025F4BB /* UserStatusView.swift */; };
890C245D277BF628009B4A30 /* AgoraRtcKit in Frameworks */ = {isa = PBXBuildFile; productRef = 890C245C277BF628009B4A30 /* AgoraRtcKit */; };
890C2460277BF896009B4A30 /* AgoraViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 890C245F277BF896009B4A30 /* AgoraViewController.swift */; };
890C2462277BF935009B4A30 /* CallView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 890C2461277BF935009B4A30 /* CallView.swift */; };
@@ -102,6 +103,7 @@
89091996277DDE030025F4BB /* ProfilePicturesOverlappedView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfilePicturesOverlappedView.swift; sourceTree = "<group>"; };
89091998277EFDCC0025F4BB /* leaveSound.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = leaveSound.mp3; sourceTree = "<group>"; };
8909199B277EFDF30025F4BB /* joinSound.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = joinSound.mp3; sourceTree = "<group>"; };
8909199D278155920025F4BB /* UserStatusView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserStatusView.swift; sourceTree = "<group>"; };
890C245F277BF896009B4A30 /* AgoraViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AgoraViewController.swift; sourceTree = "<group>"; };
890C2461277BF935009B4A30 /* CallView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallView.swift; sourceTree = "<group>"; };
890C2463277BFA97009B4A30 /* AgroRep.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AgroRep.swift; sourceTree = "<group>"; };
@@ -316,6 +318,7 @@
891A15FE27656F9200B26659 /* HeaderView.swift */,
89288ECA27675B9F00E962C4 /* OnboardingTemplateView.swift */,
89BCABEC276D2B05009E9B10 /* WavesGlassBackgroundView.swift */,
8909199D278155920025F4BB /* UserStatusView.swift */,
);
path = Templates;
sourceTree = "<group>";
@@ -656,6 +659,7 @@
8904DEC8277055E90071E6CA /* OnboardingOneView.swift in Sources */,
896CE7022770892F00DB474E /* CircleGridView.swift in Sources */,
89091995277DD9F80025F4BB /* ConvoFooterView.swift in Sources */,
8909199E278155920025F4BB /* UserStatusView.swift in Sources */,
89BDCDEA27697F9C00577829 /* UserMenu.swift in Sources */,
89BCABE7276B3D64009E9B10 /* InnerCircleViewModel.swift in Sources */,
89A107E5277476CC00B971FD /* PushNotificationService.swift in Sources */,
nirvana-ios/Views/InnerCircle/CircleGridView.swift
+6 -15
View File
@@ -149,25 +149,16 @@ struct CircleGridView: View {
let scale = getScale(proxy: gridProxy, itemNumber: adjustedValue, userId: friendId)
ZStack(alignment: .topTrailing) {
// bubble color
Circle()
.foregroundColor(self.getBubbleTint(friendDbId: friendId)) // different color for a selected user
.foregroundColor(self.getBubbleTint(friendDbId: friendId))
.blur(radius: 8)
.cornerRadius(100)
// this friend is online
if self.authSessionStore.relevantUsersDict[friendId]?.userStatus == .online {
Circle()
.frame(width: 20, height: 20)
.foregroundColor(Color.green)
.font(.title2)
.padding(5)
}
else if self.haveNewMessageFromFriend(friendDbId: friendId) { // check if the last message in the conversation between me and my friend was me talking or him
Image(systemName: "arrow.down.left.circle.fill")
.foregroundColor(Color.orange)
.font(.title2)
}
//
// user status
UserStatusView(status: self.authSessionStore.relevantUsersDict[friendId]?.userStatus, size: 20, padding: 5)
// inside avatar
Image(self.authSessionStore.relevantUsersDict[friendId]?.avatar ?? Avatars.avatarSystemNames[0])
.resizable()
.scaledToFit()
nirvana-ios/Views/InnerCircle/CircleNavigationView.swift
+1 -16
View File
@@ -103,22 +103,7 @@ struct CircleNavigationView: View {
.shadow(radius: 10)
.overlay(alignment: .topTrailing) {
// user status
switch self.authSessionStore.user?.userStatus {
case .online:
Circle()
.frame(width: 10, height: 10)
.foregroundColor(Color.green)
case .offline:
Circle()
.frame(width: 10, height: 10)
.foregroundColor(Color.red)
case .inConvo:
Circle()
.frame(width: 10, height: 10)
.foregroundColor(Color.orange)
default:
EmptyView()
}
UserStatusView(status: self.authSessionStore.user?.userStatus, size: 10)
}
}
}
nirvana-ios/Views/Templates/UserStatusView.swift
+43
View File
@@ -0,0 +1,43 @@
//
// UserStatusView.swift
// nirvana-ios
//
// Created by Arjun Patel on 1/1/22.
//
import SwiftUI
struct UserStatusView: View {
var status: UserStatus?
var size: CGFloat = 10
var padding: CGFloat = 0
var body: some View {
// user status
switch self.status {
case .online:
Circle()
.frame(width: size, height: size)
.foregroundColor(Color.green)
.padding(padding)
case .offline:
Circle()
.frame(width: size, height: size)
.foregroundColor(Color.red)
.padding(padding)
case .inConvo:
Circle()
.frame(width: size, height: size)
.foregroundColor(Color.orange)
.padding(padding)
default:
EmptyView()
}
}
}
//struct UserStatusView_Previews: PreviewProvider {
// static var previews: some View {
// UserStatusView()
// }
//}