From 4e52ab96259793e58fed4b1eaaa8145be84a003c Mon Sep 17 00:00:00 2001 From: talksik Date: Sun, 12 Dec 2021 02:36:38 -0800 Subject: [PATCH] fixing more sizing issues and making it clean --- .../FooterControlsView/FooterControlsView.swift | 2 +- .../ChatsCarouselView/ChatsCarouselView.swift | 15 ++++++--------- nirvana-ios/Views/HomeView/HomeView.swift | 4 +--- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/nirvana-ios/Views/FooterControlsView/FooterControlsView.swift b/nirvana-ios/Views/FooterControlsView/FooterControlsView.swift index 1b7b181..5f58b84 100644 --- a/nirvana-ios/Views/FooterControlsView/FooterControlsView.swift +++ b/nirvana-ios/Views/FooterControlsView/FooterControlsView.swift @@ -27,7 +27,7 @@ struct FooterControlsView: View { } } .frame(maxWidth: .infinity) - .padding(.horizontal, 30) + .padding() } } diff --git a/nirvana-ios/Views/HomeView/ChatsCarouselView/ChatsCarouselView.swift b/nirvana-ios/Views/HomeView/ChatsCarouselView/ChatsCarouselView.swift index 55893b5..a5aa8f6 100644 --- a/nirvana-ios/Views/HomeView/ChatsCarouselView/ChatsCarouselView.swift +++ b/nirvana-ios/Views/HomeView/ChatsCarouselView/ChatsCarouselView.swift @@ -35,11 +35,10 @@ struct ChatsCarouselView: View { .shadow(radius: 10) .rotation3DEffect(.degrees(minX / -10), axis: (x: 0, y: 1, z: 0)) .blur(radius: abs(minX) / 40) - .scaleEffect() - .padding(40) - .frame(maxWidth: UIScreen.main.bounds.width) - + } + .frame(maxWidth: UIScreen.main.bounds.width - 100, maxHeight: UIScreen.main.bounds.height - 200) + .padding(20) .tag(carouselUser.id) } } @@ -51,7 +50,7 @@ struct ChatsCarouselView: View { // Bottom navigation carousel ScrollViewReader {proxy in ScrollView(.horizontal, showsIndicators: false) { - HStack(spacing: 20) { + HStack { ForEach(viewModel.carouselUsers) {user in let isSelected = user.id == self.selectedUserId // let isLeftOrRight = !isSelected && @@ -75,12 +74,10 @@ struct ChatsCarouselView: View { self.selectedUserId = user.id } } - .frame(maxHeight: 60) + .padding(20) } } - .frame(maxWidth: .infinity, maxHeight: .infinity) - .padding(.top, 40) - .padding(.horizontal, 40) + .frame(maxHeight: 100) } .onChange(of: self.selectedUserId) { _ in diff --git a/nirvana-ios/Views/HomeView/HomeView.swift b/nirvana-ios/Views/HomeView/HomeView.swift index cd34401..6d20b10 100644 --- a/nirvana-ios/Views/HomeView/HomeView.swift +++ b/nirvana-ios/Views/HomeView/HomeView.swift @@ -14,9 +14,7 @@ struct HomeView: View { ChatsCarouselView() - FooterControlsView() - - Spacer() + FooterControlsView() } .frame(maxWidth:.infinity, maxHeight: .infinity) .accentColor(NirvanaColor.teal)