From 6e244b45627c5a0fabe828aab92b0b19676b17b4 Mon Sep 17 00:00:00 2001 From: talksik Date: Thu, 23 Dec 2021 21:18:09 -0800 Subject: [PATCH] more intuitive help button --- nirvana-ios/Services/AuthSessionStore.swift | 2 +- .../Views/InnerCircle/CircleNavigationView.swift | 1 + .../Views/InnerCircle/InnerCircleView.swift | 15 +++++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/nirvana-ios/Services/AuthSessionStore.swift b/nirvana-ios/Services/AuthSessionStore.swift index 4e1a867..cfa1032 100644 --- a/nirvana-ios/Services/AuthSessionStore.swift +++ b/nirvana-ios/Services/AuthSessionStore.swift @@ -34,7 +34,7 @@ final class AuthSessionStore: ObservableObject, SessionStore { // TODO: figure out which ones to publish @Published var friendsArr: [User] = [] - var messagesArr: [Message] = [] + @Published var messagesArr: [Message] = [] // transformed data for the views @Published var friendMessagesDict: [String: [Message]] = [:] diff --git a/nirvana-ios/Views/InnerCircle/CircleNavigationView.swift b/nirvana-ios/Views/InnerCircle/CircleNavigationView.swift index c192f76..04abb75 100644 --- a/nirvana-ios/Views/InnerCircle/CircleNavigationView.swift +++ b/nirvana-ios/Views/InnerCircle/CircleNavigationView.swift @@ -82,6 +82,7 @@ struct CircleNavigationView: View { .frame(width: 40, height: 40) .clipShape(Circle()) .padding(5) + .shadow(radius: 10) } } diff --git a/nirvana-ios/Views/InnerCircle/InnerCircleView.swift b/nirvana-ios/Views/InnerCircle/InnerCircleView.swift index 3e0c6c4..7cc8d15 100644 --- a/nirvana-ios/Views/InnerCircle/InnerCircleView.swift +++ b/nirvana-ios/Views/InnerCircle/InnerCircleView.swift @@ -108,7 +108,8 @@ struct InnerCircleView: View { CircleFooterView(selectedFriendIndex: self.$selectedFriendIndex) // helper for new users - if self.authSessionStore.friendsArr.count <= 1 { + // TODO: make it back to 1 instead of 10...testing + if self.authSessionStore.friendsArr.count == 1 && self.selectedFriendIndex == nil { // don't show if bottom metadata showing ZStack(alignment: .bottomTrailing) { Color.clear @@ -117,16 +118,18 @@ struct InnerCircleView: View { self.alertText = "πŸ‘†πŸΌIt's simple!" self.alertSubtext = "Press and hold to send a message. \n Tap to listen!" } label: { - Label("help!", systemImage: "questionmark.circle") - .font(.title2) + Label("help!πŸ™‰", systemImage: "questionmark.circle") + .font(.caption) .foregroundColor(NirvanaColor.teal) - .padding() + .padding(10) .background(.ultraThinMaterial) .shadow(radius: 10) - .clipShape(Circle()) - .labelStyle(.iconOnly) + .labelStyle(.titleOnly) + .clipShape(Capsule()) } + .padding() } + .transition(.slide) } } .alert(self.alertText, isPresented: self.$alertActive) {