From 5ac44b0b6af480f2d2869021ad79721295a606c5 Mon Sep 17 00:00:00 2001 From: talksik Date: Thu, 16 Dec 2021 23:33:37 -0800 Subject: [PATCH] adding icon and changing some sizing --- .../HomeView/InnerCircle/InnerCircleView.swift | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/nirvana-ios/Views/HomeView/InnerCircle/InnerCircleView.swift b/nirvana-ios/Views/HomeView/InnerCircle/InnerCircleView.swift index fb689a4..219a7c2 100644 --- a/nirvana-ios/Views/HomeView/InnerCircle/InnerCircleView.swift +++ b/nirvana-ios/Views/HomeView/InnerCircle/InnerCircleView.swift @@ -72,6 +72,7 @@ struct InnerCircleView: View { // header ZStack(alignment: .top) { + //TODO: find a better solution than hacking it like this Color.clear header @@ -93,6 +94,14 @@ struct InnerCircleView: View { // } // .stroke(Color.black) // .edgesIgnoringSafeArea(.all) + + ZStack(alignment: .bottom) { + //TODO: find a better solution than hacking it like this + Color.clear + + FooterControlsView() + } + } .onAppear() { self.animateWaves = true @@ -179,7 +188,7 @@ struct InnerCircleView: View { let xdelta = abs(midX - self.center.x) let ydelta = abs(midY - self.center.y) - let innerCircleXAcceptance = Self.size * 0.75 + let innerCircleXAcceptance = Self.size let innerCircleYAcceptance = Self.size * 0.75 let outerRingXAcceptance = self.universalSize.width * 0.4 let outerRingYAcceptance = self.universalSize.height * 0.3 @@ -228,8 +237,6 @@ struct InnerCircleView: View { .frame(width: 20.0, height: 32.132) .padding(.leading, 20) - Spacer() - Text("nirvana") .font(Font.custom("Satisfy-Regular", size: 28)) .foregroundColor(NirvanaColor.teal) @@ -237,6 +244,10 @@ struct InnerCircleView: View { Spacer() + Image(systemName: "message.and.waveform") + .foregroundColor(Color.red.opacity(1)) + .font(.title2) + Menu { Button("Log out") { print("log out button clicked")