25 Commits

Author SHA1 Message Date
Matej Bukovinski ac7a7a8c5e Version bump to 0.9.1. 2015-03-06 08:58:12 +01:00
Matej Bukovinski 61addd2405 Cancel any scheduled hideDelayed: calls. 2015-03-06 08:50:42 +01:00
Alsey Coleman Miller cca92d1156 updated enum to NS_ENUM
Better practice and Swift support
2015-03-06 08:29:16 +01:00
Matej Bukovinski 5603383161 Merge branch 'tests' 2015-03-06 08:14:52 +01:00
Matej Bukovinski fceb09cc8b Merge branch 'master' of github.com:jdg/MBProgressHUD 2015-03-06 07:47:39 +01:00
Matej Bukovinski dc534dcb31 Alternative solution for the orientation discrepancy between iOS 7 and iOS 8.
Also avoid sharedApplication usage on iOS 8+ targets.
2015-03-06 07:46:57 +01:00
Matej Bukovinski ab71afed92 Added a note regarding developer tools 2015-03-06 07:28:35 +01:00
Matej Bukovinski a9f8fe88eb Update README.mdown
Switched back to the official build indicator (now in vector form).
2015-02-08 15:29:12 +01:00
Matej Bukovinski 5612808fb1 Update README.mdown
Higher quality build shield.
2015-02-08 15:27:17 +01:00
Matej Bukovinski fe388ef956 Removed a nonexistent test target from the test scheme. 2015-02-08 15:22:52 +01:00
Matej Bukovinski f6689c1c26 Added a sample test. 2015-02-08 15:16:17 +01:00
Matej Bukovinski 69c58ea278 Don't compare apples and oranges. 2015-02-05 08:20:07 +01:00
Matej Bukovinski 6033a0b1ad Fix color inconsistencies. 2015-02-05 07:59:15 +01:00
Matej Bukovinski 3ac3f787eb Merge branch 'master' of github.com:jdg/MBProgressHUD 2014-12-22 18:52:41 +01:00
Matej Bukovinski f75901d9b0 Merge pull request #61 from bcylin/master
Update outdated .travis.yml
2014-12-22 18:30:11 +01:00
Ben fddc5dbcdf Update .travis.yml 2014-12-23 01:10:07 +08:00
Jonathan George 28c44be413 Bring back inline with MateJ's fork 2014-11-03 07:54:28 -06:00
Jonathan George c938b0f0f7 Bump to v1.0, prep for release 2014-11-03 07:48:21 -06:00
Jonathan George 23023d7983 Release 0.10 with iOS8 support 2014-11-03 07:46:33 -06:00
Jonathan George f316d247ae Merge pull request #243 from epacces/fix/ios8/hudorientation
Fix/ios8/hudorientation
2014-11-03 07:42:04 -06:00
Eriprando Pacces f4aaad3906 Fixes issue #233
last and hopefully :) working attempt
2014-09-30 02:07:26 +01:00
Eriprando Pacces 2f44900d0d [BUG][iOS8]
- Fixes the incorrect HUD orientation on applications linked against an SDK < 8.0 running on iOS 8.x
Issue #233
2014-09-22 21:31:37 +01:00
Matej Bukovinski fc1903ff44 Basic iPad support for the demo. 2014-08-18 18:15:57 +02:00
Matej Bukovinski 2216078a1a Merge pull request #225 from Zyphrax/master
Set removeFromSuperViewOnHide to YES for convenience methods
2014-08-18 18:03:46 +02:00
Yvo van Beek cb56321f40 Set removeFromSuperViewOnHide to YES for convenience methods 2014-08-18 21:35:11 +10:00
11 changed files with 327 additions and 47 deletions
+4 -1
View File
@@ -1 +1,4 @@
language: objective-c
language: objective-c
xcode_workspace: MBProgressHUD.xcworkspace
xcode_scheme: HudDemo
xcode_sdk: iphonesimulator
+183 -7
View File
@@ -26,10 +26,22 @@
D286A7321518C53500E13FB8 /* HudDemoViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D286A7341518C53500E13FB8 /* HudDemoViewController.xib */; };
D286A7361518C53C00E13FB8 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = D286A7381518C53C00E13FB8 /* MainWindow.xib */; };
D286A76D1518CA9F00E13FB8 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D286A76C1518CA9F00E13FB8 /* CoreGraphics.framework */; };
D28CBB321A87A45A0052DCEC /* HudTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D28CBB311A87A45A0052DCEC /* HudTests.m */; };
D28CBB381A87A4A10052DCEC /* MBProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = D22F7D800F85241C00550BB3 /* MBProgressHUD.m */; };
D2A6FD1D13ABC5A200BFE4C9 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D2A6FD1C13ABC5A200BFE4C9 /* Default@2x.png */; };
D2F88CD6115E9F7F00E6DB82 /* 37x-Checkmark.png in Resources */ = {isa = PBXBuildFile; fileRef = D2F88CD5115E9F7F00E6DB82 /* 37x-Checkmark.png */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
D28CBB331A87A45A0052DCEC /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
remoteGlobalIDString = 1D6058900D05DD3D006BFB54;
remoteInfo = HudDemo;
};
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
1D3623240D0F684500981E51 /* HudDemoAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HudDemoAppDelegate.h; sourceTree = "<group>"; };
@@ -48,7 +60,7 @@
D22568E61780AA77008D5939 /* Icon-Small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-Small.png"; path = "Images/Icon-Small.png"; sourceTree = "<group>"; };
D22568E71780AA77008D5939 /* Icon-Small@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-Small@2x.png"; path = "Images/Icon-Small@2x.png"; sourceTree = "<group>"; };
D22F7D7F0F85241C00550BB3 /* MBProgressHUD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MBProgressHUD.h; path = ../MBProgressHUD.h; sourceTree = SOURCE_ROOT; };
D22F7D800F85241C00550BB3 /* MBProgressHUD.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MBProgressHUD.m; path = ../../MBProgressHUD.m; sourceTree = "<group>"; };
D22F7D800F85241C00550BB3 /* MBProgressHUD.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MBProgressHUD.m; path = ../MBProgressHUD.m; sourceTree = "<group>"; };
D277FDB211FC834200304321 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = Images/Default.png; sourceTree = "<group>"; };
D277FDB711FC877E00304321 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon.png; path = Images/Icon.png; sourceTree = "<group>"; };
D277FDB811FC877E00304321 /* Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon@2x.png"; path = "Images/Icon@2x.png"; sourceTree = "<group>"; };
@@ -56,6 +68,9 @@
D286A7331518C53500E13FB8 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/HudDemoViewController.xib; sourceTree = "<group>"; };
D286A7371518C53C00E13FB8 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainWindow.xib; sourceTree = "<group>"; };
D286A76C1518CA9F00E13FB8 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
D28CBB2D1A87A45A0052DCEC /* HudTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = HudTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
D28CBB301A87A45A0052DCEC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
D28CBB311A87A45A0052DCEC /* HudTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HudTests.m; sourceTree = "<group>"; };
D2A6FD1C13ABC5A200BFE4C9 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default@2x.png"; path = "Images/Default@2x.png"; sourceTree = "<group>"; };
D2F88CD5115E9F7F00E6DB82 /* 37x-Checkmark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "37x-Checkmark.png"; path = "Images/37x-Checkmark.png"; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -71,19 +86,27 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
D28CBB2A1A87A45A0052DCEC /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
080E96DDFE201D6D7F000001 /* Classes */ = {
080E96DDFE201D6D7F000001 /* HudDemo */ = {
isa = PBXGroup;
children = (
D22F7D7F0F85241C00550BB3 /* MBProgressHUD.h */,
D22F7D800F85241C00550BB3 /* MBProgressHUD.m */,
1D3623240D0F684500981E51 /* HudDemoAppDelegate.h */,
1D3623250D0F684500981E51 /* HudDemoAppDelegate.m */,
28D7ACF60DDB3853001CB0EB /* HudDemoViewController.h */,
28D7ACF70DDB3853001CB0EB /* HudDemoViewController.m */,
29B97315FDCFA39411CA2CEA /* Other Sources */,
29B97317FDCFA39411CA2CEA /* Resources */,
);
name = HudDemo;
path = Classes;
sourceTree = "<group>";
};
@@ -91,6 +114,7 @@
isa = PBXGroup;
children = (
1D6058910D05DD3D006BFB54 /* HudDemo.app */,
D28CBB2D1A87A45A0052DCEC /* HudTests.xctest */,
);
name = Products;
sourceTree = "<group>";
@@ -98,9 +122,9 @@
29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
isa = PBXGroup;
children = (
080E96DDFE201D6D7F000001 /* Classes */,
29B97315FDCFA39411CA2CEA /* Other Sources */,
29B97317FDCFA39411CA2CEA /* Resources */,
080E96DDFE201D6D7F000001 /* HudDemo */,
D28CBB2E1A87A45A0052DCEC /* HudTests */,
D28CBB391A87A6B00052DCEC /* MBProgressHUD */,
29B97323FDCFA39411CA2CEA /* Frameworks */,
19C28FACFE9D520D11CA2CBB /* Products */,
);
@@ -114,6 +138,7 @@
29B97316FDCFA39411CA2CEA /* main.m */,
);
name = "Other Sources";
path = ..;
sourceTree = "<group>";
};
29B97317FDCFA39411CA2CEA /* Resources */ = {
@@ -124,6 +149,7 @@
8D1107310486CEB800E47090 /* Info.plist */,
);
name = Resources;
path = ..;
sourceTree = "<group>";
};
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
@@ -164,6 +190,32 @@
name = UI;
sourceTree = "<group>";
};
D28CBB2E1A87A45A0052DCEC /* HudTests */ = {
isa = PBXGroup;
children = (
D28CBB311A87A45A0052DCEC /* HudTests.m */,
D28CBB2F1A87A45A0052DCEC /* Supporting Files */,
);
path = HudTests;
sourceTree = "<group>";
};
D28CBB2F1A87A45A0052DCEC /* Supporting Files */ = {
isa = PBXGroup;
children = (
D28CBB301A87A45A0052DCEC /* Info.plist */,
);
name = "Supporting Files";
sourceTree = "<group>";
};
D28CBB391A87A6B00052DCEC /* MBProgressHUD */ = {
isa = PBXGroup;
children = (
D22F7D7F0F85241C00550BB3 /* MBProgressHUD.h */,
D22F7D800F85241C00550BB3 /* MBProgressHUD.m */,
);
name = MBProgressHUD;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
@@ -184,6 +236,24 @@
productReference = 1D6058910D05DD3D006BFB54 /* HudDemo.app */;
productType = "com.apple.product-type.application";
};
D28CBB2C1A87A45A0052DCEC /* HudTests */ = {
isa = PBXNativeTarget;
buildConfigurationList = D28CBB351A87A45A0052DCEC /* Build configuration list for PBXNativeTarget "HudTests" */;
buildPhases = (
D28CBB291A87A45A0052DCEC /* Sources */,
D28CBB2A1A87A45A0052DCEC /* Frameworks */,
D28CBB2B1A87A45A0052DCEC /* Resources */,
);
buildRules = (
);
dependencies = (
D28CBB341A87A45A0052DCEC /* PBXTargetDependency */,
);
name = HudTests;
productName = HudTests;
productReference = D28CBB2D1A87A45A0052DCEC /* HudTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
/* End PBXNativeTarget section */
/* Begin PBXProject section */
@@ -193,6 +263,12 @@
CLASSPREFIX = MB;
LastUpgradeCheck = 0600;
ORGANIZATIONNAME = "Matej Bukovinski";
TargetAttributes = {
D28CBB2C1A87A45A0052DCEC = {
CreatedOnToolsVersion = 6.1.1;
TestTargetID = 1D6058900D05DD3D006BFB54;
};
};
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "HudDemo" */;
compatibilityVersion = "Xcode 3.2";
@@ -209,6 +285,7 @@
projectRoot = "";
targets = (
1D6058900D05DD3D006BFB54 /* HudDemo */,
D28CBB2C1A87A45A0052DCEC /* HudTests */,
);
};
/* End PBXProject section */
@@ -235,6 +312,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
D28CBB2B1A87A45A0052DCEC /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
@@ -249,8 +333,25 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
D28CBB291A87A45A0052DCEC /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
D28CBB321A87A45A0052DCEC /* HudTests.m in Sources */,
D28CBB381A87A4A10052DCEC /* MBProgressHUD.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
D28CBB341A87A45A0052DCEC /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 1D6058900D05DD3D006BFB54 /* HudDemo */;
targetProxy = D28CBB331A87A45A0052DCEC /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
/* Begin PBXVariantGroup section */
D286A7341518C53500E13FB8 /* HudDemoViewController.xib */ = {
isa = PBXVariantGroup;
@@ -282,6 +383,7 @@
GCC_PREFIX_HEADER = HudDemo_Prefix.pch;
INFOPLIST_FILE = Info.plist;
PRODUCT_NAME = HudDemo;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
};
@@ -295,6 +397,7 @@
INFOPLIST_FILE = Info.plist;
PRODUCT_NAME = HudDemo;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
};
@@ -349,6 +452,71 @@
};
name = Release;
};
D28CBB361A87A45A0052DCEC /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
BUNDLE_LOADER = "$(TEST_HOST)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
COPY_PHASE_STRIP = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
);
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
INFOPLIST_FILE = HudTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MTL_ENABLE_DEBUG_INFO = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/HudDemo.app/HudDemo";
};
name = Debug;
};
D28CBB371A87A45A0052DCEC /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
BUNDLE_LOADER = "$(TEST_HOST)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
COPY_PHASE_STRIP = YES;
ENABLE_NS_ASSERTIONS = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
);
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
INFOPLIST_FILE = HudTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_NAME = "$(TARGET_NAME)";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/HudDemo.app/HudDemo";
VALIDATE_PRODUCT = YES;
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
@@ -370,6 +538,14 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
D28CBB351A87A45A0052DCEC /* Build configuration list for PBXNativeTarget "HudTests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
D28CBB361A87A45A0052DCEC /* Debug */,
D28CBB371A87A45A0052DCEC /* Release */,
);
defaultConfigurationIsVisible = 0;
};
/* End XCConfigurationList section */
};
rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
@@ -20,19 +20,52 @@
ReferencedContainer = "container:HudDemo.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D28CBB2C1A87A45A0052DCEC"
BuildableName = "HudTests.xctest"
BlueprintName = "HudTests"
ReferencedContainer = "container:HudDemo.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D28CBB2C1A87A45A0052DCEC"
BuildableName = "HudTests.xctest"
BlueprintName = "HudTests"
ReferencedContainer = "container:HudDemo.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
BuildableName = "HudDemo.app"
BlueprintName = "HudDemo"
ReferencedContainer = "container:HudDemo.xcodeproj">
</BuildableReference>
</MacroExpansion>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
displayScaleIsEnabled = "NO"
displayScale = "1.00"
launchStyle = "0"
+42
View File
@@ -0,0 +1,42 @@
//
// HudTests.m
// HudTests
//
// Created by Matej Bukovinski on 8. 02. 15.
// Copyright (c) 2015 Matej Bukovinski. All rights reserved.
//
#import <UIKit/UIKit.h>
#import <XCTest/XCTest.h>
#import "MBProgressHUD.h"
@interface HudTests : XCTestCase
@property (nonatomic, strong) MBProgressHUD *hud;
@property (nonatomic, strong) UIView *view;
@end
@implementation HudTests
- (void)setUp {
[super setUp];
self.view = [[UIView alloc] init];
self.view.bounds = [[UIScreen mainScreen] bounds];
self.hud = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
}
- (void)tearDown {
self.hud = nil;
self.view = nil;
[super tearDown];
}
- (void)testThatHUDExists {
XCTAssertNotNil(self.hud, @"Should be able to create a new HUD instance");
}
@end
+24
View File
@@ -0,0 +1,24 @@
<?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>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>com.bukovinski.$(PRODUCT_NAME:rfc1034identifier)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1</string>
</dict>
</plist>
+1 -1
View File
@@ -1,4 +1,4 @@
Copyright (c) 2013 Matej Bukovinski
Copyright (c) 2009-2015 Matej Bukovinski
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
+6 -6
View File
@@ -1,12 +1,12 @@
//
// MBProgressHUD.h
// Version 0.9
// Version 0.9.1
// Created by Matej Bukovinski on 2.4.09.
//
// This code is distributed under the terms and conditions of the MIT license.
// Copyright (c) 2013 Matej Bukovinski
// Copyright (c) 2009-2015 Matej Bukovinski
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
@@ -33,7 +33,7 @@
@protocol MBProgressHUDDelegate;
typedef enum {
typedef NS_ENUM(NSInteger, MBProgressHUDMode) {
/** Progress is shown using an UIActivityIndicatorView. This is the default. */
MBProgressHUDModeIndeterminate,
/** Progress is shown using a round, pie-chart like, progress view. */
@@ -46,16 +46,16 @@ typedef enum {
MBProgressHUDModeCustomView,
/** Shows only labels */
MBProgressHUDModeText
} MBProgressHUDMode;
};
typedef enum {
typedef NS_ENUM(NSInteger, MBProgressHUDAnimation) {
/** Opacity animation */
MBProgressHUDAnimationFade,
/** Opacity + scale animation */
MBProgressHUDAnimationZoom,
MBProgressHUDAnimationZoomOut = MBProgressHUDAnimationZoom,
MBProgressHUDAnimationZoomIn
} MBProgressHUDAnimation;
};
#ifndef MB_INSTANCETYPE
+25 -26
View File
@@ -1,6 +1,6 @@
//
// MBProgressHUD.m
// Version 0.9
// Version 0.9.1
// Created by Matej Bukovinski on 2.4.09.
//
@@ -70,7 +70,6 @@ static const CGFloat kDetailsLabelFontSize = 12.f;
@property (atomic, MB_STRONG) NSTimer *minShowTimer;
@property (atomic, MB_STRONG) NSDate *showStarted;
@end
@@ -115,6 +114,7 @@ static const CGFloat kDetailsLabelFontSize = 12.f;
+ (MB_INSTANCETYPE)showHUDAddedTo:(UIView *)view animated:(BOOL)animated {
MBProgressHUD *hud = [[self alloc] initWithView:view];
hud.removeFromSuperViewOnHide = YES;
[view addSubview:hud];
[hud show:animated];
return MB_AUTORELEASE(hud);
@@ -253,7 +253,6 @@ static const CGFloat kDetailsLabelFontSize = 12.f;
}
// ... otherwise show the HUD imediately
else {
[self setNeedsDisplay];
[self showUsingAnimation:useAnimation];
}
}
@@ -287,7 +286,6 @@ static const CGFloat kDetailsLabelFontSize = 12.f;
- (void)handleGraceTimer:(NSTimer *)theTimer {
// Show the HUD only if the task is still running
if (taskInProgress) {
[self setNeedsDisplay];
[self showUsingAnimation:useAnimation];
}
}
@@ -298,21 +296,17 @@ static const CGFloat kDetailsLabelFontSize = 12.f;
#pragma mark - View Hierrarchy
- (BOOL)shouldPerformOrientationTransform {
BOOL isPreiOS8 = NSFoundationVersionNumber < kCFCoreFoundationVersionNumber_iOS_8_0;
// prior to iOS8 code needs to take care of rotation if it is being added to the window
return isPreiOS8 && [self.superview isKindOfClass:[UIWindow class]];
}
- (void)didMoveToSuperview {
if ([self shouldPerformOrientationTransform]) {
[self setTransformForCurrentOrientation:NO];
}
[self updateForCurrentOrientationAnimated:NO];
}
#pragma mark - Internal show & hide operations
- (void)showUsingAnimation:(BOOL)animated {
// Cancel any scheduled hideDelayed: calls
[NSObject cancelPreviousPerformRequestsWithTarget:self];
[self setNeedsDisplay];
if (animated && animationType == MBProgressHUDAnimationZoomIn) {
self.transform = CGAffineTransformConcat(rotationTransform, CGAffineTransformMakeScale(0.5f, 0.5f));
} else if (animated && animationType == MBProgressHUDAnimationZoomOut) {
@@ -733,21 +727,25 @@ static const CGFloat kDetailsLabelFontSize = 12.f;
UIView *superview = self.superview;
if (!superview) {
return;
} else if ([self shouldPerformOrientationTransform]) {
[self setTransformForCurrentOrientation:YES];
} else {
self.frame = self.superview.bounds;
[self setNeedsDisplay];
[self updateForCurrentOrientationAnimated:YES];
}
}
- (void)setTransformForCurrentOrientation:(BOOL)animated {
// Stay in sync with the superview
if (self.superview) {
self.bounds = self.superview.bounds;
[self setNeedsDisplay];
}
- (void)updateForCurrentOrientationAnimated:(BOOL)animated {
// Stay in sync with the superview in any case
if (self.superview) {
self.bounds = self.superview.bounds;
[self setNeedsDisplay];
}
// Not needed on iOS 8+, compile out when the deployment target allows,
// to avoid sharedApplication problems on extension targets
#if __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
// Only needed pre iOS 7 when added to a window
BOOL iOS8OrLater = kCFCoreFoundationVersionNumber >= kCFCoreFoundationVersionNumber_iOS_8_0;
if (iOS8OrLater || ![self.superview isKindOfClass:[UIWindow class]]) return;
UIInterfaceOrientation orientation = [UIApplication sharedApplication].statusBarOrientation;
CGFloat radians = 0;
if (UIInterfaceOrientationIsLandscape(orientation)) {
@@ -769,6 +767,7 @@ static const CGFloat kDetailsLabelFontSize = 12.f;
if (animated) {
[UIView commitAnimations];
}
#endif
}
@end
@@ -815,7 +814,7 @@ static const CGFloat kDetailsLabelFontSize = 12.f;
if (_annular) {
// Draw background
BOOL isPreiOS7 = NSFoundationVersionNumber < kCFCoreFoundationVersionNumber_iOS_7_0;
BOOL isPreiOS7 = kCFCoreFoundationVersionNumber < kCFCoreFoundationVersionNumber_iOS_7_0;
CGFloat lineWidth = isPreiOS7 ? 5.f : 2.f;
UIBezierPath *processBackgroundPath = [UIBezierPath bezierPath];
processBackgroundPath.lineWidth = lineWidth;
@@ -847,7 +846,7 @@ static const CGFloat kDetailsLabelFontSize = 12.f;
CGFloat radius = (allRect.size.width - 4) / 2;
CGFloat startAngle = - ((float)M_PI / 2); // 90 degrees
CGFloat endAngle = (self.progress * 2 * (float)M_PI) + startAngle;
CGContextSetRGBFillColor(context, 1.0f, 1.0f, 1.0f, 1.0f); // white
[_progressTintColor setFill];
CGContextMoveToPoint(context, center.x, center.y);
CGContextAddArc(context, center.x, center.y, radius, startAngle, endAngle, 0);
CGContextClosePath(context);
+1 -1
View File
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "MBProgressHUD"
s.version = "0.9"
s.version = "0.9.1"
s.summary = "An iOS activity indicator view."
s.description = <<-DESC
MBProgressHUD is an iOS drop-in class that displays a translucent HUD
+3
View File
@@ -13,4 +13,7 @@
<FileRef
location = "group:LICENSE">
</FileRef>
<FileRef
location = "group:MBProgressHUD.podspec">
</FileRef>
</Workspace>
+3 -3
View File
@@ -1,4 +1,4 @@
# MBProgressHUD [![Build Status](https://travis-ci.org/matej/MBProgressHUD.png)](https://travis-ci.org/matej/MBProgressHUD)
# MBProgressHUD [![Build Status](https://travis-ci.org/matej/MBProgressHUD.svg?branch=master)](https://travis-ci.org/matej/MBProgressHUD)
MBProgressHUD is an iOS drop-in class that displays a translucent HUD with an indicator and/or labels while work is being done in a background thread. The HUD is meant as a replacement for the undocumented, private UIKit UIProgressHUD with some additional features.
@@ -18,7 +18,7 @@ MBProgressHUD works on any iOS version and is compatible with both ARC and non-A
* UIKit.framework
* CoreGraphics.framework
You will need LLVM 3.0 or later in order to build MBProgressHUD.
You will need the latest developer tools in order to build MBProgressHUD. Old Xcode versions might work, but compatibility will not be explicitly maintained.
## Adding MBProgressHUD to your project
@@ -26,7 +26,7 @@ You will need LLVM 3.0 or later in order to build MBProgressHUD.
[CocoaPods](http://cocoapods.org) is the recommended way to add MBProgressHUD to your project.
1. Add a pod entry for MBProgressHUD to your Podfile `pod 'MBProgressHUD', '~> 0.8'`
1. Add a pod entry for MBProgressHUD to your Podfile `pod 'MBProgressHUD', '~> 0.9.1'`
2. Install the pod(s) by running `pod install`.
3. Include MBProgressHUD wherever you need it with `#import "MBProgressHUD.h"`.