From 781547a35b5df22d942e53b49190f6736cb8c846 Mon Sep 17 00:00:00 2001 From: talksik Date: Sat, 25 Dec 2021 04:12:25 -0800 Subject: [PATCH] small improvements and allowing user to delete --- .../Views/InnerCircle/CircleFooterView.swift | 15 +++++++++++++++ .../Views/InnerCircle/CircleGridView.swift | 8 +------- .../Views/InnerCircle/CircleNavigationView.swift | 2 +- .../Views/InnerCircle/InnerCircleView.swift | 2 +- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/nirvana-ios/Views/InnerCircle/CircleFooterView.swift b/nirvana-ios/Views/InnerCircle/CircleFooterView.swift index 3f57e7b..bf813e2 100644 --- a/nirvana-ios/Views/InnerCircle/CircleFooterView.swift +++ b/nirvana-ios/Views/InnerCircle/CircleFooterView.swift @@ -11,6 +11,7 @@ import NavigationStack struct CircleFooterView: View { @EnvironmentObject var navigationStack: NavigationStack @EnvironmentObject var authSessionStore: AuthSessionStore + @EnvironmentObject var innerCircleVM: InnerCircleViewModel @Binding var selectedFriendIndex: String? @@ -34,6 +35,20 @@ struct CircleFooterView: View { .frame(width: 40, height: 40) .clipShape(Circle()) .padding(5) + .contextMenu { + Button(role: .destructive) { + print("deactivating friend...removing from circle") + if self.authSessionStore.user?.id != nil && self.selectedFriendIndex != nil { + self.innerCircleVM.activateOrDeactiveInboxUser(activate: false, userId: self.authSessionStore.user!.id!, friendId: self.selectedFriendIndex!) {res in + + print(res) + self.selectedFriendIndex = nil // making this footer disappear although a view change should do this + } + } + } label: { + Label("Remove from Circle", systemImage: "person.crop.circle.fill.badge.minus") + } + } } diff --git a/nirvana-ios/Views/InnerCircle/CircleGridView.swift b/nirvana-ios/Views/InnerCircle/CircleGridView.swift index 1a78a1d..8ec21bc 100644 --- a/nirvana-ios/Views/InnerCircle/CircleGridView.swift +++ b/nirvana-ios/Views/InnerCircle/CircleGridView.swift @@ -80,13 +80,9 @@ struct CircleGridView: View { // check if the last message in the conversation between me and my friend was me talking or him if self.haveNewMessageFromFriend(friendDbId: friendId) { // him talking - Image(systemName: "wave.3.right.circle.fill") + Image(systemName: "arrow.down.left.circle.fill") .foregroundColor(Color.orange) .font(.title2) - } else { - Image(systemName: "wave.3.right.circle.fill") - .foregroundColor(NirvanaColor.dimTeal) - .font(.title2) } // Image(self.authSessionStore.relevantUsersDict[friendId]?.avatar ?? Avatars.avatarSystemNames[0]) @@ -164,8 +160,6 @@ struct CircleGridView: View { .foregroundColor(Color.orange) .font(.title) - Text("\(activeFriends.count)") - Circle() .foregroundColor(Color.orange.opacity(0.4)) .blur(radius: 5) diff --git a/nirvana-ios/Views/InnerCircle/CircleNavigationView.swift b/nirvana-ios/Views/InnerCircle/CircleNavigationView.swift index 4687670..4f341a3 100644 --- a/nirvana-ios/Views/InnerCircle/CircleNavigationView.swift +++ b/nirvana-ios/Views/InnerCircle/CircleNavigationView.swift @@ -111,7 +111,7 @@ struct CircleNavigationView: View { Button { self.alertActive.toggle() - self.alertText = "👯‍♂️ Coming Soon!" + self.alertText = "❄️ Coming Soon!" self.alertSubtext = "Stay posted for buttery smooth convos with groups! We will be limiting you to 3 circles!" } label: { diff --git a/nirvana-ios/Views/InnerCircle/InnerCircleView.swift b/nirvana-ios/Views/InnerCircle/InnerCircleView.swift index 262a1c0..eca06f5 100644 --- a/nirvana-ios/Views/InnerCircle/InnerCircleView.swift +++ b/nirvana-ios/Views/InnerCircle/InnerCircleView.swift @@ -98,7 +98,7 @@ struct InnerCircleView: View { Spacer() } - CircleFooterView(selectedFriendIndex: self.$selectedFriendIndex) + CircleFooterView(selectedFriendIndex: self.$selectedFriendIndex).environmentObject(innerCircleVM) // helper for new users // TODO: make it back to 1 instead of 10...testing