From ce26e6fa39155abc0bf65a1570d2c4bfd0d075f0 Mon Sep 17 00:00:00 2001 From: talksik Date: Thu, 23 Dec 2021 04:06:33 -0800 Subject: [PATCH] bunch of little things to improve overall stale states --- .../Views/InnerCircle/CircleGridView.swift | 10 +-- .../Views/InnerCircle/InnerCircleView.swift | 72 ++++++++++++++++++- 2 files changed, 70 insertions(+), 12 deletions(-) diff --git a/nirvana-ios/Views/InnerCircle/CircleGridView.swift b/nirvana-ios/Views/InnerCircle/CircleGridView.swift index 76c3b0d..8ef8068 100644 --- a/nirvana-ios/Views/InnerCircle/CircleGridView.swift +++ b/nirvana-ios/Views/InnerCircle/CircleGridView.swift @@ -20,15 +20,7 @@ struct CircleGridView: View { let universalSize = UIScreen.main.bounds var body: some View { - if self.authSessionStore.user?.nickname == nil || self.authSessionStore.user?.avatar == nil { - - } - else if self.authSessionStore.friendsArr.count < 0 { - - } else { - gridContent - } - + gridContent } // magic variables for grid diff --git a/nirvana-ios/Views/InnerCircle/InnerCircleView.swift b/nirvana-ios/Views/InnerCircle/InnerCircleView.swift index e124ecd..aa78b13 100644 --- a/nirvana-ios/Views/InnerCircle/InnerCircleView.swift +++ b/nirvana-ios/Views/InnerCircle/InnerCircleView.swift @@ -31,9 +31,75 @@ struct InnerCircleView: View { // background WavesGlassBackgroundView(isRecording: self.innerCircleVM.isRecording) - // content - CircleGridView(selectedFriendIndex: self.$selectedFriendIndex) - .environmentObject(innerCircleVM) + if self.authSessionStore.user?.nickname == nil || self.authSessionStore.user?.avatar == nil { + VStack(alignment: .center) { + Image("undraw_fall_is_coming_yl-0-x") + .renderingMode(.original) + .resizable() + .aspectRatio(contentMode: .fit) + .padding(.bottom) + + Button { + self.sheetView = SheetView.profile + } label: { + Text("Create Profile") + .fontWeight(.heavy) + .foregroundColor(NirvanaColor.white) + .padding(.vertical, 20) + .frame(maxWidth: .infinity) + .background(NirvanaColor.teal) + .clipShape(Capsule()) + .shadow(radius:10) + } + + Text("Personalize with a simple avatar and nickname! 🌿") + .font(.caption) + .foregroundColor(NirvanaColor.teal) + .multilineTextAlignment(.center) + + } + .padding() + } + else if self.authSessionStore.friendsArr.count < 0 { + VStack(alignment: .center) { + Image("undraw_fall_is_coming_yl-0-x") + .renderingMode(.original) + .resizable() + .aspectRatio(contentMode: .fit) + .padding(.bottom) + + Button { + self.sheetView = SheetView.contacts + } label: { + Text("Add Friends") + .fontWeight(.heavy) + .foregroundColor(NirvanaColor.white) + .padding(.vertical, 20) + .frame(maxWidth: .infinity) + .background(NirvanaColor.teal) + .clipShape(Capsule()) + .shadow(radius:10) + } + + Text("Start talking with your bestie right away! 🐥") + .font(.caption) + .foregroundColor(NirvanaColor.teal) + .multilineTextAlignment(.center) + + } + .padding() + } else { + Image("undraw_fall_is_coming_yl-0-x") + .renderingMode(.original) + .resizable() + .aspectRatio(contentMode: .fit) + .blur(radius: 20) + + + // content + CircleGridView(selectedFriendIndex: self.$selectedFriendIndex) + .environmentObject(innerCircleVM) + } // header VStack(alignment: .leading) {