AllDev
/
Apple
6
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Add PlusJakartaSans font ✅

Browse Source
Menu
Emre KARTAL 2 years ago
parent 0c163a124b
commit cbc1e51a58
7 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File

14
Sources/allin/allin.xcodeproj/project.pbxproj
Unescape View File

@ -53,6 +53,8 @@
D98C4D7E2AB9D019007A6B4D /* AllInUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AllInUITests.swift; sourceTree = "<group>"; }; D98C4D7E2AB9D019007A6B4D /* AllInUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AllInUITests.swift; sourceTree = "<group>"; };
D98C4D802AB9D019007A6B4D /* AllInUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AllInUITestsLaunchTests.swift; sourceTree = "<group>"; }; D98C4D802AB9D019007A6B4D /* AllInUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AllInUITestsLaunchTests.swift; sourceTree = "<group>"; };
D98C4D8D2AB9D440007A6B4D /* TopBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TopBarView.swift; sourceTree = "<group>"; }; D98C4D8D2AB9D440007A6B4D /* TopBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TopBarView.swift; sourceTree = "<group>"; };
EC0EA7AF2ABDAAD1006BA4A0 /* PlusJakartaSans.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = PlusJakartaSans.ttf; sourceTree = "<group>"; };
EC0EA7B02ABDACED006BA4A0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
EC46D7DC2ABCCC270030AC04 /* MenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = MenuView.swift; path = allin/Views/MenuView.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; }; 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; }; 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 */ = { D98C4D622AB9D017007A6B4D /* AllIn */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
EC0EA7B02ABDACED006BA4A0 /* Info.plist */,
EC0EA7AD2ABDAAAC006BA4A0 /* Fonts */,
EC87FCD72ABBA5F200363986 /* Ressources */, EC87FCD72ABBA5F200363986 /* Ressources */,
ECF816C72ABB51E300DE30A4 /* Extensions */, ECF816C72ABB51E300DE30A4 /* Extensions */,
D92EC5782ABAC6B900CCD30E /* Views */, D92EC5782ABAC6B900CCD30E /* Views */,
@ -156,6 +160,14 @@
path = AllInUITests; path = AllInUITests;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
EC0EA7AD2ABDAAAC006BA4A0 /* Fonts */ = {
isa = PBXGroup;
children = (
EC0EA7AF2ABDAAD1006BA4A0 /* PlusJakartaSans.ttf */,
);
path = Fonts;
sourceTree = "<group>";
};
EC87FCD72ABBA5F200363986 /* Ressources */ = { EC87FCD72ABBA5F200363986 /* Ressources */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
@ -472,6 +484,7 @@
DEVELOPMENT_TEAM = 35KQ5BDC64; DEVELOPMENT_TEAM = 35KQ5BDC64;
ENABLE_PREVIEWS = YES; ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = AllIn/Info.plist;
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchScreen_Generation = YES; INFOPLIST_KEY_UILaunchScreen_Generation = YES;
@ -501,6 +514,7 @@
DEVELOPMENT_TEAM = 35KQ5BDC64; DEVELOPMENT_TEAM = 35KQ5BDC64;
ENABLE_PREVIEWS = YES; ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = AllIn/Info.plist;
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchScreen_Generation = YES; INFOPLIST_KEY_UILaunchScreen_Generation = YES;

BIN
Sources/allin/allin.xcodeproj/project.xcworkspace/xcuserdata/etudiant.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

4
Sources/allin/allin/ContentView.swift
Unescape View File

@ -26,10 +26,10 @@ struct ContentView: View {
ZStack(alignment: .leading) { ZStack(alignment: .leading) {
Home(showMenu: self.$showMenu) Home(showMenu: self.$showMenu)
.frame(width: geometry.size.width, height: geometry.size.height) .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 { if self.showMenu {
MenuView() MenuView()
.frame(width: geometry.size.width*0.8) .frame(width: geometry.size.width*0.83)
.transition(.move(edge: .leading)) .transition(.move(edge: .leading))
} }
} }

BIN
Sources/allin/allin/Fonts/PlusJakartaSans.ttf
View File

Binary file not shown.

2
Sources/allin/allin/Views/MenuView.swift
Unescape View File

@ -32,7 +32,7 @@ struct MenuView: View {
} }
.frame(maxWidth: .infinity,alignment: .leading) .frame(maxWidth: .infinity,alignment: .leading)
.background(AllinColor.darkerGray) .background(AllinColor.darkerGray)
.edgesIgnoringSafeArea(.all) .edgesIgnoringSafeArea(.bottom)
} }
} }

4
Sources/allin/allin/Views/ParameterMenuView.swift
Unescape View File

@ -18,9 +18,9 @@ struct ParameterMenuView: View {
Image(icon) Image(icon)
VStack(alignment: .leading){ VStack(alignment: .leading){
Text(title) Text(title)
.betTextStyle(weight: .bold, color: .white, size: 13) .betTextStyle(weight: .bold, color: .white, size: 14)
Text(description) Text(description)
.betTextStyle(weight: .bold, color: AllinColor.DescriptionColorMenu, size: 9) .betTextStyle(weight: .regular, color: AllinColor.DescriptionColorMenu, size: 9)
} }
Spacer() Spacer()
Image("ChevronRightIcon") Image("ChevronRightIcon")

40
Sources/allin/allin/Views/TopBarView.swift
Unescape View File

@ -13,27 +13,27 @@ struct TopBarView: View {
var body: some View { var body: some View {
ZStack{ ZStack{
HStack{ HStack{
Button(action: {withAnimation{ self.showMenu = !self.showMenu }}) { Button(action: {withAnimation{ self.showMenu = !self.showMenu }}) {
Image("menu") Image("menu")
.resizable() .resizable()
.frame(width: 26,height: 15) .frame(width: 26,height: 15)
.padding(.leading, 30) .padding(.leading, 20)
}
Spacer()
CoinCounterView()
} }
.frame(alignment: .top) Spacer()
Image("Icon") CoinCounterView()
.resizable()
.frame(width: 40, height: 40, alignment: .bottom)
} }
.padding([.bottom], 20) .frame(alignment: .top)
.padding([.top], 10) Image("Icon")
.background(LinearGradient(gradient: .resizable()
Gradient(colors:[AllinColor.TopBarColorPink,AllinColor.TopBarColorPurple,AllinColor.TopBarColorBlue]), .frame(width: 40, height: 40, alignment: .bottom)
startPoint: .bottomLeading, endPoint: .topTrailing))
}
}
.padding([.bottom], 20)
.padding([.top], 10)
.background(LinearGradient(gradient:
Gradient(colors:[AllinColor.TopBarColorPink,AllinColor.TopBarColorPurple,AllinColor.TopBarColorBlue]),
startPoint: .bottomLeading, endPoint: .topTrailing))
} }
}

Write Preview
Loading…
Cancel
Save