Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #2 from corerd/storyboard
Merged pull request implementing progressbar changes
  • Loading branch information
appdesignvault committed Feb 22, 2013
2 parents f17b15c + 17cd8c1 commit ac4c9b8
Show file tree
Hide file tree
Showing 27 changed files with 2,713 additions and 265 deletions.
Binary file removed .DS_Store
Binary file not shown.
14 changes: 14 additions & 0 deletions .gitignore
@@ -0,0 +1,14 @@
# OS generated files #
######################
.DS_Store
*~
*.bak

# XCODE generated files #
#########################
project.xcworkspace/
xcuserdata/

# DOXYGEN generated files #
#########################
html/
68 changes: 66 additions & 2 deletions ADVProgressBar.xcodeproj/project.pbxproj
Expand Up @@ -7,6 +7,18 @@
objects = { objects = {


/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
923367A916D7227500F899BA /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 923367A816D7227500F899BA /* Default-568h@2x.png */; };
924FC2C816D4930100D3F305 /* storyboard3.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 924FC2C616D4930100D3F305 /* storyboard3.jpg */; };
924FC2C916D4930100D3F305 /* storyboard4.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 924FC2C716D4930100D3F305 /* storyboard4.jpg */; };
92972F3216D0ACD8009F08AA /* storyboard0.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 92972F2F16D0ACD8009F08AA /* storyboard0.jpg */; };
92972F3316D0ACD8009F08AA /* storyboard1.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 92972F3016D0ACD8009F08AA /* storyboard1.jpg */; };
92972F3416D0ACD8009F08AA /* storyboard2.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 92972F3116D0ACD8009F08AA /* storyboard2.jpg */; };
92E4108116CFC53D00137E40 /* screenshot.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 92E4108016CFC53D00137E40 /* screenshot.jpg */; };
92EC8ECD16C0BBC20087B43B /* mainpage.dox in Resources */ = {isa = PBXBuildFile; fileRef = 92EC8ECC16C0BBC20087B43B /* mainpage.dox */; };
92ED54B116AC27F0006A1C73 /* LICENSE.txt in Resources */ = {isa = PBXBuildFile; fileRef = 92ED54AF16AC27F0006A1C73 /* LICENSE.txt */; };
92ED54B216AC27F0006A1C73 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 92ED54B016AC27F0006A1C73 /* README.md */; };
92EE065B16D33F9100D3A01D /* editorMenu.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 92EE065A16D33F9100D3A01D /* editorMenu.jpg */; };
92EEEEDB16BF57DA007610B9 /* Doxyfile in Resources */ = {isa = PBXBuildFile; fileRef = 92EEEE7C16BF57DA007610B9 /* Doxyfile */; };
ECE9A478150A435E0076F0C5 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ECE9A477150A435E0076F0C5 /* UIKit.framework */; }; ECE9A478150A435E0076F0C5 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ECE9A477150A435E0076F0C5 /* UIKit.framework */; };
ECE9A47A150A435E0076F0C5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ECE9A479150A435E0076F0C5 /* Foundation.framework */; }; ECE9A47A150A435E0076F0C5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ECE9A479150A435E0076F0C5 /* Foundation.framework */; };
ECE9A47C150A435E0076F0C5 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ECE9A47B150A435E0076F0C5 /* CoreGraphics.framework */; }; ECE9A47C150A435E0076F0C5 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ECE9A47B150A435E0076F0C5 /* CoreGraphics.framework */; };
Expand All @@ -31,6 +43,18 @@
/* End PBXBuildFile section */ /* End PBXBuildFile section */


/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
923367A816D7227500F899BA /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-568h@2x.png"; path = "../../Default-568h@2x.png"; sourceTree = "<group>"; };
924FC2C616D4930100D3F305 /* storyboard3.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = storyboard3.jpg; sourceTree = "<group>"; };
924FC2C716D4930100D3F305 /* storyboard4.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = storyboard4.jpg; sourceTree = "<group>"; };
92972F2F16D0ACD8009F08AA /* storyboard0.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = storyboard0.jpg; sourceTree = "<group>"; };
92972F3016D0ACD8009F08AA /* storyboard1.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = storyboard1.jpg; sourceTree = "<group>"; };
92972F3116D0ACD8009F08AA /* storyboard2.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = storyboard2.jpg; sourceTree = "<group>"; };
92E4108016CFC53D00137E40 /* screenshot.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = screenshot.jpg; sourceTree = "<group>"; };
92EC8ECC16C0BBC20087B43B /* mainpage.dox */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mainpage.dox; sourceTree = "<group>"; };
92ED54AF16AC27F0006A1C73 /* LICENSE.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE.txt; sourceTree = "<group>"; };
92ED54B016AC27F0006A1C73 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.md; sourceTree = "<group>"; };
92EE065A16D33F9100D3A01D /* editorMenu.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = editorMenu.jpg; sourceTree = "<group>"; };
92EEEE7C16BF57DA007610B9 /* Doxyfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Doxyfile; sourceTree = "<group>"; };
ECE9A473150A435E0076F0C5 /* ADVProgressBar.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ADVProgressBar.app; sourceTree = BUILT_PRODUCTS_DIR; }; ECE9A473150A435E0076F0C5 /* ADVProgressBar.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ADVProgressBar.app; sourceTree = BUILT_PRODUCTS_DIR; };
ECE9A477150A435E0076F0C5 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; ECE9A477150A435E0076F0C5 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
ECE9A479150A435E0076F0C5 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; ECE9A479150A435E0076F0C5 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -74,14 +98,41 @@
/* End PBXFrameworksBuildPhase section */ /* End PBXFrameworksBuildPhase section */


/* Begin PBXGroup section */ /* Begin PBXGroup section */
92EC8ECF16C0C92C0087B43B /* Resources */ = {
isa = PBXGroup;
children = (
924FC2C616D4930100D3F305 /* storyboard3.jpg */,
924FC2C716D4930100D3F305 /* storyboard4.jpg */,
92EE065A16D33F9100D3A01D /* editorMenu.jpg */,
92972F2F16D0ACD8009F08AA /* storyboard0.jpg */,
92972F3016D0ACD8009F08AA /* storyboard1.jpg */,
92972F3116D0ACD8009F08AA /* storyboard2.jpg */,
92E4108016CFC53D00137E40 /* screenshot.jpg */,
);
path = Resources;
sourceTree = "<group>";
};
92EEEE7B16BF57DA007610B9 /* DoxyDoc */ = {
isa = PBXGroup;
children = (
92EC8ECF16C0C92C0087B43B /* Resources */,
92EC8ECC16C0BBC20087B43B /* mainpage.dox */,
92EEEE7C16BF57DA007610B9 /* Doxyfile */,
);
path = DoxyDoc;
sourceTree = "<group>";
};
ECE9A468150A435E0076F0C5 = { ECE9A468150A435E0076F0C5 = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
ECE9A4B5150A48240076F0C5 /* Classes */, 92ED54B016AC27F0006A1C73 /* README.md */,
ECE9A498150A446C0076F0C5 /* Resources */, 92ED54AF16AC27F0006A1C73 /* LICENSE.txt */,
ECE9A47D150A435E0076F0C5 /* ADVProgressBar */, ECE9A47D150A435E0076F0C5 /* ADVProgressBar */,
ECE9A4B5150A48240076F0C5 /* Classes */,
92EEEE7B16BF57DA007610B9 /* DoxyDoc */,
ECE9A476150A435E0076F0C5 /* Frameworks */, ECE9A476150A435E0076F0C5 /* Frameworks */,
ECE9A474150A435E0076F0C5 /* Products */, ECE9A474150A435E0076F0C5 /* Products */,
ECE9A498150A446C0076F0C5 /* Resources */,
); );
sourceTree = "<group>"; sourceTree = "<group>";
}; };
Expand Down Expand Up @@ -130,6 +181,7 @@
ECE9A498150A446C0076F0C5 /* Resources */ = { ECE9A498150A446C0076F0C5 /* Resources */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
923367A816D7227500F899BA /* Default-568h@2x.png */,
ECE9A499150A446C0076F0C5 /* progress-count.png */, ECE9A499150A446C0076F0C5 /* progress-count.png */,
ECE9A49A150A446C0076F0C5 /* progress-count@2x.png */, ECE9A49A150A446C0076F0C5 /* progress-count@2x.png */,
ECE9A49B150A446C0076F0C5 /* progress-fill-blue.png */, ECE9A49B150A446C0076F0C5 /* progress-fill-blue.png */,
Expand Down Expand Up @@ -220,6 +272,18 @@
ECE9A4AE150A446C0076F0C5 /* progress-fill-red@2x.png in Resources */, ECE9A4AE150A446C0076F0C5 /* progress-fill-red@2x.png in Resources */,
ECE9A4AF150A446C0076F0C5 /* progress-track.png in Resources */, ECE9A4AF150A446C0076F0C5 /* progress-track.png in Resources */,
ECE9A4B0150A446C0076F0C5 /* progress-track@2x.png in Resources */, ECE9A4B0150A446C0076F0C5 /* progress-track@2x.png in Resources */,
92ED54B116AC27F0006A1C73 /* LICENSE.txt in Resources */,
92ED54B216AC27F0006A1C73 /* README.md in Resources */,
92EEEEDB16BF57DA007610B9 /* Doxyfile in Resources */,
92EC8ECD16C0BBC20087B43B /* mainpage.dox in Resources */,
92E4108116CFC53D00137E40 /* screenshot.jpg in Resources */,
92972F3216D0ACD8009F08AA /* storyboard0.jpg in Resources */,
92972F3316D0ACD8009F08AA /* storyboard1.jpg in Resources */,
92972F3416D0ACD8009F08AA /* storyboard2.jpg in Resources */,
92EE065B16D33F9100D3A01D /* editorMenu.jpg in Resources */,
924FC2C816D4930100D3F305 /* storyboard3.jpg in Resources */,
924FC2C916D4930100D3F305 /* storyboard4.jpg in Resources */,
923367A916D7227500F899BA /* Default-568h@2x.png in Resources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
Expand Down

This file was deleted.

Binary file not shown.

This file was deleted.

This file was deleted.

Binary file removed ADVProgressBar/.DS_Store
Binary file not shown.
2 changes: 1 addition & 1 deletion ADVProgressBar/ADVProgressBar-Info.plist
Expand Up @@ -11,7 +11,7 @@
<key>CFBundleIconFiles</key> <key>CFBundleIconFiles</key>
<array/> <array/>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>com.appdesign.${PRODUCT_NAME:rfc1034identifier}</string> <string>com.github.corerd.${PRODUCT_NAME:rfc1034identifier}</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleName</key> <key>CFBundleName</key>
Expand Down
40 changes: 35 additions & 5 deletions ADVProgressBar/ADVViewController.h
Expand Up @@ -6,8 +6,11 @@
/* /*
The MIT License The MIT License
Copyright (c) 2011 Tope Abayomi Original work Copyright (c) 2011 Tope Abayomi
http://www.appdesignvault.com/ http://www.appdesignvault.com/
Modified work Copyright (c) 2013 Corrado Ubezio
https://github.com/corerd/
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
Expand All @@ -28,13 +31,40 @@
THE SOFTWARE. THE SOFTWARE.
*/ */


/*!
ADVPercentProgressBar demo.
Demonstrate how to create and instantiate a bunch of ADVPercentProgressBar
custom views.
They are added to the View Controller in the two ways:
- programmatically;
- from a nib or storyboard.
*/

#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#import "ADVPercentProgressBar.h"

@interface ADVViewController : UIViewController


@interface ADVViewController : UIViewController <UIWebViewDelegate> /// An ADVPercentProgressBar showing the integral value.
@property (weak, nonatomic) IBOutlet ADVPercentProgressBar *pbRangeValue;


/// An ADVPercentProgressBar showing the percentage of the value.
@property (weak, nonatomic) IBOutlet ADVPercentProgressBar *pbRangePercent;


@property (nonatomic, strong) NSArray* progressBars;


-(IBAction)sliderValueChanged:(UISlider*)sender; /*!
Action on sliding.
Get the value changed sliding along the track.
The value is returned in the range 0.0 - 1.0 and is used to animate the
ADVPercentProgressBar views.
@param sender
Slider that is sending the action message.
*/
- (IBAction)sliderValueChanged:(UISlider *)sender;



@end @end

0 comments on commit ac4c9b8

Please sign in to comment.