From b231355bf5aa189284d5c7a5837d08481776ed40 Mon Sep 17 00:00:00 2001 From: talksik Date: Thu, 16 Dec 2021 20:56:06 -0800 Subject: [PATCH] more progress on overall feel --- .../v2/InnerCircle/InnerCircleView.swift | 47 ++++++++++--------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/nirvana-ios/v2/InnerCircle/InnerCircleView.swift b/nirvana-ios/v2/InnerCircle/InnerCircleView.swift index ba229dc..2873386 100644 --- a/nirvana-ios/v2/InnerCircle/InnerCircleView.swift +++ b/nirvana-ios/v2/InnerCircle/InnerCircleView.swift @@ -14,7 +14,7 @@ struct InnerCircleView: View { @State var animateWaves = false var body: some View { - ZStack(alignment: .top) { + ZStack { // background ZStack { AngularGradient( @@ -56,8 +56,23 @@ struct InnerCircleView: View { // content gridContent + // inner circle + Rectangle() + .foregroundColor(Color.white.opacity(0.5)) + .frame(width:universalSize.width*0.65, height: universalSize.height*0.3) + // outer circle + Rectangle() + .foregroundColor(Color.white.opacity(0.5)) + .frame(width:universalSize.width*0.75, height: universalSize.height*0.15) + //way out circle +// Ellipse() +// .foregroundColor(Color.white) +// .frame(width:universalSize.width*0.65, height: universalSize.height*0.3) + // header ZStack(alignment: .top) { + Color.clear + header } } @@ -66,12 +81,13 @@ struct InnerCircleView: View { } } - // magiv variables for grid + // magic variables for grid + // TODO: change the number of columns based on the number of items + private static var numberOfItems: Int = 50 private static let size: CGFloat = 80 private static let spacingBetweenColumns: CGFloat = 10 private static let spacingBetweenRows: CGFloat = 10 - private static let totalColumns: Int = 3 - private var numberOfItems: Int = 10 + private static let totalColumns: Int = Int(log2(Double(Self.numberOfItems))) @State private var selectedUserIndex = 0 @@ -89,7 +105,7 @@ struct InnerCircleView: View { spacing: Self.spacingBetweenRows ) { - ForEach(1..<11) { value in + ForEach(1..