zec
/
zashi-ios-wallet-private
mirror of https://github.com/zcash/zashi-ios-wallet-private.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add Rubik fonts 

Use Variable fonts
This commit is contained in:
Francisco Gindre 2021-10-19 15:11:47 -03:00
parent 7f6c06af4f
commit 6d299c6a98
9 changed files with 82 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
secant.xcodeproj/project.pbxproj
View File

@ -34,6 +34,8 @@
0D4E7A1026B364180058B01E /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0D4E7A0F26B364180058B01E /* Preview Assets.xcassets */; };
0D4E7A1B26B364180058B01E /* secantTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0D4E7A1A26B364180058B01E /* secantTests.swift */; };
0D4E7A2626B364180058B01E /* secantUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0D4E7A2526B364180058B01E /* secantUITests.swift */; };
0D535FDE271F4214009A9E3E /* Rubik-Italic-VariableFont_wght.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0D535FDC271F4214009A9E3E /* Rubik-Italic-VariableFont_wght.ttf */; };
0D535FDF271F4214009A9E3E /* Rubik-VariableFont_wght.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0D535FDD271F4214009A9E3E /* Rubik-VariableFont_wght.ttf */; };
0D5D16F526E24CCF00AD33D1 /* AppError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0D5D16F426E24CCF00AD33D1 /* AppError.swift */; };
0D7DF08C271DCC0E00530046 /* ScreenBackground.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0D7DF08B271DCC0E00530046 /* ScreenBackground.swift */; };
0D864A0526E1546000A61879 /* LoadingScreenTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0D864A0426E1546000A61879 /* LoadingScreenTests.swift */; };
@ -118,6 +120,8 @@
0D4E7A2126B364180058B01E /* secantUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = secantUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
0D4E7A2526B364180058B01E /* secantUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = secantUITests.swift; sourceTree = "<group>"; };
0D4E7A2726B364180058B01E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
0D535FDC271F4214009A9E3E /* Rubik-Italic-VariableFont_wght.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Rubik-Italic-VariableFont_wght.ttf"; sourceTree = "<group>"; };
0D535FDD271F4214009A9E3E /* Rubik-VariableFont_wght.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Rubik-VariableFont_wght.ttf"; sourceTree = "<group>"; };
0D5D16F426E24CCF00AD33D1 /* AppError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppError.swift; sourceTree = "<group>"; };
0D7DF08B271DCC0E00530046 /* ScreenBackground.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScreenBackground.swift; sourceTree = "<group>"; };
0D864A0426E1546000A61879 /* LoadingScreenTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingScreenTests.swift; sourceTree = "<group>"; };
@ -234,6 +238,7 @@
0D2ACE7E26C2C65E00D62E3C /* Fonts */ = {
isa = PBXGroup;
children = (
0D535FDB271F3B50009A9E3E /* Rubik */,
0D2ACE7F26C2C67100D62E3C /* Zboto.otf */,
);
path = Fonts;
@ -365,6 +370,15 @@
path = secantUITests;
sourceTree = "<group>";
};
0D535FDB271F3B50009A9E3E /* Rubik */ = {
isa = PBXGroup;
children = (
0D535FDC271F4214009A9E3E /* Rubik-Italic-VariableFont_wght.ttf */,
0D535FDD271F4214009A9E3E /* Rubik-VariableFont_wght.ttf */,
);
path = Rubik;
sourceTree = "<group>";
};
0D5D16F326E24CB900AD33D1 /* App Errors */ = {
isa = PBXGroup;
children = (
@ -612,8 +626,10 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
0D535FDE271F4214009A9E3E /* Rubik-Italic-VariableFont_wght.ttf in Resources */,
0D4E7A1026B364180058B01E /* Preview Assets.xcassets in Resources */,
660558E9270C7A54009D6954 /* Colors.xcassets in Resources */,
0D535FDF271F4214009A9E3E /* Rubik-VariableFont_wght.ttf in Resources */,
0D4E7A0D26B364180058B01E /* Assets.xcassets in Resources */,
0D2ACE8026C2C67100D62E3C /* Zboto.otf in Resources */,
);

38
secant/Colors.xcassets/Text/TitleText.colorset/Contents.json Normal file
View File

@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x47",
"green" : "0x37",
"red" : "0x2D"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xF2",
"green" : "0xDC",
"red" : "0xCB"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
secant/Fonts/Rubik/Rubik-Italic-VariableFont_wght.ttf Normal file
View File

Binary file not shown.

BIN
secant/Fonts/Rubik/Rubik-VariableFont_wght.ttf Normal file
View File

Binary file not shown.

19
secant/Generated/Fonts+Generated.swift
View File

@ -19,11 +19,28 @@ internal typealias SystemFont = FontConvertible.SystemFont
// swiftlint:disable identifier_name line_length type_body_length
internal enum FontFamily {
internal enum Rubik {
internal static let light = FontConvertible(name: "Rubik-Light", family: "Rubik", path: "Rubik-VariableFont_wght.ttf")
internal static let lightItalic = FontConvertible(name: "Rubik-LightItalic", family: "Rubik", path: "Rubik-Italic-VariableFont_wght.ttf")
internal static let blackItalic = FontConvertible(name: "RubikItalic-Black", family: "Rubik", path: "Rubik-Italic-VariableFont_wght.ttf")
internal static let boldItalic = FontConvertible(name: "RubikItalic-Bold", family: "Rubik", path: "Rubik-Italic-VariableFont_wght.ttf")
internal static let extraBoldItalic = FontConvertible(name: "RubikItalic-ExtraBold", family: "Rubik", path: "Rubik-Italic-VariableFont_wght.ttf")
internal static let mediumItalic = FontConvertible(name: "RubikItalic-Medium", family: "Rubik", path: "Rubik-Italic-VariableFont_wght.ttf")
internal static let italic = FontConvertible(name: "RubikItalic-Regular", family: "Rubik", path: "Rubik-Italic-VariableFont_wght.ttf")
internal static let semiBoldItalic = FontConvertible(name: "RubikItalic-SemiBold", family: "Rubik", path: "Rubik-Italic-VariableFont_wght.ttf")
internal static let black = FontConvertible(name: "RubikRoman-Black", family: "Rubik", path: "Rubik-VariableFont_wght.ttf")
internal static let bold = FontConvertible(name: "RubikRoman-Bold", family: "Rubik", path: "Rubik-VariableFont_wght.ttf")
internal static let extraBold = FontConvertible(name: "RubikRoman-ExtraBold", family: "Rubik", path: "Rubik-VariableFont_wght.ttf")
internal static let medium = FontConvertible(name: "RubikRoman-Medium", family: "Rubik", path: "Rubik-VariableFont_wght.ttf")
internal static let regular = FontConvertible(name: "RubikRoman-Regular", family: "Rubik", path: "Rubik-VariableFont_wght.ttf")
internal static let semiBold = FontConvertible(name: "RubikRoman-SemiBold", family: "Rubik", path: "Rubik-VariableFont_wght.ttf")
internal static let all: [FontConvertible] = [light, lightItalic, blackItalic, boldItalic, extraBoldItalic, mediumItalic, italic, semiBoldItalic, black, bold, extraBold, medium, regular, semiBold]
}
internal enum Zboto {
internal static let regular = FontConvertible(name: "ZbotoRegular", family: "Zboto", path: "Zboto.otf")
internal static let all: [FontConvertible] = [regular]
}
internal static let allCustomFonts: [FontConvertible] = [Zboto.all].flatMap { $0 }
internal static let allCustomFonts: [FontConvertible] = [Rubik.all, Zboto.all].flatMap { $0 }
internal static func registerAllCustomFonts() {
allCustomFonts.forEach { $0.register() }
}

1
secant/Generated/XCAssets+Generated.swift
View File

@ -64,6 +64,7 @@ internal enum Asset {
internal static let medium = ColorAsset(name: "Medium")
internal static let regular = ColorAsset(name: "Regular")
internal static let secondaryButtonText = ColorAsset(name: "SecondaryButtonText")
internal static let titleText = ColorAsset(name: "TitleText")
}
}
}

2
secant/Info.plist
View File

@ -30,6 +30,8 @@
<key>UIAppFonts</key>
<array>
<string>Zboto.otf</string>
<string>Rubik-Italic-VariableFont_wght.ttf</string>
<string>Rubik-VariableFont_wght.ttf</string>
</array>
<key>UIApplicationSceneManifest</key>
<dict>

6
secant/UI Components/DesignGuide.swift
View File

@ -10,6 +10,12 @@ import SwiftUI
struct DesignGuide: View {
var body: some View {
VStack(spacing: 30) {
Text("H1 Onboarding Rubik Light")
.font(FontFamily.Rubik.light.textStyle(.title))
.foregroundColor(Asset.Colors.Text.titleText.color)
Text("H1 Onboarding Rubik medium")
.font(FontFamily.Rubik.medium.textStyle(.title))
.foregroundColor(Asset.Colors.Text.titleText.color)
Button(action: {}) {
Text("Primary Button")
}

1
swiftgen.yml
View File

@ -14,6 +14,7 @@ xcassets:
fonts:
inputs:
- Fonts/Zboto.otf
- Fonts/Rubik
outputs:
templatePath: Templates/fonts/fonts_swift5_swiftui.stencil
output: Fonts+Generated.swift