Skip to content

Commit

Permalink
Merge pull request #7 from sfcd/release/1.0.6
Browse files Browse the repository at this point in the history
Release 1.0.6
  • Loading branch information
ildar sibagatov authored Jan 15, 2019
2 parents d54e23f + cf68889 commit 2661ed9
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 43 deletions.
2 changes: 2 additions & 0 deletions Example/Resources/ExampleInfo.plist
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
<array>
<string>armv7</string>
</array>
<key>UIStatusBarHidden</key>
<true/>
<key>UIStatusBarStyle</key>
<string>UIStatusBarStyleLightContent</string>
<key>UISupportedInterfaceOrientations</key>
Expand Down
23 changes: 13 additions & 10 deletions Example/Resources/LaunchScreen.storyboard
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina5_9" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
Expand All @@ -15,23 +18,23 @@
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" Copyright © 2016 SFÇD. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd">
<rect key="frame" x="20" y="559" width="560" height="21"/>
<rect key="frame" x="20" y="771" width="335" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SFProgressCircle" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
<rect key="frame" x="20" y="180.5" width="560" height="42"/>
<rect key="frame" x="20" y="250.66666666666663" width="335" height="42"/>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="36"/>
<color key="textColor" red="0.9882352941176471" green="0.30196078431372547" blue="0.23529411764705882" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" red="0.9882352941176471" green="0.30196078431372547" blue="0.23529411764705882" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="centerX" secondItem="obG-Y5-kRd" secondAttribute="centerX" id="5cz-MP-9tL"/>
<constraint firstAttribute="centerX" secondItem="GJd-Yh-RWb" secondAttribute="centerX" id="Q3B-4B-g5h"/>
Expand Down
3 changes: 2 additions & 1 deletion Example/Source/ViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ - (void)viewDidLoad
[_progressView setCenter:self.view.center];
[_progressView setLineWidth:6];
[_progressView setProgress:0];
[_progressView setRoundedCorners:YES];
[self.view addSubview:_progressView];

_titleLabel = [[UILabel alloc] initWithFrame:(CGRect){0, 0, 100, 30}];
Expand Down Expand Up @@ -73,7 +74,7 @@ - (void)viewDidAppear:(BOOL)animated

- (UIStatusBarStyle)preferredStatusBarStyle
{
return UIStatusBarStyleLightContent;
return UIStatusBarStyleDefault;
}

- (void)onRefresh
Expand Down
30 changes: 0 additions & 30 deletions Package.swift

This file was deleted.

2 changes: 1 addition & 1 deletion SFProgressCircle.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "SFProgressCircle"
s.version = "1.0.5"
s.version = "1.0.6"
s.summary = "A circular gradient progress view implementation for iOS (supports partial circle)"
s.description = <<-DESC
A circular gradient progress view implementation for iOS (supports partial circle)
Expand Down
1 change: 0 additions & 1 deletion Source/SFCircleGradientView.m
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ - (void)initView:(CGRect)frame
_gradientLayer = [self progressLayer];
_gradientLayer.startColor = [UIColor blackColor];
_gradientLayer.endColor = [UIColor greenColor];
_gradientLayer.roundedCorners = YES;

[self updateLayerData:frame];

Expand Down

0 comments on commit 2661ed9

Please sign in to comment.