Skip to content

Commit

Permalink
Add Karla fonts to Android and iOS projects
Browse files Browse the repository at this point in the history
  • Loading branch information
Noah Malmed committed Mar 13, 2018
1 parent 79b2791 commit 7c4f30c
Show file tree
Hide file tree
Showing 10 changed files with 40 additions and 2 deletions.
Binary file added android/app/src/main/assets/fonts/Karla-Bold.ttf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added assets/fonts/Karla-Bold.ttf
Binary file not shown.
Binary file added assets/fonts/Karla-BoldItalic.ttf
Binary file not shown.
Binary file added assets/fonts/Karla-Italic.ttf
Binary file not shown.
Binary file added assets/fonts/Karla-Regular.ttf
Binary file not shown.
24 changes: 24 additions & 0 deletions ios/ZooniverseMobile.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; };
00E356F31AD99517003FC87E /* ZooniverseMobileTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* ZooniverseMobileTests.m */; };
014AB847202374F80014915B /* libRCTGoogleAnalyticsBridge.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 99E051C91D7F618700052983 /* libRCTGoogleAnalyticsBridge.a */; };
01DE9377205192F500E81CA7 /* Karla-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 01DE9373205192F500E81CA7 /* Karla-Bold.ttf */; };
01DE9378205192F500E81CA7 /* Karla-BoldItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 01DE9374205192F500E81CA7 /* Karla-BoldItalic.ttf */; };
01DE9379205192F500E81CA7 /* Karla-Italic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 01DE9375205192F500E81CA7 /* Karla-Italic.ttf */; };
01DE937A205192F500E81CA7 /* Karla-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 01DE9376205192F500E81CA7 /* Karla-Regular.ttf */; };
133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 78C398B91ACF4ADC00677621 /* libRCTLinking.a */; };
139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */; };
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */; };
Expand Down Expand Up @@ -348,6 +352,10 @@
00E356EE1AD99517003FC87E /* ZooniverseMobileTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ZooniverseMobileTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
00E356F21AD99517003FC87E /* ZooniverseMobileTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZooniverseMobileTests.m; sourceTree = "<group>"; };
01DE9373205192F500E81CA7 /* Karla-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Karla-Bold.ttf"; path = "../assets/fonts/Karla-Bold.ttf"; sourceTree = "<group>"; };
01DE9374205192F500E81CA7 /* Karla-BoldItalic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Karla-BoldItalic.ttf"; path = "../assets/fonts/Karla-BoldItalic.ttf"; sourceTree = "<group>"; };
01DE9375205192F500E81CA7 /* Karla-Italic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Karla-Italic.ttf"; path = "../assets/fonts/Karla-Italic.ttf"; sourceTree = "<group>"; };
01DE9376205192F500E81CA7 /* Karla-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Karla-Regular.ttf"; path = "../assets/fonts/Karla-Regular.ttf"; sourceTree = "<group>"; };
051453304969ED18A9A5693A /* libPods-ZooniverseMobile.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ZooniverseMobile.a"; sourceTree = BUILT_PRODUCTS_DIR; };
139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = "../node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj"; sourceTree = "<group>"; };
139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = "../node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -488,6 +496,17 @@
name = "Supporting Files";
sourceTree = "<group>";
};
01DE9372205192D800E81CA7 /* fonts */ = {
isa = PBXGroup;
children = (
01DE9373205192F500E81CA7 /* Karla-Bold.ttf */,
01DE9374205192F500E81CA7 /* Karla-BoldItalic.ttf */,
01DE9375205192F500E81CA7 /* Karla-Italic.ttf */,
01DE9376205192F500E81CA7 /* Karla-Regular.ttf */,
);
name = fonts;
sourceTree = "<group>";
};
139105B71AF99BAD00B5F7CC /* Products */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -590,6 +609,7 @@
83CBB9F61A601CBA00E9B192 = {
isa = PBXGroup;
children = (
01DE9372205192D800E81CA7 /* fonts */,
999F9C8E1DB7B57E002B6AF0 /* Resources */,
99E051D91D7F635700052983 /* libsqlite3.0.tbd */,
99E051D71D7F634900052983 /* libz.tbd */,
Expand Down Expand Up @@ -1129,6 +1149,10 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
01DE9377205192F500E81CA7 /* Karla-Bold.ttf in Resources */,
01DE9378205192F500E81CA7 /* Karla-BoldItalic.ttf in Resources */,
01DE9379205192F500E81CA7 /* Karla-Italic.ttf in Resources */,
01DE937A205192F500E81CA7 /* Karla-Regular.ttf in Resources */,
999F9C8B1DB7B4FA002B6AF0 /* OpenSans-Semibold.ttf in Resources */,
999F9C8C1DB7B4FA002B6AF0 /* OpenSans-SemiboldItalic.ttf in Resources */,
992180751D9B18E400F8BEDD /* FontAwesome.ttf in Resources */,
Expand Down
18 changes: 16 additions & 2 deletions ios/ZooniverseMobile/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@
</dict>
</dict>
<key>NSLocationWhenInUseUsageDescription</key>
<string></string>
<string/>
<key>NSPhotoLibraryUsageDescription</key>
<string>Photo Library Access Warning</string>
<string>Photo Library Access Warning</string>
<key>PUSHER_API_KEY</key>
<string>$(PUSHER_API_KEY)</string>
<key>UIAppFonts</key>
Expand All @@ -88,6 +88,20 @@
<string>OpenSans-Regular.ttf</string>
<string>zoo-font.ttf</string>
<string>FontAwesome.ttf</string>
<string>Karla-Bold.ttf</string>
<string>Karla-BoldItalic.ttf</string>
<string>Karla-Italic.ttf</string>
<string>Karla-Regular.ttf</string>
<string>Entypo.ttf</string>
<string>EvilIcons.ttf</string>
<string>Feather.ttf</string>
<string>Foundation.ttf</string>
<string>Ionicons.ttf</string>
<string>MaterialCommunityIcons.ttf</string>
<string>MaterialIcons.ttf</string>
<string>Octicons.ttf</string>
<string>SimpleLineIcons.ttf</string>
<string>Zocial.ttf</string>
</array>
<key>UIBackgroundModes</key>
<array>
Expand Down

0 comments on commit 7c4f30c

Please sign in to comment.