Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: jdg/MBProgressHUD
base: master
...
head fork: zwaldowski/DZProgressController
compare: master
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Jan 29, 2012
@zwaldowski zwaldowski Move project completely to ARC to be as simple as possible.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
8d4ee3a
@zwaldowski zwaldowski Move license header out.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
e96e188
@zwaldowski zwaldowski Remove the deprecated delegate method, rename the remaining one to -H…
…UDWasHidden:.

Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
7974ff4
@zwaldowski zwaldowski Go all-ARC. Change all property flags to nonatomic. Use proper naming…
… conventions.

Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
5b6103f
@zwaldowski zwaldowski Don't hold on to our own transform, direct concat works just fine.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
2ebdc28
@zwaldowski zwaldowski Remove unused ivars, synthesize most of them.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
a405998
@zwaldowski zwaldowski Simplify MBRoundProgressView code.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
a358f83
Commits on Jan 30, 2012
@zwaldowski zwaldowski Use synthesized getters.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
b6ca7a2
@zwaldowski zwaldowski Move to modern blocks for execution and animation.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
dcc245b
@zwaldowski zwaldowski Use CGFloat where necessary.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
8ea2bbd
@zwaldowski zwaldowski Remove "square" property.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
b665fb4
@zwaldowski zwaldowski Prefer the new block execution method, ditch the old one.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
ab04857
@zwaldowski zwaldowski Redo -layoutSubviews to be neater.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
b30b849
@zwaldowski zwaldowski Better interaction between hide delay and minimum show time using dis…
…patch_after.

Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
d79de27
@zwaldowski zwaldowski Dim the status bar when using the background dim.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
b2e1371
@zwaldowski zwaldowski Fix the wrong method being called in the determinate example.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
d2bcf77
@zwaldowski zwaldowski Make the progress view a layer to save some redrawing.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
69c0d9b
@zwaldowski zwaldowski Remove an unused property and clean up ivars.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
27e1fdf
Commits on Jan 31, 2012
@zwaldowski zwaldowski Forget it. No background dimming, always zoom animation. Fix rotation…
… transform screw-up.

Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
0ca987f
@zwaldowski zwaldowski Never mind about the layers. (Reverts parts of 69c0d9b).
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
5eb6767
@zwaldowski zwaldowski Remove more for-want-of-a-nail properties.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
5c8f7e0
@zwaldowski zwaldowski Asynchronous label properties, like UITableViewCell.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
f6e5556
@zwaldowski zwaldowski Make sure minSize works for now, even though it's the worst of them all.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
44dde6e
@zwaldowski zwaldowski Fix a display glitch when directly setting the label text and/or font.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
86dd233
@zwaldowski zwaldowski Improvements to setting/getting progress.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
a1072cf
@zwaldowski zwaldowski Move all NSThread calls into dispatch_async. Remove more useless prop…
…erties.

Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
79b288d
@zwaldowski zwaldowski Shuffle methods around. OCD fulfillment.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
15d8c47
@zwaldowski zwaldowski Replace the single delegate method with a callback block.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
159c50b
@zwaldowski zwaldowski Use the examples from the master repo for the demo.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
d6176f8
@zwaldowski zwaldowski Massively simplify the demo.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
867c00c
@zwaldowski zwaldowski Use a custom setter to make you able to change the custom view at any…
… time, safely.

Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
7924369
@zwaldowski zwaldowski Maximize thread safety for showing.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
705ed12
@zwaldowski zwaldowski Retina success image.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
8ae5021
@zwaldowski zwaldowski Reorganize files.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
45e4c0b
@zwaldowski zwaldowski Constant values for customView that represent success and error image…
… views.

Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
69e2905
@zwaldowski zwaldowski Reset _showStarted when changing the mode so using -hide:afterDelay: …
…isn't necessary.

Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
1b6dede
Commits on Feb 02, 2012
@zwaldowski zwaldowski Main label a little more like native.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
6fa4ebe
@zwaldowski zwaldowski Better approximate native look and metrics.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
a3496b7
@zwaldowski zwaldowski Remove detailsLabel.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
75a8789
@zwaldowski zwaldowski Center vertically including the status bar.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
5fcc402
@zwaldowski zwaldowski Layout with-label HUD exactly like native.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
be0200d
@zwaldowski zwaldowski wasTappedBlock with tap gesture recognizer.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
9c8b9a1
Commits on Feb 03, 2012
@zwaldowski zwaldowski 4.3 compile support under ARC.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
12e0517
@zwaldowski zwaldowski Remove the need for a designated initializer. (Just use -init or +new.)
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
550c85b
@zwaldowski zwaldowski Use a semaphore to make sure -hide: doesn't get called during animati…
…ons, etc.

Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
d65de97
@zwaldowski zwaldowski Don't worry about dispatching from within -showWhileExecuting:
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
98ef023
@zwaldowski zwaldowski Use semaphores to always make sure we get the minimum show time in. R…
…emove the afterDelay: parameter, add completion.

Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
aa90697
@zwaldowski zwaldowski Add a method that coalesces changes into an animation. Improve setter…
… behavior while animating.

Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
35d15e2
@zwaldowski zwaldowski Examples for success and failure view.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
60802f4
@zwaldowski zwaldowski Prevent selector error when stopping animation.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
b0250c5
@zwaldowski zwaldowski Improve asynchronous glitches by calling on the current queue if poss…
…ible.

Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
a410087
@zwaldowski zwaldowski Improved behavior (non-jumpy) for setting progress.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
8d63612
@zwaldowski zwaldowski Improve documentation.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
96d2039
@zwaldowski zwaldowski Further improve dispatch functions and behavior.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
e8489dd
Commits on Feb 04, 2012
@zwaldowski zwaldowski Improve the experience for coalesced transitions with animated content.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
bede7be
@zwaldowski zwaldowski Improve the demos.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
7d7e115
@zwaldowski zwaldowski Use animated content animation option for showing and hiding as well.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
ef1f4db
@zwaldowski zwaldowski Automatically add to the main window when being shown to eliminate lo…
…ts of boilerplate.

Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
aa3de7f
@zwaldowski zwaldowski Set a default minimum show time.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
cfce77a
Commits on Feb 05, 2012
@zwaldowski zwaldowski Animated progress setting.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
465a197
@zwaldowski zwaldowski Animate contents will animating in the HUD so you can do things like …
…set progress.

Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
c65fcf5
@zwaldowski zwaldowski Move progress animation into the progress view.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
b632484
@zwaldowski zwaldowski Convenience class method for showing a simple block.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
9ce16de
@zwaldowski zwaldowski Default to removing from superview. Remove the -addSubview:HUD requir…
…ement. Remove the hide with completion method.

Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
7d85722
@zwaldowski zwaldowski Synchronously fire background block to fix returning from -showWhileE…
…xecuting: immediately.

Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
6db166e
@zwaldowski zwaldowski Force animation for showing and hiding.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
90a7b66
@zwaldowski zwaldowski A simpler chain of class methods.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
f631301
@zwaldowski zwaldowski Just reorganize some things.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
6cc1d44
@zwaldowski zwaldowski Revert "Synchronously fire background block to fix returning from -sh…
…owWhileExecuting: immediately."

This reverts commit 6db166e.

Conflicts:

	MBProgressHUD.m

Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
9ff76c4
@zwaldowski zwaldowski Layout the HUD correctly. (Revert a tiny part of 6cc1d44.)
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
c4de4cb
@zwaldowski zwaldowski Update README and write a CocoaPods spec.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
9b4600c
Commits on Feb 06, 2012
@zwaldowski zwaldowski Licensing and disclaimer detritus.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
ebaf638
@zwaldowski zwaldowski Clean up block types and the demo's selectors.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
7ea39d3
Commits on Feb 10, 2012
@zwaldowski zwaldowski Improve progress setting behavior for very fast switches (see "Downlo…
…ading" sample).

Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
0fd4e46
Commits on Feb 15, 2012
@zwaldowski zwaldowski Attempt to unlock the semaphore immediately on hide to prevent crash.
Attempt to unlock the semaphore immediately on hide to prevent crashing while releasing the semaphore.

Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
414e41b
Commits on Feb 16, 2012
@zwaldowski zwaldowski Make sure Pod Spec is marked for ARC.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
ffad5c5
Commits on Apr 01, 2012
@zwaldowski zwaldowski Hard fork. ec73138
Commits on Apr 05, 2012
@zwaldowski zwaldowski Use weak references instead of unsafe_unretained. Licensing crud.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
74dfbb4
Commits on Apr 07, 2012
@zwaldowski zwaldowski Revert the weak-refs part of the previous commit. a4af501
Commits on Jun 18, 2012
@zwaldowski zwaldowski Migrate to DZProgressController, deriving from UIViewController inste…
…ad of its own view hierarchy.

Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
81eaaf8
@zwaldowski zwaldowski Follow through on name change.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
efea9fd
@zwaldowski zwaldowski Fix bug in laying out a new mode during a transition.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
84c8ed8
@zwaldowski zwaldowski Move layered properties into drawing code for the pie progress layer.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
9f69188
@zwaldowski zwaldowski Draw shadow entirely in code for speed and to prevent glitch during a…
…nimations.

Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
b343fc4
@zwaldowski zwaldowski Remove -setProgress:animated: as the progress is always implicitly an…
…imated.

Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
9ec7a03
@zwaldowski zwaldowski Don't animate the download test change to determinate (misses out on …
…progress). Toy with the determinate test animations.

Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
d3e8952
@zwaldowski zwaldowski Finish renaming. ;-)
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
08aa1c0
@zwaldowski zwaldowski Fix retina issue with pie progress.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
705ab11
Commits on Jul 12, 2012
@zwaldowski zwaldowski Whoops, rename internal class so as to not clash with DZPopupController. 75818dc
Commits on Jul 18, 2012
@zwaldowski zwaldowski Update pod spec. 42b9621
Commits on Aug 12, 2012
@zwaldowski zwaldowski Finalize spec for 1.0.0.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
851092f
Commits on Oct 25, 2012
Nick Added CGRetainColor/CGReleaseColor to prevent determinate progress co…
…ntroller from crashing
90cdd23
Commits on Feb 17, 2013
@YuAo YuAo Store the App's original keyWindow on -[DZProgressController show] an…
…d set it back on -[DZProgressController hide]
305157e
@zwaldowski zwaldowski Merge pull request #4 from YuAo/master
Fix a bug that causes the App's KeyWindow to become nil on iOS 5.
6b3277c
Commits on May 29, 2013
@zwaldowski zwaldowski Adds giraffe default image to example project.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
7e1946c
@zwaldowski zwaldowski Uses faster image-backed frame drawing, cleanups.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
c7aa473
@zwaldowski zwaldowski Tag 1.1.0.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
ad43fc9
@zwaldowski zwaldowski Whoops, fix giraffe Xcode project reference.
Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
c5fb566
Commits on May 30, 2013
@zwaldowski zwaldowski Fixes HUD being displayed over alert views. feef579
Commits on Nov 03, 2013
@a2 a2 Fix casts of self.layer in DZProgressController.m
When building for 64-bit, there is a type conflict between the CGFloat DZProgressController property and the float UIProgressView property.
51d398e
@zwaldowski zwaldowski Merge pull request #6 from a2/master
Fix casts of self.layer in DZProgressController.m
8117dac
Commits on Nov 04, 2013
@a2 a2 Fix tap gesture failure by enabling user interaction on frameView 2bcdede
Commits on Nov 09, 2013
@zwaldowski zwaldowski Merge pull request #7 from a2/master
Fix tap gesture failure by enabling user interaction on frameView
cf26887