From 418d2868943d843d6258e5ac06c433d711223449 Mon Sep 17 00:00:00 2001 From: Wilson Yuan Date: Mon, 13 Feb 2017 11:20:13 +0800 Subject: [PATCH 01/26] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0a0bb46..9801a64 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # WSProgressHUD This is a beauful hud view for iPhone & iPad -[![CI Status](http://img.shields.io/travis/袁仕崇/WSProgressHUD.svg?style=flat)](https://travis-ci.org/袁仕崇/WSProgressHUD) +[![CI Status](http://img.shields.io/travis/devSC/WSProgressHUD.svg?style=flat)](https://travis-ci.org/devSC/WSProgressHUD) [![Version](https://img.shields.io/cocoapods/v/WSProgressHUD.svg?style=flat)](http://cocoapods.org/pods/WSProgressHUD) [![License](https://img.shields.io/cocoapods/l/WSProgressHUD.svg?style=flat)](http://cocoapods.org/pods/WSProgressHUD) [![Platform](https://img.shields.io/cocoapods/p/WSProgressHUD.svg?style=flat)](http://cocoapods.org/pods/WSProgressHUD) From e8456a9d54c04bfba2a368406833efb5815545fc Mon Sep 17 00:00:00 2001 From: Wilson Date: Mon, 3 Apr 2017 21:43:22 +0800 Subject: [PATCH 02/26] Fix bug [#13] --- Demo/WSProgressHUD/WSProgressHUD.m | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/Demo/WSProgressHUD/WSProgressHUD.m b/Demo/WSProgressHUD/WSProgressHUD.m index 8e63b45..29a32a7 100644 --- a/Demo/WSProgressHUD/WSProgressHUD.m +++ b/Demo/WSProgressHUD/WSProgressHUD.m @@ -419,7 +419,7 @@ - (void)showHudViewWithAnimation delay:0 options:UIViewAnimationOptionAllowUserInteraction | UIViewAnimationCurveEaseOut | UIViewAnimationOptionBeginFromCurrentState animations:^{ - self.hudView.transform = CGAffineTransformScale(self.hudView.transform, 1/1.2, 1/1.2); + self.hudView.transform = CGAffineTransformIdentity; self.hudView.alpha = 1; } completion:^(BOOL finished){ @@ -467,24 +467,27 @@ - (void)dismiss self.hudView.transform = CGAffineTransformIdentity; [UIView animateWithDuration:WSProgressHUDDismissDuration delay:0 - options:UIViewAnimationOptionAllowUserInteraction | UIViewAnimationCurveEaseOut + options:UIViewAnimationOptionAllowUserInteraction | UIViewAnimationCurveEaseOut | UIViewAnimationOptionBeginFromCurrentState animations:^{ self.hudView.transform = CGAffineTransformScale(self.hudView.transform, .8, .8); self.hudView.alpha = 0; } completion:^(BOOL finished){ - self.hudView.transform = CGAffineTransformIdentity; - [self.overlayView removeFromSuperview]; - - self.userInteractionEnabled = NO; - - [self stopIndicatorAnimation]; - - //Call drawInRact - [self setNeedsDisplay]; - - [self setProgressHUDIndicatorStyle:self.indicatorStyle]; + if (self.hudView.alpha == 0) { + self.hudView.transform = CGAffineTransformIdentity; + + [self.overlayView removeFromSuperview]; + + self.userInteractionEnabled = NO; + + [self stopIndicatorAnimation]; + + //Call drawInRact + [self setNeedsDisplay]; + + [self setProgressHUDIndicatorStyle:self.indicatorStyle]; + } }]; } From e05887f70b53b7bae06e495007bd7157632893b1 Mon Sep 17 00:00:00 2001 From: Wilson Date: Mon, 3 Apr 2017 21:43:47 +0800 Subject: [PATCH 03/26] update lib --- WSProgressHUD/MMMaterialDesignSpinner.m | 2 ++ .../WSProgressBundle.bundle/error@2x.png | Bin 1137 -> 2377 bytes .../WSProgressBundle.bundle/success@2x.png | Bin 811 -> 1856 bytes WSProgressHUD/WSProgressHUD.m | 29 ++++++++++-------- 4 files changed, 18 insertions(+), 13 deletions(-) mode change 100755 => 100644 WSProgressHUD/WSProgressBundle.bundle/error@2x.png mode change 100755 => 100644 WSProgressHUD/WSProgressBundle.bundle/success@2x.png diff --git a/WSProgressHUD/MMMaterialDesignSpinner.m b/WSProgressHUD/MMMaterialDesignSpinner.m index 8d256d4..9e19cea 100755 --- a/WSProgressHUD/MMMaterialDesignSpinner.m +++ b/WSProgressHUD/MMMaterialDesignSpinner.m @@ -36,6 +36,8 @@ - (instancetype)initWithCoder:(NSCoder *)aDecoder { - (void)awakeFromNib { + [super awakeFromNib]; + [self initialize]; } diff --git a/WSProgressHUD/WSProgressBundle.bundle/error@2x.png b/WSProgressHUD/WSProgressBundle.bundle/error@2x.png old mode 100755 new mode 100644 index b8bc16c896bc3667141e4b131974628f68c785d2..87534fac5fc9e065ef9b6cd1e4b62bcacc745c33 GIT binary patch literal 2377 zcmaJ@X;f3!77j?jgh|UFlQcvE0VJaV5(qVc1VWRb41y9ZA-O<+4BiA2^eL0N@QI>; z%z04JmbMU!RsjJ8D-VKzYl(s=3Ti0T3Zmfj5P89h?T_cXYu$U!KI{9wz0cm?k9%kn zH^dz70Ea*z=B&`*2>t4}^sY44f9nqVJL?yF1tV4wDNR%;`5*wH38e`Df+glB0TBRS zn6Xm}1VA7wTtrc^idYVtB9MwP{3Q%VC6?*g5JK$1v8MLui2j6{fp zRAdZ^gX748fMikVZV-sv&5aW5P8E=a$gcts0V;}KKny7O2$eWZBB!XR$Pc;{{eI~f zi$r{YC{n4&KZ}axY(fM{K>$I*kh}#r{04+C8G|R`H~8V#BM3M=5sM>Y@kDPtfr2Ab z@Fc{?2dU2n3KJ<2!OV}j^br-AtWd}(Sgca1#3+dvDVT)ClgVT(j({Z)y!8lgd4@#6 zS9we1>y{OQ0l5Ga$rK`~1hJ&ZPmrc7s7QUKe_lZ>`y?xoe{7S!VOSMkhQ(uWOIKP3 zayb7VDi(i2%M}s8U-kY^VR=-B48TSJa%nm!&<`$g-BKzUB?tug3Mm*Rm8LCsaZ|EX zA(bafWr(041Ug0}5lWSEj}LGThr*J`6?};RUYx8*57z}GMUk3)menJ&M`rbi#NDz&R^AO+F-r|eLpM!x61m= z%7na=S$Pj_67r2145*Ri!v=$>sDKpewr!8!EIwK6!dBj!emdQDubi_FmXYN!)M0B4oYGEZ02OR z0~+V?_SEf=cvpr5EAySW)7c%rzekIIwQ)7su8qyI??3PktJS6q)*b5VV;g7&u&PjG9(76m5`-yPZdL>%5e{#mM zcA;_KP|9U>o-W{^;PE(gNBaw8&sq!T=)KrS&{wyZ81-7C-+qkKF_@bDK`rmwe)d@? z3@jKpt>*bp6%i~;@TsAG$9@7Nqik|Z>cQXcYzb6fbC|;oBMN5u!mPrbn$}tScE&WB zDT_3t{VL>LNneNhh7VS*+{hie3$;FXycIL%V@fXH+mRdgf+R~Y$nNg-emFJOD}2;L z$87tyY4HAdAgU!GTx&OBdrrM2F?_+aeImDv*j~2geQ!}5O?%d9q6FR2#dBuc8JQ~w zU!%26ovc9lFpWLkFiKDKc4Ozz!*M~Zu!EUkNy88#k?EY+M1C3 z`u*a1z)jbdISl;A&M)UWTsP)?`I(9Fn$tDUnm4-6cQyH?oOS%h(&xoub(Wl0>biaU zY6zjWQ7&~eJzttz{kFaMcK5~lp_W2_gL?MyyXwp_3m)tOTKilB-%9hnec72R|zc?J_60gq^!KQ>rcnkBszIy5_9XxclauvHbf4_}?DckABe zNd_HnhWg;FJj-hW;+<-B`&KkfxO^Y-B4Nh-?tE2t-H+BegpdKiaBAoFRx;<8zK{sR z{?fG9rWg-@o5)Q=jXOstwUh4CU+gkPiQ<vjKLQ(;OuRTbWtcJYm=mkIR-tatPx{lsdY#w|CfI;msHxmV{ZEIFtL zmtzV}?Tsgt$8;PWEkj)JWE49wSsv&`i|M5CLt2C3S(w;=f@yMoWIYo2N4wAlRr$t( zcH%+qF(&gG5sCgjF0*U;09~x@j3qmCN$G) delta 1127 zcmV-t1ep8D67dL-8Gi%-0007y^OXPq1UN}VK~#7FwbFZRopl|@@z;6U)Acr5i=BgI z$k1V(n-Z9HE((^h;zTi$EI}3^0uF~uQ$+EGAU1+7GgA~7Z@5exOqdQfvor>SH>}VN zR0x-eOY0DDAhV;_)Ancb`)^Ix_MAS?`|oqk>-n7TLzUGUB!99k(O|VoxYi**by}um z;uN>&b*oB#XUL%K7G*}}EYM*X9)U7_Y^*iz z?q18J)_;88ie#6IBonv?1qJt5BGnpgj^txLEC*nPy^-7DZBp-K-;Csb9|5eiPcZ7| z7R#i1w@31EAC>c7opIfEZ;@GbIwINaW_#kgZBCbIbKM%rLgempn#`+rr*T2B+Zi%1 zr$v_#$%EEq&#m$&LBFT;3ZAx3BC`^$9*OtcVtw0k*{SIbMaau-K#$R-N_k<{j;NUk?0P3{t1f&sT3$3d-)UJyKM zgDR<%x7J?-$9z3+U_lU{jibPHa!#XJBSe8!RZs$AhDNR@2WZOm)F6JS@O z(T!e>>n<}FQYTw<8}&cmGhdD`J8E37wQ6NkxpO^cRG+Qt=yX(%k7dR|-U^Qz_N-ToJwV~FHtSe{{et(ey<=7;C282002ovPDHLkV1k?SGt>Y8 diff --git a/WSProgressHUD/WSProgressBundle.bundle/success@2x.png b/WSProgressHUD/WSProgressBundle.bundle/success@2x.png old mode 100755 new mode 100644 index c33f9f38609fb07043bb6d861265f74abaac8909..6cfe8b8b0e574b42562438977c489e9afff980d2 GIT binary patch literal 1856 zcmaJ?eN;?&7@omLfQigrw*UBIb)zrOmBwSCSPIC2AP8i0K`u9dL zgXxU84mAK)MRgLIii?<}(@!brjh|%=rh#K34-6#KMv%i|TT>bY%H{tL)$2c_O}G;I z;`cv=O{#Pw0xA&`nu=-2!XP(w? z)eiqGag~ib?M)&DpV;VhaBW9X_1rc;f|iiE{AYSIZD!rZDdq@hKV|v&9E$5a+m7GuUduJwR8U22L4?!EN&ffzefSz*fy2D4 z1Vv-P^Fp7_APb{vto!itaT^27&y6cfXK9+hq3#~L(Ya1~HE3=&-nWbDShuDs8@d%~ zsoL(EdA**y*U!8sZl7v4D+%B5xV_rmec1TAuggk`+FO6QYddp+0?y$&x$QEIEX876 z&GF)qI~PB<0OuBNZZEoCuAM^P*xnkH`(t3YcX!KQZ^hdisc-98-Pydf39B}zOz1Gb zj|*C4@#xO?V-%bKUwYhj@N#yyyX%|w9j32lFb+8`u|>T8zU+O!DT|vNq1C>entYzB zY5EXnNQd9>FKs#8-a475S^NhGUuZzx&t+>Fl!wezm1n3MQ3-Z&S@(DfC#o=I&#&jazv;^R$p<%;Q-n;OZi3O!notvPNE3 zOXBF@!!^b=!`DEM5-fq0(Vpd{438g)&PhBfDH!A208>$xpE zR&pzeyAS!&o{rPSS0=sF>58Tv>V37L-0j6ZaB_3WBb9G(80Gb+%hOA9;r2VSDV4a5 UB=6UCqpkn6sPGusQAuLfKV`+ulmGw# delta 789 zcmV+w1M2+14yy)`BYy(&Nkl>ewcv^b_ zCfX<4Lfmi>Zd|!xVNA4EXr1ZMGbwn8eip>k9criL)%hi# zcmK_^c%!lZ!5V9A9}VLy)&sRuT(kI%WoEU)u0h13HJJj)eUxy~CrL{6j} zn6Zy9Smt});t>i&%7G<@xXc>gGE6H0=>|6Q441gWcf3P8k$T_*404uVm}QtYBK5!$ z1DxYF^Sn(98Gp$K4swZQsvMw&oJc)zfKOTAItOVZBT^2`d729>@dJnHARyhqCU$X# zTg>o2T}0}EP4qLtZK@ohi%31NNFNidv&4IJkdb^~Ka(uNpK(PZ^}v3nn5W7Jo#e!3 z1vZfrTPWixPE%u+6Fg49<^=BM6?Rc1wm^wq##m;SkAEo>n;m$LX-?8haSP(ge8?I% zIYF7IN8l$+bBigu$%#71{}Kns=^?LIU@J$t&LS7+BqugmFQe30}8BO78#{Xk*IGVlo{a$%ZyRpgvbIte8e18PVpoKVrv4ShYy%zjbr~ZvPc)l zs8MB-K7RtXG7uhPl*)$4Zt{N+*U2H4?m9&uv7LcAI~b?J3Zt}>5%(aYi^D9j&Nw?M zZf_uDv@u478YgMJ$H;DuQek6U6Tx-|0%b<|i7MmwaLH~)m|>Mk`Y93jS0MB=Mui1N z=p-Wm=->!5EO4IPWW@a$2s@czo@L&pi<}^*jemp8ag&SeA-2=s{mV{M+Ys4KGp!6W z&kE-mppZr&6zSv)H5NIXQtRgiAX09a=JG}{>WF{*bp~BGm&5*(8nYderKJF z4AM-b9SDP*~b*8($gG9rP%BsBt4*9c5qBQRx+z&`+|O1WUM TGY;rE00000NkvXXu0mjf Date: Mon, 3 Apr 2017 21:44:29 +0800 Subject: [PATCH 04/26] upgrade the lib version --- WSProgressHUD.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WSProgressHUD.podspec b/WSProgressHUD.podspec index 75b9976..cce4e0d 100644 --- a/WSProgressHUD.podspec +++ b/WSProgressHUD.podspec @@ -16,7 +16,7 @@ Pod::Spec.new do |s| # s.name = "WSProgressHUD" - s.version = "1.1.1" + s.version = "1.1.2" s.summary = "WSProgressHUD is a beauful hud view for iPhone & iPad." s.description = <<-DESC @@ -34,7 +34,7 @@ Pod::Spec.new do |s| s.author = { "袁仕崇" => "xiaochong2154@163.com" } s.platform = :ios, "6.0" - s.source = { :git => "https://github.com/devSC/WSProgressHUD.git", :tag => "1.1.1" } + s.source = { :git => "https://github.com/devSC/WSProgressHUD.git", :tag => "1.1.2" } s.source_files = "WSProgressHUD/*" s.exclude_files = "Demo/Exclude" From 403680494d4101d4dc0c97335acccfb48aec62e3 Mon Sep 17 00:00:00 2001 From: Santiago Castro Date: Mon, 17 Apr 2017 22:31:53 -0300 Subject: [PATCH 05/26] Fix broken Markdown headings --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9801a64..05c61ac 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ This is a beauful hud view for iPhone & iPad ![Demo](https://raw.githubusercontent.com/devSC/WSProgressHUD/master/Demo/Demo.gif) -#Usage +# Usage To Download the project. Run the WSProgressHUD.xcodeproj in the demo directory. ``` objc @@ -95,7 +95,7 @@ Drag the WSProgressHUD/Demo/WSProgressHUD folder into your project. Then take care that WSProgressHUD.bundle is added to Targets->Build Phases->Copy Bundle Resources. Add the QuartzCore framework to your project. -##Thanks +## Thanks @Shimmering @SVProgressHUD From 95caae92613da1fd76f0431997364bc9bbd6ef1e Mon Sep 17 00:00:00 2001 From: Wilson Date: Wed, 7 Jun 2017 22:03:42 +0800 Subject: [PATCH 06/26] rename project --- .../project.pbxproj | 253 +++++++++++------- .../contents.xcworkspacedata | 7 - .../xcschemes/WSProgressHUD.xcscheme | 101 ------- Demo/WSProgressHUD/Info.plist | 24 ++ Demo/WSProgressHUD/WSProgressHUD.h | 112 +------- .../Base.lproj/LaunchScreen.xib | 11 +- 6 files changed, 194 insertions(+), 314 deletions(-) rename Demo/{WSProgressHUD.xcodeproj => WSProgressHUD-Demo.xcodeproj}/project.pbxproj (79%) delete mode 100644 Demo/WSProgressHUD.xcodeproj/project.xcworkspace/contents.xcworkspacedata delete mode 100644 Demo/WSProgressHUD.xcodeproj/xcshareddata/xcschemes/WSProgressHUD.xcscheme create mode 100644 Demo/WSProgressHUD/Info.plist diff --git a/Demo/WSProgressHUD.xcodeproj/project.pbxproj b/Demo/WSProgressHUD-Demo.xcodeproj/project.pbxproj similarity index 79% rename from Demo/WSProgressHUD.xcodeproj/project.pbxproj rename to Demo/WSProgressHUD-Demo.xcodeproj/project.pbxproj index cdee79f..33f9647 100644 --- a/Demo/WSProgressHUD.xcodeproj/project.pbxproj +++ b/Demo/WSProgressHUD-Demo.xcodeproj/project.pbxproj @@ -12,7 +12,6 @@ FE52FF271B648EDD00703FB5 /* MMMaterialDesignSpinner.m in Sources */ = {isa = PBXBuildFile; fileRef = FE52FF1F1B648EDD00703FB5 /* MMMaterialDesignSpinner.m */; }; FE52FF281B648EDD00703FB5 /* WSIndefiniteAnimationView.m in Sources */ = {isa = PBXBuildFile; fileRef = FE52FF211B648EDD00703FB5 /* WSIndefiniteAnimationView.m */; }; FE52FF291B648EDD00703FB5 /* WSProgressBundle.bundle in Resources */ = {isa = PBXBuildFile; fileRef = FE52FF221B648EDD00703FB5 /* WSProgressBundle.bundle */; }; - FE52FF2A1B648EDD00703FB5 /* WSProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = FE52FF241B648EDD00703FB5 /* WSProgressHUD.m */; }; FE52FF2E1B649B9300703FB5 /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = FE52FF2B1B649B9300703FB5 /* LICENSE */; }; FE52FF2F1B649B9300703FB5 /* README.md in Sources */ = {isa = PBXBuildFile; fileRef = FE52FF2C1B649B9300703FB5 /* README.md */; }; FE52FF301B649B9300703FB5 /* WSProgressHUD.podspec in Resources */ = {isa = PBXBuildFile; fileRef = FE52FF2D1B649B9300703FB5 /* WSProgressHUD.podspec */; }; @@ -28,19 +27,36 @@ FED429261B63E2A0002A5294 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = FED428F31B63E262002A5294 /* LaunchScreen.xib */; }; FED429271B63E2A0002A5294 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = FED428F51B63E262002A5294 /* Main.storyboard */; }; FED429281B63E2A0002A5294 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = FEDB74B91B593589003DDB79 /* Info.plist */; }; - FEDB74BB1B593589003DDB79 /* WSProgressHUDTests.m in Sources */ = {isa = PBXBuildFile; fileRef = FEDB74BA1B593589003DDB79 /* WSProgressHUDTests.m */; }; + FED85EC01EE83B680071B3A3 /* WSProgressHUD.h in Headers */ = {isa = PBXBuildFile; fileRef = FED85EBE1EE83B680071B3A3 /* WSProgressHUD.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FED85EC31EE83B680071B3A3 /* WSProgressHUD.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FED85EBC1EE83B680071B3A3 /* WSProgressHUD.framework */; }; + FED85EC41EE83B680071B3A3 /* WSProgressHUD.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = FED85EBC1EE83B680071B3A3 /* WSProgressHUD.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + FED85EC91EE83BC30071B3A3 /* WSProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = FE52FF241B648EDD00703FB5 /* WSProgressHUD.m */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - FEDB74B51B593589003DDB79 /* PBXContainerItemProxy */ = { + FED85EC11EE83B680071B3A3 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = FEDB74931B593589003DDB79 /* Project object */; proxyType = 1; - remoteGlobalIDString = FEDB749A1B593589003DDB79; + remoteGlobalIDString = FED85EBB1EE83B680071B3A3; remoteInfo = WSProgressHUD; }; /* End PBXContainerItemProxy section */ +/* Begin PBXCopyFilesBuildPhase section */ + FED85EC81EE83B680071B3A3 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + FED85EC41EE83B680071B3A3 /* WSProgressHUD.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ FE52FF181B648EDD00703FB5 /* FBShimmering-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "FBShimmering-Prefix.pch"; sourceTree = ""; }; FE52FF191B648EDD00703FB5 /* FBShimmering.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBShimmering.h; sourceTree = ""; }; @@ -74,24 +90,27 @@ FED429001B63E262002A5294 /* TabViewController2.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TabViewController2.m; sourceTree = ""; }; FED429011B63E262002A5294 /* ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; FED429021B63E262002A5294 /* ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; - FEDB749B1B593589003DDB79 /* WSProgressHUD.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WSProgressHUD.app; sourceTree = BUILT_PRODUCTS_DIR; }; - FEDB74B41B593589003DDB79 /* WSProgressHUDTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = WSProgressHUDTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + FED85EBC1EE83B680071B3A3 /* WSProgressHUD.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WSProgressHUD.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + FED85EBE1EE83B680071B3A3 /* WSProgressHUD.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WSProgressHUD.h; sourceTree = ""; }; + FED85EBF1EE83B680071B3A3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + FEDB749B1B593589003DDB79 /* WSProgressHUD-Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "WSProgressHUD-Demo.app"; sourceTree = BUILT_PRODUCTS_DIR; }; FEDB74B91B593589003DDB79 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; FEDB74BA1B593589003DDB79 /* WSProgressHUDTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WSProgressHUDTests.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - FEDB74981B593589003DDB79 /* Frameworks */ = { + FED85EB81EE83B680071B3A3 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; - FEDB74B11B593589003DDB79 /* Frameworks */ = { + FEDB74981B593589003DDB79 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FED85EC31EE83B680071B3A3 /* WSProgressHUD.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -157,6 +176,15 @@ path = WSProgressHUDDemo; sourceTree = ""; }; + FED85EBD1EE83B680071B3A3 /* WSProgressHUD */ = { + isa = PBXGroup; + children = ( + FED85EBE1EE83B680071B3A3 /* WSProgressHUD.h */, + FED85EBF1EE83B680071B3A3 /* Info.plist */, + ); + path = WSProgressHUD; + sourceTree = ""; + }; FEDB74921B593589003DDB79 = { isa = PBXGroup; children = ( @@ -166,6 +194,7 @@ FE52FF171B648EDD00703FB5 /* WSProgressHUD */, FED428F01B63E262002A5294 /* WSProgressHUDDemo */, FEDB74B71B593589003DDB79 /* WSProgressHUDTests */, + FED85EBD1EE83B680071B3A3 /* WSProgressHUD */, FEDB749C1B593589003DDB79 /* Products */, ); sourceTree = ""; @@ -173,8 +202,8 @@ FEDB749C1B593589003DDB79 /* Products */ = { isa = PBXGroup; children = ( - FEDB749B1B593589003DDB79 /* WSProgressHUD.app */, - FEDB74B41B593589003DDB79 /* WSProgressHUDTests.xctest */, + FEDB749B1B593589003DDB79 /* WSProgressHUD-Demo.app */, + FED85EBC1EE83B680071B3A3 /* WSProgressHUD.framework */, ); name = Products; sourceTree = ""; @@ -198,14 +227,26 @@ }; /* End PBXGroup section */ +/* Begin PBXHeadersBuildPhase section */ + FED85EB91EE83B680071B3A3 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + FED85EC01EE83B680071B3A3 /* WSProgressHUD.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + /* Begin PBXNativeTarget section */ - FEDB749A1B593589003DDB79 /* WSProgressHUD */ = { + FED85EBB1EE83B680071B3A3 /* WSProgressHUD */ = { isa = PBXNativeTarget; - buildConfigurationList = FEDB74BE1B593589003DDB79 /* Build configuration list for PBXNativeTarget "WSProgressHUD" */; + buildConfigurationList = FED85EC71EE83B680071B3A3 /* Build configuration list for PBXNativeTarget "WSProgressHUD" */; buildPhases = ( - FEDB74971B593589003DDB79 /* Sources */, - FEDB74981B593589003DDB79 /* Frameworks */, - FEDB74991B593589003DDB79 /* Resources */, + FED85EB71EE83B680071B3A3 /* Sources */, + FED85EB81EE83B680071B3A3 /* Frameworks */, + FED85EB91EE83B680071B3A3 /* Headers */, + FED85EBA1EE83B680071B3A3 /* Resources */, ); buildRules = ( ); @@ -213,26 +254,27 @@ ); name = WSProgressHUD; productName = WSProgressHUD; - productReference = FEDB749B1B593589003DDB79 /* WSProgressHUD.app */; - productType = "com.apple.product-type.application"; + productReference = FED85EBC1EE83B680071B3A3 /* WSProgressHUD.framework */; + productType = "com.apple.product-type.framework"; }; - FEDB74B31B593589003DDB79 /* WSProgressHUDTests */ = { + FEDB749A1B593589003DDB79 /* WSProgressHUD-Demo */ = { isa = PBXNativeTarget; - buildConfigurationList = FEDB74C11B593589003DDB79 /* Build configuration list for PBXNativeTarget "WSProgressHUDTests" */; + buildConfigurationList = FEDB74BE1B593589003DDB79 /* Build configuration list for PBXNativeTarget "WSProgressHUD-Demo" */; buildPhases = ( - FEDB74B01B593589003DDB79 /* Sources */, - FEDB74B11B593589003DDB79 /* Frameworks */, - FEDB74B21B593589003DDB79 /* Resources */, + FEDB74971B593589003DDB79 /* Sources */, + FEDB74981B593589003DDB79 /* Frameworks */, + FEDB74991B593589003DDB79 /* Resources */, + FED85EC81EE83B680071B3A3 /* Embed Frameworks */, ); buildRules = ( ); dependencies = ( - FEDB74B61B593589003DDB79 /* PBXTargetDependency */, + FED85EC21EE83B680071B3A3 /* PBXTargetDependency */, ); - name = WSProgressHUDTests; - productName = WSProgressHUDTests; - productReference = FEDB74B41B593589003DDB79 /* WSProgressHUDTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; + name = "WSProgressHUD-Demo"; + productName = WSProgressHUD; + productReference = FEDB749B1B593589003DDB79 /* WSProgressHUD-Demo.app */; + productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -243,16 +285,18 @@ LastUpgradeCheck = 0820; ORGANIZATIONNAME = "wilson-yuan"; TargetAttributes = { - FEDB749A1B593589003DDB79 = { - CreatedOnToolsVersion = 6.4; + FED85EBB1EE83B680071B3A3 = { + CreatedOnToolsVersion = 8.3.2; + DevelopmentTeam = 7222U544JL; + ProvisioningStyle = Automatic; }; - FEDB74B31B593589003DDB79 = { + FEDB749A1B593589003DDB79 = { CreatedOnToolsVersion = 6.4; - TestTargetID = FEDB749A1B593589003DDB79; + DevelopmentTeam = 7222U544JL; }; }; }; - buildConfigurationList = FEDB74961B593589003DDB79 /* Build configuration list for PBXProject "WSProgressHUD" */; + buildConfigurationList = FEDB74961B593589003DDB79 /* Build configuration list for PBXProject "WSProgressHUD-Demo" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -265,13 +309,20 @@ projectDirPath = ""; projectRoot = ""; targets = ( - FEDB749A1B593589003DDB79 /* WSProgressHUD */, - FEDB74B31B593589003DDB79 /* WSProgressHUDTests */, + FEDB749A1B593589003DDB79 /* WSProgressHUD-Demo */, + FED85EBB1EE83B680071B3A3 /* WSProgressHUD */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ + FED85EBA1EE83B680071B3A3 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; FEDB74991B593589003DDB79 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -289,23 +340,23 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - FEDB74B21B593589003DDB79 /* Resources */ = { - isa = PBXResourcesBuildPhase; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + FED85EB71EE83B680071B3A3 /* Sources */ = { + isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + FED85EC91EE83BC30071B3A3 /* WSProgressHUD.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ FEDB74971B593589003DDB79 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( FE52FF251B648EDD00703FB5 /* FBShimmeringLayer.m in Sources */, FED429031B63E262002A5294 /* AppDelegate.m in Sources */, - FE52FF2A1B648EDD00703FB5 /* WSProgressHUD.m in Sources */, FED4290E1B63E262002A5294 /* ViewController.m in Sources */, FE52FF261B648EDD00703FB5 /* FBShimmeringView.m in Sources */, FED4290D1B63E262002A5294 /* TabViewController2.m in Sources */, @@ -317,21 +368,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - FEDB74B01B593589003DDB79 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - FEDB74BB1B593589003DDB79 /* WSProgressHUDTests.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - FEDB74B61B593589003DDB79 /* PBXTargetDependency */ = { + FED85EC21EE83B680071B3A3 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = FEDB749A1B593589003DDB79 /* WSProgressHUD */; - targetProxy = FEDB74B51B593589003DDB79 /* PBXContainerItemProxy */; + target = FED85EBB1EE83B680071B3A3 /* WSProgressHUD */; + targetProxy = FED85EC11EE83B680071B3A3 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -355,6 +398,57 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + FED85EC51EE83B680071B3A3 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CODE_SIGN_IDENTITY = ""; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = dwarf; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = 7222U544JL; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = WSProgressHUD/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 10.3; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = Wilson.WSProgressHUD; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + FED85EC61EE83B680071B3A3 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CODE_SIGN_IDENTITY = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = 7222U544JL; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = WSProgressHUD/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 10.3; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = Wilson.WSProgressHUD; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; FEDB74BC1B593589003DDB79 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -446,6 +540,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + DEVELOPMENT_TEAM = 7222U544JL; INFOPLIST_FILE = "$(SRCROOT)/WSProgressHUDDemo/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -458,6 +553,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + DEVELOPMENT_TEAM = 7222U544JL; INFOPLIST_FILE = "$(SRCROOT)/WSProgressHUDDemo/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -466,68 +562,31 @@ }; name = Release; }; - FEDB74C21B593589003DDB79 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - INFOPLIST_FILE = WSProgressHUDTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "com.ysc.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/WSProgressHUD.app/WSProgressHUD"; - }; - name = Debug; - }; - FEDB74C31B593589003DDB79 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); - INFOPLIST_FILE = WSProgressHUDTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "com.ysc.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/WSProgressHUD.app/WSProgressHUD"; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - FEDB74961B593589003DDB79 /* Build configuration list for PBXProject "WSProgressHUD" */ = { + FED85EC71EE83B680071B3A3 /* Build configuration list for PBXNativeTarget "WSProgressHUD" */ = { isa = XCConfigurationList; buildConfigurations = ( - FEDB74BC1B593589003DDB79 /* Debug */, - FEDB74BD1B593589003DDB79 /* Release */, + FED85EC51EE83B680071B3A3 /* Debug */, + FED85EC61EE83B680071B3A3 /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; }; - FEDB74BE1B593589003DDB79 /* Build configuration list for PBXNativeTarget "WSProgressHUD" */ = { + FEDB74961B593589003DDB79 /* Build configuration list for PBXProject "WSProgressHUD-Demo" */ = { isa = XCConfigurationList; buildConfigurations = ( - FEDB74BF1B593589003DDB79 /* Debug */, - FEDB74C01B593589003DDB79 /* Release */, + FEDB74BC1B593589003DDB79 /* Debug */, + FEDB74BD1B593589003DDB79 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - FEDB74C11B593589003DDB79 /* Build configuration list for PBXNativeTarget "WSProgressHUDTests" */ = { + FEDB74BE1B593589003DDB79 /* Build configuration list for PBXNativeTarget "WSProgressHUD-Demo" */ = { isa = XCConfigurationList; buildConfigurations = ( - FEDB74C21B593589003DDB79 /* Debug */, - FEDB74C31B593589003DDB79 /* Release */, + FEDB74BF1B593589003DDB79 /* Debug */, + FEDB74C01B593589003DDB79 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/Demo/WSProgressHUD.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Demo/WSProgressHUD.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 919434a..0000000 --- a/Demo/WSProgressHUD.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/Demo/WSProgressHUD.xcodeproj/xcshareddata/xcschemes/WSProgressHUD.xcscheme b/Demo/WSProgressHUD.xcodeproj/xcshareddata/xcschemes/WSProgressHUD.xcscheme deleted file mode 100644 index 03eb349..0000000 --- a/Demo/WSProgressHUD.xcodeproj/xcshareddata/xcschemes/WSProgressHUD.xcscheme +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Demo/WSProgressHUD/Info.plist b/Demo/WSProgressHUD/Info.plist new file mode 100644 index 0000000..fbe1e6b --- /dev/null +++ b/Demo/WSProgressHUD/Info.plist @@ -0,0 +1,24 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + NSPrincipalClass + + + diff --git a/Demo/WSProgressHUD/WSProgressHUD.h b/Demo/WSProgressHUD/WSProgressHUD.h index 03a03db..f590ba2 100644 --- a/Demo/WSProgressHUD/WSProgressHUD.h +++ b/Demo/WSProgressHUD/WSProgressHUD.h @@ -2,115 +2,19 @@ // WSProgressHUD.h // WSProgressHUD // -// Created by Wilson-Yuan on 15/7/17. -// Copyright (c) 2015年 wilson-yuan. All rights reserved. +// Created by Wilson-Yuan on 2017/6/7. +// Copyright © 2017年 wilson-yuan. All rights reserved. // #import +#import "WSProgressHUD.h" -typedef NS_ENUM(NSInteger, WSProgressHUDMaskType) { - WSProgressHUDMaskTypeDefault, //allow user touch when hud display - WSProgressHUDMaskTypeClear, //dont allowed user touch - WSProgressHUDMaskTypeBlack, //dont allowed user touch - WSProgressHUDMaskTypeGradient //dont allowed user touch -}; +//! Project version number for WSProgressHUD. +FOUNDATION_EXPORT double WSProgressHUDVersionNumber; -typedef NS_ENUM(NSInteger, WSProgressHUDMaskWithoutType) { // - WSProgressHUDMaskWithoutDefault, // default mask all - WSProgressHUDMaskWithoutNavigation, //show mask without navigation - WSProgressHUDMaskWithoutTabbar, //show mask without tabbar - WSProgressHUDMaskWithoutNavAndTabbar, //show mask without tabbar and navigation -}; +//! Project version string for WSProgressHUD. +FOUNDATION_EXPORT const unsigned char WSProgressHUDVersionString[]; -typedef NS_ENUM(NSInteger, WSProgressHUDIndicatorStyle) { - WSProgressHUDIndicatorCustom, - WSProgressHUDIndicatorMMSpinner, - WSProgressHUDIndicatorSmallLight, - WSProgressHUDIndicatorGray, - WSProgressHUDIndicatorBigGray, -}; +// In this header, you should import all the public headers of your framework using statements like #import -@interface WSProgressHUD : UIView - -/*----------------------Show On the Window------------------------------*/ -+ (void)show; -+ (void)showWithMaskType: (WSProgressHUDMaskType)maskType; -+ (void)showWithMaskType: (WSProgressHUDMaskType)maskType maskWithout: (WSProgressHUDMaskWithoutType)withoutType; - - -+ (void)showWithStatus: (NSString *)string; -+ (void)showWithStatus: (NSString *)string maskType: (WSProgressHUDMaskType)maskType; -+ (void)showWithStatus: (NSString *)string maskType: (WSProgressHUDMaskType)maskType maskWithout: (WSProgressHUDMaskWithoutType)withoutType; - - -+ (void)showShimmeringString: (NSString *)string; -+ (void)showShimmeringString: (NSString *)string maskType: (WSProgressHUDMaskType)maskType; -+ (void)showShimmeringString: (NSString *)string maskType: (WSProgressHUDMaskType)maskType maskWithout: (WSProgressHUDMaskWithoutType)withoutType; - -+ (void)showProgress:(CGFloat)progress; -+ (void)showProgress:(CGFloat)progress maskType:(WSProgressHUDMaskType)maskType; -+ (void)showProgress:(CGFloat)progress maskType:(WSProgressHUDMaskType)maskType maskWithout: (WSProgressHUDMaskWithoutType)withoutType; - -+ (void)showProgress:(CGFloat)progress status:(NSString*)string; -+ (void)showProgress:(CGFloat)progress status:(NSString*)string maskType:(WSProgressHUDMaskType)maskType; -+ (void)showProgress:(CGFloat)progress status:(NSString*)string maskType:(WSProgressHUDMaskType)maskType maskWithout: (WSProgressHUDMaskWithoutType)withoutType; - -//imageSize is 28*28 -+ (void)showImage:(UIImage *)image status:(NSString *)title; -+ (void)showImage:(UIImage *)image status:(NSString *)title maskType: (WSProgressHUDMaskType)maskType; -+ (void)showImage:(UIImage *)image status:(NSString *)title maskType: (WSProgressHUDMaskType)maskType maskWithout: (WSProgressHUDMaskWithoutType)withoutType; - -+ (void)showSuccessWithStatus: (NSString *)string; -+ (void)showErrorWithStatus: (NSString *)string; -+ (void)dismiss; - -/*----------------------------Custom---------------------------------*/ - -+ (void)setProgressHUDIndicatorStyle: (WSProgressHUDIndicatorStyle)style; - -/// if you set WSProgressHUDIndicatorBigGray style you should set second prority indicator Style -+ (void)setSecondProrityIndicatorStyle: (WSProgressHUDIndicatorStyle)style; //Default is small SmallLight - -+ (void)setProgressHUDFont: (UIFont *)font; - -/*----------------------Show On the view------------------------------*/ - -- (instancetype)initWithView: (UIView *)view; -- (instancetype)initWithFrame:(CGRect)frame; - -- (void)show; -- (void)showWithMaskType: (WSProgressHUDMaskType)maskType; - -- (void)showWithString: (NSString *)string; -- (void)showWithString: (NSString *)string maskType: (WSProgressHUDMaskType)maskType; - - -- (void)showShimmeringString: (NSString *)string; -- (void)showShimmeringString: (NSString *)string maskType: (WSProgressHUDMaskType)maskType; - -- (void)showProgress:(CGFloat)progress; -- (void)showProgress:(CGFloat)progress maskType:(WSProgressHUDMaskType)maskType; - -- (void)showProgress:(CGFloat)progress status:(NSString*)status; -- (void)showProgress:(CGFloat)progress status:(NSString*)status maskType:(WSProgressHUDMaskType)maskType; - - - -- (void)showImage:(UIImage *)image status:(NSString *)title; -- (void)showImage:(UIImage *)image status:(NSString *)title maskType: (WSProgressHUDMaskType)maskType; - -- (void)showSuccessWithString: (NSString *)string; -- (void)showErrorWithString: (NSString *)string; - -- (void)dismiss; - -/*----------------------------Custom---------------------------------*/ -- (void)setProgressHUDIndicatorStyle: (WSProgressHUDIndicatorStyle)style; - -/// if you set WSProgressHUDIndicatorBigGray style you should set second prority indicator Style -- (void)setSecondProrityIndicatorStyle: (WSProgressHUDIndicatorStyle)style; //Default is small SmallLight - -- (void)setProgressHUDFont: (UIFont *)font; - -@end diff --git a/Demo/WSProgressHUDDemo/Base.lproj/LaunchScreen.xib b/Demo/WSProgressHUDDemo/Base.lproj/LaunchScreen.xib index f0f2891..ee68635 100644 --- a/Demo/WSProgressHUDDemo/Base.lproj/LaunchScreen.xib +++ b/Demo/WSProgressHUDDemo/Base.lproj/LaunchScreen.xib @@ -1,7 +1,8 @@ - - + + - + + @@ -17,14 +18,14 @@ -