From 3895e52fdb207f874df7a5708de99929c36da782 Mon Sep 17 00:00:00 2001 From: talksik Date: Fri, 17 Dec 2021 00:15:20 -0800 Subject: [PATCH] added a nav bar but I don't like it...takes away from the flow --- .../FooterControlsView.swift | 94 +++++++++---------- .../InnerCircle/InnerCircleView.swift | 37 +++++++- 2 files changed, 79 insertions(+), 52 deletions(-) diff --git a/nirvana-ios/Views/FooterControlsView/FooterControlsView.swift b/nirvana-ios/Views/FooterControlsView/FooterControlsView.swift index 37a40c7..6dd9d13 100644 --- a/nirvana-ios/Views/FooterControlsView/FooterControlsView.swift +++ b/nirvana-ios/Views/FooterControlsView/FooterControlsView.swift @@ -37,61 +37,53 @@ struct FooterControlsView: View { } var body: some View { - HStack(alignment: .center) { - Spacer() - - ZStack { - Button(action: { - }, label: { - Image(systemName: self.isHolding ? "waveform" : "mic.fill") - .foregroundColor(.white) - .padding() - .background(NirvanaColor.teal) - .clipShape(Circle()) - .shadow(radius: 10) - .scaleEffect(self.isHolding ? 1.2: 1, - anchor: .center) - .simultaneousGesture(dragGesture) - // .animation(.default, value: self.isHolding) - }) - .zIndex(10) - - Circle() - .frame(width: 60, height: 60, alignment: /*@START_MENU_TOKEN@*/.center/*@END_MENU_TOKEN@*/) - .scaleEffect(self.scaleBigPulser, + ZStack { + Button(action: { + }, label: { + Image(systemName: self.isHolding ? "waveform" : "mic.fill") + .foregroundColor(.white) + .padding() + .background(NirvanaColor.teal) + .clipShape(Circle()) + .shadow(radius: 10) + .scaleEffect(self.isHolding ? 1.2: 1, anchor: .center) - .foregroundColor(NirvanaColor.teal) - .opacity(0.3) - .onAppear { - let baseAnimation = Animation.easeOut(duration: 1) - let repeated = baseAnimation.repeatForever(autoreverses: true) + .simultaneousGesture(dragGesture) +// .animation(.default, value: self.isHolding) + }) + .zIndex(10) - withAnimation(repeated) { - self.scaleBigPulser = 1.12 - } + Circle() + .frame(width: 60, height: 60, alignment: /*@START_MENU_TOKEN@*/.center/*@END_MENU_TOKEN@*/) + .scaleEffect(self.scaleBigPulser, + anchor: .center) + .foregroundColor(NirvanaColor.teal) + .opacity(0.3) + .onAppear { + let baseAnimation = Animation.easeOut(duration: 1) + let repeated = baseAnimation.repeatForever(autoreverses: true) + + withAnimation(repeated) { + self.scaleBigPulser = 1.12 } - - Circle() - .frame(width: 50, height: 50, alignment: /*@START_MENU_TOKEN@*/.center/*@END_MENU_TOKEN@*/) - .scaleEffect(self.isHolding ? 1.5: 1, - anchor: .center) - .foregroundColor(NirvanaColor.teal) - .opacity(0.5) - .animation(Animation.easeInOut(duration:1).repeat(while: self.isHolding, autoreverses: true)) - - Circle() - .frame(width: 30, height: 30, alignment: /*@START_MENU_TOKEN@*/.center/*@END_MENU_TOKEN@*/) - .scaleEffect(self.isHolding ? 1.1: 1, - anchor: .center) - .foregroundColor(NirvanaColor.teal) - .opacity(0.9) - .animation(Animation.easeInOut(duration: 1).repeat(while: self.isHolding, autoreverses: true)) - - - - } + } + + Circle() + .frame(width: 50, height: 50, alignment: /*@START_MENU_TOKEN@*/.center/*@END_MENU_TOKEN@*/) + .scaleEffect(self.isHolding ? 1.5: 1, + anchor: .center) + .foregroundColor(NirvanaColor.teal) + .opacity(0.5) + .animation(Animation.easeInOut(duration:1).repeat(while: self.isHolding, autoreverses: true)) + + Circle() + .frame(width: 30, height: 30, alignment: /*@START_MENU_TOKEN@*/.center/*@END_MENU_TOKEN@*/) + .scaleEffect(self.isHolding ? 1.1: 1, + anchor: .center) + .foregroundColor(NirvanaColor.teal) + .opacity(0.9) + .animation(Animation.easeInOut(duration: 1).repeat(while: self.isHolding, autoreverses: true)) } - .padding() } } diff --git a/nirvana-ios/Views/HomeView/InnerCircle/InnerCircleView.swift b/nirvana-ios/Views/HomeView/InnerCircle/InnerCircleView.swift index 30783eb..60a4376 100644 --- a/nirvana-ios/Views/HomeView/InnerCircle/InnerCircleView.swift +++ b/nirvana-ios/Views/HomeView/InnerCircle/InnerCircleView.swift @@ -99,7 +99,7 @@ struct InnerCircleView: View { //TODO: find a better solution than hacking it like this Color.clear - FooterControlsView() + footer } } @@ -108,6 +108,41 @@ struct InnerCircleView: View { } } + var footer : some View { + ZStack { + HStack { + Image(systemName: "house.fill") + .frame(maxWidth: .infinity) + .frame(width: 40, height: 40) + .foregroundColor(NirvanaColor.white) + .padding(5) + .background(NirvanaColor.teal.opacity(0.1)) + .clipShape(Circle()) + Spacer() + Image(systemName: "rectangle.3.group.fill") + .frame(maxWidth: .infinity) + .frame(width: 40, height: 40) + .foregroundColor(NirvanaColor.teal) + Spacer() + Image(systemName: "suitcase.fill") + .frame(maxWidth: .infinity) + .frame(width: 40, height: 40) + .foregroundColor(NirvanaColor.teal) + } + .frame(maxWidth: .infinity, maxHeight: 50) + .background(Color.white.opacity(0.5)) + .clipShape(RoundedRectangle(cornerRadius: 30, style: .continuous)) + .shadow(color: Color.black.opacity(0.25), radius: 30, x: 0, y: 20) + .padding() + + + FooterControlsView() + .offset(x: 0, y: -25) + } + + + } + // magic variables for grid // TODO: change the number of columns based on the number of items private static var numberOfItems: Int = 20