Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Hamza Ghazouani
|
178d58aa40 | ||
 Hamza GHAZOUANI
|
38c9c1a7ed | ||
|
Hamza GHAZOUANI
|
51a9a15737 | ||
|
Hamza Ghazouani
|
498362d18d |
+1
-1
@@ -1 +1 @@
|
||||
2.2
|
||||
3.0
|
||||
|
||||
+16
-2
@@ -1,6 +1,20 @@
|
||||
# Change Log
|
||||
All notable changes to this project will be documented in this file.
|
||||
|
||||
#### Added
|
||||
- Initial release of HGCircularSlider.
|
||||
|
||||
## [1.0.0](https://github.com/HamzaGhazouani/HGCircularSlider/releases/tag/1.0.0)
|
||||
|
||||
* Support for Swift 3.0.
|
||||
|
||||
## [0.1.2](https://github.com/HamzaGhazouani/HGCircularSlider/releases/tag/0.1.2)
|
||||
|
||||
* Add documentation
|
||||
* Last version that support Xcode 7.3.1
|
||||
|
||||
## [0.1.1](https://github.com/HamzaGhazouani/HGCircularSlider/releases/tag/0.1.1)
|
||||
|
||||
* Add new examples
|
||||
|
||||
## [0.1.0](https://github.com/HamzaGhazouani/HGCircularSlider/releases/tag/0.1.0)
|
||||
|
||||
* Initial release.
|
||||
|
||||
@@ -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.
|
||||
}
|
||||
|
||||
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) {
|
||||
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 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:.
|
||||
}
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="sp2-vV-rZV">
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="sp2-vV-rZV">
|
||||
<dependencies>
|
||||
<development version="7000" identifier="xcode"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
|
||||
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
|
||||
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<scenes>
|
||||
<!--Clock-->
|
||||
@@ -16,59 +16,47 @@
|
||||
<viewControllerLayoutGuide type="bottom" id="lUY-qL-6BD"/>
|
||||
</layoutGuides>
|
||||
<view key="view" contentMode="scaleToFill" id="4jd-aQ-SwJ">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="431"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="618"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="dyk-gn-E0m">
|
||||
<rect key="frame" x="26" y="-2" width="268" height="57"/>
|
||||
<subviews>
|
||||
<stackView opaque="NO" contentMode="scaleToFill" placeholderIntrinsicWidth="116" placeholderIntrinsicHeight="57" axis="vertical" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="DG9-tl-Yx0" userLabel="BedTime Stack View">
|
||||
<rect key="frame" x="0.0" y="0.0" width="126.5" height="57"/>
|
||||
<subviews>
|
||||
<stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="YwR-eO-oZe">
|
||||
<rect key="frame" x="15" y="0.0" width="97" height="24"/>
|
||||
<subviews>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" placeholderIntrinsicWidth="17" placeholderIntrinsicHeight="24" image="ic_bedtime" translatesAutoresizingMaskIntoConstraints="NO" id="KC4-Yz-4tg">
|
||||
<rect key="frame" x="0.0" y="0.0" width="17" height="24"/>
|
||||
<color key="tintColor" red="1" green="0.65098039220000004" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="tintColor" red="1" green="0.65098039220000004" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</imageView>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" placeholderIntrinsicWidth="75" placeholderIntrinsicHeight="24" text="Bedtime" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JV5-mg-K6N">
|
||||
<rect key="frame" x="22" y="0.0" width="75" height="24"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="18"/>
|
||||
<color key="textColor" red="1" green="0.65098039215686276" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="textColor" red="1" green="0.65098039215686276" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
</subviews>
|
||||
</stackView>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" placeholderIntrinsicWidth="108" placeholderIntrinsicHeight="33" text="12:00 AM" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ode-Tz-DNv">
|
||||
<rect key="frame" x="9" y="24" width="108" height="33"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="25"/>
|
||||
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
</subviews>
|
||||
</stackView>
|
||||
<stackView opaque="NO" contentMode="scaleToFill" placeholderIntrinsicWidth="116" placeholderIntrinsicHeight="57" axis="vertical" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="pua-bm-FEt" userLabel="Wake Stack View">
|
||||
<rect key="frame" x="141" y="0.0" width="126.5" height="57"/>
|
||||
<subviews>
|
||||
<stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="GT6-Lu-cLO">
|
||||
<rect key="frame" x="15" y="0.0" width="97" height="24"/>
|
||||
<subviews>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" placeholderIntrinsicWidth="17" placeholderIntrinsicHeight="24" image="ic_wake" translatesAutoresizingMaskIntoConstraints="NO" id="yHs-NA-gtj">
|
||||
<rect key="frame" x="0.0" y="0.0" width="17" height="24"/>
|
||||
</imageView>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" placeholderIntrinsicWidth="17" placeholderIntrinsicHeight="24" image="ic_wake" translatesAutoresizingMaskIntoConstraints="NO" id="yHs-NA-gtj"/>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" placeholderIntrinsicWidth="75" placeholderIntrinsicHeight="24" text="Wake" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0hP-PD-D5h">
|
||||
<rect key="frame" x="22" y="0.0" width="75" height="24"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="18"/>
|
||||
<color key="textColor" red="0.99215686270000003" green="0.75294117650000003" blue="0.035294117649999998" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="textColor" red="0.99215686270000003" green="0.75294117650000003" blue="0.035294117649999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
</subviews>
|
||||
</stackView>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" placeholderIntrinsicWidth="115" placeholderIntrinsicHeight="33" text="12:00 PM" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lh9-bX-Mdn">
|
||||
<rect key="frame" x="6" y="24" width="115" height="33"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="27"/>
|
||||
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
</subviews>
|
||||
@@ -76,8 +64,7 @@
|
||||
</subviews>
|
||||
</stackView>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="B7k-gj-MGd" customClass="RangeCircularSlider" customModule="HGCircularSlider">
|
||||
<rect key="frame" x="16" y="71.5" width="288" height="288"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="calibratedRGB"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" secondItem="B7k-gj-MGd" secondAttribute="height" id="NVA-rO-PLq"/>
|
||||
</constraints>
|
||||
@@ -86,16 +73,16 @@
|
||||
<real key="value" value="40"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="trackFillColor">
|
||||
<color key="value" red="0.99215686270000003" green="0.75294117650000003" blue="0.035294117649999998" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="value" red="0.99215686270000003" green="0.75294117650000003" blue="0.035294117649999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="diskColor">
|
||||
<color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="calibratedRGB"/>
|
||||
<color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="diskFillColor">
|
||||
<color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="calibratedRGB"/>
|
||||
<color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="trackColor">
|
||||
<color key="value" red="1" green="1" blue="1" alpha="0.10000000000000001" colorSpace="calibratedRGB"/>
|
||||
<color key="value" red="1" green="1" blue="1" alpha="0.10000000000000001" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
@@ -103,14 +90,13 @@
|
||||
</connections>
|
||||
</view>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0:41" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2Yn-91-Eq6">
|
||||
<rect key="frame" x="119" y="188" width="82" height="55"/>
|
||||
<fontDescription key="fontDescription" name="AvenirNext-Regular" family="Avenir Next" pointSize="40"/>
|
||||
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
</subviews>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstItem="dyk-gn-E0m" firstAttribute="leading" secondItem="4jd-aQ-SwJ" secondAttribute="leadingMargin" constant="10" id="Dl0-lI-EH6"/>
|
||||
<constraint firstItem="B7k-gj-MGd" firstAttribute="leading" secondItem="4jd-aQ-SwJ" secondAttribute="leadingMargin" id="Jac-u5-3tf"/>
|
||||
@@ -134,7 +120,7 @@
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="IfT-Jw-FAY" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="-234" y="1695"/>
|
||||
<point key="canvasLocation" x="-1254" y="2468"/>
|
||||
</scene>
|
||||
<!--Tab Bar Controller-->
|
||||
<scene sceneID="M9S-pb-Waq">
|
||||
@@ -143,9 +129,9 @@
|
||||
<tabBar key="tabBar" contentMode="scaleToFill" id="b7Z-PI-gCQ">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="49"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<color key="tintColor" red="0.89411764709999997" green="0.93333333330000001" blue="0.38823529410000002" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="barTintColor" red="0.17254901960784313" green="0.15686274509803921" blue="0.16862745098039217" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<color key="tintColor" red="0.89411764709999997" green="0.93333333330000001" blue="0.38823529410000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<color key="barTintColor" red="0.17254901960784313" green="0.15686274509803921" blue="0.16862745098039217" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</tabBar>
|
||||
<connections>
|
||||
<segue destination="CT4-vj-wFA" kind="relationship" relationship="viewControllers" id="pZZ-eo-szV"/>
|
||||
@@ -156,7 +142,7 @@
|
||||
</tabBarController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="gDj-DB-klF" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="-1113" y="2067"/>
|
||||
<point key="canvasLocation" x="-562" y="1626"/>
|
||||
</scene>
|
||||
<!--Player-->
|
||||
<scene sceneID="90r-0D-nKE">
|
||||
@@ -167,15 +153,13 @@
|
||||
<viewControllerLayoutGuide type="bottom" id="qfh-d6-sk8"/>
|
||||
</layoutGuides>
|
||||
<view key="view" contentMode="scaleToFill" id="neD-ad-Dbx">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="431"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="618"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="c7m-F5-dgq">
|
||||
<rect key="frame" x="40" y="43" width="240" height="345"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="x2l-Xh-2MZ" customClass="CircularSlider" customModule="HGCircularSlider">
|
||||
<rect key="frame" x="0.0" y="0.0" width="240" height="240"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="calibratedRGB"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" secondItem="x2l-Xh-2MZ" secondAttribute="height" priority="999" id="5ZH-Qv-URo"/>
|
||||
</constraints>
|
||||
@@ -184,25 +168,25 @@
|
||||
<real key="value" value="2"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="trackFillColor">
|
||||
<color key="value" red="0.14901960780000001" green="0.83921568629999999" blue="0.99215686270000003" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="value" red="0.14901960780000001" green="0.83921568629999999" blue="0.99215686270000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="diskColor">
|
||||
<color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="calibratedRGB"/>
|
||||
<color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="diskFillColor">
|
||||
<color key="value" red="0.14901960780000001" green="0.83921568629999999" blue="0.99215686270000003" alpha="0.10000000000000001" colorSpace="calibratedRGB"/>
|
||||
<color key="value" red="0.14901960780000001" green="0.83921568629999999" blue="0.99215686270000003" alpha="0.10000000000000001" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="trackColor">
|
||||
<color key="value" red="1" green="1" blue="1" alpha="0.10000000000000001" colorSpace="calibratedRGB"/>
|
||||
<color key="value" red="1" green="1" blue="1" alpha="0.10000000000000001" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="thumbRadius">
|
||||
<real key="value" value="2"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="endThumbStrokeHighlightedColor">
|
||||
<color key="value" red="0.80000000000000004" green="0.5725490196078431" blue="0.88235294117647056" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="value" red="0.80000000000000004" green="0.5725490196078431" blue="0.88235294117647056" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="endThumbStrokeColor">
|
||||
<color key="value" red="0.14901960780000001" green="0.83921568629999999" blue="0.99215686270000003" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="value" red="0.14901960780000001" green="0.83921568629999999" blue="0.99215686270000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
@@ -210,24 +194,20 @@
|
||||
</connections>
|
||||
</view>
|
||||
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="ynQ-4R-F24">
|
||||
<rect key="frame" x="0.0" y="260" width="240" height="37"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" placeholderIntrinsicWidth="240" placeholderIntrinsicHeight="17" text="StrangeZero" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cRt-q4-UdR">
|
||||
<rect key="frame" x="0.0" y="0.0" width="240" height="17"/>
|
||||
<fontDescription key="fontDescription" type="system" weight="light" pointSize="14"/>
|
||||
<color key="textColor" white="1" alpha="0.5" colorSpace="calibratedWhite"/>
|
||||
<color key="textColor" red="1" green="1" blue="1" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" placeholderIntrinsicWidth="240" placeholderIntrinsicHeight="20" text="Burnin Star" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uAk-aN-SL3">
|
||||
<rect key="frame" x="0.0" y="17" width="240" height="20"/>
|
||||
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
|
||||
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
</subviews>
|
||||
</stackView>
|
||||
<segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="9nw-2D-CbD">
|
||||
<rect key="frame" x="0.0" y="317" width="240" height="29"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="28" id="Tdt-J7-hiZ"/>
|
||||
</constraints>
|
||||
@@ -242,14 +222,13 @@
|
||||
</subviews>
|
||||
</stackView>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" placeholderIntrinsicWidth="167" placeholderIntrinsicHeight="48" text="0:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="V2j-gL-XgV">
|
||||
<rect key="frame" x="77" y="139" width="167" height="48"/>
|
||||
<fontDescription key="fontDescription" type="system" weight="ultraLight" pointSize="40"/>
|
||||
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
</subviews>
|
||||
<color key="backgroundColor" red="0.49803921569999998" green="0.10980392160000001" blue="0.65098039220000004" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="tintColor" red="0.14901960780000001" green="0.83921568629999999" blue="0.99215686270000003" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="backgroundColor" red="0.49803921569999998" green="0.10980392160000001" blue="0.65098039220000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<color key="tintColor" red="0.14901960780000001" green="0.83921568629999999" blue="0.99215686270000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstItem="V2j-gL-XgV" firstAttribute="centerY" secondItem="x2l-Xh-2MZ" secondAttribute="centerY" id="3Cf-SB-Xap"/>
|
||||
<constraint firstItem="V2j-gL-XgV" firstAttribute="centerX" secondItem="x2l-Xh-2MZ" secondAttribute="centerX" id="KeP-bj-vvP"/>
|
||||
@@ -269,7 +248,7 @@
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="LfZ-7G-N6b" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="-251" y="2267"/>
|
||||
<point key="canvasLocation" x="-794" y="2468"/>
|
||||
</scene>
|
||||
<!--Example-->
|
||||
<scene sceneID="stQ-nu-pyE">
|
||||
@@ -280,12 +259,11 @@
|
||||
<viewControllerLayoutGuide type="bottom" id="I5G-Jl-WfO"/>
|
||||
</layoutGuides>
|
||||
<view key="view" contentMode="scaleToFill" id="kxo-la-Q5X">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="431"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="618"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="P7G-Iv-4Jm" customClass="MidPointCircularSlider" customModule="HGCircularSlider">
|
||||
<rect key="frame" x="46" y="101" width="228" height="228"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="228" id="Kx9-Mg-DfE"/>
|
||||
<constraint firstAttribute="width" secondItem="P7G-Iv-4Jm" secondAttribute="height" id="aGA-yL-Kg8"/>
|
||||
@@ -295,28 +273,28 @@
|
||||
<real key="value" value="15"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="trackFillColor">
|
||||
<color key="value" red="0.92156862745098034" green="0.18431372549019609" blue="0.38039215686274508" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="value" red="0.92156862745098034" green="0.18431372549019609" blue="0.38039215686274508" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="trackColor">
|
||||
<color key="value" red="0.35686274509803922" green="0.70196078431372544" blue="0.92549019607843142" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="value" red="0.35686274509803922" green="0.70196078431372544" blue="0.92549019607843142" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="distance">
|
||||
<real key="value" value="0.14999999999999999"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="diskColor">
|
||||
<color key="value" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="midThumbStrokeHighlightedColor">
|
||||
<color key="value" red="0.92156862750000001" green="0.1843137255" blue="0.3803921569" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="value" red="0.92156862750000001" green="0.1843137255" blue="0.3803921569" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="midThumbStrokeColor">
|
||||
<color key="value" red="0.35686274509999999" green="0.70196078429999997" blue="0.92549019610000005" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="value" red="0.35686274509999999" green="0.70196078429999997" blue="0.92549019610000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="thumbRadius">
|
||||
<real key="value" value="10"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="diskFillColor">
|
||||
<color key="value" red="0.35686274509999999" green="0.70196078429999997" blue="0.92549019610000005" alpha="0.13957435344827587" colorSpace="calibratedRGB"/>
|
||||
<color key="value" red="0.35686274509999999" green="0.70196078429999997" blue="0.92549019610000005" alpha="0.13957435344827587" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
@@ -324,13 +302,12 @@
|
||||
</connections>
|
||||
</view>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="April" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Cfm-Db-wi2">
|
||||
<rect key="frame" x="85" y="140.5" width="150" height="150"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="150" id="LDb-AT-qTm"/>
|
||||
<constraint firstAttribute="width" secondItem="Cfm-Db-wi2" secondAttribute="height" id="sh3-2g-Wm9"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="22"/>
|
||||
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth">
|
||||
@@ -340,12 +317,12 @@
|
||||
<integer key="value" value="75"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="layer.borderUIColor">
|
||||
<color key="value" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="value" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
</subviews>
|
||||
<color key="backgroundColor" red="0.38039215686274508" green="0.33725490196078434" blue="0.43529411764705883" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="backgroundColor" red="0.38039215686274508" green="0.33725490196078434" blue="0.43529411764705883" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstItem="Cfm-Db-wi2" firstAttribute="centerY" secondItem="kxo-la-Q5X" secondAttribute="centerY" id="PTz-yo-VP9"/>
|
||||
<constraint firstItem="Cfm-Db-wi2" firstAttribute="centerX" secondItem="kxo-la-Q5X" secondAttribute="centerX" id="QSS-kS-W8Q"/>
|
||||
@@ -358,7 +335,7 @@
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="11N-ZE-qqz" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="-274" y="2943"/>
|
||||
<point key="canvasLocation" x="-326" y="2468"/>
|
||||
</scene>
|
||||
<!--OClock-->
|
||||
<scene sceneID="qvZ-oN-u0x">
|
||||
@@ -369,14 +346,12 @@
|
||||
<viewControllerLayoutGuide type="bottom" id="zbM-Dt-5AV"/>
|
||||
</layoutGuides>
|
||||
<view key="view" contentMode="scaleToFill" id="fAM-4k-cvc">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="431"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="618"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<stackView opaque="NO" contentMode="scaleToFill" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="WRY-kB-aj8">
|
||||
<rect key="frame" x="100" y="20" width="120" height="45"/>
|
||||
<subviews>
|
||||
<segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="19A-pG-3td">
|
||||
<rect key="frame" x="0.0" y="8.5" width="120" height="29"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="120" id="3jN-4n-QeQ"/>
|
||||
</constraints>
|
||||
@@ -384,7 +359,7 @@
|
||||
<segment title="AM"/>
|
||||
<segment title="PM"/>
|
||||
</segments>
|
||||
<color key="tintColor" red="0.99215686270000003" green="0.75294117650000003" blue="0.035294117649999998" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="tintColor" red="0.99215686270000003" green="0.75294117650000003" blue="0.035294117649999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<connections>
|
||||
<action selector="switchBetweenAMAndPM:" destination="fOf-1m-bg4" eventType="valueChanged" id="Ztd-XM-Khe"/>
|
||||
</connections>
|
||||
@@ -392,66 +367,57 @@
|
||||
</subviews>
|
||||
</stackView>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="time_indicators" translatesAutoresizingMaskIntoConstraints="NO" id="iV1-rk-1SV">
|
||||
<rect key="frame" x="9" y="65" width="301" height="301"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" secondItem="iV1-rk-1SV" secondAttribute="height" id="L3y-vK-lUp"/>
|
||||
</constraints>
|
||||
</imageView>
|
||||
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="Hes-2U-VeA">
|
||||
<rect key="frame" x="100" y="136" width="120" height="159"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" placeholderIntrinsicWidth="92" placeholderIntrinsicHeight="53" text="AM" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Jhh-41-cud">
|
||||
<rect key="frame" x="0.0" y="0.0" width="120" height="53"/>
|
||||
<fontDescription key="fontDescription" type="system" weight="ultraLight" pointSize="16"/>
|
||||
<color key="textColor" red="0.87450980392156863" green="0.80000000000000004" blue="0.22352941176470587" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="textColor" red="0.87450980392156863" green="0.80000000000000004" blue="0.22352941176470587" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="43q-ax-2ig">
|
||||
<rect key="frame" x="0.0" y="53" width="120" height="53"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" placeholderIntrinsicWidth="54" placeholderIntrinsicHeight="53" text="06" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hbF-TF-3lB">
|
||||
<rect key="frame" x="0.0" y="0.0" width="54" height="53"/>
|
||||
<fontDescription key="fontDescription" type="system" weight="light" pointSize="44"/>
|
||||
<color key="textColor" red="0.87450980392156863" green="0.80000000000000004" blue="0.22352941176470587" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="textColor" red="0.87450980392156863" green="0.80000000000000004" blue="0.22352941176470587" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" placeholderIntrinsicWidth="12" placeholderIntrinsicHeight="53" text=":" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vth-jB-JLd">
|
||||
<rect key="frame" x="54" y="0.0" width="12" height="53"/>
|
||||
<fontDescription key="fontDescription" type="system" weight="light" pointSize="44"/>
|
||||
<color key="textColor" red="0.87450980389999999" green="0.80000000000000004" blue="0.22352941179999999" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="textColor" red="0.87450980389999999" green="0.80000000000000004" blue="0.22352941179999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" placeholderIntrinsicWidth="54" placeholderIntrinsicHeight="53" text="35" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="t63-gB-ld3">
|
||||
<rect key="frame" x="66" y="0.0" width="54" height="53"/>
|
||||
<fontDescription key="fontDescription" type="system" weight="light" pointSize="44"/>
|
||||
<color key="textColor" red="0.87450980389999999" green="0.80000000000000004" blue="0.22352941179999999" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="textColor" red="0.87450980389999999" green="0.80000000000000004" blue="0.22352941179999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
</subviews>
|
||||
</stackView>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" placeholderIntrinsicWidth="92" placeholderIntrinsicHeight="53" text="MONDAY" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="F6O-w8-ufI">
|
||||
<rect key="frame" x="0.0" y="106" width="120" height="53"/>
|
||||
<fontDescription key="fontDescription" type="system" weight="ultraLight" pointSize="16"/>
|
||||
<color key="textColor" red="0.87450980392156863" green="0.80000000000000004" blue="0.22352941176470587" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="textColor" red="0.87450980392156863" green="0.80000000000000004" blue="0.22352941176470587" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
</subviews>
|
||||
</stackView>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kWD-6U-Cha" customClass="CircularSlider" customModule="HGCircularSlider">
|
||||
<rect key="frame" x="29" y="85" width="261" height="261"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="diskFillColor">
|
||||
<color key="value" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="diskColor">
|
||||
<color key="value" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="trackFillColor">
|
||||
<color key="value" red="0.87450980389999999" green="0.80000000000000004" blue="0.22352941179999999" alpha="0.79496228449999995" colorSpace="calibratedRGB"/>
|
||||
<color key="value" red="0.87450980389999999" green="0.80000000000000004" blue="0.22352941179999999" alpha="0.79496228449999995" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="trackColor">
|
||||
<color key="value" red="1" green="1" blue="1" alpha="0.10000000000000001" colorSpace="calibratedRGB"/>
|
||||
<color key="value" red="1" green="1" blue="1" alpha="0.10000000000000001" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="lineWidth">
|
||||
<real key="value" value="2"/>
|
||||
@@ -460,31 +426,30 @@
|
||||
<real key="value" value="2"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="endThumbTintColor">
|
||||
<color key="value" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<color key="value" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="endThumbStrokeColor">
|
||||
<color key="value" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<color key="value" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="endThumbStrokeHighlightedColor">
|
||||
<color key="value" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<color key="value" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XLN-xb-Www" customClass="CircularSlider" customModule="HGCircularSlider">
|
||||
<rect key="frame" x="54" y="110" width="211" height="211"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="diskFillColor">
|
||||
<color key="value" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="diskColor">
|
||||
<color key="value" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="trackFillColor">
|
||||
<color key="value" red="0.87450980392156863" green="0.80000000000000004" blue="0.22352941176470587" alpha="0.79496228448275863" colorSpace="calibratedRGB"/>
|
||||
<color key="value" red="0.87450980392156863" green="0.80000000000000004" blue="0.22352941176470587" alpha="0.79496228448275863" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="trackColor">
|
||||
<color key="value" red="1" green="1" blue="1" alpha="0.10000000000000001" colorSpace="calibratedRGB"/>
|
||||
<color key="value" red="1" green="1" blue="1" alpha="0.10000000000000001" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="lineWidth">
|
||||
<real key="value" value="4"/>
|
||||
@@ -493,32 +458,28 @@
|
||||
<real key="value" value="4"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="endThumbTintColor">
|
||||
<color key="value" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<color key="value" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="endThumbStrokeColor">
|
||||
<color key="value" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<color key="value" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="endThumbStrokeHighlightedColor">
|
||||
<color key="value" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<color key="value" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<stackView opaque="NO" contentMode="scaleToFill" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="mzf-rC-Kpg">
|
||||
<rect key="frame" x="94" y="366" width="132" height="65"/>
|
||||
<subviews>
|
||||
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="i8l-FT-Qb1">
|
||||
<rect key="frame" x="0.0" y="12.5" width="132" height="40"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" placeholderIntrinsicWidth="132" placeholderIntrinsicHeight="20" text="PARIS, FRANCE" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DSP-Eq-0z0">
|
||||
<rect key="frame" x="0.0" y="0.0" width="132" height="20"/>
|
||||
<fontDescription key="fontDescription" type="boldSystem" pointSize="16"/>
|
||||
<color key="textColor" red="0.99215686270000003" green="0.75294117650000003" blue="0.035294117649999998" alpha="0.61616379310344827" colorSpace="calibratedRGB"/>
|
||||
<color key="textColor" red="0.99215686270000003" green="0.75294117650000003" blue="0.035294117649999998" alpha="0.61616379310344827" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" placeholderIntrinsicWidth="132" placeholderIntrinsicHeight="20" text="November 9, 2016" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="f3J-m0-6t0">
|
||||
<rect key="frame" x="0.0" y="20" width="132" height="20"/>
|
||||
<fontDescription key="fontDescription" type="system" weight="ultraLight" pointSize="16"/>
|
||||
<color key="textColor" red="0.99215686270000003" green="0.75294117650000003" blue="0.035294117649999998" alpha="0.61616379310344827" colorSpace="calibratedRGB"/>
|
||||
<color key="textColor" red="0.99215686270000003" green="0.75294117650000003" blue="0.035294117649999998" alpha="0.61616379310344827" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
</subviews>
|
||||
@@ -526,7 +487,7 @@
|
||||
</subviews>
|
||||
</stackView>
|
||||
</subviews>
|
||||
<color key="backgroundColor" red="0.12549019607843137" green="0.14509803921568626" blue="0.21568627450980393" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="backgroundColor" red="0.12549019607843137" green="0.14509803921568626" blue="0.21568627450980393" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstItem="kWD-6U-Cha" firstAttribute="top" secondItem="iV1-rk-1SV" secondAttribute="top" constant="20" id="0n6-Li-FgA"/>
|
||||
<constraint firstItem="iV1-rk-1SV" firstAttribute="top" secondItem="WRY-kB-aj8" secondAttribute="bottom" id="3ax-Zd-hhc"/>
|
||||
@@ -560,7 +521,7 @@
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="4jZ-R1-SB1" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="-288" y="3562"/>
|
||||
<point key="canvasLocation" x="148" y="2468"/>
|
||||
</scene>
|
||||
</scenes>
|
||||
<resources>
|
||||
@@ -573,6 +534,6 @@
|
||||
<simulatedMetricsContainer key="defaultSimulatedMetrics">
|
||||
<simulatedStatusBarMetrics key="statusBar"/>
|
||||
<simulatedOrientationMetrics key="orientation"/>
|
||||
<simulatedScreenMetrics key="destination"/>
|
||||
<simulatedScreenMetrics key="destination" type="retina4_7.fullscreen"/>
|
||||
</simulatedMetricsContainer>
|
||||
</document>
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
import UIKit
|
||||
import HGCircularSlider
|
||||
|
||||
extension NSDate {
|
||||
extension Date {
|
||||
|
||||
}
|
||||
|
||||
@@ -21,9 +21,9 @@ class ClockViewController: UIViewController {
|
||||
@IBOutlet weak var wakeLabel: UILabel!
|
||||
@IBOutlet weak var rangeCircularSlider: RangeCircularSlider!
|
||||
|
||||
lazy var dateFormatter: NSDateFormatter = {
|
||||
let dateFormatter = NSDateFormatter()
|
||||
dateFormatter.timeZone = NSTimeZone(abbreviation: "UTC")
|
||||
lazy var dateFormatter: DateFormatter = {
|
||||
let dateFormatter = DateFormatter()
|
||||
dateFormatter.timeZone = TimeZone(abbreviation: "UTC")
|
||||
dateFormatter.dateFormat = "hh:mm a"
|
||||
return dateFormatter
|
||||
}()
|
||||
@@ -50,19 +50,19 @@ class ClockViewController: UIViewController {
|
||||
// Dispose of any resources that can be recreated.
|
||||
}
|
||||
|
||||
@IBAction func updateTexts(sender: AnyObject) {
|
||||
let bedtime = NSTimeInterval(rangeCircularSlider.startPointValue)
|
||||
let bedtimeDate = NSDate(timeIntervalSinceReferenceDate: bedtime)
|
||||
bedtimeLabel.text = dateFormatter.stringFromDate(bedtimeDate)
|
||||
@IBAction func updateTexts(_ sender: AnyObject) {
|
||||
let bedtime = TimeInterval(rangeCircularSlider.startPointValue)
|
||||
let bedtimeDate = Date(timeIntervalSinceReferenceDate: bedtime)
|
||||
bedtimeLabel.text = dateFormatter.string(from: bedtimeDate)
|
||||
|
||||
let wake = NSTimeInterval(rangeCircularSlider.endPointValue)
|
||||
let wakeDate = NSDate(timeIntervalSinceReferenceDate: wake)
|
||||
wakeLabel.text = dateFormatter.stringFromDate(wakeDate)
|
||||
let wake = TimeInterval(rangeCircularSlider.endPointValue)
|
||||
let wakeDate = Date(timeIntervalSinceReferenceDate: wake)
|
||||
wakeLabel.text = dateFormatter.string(from: wakeDate)
|
||||
|
||||
let duration = wake - bedtime
|
||||
let durationDate = NSDate(timeIntervalSinceReferenceDate: duration)
|
||||
let durationDate = Date(timeIntervalSinceReferenceDate: duration)
|
||||
dateFormatter.dateFormat = "HH:mm"
|
||||
durationLabel.text = dateFormatter.stringFromDate(durationDate)
|
||||
durationLabel.text = dateFormatter.string(from: durationDate)
|
||||
dateFormatter.dateFormat = "hh:mm a"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,15 @@
|
||||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "iphone",
|
||||
"size" : "20x20",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "iphone",
|
||||
"size" : "20x20",
|
||||
"scale" : "3x"
|
||||
},
|
||||
{
|
||||
"idiom" : "iphone",
|
||||
"size" : "29x29",
|
||||
@@ -35,4 +45,4 @@
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2,16 +2,7 @@
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "first.pdf",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
"filename" : "first.pdf"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
|
||||
@@ -2,16 +2,7 @@
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "second.pdf",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
"filename" : "second.pdf"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
|
||||
+1
-10
@@ -2,16 +2,7 @@
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "time_indicators.pdf",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
"filename" : "time_indicators.pdf"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
|
||||
@@ -34,13 +34,13 @@ class OClockViewController: UIViewController {
|
||||
hoursCircularSlider.minimumValue = 0
|
||||
hoursCircularSlider.maximumValue = 12
|
||||
hoursCircularSlider.endPointValue = 6
|
||||
hoursCircularSlider.addTarget(self, action: #selector(updateHours), forControlEvents: .ValueChanged)
|
||||
hoursCircularSlider.addTarget(self, action: #selector(updateHours), for: .valueChanged)
|
||||
|
||||
// minutes
|
||||
minutesCircularSlider.minimumValue = 0
|
||||
minutesCircularSlider.maximumValue = 60
|
||||
minutesCircularSlider.endPointValue = 35
|
||||
minutesCircularSlider.addTarget(self, action: #selector(updateMinutes), forControlEvents: .ValueChanged)
|
||||
minutesCircularSlider.addTarget(self, action: #selector(updateMinutes), for: .valueChanged)
|
||||
|
||||
|
||||
}
|
||||
@@ -69,7 +69,7 @@ class OClockViewController: UIViewController {
|
||||
updateHours()
|
||||
}
|
||||
|
||||
@IBAction func switchBetweenAMAndPM(sender: UISegmentedControl) {
|
||||
@IBAction func switchBetweenAMAndPM(_ sender: UISegmentedControl) {
|
||||
AMPMLabel.text = sender.selectedSegmentIndex == 0 ? "AM" : "PM"
|
||||
}
|
||||
|
||||
|
||||
@@ -11,11 +11,11 @@ import UIKit
|
||||
extension CALayer {
|
||||
|
||||
func borderUIColor() -> UIColor? {
|
||||
return borderColor != nil ? UIColor(CGColor: borderColor!) : nil
|
||||
return borderColor != nil ? UIColor(cgColor: borderColor!) : nil
|
||||
}
|
||||
|
||||
func setBorderUIColor(color: UIColor) {
|
||||
borderColor = color.CGColor
|
||||
func setBorderUIColor(_ color: UIColor) {
|
||||
borderColor = color.cgColor
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -27,10 +27,10 @@ class PlayerViewController: UIViewController {
|
||||
let audioPlayer = AVPlayer()
|
||||
|
||||
// date formatter user for timer label
|
||||
let dateComponentsFormatter: NSDateComponentsFormatter = {
|
||||
let formatter = NSDateComponentsFormatter()
|
||||
formatter.zeroFormattingBehavior = .Pad
|
||||
formatter.allowedUnits = [.Minute, .Second]
|
||||
let dateComponentsFormatter: DateComponentsFormatter = {
|
||||
let formatter = DateComponentsFormatter()
|
||||
formatter.zeroFormattingBehavior = .pad
|
||||
formatter.allowedUnits = [.minute, .second]
|
||||
|
||||
return formatter
|
||||
}()
|
||||
@@ -40,13 +40,13 @@ class PlayerViewController: UIViewController {
|
||||
|
||||
setupAudioPlayer()
|
||||
|
||||
circularSlider.addTarget(self, action: #selector(pause), forControlEvents: .EditingDidBegin)
|
||||
circularSlider.addTarget(self, action: #selector(play), forControlEvents: .EditingDidEnd)
|
||||
circularSlider.addTarget(self, action: #selector(updateTimer), forControlEvents: .ValueChanged)
|
||||
circularSlider.addTarget(self, action: #selector(pause), for: .editingDidBegin)
|
||||
circularSlider.addTarget(self, action: #selector(play), for: .editingDidEnd)
|
||||
circularSlider.addTarget(self, action: #selector(updateTimer), for: .valueChanged)
|
||||
|
||||
NSNotificationCenter.defaultCenter().addObserver(self,
|
||||
NotificationCenter.default.addObserver(self,
|
||||
selector: #selector(playerItemDidReachEnd(_:)),
|
||||
name: AVPlayerItemDidPlayToEndTimeNotification,
|
||||
name: NSNotification.Name.AVPlayerItemDidPlayToEndTime,
|
||||
object: audioPlayer.currentItem)
|
||||
}
|
||||
|
||||
@@ -55,12 +55,12 @@ class PlayerViewController: UIViewController {
|
||||
// Dispose of any resources that can be recreated.
|
||||
}
|
||||
|
||||
@IBAction func togglePlayer(sender: UISegmentedControl) {
|
||||
@IBAction func togglePlayer(_ sender: UISegmentedControl) {
|
||||
switch sender.selectedSegmentIndex {
|
||||
case 0:
|
||||
let currentTime = Float64(circularSlider.endPointValue)
|
||||
let newTime = CMTimeMakeWithSeconds(currentTime, 600)
|
||||
audioPlayer.seekToTime(newTime, toleranceBefore: kCMTimeZero, toleranceAfter: kCMTimeZero)
|
||||
audioPlayer.seek(to: newTime, toleranceBefore: kCMTimeZero, toleranceAfter: kCMTimeZero)
|
||||
audioPlayer.play()
|
||||
default:
|
||||
audioPlayer.pause()
|
||||
@@ -83,16 +83,16 @@ class PlayerViewController: UIViewController {
|
||||
*/
|
||||
func setupAudioPlayer() {
|
||||
// TODO: load the audio file asynchronously and observe player status
|
||||
guard let audioFileURL = NSBundle.mainBundle().URLForResource("StrangeZero", withExtension: "mp3") else { return }
|
||||
let asset = AVURLAsset(URL: audioFileURL, options: nil)
|
||||
guard let audioFileURL = Bundle.main.url(forResource: "StrangeZero", withExtension: "mp3") else { return }
|
||||
let asset = AVURLAsset(url: audioFileURL, options: nil)
|
||||
let playerItem = AVPlayerItem(asset: asset)
|
||||
audioPlayer.replaceCurrentItemWithPlayerItem(playerItem)
|
||||
audioPlayer.actionAtItemEnd = .Pause
|
||||
audioPlayer.replaceCurrentItem(with: playerItem)
|
||||
audioPlayer.actionAtItemEnd = .pause
|
||||
|
||||
let durationInSeconds = CMTimeGetSeconds(asset.duration)
|
||||
circularSlider.maximumValue = CGFloat(durationInSeconds)
|
||||
let interval = CMTimeMake(1, 4)
|
||||
audioPlayer.addPeriodicTimeObserverForInterval(interval, queue: dispatch_get_main_queue()) {
|
||||
audioPlayer.addPeriodicTimeObserver(forInterval: interval, queue: DispatchQueue.main) {
|
||||
[weak self] time in
|
||||
let seconds = CMTimeGetSeconds(time)
|
||||
self?.updatePlayerUI(withCurrentTime: CGFloat(seconds))
|
||||
@@ -105,22 +105,22 @@ class PlayerViewController: UIViewController {
|
||||
// update the slider position and the timer text
|
||||
func updatePlayerUI(withCurrentTime currentTime: CGFloat) {
|
||||
circularSlider.endPointValue = currentTime
|
||||
let components = NSDateComponents()
|
||||
var components = DateComponents()
|
||||
components.second = Int(currentTime)
|
||||
timerLabel.text = dateComponentsFormatter.stringFromDateComponents(components)
|
||||
timerLabel.text = dateComponentsFormatter.string(from: components)
|
||||
}
|
||||
|
||||
func updateTimer() {
|
||||
let components = NSDateComponents()
|
||||
var components = DateComponents()
|
||||
components.second = Int(circularSlider.endPointValue)
|
||||
timerLabel.text = dateComponentsFormatter.stringFromDateComponents(components)
|
||||
timerLabel.text = dateComponentsFormatter.string(from: components)
|
||||
}
|
||||
|
||||
// MARK: - Notification
|
||||
|
||||
func playerItemDidReachEnd(notification: NSNotification) {
|
||||
func playerItemDidReachEnd(_ notification: Notification) {
|
||||
if let playerItem: AVPlayerItem = notification.object as? AVPlayerItem {
|
||||
playerItem.seekToTime(kCMTimeZero)
|
||||
playerItem.seek(to: kCMTimeZero)
|
||||
playerSegmentedControl.selectedSegmentIndex = UISegmentedControlNoSegment
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
PODS:
|
||||
- HGCircularSlider (0.1.3)
|
||||
- HGCircularSlider (0.1.0)
|
||||
|
||||
DEPENDENCIES:
|
||||
- HGCircularSlider (from `../`)
|
||||
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
|
||||
:path: ../
|
||||
|
||||
SPEC CHECKSUMS:
|
||||
HGCircularSlider: 50fd2c84c478c1dd6244a75840514427193c715f
|
||||
HGCircularSlider: 6e1102b5beb35049162fde593b4c70bf26b338ec
|
||||
|
||||
PODFILE CHECKSUM: 7cb4c64ce59896052589f93ba9b0ea50a207f738
|
||||
|
||||
COCOAPODS: 1.1.1
|
||||
COCOAPODS: 1.0.0
|
||||
|
||||
+8
-9
@@ -1,23 +1,22 @@
|
||||
{
|
||||
"name": "HGCircularSlider",
|
||||
"version": "0.1.3",
|
||||
"summary": "Multiple Circular Sliders used to select a value from a continuous range of values.",
|
||||
"description": "Circular Sliders used to select a value from a continuous range of values.\n\nCircularSlider: simple circular slider\nRangeCircularSlider: slider with two points to select a range of values from a continuous range of values\nMidPointCircularSlider: slider with fixed range to select a range of values from a continuois range of values",
|
||||
"homepage": "https://github.com/HamzaGhazouani/HGCircularSlider",
|
||||
"version": "0.1.0",
|
||||
"summary": "A short description of HGCircularSlider.",
|
||||
"description": "TODO: Add long description of the pod here.",
|
||||
"homepage": "https://github.com/<GITHUB_USERNAME>/HGCircularSlider",
|
||||
"license": {
|
||||
"type": "MIT",
|
||||
"file": "LICENSE"
|
||||
},
|
||||
"authors": {
|
||||
"Hamza Ghazouani": "hamza.ghazouani@gmail.com"
|
||||
"Hamza GHAZOUANI": "hamza.ghazouani@onmobile.com"
|
||||
},
|
||||
"source": {
|
||||
"git": "https://github.com/HamzaGhazouani/HGCircularSlider.git",
|
||||
"tag": "0.1.3"
|
||||
"git": "https://github.com/<GITHUB_USERNAME>/HGCircularSlider.git",
|
||||
"tag": "0.1.0"
|
||||
},
|
||||
"social_media_url": "https://twitter.com/GhazouaniHamza",
|
||||
"platforms": {
|
||||
"ios": "7.0"
|
||||
"ios": "8.0"
|
||||
},
|
||||
"source_files": "HGCircularSlider/Classes/**/*"
|
||||
}
|
||||
|
||||
Generated
+3
-3
@@ -1,5 +1,5 @@
|
||||
PODS:
|
||||
- HGCircularSlider (0.1.3)
|
||||
- HGCircularSlider (0.1.0)
|
||||
|
||||
DEPENDENCIES:
|
||||
- HGCircularSlider (from `../`)
|
||||
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
|
||||
:path: ../
|
||||
|
||||
SPEC CHECKSUMS:
|
||||
HGCircularSlider: 50fd2c84c478c1dd6244a75840514427193c715f
|
||||
HGCircularSlider: 6e1102b5beb35049162fde593b4c70bf26b338ec
|
||||
|
||||
PODFILE CHECKSUM: 7cb4c64ce59896052589f93ba9b0ea50a207f738
|
||||
|
||||
COCOAPODS: 1.1.1
|
||||
COCOAPODS: 1.0.0
|
||||
|
||||
-2
@@ -1,6 +1,4 @@
|
||||
#ifdef __OBJC__
|
||||
#import <UIKit/UIKit.h>
|
||||
#endif
|
||||
|
||||
|
||||
FOUNDATION_EXPORT double HGCircularSliderVersionNumber;
|
||||
|
||||
+20
-20
@@ -2,25 +2,25 @@
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>en</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>${EXECUTABLE_NAME}</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>${PRODUCT_NAME}</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>FMWK</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>0.1.3</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>${CURRENT_PROJECT_VERSION}</string>
|
||||
<key>NSPrincipalClass</key>
|
||||
<string></string>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>en</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>${EXECUTABLE_NAME}</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>${PRODUCT_NAME}</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>FMWK</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>0.1.0</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>${CURRENT_PROJECT_VERSION}</string>
|
||||
<key>NSPrincipalClass</key>
|
||||
<string></string>
|
||||
</dict>
|
||||
</plist>
|
||||
|
||||
+2
-4
@@ -17,7 +17,7 @@
|
||||
<string>Copyright (c) 2016 Hamza Ghazouani <hamza.ghazouani@gmail.com>
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
@@ -26,7 +26,7 @@ furnished to do so, subject to the following conditions:
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
@@ -34,8 +34,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
</string>
|
||||
<key>License</key>
|
||||
<string>MIT</string>
|
||||
<key>Title</key>
|
||||
<string>HGCircularSlider</string>
|
||||
<key>Type</key>
|
||||
|
||||
+10
-4
@@ -23,6 +23,12 @@ case "${TARGETED_DEVICE_FAMILY}" in
|
||||
;;
|
||||
esac
|
||||
|
||||
realpath() {
|
||||
DIRECTORY="$(cd "${1%/*}" && pwd)"
|
||||
FILENAME="${1##*/}"
|
||||
echo "$DIRECTORY/$FILENAME"
|
||||
}
|
||||
|
||||
install_resource()
|
||||
{
|
||||
if [[ "$1" = /* ]] ; then
|
||||
@@ -42,8 +48,8 @@ EOM
|
||||
ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS}
|
||||
;;
|
||||
*.xib)
|
||||
echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}"
|
||||
ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS}
|
||||
echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT}"
|
||||
ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}"
|
||||
;;
|
||||
*.framework)
|
||||
echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
|
||||
@@ -64,7 +70,7 @@ EOM
|
||||
xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm"
|
||||
;;
|
||||
*.xcassets)
|
||||
ABSOLUTE_XCASSET_FILE="$RESOURCE_PATH"
|
||||
ABSOLUTE_XCASSET_FILE=$(realpath "$RESOURCE_PATH")
|
||||
XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE")
|
||||
;;
|
||||
*)
|
||||
@@ -87,7 +93,7 @@ then
|
||||
# Find all other xcassets (this unfortunately includes those of path pods and other targets).
|
||||
OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
|
||||
while read line; do
|
||||
if [[ $line != "${PODS_ROOT}*" ]]; then
|
||||
if [[ $line != "`realpath $PODS_ROOT`*" ]]; then
|
||||
XCASSET_FILES+=("$line")
|
||||
fi
|
||||
done <<<"$OTHER_XCASSETS"
|
||||
|
||||
-2
@@ -1,6 +1,4 @@
|
||||
#ifdef __OBJC__
|
||||
#import <UIKit/UIKit.h>
|
||||
#endif
|
||||
|
||||
|
||||
FOUNDATION_EXPORT double Pods_HGCircularSlider_ExampleVersionNumber;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
|
||||
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES
|
||||
FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/HGCircularSlider"
|
||||
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
|
||||
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES
|
||||
FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/HGCircularSlider"
|
||||
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
|
||||
|
||||
+20
-20
@@ -2,25 +2,25 @@
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>en</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>${EXECUTABLE_NAME}</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>${PRODUCT_NAME}</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>FMWK</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.0.0</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>${CURRENT_PROJECT_VERSION}</string>
|
||||
<key>NSPrincipalClass</key>
|
||||
<string></string>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>en</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>${EXECUTABLE_NAME}</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>${PRODUCT_NAME}</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>FMWK</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.0.0</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>${CURRENT_PROJECT_VERSION}</string>
|
||||
<key>NSPrincipalClass</key>
|
||||
<string></string>
|
||||
</dict>
|
||||
</plist>
|
||||
|
||||
+10
-4
@@ -23,6 +23,12 @@ case "${TARGETED_DEVICE_FAMILY}" in
|
||||
;;
|
||||
esac
|
||||
|
||||
realpath() {
|
||||
DIRECTORY="$(cd "${1%/*}" && pwd)"
|
||||
FILENAME="${1##*/}"
|
||||
echo "$DIRECTORY/$FILENAME"
|
||||
}
|
||||
|
||||
install_resource()
|
||||
{
|
||||
if [[ "$1" = /* ]] ; then
|
||||
@@ -42,8 +48,8 @@ EOM
|
||||
ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS}
|
||||
;;
|
||||
*.xib)
|
||||
echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}"
|
||||
ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS}
|
||||
echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT}"
|
||||
ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}"
|
||||
;;
|
||||
*.framework)
|
||||
echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
|
||||
@@ -64,7 +70,7 @@ EOM
|
||||
xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm"
|
||||
;;
|
||||
*.xcassets)
|
||||
ABSOLUTE_XCASSET_FILE="$RESOURCE_PATH"
|
||||
ABSOLUTE_XCASSET_FILE=$(realpath "$RESOURCE_PATH")
|
||||
XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE")
|
||||
;;
|
||||
*)
|
||||
@@ -87,7 +93,7 @@ then
|
||||
# Find all other xcassets (this unfortunately includes those of path pods and other targets).
|
||||
OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
|
||||
while read line; do
|
||||
if [[ $line != "${PODS_ROOT}*" ]]; then
|
||||
if [[ $line != "`realpath $PODS_ROOT`*" ]]; then
|
||||
XCASSET_FILES+=("$line")
|
||||
fi
|
||||
done <<<"$OTHER_XCASSETS"
|
||||
|
||||
Example/Pods/Target Support Files/Pods-HGCircularSlider_Tests/Pods-HGCircularSlider_Tests-umbrella.h
Generated
-2
@@ -1,6 +1,4 @@
|
||||
#ifdef __OBJC__
|
||||
#import <UIKit/UIKit.h>
|
||||
#endif
|
||||
|
||||
|
||||
FOUNDATION_EXPORT double Pods_HGCircularSlider_TestsVersionNumber;
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO
|
||||
FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/HGCircularSlider"
|
||||
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
|
||||
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO
|
||||
FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/HGCircularSlider"
|
||||
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
|
||||
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
|
||||
|
||||
@@ -21,7 +21,7 @@ class Tests: XCTestCase {
|
||||
|
||||
func testPerformanceExample() {
|
||||
// This is an example of a performance test case.
|
||||
self.measureBlock() {
|
||||
self.measure() {
|
||||
// Put the code you want to measure the time of here.
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
s.name = 'HGCircularSlider'
|
||||
s.version = '0.1.3'
|
||||
s.version = '1.0.0'
|
||||
s.summary = 'Multiple Circular Sliders used to select a value from a continuous range of values.'
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ s.author = { 'Hamza Ghazouani' => 'hamza.ghazouani@gmail.com' }
|
||||
s.source = { :git => 'https://github.com/HamzaGhazouani/HGCircularSlider.git', :tag => s.version.to_s }
|
||||
s.social_media_url = 'https://twitter.com/GhazouaniHamza'
|
||||
|
||||
s.ios.deployment_target = '7.0'
|
||||
s.ios.deployment_target = '8.0'
|
||||
|
||||
s.source_files = 'HGCircularSlider/Classes/**/*'
|
||||
|
||||
|
||||
@@ -20,18 +20,19 @@ extension CircularSlider {
|
||||
- parameter context: the context
|
||||
|
||||
*/
|
||||
internal static func drawArc(withArc arc: Arc, lineWidth: CGFloat = 2, mode: CGPathDrawingMode = .FillStroke, inContext context: CGContextRef) {
|
||||
internal static func drawArc(withArc arc: Arc, lineWidth: CGFloat = 2, mode: CGPathDrawingMode = .fillStroke, inContext context: CGContext) {
|
||||
|
||||
let circle = arc.circle
|
||||
let origin = circle.origin
|
||||
|
||||
UIGraphicsPushContext(context)
|
||||
CGContextBeginPath(context)
|
||||
context.beginPath()
|
||||
|
||||
context.setLineWidth(lineWidth)
|
||||
context.addArc(center: origin, radius: circle.radius, startAngle: arc.startAngle, endAngle: arc.endAngle, clockwise: false)
|
||||
context.move(to: CGPoint(x: origin.x, y: origin.y))
|
||||
context.drawPath(using: mode)
|
||||
|
||||
CGContextSetLineWidth(context, lineWidth)
|
||||
CGContextAddArc(context, origin.x, origin.y, circle.radius, arc.startAngle, arc.endAngle, 0)
|
||||
CGContextMoveToPoint(context, origin.x, origin.y)
|
||||
CGContextDrawPath(context, mode)
|
||||
UIGraphicsPopContext()
|
||||
}
|
||||
|
||||
@@ -41,25 +42,26 @@ extension CircularSlider {
|
||||
- parameter arc: the arc coordinates (origin, radius, start angle, end angle)
|
||||
- parameter context: the context
|
||||
*/
|
||||
internal static func drawDisk(withArc arc: Arc, inContext context: CGContextRef) {
|
||||
internal static func drawDisk(withArc arc: Arc, inContext context: CGContext) {
|
||||
|
||||
let circle = arc.circle
|
||||
let origin = circle.origin
|
||||
|
||||
UIGraphicsPushContext(context)
|
||||
CGContextBeginPath(context)
|
||||
context.beginPath()
|
||||
|
||||
context.setLineWidth(0)
|
||||
context.addArc(center: origin, radius: circle.radius, startAngle: arc.startAngle, endAngle: arc.endAngle, clockwise: false)
|
||||
context.addLine(to: CGPoint(x: origin.x, y: origin.y))
|
||||
context.drawPath(using: .fill)
|
||||
|
||||
CGContextSetLineWidth(context, 0)
|
||||
CGContextAddArc(context, origin.x, origin.y, circle.radius, arc.startAngle, arc.endAngle, 0)
|
||||
CGContextAddLineToPoint(context, origin.x, origin.y)
|
||||
CGContextDrawPath(context, .Fill)
|
||||
UIGraphicsPopContext()
|
||||
}
|
||||
|
||||
// MARK: drawing instance methods
|
||||
|
||||
/// Draw the circular slider
|
||||
internal func drawCircularSlider(inContext context: CGContextRef) {
|
||||
internal func drawCircularSlider(inContext context: CGContext) {
|
||||
diskColor.setFill()
|
||||
trackColor.setStroke()
|
||||
|
||||
@@ -70,7 +72,7 @@ extension CircularSlider {
|
||||
}
|
||||
|
||||
/// draw Filled arc between start an end angles
|
||||
internal func drawFilledArc(fromAngle startAngle: CGFloat, toAngle endAngle: CGFloat, inContext context: CGContextRef) {
|
||||
internal func drawFilledArc(fromAngle startAngle: CGFloat, toAngle endAngle: CGFloat, inContext context: CGContext) {
|
||||
diskFillColor.setFill()
|
||||
trackFillColor.setStroke()
|
||||
|
||||
@@ -80,7 +82,7 @@ extension CircularSlider {
|
||||
// fill Arc
|
||||
CircularSlider.drawDisk(withArc: arc, inContext: context)
|
||||
// stroke Arc
|
||||
CircularSlider.drawArc(withArc: arc, lineWidth: lineWidth, mode: .Stroke, inContext: context)
|
||||
CircularSlider.drawArc(withArc: arc, lineWidth: lineWidth, mode: .stroke, inContext: context)
|
||||
}
|
||||
|
||||
|
||||
@@ -92,7 +94,7 @@ extension CircularSlider {
|
||||
|
||||
- returns: return the origin point of the thumb
|
||||
*/
|
||||
internal func drawThumb(withAngle angle: CGFloat, inContext context: CGContextRef) -> CGPoint {
|
||||
internal func drawThumb(withAngle angle: CGFloat, inContext context: CGContext) -> CGPoint {
|
||||
let circle = Circle(origin: bounds.center, radius: self.radius)
|
||||
let thumbOrigin = CircularSliderHelper.endPoint(fromCircle: circle, angle: angle)
|
||||
let thumbCircle = Circle(origin: thumbOrigin, radius: thumbRadius)
|
||||
@@ -112,14 +114,14 @@ extension CircularSlider {
|
||||
|
||||
- returns: return the origin point of the thumb
|
||||
*/
|
||||
internal func drawThumb(withImage image: UIImage, angle: CGFloat, inContext context: CGContextRef) -> CGPoint {
|
||||
internal func drawThumb(withImage image: UIImage, angle: CGFloat, inContext context: CGContext) -> CGPoint {
|
||||
UIGraphicsPushContext(context)
|
||||
CGContextBeginPath(context)
|
||||
context.beginPath()
|
||||
let circle = Circle(origin: bounds.center, radius: self.radius)
|
||||
let thumbOrigin = CircularSliderHelper.endPoint(fromCircle: circle, angle: angle)
|
||||
let imageSize = image.size
|
||||
let imageFrame = CGRectMake(thumbOrigin.x - (imageSize.width / 2), thumbOrigin.y - (imageSize.height / 2), imageSize.width, imageSize.height)
|
||||
image.drawInRect(imageFrame)
|
||||
let imageFrame = CGRect(x: thumbOrigin.x - (imageSize.width / 2), y: thumbOrigin.y - (imageSize.height / 2), width: imageSize.width, height: imageSize.height)
|
||||
image.draw(in: imageFrame)
|
||||
UIGraphicsPopContext()
|
||||
|
||||
return thumbOrigin
|
||||
|
||||
@@ -15,7 +15,7 @@ import UIKit
|
||||
* ValueChanged, EditingDidBegin and EditingDidEnd
|
||||
*/
|
||||
@IBDesignable
|
||||
public class CircularSlider: UIControl {
|
||||
open class CircularSlider: UIControl {
|
||||
|
||||
// MARK: Changing the Slider’s Appearance
|
||||
|
||||
@@ -24,28 +24,28 @@ public class CircularSlider: UIControl {
|
||||
* The default value is a transparent color.
|
||||
*/
|
||||
@IBInspectable
|
||||
public var diskFillColor: UIColor = UIColor.clearColor()
|
||||
open var diskFillColor: UIColor = UIColor.clear
|
||||
|
||||
/**
|
||||
* The color shown for the portion of the disk of slider that is unfilled. (outside start and end values)
|
||||
* The default value of this property is the black color with alpha = 0.3.
|
||||
*/
|
||||
@IBInspectable
|
||||
public var diskColor: UIColor = UIColor.grayColor()
|
||||
open var diskColor: UIColor = UIColor.gray
|
||||
|
||||
/**
|
||||
* The color shown for the portion of the slider that is filled. (between start and end values)
|
||||
* The default value of this property is the tint color.
|
||||
*/
|
||||
@IBInspectable
|
||||
public var trackFillColor: UIColor = UIColor.clearColor()
|
||||
open var trackFillColor: UIColor = UIColor.clear
|
||||
|
||||
/**
|
||||
* The color shown for the portion of the slider that is unfilled. (outside start and end values)
|
||||
* The default value of this property is the white color.
|
||||
*/
|
||||
@IBInspectable
|
||||
public var trackColor: UIColor = UIColor.whiteColor()
|
||||
open var trackColor: UIColor = UIColor.white
|
||||
|
||||
/**
|
||||
* The width of the circular line
|
||||
@@ -53,7 +53,7 @@ public class CircularSlider: UIControl {
|
||||
* The default value of this property is 5.0.
|
||||
*/
|
||||
@IBInspectable
|
||||
public var lineWidth: CGFloat = 5.0
|
||||
open var lineWidth: CGFloat = 5.0
|
||||
|
||||
/**
|
||||
* The width of the thumb stroke line
|
||||
@@ -61,7 +61,7 @@ public class CircularSlider: UIControl {
|
||||
* The default value of this property is 4.0.
|
||||
*/
|
||||
@IBInspectable
|
||||
public var thumbLineWidth: CGFloat = 4.0
|
||||
open var thumbLineWidth: CGFloat = 4.0
|
||||
|
||||
/**
|
||||
* The radius of thumb
|
||||
@@ -69,7 +69,7 @@ public class CircularSlider: UIControl {
|
||||
* The default value of this property is 13.0.
|
||||
*/
|
||||
@IBInspectable
|
||||
public var thumbRadius: CGFloat = 13.0
|
||||
open var thumbRadius: CGFloat = 13.0
|
||||
|
||||
/**
|
||||
* The color used to tint thumb
|
||||
@@ -78,14 +78,14 @@ public class CircularSlider: UIControl {
|
||||
* The default value of this property is the groupTableViewBackgroundColor.
|
||||
*/
|
||||
@IBInspectable
|
||||
public var endThumbTintColor: UIColor = UIColor.groupTableViewBackgroundColor()
|
||||
open var endThumbTintColor: UIColor = UIColor.groupTableViewBackground
|
||||
|
||||
/**
|
||||
* The stroke highlighted color of end thumb
|
||||
* The default value of this property is blue color
|
||||
*/
|
||||
@IBInspectable
|
||||
public var endThumbStrokeHighlightedColor: UIColor = UIColor.blueColor()
|
||||
open var endThumbStrokeHighlightedColor: UIColor = UIColor.blue
|
||||
|
||||
/**
|
||||
* The color used to tint the stroke of the end thumb
|
||||
@@ -94,7 +94,7 @@ public class CircularSlider: UIControl {
|
||||
* The default value of this property is the red color.
|
||||
*/
|
||||
@IBInspectable
|
||||
public var endThumbStrokeColor: UIColor = UIColor.redColor()
|
||||
open var endThumbStrokeColor: UIColor = UIColor.red
|
||||
|
||||
/**
|
||||
* The image of the end thumb
|
||||
@@ -102,7 +102,7 @@ public class CircularSlider: UIControl {
|
||||
*
|
||||
* The default value of this property is nil
|
||||
*/
|
||||
public var endThumbImage: UIImage?
|
||||
open var endThumbImage: UIImage?
|
||||
|
||||
// MARK: Accessing the Slider’s Value Limits
|
||||
|
||||
@@ -113,7 +113,7 @@ public class CircularSlider: UIControl {
|
||||
* The default value of this property is 0.0.
|
||||
*/
|
||||
@IBInspectable
|
||||
public var minimumValue: CGFloat = 0.0 {
|
||||
open var minimumValue: CGFloat = 0.0 {
|
||||
didSet {
|
||||
if endPointValue < minimumValue {
|
||||
endPointValue = minimumValue
|
||||
@@ -128,7 +128,7 @@ public class CircularSlider: UIControl {
|
||||
* The default value of this property is 1.0.
|
||||
*/
|
||||
@IBInspectable
|
||||
public var maximumValue: CGFloat = 1.0 {
|
||||
open var maximumValue: CGFloat = 1.0 {
|
||||
didSet {
|
||||
if endPointValue > maximumValue {
|
||||
endPointValue = maximumValue
|
||||
@@ -144,7 +144,7 @@ public class CircularSlider: UIControl {
|
||||
*
|
||||
* The default value of this property is 0.5
|
||||
*/
|
||||
public var endPointValue: CGFloat = 0.5 {
|
||||
open var endPointValue: CGFloat = 0.5 {
|
||||
didSet {
|
||||
if oldValue == endPointValue {
|
||||
return
|
||||
@@ -171,7 +171,7 @@ public class CircularSlider: UIControl {
|
||||
}
|
||||
|
||||
/// See superclass documentation
|
||||
override public var highlighted: Bool {
|
||||
override open var isHighlighted: Bool {
|
||||
didSet {
|
||||
setNeedsDisplay()
|
||||
}
|
||||
@@ -206,7 +206,7 @@ public class CircularSlider: UIControl {
|
||||
/**
|
||||
See superclass documentation
|
||||
*/
|
||||
override public func drawRect(rect: CGRect) {
|
||||
override open func draw(_ rect: CGRect) {
|
||||
guard let context = UIGraphicsGetCurrentContext() else { return }
|
||||
|
||||
drawCircularSlider(inContext: context)
|
||||
@@ -219,7 +219,7 @@ public class CircularSlider: UIControl {
|
||||
|
||||
// draw end thumb
|
||||
endThumbTintColor.setFill()
|
||||
(highlighted == true) ? endThumbStrokeHighlightedColor.setStroke() : endThumbStrokeColor.setStroke()
|
||||
(isHighlighted == true) ? endThumbStrokeHighlightedColor.setStroke() : endThumbStrokeColor.setStroke()
|
||||
drawThumb(withAngle: endAngle, inContext: context)
|
||||
|
||||
guard let image = endThumbImage else {
|
||||
@@ -234,8 +234,8 @@ public class CircularSlider: UIControl {
|
||||
/**
|
||||
See superclass documentation
|
||||
*/
|
||||
override public func beginTrackingWithTouch(touch: UITouch, withEvent event: UIEvent?) -> Bool {
|
||||
sendActionsForControlEvents(.EditingDidBegin)
|
||||
override open func beginTracking(_ touch: UITouch, with event: UIEvent?) -> Bool {
|
||||
sendActions(for: .editingDidBegin)
|
||||
|
||||
return true
|
||||
}
|
||||
@@ -243,10 +243,10 @@ public class CircularSlider: UIControl {
|
||||
/**
|
||||
See superclass documentation
|
||||
*/
|
||||
override public func continueTrackingWithTouch(touch: UITouch, withEvent event: UIEvent?) -> Bool {
|
||||
override open func continueTracking(_ touch: UITouch, with event: UIEvent?) -> Bool {
|
||||
|
||||
// the position of the pan gesture
|
||||
let touchPosition = touch.locationInView(self)
|
||||
let touchPosition = touch.location(in: self)
|
||||
|
||||
let startPoint = CGPoint(x: bounds.center.x, y: 0)
|
||||
let angle = CircularSliderHelper.angle(betweenFirstPoint: startPoint, secondPoint: touchPosition, inCircleWithCenter: bounds.center)
|
||||
@@ -255,7 +255,7 @@ public class CircularSlider: UIControl {
|
||||
let newValue = CircularSliderHelper.value(inInterval: interval, fromAngle: angle)
|
||||
|
||||
endPointValue = newValue
|
||||
sendActionsForControlEvents(.ValueChanged)
|
||||
sendActions(for: .valueChanged)
|
||||
|
||||
return true
|
||||
}
|
||||
@@ -263,8 +263,8 @@ public class CircularSlider: UIControl {
|
||||
/**
|
||||
See superclass documentation
|
||||
*/
|
||||
public override func endTrackingWithTouch(touch: UITouch?, withEvent event: UIEvent?) {
|
||||
sendActionsForControlEvents(.EditingDidEnd)
|
||||
open override func endTracking(_ touch: UITouch?, with event: UIEvent?) {
|
||||
sendActions(for: .editingDidEnd)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ internal struct Interval {
|
||||
}
|
||||
|
||||
internal struct Circle {
|
||||
var origin = CGPointZero
|
||||
var origin = CGPoint.zero
|
||||
var radius: CGFloat = 0
|
||||
|
||||
init(origin: CGPoint, radius: CGFloat) {
|
||||
@@ -35,7 +35,7 @@ internal struct Circle {
|
||||
|
||||
internal struct Arc {
|
||||
|
||||
var circle = Circle(origin: CGPointZero, radius: 0)
|
||||
var circle = Circle(origin: CGPoint.zero, radius: 0)
|
||||
var startAngle: CGFloat = 0.0
|
||||
var endAngle: CGFloat = 0.0
|
||||
|
||||
@@ -63,12 +63,12 @@ extension CGVector {
|
||||
self.init(dx: dx, dy: dy)
|
||||
}
|
||||
|
||||
func dotProduct(v: CGVector) -> CGFloat {
|
||||
func dotProduct(_ v: CGVector) -> CGFloat {
|
||||
let dotProduct = (dx * v.dx) + (dy * v.dy)
|
||||
return dotProduct
|
||||
}
|
||||
|
||||
func determinant(v: CGVector) -> CGFloat {
|
||||
func determinant(_ v: CGVector) -> CGFloat {
|
||||
let determinant = (v.dx * dy) - (dx * v.dy)
|
||||
return determinant
|
||||
}
|
||||
@@ -88,7 +88,7 @@ extension CGRect {
|
||||
// get the center of rect (bounds or frame)
|
||||
internal var center: CGPoint {
|
||||
get {
|
||||
let center = CGPointMake(midX, midY)
|
||||
let center = CGPoint(x: midX, y: midY)
|
||||
return center
|
||||
}
|
||||
}
|
||||
@@ -154,7 +154,7 @@ class CircularSliderHelper {
|
||||
|
||||
let x = circle.radius * cos(angle) + circle.origin.x // cos(α) = x / radius
|
||||
let y = circle.radius * sin(angle) + circle.origin.y // sin(α) = y / radius
|
||||
let point = CGPointMake(x, y)
|
||||
let point = CGPoint(x: x, y: y)
|
||||
|
||||
return point
|
||||
}
|
||||
@@ -171,7 +171,7 @@ class CircularSliderHelper {
|
||||
|
||||
- returns: the value in the new interval
|
||||
*/
|
||||
internal static func scaleValue(value: CGFloat, fromInterval source: Interval, toInterval destination: Interval) -> CGFloat {
|
||||
internal static func scaleValue(_ value: CGFloat, fromInterval source: Interval, toInterval destination: Interval) -> CGFloat {
|
||||
let sourceRange = source.max - source.min
|
||||
let destinationRange = destination.max - destination.min
|
||||
let newValue = (((value - source.min) * destinationRange) / sourceRange) + destination.min
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
MidPointCircularSlider use the target-action mechanism to report changes made during the course of editing:
|
||||
ValueChanged, EditingDidBegin and EditingDidEnd
|
||||
*/
|
||||
public class MidPointCircularSlider: RangeCircularSlider {
|
||||
open class MidPointCircularSlider: RangeCircularSlider {
|
||||
|
||||
// MARK: properties
|
||||
|
||||
@@ -22,14 +22,14 @@ public class MidPointCircularSlider: RangeCircularSlider {
|
||||
* The default value of this property is the groupTableViewBackgroundColor.
|
||||
*/
|
||||
@IBInspectable
|
||||
public var midThumbTintColor: UIColor = UIColor.groupTableViewBackgroundColor()
|
||||
open var midThumbTintColor: UIColor = UIColor.groupTableViewBackground
|
||||
|
||||
/**
|
||||
* The stroke highlighted color of end thumb
|
||||
* The default value of this property is blue color
|
||||
*/
|
||||
@IBInspectable
|
||||
public var midThumbStrokeHighlightedColor: UIColor = UIColor.blueColor()
|
||||
open var midThumbStrokeHighlightedColor: UIColor = UIColor.blue
|
||||
|
||||
/**
|
||||
* The color used to tint the stroke of the mid thumb
|
||||
@@ -38,7 +38,7 @@ public class MidPointCircularSlider: RangeCircularSlider {
|
||||
* The default value of this property is the red color.
|
||||
*/
|
||||
@IBInspectable
|
||||
public var midThumbStrokeColor: UIColor = UIColor.redColor()
|
||||
open var midThumbStrokeColor: UIColor = UIColor.red
|
||||
|
||||
|
||||
/**
|
||||
@@ -47,7 +47,7 @@ public class MidPointCircularSlider: RangeCircularSlider {
|
||||
*
|
||||
* The default value of this property is nil
|
||||
*/
|
||||
public var midThumbImage: UIImage?
|
||||
open var midThumbImage: UIImage?
|
||||
|
||||
|
||||
/**
|
||||
@@ -56,14 +56,14 @@ public class MidPointCircularSlider: RangeCircularSlider {
|
||||
* The value of this property should be >= 0
|
||||
* The default value of this property is 0.2
|
||||
*/
|
||||
override public var distance: CGFloat {
|
||||
override open var distance: CGFloat {
|
||||
didSet {
|
||||
assert(distance >= 0, "The CustomCircularSlider works only with fixed distance between start and end points, so distance property should be > 0")
|
||||
}
|
||||
}
|
||||
|
||||
/// The value of the mid point (between the start and end points)
|
||||
private var midPointValue: CGFloat {
|
||||
fileprivate var midPointValue: CGFloat {
|
||||
get {
|
||||
return (endPointValue + startPointValue) / 2
|
||||
}
|
||||
@@ -94,7 +94,7 @@ public class MidPointCircularSlider: RangeCircularSlider {
|
||||
/**
|
||||
See superclass documentation
|
||||
*/
|
||||
override public func drawRect(rect: CGRect) {
|
||||
override open func draw(_ rect: CGRect) {
|
||||
guard let context = UIGraphicsGetCurrentContext() else { return }
|
||||
|
||||
drawCircularSlider(inContext: context)
|
||||
@@ -112,7 +112,7 @@ public class MidPointCircularSlider: RangeCircularSlider {
|
||||
|
||||
// draw mid thumb
|
||||
midThumbTintColor.setFill()
|
||||
(highlighted == true) ? midThumbStrokeHighlightedColor.setStroke() : midThumbStrokeColor.setStroke()
|
||||
(isHighlighted == true) ? midThumbStrokeHighlightedColor.setStroke() : midThumbStrokeColor.setStroke()
|
||||
|
||||
guard let image = midThumbImage else {
|
||||
drawThumb(withAngle: midAngle, inContext: context)
|
||||
@@ -126,8 +126,8 @@ public class MidPointCircularSlider: RangeCircularSlider {
|
||||
/**
|
||||
See superclass documentation
|
||||
*/
|
||||
override public func beginTrackingWithTouch(touch: UITouch, withEvent event: UIEvent?) -> Bool {
|
||||
sendActionsForControlEvents(.EditingDidBegin)
|
||||
override open func beginTracking(_ touch: UITouch, with event: UIEvent?) -> Bool {
|
||||
sendActions(for: .editingDidBegin)
|
||||
|
||||
return true
|
||||
}
|
||||
@@ -135,10 +135,10 @@ public class MidPointCircularSlider: RangeCircularSlider {
|
||||
/**
|
||||
See superclass documentation
|
||||
*/
|
||||
override public func continueTrackingWithTouch(touch: UITouch, withEvent event: UIEvent?) -> Bool {
|
||||
let touchPosition = touch.locationInView(self)
|
||||
override open func continueTracking(_ touch: UITouch, with event: UIEvent?) -> Bool {
|
||||
let touchPosition = touch.location(in: self)
|
||||
|
||||
let center = CGPointMake(bounds.midX, bounds.midY)
|
||||
let center = CGPoint(x: bounds.midX, y: bounds.midY)
|
||||
let startPoint = CGPoint(x: center.x, y: 0)
|
||||
let angle = CircularSliderHelper.angle(betweenFirstPoint: startPoint, secondPoint: touchPosition, inCircleWithCenter: center)
|
||||
|
||||
@@ -147,7 +147,7 @@ public class MidPointCircularSlider: RangeCircularSlider {
|
||||
|
||||
|
||||
midPointValue = newValue
|
||||
sendActionsForControlEvents(.ValueChanged)
|
||||
sendActions(for: .valueChanged)
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@ import UIKit
|
||||
RangeCircularSlider use the target-action mechanism to report changes made during the course of editing:
|
||||
ValueChanged, EditingDidBegin and EditingDidEnd
|
||||
*/
|
||||
public class RangeCircularSlider: CircularSlider {
|
||||
open class RangeCircularSlider: CircularSlider {
|
||||
|
||||
enum SelectedThumb {
|
||||
case startThumb
|
||||
@@ -30,7 +30,7 @@ public class RangeCircularSlider: CircularSlider {
|
||||
* The default value of this property is the groupTableViewBackgroundColor.
|
||||
*/
|
||||
@IBInspectable
|
||||
public var startThumbTintColor: UIColor = UIColor.groupTableViewBackgroundColor()
|
||||
open var startThumbTintColor: UIColor = UIColor.groupTableViewBackground
|
||||
|
||||
/**
|
||||
* The color used to tint the stroke of the start thumb
|
||||
@@ -39,14 +39,14 @@ public class RangeCircularSlider: CircularSlider {
|
||||
* The default value of this property is the green color.
|
||||
*/
|
||||
@IBInspectable
|
||||
public var startThumbStrokeColor: UIColor = UIColor.greenColor()
|
||||
open var startThumbStrokeColor: UIColor = UIColor.green
|
||||
|
||||
/**
|
||||
* The stroke highlighted color of start thumb
|
||||
* The default value of this property is blue color
|
||||
*/
|
||||
@IBInspectable
|
||||
public var startThumbStrokeHighlightedColor: UIColor = UIColor.purpleColor()
|
||||
open var startThumbStrokeHighlightedColor: UIColor = UIColor.purple
|
||||
|
||||
|
||||
/**
|
||||
@@ -55,7 +55,7 @@ public class RangeCircularSlider: CircularSlider {
|
||||
*
|
||||
* The default value of this property is nil
|
||||
*/
|
||||
public var startThumbImage: UIImage?
|
||||
open var startThumbImage: UIImage?
|
||||
|
||||
|
||||
// MARK: Accessing the Slider’s Value Limits
|
||||
@@ -67,7 +67,7 @@ public class RangeCircularSlider: CircularSlider {
|
||||
* The end value is also adjusted to match (startPointValue + distance) automatically (see startPointValue)
|
||||
* The default value of this property is 0.0.
|
||||
*/
|
||||
override public var minimumValue: CGFloat {
|
||||
override open var minimumValue: CGFloat {
|
||||
didSet {
|
||||
if startPointValue < minimumValue {
|
||||
startPointValue = minimumValue
|
||||
@@ -83,7 +83,7 @@ public class RangeCircularSlider: CircularSlider {
|
||||
* The default value of this property is 1.0.
|
||||
*/
|
||||
@IBInspectable
|
||||
override public var maximumValue: CGFloat {
|
||||
override open var maximumValue: CGFloat {
|
||||
didSet {
|
||||
if endPointValue > maximumValue {
|
||||
endPointValue = maximumValue
|
||||
@@ -101,7 +101,7 @@ public class RangeCircularSlider: CircularSlider {
|
||||
* The default value of this property is -1
|
||||
*/
|
||||
@IBInspectable
|
||||
public var distance: CGFloat = -1 {
|
||||
open var distance: CGFloat = -1 {
|
||||
didSet {
|
||||
assert(distance <= maximumValue - minimumValue, "The distance value is greater than distance between max and min value")
|
||||
endPointValue = startPointValue + distance
|
||||
@@ -116,7 +116,7 @@ public class RangeCircularSlider: CircularSlider {
|
||||
*
|
||||
* The default value of this property is 0.0.
|
||||
*/
|
||||
public var startPointValue: CGFloat = 0.0 {
|
||||
open var startPointValue: CGFloat = 0.0 {
|
||||
didSet {
|
||||
if oldValue == startPointValue {
|
||||
return
|
||||
@@ -142,7 +142,7 @@ public class RangeCircularSlider: CircularSlider {
|
||||
*
|
||||
* The default value of this property is 0.5
|
||||
*/
|
||||
override public var endPointValue: CGFloat {
|
||||
override open var endPointValue: CGFloat {
|
||||
didSet {
|
||||
if oldValue == endPointValue && distance <= 0 {
|
||||
return
|
||||
@@ -166,19 +166,19 @@ public class RangeCircularSlider: CircularSlider {
|
||||
* The center of the start thumb
|
||||
* Used to know in which thumb is the user gesture
|
||||
*/
|
||||
private var startThumbCenter: CGPoint = CGPointZero
|
||||
fileprivate var startThumbCenter: CGPoint = CGPoint.zero
|
||||
|
||||
/**
|
||||
* The center of the end thumb
|
||||
* Used to know in which thumb is the user gesture
|
||||
*/
|
||||
private var endThumbCenter: CGPoint = CGPointZero
|
||||
fileprivate var endThumbCenter: CGPoint = CGPoint.zero
|
||||
|
||||
/**
|
||||
* The last touched thumb
|
||||
* By default the value is none
|
||||
*/
|
||||
private var selectedThumb: SelectedThumb = .none
|
||||
fileprivate var selectedThumb: SelectedThumb = .none
|
||||
|
||||
/**
|
||||
Checks if the touched point affect the thumb
|
||||
@@ -194,7 +194,7 @@ public class RangeCircularSlider: CircularSlider {
|
||||
*/
|
||||
internal func isThumb(withCenter thumbCenter: CGPoint, containsPoint touchPoint: CGPoint) -> Bool {
|
||||
// the coordinates of thumb from its center
|
||||
let rect = CGRectMake(thumbCenter.x - thumbRadius, thumbCenter.y - thumbRadius, thumbRadius * 2, thumbRadius * 2)
|
||||
let rect = CGRect(x: thumbCenter.x - thumbRadius, y: thumbCenter.y - thumbRadius, width: thumbRadius * 2, height: thumbRadius * 2)
|
||||
if rect.contains(touchPoint) {
|
||||
return true
|
||||
}
|
||||
@@ -212,7 +212,7 @@ public class RangeCircularSlider: CircularSlider {
|
||||
/**
|
||||
See superclass documentation
|
||||
*/
|
||||
override public func drawRect(rect: CGRect) {
|
||||
override open func draw(_ rect: CGRect) {
|
||||
guard let context = UIGraphicsGetCurrentContext() else { return }
|
||||
|
||||
drawCircularSlider(inContext: context)
|
||||
@@ -227,7 +227,7 @@ public class RangeCircularSlider: CircularSlider {
|
||||
|
||||
// end thumb
|
||||
endThumbTintColor.setFill()
|
||||
(highlighted == true && selectedThumb == .endThumb) ? endThumbStrokeHighlightedColor.setStroke() : endThumbStrokeColor.setStroke()
|
||||
(isHighlighted == true && selectedThumb == .endThumb) ? endThumbStrokeHighlightedColor.setStroke() : endThumbStrokeColor.setStroke()
|
||||
if let image = endThumbImage {
|
||||
endThumbCenter = drawThumb(withImage: image, angle: endAngle, inContext: context)
|
||||
} else {
|
||||
@@ -236,7 +236,7 @@ public class RangeCircularSlider: CircularSlider {
|
||||
|
||||
// start thumb
|
||||
startThumbTintColor.setFill()
|
||||
(highlighted == true && selectedThumb == .startThumb) ? startThumbStrokeHighlightedColor.setStroke() : startThumbStrokeColor.setStroke()
|
||||
(isHighlighted == true && selectedThumb == .startThumb) ? startThumbStrokeHighlightedColor.setStroke() : startThumbStrokeColor.setStroke()
|
||||
|
||||
if let image = startThumbImage {
|
||||
startThumbCenter = drawThumb(withImage: image, angle: startAngle, inContext: context)
|
||||
@@ -250,10 +250,10 @@ public class RangeCircularSlider: CircularSlider {
|
||||
/**
|
||||
See superclass documentation
|
||||
*/
|
||||
override public func beginTrackingWithTouch(touch: UITouch, withEvent event: UIEvent?) -> Bool {
|
||||
sendActionsForControlEvents(.EditingDidBegin)
|
||||
override open func beginTracking(_ touch: UITouch, with event: UIEvent?) -> Bool {
|
||||
sendActions(for: .editingDidBegin)
|
||||
// the position of the pan gesture
|
||||
let touchPosition = touch.locationInView(self)
|
||||
let touchPosition = touch.location(in: self)
|
||||
|
||||
if isThumb(withCenter: startThumbCenter, containsPoint: touchPosition) {
|
||||
selectedThumb = .startThumb
|
||||
@@ -270,10 +270,10 @@ public class RangeCircularSlider: CircularSlider {
|
||||
/**
|
||||
See superclass documentation
|
||||
*/
|
||||
override public func continueTrackingWithTouch(touch: UITouch, withEvent event: UIEvent?) -> Bool {
|
||||
override open func continueTracking(_ touch: UITouch, with event: UIEvent?) -> Bool {
|
||||
|
||||
// the position of the pan gesture
|
||||
let touchPosition = touch.locationInView(self)
|
||||
let touchPosition = touch.location(in: self)
|
||||
|
||||
let startPoint = CGPoint(x: bounds.center.x, y: 0)
|
||||
let angle = CircularSliderHelper.angle(betweenFirstPoint: startPoint, secondPoint: touchPosition, inCircleWithCenter: bounds.center)
|
||||
@@ -288,8 +288,8 @@ public class RangeCircularSlider: CircularSlider {
|
||||
else {
|
||||
endPointValue = newValue
|
||||
}
|
||||
sendActionsForControlEvents(.ValueChanged)
|
||||
sendActions(for: .valueChanged)
|
||||
|
||||
return true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,10 +4,12 @@
|
||||
[](https://travis-ci.org/Hamza Ghazouani/HGCircularSlider)
|
||||
[](http://cocoapods.org/pods/HGCircularSlider)
|
||||
[](http://cocoapods.org/pods/HGCircularSlider)
|
||||
[]()
|
||||
[](http://cocoapods.org/pods/HGCircularSlider) <br />
|
||||
|
||||
[](http://clayallsopp.github.io/readme-score?url=https://github.com/hamzaghazouani/hgcircularslider/tree/develop)
|
||||
[](https://codebeat.co/projects/github-com-hamzaghazouani-hgcircularslider)
|
||||
[](http://cocoadocs.org/docsets/HGCircularSlider/)
|
||||
[](http://clayallsopp.github.io/readme-score?url=https://github.com/hamzaghazouani/hgcircularslider/tree/develop)
|
||||
|
||||
## Example
|
||||
|
||||
@@ -18,7 +20,7 @@ To run the example project, clone the repo, and run `pod install` from the Examp
|
||||
## Requirements
|
||||
|
||||
- iOS 7.1+
|
||||
- Xcode 7.3
|
||||
- Xcode 8.0
|
||||
|
||||
## Installation
|
||||
|
||||
@@ -26,8 +28,12 @@ HGCircularSlider is available through [CocoaPods](http://cocoapods.org). To inst
|
||||
it, simply add the following line to your Podfile:
|
||||
|
||||
``` ruby
|
||||
# Swift 2.2 - Xcode 7.3.1
|
||||
pod 'HGCircularSlider', '~> 0.1.1'
|
||||
|
||||
# Swift 3.0 - Xcode 8
|
||||
pod 'HGCircularSlider', '~> 1.0.0'
|
||||
|
||||
# Swift 2.2 - Xcode 7.3.1 (Checkout Swift2_Xcode7.3 branche)
|
||||
pod 'HGCircularSlider', '~> 0.1.2'
|
||||
```
|
||||
## Usage
|
||||
|
||||
@@ -46,8 +52,8 @@ let circularSlider = RangeCircularSlider(frame: myFrame)
|
||||
let circularSlider = MidPointCircularSlider(frame: myFrame)
|
||||
```
|
||||
## Documentation
|
||||
You can install documentation locally using [jazzy](https://github.com/realm/jazzy).
|
||||
<!-- Full API documentation is available on [CocoaDocs](http://cocoadocs.org/docsets/HGCircularSlider/).<br/> -->
|
||||
Full documentation is available on [CocoaDocs](http://cocoadocs.org/docsets/HGCircularSlider/).<br/>
|
||||
You can also install documentation locally using [jazzy](https://github.com/realm/jazzy).
|
||||
|
||||
## References
|
||||
The UI examples of the demo project inspired from [Dribbble](https://github.com/realm/jazzy).
|
||||
|
||||
Reference in New Issue
Block a user