Skip to content

Commit

Permalink
Swift 3 support
Browse files Browse the repository at this point in the history
  • Loading branch information
PhilippeBoisney committed Oct 7, 2016
1 parent a7a0e33 commit a9cf823
Show file tree
Hide file tree
Showing 21 changed files with 425 additions and 243 deletions.
1 change: 1 addition & 0 deletions .swift-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.0
30 changes: 12 additions & 18 deletions LinearProgressBar.podspec
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,22 +1,16 @@
Pod::Spec.new do |s|
s.name = "LinearProgressBar"
s.version = "1.2"
s.summary = "LinearProgressBar"
s.description = "A simple Linear Progress Bar for IOS (Swift 3.0), inspired by Material Design"
s.homepage = "https://github.com/PhilippeBoisney/LinearProgressBar"
s.license = 'MIT'
s.author = { "PhilippeBoisney" => "[email protected]" }
s.source = { :git => "https://github.com/PhilippeBoisney/LinearProgressBar.git", :tag => s.version }
s.platform = :ios, '8.0'
s.requires_arc = true

s.name = "LinearProgressBar"
s.version = "1.0.1"
s.summary = "Linear Progress Bar for Swift"
s.homepage = "https://github.com/PhilippeBoisney/LinearProgressBar"
s.author = {
"BOISNEY Philippe" => "phil.boisney(@)gmail.com"
}
s.license = {
:type => 'MIT',
:file => 'LICENSE'
}
s.source = {
:git => "https://github.com/PhilippeBoisney/LinearProgressBar.git",
:tag => "v1.0.1"
}
s.source_files = "LinearProgressBar/LinearProgressBar.swift"
s.frameworks = "UIKit"
s.platform = :ios, "7.0"
# If more than one source file: https://guides.cocoapods.org/syntax/podspec.html#source_files
s.source_files = 'Pod/Classes/**/*'

end
165 changes: 93 additions & 72 deletions LinearProgressBar.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0710"
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -14,7 +14,7 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4A2A994B1C14416500A9B50D"
BlueprintIdentifier = "3721E06A1DA78F1100DC9E8F"
BuildableName = "LinearProgressBar.app"
BlueprintName = "LinearProgressBar"
ReferencedContainer = "container:LinearProgressBar.xcodeproj">
Expand All @@ -32,7 +32,7 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4A2A994B1C14416500A9B50D"
BlueprintIdentifier = "3721E06A1DA78F1100DC9E8F"
BuildableName = "LinearProgressBar.app"
BlueprintName = "LinearProgressBar"
ReferencedContainer = "container:LinearProgressBar.xcodeproj">
Expand All @@ -55,7 +55,7 @@
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4A2A994B1C14416500A9B50D"
BlueprintIdentifier = "3721E06A1DA78F1100DC9E8F"
BuildableName = "LinearProgressBar.app"
BlueprintName = "LinearProgressBar"
ReferencedContainer = "container:LinearProgressBar.xcodeproj">
Expand All @@ -74,7 +74,7 @@
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4A2A994B1C14416500A9B50D"
BlueprintIdentifier = "3721E06A1DA78F1100DC9E8F"
BuildableName = "LinearProgressBar.app"
BlueprintName = "LinearProgressBar"
ReferencedContainer = "container:LinearProgressBar.xcodeproj">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>4A2A994B1C14416500A9B50D</key>
<key>3721E06A1DA78F1100DC9E8F</key>
<dict>
<key>primary</key>
<true/>
Expand Down
20 changes: 10 additions & 10 deletions LinearProgressBar/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// AppDelegate.swift
// LinearProgressBar
//
// Created by Philippe Boisney on 06/12/2015.
// Copyright © 2015 Philippe Boisney. All rights reserved.
// Created by Philippe on 07/10/2016.
// Copyright © 2016 CookMinute. All rights reserved.
//

import UIKit
Expand All @@ -14,30 +14,30 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?


func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.
return true
}

func applicationWillResignActive(application: UIApplication) {
func applicationWillResignActive(_ application: UIApplication) {
// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
// Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
// Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
}

func applicationDidEnterBackground(application: UIApplication) {
func applicationDidEnterBackground(_ application: UIApplication) {
// Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
}

func applicationWillEnterForeground(application: UIApplication) {
// Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
func applicationWillEnterForeground(_ application: UIApplication) {
// Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
}

func applicationDidBecomeActive(application: UIApplication) {
func applicationDidBecomeActive(_ application: UIApplication) {
// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
}

func applicationWillTerminate(application: UIApplication) {
func applicationWillTerminate(_ application: UIApplication) {
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
}

Expand Down
30 changes: 30 additions & 0 deletions LinearProgressBar/Assets.xcassets/AppIcon.appiconset/Contents.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,36 @@
"idiom" : "iphone",
"size" : "60x60",
"scale" : "3x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "2x"
}
],
"info" : {
Expand Down
6 changes: 0 additions & 6 deletions LinearProgressBar/Assets.xcassets/Contents.json

This file was deleted.

This file was deleted.

Binary file not shown.
10 changes: 5 additions & 5 deletions LinearProgressBar/Base.lproj/LaunchScreen.storyboard
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9060" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11134" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9051"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11106"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
Expand All @@ -13,10 +14,9 @@
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
Expand Down
Loading

0 comments on commit a9cf823

Please sign in to comment.