Skip to content

Commit

Permalink
Solving Issue with Font Loading
Browse files Browse the repository at this point in the history
  • Loading branch information
@ranesr
ranesr committed Mar 30, 2017
1 parent 3986038 commit d8e70eb
Show file tree
Hide file tree
Showing 5 changed files with 73 additions and 67 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Add the following lines to your `Podfile`:
```ruby
target 'YourProject' do
use_frameworks!
pod 'SwiftIcons', '~> 1.0.1'
pod 'SwiftIcons', '~> 1.0.2'
end
```

Expand Down
9 changes: 8 additions & 1 deletion Source/SwiftIcons.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,14 @@ private class FontLoader {

if UIFont.fontNames(forFamilyName: familyName).count == 0 {
let bundle = Bundle(for: FontLoader.self)
let fontURL = bundle.url(forResource: fileName, withExtension: "ttf")!
var fontURL: URL!
let identifier = bundle.bundleIdentifier

if (identifier?.hasPrefix("org.cocoapods"))! {
fontURL = bundle.url(forResource: fileName, withExtension: "ttf", subdirectory: "SwiftIcons.bundle")
} else {
fontURL = bundle.url(forResource: fileName, withExtension: "ttf")!
}

let data = try! Data(contentsOf: fontURL)
let provider = CGDataProvider(data: data as CFData)
Expand Down
2 changes: 1 addition & 1 deletion SwiftIcons.podspec
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "SwiftIcons"
s.version = "1.0.1"
s.version = "1.0.2"
s.summary = 'SwiftIcons - A library for using different font icons'
s.description = 'SwiftIcons library helps you use icons from any of these font icons - Dripicons, Emoji, FontAwesome, Ionicons, Linearicons, Map-icons, Material icons, Open iconic, State face icons, Weather icons'

Expand Down
2 changes: 1 addition & 1 deletion SwiftIcons/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<action selector="goToGithub:" destination="992-F2-xEZ" eventType="touchUpInside" id="I3n-uX-RS9"/>
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Version: 1.0.1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="p4a-eR-qB1">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Version: 1.0.2" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="p4a-eR-qB1">
<rect key="frame" x="30" y="377" width="315" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="szw-oy-t1T"/>
Expand Down
125 changes: 62 additions & 63 deletions docs/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,71 +1,70 @@
<html>
<head>
<script src="js/respond.min.js" type="text/javascript"></script>
<title>Swift Icons</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" type="text/css" href="css/main.css">
<!--[if lte IE 9]><link rel="stylesheet" href="assets/css/ie9.css" /><![endif]-->
<!--[if lte IE 8]><link rel="stylesheet" href="assets/css/ie8.css" /><![endif]-->
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
<head>
<script src="js/respond.min.js" type="text/javascript"></script>
<title>Swift Icons</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" type="text/css" href="css/main.css">
<!--[if lte IE 9]><link rel="stylesheet" href="assets/css/ie9.css" /><![endif]-->
<!--[if lte IE 8]><link rel="stylesheet" href="assets/css/ie8.css" /><![endif]-->
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');

ga('create', 'UA-43007500-10', 'auto');
ga('send', 'pageview');

</script>
</head>
<body class="">
<div id="page-wrapper">
<section id="wrapper">
<div class="inner">
<h1>
<b>Swift</b>Icons
</h1>
<h2>
A library for using different font icons
</h2>
<p>Swift Library for Font Icons: <a target="_blank" href="https://github.com/amitjakhu/dripicons">dripicons</a>, <a target="_blank" href="http://jslegers.github.io/emoji-icon-font/">emoji</a>, <a target="_blank" href="http://fontawesome.io/icons/">font awesome</a>, <a target="_blank" href="http://ionicons.com/">ionicons</a>, <a target="_blank" href="https://linearicons.com/free">linear icons</a>, <a target="_blank" href="http://map-icons.com/">map icons</a>, <a target="_blank" href="https://material.io/icons/">material icons</a>, <a target="_blank" href="https://useiconic.com/open">open iconic</a>, <a target="_blank" href="http://propublica.github.io/stateface/">state</a>, <a target="_blank" href="https://erikflowers.github.io/weather-icons/">weather</a></p>
ga('create', 'UA-43007500-10', 'auto');
ga('send', 'pageview');
</script>
</head>
<body class="">
<div id="page-wrapper">
<section id="wrapper">
<div class="inner">
<h1>
<b>Swift</b>Icons
</h1>
<h2>
A library for using different font icons
</h2>
<p>Swift Library for Font Icons: <a target="_blank" href="https://github.com/amitjakhu/dripicons">dripicons</a>, <a target="_blank" href="http://jslegers.github.io/emoji-icon-font/">emoji</a>, <a target="_blank" href="http://fontawesome.io/icons/">font awesome</a>, <a target="_blank" href="http://ionicons.com/">ionicons</a>, <a target="_blank" href="https://linearicons.com/free">linear icons</a>, <a target="_blank" href="http://map-icons.com/">map icons</a>, <a target="_blank" href="https://material.io/icons/">material icons</a>, <a target="_blank" href="https://useiconic.com/open">open iconic</a>, <a target="_blank" href="http://propublica.github.io/stateface/">state</a>, <a target="_blank" href="https://erikflowers.github.io/weather-icons/">weather</a></p>

<ul class="actions">
<li><a href="https://github.com/ranesr/SwiftIcons/archive/master.zip" class="button special icon fa-arrow-down" style="cursor: pointer;">Download</a></li>
<li><a href="https://github.com/ranesr/SwiftIcons" class="button special icon fa-code" style="cursor: pointer;" target="_blank">GitHub</a></li>
</ul>
<ul class="actions">
<li><a href="https://github.com/ranesr/SwiftIcons/archive/master.zip" class="button special icon fa-arrow-down" style="cursor: pointer;">Download</a></li>
<li><a href="https://github.com/ranesr/SwiftIcons" class="button special icon fa-code" style="cursor: pointer;" target="_blank">GitHub</a></li>
</ul>

<p><iframe src="https://ghbtns.com/github-btn.html?user=ranesr&repo=SwiftIcons&type=star&count=true&size=large" frameborder="0" scrolling="0" width="160px" height="30px"></iframe></p>
<p><iframe src="https://ghbtns.com/github-btn.html?user=ranesr&repo=SwiftIcons&type=fork&count=true&size=large" frameborder="0" scrolling="0" width="158px" height="30px"></iframe></p>
</div>
<footer>
<ul class="icons">
<li><a target="_blank" class="icon fa-github" href="https://github.com/ranesr" style="cursor: pointer;"><span class="label">GitHub</span></a></li>
<li><a target="_blank" class="icon fa-linkedin-square" href="https://linkedin.com/in/ranesaurabh" style="cursor: pointer;"><span class="label">Linkedin</span></a></li>
<li><a target="_blank" class="icon fa-send" href="mailto:[email protected]" style="cursor: pointer;"><span class="label">Email</span></a></li>
<p><iframe src="https://ghbtns.com/github-btn.html?user=ranesr&repo=SwiftIcons&type=star&count=true&size=large" frameborder="0" scrolling="0" width="160px" height="30px"></iframe></p>
<p><iframe src="https://ghbtns.com/github-btn.html?user=ranesr&repo=SwiftIcons&type=fork&count=true&size=large" frameborder="0" scrolling="0" width="158px" height="30px"></iframe></p>
</div>
<footer>
<ul class="icons">
<li><a target="_blank" class="icon fa-github" href="https://github.com/ranesr" style="cursor: pointer;"><span class="label">GitHub</span></a></li>
<li><a target="_blank" class="icon fa-linkedin-square" href="https://linkedin.com/in/ranesaurabh" style="cursor: pointer;"><span class="label">Linkedin</span></a></li>
<li><a target="_blank" class="icon fa-send" href="mailto:[email protected]" style="cursor: pointer;"><span class="label">Email</span></a></li>

</ul>
</footer>
</section>
<section id="banner">
<div class="inner">
<div class="content">
<ul>
<li class="visible top"><img src="images/pic01.png" alt=""></li>
<li class=""><img src="images/pic02.png" alt=""></li>
<li class=""><img src="images/pic03.png" alt=""></li>
<li class=""><img src="images/pic04.png" alt=""></li>
<li class=""><img src="images/pic05.png" alt=""></li>
<li class=""><img src="images/pic06.png" alt=""></li>
<li class=""><img src="images/pic07.png" alt=""></li>
<li class=""><img src="images/pic08.png" alt=""></li>
<li class=""><img src="images/pic09.png" alt=""></li>
</ul>
</footer>
</section>
<section id="banner">
<div class="inner">
<div class="content">
<ul>
<li class="visible top"><img src="images/pic01.png" alt=""></li>
<li class=""><img src="images/pic02.png" alt=""></li>
<li class=""><img src="images/pic03.png" alt=""></li>
<li class=""><img src="images/pic04.png" alt=""></li>
<li class=""><img src="images/pic05.png" alt=""></li>
<li class=""><img src="images/pic06.png" alt=""></li>
<li class=""><img src="images/pic07.png" alt=""></li>
<li class=""><img src="images/pic08.png" alt=""></li>
<li class=""><img src="images/pic09.png" alt=""></li>
</ul>
</div>
</div>
</div>
</section>
</div>
<!--[if lte IE 8]><![endif]-->
<script src="js/banner.min.js" type="text/javascript"></script>
</body>
</section>
</div>
<!--[if lte IE 8]><![endif]-->
<script src="js/banner.min.js" type="text/javascript"></script>
</body>
</html>

0 comments on commit d8e70eb

Please sign in to comment.