Skip to content

General Updates and Improvements #4

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.

Sign up for GitHub

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

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

General Updates and Improvements #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
52afab3
Refactored Progress view for greater customization
codytwinton Oct 21, 2016
024a5cf
Refactored showing and dismissing
codytwinton Oct 21, 2016
c75324c
View Controller updates
codytwinton Oct 21, 2016
2a1a02c
Refactored view to rely on view frame for size animations
codytwinton Oct 21, 2016
903a521
Minor update to view frame
codytwinton Oct 21, 2016
2829850
Added Specific Progress functionality
codytwinton Oct 21, 2016
c2adb07
UIWindow Extension added
codytwinton Oct 21, 2016
52da0a1
Documentation Updates
codytwinton Oct 21, 2016
a2e3196
Minor refactor
codytwinton Oct 21, 2016
29d520a
Created gitignore file
codytwinton Oct 22, 2016
4dbd8a7
Removed unnecessary files based on git ignore
codytwinton Oct 22, 2016
4ea802e
Minor function refactoring
codytwinton Oct 22, 2016
396465a
Updated LinearProgressBar class for proper Cocoapod access
codytwinton Oct 22, 2016
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
65 changes: 65 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## Build generated
build/
DerivedData/

## Various settings
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata/

## Other
*.moved-aside
*.xcuserstate

## Obj-C/Swift specific
*.hmap
*.ipa
*.dSYM.zip
*.dSYM

## Playgrounds
timeline.xctimeline
playground.xcworkspace

# Swift Package Manager
#
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
.build/

# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
# Pods/

# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts

Carthage/Build

# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md

fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output
17 changes: 5 additions & 12 deletions LinearProgressBar.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
3721E0741DA78F1100DC9E8F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3721E0721DA78F1100DC9E8F /* Main.storyboard */; };
3721E0761DA78F1100DC9E8F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3721E0751DA78F1100DC9E8F /* Assets.xcassets */; };
3721E0791DA78F1100DC9E8F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3721E0771DA78F1100DC9E8F /* LaunchScreen.storyboard */; };
3721E0821DA78FA500DC9E8F /* LinearProgressBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3721E0811DA78FA500DC9E8F /* LinearProgressBar.swift */; };
6AD200AF1DBBEE77007DA1A4 /* LinearProgressBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6AD200AD1DBBED76007DA1A4 /* LinearProgressBar.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -23,7 +23,7 @@
3721E0751DA78F1100DC9E8F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
3721E0781DA78F1100DC9E8F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
3721E07A1DA78F1100DC9E8F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3721E0811DA78FA500DC9E8F /* LinearProgressBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LinearProgressBar.swift; sourceTree = "<group>"; };
6AD200AD1DBBED76007DA1A4 /* LinearProgressBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LinearProgressBar.swift; path = Pod/Classes/LinearProgressBar.swift; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -56,7 +56,7 @@
3721E06D1DA78F1100DC9E8F /* LinearProgressBar */ = {
isa = PBXGroup;
children = (
3721E0801DA78F9C00DC9E8F /* Lib */,
6AD200AD1DBBED76007DA1A4 /* LinearProgressBar.swift */,
3721E06E1DA78F1100DC9E8F /* AppDelegate.swift */,
3721E0701DA78F1100DC9E8F /* ViewController.swift */,
3721E0721DA78F1100DC9E8F /* Main.storyboard */,
Expand All @@ -67,14 +67,6 @@
path = LinearProgressBar;
sourceTree = "<group>";
};
3721E0801DA78F9C00DC9E8F /* Lib */ = {
isa = PBXGroup;
children = (
3721E0811DA78FA500DC9E8F /* LinearProgressBar.swift */,
);
name = Lib;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -150,7 +142,7 @@
files = (
3721E0711DA78F1100DC9E8F /* ViewController.swift in Sources */,
3721E06F1DA78F1100DC9E8F /* AppDelegate.swift in Sources */,
3721E0821DA78FA500DC9E8F /* LinearProgressBar.swift in Sources */,
6AD200AF1DBBEE77007DA1A4 /* LinearProgressBar.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -314,6 +306,7 @@
3721E07F1DA78F1100DC9E8F /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
Expand Down
Binary file removed ...deproj/project.xcworkspace/xcuserdata/Philippe.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
19 changes: 19 additions & 0 deletions ...rProgressBar.xcodeproj/xcuserdata/iosdev.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
type = "1"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.SymbolicBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = ""
moduleName = "">
<Locations>
</Locations>
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
91 changes: 91 additions & 0 deletions ...rProgressBar.xcodeproj/xcuserdata/iosdev.xcuserdatad/xcschemes/LinearProgressBar.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3721E06A1DA78F1100DC9E8F"
BuildableName = "LinearProgressBar.app"
BlueprintName = "LinearProgressBar"
ReferencedContainer = "container:LinearProgressBar.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3721E06A1DA78F1100DC9E8F"
BuildableName = "LinearProgressBar.app"
BlueprintName = "LinearProgressBar"
ReferencedContainer = "container:LinearProgressBar.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3721E06A1DA78F1100DC9E8F"
BuildableName = "LinearProgressBar.app"
BlueprintName = "LinearProgressBar"
ReferencedContainer = "container:LinearProgressBar.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3721E06A1DA78F1100DC9E8F"
BuildableName = "LinearProgressBar.app"
BlueprintName = "LinearProgressBar"
ReferencedContainer = "container:LinearProgressBar.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
22 changes: 22 additions & 0 deletions LinearProgressBar.xcodeproj/xcuserdata/iosdev.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>LinearProgressBar.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>3721E06A1DA78F1100DC9E8F</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
66 changes: 35 additions & 31 deletions LinearProgressBar/Base.lproj/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="6zn-ZP-uD2">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="6zn-ZP-uD2">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
Expand All @@ -20,57 +18,63 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="background" translatesAutoresizingMaskIntoConstraints="NO" id="djY-9c-eCz">
<frame key="frameInset" minX="200" minY="226" width="200" height="148"/>
</imageView>
<button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YHr-KY-UkW">
<frame key="frameInset" minY="526" width="600" height="74"/>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YHr-KY-UkW">
<color key="backgroundColor" red="0.0" green="0.3309842429" blue="0.53333333329999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="60" id="P8U-QQ-i2w"/>
</constraints>
<fontDescription key="fontDescription" name="Avenir-Heavy" family="Avenir" pointSize="23"/>
<state key="normal" title="Stop Animation">
<state key="normal" title="Dismiss">
<color key="titleColor" red="0.96862745100000003" green="0.96862745100000003" blue="0.96862745100000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<connections>
<action selector="stopAnimation:" destination="6zn-ZP-uD2" eventType="touchUpInside" id="0ji-pp-LgS"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MfI-ao-qL5">
<frame key="frameInset" minY="453" width="600" height="73"/>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MfI-ao-qL5">
<color key="backgroundColor" red="0.0" green="0.48145251500000003" blue="0.53333333329999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="60" id="Ei9-nR-Yw6"/>
</constraints>
<fontDescription key="fontDescription" name="Avenir-Heavy" family="Avenir" pointSize="23"/>
<state key="normal" title="Start Animation">
<state key="normal" title="Show">
<color key="titleColor" red="0.96862745100000003" green="0.96862745100000003" blue="0.96862745100000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<connections>
<action selector="startAnimation:" destination="6zn-ZP-uD2" eventType="touchUpInside" id="t6l-YB-TwG"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="F5v-ZQ-bEK">
<color key="backgroundColor" red="0.0" green="0.55761772390499398" blue="0.62067708330000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="60" id="txT-SW-yrb"/>
</constraints>
<fontDescription key="fontDescription" name="Avenir-Heavy" family="Avenir" pointSize="23"/>
<state key="normal" title="Advance Progress">
<color key="titleColor" red="0.96862745100000003" green="0.96862745100000003" blue="0.96862745100000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<connections>
<action selector="advanceProgress:" destination="6zn-ZP-uD2" eventType="touchUpInside" id="Ap3-Pp-kCj"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" red="0.0" green="0.58823529409999997" blue="0.53333333329999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="YHr-KY-UkW" secondAttribute="trailing" id="3c9-sm-6bL"/>
<constraint firstItem="djY-9c-eCz" firstAttribute="centerX" secondItem="2MK-bg-cfg" secondAttribute="centerX" id="5Kz-ad-01s"/>
<constraint firstItem="djY-9c-eCz" firstAttribute="height" secondItem="2MK-bg-cfg" secondAttribute="width" multiplier="0.25" id="72b-Co-60D"/>
<constraint firstAttribute="trailing" secondItem="MfI-ao-qL5" secondAttribute="trailing" id="7S8-cs-VaJ"/>
<constraint firstItem="YHr-KY-UkW" firstAttribute="top" secondItem="MfI-ao-qL5" secondAttribute="bottom" id="9jg-bY-zSW"/>
<constraint firstItem="djY-9c-eCz" firstAttribute="width" secondItem="2MK-bg-cfg" secondAttribute="width" multiplier="0.3" id="F2k-rL-ceD"/>
<constraint firstItem="YHr-KY-UkW" firstAttribute="width" secondItem="2MK-bg-cfg" secondAttribute="width" id="Hgt-gH-RO7"/>
<constraint firstItem="HPV-qt-sJQ" firstAttribute="top" secondItem="YHr-KY-UkW" secondAttribute="bottom" id="Pd5-YB-Xue"/>
<constraint firstItem="MfI-ao-qL5" firstAttribute="height" secondItem="YHr-KY-UkW" secondAttribute="height" id="S5y-dP-uNC"/>
<constraint firstItem="YHr-KY-UkW" firstAttribute="leading" secondItem="2MK-bg-cfg" secondAttribute="leading" id="VmN-hi-wYW"/>
<constraint firstItem="YHr-KY-UkW" firstAttribute="height" secondItem="2MK-bg-cfg" secondAttribute="height" multiplier="0.1" id="WiY-Qg-lCc"/>
<constraint firstItem="MfI-ao-qL5" firstAttribute="leading" secondItem="2MK-bg-cfg" secondAttribute="leading" id="dro-3o-dLk"/>
<constraint firstItem="djY-9c-eCz" firstAttribute="centerY" secondItem="2MK-bg-cfg" secondAttribute="centerY" id="ec7-F4-DnC"/>
<constraint firstItem="MfI-ao-qL5" firstAttribute="width" secondItem="YHr-KY-UkW" secondAttribute="width" id="uLZ-EE-LoR"/>
<constraint firstAttribute="trailing" secondItem="MfI-ao-qL5" secondAttribute="trailing" id="4tA-rF-F8e"/>
<constraint firstItem="MfI-ao-qL5" firstAttribute="top" secondItem="F5v-ZQ-bEK" secondAttribute="bottom" id="7jM-3G-Cq9"/>
<constraint firstItem="HPV-qt-sJQ" firstAttribute="top" secondItem="YHr-KY-UkW" secondAttribute="bottom" id="Tlq-F4-7p9"/>
<constraint firstItem="YHr-KY-UkW" firstAttribute="leading" secondItem="2MK-bg-cfg" secondAttribute="leading" id="b9u-pG-CFf"/>
<constraint firstAttribute="trailing" secondItem="YHr-KY-UkW" secondAttribute="trailing" id="dv9-Gt-jsR"/>
<constraint firstItem="MfI-ao-qL5" firstAttribute="leading" secondItem="2MK-bg-cfg" secondAttribute="leading" id="ffw-aO-0O4"/>
<constraint firstItem="F5v-ZQ-bEK" firstAttribute="leading" secondItem="2MK-bg-cfg" secondAttribute="leading" id="kbc-6F-wQ5"/>
<constraint firstItem="YHr-KY-UkW" firstAttribute="top" secondItem="MfI-ao-qL5" secondAttribute="bottom" id="rvq-YO-BbV"/>
<constraint firstAttribute="trailing" secondItem="F5v-ZQ-bEK" secondAttribute="trailing" id="whr-WY-2Ix"/>
</constraints>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="q0s-a0-BUm" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="305" y="347"/>
<point key="canvasLocation" x="-372" y="239"/>
</scene>
</scenes>
<resources>
<image name="background" width="200" height="148"/>
</resources>
</document>
Loading