Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Jalal Ouraigua
|
eb527c3621 | ||
|
Jalal Ouraigua
|
b1e0e3dca1 |
@@ -0,0 +1,10 @@
|
||||
{
|
||||
"SWIFT": {
|
||||
"TOO_MANY_IVARS": [8, 12, 16, 20],
|
||||
"TOO_MANY_FUNCTIONS": [46, 55, 65, 85],
|
||||
"ARITY" : [5, 6, 7, 8],
|
||||
"ABC": [15, 25, 50, 70],
|
||||
"TOTAL_COMPLEXITY": [100, 180, 280, 400],
|
||||
"TOTAL_LOC": [200, 250, 320, 450]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
jazzy --podspec JOCircularSlider.podspec
|
||||
Executable
+11
@@ -0,0 +1,11 @@
|
||||
# Change Log
|
||||
All notable changes to this project will be documented in this file.
|
||||
|
||||
## [1.0.3](https://github.com/ouraigua/JOCircularSlider/releases/tag/1.0.3)
|
||||
|
||||
* Add example
|
||||
|
||||
|
||||
## [1.0.0](https://github.com/ouraigua/JOCircularSlider/releases/tag/1.0.0)
|
||||
|
||||
* Initial release.
|
||||
@@ -11,12 +11,17 @@
|
||||
607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD51AFB9204008FA782 /* AppDelegate.swift */; };
|
||||
607FACD81AFB9204008FA782 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD71AFB9204008FA782 /* ViewController.swift */; };
|
||||
607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 607FACD91AFB9204008FA782 /* Main.storyboard */; };
|
||||
607FACDD1AFB9204008FA782 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDC1AFB9204008FA782 /* Images.xcassets */; };
|
||||
607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDE1AFB9204008FA782 /* LaunchScreen.xib */; };
|
||||
607FACEC1AFB9204008FA782 /* Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACEB1AFB9204008FA782 /* Tests.swift */; };
|
||||
9A9536F8A95805979063DD22 /* Pods_JOCircularSlider_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3CC0EF1308BF44BE0466D9BF /* Pods_JOCircularSlider_Example.framework */; };
|
||||
AF4F276921BB942500D39C60 /* .jazzy_cmd.yaml in Resources */ = {isa = PBXBuildFile; fileRef = AF4F276821BB942500D39C60 /* .jazzy_cmd.yaml */; };
|
||||
AF737E2421B89B2B00BFBE5E /* GradientView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF737E2321B89B2B00BFBE5E /* GradientView.swift */; };
|
||||
AF737E2621B89F8000BFBE5E /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF737E2521B89F8000BFBE5E /* Utils.swift */; };
|
||||
AF737E2921B8D60400BFBE5E /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AF737E2721B8D60400BFBE5E /* LaunchScreen.storyboard */; };
|
||||
AF737E2B21B8D71900BFBE5E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = AF737E2A21B8D71900BFBE5E /* Assets.xcassets */; };
|
||||
AFB6605421BB1F2000E22629 /* .codebeatsettings in Resources */ = {isa = PBXBuildFile; fileRef = AFB6605321BB1F2000E22629 /* .codebeatsettings */; };
|
||||
AFB6605821BB1F3300E22629 /* .swift-version in Resources */ = {isa = PBXBuildFile; fileRef = AFB6605521BB1F3300E22629 /* .swift-version */; };
|
||||
AFB6605921BB1F3300E22629 /* .travis.yml in Resources */ = {isa = PBXBuildFile; fileRef = AFB6605621BB1F3300E22629 /* .travis.yml */; };
|
||||
AFB6605A21BB1F3300E22629 /* .gitignore in Resources */ = {isa = PBXBuildFile; fileRef = AFB6605721BB1F3300E22629 /* .gitignore */; };
|
||||
/* End PBXBuildFile section */
|
||||
|
||||
/* Begin PBXContainerItemProxy section */
|
||||
@@ -36,8 +41,6 @@
|
||||
607FACD51AFB9204008FA782 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
|
||||
607FACD71AFB9204008FA782 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
|
||||
607FACDA1AFB9204008FA782 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
|
||||
607FACDC1AFB9204008FA782 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
|
||||
607FACDF1AFB9204008FA782 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
|
||||
607FACE51AFB9204008FA782 /* JOCircularSlider_Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = JOCircularSlider_Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
607FACEA1AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
||||
607FACEB1AFB9204008FA782 /* Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tests.swift; sourceTree = "<group>"; };
|
||||
@@ -46,8 +49,15 @@
|
||||
857FCA310632359F6C66CC65 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
|
||||
9ED6373888E3CDF94E3F8213 /* Pods-JOCircularSlider_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JOCircularSlider_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-JOCircularSlider_Tests/Pods-JOCircularSlider_Tests.debug.xcconfig"; sourceTree = "<group>"; };
|
||||
A310FF740AC505A50DEF761C /* Pods-JOCircularSlider_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JOCircularSlider_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-JOCircularSlider_Tests/Pods-JOCircularSlider_Tests.release.xcconfig"; sourceTree = "<group>"; };
|
||||
AF4F276821BB942500D39C60 /* .jazzy_cmd.yaml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = .jazzy_cmd.yaml; path = ../.jazzy_cmd.yaml; sourceTree = "<group>"; };
|
||||
AF737E2321B89B2B00BFBE5E /* GradientView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GradientView.swift; sourceTree = "<group>"; };
|
||||
AF737E2521B89F8000BFBE5E /* Utils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utils.swift; sourceTree = "<group>"; };
|
||||
AF737E2821B8D60400BFBE5E /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
|
||||
AF737E2A21B8D71900BFBE5E /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
|
||||
AFB6605321BB1F2000E22629 /* .codebeatsettings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = .codebeatsettings; path = ../.codebeatsettings; sourceTree = "<group>"; };
|
||||
AFB6605521BB1F3300E22629 /* .swift-version */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ".swift-version"; path = "../.swift-version"; sourceTree = "<group>"; };
|
||||
AFB6605621BB1F3300E22629 /* .travis.yml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = .travis.yml; path = ../.travis.yml; sourceTree = "<group>"; };
|
||||
AFB6605721BB1F3300E22629 /* .gitignore */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = .gitignore; path = ../.gitignore; sourceTree = "<group>"; };
|
||||
B53C2541DC14B9F694325C57 /* Pods-JOCircularSlider_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JOCircularSlider_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-JOCircularSlider_Example/Pods-JOCircularSlider_Example.debug.xcconfig"; sourceTree = "<group>"; };
|
||||
D0CC336CBAD390916FD5F8FE /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
|
||||
D1B349DAD0AE068D7095DAFC /* Pods-JOCircularSlider_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JOCircularSlider_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-JOCircularSlider_Example/Pods-JOCircularSlider_Example.release.xcconfig"; sourceTree = "<group>"; };
|
||||
@@ -121,9 +131,9 @@
|
||||
607FACD71AFB9204008FA782 /* ViewController.swift */,
|
||||
AF737E2321B89B2B00BFBE5E /* GradientView.swift */,
|
||||
AF737E2521B89F8000BFBE5E /* Utils.swift */,
|
||||
AF737E2A21B8D71900BFBE5E /* Assets.xcassets */,
|
||||
607FACD91AFB9204008FA782 /* Main.storyboard */,
|
||||
607FACDC1AFB9204008FA782 /* Images.xcassets */,
|
||||
607FACDE1AFB9204008FA782 /* LaunchScreen.xib */,
|
||||
AF737E2721B8D60400BFBE5E /* LaunchScreen.storyboard */,
|
||||
607FACD31AFB9204008FA782 /* Supporting Files */,
|
||||
);
|
||||
name = "Example for JOCircularSlider";
|
||||
@@ -161,6 +171,11 @@
|
||||
7B49D36A49F9D30C4E298C6D /* JOCircularSlider.podspec */,
|
||||
857FCA310632359F6C66CC65 /* README.md */,
|
||||
D0CC336CBAD390916FD5F8FE /* LICENSE */,
|
||||
AFB6605321BB1F2000E22629 /* .codebeatsettings */,
|
||||
AFB6605721BB1F3300E22629 /* .gitignore */,
|
||||
AFB6605521BB1F3300E22629 /* .swift-version */,
|
||||
AFB6605621BB1F3300E22629 /* .travis.yml */,
|
||||
AF4F276821BB942500D39C60 /* .jazzy_cmd.yaml */,
|
||||
);
|
||||
name = "Podspec Metadata";
|
||||
sourceTree = "<group>";
|
||||
@@ -253,9 +268,14 @@
|
||||
isa = PBXResourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
AFB6605921BB1F3300E22629 /* .travis.yml in Resources */,
|
||||
AFB6605A21BB1F3300E22629 /* .gitignore in Resources */,
|
||||
AF737E2921B8D60400BFBE5E /* LaunchScreen.storyboard in Resources */,
|
||||
AF737E2B21B8D71900BFBE5E /* Assets.xcassets in Resources */,
|
||||
607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */,
|
||||
607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */,
|
||||
607FACDD1AFB9204008FA782 /* Images.xcassets in Resources */,
|
||||
AF4F276921BB942500D39C60 /* .jazzy_cmd.yaml in Resources */,
|
||||
AFB6605421BB1F2000E22629 /* .codebeatsettings in Resources */,
|
||||
AFB6605821BB1F3300E22629 /* .swift-version in Resources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@@ -364,12 +384,12 @@
|
||||
name = Main.storyboard;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
607FACDE1AFB9204008FA782 /* LaunchScreen.xib */ = {
|
||||
AF737E2721B8D60400BFBE5E /* LaunchScreen.storyboard */ = {
|
||||
isa = PBXVariantGroup;
|
||||
children = (
|
||||
607FACDF1AFB9204008FA782 /* Base */,
|
||||
AF737E2821B8D60400BFBE5E /* Base */,
|
||||
);
|
||||
name = LaunchScreen.xib;
|
||||
name = LaunchScreen.storyboard;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
/* End PBXVariantGroup section */
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "1000"
|
||||
LastUpgradeVersion = "1010"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
|
||||
+46
-1
@@ -40,6 +40,51 @@
|
||||
"size" : "60x60",
|
||||
"scale" : "3x"
|
||||
},
|
||||
{
|
||||
"idiom" : "ipad",
|
||||
"size" : "20x20",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "ipad",
|
||||
"size" : "20x20",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "ipad",
|
||||
"size" : "29x29",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "ipad",
|
||||
"size" : "29x29",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "ipad",
|
||||
"size" : "40x40",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "ipad",
|
||||
"size" : "40x40",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "ipad",
|
||||
"size" : "76x76",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "ipad",
|
||||
"size" : "76x76",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "ipad",
|
||||
"size" : "83.5x83.5",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "ios-marketing",
|
||||
"size" : "1024x1024",
|
||||
@@ -50,4 +95,4 @@
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="kyC-50-ACg">
|
||||
<device id="retina4_7" orientation="portrait">
|
||||
<adaptation id="fullscreen"/>
|
||||
</device>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
|
||||
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<scenes>
|
||||
<!--View Controller-->
|
||||
<scene sceneID="QKt-mf-1VZ">
|
||||
<objects>
|
||||
<viewController id="kyC-50-ACg" sceneMemberID="viewController">
|
||||
<view key="view" contentMode="scaleToFill" id="txe-SZ-eyi">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<viewLayoutGuide key="safeArea" id="esi-0o-8Hw"/>
|
||||
</view>
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="U0S-aT-UUb" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="-346" y="-28"/>
|
||||
</scene>
|
||||
</scenes>
|
||||
</document>
|
||||
@@ -1,46 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
|
||||
<device id="retina4_7" orientation="portrait">
|
||||
<adaptation id="fullscreen"/>
|
||||
</device>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
|
||||
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<view contentMode="scaleToFill" id="iN0-l3-epB">
|
||||
<rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" Copyright (c) 2015 CocoaPods. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
|
||||
<rect key="frame" x="20" y="439" width="441" height="21"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="JOCircularSlider" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
|
||||
<rect key="frame" x="20" y="140" width="441" height="43"/>
|
||||
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
|
||||
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
</subviews>
|
||||
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
|
||||
<constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
|
||||
<constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/>
|
||||
<constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0"/>
|
||||
<constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
|
||||
<constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/>
|
||||
</constraints>
|
||||
<nil key="simulatedStatusBarMetrics"/>
|
||||
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
|
||||
<point key="canvasLocation" x="548" y="455"/>
|
||||
</view>
|
||||
</objects>
|
||||
</document>
|
||||
@@ -15,7 +15,7 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.0.0</string>
|
||||
<string>1.0.5</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleVersion</key>
|
||||
@@ -30,6 +30,8 @@
|
||||
<array>
|
||||
<string>armv7</string>
|
||||
</array>
|
||||
<key>UIStatusBarStyle</key>
|
||||
<string>UIStatusBarStyleLightContent</string>
|
||||
<key>UISupportedInterfaceOrientations</key>
|
||||
<array>
|
||||
<string>UIInterfaceOrientationPortrait</string>
|
||||
@@ -38,5 +40,7 @@
|
||||
<array>
|
||||
<string>UIInterfaceOrientationPortrait</string>
|
||||
</array>
|
||||
<key>UIViewControllerBasedStatusBarAppearance</key>
|
||||
<false/>
|
||||
</dict>
|
||||
</plist>
|
||||
|
||||
@@ -49,11 +49,12 @@ class ViewController: UIViewController {
|
||||
let darkColor = UIColor(red: 86/255.0, green: 93/255.0, blue: 108/255.0, alpha: 1)
|
||||
let lightColor = UIColor(red: 136/255.0, green: 143/255.0, blue: 160/255.0, alpha: 1)
|
||||
let sliderDark = UIColor(red: 52/255.0, green: 60/255.0, blue: 72/255.0, alpha: 1)
|
||||
let sliderLight = UIColor(red: 128/255.0, green: 136/255.0, blue: 149/255.0, alpha: 1)
|
||||
|
||||
for subview in stackView.subviews {
|
||||
|
||||
if let slider = subview as? UISlider {
|
||||
slider.tintColor = theme == .dark ? sliderDark : .white
|
||||
slider.tintColor = theme == .dark ? sliderDark : sliderLight
|
||||
slider.maximumTrackTintColor = theme == .dark ? .black : UIColor.white.withAlphaComponent(0.4)
|
||||
|
||||
} else {
|
||||
|
||||
+2
-1
@@ -335,7 +335,7 @@
|
||||
isa = PBXProject;
|
||||
attributes = {
|
||||
LastSwiftUpdateCheck = 0930;
|
||||
LastUpgradeCheck = 0930;
|
||||
LastUpgradeCheck = 1010;
|
||||
};
|
||||
buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */;
|
||||
compatibilityVersion = "Xcode 3.2";
|
||||
@@ -559,6 +559,7 @@
|
||||
MTL_ENABLE_DEBUG_INFO = NO;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
STRIP_INSTALLED_PRODUCT = NO;
|
||||
SWIFT_COMPILATION_MODE = wholemodule;
|
||||
SYMROOT = "${SRCROOT}/../build";
|
||||
};
|
||||
name = Release;
|
||||
|
||||
+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.5</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>${CURRENT_PROJECT_VERSION}</string>
|
||||
<key>NSPrincipalClass</key>
|
||||
<string></string>
|
||||
</dict>
|
||||
</plist>
|
||||
|
||||
+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.5</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>${CURRENT_PROJECT_VERSION}</string>
|
||||
<key>NSPrincipalClass</key>
|
||||
<string></string>
|
||||
</dict>
|
||||
</plist>
|
||||
|
||||
+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.5</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>${CURRENT_PROJECT_VERSION}</string>
|
||||
<key>NSPrincipalClass</key>
|
||||
<string></string>
|
||||
</dict>
|
||||
</plist>
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
s.name = 'JOCircularSlider'
|
||||
s.version = '1.0.0'
|
||||
s.summary = 'A highly customaizable and reusable circular slider for iOS applications.'
|
||||
s.version = '1.0.5'
|
||||
s.summary = 'A highly customisable and reusable iOS circular slider.'
|
||||
|
||||
# This description is used to generate tags and improve search results.
|
||||
# * Think: What does it do? Why did you write it? What is the focus?
|
||||
@@ -18,7 +18,7 @@ Pod::Spec.new do |s|
|
||||
# * Finally, don't worry about the indent, CocoaPods strips it!
|
||||
|
||||
s.description = <<-DESC
|
||||
A highly customaizable and reusable circular slider for iOS applications.
|
||||
JOCircularSlider is a highly customisable and reusable iOS circular slider that mimics the behaviour of a knob control. It uses no preset images and every one of its components is drawn completely in code making it extremely adaptable to every design and theme.
|
||||
It's written in Swift 4.2 and it's 100% IBDesignable and all parameters are IBInspectable.
|
||||
You can control almost every aspect of the slider's design: Size, colors, direction (clockwise/anti-clockwise), etc...
|
||||
DESC
|
||||
@@ -33,6 +33,8 @@ Pod::Spec.new do |s|
|
||||
s.ios.deployment_target = '10.0'
|
||||
|
||||
s.source_files = 'JOCircularSlider/Classes/**/*'
|
||||
|
||||
s.documentation_url = 'http://ouraigua.com/github/jocircularslider/docs/index.html'
|
||||
|
||||
# s.resource_bundles = {
|
||||
# 'JOCircularSlider' => ['JOCircularSlider/Assets/*.png']
|
||||
|
||||
@@ -31,7 +31,7 @@ public struct Constants {
|
||||
public static let dotBlueColor = UIColor(red: 31/255.0, green: 206/255.0, blue: 252/255.0, alpha: 1)
|
||||
public static let dotRedColor = UIColor(red: 248/255.0, green: 16/255.0, blue: 32/255.0, alpha: 1)
|
||||
public static let dotOrangeColor = UIColor(red: 1, green: 128/255.0, blue: 0, alpha: 1)
|
||||
public static let dotGrayColor = UIColor(red: 206/255.0, green: 206/255.0, blue: 206/255.0, alpha: 1)
|
||||
public static let dotGrayColor = lightColor4
|
||||
public static let dotShadowOffset = CGSize(width: 2, height: 2)
|
||||
|
||||
public static let outerMultiplier : CGFloat = 0.86
|
||||
@@ -44,26 +44,22 @@ open class CircularSlider: UIControl {
|
||||
|
||||
// MARK: - Public API
|
||||
|
||||
@IBInspectable
|
||||
open var color1: UIColor {
|
||||
@IBInspectable open var color1: UIColor {
|
||||
get { return renderer.knobView.color1 }
|
||||
set { renderer.knobView.color1 = newValue }
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var color2: UIColor {
|
||||
@IBInspectable open var color2: UIColor {
|
||||
get { return renderer.knobView.color2 }
|
||||
set { renderer.knobView.color2 = newValue}
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var color3: UIColor {
|
||||
@IBInspectable open var color3: UIColor {
|
||||
get { return renderer.knobView.color3 }
|
||||
set { renderer.knobView.color3 = newValue}
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var color4: UIColor {
|
||||
@IBInspectable open var color4: UIColor {
|
||||
get { return renderer.knobView.color4 }
|
||||
set {
|
||||
renderer.knobView.color4 = newValue
|
||||
@@ -71,8 +67,7 @@ open class CircularSlider: UIControl {
|
||||
}
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var highlightColor: UIColor {
|
||||
@IBInspectable open var highlightColor: UIColor {
|
||||
get { return renderer.knobView.highlightColor }
|
||||
set {
|
||||
renderer.knobView.highlightColor = newValue
|
||||
@@ -83,8 +78,7 @@ open class CircularSlider: UIControl {
|
||||
}
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var knobOuterCircleMultiplier: CGFloat {
|
||||
@IBInspectable open var knobOuterCircleMultiplier: CGFloat {
|
||||
get { return renderer.knobView.outerCircleMultiplier }
|
||||
set {
|
||||
renderer.knobView.outerCircleMultiplier = newValue
|
||||
@@ -93,82 +87,69 @@ open class CircularSlider: UIControl {
|
||||
}
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var knobMiddleCircleMultiplier: CGFloat {
|
||||
@IBInspectable open var knobMiddleCircleMultiplier: CGFloat {
|
||||
get { return renderer.knobView.middleCircleMultiplier }
|
||||
set {
|
||||
renderer.knobView.middleCircleMultiplier = newValue
|
||||
}
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var knobInnerCircleMultiplier: CGFloat {
|
||||
@IBInspectable open var knobInnerCircleMultiplier: CGFloat {
|
||||
get { return renderer.knobView.innerCircleMultiplier }
|
||||
set { renderer.knobView.innerCircleMultiplier = newValue }
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var knobShadowOpacity: Float {
|
||||
@IBInspectable open var knobShadowOpacity: Float {
|
||||
get { return renderer.knobView.shadowOpacity }
|
||||
set { renderer.knobView.shadowOpacity = newValue }
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var pointerDistanceFromInnerCircleEdge: CGFloat {
|
||||
@IBInspectable open var pointerDistanceFromInnerCircleEdge: CGFloat {
|
||||
get { return renderer.pointerViewDistanceFromEdge }
|
||||
set { renderer.pointerViewDistanceFromEdge = newValue }
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var pointerSizeMultiplier: CGFloat {
|
||||
@IBInspectable open var pointerSizeMultiplier: CGFloat {
|
||||
get { return renderer.pointerViewMultiplier }
|
||||
set { renderer.pointerViewMultiplier = newValue }
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var pointerColor1: UIColor {
|
||||
@IBInspectable open var pointerColor1: UIColor {
|
||||
get { return renderer.pointerView.color1 }
|
||||
set { renderer.pointerView.color1 = newValue }
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var pointerColor2: UIColor {
|
||||
@IBInspectable open var pointerColor2: UIColor {
|
||||
get { return renderer.pointerView.color2 }
|
||||
set { renderer.pointerView.color2 = newValue }
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var textIsHidden: Bool {
|
||||
@IBInspectable open var textIsHidden: Bool {
|
||||
get { return renderer.textFieldIsHidden }
|
||||
set { renderer.textFieldIsHidden = newValue}
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var textFontSizeMultiplier: CGFloat {
|
||||
@IBInspectable open var textFontSizeMultiplier: CGFloat {
|
||||
get { return renderer.fontSizeMultiplier }
|
||||
set { renderer.fontSizeMultiplier = newValue}
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var textColor: UIColor {
|
||||
@IBInspectable open var textColor: UIColor {
|
||||
get { return renderer.textField.textColor! }
|
||||
set { renderer.textField.textColor = newValue}
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var maxidotViewIsHidden: Bool {
|
||||
@IBInspectable open var maxidotViewIsHidden: Bool {
|
||||
get { return renderer.maxiDotView.isHidden }
|
||||
set { renderer.maxiDotView.isHidden = newValue }
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var maxidotOffColor: UIColor {
|
||||
@IBInspectable open var maxidotOffColor: UIColor {
|
||||
get { return renderer.maxiDotView.offColor }
|
||||
set { renderer.maxiDotView.offColor = newValue }
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var maxidotOnColor: UIColor {
|
||||
@IBInspectable open var maxidotOnColor: UIColor {
|
||||
get { return renderer.maxiDotView.onColor }
|
||||
set {
|
||||
renderer.maxiDotView.onColor = newValue
|
||||
@@ -177,14 +158,12 @@ open class CircularSlider: UIControl {
|
||||
}
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var maxidotMaxColor: UIColor {
|
||||
@IBInspectable open var maxidotMaxColor: UIColor {
|
||||
get { return renderer.maxiDotView.maxColor }
|
||||
set { renderer.maxiDotView.maxColor = newValue }
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var maxidotCount: Int {
|
||||
@IBInspectable open var maxidotCount: Int {
|
||||
get { return renderer.maxiDotView.maxiDotCount }
|
||||
set {
|
||||
let value = newValue % 2 == 0 ? newValue + 1 : newValue
|
||||
@@ -195,44 +174,37 @@ open class CircularSlider: UIControl {
|
||||
}
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var maxidotRadiusMultiplier: CGFloat {
|
||||
@IBInspectable open var maxidotRadiusMultiplier: CGFloat {
|
||||
get { return renderer.maxiDotView.dotRadiusMultiplier }
|
||||
set { renderer.maxiDotView.dotRadiusMultiplier = newValue }
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var maxidotInset: CGFloat {
|
||||
@IBInspectable open var maxidotInset: CGFloat {
|
||||
get { return renderer.maxiDotView.dotInset }
|
||||
set { renderer.maxiDotView.dotInset = newValue }
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var maxidotMaxDotCount: Int {
|
||||
@IBInspectable open var maxidotMaxDotCount: Int {
|
||||
get { return renderer.maxiDotView.maxDotCount }
|
||||
set { renderer.maxiDotView.maxDotCount = newValue }
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var minidotViewIsHidden: Bool {
|
||||
@IBInspectable open var minidotViewIsHidden: Bool {
|
||||
get { return renderer.miniDotView.isHidden }
|
||||
set { renderer.miniDotView.isHidden = newValue }
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var minidotColor: UIColor {
|
||||
@IBInspectable open var minidotColor: UIColor {
|
||||
get { return renderer.miniDotView.offColor }
|
||||
set { renderer.miniDotView.offColor = newValue }
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var minidotHighlightColor: UIColor {
|
||||
@IBInspectable open var minidotHighlightColor: UIColor {
|
||||
get { return renderer.miniDotView.highlightColor ?? .white }
|
||||
set { renderer.miniDotView.highlightColor = newValue }
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var minidotCountPerSegment: Int {
|
||||
@IBInspectable open var minidotCountPerSegment: Int {
|
||||
get { return renderer.miniDotView.dotCountPerSegment }
|
||||
set {
|
||||
renderer.miniDotView.dotCountPerSegment = newValue
|
||||
@@ -240,26 +212,22 @@ open class CircularSlider: UIControl {
|
||||
}
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var minidotRadiusMultiplier: CGFloat {
|
||||
@IBInspectable open var minidotRadiusMultiplier: CGFloat {
|
||||
get { return renderer.miniDotView.dotRadiusMultiplier }
|
||||
set { renderer.miniDotView.dotRadiusMultiplier = newValue }
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var minidotInset: CGFloat {
|
||||
@IBInspectable open var minidotInset: CGFloat {
|
||||
get { return renderer.miniDotView.dotInset }
|
||||
set { renderer.miniDotView.dotInset = newValue }
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var minidotHideHighlight: Bool {
|
||||
@IBInspectable open var minidotHideHighlight: Bool {
|
||||
get { return renderer.miniDotView.highlightColor != nil }
|
||||
set { renderer.miniDotView.highlightColor = newValue ? highlightColor : nil }
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var minimumValue: CGFloat {
|
||||
@IBInspectable open var minimumValue: CGFloat {
|
||||
get { return CGFloat(renderer.minimumValue) }
|
||||
set {
|
||||
renderer.minimumValue = Float(newValue)
|
||||
@@ -267,8 +235,7 @@ open class CircularSlider: UIControl {
|
||||
}
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var maximumValue: CGFloat {
|
||||
@IBInspectable open var maximumValue: CGFloat {
|
||||
get { return CGFloat(renderer.maximumValue) }
|
||||
set {
|
||||
renderer.maximumValue = Float(newValue)
|
||||
@@ -276,20 +243,17 @@ open class CircularSlider: UIControl {
|
||||
}
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var startAngle: CGFloat {
|
||||
@IBInspectable open var startAngle: CGFloat {
|
||||
get { return renderer.startAngle.toDegree }
|
||||
set { renderer.startAngle = newValue.toRadian }
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var endAngle: CGFloat {
|
||||
@IBInspectable open var endAngle: CGFloat {
|
||||
get { return renderer.endAngle.toDegree }
|
||||
set { renderer.endAngle = newValue.toRadian }
|
||||
}
|
||||
|
||||
@IBInspectable
|
||||
open var isClockwise: Bool {
|
||||
@IBInspectable open var isClockwise: Bool {
|
||||
get { return renderer.isClockwise }
|
||||
set { renderer.isClockwise = newValue }
|
||||
}
|
||||
@@ -319,6 +283,34 @@ open class CircularSlider: UIControl {
|
||||
renderer.update(bounds, value: value)
|
||||
}
|
||||
|
||||
// MARK: - Touches
|
||||
|
||||
override open func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
|
||||
super.touchesBegan(touches, with: event)
|
||||
guard let location = touches.first?.location(in: self) else { return }
|
||||
|
||||
let distanceToOrigin = location - centerPoint
|
||||
lastTouchAngle = atan2(distanceToOrigin.y, distanceToOrigin.x).toDegree
|
||||
}
|
||||
|
||||
override open func touchesMoved(_ touches: Set<UITouch>, with event: UIEvent?) {
|
||||
super.touchesMoved(touches, with: event)
|
||||
guard let location = touches.first?.location(in: self) else { return }
|
||||
|
||||
let distanceToOrigin = location - centerPoint
|
||||
let currentTouchAngle = atan2(distanceToOrigin.y, distanceToOrigin.x).toDegree
|
||||
|
||||
let angelDelta = currentTouchAngle - lastTouchAngle // in degree
|
||||
lastTouchAngle = currentTouchAngle
|
||||
|
||||
let angleRange = angleDifferenceInDegree(from: startAngle, to: endAngle, isClockwise: isClockwise)
|
||||
|
||||
let angelDeltaAsPercentage = Float(angelDelta / angleRange)
|
||||
guard abs(angelDeltaAsPercentage) < 1 else { return }
|
||||
let newValue = isClockwise ? value + angelDeltaAsPercentage : value - angelDeltaAsPercentage
|
||||
setValue(newValue, isPercentage: true)
|
||||
}
|
||||
|
||||
// MARK: - Public
|
||||
|
||||
open func setValue(_ newValue: Float, isPercentage: Bool = false) {
|
||||
@@ -349,35 +341,6 @@ open class CircularSlider: UIControl {
|
||||
open func setTextShadow(color: UIColor, opacity: Float = 1, offset: CGSize = CGSize(width: 1, height: 1), radius: CGFloat = 0) {
|
||||
renderer.setTextShadow(color: color, opacity: opacity, offset: offset, radius: radius)
|
||||
}
|
||||
|
||||
// MARK: - Touches
|
||||
|
||||
override open func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
|
||||
super.touchesBegan(touches, with: event)
|
||||
guard let location = touches.first?.location(in: self) else { return }
|
||||
|
||||
let distanceToOrigin = location - centerPoint
|
||||
lastTouchAngle = atan2(distanceToOrigin.y, distanceToOrigin.x).toDegree
|
||||
}
|
||||
|
||||
override open func touchesMoved(_ touches: Set<UITouch>, with event: UIEvent?) {
|
||||
super.touchesMoved(touches, with: event)
|
||||
guard let location = touches.first?.location(in: self) else { return }
|
||||
|
||||
let distanceToOrigin = location - centerPoint
|
||||
let currentTouchAngle = atan2(distanceToOrigin.y, distanceToOrigin.x).toDegree
|
||||
|
||||
let angelDelta = currentTouchAngle - lastTouchAngle // in degree
|
||||
lastTouchAngle = currentTouchAngle
|
||||
|
||||
let angleRange = angleDifferenceInDegree(from: startAngle, to: endAngle, isClockwise: isClockwise)
|
||||
|
||||
let angelDeltaAsPercentage = Float(angelDelta / angleRange)
|
||||
guard abs(angelDeltaAsPercentage) < 1 else { return }
|
||||
let newValue = isClockwise ? value + angelDeltaAsPercentage : value - angelDeltaAsPercentage
|
||||
setValue(newValue, isPercentage: true)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
class Renderer {
|
||||
@@ -460,32 +423,34 @@ private extension Renderer {
|
||||
circularSlider?.addSubview(knobView)
|
||||
knobView.translatesAutoresizingMaskIntoConstraints = false
|
||||
let views = ["view": knobView]
|
||||
circularSlider?.addConstraints(NSLayoutConstraint.constraints(withVisualFormat: "V:|[view]|", options: .init(rawValue: 0), metrics: nil, views: views))
|
||||
circularSlider?.addConstraints(NSLayoutConstraint.constraints(withVisualFormat: "H:|[view]|", options: .init(rawValue: 0), metrics: nil, views: views))
|
||||
let verticalConstraint = NSLayoutConstraint.constraints(withVisualFormat: "V:|[view]|", options: .init(rawValue: 0), metrics: nil, views: views)
|
||||
let horizontalConstraint = NSLayoutConstraint.constraints(withVisualFormat: "H:|[view]|", options: .init(rawValue: 0), metrics: nil, views: views)
|
||||
circularSlider?.addConstraints(verticalConstraint + horizontalConstraint)
|
||||
}
|
||||
|
||||
func addPointerView() {
|
||||
circularSlider?.addSubview(pointerView)
|
||||
}
|
||||
|
||||
func addInputAccessoryView() {
|
||||
let width = UIScreen.main.bounds.width
|
||||
let toolBar = UIToolbar(frame: CGRect(origin: .zero, size: CGSize(width: width, height: 48)))
|
||||
toolBar.barStyle = .blackTranslucent
|
||||
let flexibleSpace = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil)
|
||||
let done = UIBarButtonItem(title: "Done", style: .done, target: self, action: #selector(keyboardDoneButtonTapped))
|
||||
done.tintColor = .lightGray
|
||||
toolBar.items = [done, flexibleSpace]
|
||||
toolBar.sizeToFit()
|
||||
textField.inputAccessoryView = toolBar
|
||||
}
|
||||
|
||||
func addTextField() {
|
||||
|
||||
func addInputAccessoryView() {
|
||||
let width = UIScreen.main.bounds.width
|
||||
let toolBar = UIToolbar(frame: CGRect(origin: .zero, size: CGSize(width: width, height: 48)))
|
||||
toolBar.barStyle = .blackTranslucent
|
||||
let flexibleSpace = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil)
|
||||
let done = UIBarButtonItem(title: "Done", style: .done, target: self, action: #selector(keyboardDoneButtonTapped))
|
||||
toolBar.items = [done, flexibleSpace]
|
||||
toolBar.sizeToFit()
|
||||
textField.inputAccessoryView = toolBar
|
||||
}
|
||||
|
||||
textField.backgroundColor = .clear
|
||||
textField.layer.cornerRadius = 3
|
||||
textField.textAlignment = .center
|
||||
textField.text = ""
|
||||
textField.keyboardType = .numberPad
|
||||
textField.keyboardAppearance = .dark
|
||||
textField.clearsOnInsertion = true
|
||||
textField.adjustsFontSizeToFitWidth = true
|
||||
if let height = circularSlider?.bounds.height {
|
||||
|
||||
@@ -78,37 +78,20 @@ class DotView: UIView {
|
||||
|
||||
override func layoutSubviews() {
|
||||
super.layoutSubviews()
|
||||
|
||||
var radius = (bounds.width/2) - dotRadius - dotInset
|
||||
if let outerCircleRadius = outerCircleRadius {
|
||||
radius = outerCircleRadius + dotRadius + dotInset
|
||||
}
|
||||
|
||||
guard let sublayers = layer.sublayers else { return }
|
||||
|
||||
let radius = outerCircleRadius == nil ? (bounds.width/2) - dotRadius - dotInset : outerCircleRadius! + dotRadius + dotInset
|
||||
|
||||
for i in 0..<sublayers.count {
|
||||
guard let dotLayer = sublayers[i] as? DotLayer else { continue }
|
||||
if type == .mini && (i % dotCountPerSegment == 0) {
|
||||
continue
|
||||
}
|
||||
let angle = startAngle + ((CGFloat(i) * unitAngle) * (isClockwise ? 1 : -1))
|
||||
let x = cos(angle) * radius - dotRadius
|
||||
let y = sin(angle) * radius - dotRadius
|
||||
let width = dotRadius * 2
|
||||
|
||||
guard let dotLayer = sublayers[i] as? DotLayer else { continue }
|
||||
dotLayer.frame = CGRect(x: x, y: y, width: width, height: width)
|
||||
|
||||
// switch type {
|
||||
// case .mini:
|
||||
// dotLayer.color = offColor
|
||||
// dotLayer.highlightColor = highlightColor
|
||||
// case .maxi:
|
||||
// dotLayer.highlightColor = highlightColor
|
||||
// if i <= currentIndex {
|
||||
// dotLayer.color = (i >= dotCount - maxDotCount) ? maxColor : onColor
|
||||
// } else {
|
||||
// dotLayer.color = offColor
|
||||
// }
|
||||
// }
|
||||
dotLayer.frame = CGRect(x: cos(angle) * radius - dotRadius,
|
||||
y: sin(angle) * radius - dotRadius,
|
||||
width: dotRadius * 2,
|
||||
height: dotRadius * 2)
|
||||
}
|
||||
currentIndex = -1
|
||||
updateColors(using: value)
|
||||
@@ -120,47 +103,22 @@ class DotView: UIView {
|
||||
}
|
||||
|
||||
func updateColors(using value: Float) {
|
||||
|
||||
guard type == .maxi else { return }
|
||||
let index = Int(value * Float(dotCount - 1))
|
||||
guard index != currentIndex else { return }
|
||||
currentIndex = index
|
||||
self.value = value
|
||||
|
||||
var hue: CGFloat = 0
|
||||
var saturation: CGFloat = 0
|
||||
var brightness: CGFloat = 0
|
||||
onColor.getHue(&hue, saturation: &saturation, brightness: &brightness, alpha: nil)
|
||||
|
||||
//print("first: \(hue)")
|
||||
|
||||
|
||||
guard let sublayers = layer.sublayers else { return }
|
||||
var hue: CGFloat = 0; var saturation: CGFloat = 0 ; var brightness: CGFloat = 0
|
||||
onColor.getHue(&hue, saturation: &saturation, brightness: &brightness, alpha: nil)
|
||||
var j: CGFloat = 0
|
||||
for i in 0..<sublayers.count {
|
||||
guard let dotLayer = sublayers[i] as? DotLayer else { continue }
|
||||
if i <= currentIndex {
|
||||
if i >= dotCount - maxDotCount {
|
||||
var newHue: CGFloat
|
||||
if hue > 0.5 {
|
||||
newHue = hue + (j * ((1.0 - hue)/CGFloat(maxDotCount-1)))
|
||||
} else {
|
||||
newHue = hue - (j * (hue/CGFloat(maxDotCount-1)))
|
||||
}
|
||||
j += 1.0
|
||||
//print("new: \(newHue)")
|
||||
let newMaxColor = UIColor(hue: newHue , saturation: saturation, brightness: brightness, alpha: 1)
|
||||
dotLayer.color = newMaxColor
|
||||
}
|
||||
else {
|
||||
dotLayer.color = onColor
|
||||
}
|
||||
//dotLayer.color = (i >= dotCount - maxDotCount) ? maxColor : onColor
|
||||
|
||||
}
|
||||
else {
|
||||
dotLayer.color = offColor
|
||||
}
|
||||
guard i <= currentIndex else { dotLayer.color = offColor; continue }
|
||||
guard i >= dotCount - maxDotCount else { dotLayer.color = onColor; continue }
|
||||
let newHue = hue > 0.5 ? hue + (j * ((1.0 - hue)/CGFloat(maxDotCount-1))) : hue - (j * (hue/CGFloat(maxDotCount-1)))
|
||||
dotLayer.color = UIColor(hue: newHue , saturation: saturation, brightness: brightness, alpha: 1)
|
||||
j += 1.0
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -53,11 +53,3 @@ extension CALayer {
|
||||
return UIBezierPath(ovalIn: bounds.insetBy(dx: bounds.width * multiplier, dy: bounds.height * multiplier))
|
||||
}
|
||||
}
|
||||
|
||||
extension UIView {
|
||||
|
||||
func circlePath(with multiplier: CGFloat) -> UIBezierPath {
|
||||
let multiplier = (1 - max(0, min(multiplier, 1))) / 2.0
|
||||
return UIBezierPath(ovalIn: bounds.insetBy(dx: bounds.width * multiplier, dy: bounds.height * multiplier))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -66,7 +66,7 @@ class KnobView: UIView {
|
||||
}
|
||||
middleCircle.multiplier = middleCircleMultiplier
|
||||
glowCircleLayer.multiplier = middleCircleMultiplier
|
||||
middleCircleShadow.path = circlePath(with: middleCircleMultiplier).cgPath
|
||||
middleCircleShadow.path = layer.circlePath(with: middleCircleMultiplier).cgPath
|
||||
}
|
||||
}
|
||||
var innerCircleMultiplier: CGFloat = Constants.innerMultiplier {
|
||||
@@ -102,7 +102,7 @@ class KnobView: UIView {
|
||||
}()
|
||||
|
||||
lazy private var glowCircleLayer: CircularLayer = {
|
||||
let layer = CircularLayer(colors: [.red, .blue], maskType: .stroke(width: 5))
|
||||
let layer = CircularLayer(colors: [onColor, onColor], maskType: .stroke(width: 5))
|
||||
layer.multiplier = middleCircleMultiplier
|
||||
return layer
|
||||
}()
|
||||
@@ -148,7 +148,7 @@ class KnobView: UIView {
|
||||
middleCircle.frame = bounds
|
||||
innerCircle.frame = bounds
|
||||
|
||||
middleCircleShadow.path = circlePath(with: middleCircleMultiplier).cgPath
|
||||
middleCircleShadow.path = layer.circlePath(with: middleCircleMultiplier).cgPath
|
||||
glowCircleLayer.frame = bounds
|
||||
|
||||
}
|
||||
@@ -163,9 +163,6 @@ class KnobView: UIView {
|
||||
layer.insertSublayer(glowCircleLayer, above: outerCircle)
|
||||
layer.insertSublayer(middleCircleShadow, above: glowCircleLayer)
|
||||
layer.insertSublayer(middleCircle, above: middleCircleShadow)
|
||||
// layer.insertSublayer(middleCircleShadow, above: outerCircle)
|
||||
// layer.insertSublayer(glowCircleLayer, above: middleCircleShadow)
|
||||
// layer.insertSublayer(middleCircle, above: glowCircleLayer)
|
||||
|
||||
layer.insertSublayer(innerCircle, above: middleCircle)
|
||||
}
|
||||
|
||||
@@ -1,19 +1,25 @@
|
||||
# JOCircularSlider
|
||||
|
||||
|
||||
[](https://cocoapods.org/pods/JOCircularSlider)
|
||||
[](https://cocoapods.org/pods/JOCircularSlider)
|
||||
[](https://cocoapods.org/pods/JOCircularSlider)
|
||||
[]()
|
||||
[](https://cocoapods.org/pods/JOCircularSlider)
|
||||
[](https://twitter.com/ouraigua)
|
||||
[](http://clayallsopp.github.io/readme-score?url=https://github.com/ouraigua/jocircularslider)
|
||||
[](https://codebeat.co/projects/github-com-ouraigua-jocircularslider-master)
|
||||
|
||||
## Overview
|
||||
|
||||
JOCircularSlider is a highly customaizable and reusable circular slider for iOS applications.
|
||||
# JOCircularSlider
|
||||
|
||||
JOCircularSlider is a highly customisable and reusable iOS circular slider that mimics the behaviour of a knob control.
|
||||
It uses no preset images and every one of its components is drawn completely in code making it extremely adaptable to every design and theme.
|
||||
|
||||
## Example
|
||||
|
||||
To run the example project, clone the repo, and run `pod install` from the Example directory first.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
## Requirements
|
||||
|
||||
@@ -36,22 +42,54 @@ pod 'JOCircularSlider'
|
||||
import JOCircularSlider
|
||||
```
|
||||
Drag a UIView to your storyboard, change its class of to CircularSlider and start visually customising the design to your liking.
|
||||
All the paramters are IBInspectable, so you can configure the slider straight from the attribute inspector tab, without having to write a single line of code.
|
||||
All the parameters are IBInspectable, so you can configure the slider straight from the attribute inspector tab, without having to write a single line of code.
|
||||
|
||||
|
||||
|
||||
2. Programatically:
|
||||
|
||||
```swift
|
||||
|
||||
import JOCircularSlider
|
||||
let circularSlider = CircularSlider(frame: .zero)
|
||||
|
||||
let circularSlider = CircularSlider(frame: aFrame)
|
||||
circularSlider.startAngle = 230
|
||||
circularSlider.endAngle = 310
|
||||
circularSlider.minimumValue = 0
|
||||
circularSlider.maximumValue = 60
|
||||
circularSlider.isClockwise = true
|
||||
circularSlider.isClockwise = false
|
||||
```
|
||||
These are just few of the many params you can configure for the slider.
|
||||
|
||||
The slider's `value` property is read-only.
|
||||
```swift
|
||||
/**
|
||||
returns a value in the range 0.0 (minimumValue) to 1.0 (maximumValue).
|
||||
The default value of this property is 0.0.
|
||||
*/
|
||||
open private (set) var value: Float = 0
|
||||
```
|
||||
To set the slider's value use the following:
|
||||
```swift
|
||||
/**
|
||||
Set the `value`.
|
||||
- parameter newValue: if `isPercentage` then new value must be in the range 0.0 to 1.0
|
||||
- parameter isPercentage: specifies if newValue is in the range [0.0, 1.0] or not
|
||||
*/
|
||||
open func setValue(_ newValue: Float, isPercentage: Bool = false)
|
||||
```
|
||||
|
||||
To Control the text's appearance, use these:
|
||||
```swift
|
||||
open func setTextFont(named: String, textColor: UIColor, multiplier: CGFloat)
|
||||
open func setTextShadow(color: UIColor, opacity: Float = 1, offset: CGSize = CGSize(width: 1, height: 1), radius: CGFloat = 0)
|
||||
```
|
||||
|
||||
## References
|
||||
|
||||
The project is Inspired by:
|
||||
- [How To Make a Custom Control Tutorial: A Reusable Knob](https://www.raywenderlich.com/5294-how-to-make-a-custom-control-tutorial-a-reusable-knob)
|
||||
- [HGCircularSlider](https://github.com/HamzaGhazouani/HGCircularSlider)
|
||||
|
||||
## Author
|
||||
|
||||
Jalal Ouraigua, ouraigua@icloud.com
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 1.1 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 570 KiB After Width: | Height: | Size: 722 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 598 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 835 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.2 MiB |
Reference in New Issue
Block a user