diff --git a/Sources/allin/allin.xcodeproj/project.pbxproj b/Sources/allin/allin.xcodeproj/project.pbxproj index d88e295..54d1c12 100644 --- a/Sources/allin/allin.xcodeproj/project.pbxproj +++ b/Sources/allin/allin.xcodeproj/project.pbxproj @@ -53,6 +53,8 @@ D98C4D7E2AB9D019007A6B4D /* AllInUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AllInUITests.swift; sourceTree = ""; }; 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 = ""; }; + EC0EA7B02ABDACED006BA4A0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; 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; }; EC87FCD52ABBA24000363986 /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Extensions.swift; path = allin/Extensions/Extensions.swift; sourceTree = SOURCE_ROOT; }; @@ -120,6 +122,8 @@ D98C4D622AB9D017007A6B4D /* AllIn */ = { isa = PBXGroup; children = ( + EC0EA7B02ABDACED006BA4A0 /* Info.plist */, + EC0EA7AD2ABDAAAC006BA4A0 /* Fonts */, EC87FCD72ABBA5F200363986 /* Ressources */, ECF816C72ABB51E300DE30A4 /* Extensions */, D92EC5782ABAC6B900CCD30E /* Views */, @@ -156,6 +160,14 @@ path = AllInUITests; sourceTree = ""; }; + EC0EA7AD2ABDAAAC006BA4A0 /* Fonts */ = { + isa = PBXGroup; + children = ( + EC0EA7AF2ABDAAD1006BA4A0 /* PlusJakartaSans.ttf */, + ); + path = Fonts; + sourceTree = ""; + }; EC87FCD72ABBA5F200363986 /* Ressources */ = { isa = PBXGroup; children = ( @@ -472,6 +484,7 @@ DEVELOPMENT_TEAM = 35KQ5BDC64; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_FILE = AllIn/Info.plist; INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchScreen_Generation = YES; @@ -501,6 +514,7 @@ DEVELOPMENT_TEAM = 35KQ5BDC64; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_FILE = AllIn/Info.plist; INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchScreen_Generation = YES; 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 ac598ab..857762b 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 d1a2733..dadefba 100644 --- a/Sources/allin/allin/ContentView.swift +++ b/Sources/allin/allin/ContentView.swift @@ -26,10 +26,10 @@ 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.25:0) + .offset(x: self.showMenu ? geometry.size.width/1.21:0) if self.showMenu { MenuView() - .frame(width: geometry.size.width*0.8) + .frame(width: geometry.size.width*0.83) .transition(.move(edge: .leading)) } } diff --git a/Sources/allin/allin/Fonts/PlusJakartaSans.ttf b/Sources/allin/allin/Fonts/PlusJakartaSans.ttf new file mode 100644 index 0000000..7de3b5b Binary files /dev/null and b/Sources/allin/allin/Fonts/PlusJakartaSans.ttf differ diff --git a/Sources/allin/allin/Views/MenuView.swift b/Sources/allin/allin/Views/MenuView.swift index 9cdb5af..3273aaa 100644 --- a/Sources/allin/allin/Views/MenuView.swift +++ b/Sources/allin/allin/Views/MenuView.swift @@ -32,7 +32,7 @@ struct MenuView: View { } .frame(maxWidth: .infinity,alignment: .leading) .background(AllinColor.darkerGray) - .edgesIgnoringSafeArea(.all) + .edgesIgnoringSafeArea(.bottom) } } diff --git a/Sources/allin/allin/Views/ParameterMenuView.swift b/Sources/allin/allin/Views/ParameterMenuView.swift index fb56b02..0a19c34 100644 --- a/Sources/allin/allin/Views/ParameterMenuView.swift +++ b/Sources/allin/allin/Views/ParameterMenuView.swift @@ -18,9 +18,9 @@ struct ParameterMenuView: View { Image(icon) VStack(alignment: .leading){ Text(title) - .betTextStyle(weight: .bold, color: .white, size: 13) + .betTextStyle(weight: .bold, color: .white, size: 14) Text(description) - .betTextStyle(weight: .bold, color: AllinColor.DescriptionColorMenu, size: 9) + .betTextStyle(weight: .regular, color: AllinColor.DescriptionColorMenu, size: 9) } Spacer() Image("ChevronRightIcon") diff --git a/Sources/allin/allin/Views/TopBarView.swift b/Sources/allin/allin/Views/TopBarView.swift index fc82f6b..141fd6b 100644 --- a/Sources/allin/allin/Views/TopBarView.swift +++ b/Sources/allin/allin/Views/TopBarView.swift @@ -13,27 +13,27 @@ struct TopBarView: View { var body: some View { ZStack{ - HStack{ - Button(action: {withAnimation{ self.showMenu = !self.showMenu }}) { - Image("menu") - .resizable() - .frame(width: 26,height: 15) - .padding(.leading, 30) - } - Spacer() - CoinCounterView() + HStack{ + Button(action: {withAnimation{ self.showMenu = !self.showMenu }}) { + Image("menu") + .resizable() + .frame(width: 26,height: 15) + .padding(.leading, 20) } - .frame(alignment: .top) - Image("Icon") - .resizable() - .frame(width: 40, height: 40, alignment: .bottom) - + Spacer() + CoinCounterView() } - .padding([.bottom], 20) - .padding([.top], 10) - .background(LinearGradient(gradient: - Gradient(colors:[AllinColor.TopBarColorPink,AllinColor.TopBarColorPurple,AllinColor.TopBarColorBlue]), - startPoint: .bottomLeading, endPoint: .topTrailing)) - } - + .frame(alignment: .top) + Image("Icon") + .resizable() + .frame(width: 40, height: 40, alignment: .bottom) + + } + .padding([.bottom], 20) + .padding([.top], 10) + .background(LinearGradient(gradient: + Gradient(colors:[AllinColor.TopBarColorPink,AllinColor.TopBarColorPurple,AllinColor.TopBarColorBlue]), + startPoint: .bottomLeading, endPoint: .topTrailing)) } + +}