Skip to content
This repository has been archived by the owner on Dec 29, 2020. It is now read-only.

Commit

Permalink
Merge pull request #18 from gizmosachin/4.0
Browse files Browse the repository at this point in the history
ColorSlider 4.0
  • Loading branch information
gizmosachin authored Sep 26, 2017
2 parents 1a14587 + 5eaf0e8 commit 2d9ad43
Show file tree
Hide file tree
Showing 69 changed files with 6,293 additions and 2,155 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0
4.0
8 changes: 3 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
language: objective-c
osx_image: xcode8
osx_image: xcode9
env:
global:
- LC_CTYPE=en_US.UTF-8
- LANG=en_US.UTF-8
before_install:
- brew update
- brew reinstall xctool
- bundle install
script:
- xcodebuild -showsdks
- xcodebuild -project ColorSlider/ColorSlider.xcodeproj -scheme ColorSlider -sdk iphonesimulator10.0 build analyze
- bundle exec pod lib lint --verbose

11 changes: 11 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
### One issue or bug per Pull Request

Keep your Pull Requests small. Small PRs are easier to reason about which makes them significantly more likely to get merged.

### Issues before features

If you want to add a feature, please file an [Issue](issues) first. An Issue gives us the opportunity to discuss the requirements and implications of a feature with you before you start writing code.

### Forwards compatibility

Please do not write new code using deprecated APIs.
Binary file modified ColorSlider.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 12 additions & 3 deletions ColorSlider.podspec
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
Pod::Spec.new do |s|
s.name = 'ColorSlider'
s.version = '3.0.1'
s.summary = 'Snapchat-style color picker with live preview'
s.version = '4.0'
s.summary = 'Snapchat-style color picker in Swift'
s.homepage = 'http://github.com/gizmosachin/ColorSlider'
s.license = 'MIT'
s.documentation_url = 'http://gizmosachin.com/ColorSlider/'

s.social_media_url = 'http://twitter.com/gizmosachin'
s.author = { 'Sachin Patel' => '[email protected]' }

# source
s.source = { :git => 'https://github.com/gizmosachin/ColorSlider.git', :tag => s.version }
s.source_files = 'Sources/**', 'Sources/Internal/**'

# platform
s.platform = :ios
s.ios.deployment_target = '9.0'
s.source_files = 'Sources/*.swift'

# build settings
s.requires_arc = true
s.frameworks = 'Foundation', 'UIKit', 'CoreGraphics', 'QuartzCore'
end
57 changes: 43 additions & 14 deletions ColorSlider/ColorSlider.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,23 @@
objects = {

/* Begin PBXBuildFile section */
46E735CD1C63392800B63587 /* ColorSlider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46E735CC1C63392800B63587 /* ColorSlider.swift */; };
038C445A1F70ED57009927DD /* PreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 038C44531F70ED52009927DD /* PreviewView.swift */; };
038C445B1F70ED57009927DD /* ColorSlider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 038C44541F70ED52009927DD /* ColorSlider.swift */; };
038C445C1F70ED57009927DD /* ColorSliderExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 038C44561F70ED52009927DD /* ColorSliderExtensions.swift */; };
038C445D1F70ED57009927DD /* HSBColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 038C44571F70ED52009927DD /* HSBColor.swift */; };
038C445E1F70ED57009927DD /* GradientView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 038C44581F70ED52009927DD /* GradientView.swift */; };
038C445F1F70ED57009927DD /* DefaultPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 038C44591F70ED52009927DD /* DefaultPreviewView.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
038C44531F70ED52009927DD /* PreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreviewView.swift; sourceTree = "<group>"; };
038C44541F70ED52009927DD /* ColorSlider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorSlider.swift; sourceTree = "<group>"; };
038C44561F70ED52009927DD /* ColorSliderExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorSliderExtensions.swift; sourceTree = "<group>"; };
038C44571F70ED52009927DD /* HSBColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HSBColor.swift; sourceTree = "<group>"; };
038C44581F70ED52009927DD /* GradientView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GradientView.swift; sourceTree = "<group>"; };
038C44591F70ED52009927DD /* DefaultPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultPreviewView.swift; sourceTree = "<group>"; };
038C44601F70ED5F009927DD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
46E735C11C6338F900B63587 /* ColorSlider.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ColorSlider.framework; sourceTree = BUILT_PRODUCTS_DIR; };
46E735C61C6338F900B63587 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
46E735CC1C63392800B63587 /* ColorSlider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ColorSlider.swift; path = ../Sources/ColorSlider.swift; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -27,29 +37,43 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
46E735B71C6338F900B63587 = {
038C44521F70ED52009927DD /* Sources */ = {
isa = PBXGroup;
children = (
46E735C31C6338F900B63587 /* ColorSlider */,
46E735C21C6338F900B63587 /* Products */,
038C44531F70ED52009927DD /* PreviewView.swift */,
038C44541F70ED52009927DD /* ColorSlider.swift */,
038C44551F70ED52009927DD /* Internal */,
038C44581F70ED52009927DD /* GradientView.swift */,
038C44591F70ED52009927DD /* DefaultPreviewView.swift */,
);
name = Sources;
path = ../Sources;
sourceTree = "<group>";
};
46E735C21C6338F900B63587 /* Products */ = {
038C44551F70ED52009927DD /* Internal */ = {
isa = PBXGroup;
children = (
46E735C11C6338F900B63587 /* ColorSlider.framework */,
038C44561F70ED52009927DD /* ColorSliderExtensions.swift */,
038C44571F70ED52009927DD /* HSBColor.swift */,
);
name = Products;
path = Internal;
sourceTree = "<group>";
};
46E735C31C6338F900B63587 /* ColorSlider */ = {
46E735B71C6338F900B63587 = {
isa = PBXGroup;
children = (
46E735CC1C63392800B63587 /* ColorSlider.swift */,
46E735C61C6338F900B63587 /* Info.plist */,
038C44601F70ED5F009927DD /* Info.plist */,
038C44521F70ED52009927DD /* Sources */,
46E735C21C6338F900B63587 /* Products */,
);
path = ColorSlider;
sourceTree = "<group>";
};
46E735C21C6338F900B63587 /* Products */ = {
isa = PBXGroup;
children = (
46E735C11C6338F900B63587 /* ColorSlider.framework */,
);
name = Products;
sourceTree = "<group>";
};
/* End PBXGroup section */
Expand Down Expand Up @@ -130,7 +154,12 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
46E735CD1C63392800B63587 /* ColorSlider.swift in Sources */,
038C445B1F70ED57009927DD /* ColorSlider.swift in Sources */,
038C445D1F70ED57009927DD /* HSBColor.swift in Sources */,
038C445E1F70ED57009927DD /* GradientView.swift in Sources */,
038C445F1F70ED57009927DD /* DefaultPreviewView.swift in Sources */,
038C445C1F70ED57009927DD /* ColorSliderExtensions.swift in Sources */,
038C445A1F70ED57009927DD /* PreviewView.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Loading

0 comments on commit 2d9ad43

Please sign in to comment.