Skip to content

Commit

Permalink
Release 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ranesr committed Dec 6, 2017
1 parent 420ccbd commit fdea670
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 13 deletions.
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p

## [Unreleased]

## [2.0] - 2017-12-06

### Changed

- Support for Swift 4.0

## [1.5.1] - 2017-06-08

### Changed
Expand Down Expand Up @@ -66,7 +72,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
- Initial Version of SwiftIcons
- Support for Cocoapods

[Unreleased]: https://github.com/ranesr/SwiftIcons/compare/1.5.1...master
[Unreleased]: https://github.com/ranesr/SwiftIcons/compare/2.0...master
[2.0]: https://github.com/ranesr/SwiftIcons/compare/1.5.1...2.0
[1.5.1]: https://github.com/ranesr/SwiftIcons/compare/1.5...1.5.1
[1.5]: https://github.com/ranesr/SwiftIcons/compare/1.4.1...1.5
[1.4.1]: https://github.com/ranesr/SwiftIcons/compare/1.4...1.4.1
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![SwiftIcons](https://github.com/ranesr/SwiftIcons/raw/master/resources/logo.png)]()

[![CocoaPods](https://img.shields.io/cocoapods/v/SwiftIcons.svg)](http://cocoadocs.org/docsets/SwiftIcons) [![CocoaPods](https://img.shields.io/cocoapods/dm/SwiftIcons.svg)](http://cocoapods.org/pods/SwiftIcons) [![CocoaPods](https://img.shields.io/cocoapods/dw/SwiftIcons.svg)](http://cocoapods.org/pods/SwiftIcons) [![Platform](https://img.shields.io/cocoapods/p/SwiftIcons.svg)](http://cocoadocs.org/docsets/SwiftIcons) ![Swift](https://img.shields.io/badge/%20in-swift%203.0-orange.svg)
[![CocoaPods](https://img.shields.io/cocoapods/v/SwiftIcons.svg)](http://cocoadocs.org/docsets/SwiftIcons) [![CocoaPods](https://img.shields.io/cocoapods/dm/SwiftIcons.svg)](http://cocoapods.org/pods/SwiftIcons) [![CocoaPods](https://img.shields.io/cocoapods/dw/SwiftIcons.svg)](http://cocoapods.org/pods/SwiftIcons) [![Platform](https://img.shields.io/cocoapods/p/SwiftIcons.svg)](http://cocoadocs.org/docsets/SwiftIcons) ![Swift](https://img.shields.io/badge/%20in-swift%204.0-orange.svg)

[![Travis](https://img.shields.io/travis/ranesr/SwiftIcons.svg)](https://travis-ci.org/ranesr/SwiftIcons/)

Expand Down Expand Up @@ -68,7 +68,7 @@ Add the following lines to your `Podfile`:
```ruby
target 'YourProject' do
use_frameworks!
pod 'SwiftIcons', '~> 1.5.1'
pod 'SwiftIcons', '~> 2.0'
end
```

Expand Down
4 changes: 2 additions & 2 deletions SwiftIcons.podspec
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.5.1'
s.version = '2.0'
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, Icofont, Ionicons, Linearicons, Map-icons, Material icons, Open iconic, State face icons, Weather icons'

Expand All @@ -11,7 +11,7 @@ Pod::Spec.new do |s|
s.screenshots = 'https://raw.githubusercontent.com/ranesr/SwiftIcons/master/docs/images/pic01.png'

s.source = { :git => 'https://github.com/ranesr/SwiftIcons.git', :tag => s.version }
s.ios.deployment_target = '8.0'
s.ios.deployment_target = '9.0'
s.source_files = 'Source/SwiftIcons.swift'
s.resource_bundle = { 'SwiftIcons' => 'Source/*.ttf' }

Expand Down
2 changes: 1 addition & 1 deletion SwiftIcons/AboutViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class AboutViewController: UIViewController {

githubBtn.setIcon(prefixText: "Learn more: ", icon: .fontAwesome(.github), iconColor: UIColor.init(hex: "3498db"), postfixText: "", forState: .normal, textSize: 16, iconSize: 30)

madeWith.setIcon(prefixText: "Made with ", icon: .fontAwesome(.heart), iconColor: UIColor.init(hex: "e74c3c"), postfixText: " in Dallas, Texas", size: 20, iconSize: 20)
madeWith.setIcon(prefixText: "Made with ", icon: .fontAwesome(.heart), iconColor: UIColor.init(hex: "e74c3c"), postfixText: " in San Francisco, California", size: 20, iconSize: 20)
}

override func didReceiveMemoryWarning() {
Expand Down
18 changes: 12 additions & 6 deletions SwiftIcons/Base.lproj/Main.storyboard
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12120" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="fM4-mC-SpR">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="fM4-mC-SpR">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
<array key="AppleSDGothicNeo.ttc">
<string>AppleSDGothicNeo-Bold</string>
<string>AppleSDGothicNeo-Thin</string>
</array>
</customFonts>
<scenes>
<!--Swift Icons-->
<scene sceneID="fxV-Gg-FJy">
Expand Down Expand Up @@ -48,7 +54,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.5.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: 2.0" 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 Expand Up @@ -143,7 +149,7 @@
<tabBarItem key="tabBarItem" title="ABOUT" id="If0-c9-SjZ"/>
<toolbarItems/>
<navigationBar key="navigationBar" contentMode="scaleToFill" id="o17-GR-1lm">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<rect key="frame" x="0.0" y="20" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
<nil name="viewControllers"/>
Expand Down Expand Up @@ -226,7 +232,7 @@
<tabBarItem key="tabBarItem" title="FONTS" id="Jtt-Qj-1YK"/>
<toolbarItems/>
<navigationBar key="navigationBar" contentMode="scaleToFill" id="nuW-Dd-PYP">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<rect key="frame" x="0.0" y="20" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
<nil name="viewControllers"/>
Expand Down Expand Up @@ -390,7 +396,7 @@
<tabBarItem key="tabBarItem" title="OBJECT LIBRARY" id="m6V-3Q-sih"/>
<toolbarItems/>
<navigationBar key="navigationBar" contentMode="scaleToFill" id="rBT-q0-oHq">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<rect key="frame" x="0.0" y="20" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
<nil name="viewControllers"/>
Expand Down
2 changes: 1 addition & 1 deletion SwiftIcons/Extensions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public extension UIColor {
if (cString.hasPrefix("#")) {
cString = String(cString[cString.index(cString.startIndex, offsetBy: 1)...])
}
if ((cString.characters.count) != 6) {
if ((cString.count) != 6) {
cString = "808080"
}
var rgbValue:UInt32 = 0
Expand Down
Binary file modified docs/images/pic01.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit fdea670

Please sign in to comment.