Skip to content

Commit

Permalink
Merge branch 'feature/fix-orientation-issue'
Browse files Browse the repository at this point in the history
  • Loading branch information
@antoninbiret
antoninbiret committed Jul 31, 2016
2 parents a09b07e + 994519f commit 284e4b7
Show file tree
Hide file tree
Showing 10 changed files with 231 additions and 129 deletions.
6 changes: 6 additions & 0 deletions Exemple-ABSteppedProgressBar/Exemple.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,10 +327,13 @@
baseConfigurationReference = 2D13ABDFC150D98A2F44B2DE /* Pods-Exemple.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEAD_CODE_STRIPPING = NO;
INFOPLIST_FILE = Exemple/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = fr.antoninbiret.Exemple;
PRODUCT_NAME = "$(TARGET_NAME)";
STRIP_INSTALLED_PRODUCT = NO;
STRIP_STYLE = debugging;
};
name = Debug;
};
Expand All @@ -339,10 +342,13 @@
baseConfigurationReference = 65649D4FA8E5DD4AEC2EF0F9 /* Pods-Exemple.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEAD_CODE_STRIPPING = NO;
INFOPLIST_FILE = Exemple/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = fr.antoninbiret.Exemple;
PRODUCT_NAME = "$(TARGET_NAME)";
STRIP_INSTALLED_PRODUCT = NO;
STRIP_STYLE = debugging;
};
name = Release;
};
Expand Down
5 changes: 5 additions & 0 deletions Exemple-ABSteppedProgressBar/Exemple/Assets.xcassets/AppIcon.appiconset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@
"idiom" : "ipad",
"size" : "76x76",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "83.5x83.5",
"scale" : "2x"
}
],
"info" : {
Expand Down
79 changes: 45 additions & 34 deletions Exemple-ABSteppedProgressBar/Exemple/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
</dependencies>
<scenes>
<!--Navigation Controller-->
Expand Down Expand Up @@ -87,43 +88,53 @@
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="OS8-9y-r9C" customClass="ABSteppedProgressBar" customModule="ABSteppedProgressBar">
<rect key="frame" x="215" y="280" width="170" height="40"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="Pqc-za-CTX"/>
<constraint firstAttribute="width" constant="170" id="srF-IW-a91"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="numberOfPoints">
<integer key="value" value="4"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="lineHeight">
<real key="value" value="15"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="progressRadius">
<real key="value" value="15"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="progressLineHeight">
<real key="value" value="10"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="backgroundShapeColor">
<color key="value" red="1" green="0.0" blue="0.174486237628523" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="selectedBackgoundColor">
<color key="value" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="displayNumbers" value="YES"/>
<userDefinedRuntimeAttribute type="number" keyPath="radius">
<real key="value" value="20"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</view>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="2yz-Dm-oXL">
<rect key="frame" x="40" y="84" width="520" height="496"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="OS8-9y-r9C" customClass="ABSteppedProgressBar" customModule="ABSteppedProgressBar">
<rect key="frame" x="0.0" y="0.0" width="520" height="50"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="0m2-Mc-cBp"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="numberOfPoints">
<integer key="value" value="4"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="lineHeight">
<real key="value" value="15"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="progressRadius">
<real key="value" value="15"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="progressLineHeight">
<real key="value" value="10"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="selectedBackgoundColor">
<color key="value" red="0.25098039215686274" green="0.67843137254901964" blue="0.082352941176470587" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="displayNumbers" value="YES"/>
<userDefinedRuntimeAttribute type="number" keyPath="radius">
<real key="value" value="20"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="backgroundShapeColor">
<color key="value" red="0.90588235294117647" green="0.90588235294117647" blue="0.90588235294117647" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Sb9-nq-8bl">
<rect key="frame" x="0.0" y="50" width="520" height="446"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
</subviews>
</stackView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="OS8-9y-r9C" firstAttribute="centerY" secondItem="8bC-Xf-vdC" secondAttribute="centerY" id="66y-7c-ctM"/>
<constraint firstItem="OS8-9y-r9C" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="jlp-x3-9LX"/>
<constraint firstItem="wfy-db-euE" firstAttribute="top" secondItem="2yz-Dm-oXL" secondAttribute="bottom" constant="20" id="1Vv-YB-OKq"/>
<constraint firstItem="2yz-Dm-oXL" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leadingMargin" constant="20" id="9ab-vN-mXH"/>
<constraint firstAttribute="trailingMargin" secondItem="2yz-Dm-oXL" secondAttribute="trailing" constant="20" id="JrS-7c-c9n"/>
<constraint firstItem="2yz-Dm-oXL" firstAttribute="top" secondItem="y3c-jy-aDJ" secondAttribute="bottom" constant="20" id="PSB-xl-Rv9"/>
</constraints>
</view>
</viewController>
Expand Down
3 changes: 3 additions & 0 deletions Exemple-ABSteppedProgressBar/Exemple/ExempleViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ class ExempleViewController: UIViewController {
progressBar.progressLineHeight = 10

progressBar.delegate = self

progressBar.backgroundShapeColor = UIColor(red: 231/255, green: 231/255, blue: 231/255, alpha: 1)
progressBar.selectedBackgoundColor = UIColor(red: 64/255, green: 173/255, blue: 21/255, alpha: 1)
}
}

Expand Down
4 changes: 2 additions & 2 deletions Exemple-ABSteppedProgressBar/Podfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- ABSteppedProgressBar (0.0.3)
- ABSteppedProgressBar (0.0.4)

DEPENDENCIES:
- ABSteppedProgressBar (from `../`)
Expand All @@ -9,7 +9,7 @@ EXTERNAL SOURCES:
:path: ../

SPEC CHECKSUMS:
ABSteppedProgressBar: 2f4f51ad45a9610f15fb696e2447482e690210c5
ABSteppedProgressBar: 931e2f628e425cd3491a1db6efc59c12ff991981

PODFILE CHECKSUM: 6a8e347d3f7d25053b7843d2d2f4b942079e6494

Expand Down
4 changes: 2 additions & 2 deletions Exemple-ABSteppedProgressBar/Pods/Local Podspecs/ABSteppedProgressBar.podspec.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Exemple-ABSteppedProgressBar/Pods/Manifest.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 0 additions & 10 deletions ...ods/Pods.xcodeproj/xcuserdata/antoninbiret.xcuserdatad/xcschemes/xcschememanagement.plist
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Exemple-ABSteppedProgressBar/Pods/Target Support Files/ABSteppedProgressBar/Info.plist
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 284e4b7

Please sign in to comment.