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 4158f7b..bcc7040 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/Assets.xcassets/TopBarColorBlue.colorset/Contents.json b/Sources/allin/allin/Assets.xcassets/TopBarColorBlue.colorset/Contents.json new file mode 100644 index 0000000..b60560a --- /dev/null +++ b/Sources/allin/allin/Assets.xcassets/TopBarColorBlue.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xEE", + "green" : "0x9F", + "red" : "0x19" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xEE", + "green" : "0x9F", + "red" : "0x19" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Sources/allin/allin/Assets.xcassets/TopBarColorPink.colorset/Contents.json b/Sources/allin/allin/Assets.xcassets/TopBarColorPink.colorset/Contents.json new file mode 100644 index 0000000..babbf18 --- /dev/null +++ b/Sources/allin/allin/Assets.xcassets/TopBarColorPink.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xA8", + "green" : "0x51", + "red" : "0xF9" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xA8", + "green" : "0x51", + "red" : "0xF9" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Sources/allin/allin/Assets.xcassets/TopBarColorPurple.colorset/Contents.json b/Sources/allin/allin/Assets.xcassets/TopBarColorPurple.colorset/Contents.json new file mode 100644 index 0000000..b48ebfa --- /dev/null +++ b/Sources/allin/allin/Assets.xcassets/TopBarColorPurple.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xF3", + "green" : "0x7E", + "red" : "0xAA" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xF3", + "green" : "0x7E", + "red" : "0xAA" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Sources/allin/allin/ContentView.swift b/Sources/allin/allin/ContentView.swift index a6bf910..50016ef 100644 --- a/Sources/allin/allin/ContentView.swift +++ b/Sources/allin/allin/ContentView.swift @@ -50,7 +50,7 @@ struct Home: View { @Binding var showMenu: Bool var body: some View { - VStack(alignment: .center) { + VStack(alignment: .center, spacing: 0) { TopBarView(showMenu: self.$showMenu) ScrollView{ TrendingBetCard() diff --git a/Sources/allin/allin/Ressources/Colors.swift b/Sources/allin/allin/Ressources/Colors.swift index b06506c..f631693 100644 --- a/Sources/allin/allin/Ressources/Colors.swift +++ b/Sources/allin/allin/Ressources/Colors.swift @@ -15,6 +15,9 @@ struct AllinColor { static let darkLight = Color("DarkLight") static let backgroundWhite = Color("BackgroundWhite") static let blueAccent = Color("BlueAccent") + static let TopBarColorPink = Color("TopBarColorPink") + static let TopBarColorBlue = Color("TopBarColorBlue") + static let TopBarColorPurple = Color("TopBarColorPurple") static let gradiantCard = LinearGradient( gradient: Gradient(colors: [AllinColor.pinkAccentText, AllinColor.blueAccent]), startPoint: .bottomLeading, diff --git a/Sources/allin/allin/Views/TopBarView.swift b/Sources/allin/allin/Views/TopBarView.swift index ca40122..fc82f6b 100644 --- a/Sources/allin/allin/Views/TopBarView.swift +++ b/Sources/allin/allin/Views/TopBarView.swift @@ -12,9 +12,6 @@ struct TopBarView: View { @Binding var showMenu: Bool var body: some View { - let TopBarColorPink = Color(red: 249/255, green: 81/255, blue: 168/255) - let TopBarColorBlue = Color(red: 25/255, green: 159/255, blue: 238/255) - let TopBarColorPurple = Color(red: 170/255, green: 126/255, blue: 243/255) ZStack{ HStack{ Button(action: {withAnimation{ self.showMenu = !self.showMenu }}) { @@ -35,7 +32,7 @@ struct TopBarView: View { .padding([.bottom], 20) .padding([.top], 10) .background(LinearGradient(gradient: - Gradient(colors:[TopBarColorPink,TopBarColorPurple,TopBarColorBlue]), + Gradient(colors:[AllinColor.TopBarColorPink,AllinColor.TopBarColorPurple,AllinColor.TopBarColorBlue]), startPoint: .bottomLeading, endPoint: .topTrailing)) }