diff --git a/Sources/allin/allin.xcodeproj/project.xcworkspace/xcuserdata/etudiant.xcuserdatad/UserInterfaceState.xcuserstate b/Sources/allin/allin.xcodeproj/project.xcworkspace/xcuserdata/etudiant.xcuserdatad/UserInterfaceState.xcuserstate index 1adf627..4158f7b 100644 Binary files a/Sources/allin/allin.xcodeproj/project.xcworkspace/xcuserdata/etudiant.xcuserdatad/UserInterfaceState.xcuserstate and b/Sources/allin/allin.xcodeproj/project.xcworkspace/xcuserdata/etudiant.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Sources/allin/allin/ContentView.swift b/Sources/allin/allin/ContentView.swift index 85134d1..a6bf910 100644 --- a/Sources/allin/allin/ContentView.swift +++ b/Sources/allin/allin/ContentView.swift @@ -26,7 +26,7 @@ struct ContentView: View { ZStack(alignment: .leading) { Home(showMenu: self.$showMenu) .frame(width: geometry.size.width, height: geometry.size.height) - .offset(x: self.showMenu ? geometry.size.width/1.3:0) + .offset(x: self.showMenu ? geometry.size.width/1.25:0) if self.showMenu { MenuView() .frame(width: geometry.size.width*0.8) @@ -34,6 +34,7 @@ struct ContentView: View { } } .gesture(drag) + } } } @@ -51,8 +52,13 @@ struct Home: View { var body: some View { VStack(alignment: .center) { TopBarView(showMenu: self.$showMenu) - TrendingBetCard()} - .edgesIgnoringSafeArea(.top) + ScrollView{ + TrendingBetCard() + } + + Spacer() + } + .edgesIgnoringSafeArea(.bottom) } } diff --git a/Sources/allin/allin/Views/TopBarView.swift b/Sources/allin/allin/Views/TopBarView.swift index 21c2850..ca40122 100644 --- a/Sources/allin/allin/Views/TopBarView.swift +++ b/Sources/allin/allin/Views/TopBarView.swift @@ -27,7 +27,6 @@ struct TopBarView: View { CoinCounterView() } .frame(alignment: .top) - .padding(.leading, 20) Image("Icon") .resizable() .frame(width: 40, height: 40, alignment: .bottom)