diff --git a/SVProgressHUD/Ressources/svhud-error.png b/SVProgressHUD/SVProgressHUD.bundle/error.png similarity index 100% rename from SVProgressHUD/Ressources/svhud-error.png rename to SVProgressHUD/SVProgressHUD.bundle/error.png diff --git a/SVProgressHUD/Ressources/svhud-error@2x.png b/SVProgressHUD/SVProgressHUD.bundle/error@2x.png similarity index 100% rename from SVProgressHUD/Ressources/svhud-error@2x.png rename to SVProgressHUD/SVProgressHUD.bundle/error@2x.png diff --git a/SVProgressHUD/Ressources/svhud-success.png b/SVProgressHUD/SVProgressHUD.bundle/success.png similarity index 100% rename from SVProgressHUD/Ressources/svhud-success.png rename to SVProgressHUD/SVProgressHUD.bundle/success.png diff --git a/SVProgressHUD/Ressources/svhud-success@2x.png b/SVProgressHUD/SVProgressHUD.bundle/success@2x.png similarity index 100% rename from SVProgressHUD/Ressources/svhud-success@2x.png rename to SVProgressHUD/SVProgressHUD.bundle/success@2x.png diff --git a/SVProgressHUD/SVProgressHUD.m b/SVProgressHUD/SVProgressHUD.m index f466d82a..f7e2f2ef 100644 --- a/SVProgressHUD/SVProgressHUD.m +++ b/SVProgressHUD/SVProgressHUD.m @@ -129,7 +129,7 @@ - (id)initWithFrame:(CGRect)frame { - (void)setStatus:(NSString *)string { - CGFloat stringWidth = [string sizeWithFont:stringLabel.font].width+28; + CGFloat stringWidth = [string sizeWithFont:self.stringLabel.font].width+28; if(stringWidth < 100) stringWidth = 100; @@ -165,9 +165,12 @@ - (void)showInView:(UIView*)view status:(NSString*)string networkIndicator:(BOOL [spinnerView startAnimating]; if(![sharedView isDescendantOfView:view]) { - + sharedView.layer.opacity = 0; [view addSubview:sharedView]; + } + if(sharedView.layer.opacity != 1) { + posY+=(CGRectGetHeight(self.bounds)/2); self.center = CGPointMake(CGRectGetWidth(self.superview.bounds)/2, posY); @@ -197,7 +200,7 @@ - (void)dismiss { self.layer.transform = CATransform3DScale(CATransform3DMakeTranslation(0, 0, 0), 0.8, 0.8, 1.0); self.layer.opacity = 0; } - completion:^(BOOL finished){ [self removeFromSuperview]; }]; + completion:^(BOOL finished){ if(self.layer.opacity == 0) [self removeFromSuperview]; }]; } @@ -206,9 +209,9 @@ - (void)dismissWithStatus:(NSString*)string error:(BOOL)error { [UIApplication sharedApplication].networkActivityIndicatorVisible = NO; if(error) - self.imageView.image = [UIImage imageNamed:@"svhud-error.png"]; + self.imageView.image = [UIImage imageNamed:@"SVProgressHUD.bundle/error.png"]; else - self.imageView.image = [UIImage imageNamed:@"svhud-success.png"]; + self.imageView.image = [UIImage imageNamed:@"SVProgressHUD.bundle/success.png"]; self.imageView.hidden = NO; diff --git a/Sample/SVProgressHUD.xcodeproj/project.pbxproj b/Sample/SVProgressHUD.xcodeproj/project.pbxproj index 7516adab..b21e9341 100755 --- a/Sample/SVProgressHUD.xcodeproj/project.pbxproj +++ b/Sample/SVProgressHUD.xcodeproj/project.pbxproj @@ -11,17 +11,14 @@ 1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; }; 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; - 222A67DD133FDB5B00DAE48C /* SVProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = 222A67D9133FDB5B00DAE48C /* SVProgressHUD.m */; }; - 222A67DE133FDB5B00DAE48C /* svhud-success.png in Resources */ = {isa = PBXBuildFile; fileRef = 222A67DB133FDB5B00DAE48C /* svhud-success.png */; }; - 222A67DF133FDB5B00DAE48C /* svhud-error.png in Resources */ = {isa = PBXBuildFile; fileRef = 222A67DC133FDB5B00DAE48C /* svhud-error.png */; }; 222A6821133FE36400DAE48C /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 222A6820133FE36400DAE48C /* QuartzCore.framework */; }; - 22EBCCF313411B940074B281 /* svhud-error@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 22EBCCF213411B940074B281 /* svhud-error@2x.png */; }; - 22EBCCF513411B9F0074B281 /* svhud-success@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 22EBCCF413411B9F0074B281 /* svhud-success@2x.png */; }; + 22D13AB71365FEAC0025FCC9 /* SVProgressHUD.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 22D13AB61365FEAC0025FCC9 /* SVProgressHUD.bundle */; }; 22EBCD19134128130074B281 /* MainWindow-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22EBCD18134128130074B281 /* MainWindow-iPad.xib */; }; 288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765A40DF7441C002DB57D /* CoreGraphics.framework */; }; 2899E5220DE3E06400AC0155 /* ViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2899E5210DE3E06400AC0155 /* ViewController.xib */; }; 28AD733F0D9D9553002E5188 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD733E0D9D9553002E5188 /* MainWindow.xib */; }; 28D7ACF80DDB3853001CB0EB /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 28D7ACF70DDB3853001CB0EB /* ViewController.m */; }; + 63ADC4BC1364C1360060E45B /* SVProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = 63ADC4BA1364C1360060E45B /* SVProgressHUD.m */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -30,13 +27,8 @@ 1D3623250D0F684500981E51 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; 1D6058910D05DD3D006BFB54 /* SVProgressHUD.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SVProgressHUD.app; sourceTree = BUILT_PRODUCTS_DIR; }; 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; - 222A67D8133FDB5B00DAE48C /* SVProgressHUD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVProgressHUD.h; sourceTree = ""; }; - 222A67D9133FDB5B00DAE48C /* SVProgressHUD.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVProgressHUD.m; sourceTree = ""; }; - 222A67DB133FDB5B00DAE48C /* svhud-success.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "svhud-success.png"; sourceTree = ""; }; - 222A67DC133FDB5B00DAE48C /* svhud-error.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "svhud-error.png"; sourceTree = ""; }; 222A6820133FE36400DAE48C /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; - 22EBCCF213411B940074B281 /* svhud-error@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "svhud-error@2x.png"; sourceTree = ""; }; - 22EBCCF413411B9F0074B281 /* svhud-success@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "svhud-success@2x.png"; sourceTree = ""; }; + 22D13AB61365FEAC0025FCC9 /* SVProgressHUD.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = SVProgressHUD.bundle; sourceTree = ""; }; 22EBCD18134128130074B281 /* MainWindow-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "MainWindow-iPad.xib"; path = "Resources-iPad/MainWindow-iPad.xib"; sourceTree = ""; }; 288765A40DF7441C002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 2899E5210DE3E06400AC0155 /* ViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ViewController.xib; path = ../ViewController.xib; sourceTree = ""; }; @@ -45,6 +37,8 @@ 28D7ACF70DDB3853001CB0EB /* ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 32CA4F630368D1EE00C91783 /* SVProgressHUD_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVProgressHUD_Prefix.pch; sourceTree = ""; }; + 63ADC4B91364C1360060E45B /* SVProgressHUD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVProgressHUD.h; sourceTree = ""; }; + 63ADC4BA1364C1360060E45B /* SVProgressHUD.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVProgressHUD.m; sourceTree = ""; }; 8D1107310486CEB800E47090 /* SVProgressHUD-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "SVProgressHUD-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -71,6 +65,7 @@ 2899E5210DE3E06400AC0155 /* ViewController.xib */, 1D3623240D0F684500981E51 /* AppDelegate.h */, 1D3623250D0F684500981E51 /* AppDelegate.m */, + 63ADC4B81364C1360060E45B /* SVProgressHUD */, ); path = Classes; sourceTree = ""; @@ -83,28 +78,6 @@ name = Products; sourceTree = ""; }; - 222A67D7133FDB5B00DAE48C /* SVProgressHUD */ = { - isa = PBXGroup; - children = ( - 222A67D8133FDB5B00DAE48C /* SVProgressHUD.h */, - 222A67D9133FDB5B00DAE48C /* SVProgressHUD.m */, - 222A67DA133FDB5B00DAE48C /* Ressources */, - ); - name = SVProgressHUD; - path = ../SVProgressHUD; - sourceTree = SOURCE_ROOT; - }; - 222A67DA133FDB5B00DAE48C /* Ressources */ = { - isa = PBXGroup; - children = ( - 222A67DB133FDB5B00DAE48C /* svhud-success.png */, - 22EBCCF413411B9F0074B281 /* svhud-success@2x.png */, - 222A67DC133FDB5B00DAE48C /* svhud-error.png */, - 22EBCCF213411B940074B281 /* svhud-error@2x.png */, - ); - path = Ressources; - sourceTree = ""; - }; 22EBCD17134128130074B281 /* Resources-iPad */ = { isa = PBXGroup; children = ( @@ -117,7 +90,6 @@ isa = PBXGroup; children = ( 080E96DDFE201D6D7F000001 /* Classes */, - 222A67D7133FDB5B00DAE48C /* SVProgressHUD */, 29B97315FDCFA39411CA2CEA /* Other Sources */, 29B97317FDCFA39411CA2CEA /* Resources */, 22EBCD17134128130074B281 /* Resources-iPad */, @@ -156,6 +128,17 @@ name = Frameworks; sourceTree = ""; }; + 63ADC4B81364C1360060E45B /* SVProgressHUD */ = { + isa = PBXGroup; + children = ( + 63ADC4B91364C1360060E45B /* SVProgressHUD.h */, + 63ADC4BA1364C1360060E45B /* SVProgressHUD.m */, + 22D13AB61365FEAC0025FCC9 /* SVProgressHUD.bundle */, + ); + name = SVProgressHUD; + path = ../../SVProgressHUD; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -207,11 +190,8 @@ files = ( 28AD733F0D9D9553002E5188 /* MainWindow.xib in Resources */, 2899E5220DE3E06400AC0155 /* ViewController.xib in Resources */, - 222A67DE133FDB5B00DAE48C /* svhud-success.png in Resources */, - 222A67DF133FDB5B00DAE48C /* svhud-error.png in Resources */, - 22EBCCF313411B940074B281 /* svhud-error@2x.png in Resources */, - 22EBCCF513411B9F0074B281 /* svhud-success@2x.png in Resources */, 22EBCD19134128130074B281 /* MainWindow-iPad.xib in Resources */, + 22D13AB71365FEAC0025FCC9 /* SVProgressHUD.bundle in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -225,7 +205,7 @@ 1D60589B0D05DD56006BFB54 /* main.m in Sources */, 1D3623260D0F684500981E51 /* AppDelegate.m in Sources */, 28D7ACF80DDB3853001CB0EB /* ViewController.m in Sources */, - 222A67DD133FDB5B00DAE48C /* SVProgressHUD.m in Sources */, + 63ADC4BC1364C1360060E45B /* SVProgressHUD.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };