From 563bf353a80f43d158e684d0bf7d5363a422f4bd Mon Sep 17 00:00:00 2001 From: lucas delanier Date: Sun, 24 Sep 2023 19:05:40 +0200 Subject: [PATCH 1/2] betcard finish --- Sources/allin/allin.xcodeproj/project.pbxproj | 12 +++ .../CapsuleGray.colorset/Contents.json | 38 +++++++++ .../DefaultUserIcon.imageset/Contents.json | 21 +++++ .../DefaultUserIcon.imageset/Ellipse 1-2.png | Bin 0 -> 20893 bytes .../DelimiterGray.colorset/Contents.json | 38 +++++++++ .../LightGray.colorset/Contents.json | 38 +++++++++ .../PrimaryTextColor.colorset/Contents.json | 38 +++++++++ .../TopBarColorPurple.colorset/Contents.json | 6 +- Sources/allin/allin/Ressources/Colors.swift | 6 ++ Sources/allin/allin/Screens/HomeScreen.swift | 7 +- Sources/allin/allin/Views/BetCard.swift | 72 ++++++++++++++++++ Sources/allin/allin/Views/TextCapsule.swift | 23 ++++++ .../allin/allin/Views/TrendingBetCard.swift | 1 - Sources/allin/allin/Views/UsersPreview.swift | 33 ++++++++ 14 files changed, 326 insertions(+), 7 deletions(-) create mode 100644 Sources/allin/allin/Assets.xcassets/CapsuleGray.colorset/Contents.json create mode 100644 Sources/allin/allin/Assets.xcassets/DefaultUserIcon.imageset/Contents.json create mode 100644 Sources/allin/allin/Assets.xcassets/DefaultUserIcon.imageset/Ellipse 1-2.png create mode 100644 Sources/allin/allin/Assets.xcassets/DelimiterGray.colorset/Contents.json create mode 100644 Sources/allin/allin/Assets.xcassets/LightGray.colorset/Contents.json create mode 100644 Sources/allin/allin/Assets.xcassets/PrimaryTextColor.colorset/Contents.json create mode 100644 Sources/allin/allin/Views/BetCard.swift create mode 100644 Sources/allin/allin/Views/TextCapsule.swift create mode 100644 Sources/allin/allin/Views/UsersPreview.swift diff --git a/Sources/allin/allin.xcodeproj/project.pbxproj b/Sources/allin/allin.xcodeproj/project.pbxproj index 338403a..9bf1da5 100644 --- a/Sources/allin/allin.xcodeproj/project.pbxproj +++ b/Sources/allin/allin.xcodeproj/project.pbxproj @@ -16,6 +16,9 @@ D98C4D7F2AB9D019007A6B4D /* AllInUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D98C4D7E2AB9D019007A6B4D /* AllInUITests.swift */; }; D98C4D812AB9D019007A6B4D /* AllInUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D98C4D802AB9D019007A6B4D /* AllInUITestsLaunchTests.swift */; }; D98C4D8E2AB9D440007A6B4D /* TopBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D98C4D8D2AB9D440007A6B4D /* TopBarView.swift */; }; + EC2C1EEB2AC08BE80091D57C /* BetCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC2C1EEA2AC08BE80091D57C /* BetCard.swift */; }; + EC2C1EED2AC093820091D57C /* TextCapsule.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC2C1EEC2AC093820091D57C /* TextCapsule.swift */; }; + EC2C1EEF2AC098D30091D57C /* UsersPreview.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC2C1EEE2AC098D30091D57C /* UsersPreview.swift */; }; EC46D7DD2ABCCC270030AC04 /* MenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC46D7DC2ABCCC270030AC04 /* MenuView.swift */; }; EC46D7DF2ABCE0A20030AC04 /* ParameterMenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC46D7DE2ABCE0A20030AC04 /* ParameterMenuView.swift */; }; EC50BF962ABF4D3300197685 /* SplashScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC50BF952ABF4D3300197685 /* SplashScreen.swift */; }; @@ -57,6 +60,9 @@ D98C4D802AB9D019007A6B4D /* AllInUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AllInUITestsLaunchTests.swift; sourceTree = ""; }; D98C4D8D2AB9D440007A6B4D /* TopBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TopBarView.swift; sourceTree = ""; }; EC0EA7AF2ABDAAD1006BA4A0 /* PlusJakartaSans.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = PlusJakartaSans.ttf; sourceTree = ""; }; + EC2C1EEA2AC08BE80091D57C /* BetCard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = BetCard.swift; path = allin/Views/BetCard.swift; sourceTree = SOURCE_ROOT; }; + EC2C1EEC2AC093820091D57C /* TextCapsule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = TextCapsule.swift; path = allin/Views/TextCapsule.swift; sourceTree = SOURCE_ROOT; }; + EC2C1EEE2AC098D30091D57C /* UsersPreview.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = UsersPreview.swift; path = allin/Views/UsersPreview.swift; sourceTree = SOURCE_ROOT; }; EC46D7DC2ABCCC270030AC04 /* MenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = MenuView.swift; path = allin/Views/MenuView.swift; sourceTree = SOURCE_ROOT; }; EC46D7DE2ABCE0A20030AC04 /* ParameterMenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ParameterMenuView.swift; path = allin/Views/ParameterMenuView.swift; sourceTree = SOURCE_ROOT; }; EC50BF952ABF4D3300197685 /* SplashScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SplashScreen.swift; path = allin/Screens/SplashScreen.swift; sourceTree = SOURCE_ROOT; }; @@ -100,6 +106,9 @@ EC87FCDA2ABBA6AC00363986 /* TrendingBetCard.swift */, EC46D7DC2ABCCC270030AC04 /* MenuView.swift */, EC46D7DE2ABCE0A20030AC04 /* ParameterMenuView.swift */, + EC2C1EEA2AC08BE80091D57C /* BetCard.swift */, + EC2C1EEC2AC093820091D57C /* TextCapsule.swift */, + EC2C1EEE2AC098D30091D57C /* UsersPreview.swift */, ); path = Views; sourceTree = ""; @@ -331,15 +340,18 @@ files = ( EC87FCD62ABBA24000363986 /* Extensions.swift in Sources */, EC46D7DD2ABCCC270030AC04 /* MenuView.swift in Sources */, + EC2C1EEB2AC08BE80091D57C /* BetCard.swift in Sources */, EC87FCD92ABBA60900363986 /* Colors.swift in Sources */, D98C4D662AB9D017007A6B4D /* ContentView.swift in Sources */, D92EC57C2ABADA2800CCD30E /* CoinCounterView.swift in Sources */, + EC2C1EED2AC093820091D57C /* TextCapsule.swift in Sources */, D98C4D8E2AB9D440007A6B4D /* TopBarView.swift in Sources */, EC50BF962ABF4D3300197685 /* SplashScreen.swift in Sources */, EC9A45B02ABDF4A800125D41 /* HomeScreen.swift in Sources */, EC46D7DF2ABCE0A20030AC04 /* ParameterMenuView.swift in Sources */, EC50BF982ABF541B00197685 /* WelcomeScreen.swift in Sources */, D98C4D642AB9D017007A6B4D /* AllInApp.swift in Sources */, + EC2C1EEF2AC098D30091D57C /* UsersPreview.swift in Sources */, EC87FCDB2ABBA6AC00363986 /* TrendingBetCard.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Sources/allin/allin/Assets.xcassets/CapsuleGray.colorset/Contents.json b/Sources/allin/allin/Assets.xcassets/CapsuleGray.colorset/Contents.json new file mode 100644 index 0000000..95954f7 --- /dev/null +++ b/Sources/allin/allin/Assets.xcassets/CapsuleGray.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xF9", + "green" : "0xF9", + "red" : "0xF9" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xF9", + "green" : "0xF9", + "red" : "0xF9" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Sources/allin/allin/Assets.xcassets/DefaultUserIcon.imageset/Contents.json b/Sources/allin/allin/Assets.xcassets/DefaultUserIcon.imageset/Contents.json new file mode 100644 index 0000000..121781c --- /dev/null +++ b/Sources/allin/allin/Assets.xcassets/DefaultUserIcon.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "Ellipse 1-2.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Sources/allin/allin/Assets.xcassets/DefaultUserIcon.imageset/Ellipse 1-2.png b/Sources/allin/allin/Assets.xcassets/DefaultUserIcon.imageset/Ellipse 1-2.png new file mode 100644 index 0000000000000000000000000000000000000000..fd31ae8f46b044e98d6beafc2029fb1163e1b72a GIT binary patch literal 20893 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 Date: Tue, 26 Sep 2023 15:38:42 +0200 Subject: [PATCH 2/2] dark and light mode and scroll choice component on main page --- Sources/allin/allin.xcodeproj/project.pbxproj | 4 ++ .../BackgroundWhite.colorset/Contents.json | 6 +-- .../BetCardBackground.colorset/Contents.json | 38 +++++++++++++++++++ .../BetTitle.colorset/Contents.json | 38 +++++++++++++++++++ .../CapsuleGray.colorset/Contents.json | 12 +++--- .../DelimiterGray.colorset/Contents.json | 6 +-- .../LightGray_200.colorset/Contents.json | 38 +++++++++++++++++++ .../Contents.json | 38 +++++++++++++++++++ Sources/allin/allin/Ressources/Colors.swift | 8 ++++ Sources/allin/allin/Screens/HomeScreen.swift | 36 ++++++++++++++++-- Sources/allin/allin/Views/BetCard.swift | 11 ++++-- Sources/allin/allin/Views/ChoiceCapsule.swift | 35 +++++++++++++++++ .../allin/allin/Views/TrendingBetCard.swift | 2 +- 13 files changed, 252 insertions(+), 20 deletions(-) create mode 100644 Sources/allin/allin/Assets.xcassets/BetCardBackground.colorset/Contents.json create mode 100644 Sources/allin/allin/Assets.xcassets/BetTitle.colorset/Contents.json create mode 100644 Sources/allin/allin/Assets.xcassets/LightGray_200.colorset/Contents.json create mode 100644 Sources/allin/allin/Assets.xcassets/TrendingBetCardBackground.colorset/Contents.json create mode 100644 Sources/allin/allin/Views/ChoiceCapsule.swift diff --git a/Sources/allin/allin.xcodeproj/project.pbxproj b/Sources/allin/allin.xcodeproj/project.pbxproj index 9bf1da5..5c15789 100644 --- a/Sources/allin/allin.xcodeproj/project.pbxproj +++ b/Sources/allin/allin.xcodeproj/project.pbxproj @@ -19,6 +19,7 @@ EC2C1EEB2AC08BE80091D57C /* BetCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC2C1EEA2AC08BE80091D57C /* BetCard.swift */; }; EC2C1EED2AC093820091D57C /* TextCapsule.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC2C1EEC2AC093820091D57C /* TextCapsule.swift */; }; EC2C1EEF2AC098D30091D57C /* UsersPreview.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC2C1EEE2AC098D30091D57C /* UsersPreview.swift */; }; + EC3737E42AC2F5FB00E6BDB5 /* ChoiceCapsule.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC3737E32AC2F5FB00E6BDB5 /* ChoiceCapsule.swift */; }; EC46D7DD2ABCCC270030AC04 /* MenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC46D7DC2ABCCC270030AC04 /* MenuView.swift */; }; EC46D7DF2ABCE0A20030AC04 /* ParameterMenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC46D7DE2ABCE0A20030AC04 /* ParameterMenuView.swift */; }; EC50BF962ABF4D3300197685 /* SplashScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC50BF952ABF4D3300197685 /* SplashScreen.swift */; }; @@ -63,6 +64,7 @@ EC2C1EEA2AC08BE80091D57C /* BetCard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = BetCard.swift; path = allin/Views/BetCard.swift; sourceTree = SOURCE_ROOT; }; EC2C1EEC2AC093820091D57C /* TextCapsule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = TextCapsule.swift; path = allin/Views/TextCapsule.swift; sourceTree = SOURCE_ROOT; }; EC2C1EEE2AC098D30091D57C /* UsersPreview.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = UsersPreview.swift; path = allin/Views/UsersPreview.swift; sourceTree = SOURCE_ROOT; }; + EC3737E32AC2F5FB00E6BDB5 /* ChoiceCapsule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ChoiceCapsule.swift; path = allin/Views/ChoiceCapsule.swift; sourceTree = SOURCE_ROOT; }; EC46D7DC2ABCCC270030AC04 /* MenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = MenuView.swift; path = allin/Views/MenuView.swift; sourceTree = SOURCE_ROOT; }; EC46D7DE2ABCE0A20030AC04 /* ParameterMenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ParameterMenuView.swift; path = allin/Views/ParameterMenuView.swift; sourceTree = SOURCE_ROOT; }; EC50BF952ABF4D3300197685 /* SplashScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SplashScreen.swift; path = allin/Screens/SplashScreen.swift; sourceTree = SOURCE_ROOT; }; @@ -109,6 +111,7 @@ EC2C1EEA2AC08BE80091D57C /* BetCard.swift */, EC2C1EEC2AC093820091D57C /* TextCapsule.swift */, EC2C1EEE2AC098D30091D57C /* UsersPreview.swift */, + EC3737E32AC2F5FB00E6BDB5 /* ChoiceCapsule.swift */, ); path = Views; sourceTree = ""; @@ -344,6 +347,7 @@ EC87FCD92ABBA60900363986 /* Colors.swift in Sources */, D98C4D662AB9D017007A6B4D /* ContentView.swift in Sources */, D92EC57C2ABADA2800CCD30E /* CoinCounterView.swift in Sources */, + EC3737E42AC2F5FB00E6BDB5 /* ChoiceCapsule.swift in Sources */, EC2C1EED2AC093820091D57C /* TextCapsule.swift in Sources */, D98C4D8E2AB9D440007A6B4D /* TopBarView.swift in Sources */, EC50BF962ABF4D3300197685 /* SplashScreen.swift in Sources */, diff --git a/Sources/allin/allin/Assets.xcassets/BackgroundWhite.colorset/Contents.json b/Sources/allin/allin/Assets.xcassets/BackgroundWhite.colorset/Contents.json index 79a05ce..6dc7e58 100644 --- a/Sources/allin/allin/Assets.xcassets/BackgroundWhite.colorset/Contents.json +++ b/Sources/allin/allin/Assets.xcassets/BackgroundWhite.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "display-p3", "components" : { "alpha" : "1.000", - "blue" : "0x26", - "green" : "0x24", - "red" : "0x25" + "blue" : "0x1C", + "green" : "0x1C", + "red" : "0x1C" } }, "idiom" : "universal" diff --git a/Sources/allin/allin/Assets.xcassets/BetCardBackground.colorset/Contents.json b/Sources/allin/allin/Assets.xcassets/BetCardBackground.colorset/Contents.json new file mode 100644 index 0000000..fe25ab7 --- /dev/null +++ b/Sources/allin/allin/Assets.xcassets/BetCardBackground.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xFF", + "green" : "0xFF", + "red" : "0xFF" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x26", + "green" : "0x26", + "red" : "0x26" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Sources/allin/allin/Assets.xcassets/BetTitle.colorset/Contents.json b/Sources/allin/allin/Assets.xcassets/BetTitle.colorset/Contents.json new file mode 100644 index 0000000..2536dc2 --- /dev/null +++ b/Sources/allin/allin/Assets.xcassets/BetTitle.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xFF", + "green" : "0xFF", + "red" : "0xFF" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xFF", + "green" : "0xFF", + "red" : "0xFF" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Sources/allin/allin/Assets.xcassets/CapsuleGray.colorset/Contents.json b/Sources/allin/allin/Assets.xcassets/CapsuleGray.colorset/Contents.json index 95954f7..29efc6f 100644 --- a/Sources/allin/allin/Assets.xcassets/CapsuleGray.colorset/Contents.json +++ b/Sources/allin/allin/Assets.xcassets/CapsuleGray.colorset/Contents.json @@ -5,9 +5,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0xF9", - "green" : "0xF9", - "red" : "0xF9" + "blue" : "0xF7", + "green" : "0xF7", + "red" : "0xF7" } }, "idiom" : "universal" @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0xF9", - "green" : "0xF9", - "red" : "0xF9" + "blue" : "0x2A", + "green" : "0x2A", + "red" : "0x2A" } }, "idiom" : "universal" diff --git a/Sources/allin/allin/Assets.xcassets/DelimiterGray.colorset/Contents.json b/Sources/allin/allin/Assets.xcassets/DelimiterGray.colorset/Contents.json index 771d19d..53b0ea1 100644 --- a/Sources/allin/allin/Assets.xcassets/DelimiterGray.colorset/Contents.json +++ b/Sources/allin/allin/Assets.xcassets/DelimiterGray.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0xEB", - "green" : "0xEB", - "red" : "0xEB" + "blue" : "0x39", + "green" : "0x39", + "red" : "0x39" } }, "idiom" : "universal" diff --git a/Sources/allin/allin/Assets.xcassets/LightGray_200.colorset/Contents.json b/Sources/allin/allin/Assets.xcassets/LightGray_200.colorset/Contents.json new file mode 100644 index 0000000..4f6f888 --- /dev/null +++ b/Sources/allin/allin/Assets.xcassets/LightGray_200.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xEB", + "green" : "0xEB", + "red" : "0xEB" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0x39", + "green" : "0x39", + "red" : "0x39" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Sources/allin/allin/Assets.xcassets/TrendingBetCardBackground.colorset/Contents.json b/Sources/allin/allin/Assets.xcassets/TrendingBetCardBackground.colorset/Contents.json new file mode 100644 index 0000000..85730c1 --- /dev/null +++ b/Sources/allin/allin/Assets.xcassets/TrendingBetCardBackground.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x2A", + "green" : "0x2A", + "red" : "0x2A" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x2A", + "green" : "0x2A", + "red" : "0x2A" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Sources/allin/allin/Ressources/Colors.swift b/Sources/allin/allin/Ressources/Colors.swift index 40255ef..6cab901 100644 --- a/Sources/allin/allin/Ressources/Colors.swift +++ b/Sources/allin/allin/Ressources/Colors.swift @@ -27,6 +27,9 @@ struct AllinColor { static let PrimaryTextColor = Color("PrimaryTextColor") static let DelimiterGray = Color("DelimiterGray") static let CapsuleGray = Color("CapsuleGray") + static let LightGray_200 = Color("LightGray_200") + static let TrendingBetCardBackground = Color("TrendingBetCardBackground") + static let BetCardBackground = Color("BetCardBackground") static let gradiantCard = LinearGradient( @@ -34,4 +37,9 @@ struct AllinColor { startPoint: .bottomLeading, endPoint: .topTrailing ) + static let fadeInGradiantCard = LinearGradient( + gradient: Gradient(colors: [AllinColor.backgroundWhite.opacity(0), AllinColor.backgroundWhite.opacity(0.9),AllinColor.backgroundWhite]), + startPoint: .bottom, + endPoint: .top + ) } diff --git a/Sources/allin/allin/Screens/HomeScreen.swift b/Sources/allin/allin/Screens/HomeScreen.swift index 25c49b2..95106d0 100644 --- a/Sources/allin/allin/Screens/HomeScreen.swift +++ b/Sources/allin/allin/Screens/HomeScreen.swift @@ -14,10 +14,38 @@ struct Home: View { var body: some View { VStack(alignment: .center, spacing: 0) { TopBarView(showMenu: self.$showMenu) - ScrollView{ - TrendingBetCard().padding(.top,25) - BetCard() - }.padding([.leading,.trailing],25) + ScrollView(showsIndicators: false){ + LazyVStack(alignment: .leading, spacing: 0, pinnedViews: [.sectionHeaders]) { + + TrendingBetCard().padding(.top,25).padding([.leading,.trailing],25) + + Section { + VStack(spacing: 20){ + BetCard() + BetCard() + BetCard() + }.padding([.leading,.trailing],25) + } header: { + ZStack{ + AllinColor.fadeInGradiantCard + ScrollView(.horizontal,showsIndicators: false){ + HStack{ + ChoiceCapsule() + ChoiceCapsule() + ChoiceCapsule() + ChoiceCapsule() + ChoiceCapsule() + ChoiceCapsule() + ChoiceCapsule() + }.padding(.leading,25).padding([.top,.bottom],15) + + } + } + + } + + } + } Spacer() } diff --git a/Sources/allin/allin/Views/BetCard.swift b/Sources/allin/allin/Views/BetCard.swift index af37535..70cb769 100644 --- a/Sources/allin/allin/Views/BetCard.swift +++ b/Sources/allin/allin/Views/BetCard.swift @@ -27,7 +27,7 @@ struct BetCard: View { } }.frame(width: .infinity).padding(.all,15) - .background(.white).cornerRadius(20, corners: [.topLeft,.topRight]).padding(.bottom,0) + .background(AllinColor.BetCardBackground).cornerRadius(20, corners: [.topLeft,.topRight]).padding(.bottom,0) VStack(alignment: .leading,spacing: 2){ HStack{ Spacer() @@ -55,8 +55,13 @@ struct BetCard: View { ) } } - .accentColor(.white) - .buttonStyle(.borderedProminent).padding([.top],5) + + .accentColor(AllinColor.BetCardBackground) + .buttonStyle(.borderedProminent).cornerRadius(4.0) + .overlay( + RoundedRectangle(cornerRadius: 12).stroke(AllinColor.DelimiterGray , lineWidth: 1) + ).padding([.top],5) + }.frame(width: .infinity).padding(.all,8) .background(AllinColor.CapsuleGray).cornerRadius(20, corners: [.bottomLeft,.bottomRight]).padding(.bottom,0).border(width: 1, edges: [.top], color: AllinColor.DelimiterGray) diff --git a/Sources/allin/allin/Views/ChoiceCapsule.swift b/Sources/allin/allin/Views/ChoiceCapsule.swift new file mode 100644 index 0000000..bb2f962 --- /dev/null +++ b/Sources/allin/allin/Views/ChoiceCapsule.swift @@ -0,0 +1,35 @@ +// +// ChoiceCapsule.swift +// AllIn +// +// Created by étudiant on 26/09/2023. +// + +import SwiftUI + +struct ChoiceCapsule: View { + @State var buttonPressed = false + var body: some View { + Group { + if(buttonPressed){ + Text("En cours").font(.system(size: 15)).foregroundColor(.white).fontWeight(.semibold).padding([.leading,.trailing],13.8).padding([.top,.bottom], 7).background(AllinColor.PrimaryTextColor).clipShape(Capsule() + ) + }else{ + Text("En cours").font(.system(size: 15)).foregroundColor(AllinColor.lightGray).fontWeight(.regular).padding([.leading,.trailing],15).padding([.top,.bottom], 7).background(AllinColor.CapsuleGray).clipShape(Capsule()).overlay( /// apply a rounded border + RoundedRectangle(cornerRadius: 20) + .stroke(AllinColor.LightGray_200, lineWidth: 1) + ) + } + } + .onTapGesture() { + buttonPressed.toggle() + } + + } +} + +struct ChoiceCapsule_Previews: PreviewProvider { + static var previews: some View { + ChoiceCapsule() + } +} diff --git a/Sources/allin/allin/Views/TrendingBetCard.swift b/Sources/allin/allin/Views/TrendingBetCard.swift index 434865e..f7574cc 100644 --- a/Sources/allin/allin/Views/TrendingBetCard.swift +++ b/Sources/allin/allin/Views/TrendingBetCard.swift @@ -70,7 +70,7 @@ struct TrendingBetCard: View { } } .frame(height: 127, alignment: .topLeading) - .background(AllinColor.darkerGray) + .background(AllinColor.TrendingBetCardBackground) .overlay( RoundedRectangle(cornerRadius: 20, style: .continuous) .stroke(AllinColor.gradiantCard, lineWidth: 5)