Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added number of rounds and carthage support #15

Closed
wants to merge 14 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,26 @@
# Change Log
All notable changes to this project will be documented in this file.
## [2.1.0](https://github.com/HamzaGhazouani/HGCircularSlider/releases/tag/2.0.0)

* Updated to Swift 3.1 - fixed deprecations
* Reintroduced example project, with number of rounds
* Fixed example project pods settings

## [2.0.1](https://github.com/HamzaGhazouani/HGCircularSlider/releases/tag/2.0.0)

* Added Carthage prebuilt binary
* Set deployment target to iOS 9.0

## [2.0.0](https://github.com/HamzaGhazouani/HGCircularSlider/releases/tag/2.0.0)

* Added Carthage support
* Added number of rounds, allowing to create slider same as Apple bedtime slider (12h clock with two rounds)
* Added backtrack inspectable properties, allowing to modify its properties
* Added shadow track color and offset inspectable attributes
* Removed distance from default slider definition
* Removed example project
* Removed MidPointCircularSlider


## [1.1.0](https://github.com/HamzaGhazouani/HGCircularSlider/releases/tag/1.1.0)

Expand All @@ -16,7 +37,7 @@ All notable changes to this project will be documented in this file.

## [1.0.1](https://github.com/HamzaGhazouani/HGCircularSlider/releases/tag/1.0.1)

* remove warnings
* remove warnings

## [1.0.0](https://github.com/HamzaGhazouani/HGCircularSlider/releases/tag/1.0.0)

Expand All @@ -25,7 +46,7 @@ All notable changes to this project will be documented in this file.
## [0.1.2](https://github.com/HamzaGhazouani/HGCircularSlider/releases/tag/0.1.2)

* Add documentation
* Last version that support Xcode 7.3.1
* Last version that support Xcode 7.3.1

## [0.1.1](https://github.com/HamzaGhazouani/HGCircularSlider/releases/tag/0.1.1)

Expand Down
8 changes: 4 additions & 4 deletions Example/HGCircularSlider.xcodeproj/project.pbxproj
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
0F46583D66160DDAEA5B58FE /* [CP] Copy Pods Resources */ = {
Expand Down Expand Up @@ -366,7 +366,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -511,7 +511,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 04EAC630898381E6412A72E4 /* Pods-HGCircularSlider_Example.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = HGCircularSlider/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
Expand All @@ -526,7 +526,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 9BA305BCC009CE17283FE799 /* Pods-HGCircularSlider_Example.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = HGCircularSlider/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
Expand Down
Empty file.
Empty file.
Empty file modified Example/HGCircularSlider.xcworkspace/contents.xcworkspacedata
100644 → 100755
Empty file.
Empty file modified Example/HGCircularSlider/AppDelegate.swift
100644 → 100755
Empty file.
Empty file modified Example/HGCircularSlider/Base.lproj/LaunchScreen.xib
100644 → 100755
Empty file.
82 changes: 77 additions & 5 deletions Example/HGCircularSlider/Base.lproj/Main.storyboard
100644 → 100755

Large diffs are not rendered by default.

14 changes: 13 additions & 1 deletion Example/HGCircularSlider/ClockViewController.swift
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ extension Date {

class ClockViewController: UIViewController {


@IBOutlet weak var durationLabel: UILabel!
@IBOutlet weak var bedtimeLabel: UILabel!
@IBOutlet weak var wakeLabel: UILabel!
@IBOutlet weak var rangeCircularSlider: RangeCircularSlider!
@IBOutlet weak var clockFormatSegmentedControl: UISegmentedControl!

lazy var dateFormatter: DateFormatter = {
let dateFormatter = DateFormatter()
Expand Down Expand Up @@ -65,5 +66,16 @@ class ClockViewController: UIViewController {
durationLabel.text = dateFormatter.string(from: durationDate)
dateFormatter.dateFormat = "hh:mm a"
}

@IBAction func clockFormatChange(_ sender: UISegmentedControl) {
switch sender.selectedSegmentIndex {
case 0: rangeCircularSlider.numberOfRounds = 1
case 1: rangeCircularSlider.numberOfRounds = 2
default: assert(false)
}


}

}

Empty file.
Empty file.
Empty file.
Empty file modified Example/HGCircularSlider/Images.xcassets/Contents.json
100644 → 100755
Empty file.
Empty file.
Empty file modified Example/HGCircularSlider/Images.xcassets/Wake.imageset/Wake.pdf
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified Example/HGCircularSlider/Info.plist
100644 → 100755
Empty file.
Empty file modified Example/HGCircularSlider/OClockViewController.swift
100644 → 100755
Empty file.
Empty file modified Example/HGCircularSlider/OtherExampleViewController.swift
100644 → 100755
Empty file.
Empty file modified Example/HGCircularSlider/PlayerViewController.swift
100644 → 100755
Empty file.
Empty file modified Example/HGCircularSlider/StrangeZero.mp3
100644 → 100755
Empty file.
Empty file modified Example/Podfile
100644 → 100755
Empty file.
8 changes: 4 additions & 4 deletions Example/Podfile.lock
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
PODS:
- HGCircularSlider (1.0.2)
- HGCircularSlider (2.1.0)

DEPENDENCIES:
- HGCircularSlider (from `../`)

EXTERNAL SOURCES:
HGCircularSlider:
:path: ../
:path: "../"

SPEC CHECKSUMS:
HGCircularSlider: e7ded3c342cf180d2b751a444aeb603c61b1f3fd
HGCircularSlider: ed0948eab581b6371d0b647051fe538e60741cc4

PODFILE CHECKSUM: 7cb4c64ce59896052589f93ba9b0ea50a207f738

COCOAPODS: 1.1.1
COCOAPODS: 1.2.1
23 changes: 0 additions & 23 deletions Example/Pods/Local Podspecs/HGCircularSlider.podspec.json

This file was deleted.

16 changes: 0 additions & 16 deletions Example/Pods/Manifest.lock

This file was deleted.

Loading