Skip to content
This repository has been archived by the owner on Aug 29, 2024. It is now read-only.

Commit

Permalink
Merge pull request #20 from ArtSabintsev/improvement/SwiftierCode
Browse files Browse the repository at this point in the history
General Improvements
  • Loading branch information
ArtSabintsev authored Mar 5, 2017
2 parents a87948e + d554a1f commit f6e9b8c
Show file tree
Hide file tree
Showing 58 changed files with 2,123 additions and 304 deletions.
7 changes: 7 additions & 0 deletions .jazzy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
module: Siren
author: Arthur Ariel Sabintsev
author_url: http://www.sabintsev.com
github_url: https://github.com/artsabintsev/fontblaster
copyright: "© 2015-2017 [Arthur Ariel Sabintsev](http://www.sabintsev.com)"
clean: true
podspec: ../FontBlaster.podspec
4 changes: 2 additions & 2 deletions FontBlaster.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "FontBlaster"
s.version = "3.0.1"
s.version = "3.0.2"
s.summary = "Programmatically load custom fonts into your iOS app."

s.description = <<-DESC
Expand All @@ -13,6 +13,6 @@ Say goodbye to importing custom fonts via property lists as **FontBlaster** auto
s.authors = { "Arthur Ariel Sabintsev" => "[email protected]"}
s.platform = :ios, "8.0"
s.source = { :git => "https://github.com/ArtSabintsev/FontBlaster.git", :tag => s.version.to_s }
s.source_files = 'FontBlaster.swift'
s.source_files = 'Sources/'
s.requires_arc = true
end
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// FontBlaster.h
// FontBlaster
//
// Created by Sabintsev, Arthur on 2/7/16.
// Copyright © 2016 Arthur Ariel Sabintsev. All rights reserved.
// Created by Sabintsev, Arthur on 3/4/17.
// Copyright © 2017 Arthur Ariel Sabintsev. All rights reserved.
//

#import <UIKit/UIKit.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "0820"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -14,10 +14,10 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5506979A1C685178008C5BAF"
BlueprintIdentifier = "554B837F1E6B50C400798F7A"
BuildableName = "FontBlaster.framework"
BlueprintName = "FontBlaster"
ReferencedContainer = "container:Font Blaster Sample Project.xcodeproj">
ReferencedContainer = "container:FontBlasterExample.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand Down Expand Up @@ -45,10 +45,10 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5506979A1C685178008C5BAF"
BlueprintIdentifier = "554B837F1E6B50C400798F7A"
BuildableName = "FontBlaster.framework"
BlueprintName = "FontBlaster"
ReferencedContainer = "container:Font Blaster Sample Project.xcodeproj">
ReferencedContainer = "container:FontBlasterExample.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
Expand All @@ -63,10 +63,10 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5506979A1C685178008C5BAF"
BlueprintIdentifier = "554B837F1E6B50C400798F7A"
BuildableName = "FontBlaster.framework"
BlueprintName = "FontBlaster"
ReferencedContainer = "container:Font Blaster Sample Project.xcodeproj">
ReferencedContainer = "container:FontBlasterExample.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "0820"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -15,23 +15,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8E7CBE8A1AF9BD7200009618"
BuildableName = "Font Blaster Sample Project.app"
BlueprintName = "Font Blaster Sample Project"
ReferencedContainer = "container:Font Blaster Sample Project.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8E7CBE9F1AF9BD7200009618"
BuildableName = "Font Blaster Sample ProjectTests.xctest"
BlueprintName = "Font Blaster Sample ProjectTests"
ReferencedContainer = "container:Font Blaster Sample Project.xcodeproj">
BuildableName = "FontBlasterExample.app"
BlueprintName = "FontBlasterExample"
ReferencedContainer = "container:FontBlasterExample.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand All @@ -42,24 +28,14 @@
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8E7CBE9F1AF9BD7200009618"
BuildableName = "Font Blaster Sample ProjectTests.xctest"
BlueprintName = "Font Blaster Sample ProjectTests"
ReferencedContainer = "container:Font Blaster Sample Project.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8E7CBE8A1AF9BD7200009618"
BuildableName = "Font Blaster Sample Project.app"
BlueprintName = "Font Blaster Sample Project"
ReferencedContainer = "container:Font Blaster Sample Project.xcodeproj">
BuildableName = "FontBlasterExample.app"
BlueprintName = "FontBlasterExample"
ReferencedContainer = "container:FontBlasterExample.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
Expand All @@ -80,9 +56,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8E7CBE8A1AF9BD7200009618"
BuildableName = "Font Blaster Sample Project.app"
BlueprintName = "Font Blaster Sample Project"
ReferencedContainer = "container:Font Blaster Sample Project.xcodeproj">
BuildableName = "FontBlasterExample.app"
BlueprintName = "FontBlasterExample"
ReferencedContainer = "container:FontBlasterExample.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
Expand All @@ -99,9 +75,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8E7CBE8A1AF9BD7200009618"
BuildableName = "Font Blaster Sample Project.app"
BlueprintName = "Font Blaster Sample Project"
ReferencedContainer = "container:Font Blaster Sample Project.xcodeproj">
BuildableName = "FontBlasterExample.app"
BlueprintName = "FontBlasterExample"
ReferencedContainer = "container:FontBlasterExample.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="NO">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
<development version="7000" identifier="xcode"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
</dependencies>
<objects>
Expand All @@ -18,14 +18,14 @@
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Font Blaster Sample Project" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FontBlasterExample" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
<rect key="frame" x="20" y="140" width="441" height="43"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
<constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# A sample Gemfile
source "https://rubygems.org"

gem "cocoapods", "1.1.0.rc.2"
gem "cocoapods"
54 changes: 29 additions & 25 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,69 +1,73 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (4.2.7.1)
CFPropertyList (2.3.5)
activesupport (4.2.8)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
claide (1.0.0)
cocoapods (1.1.0.rc.2)
claide (1.0.1)
cocoapods (1.2.0)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.0, < 2.0)
cocoapods-core (= 1.1.0.rc.2)
claide (>= 1.0.1, < 2.0)
cocoapods-core (= 1.2.0)
cocoapods-deintegrate (>= 1.0.1, < 2.0)
cocoapods-downloader (>= 1.1.1, < 2.0)
cocoapods-downloader (>= 1.1.3, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-stats (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.1.2, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored (~> 1.2)
escape (~> 0.0.4)
fourflusher (~> 1.0.1)
fourflusher (~> 2.0.1)
gh_inspector (~> 1.0)
molinillo (~> 0.5.1)
molinillo (~> 0.5.5)
nap (~> 1.0)
xcodeproj (>= 1.3.1, < 2.0)
cocoapods-core (1.1.0.rc.2)
ruby-macho (~> 0.2.5)
xcodeproj (>= 1.4.1, < 2.0)
cocoapods-core (1.2.0)
activesupport (>= 4.0.2, < 5)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
cocoapods-deintegrate (1.0.1)
cocoapods-downloader (1.1.1)
cocoapods-downloader (1.1.3)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.0.0)
cocoapods-trunk (1.0.0)
cocoapods-trunk (1.1.2)
nap (>= 0.8, < 2.0)
netrc (= 0.7.8)
cocoapods-try (1.1.0)
colored (1.2)
escape (0.0.4)
fourflusher (1.0.1)
fourflusher (2.0.1)
fuzzy_match (2.0.4)
gh_inspector (1.0.2)
i18n (0.7.0)
json (1.8.3)
minitest (5.9.0)
molinillo (0.5.1)
gh_inspector (1.0.3)
i18n (0.8.1)
minitest (5.10.1)
molinillo (0.5.7)
nanaimo (0.2.3)
nap (1.1.0)
netrc (0.7.8)
thread_safe (0.3.5)
ruby-macho (0.2.6)
thread_safe (0.3.6)
tzinfo (1.2.2)
thread_safe (~> 0.1)
xcodeproj (1.3.1)
xcodeproj (1.4.2)
CFPropertyList (~> 2.3.3)
activesupport (>= 3)
claide (>= 1.0.0, < 2.0)
claide (>= 1.0.1, < 2.0)
colored (~> 1.2)
nanaimo (~> 0.2.3)

PLATFORMS
ruby

DEPENDENCIES
cocoapods (= 1.1.0.rc.2)
cocoapods

BUNDLED WITH
1.13.0
1.14.5
Binary file removed Sample Project/.DS_Store
Binary file not shown.

This file was deleted.

Loading

0 comments on commit f6e9b8c

Please sign in to comment.