diff --git a/JGProgressHUD Tests/JGProgressHUD Tests.xcodeproj/project.pbxproj b/JGProgressHUD Tests/JGProgressHUD Tests.xcodeproj/project.pbxproj index 27a25d8..22b6053 100644 --- a/JGProgressHUD Tests/JGProgressHUD Tests.xcodeproj/project.pbxproj +++ b/JGProgressHUD Tests/JGProgressHUD Tests.xcodeproj/project.pbxproj @@ -7,7 +7,14 @@ objects = { /* Begin PBXBuildFile section */ + 6B12977D1AF1248500EECA97 /* JGProgressHUD.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B12977A1AF1245200EECA97 /* JGProgressHUD.framework */; }; + 6B12977E1AF1248500EECA97 /* JGProgressHUD.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 6B12977A1AF1245200EECA97 /* JGProgressHUD.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 6B1297821AF124BD00EECA97 /* JGAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BC018D7197BF28100DA4C49 /* JGAppDelegate.m */; }; + 6B1297831AF124BD00EECA97 /* JGViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BC018E0197BF28100DA4C49 /* JGViewController.m */; }; 6B20E7D7197FC22E00488D60 /* libJGProgressHUD.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B20E7D4197FC22000488D60 /* libJGProgressHUD.a */; }; + 6B48F0D31AF12789006EDEB5 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BC018D3197BF28100DA4C49 /* main.m */; }; + 6B48F0DA1AF12991006EDEB5 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6BC018E2197BF28100DA4C49 /* Images.xcassets */; }; + 6B48F0DC1AF129A0006EDEB5 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6BC018D0197BF28100DA4C49 /* InfoPlist.strings */; }; 6B60B26719A3C09900ED1A4E /* JGProgressHUD Resources.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 6B60B24D19A3B41600ED1A4E /* JGProgressHUD Resources.bundle */; }; 6BC018C8197BF28100DA4C49 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6BC018C7197BF28100DA4C49 /* Foundation.framework */; }; 6BC018CA197BF28100DA4C49 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6BC018C9197BF28100DA4C49 /* CoreGraphics.framework */; }; @@ -20,6 +27,20 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 6B1297791AF1245200EECA97 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 6B20E7CF197FC22000488D60 /* JGProgressHUD.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 6BF7DC5A1AEFCFD9000A0AE0; + remoteInfo = "JGProgressHUD Framework"; + }; + 6B12977F1AF1248500EECA97 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 6B20E7CF197FC22000488D60 /* JGProgressHUD.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 6BF7DC591AEFCFD9000A0AE0; + remoteInfo = "JGProgressHUD Framework"; + }; 6B20E7D3197FC22000488D60 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 6B20E7CF197FC22000488D60 /* JGProgressHUD.xcodeproj */; @@ -50,7 +71,22 @@ }; /* End PBXContainerItemProxy section */ +/* Begin PBXCopyFilesBuildPhase section */ + 6B1297811AF1248500EECA97 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 6B12977E1AF1248500EECA97 /* JGProgressHUD.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ + 6B1297541AF1245200EECA97 /* JGProgressHUD Tests - Framework.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "JGProgressHUD Tests - Framework.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 6B20E7CF197FC22000488D60 /* JGProgressHUD.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = JGProgressHUD.xcodeproj; path = ../../JGProgressHUD/JGProgressHUD.xcodeproj; sourceTree = ""; }; 6BC018C4197BF28100DA4C49 /* JGProgressHUD Tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "JGProgressHUD Tests.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 6BC018C7197BF28100DA4C49 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; @@ -69,6 +105,14 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 6B1297511AF1245200EECA97 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 6B12977D1AF1248500EECA97 /* JGProgressHUD.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 6BC018C1197BF28100DA4C49 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -88,6 +132,7 @@ children = ( 6B20E7D4197FC22000488D60 /* libJGProgressHUD.a */, 6B60B24D19A3B41600ED1A4E /* JGProgressHUD Resources.bundle */, + 6B12977A1AF1245200EECA97 /* JGProgressHUD.framework */, ); name = Products; sourceTree = ""; @@ -105,6 +150,7 @@ isa = PBXGroup; children = ( 6BC018C4197BF28100DA4C49 /* JGProgressHUD Tests.app */, + 6B1297541AF1245200EECA97 /* JGProgressHUD Tests - Framework.app */, ); name = Products; sourceTree = ""; @@ -123,11 +169,11 @@ 6BC018CD197BF28100DA4C49 /* JGProgressHUD Tests */ = { isa = PBXGroup; children = ( + 6B20E7CF197FC22000488D60 /* JGProgressHUD.xcodeproj */, 6BC018D6197BF28100DA4C49 /* JGAppDelegate.h */, 6BC018D7197BF28100DA4C49 /* JGAppDelegate.m */, 6BC018DF197BF28100DA4C49 /* JGViewController.h */, 6BC018E0197BF28100DA4C49 /* JGViewController.m */, - 6B20E7CF197FC22000488D60 /* JGProgressHUD.xcodeproj */, 6BC018E2197BF28100DA4C49 /* Images.xcassets */, 6BC018CE197BF28100DA4C49 /* Supporting Files */, ); @@ -148,6 +194,25 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ + 6B1297531AF1245200EECA97 /* JGProgressHUD Tests - Framework */ = { + isa = PBXNativeTarget; + buildConfigurationList = 6B12977B1AF1245200EECA97 /* Build configuration list for PBXNativeTarget "JGProgressHUD Tests - Framework" */; + buildPhases = ( + 6B1297501AF1245200EECA97 /* Sources */, + 6B1297511AF1245200EECA97 /* Frameworks */, + 6B1297521AF1245200EECA97 /* Resources */, + 6B1297811AF1248500EECA97 /* Embed Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 6B1297801AF1248500EECA97 /* PBXTargetDependency */, + ); + name = "JGProgressHUD Tests - Framework"; + productName = "JGProgressHUD Tests - Framework"; + productReference = 6B1297541AF1245200EECA97 /* JGProgressHUD Tests - Framework.app */; + productType = "com.apple.product-type.application"; + }; 6BC018C3197BF28100DA4C49 /* JGProgressHUD Tests */ = { isa = PBXNativeTarget; buildConfigurationList = 6BC018F9197BF28100DA4C49 /* Build configuration list for PBXNativeTarget "JGProgressHUD Tests" */; @@ -176,6 +241,11 @@ CLASSPREFIX = JG; LastUpgradeCheck = 0510; ORGANIZATIONNAME = "Jonas Gessner"; + TargetAttributes = { + 6B1297531AF1245200EECA97 = { + CreatedOnToolsVersion = 6.4; + }; + }; }; buildConfigurationList = 6BC018BF197BF28100DA4C49 /* Build configuration list for PBXProject "JGProgressHUD Tests" */; compatibilityVersion = "Xcode 3.2"; @@ -197,11 +267,19 @@ projectRoot = ""; targets = ( 6BC018C3197BF28100DA4C49 /* JGProgressHUD Tests */, + 6B1297531AF1245200EECA97 /* JGProgressHUD Tests - Framework */, ); }; /* End PBXProject section */ /* Begin PBXReferenceProxy section */ + 6B12977A1AF1245200EECA97 /* JGProgressHUD.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = JGProgressHUD.framework; + remoteRef = 6B1297791AF1245200EECA97 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 6B20E7D4197FC22000488D60 /* libJGProgressHUD.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -219,6 +297,15 @@ /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ + 6B1297521AF1245200EECA97 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 6B48F0DA1AF12991006EDEB5 /* Images.xcassets in Resources */, + 6B48F0DC1AF129A0006EDEB5 /* InfoPlist.strings in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 6BC018C2197BF28100DA4C49 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -232,6 +319,16 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 6B1297501AF1245200EECA97 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 6B48F0D31AF12789006EDEB5 /* main.m in Sources */, + 6B1297821AF124BD00EECA97 /* JGAppDelegate.m in Sources */, + 6B1297831AF124BD00EECA97 /* JGViewController.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 6BC018C0197BF28100DA4C49 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -245,6 +342,11 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + 6B1297801AF1248500EECA97 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "JGProgressHUD Framework"; + targetProxy = 6B12977F1AF1248500EECA97 /* PBXContainerItemProxy */; + }; 6B20E7D6197FC22A00488D60 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = JGProgressHUD; @@ -269,6 +371,49 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + 6B1297741AF1245200EECA97 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + CLANG_WARN_UNREACHABLE_CODE = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + "JGProgressHUD_Framework=1", + ); + INFOPLIST_FILE = "$(SRCROOT)/JGProgressHUD Tests/JGProgressHUD Tests-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = YES; + OTHER_LDFLAGS = "-ObjC"; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 6B1297751AF1245200EECA97 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + CLANG_WARN_UNREACHABLE_CODE = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; + GCC_PREPROCESSOR_DEFINITIONS = "JGProgressHUD_Framework=1"; + INFOPLIST_FILE = "$(SRCROOT)/JGProgressHUD Tests/JGProgressHUD Tests-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = NO; + OTHER_LDFLAGS = "-ObjC"; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; 6BC018F7197BF28100DA4C49 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -350,6 +495,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "JGProgressHUD Tests/JGProgressHUD Tests-Prefix.pch"; INFOPLIST_FILE = "JGProgressHUD Tests/JGProgressHUD Tests-Info.plist"; + OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; USER_HEADER_SEARCH_PATHS = ""; WRAPPER_EXTENSION = app; @@ -365,6 +511,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "JGProgressHUD Tests/JGProgressHUD Tests-Prefix.pch"; INFOPLIST_FILE = "JGProgressHUD Tests/JGProgressHUD Tests-Info.plist"; + OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; USER_HEADER_SEARCH_PATHS = ""; WRAPPER_EXTENSION = app; @@ -374,6 +521,15 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 6B12977B1AF1245200EECA97 /* Build configuration list for PBXNativeTarget "JGProgressHUD Tests - Framework" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 6B1297741AF1245200EECA97 /* Debug */, + 6B1297751AF1245200EECA97 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 6BC018BF197BF28100DA4C49 /* Build configuration list for PBXProject "JGProgressHUD Tests" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/JGProgressHUD Tests/JGProgressHUD Tests/Images.xcassets/AppIcon.appiconset/Contents.json b/JGProgressHUD Tests/JGProgressHUD Tests/Images.xcassets/AppIcon.appiconset/Contents.json index 91bf9c1..b10503e 100644 --- a/JGProgressHUD Tests/JGProgressHUD Tests/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/JGProgressHUD Tests/JGProgressHUD Tests/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,20 +1,50 @@ { "images" : [ + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "1x" + }, { "idiom" : "iphone", "size" : "29x29", "scale" : "2x" }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "3x" + }, { "idiom" : "iphone", "size" : "40x40", "scale" : "2x" }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "57x57", + "scale" : "1x" + }, + { + "idiom" : "iphone", + "size" : "57x57", + "scale" : "2x" + }, { "idiom" : "iphone", "size" : "60x60", "scale" : "2x" }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "3x" + }, { "idiom" : "ipad", "size" : "29x29", @@ -35,6 +65,26 @@ "size" : "40x40", "scale" : "2x" }, + { + "idiom" : "ipad", + "size" : "50x50", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "50x50", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "72x72", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "72x72", + "scale" : "2x" + }, { "idiom" : "ipad", "size" : "76x76", @@ -49,5 +99,8 @@ "info" : { "version" : 1, "author" : "xcode" + }, + "properties" : { + "pre-rendered" : true } } \ No newline at end of file diff --git a/JGProgressHUD Tests/JGProgressHUD Tests/Images.xcassets/LaunchImage.launchimage/Contents.json b/JGProgressHUD Tests/JGProgressHUD Tests/Images.xcassets/LaunchImage.launchimage/Contents.json index 6f870a4..f1a1488 100644 --- a/JGProgressHUD Tests/JGProgressHUD Tests/Images.xcassets/LaunchImage.launchimage/Contents.json +++ b/JGProgressHUD Tests/JGProgressHUD Tests/Images.xcassets/LaunchImage.launchimage/Contents.json @@ -1,18 +1,46 @@ { "images" : [ { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "736h", + "filename" : "Default-736h@3x.png", + "minimum-system-version" : "8.0", "orientation" : "portrait", + "scale" : "3x" + }, + { + "orientation" : "landscape", "idiom" : "iphone", "extent" : "full-screen", - "minimum-system-version" : "7.0", + "minimum-system-version" : "8.0", + "subtype" : "736h", + "scale" : "3x" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "667h", + "filename" : "Default-667h@2x-1.png", + "minimum-system-version" : "8.0", + "orientation" : "portrait", "scale" : "2x" }, { "orientation" : "portrait", "idiom" : "iphone", - "subtype" : "retina4", "extent" : "full-screen", "minimum-system-version" : "7.0", + "filename" : "Default@2x Kopie.png", + "scale" : "2x" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "retina4", + "filename" : "Default-568h@2x.png", + "minimum-system-version" : "7.0", + "orientation" : "portrait", "scale" : "2x" }, { @@ -42,6 +70,75 @@ "extent" : "full-screen", "minimum-system-version" : "7.0", "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "filename" : "Default@2x.png", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "filename" : "Default-568h@2x Kopie.png", + "subtype" : "retina4", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "full-screen", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "full-screen", + "scale" : "2x" } ], "info" : { diff --git a/JGProgressHUD Tests/JGProgressHUD Tests/Images.xcassets/LaunchImage.launchimage/Default-568h@2x Kopie.png b/JGProgressHUD Tests/JGProgressHUD Tests/Images.xcassets/LaunchImage.launchimage/Default-568h@2x Kopie.png new file mode 100644 index 0000000..0891b7a Binary files /dev/null and b/JGProgressHUD Tests/JGProgressHUD Tests/Images.xcassets/LaunchImage.launchimage/Default-568h@2x Kopie.png differ diff --git a/JGProgressHUD Tests/JGProgressHUD Tests/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png b/JGProgressHUD Tests/JGProgressHUD Tests/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png new file mode 100644 index 0000000..0891b7a Binary files /dev/null and b/JGProgressHUD Tests/JGProgressHUD Tests/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png differ diff --git a/JGProgressHUD Tests/JGProgressHUD Tests/Images.xcassets/LaunchImage.launchimage/Default-667h@2x-1.png b/JGProgressHUD Tests/JGProgressHUD Tests/Images.xcassets/LaunchImage.launchimage/Default-667h@2x-1.png new file mode 100644 index 0000000..85467c9 Binary files /dev/null and b/JGProgressHUD Tests/JGProgressHUD Tests/Images.xcassets/LaunchImage.launchimage/Default-667h@2x-1.png differ diff --git a/JGProgressHUD Tests/JGProgressHUD Tests/Images.xcassets/LaunchImage.launchimage/Default-736h@3x.png b/JGProgressHUD Tests/JGProgressHUD Tests/Images.xcassets/LaunchImage.launchimage/Default-736h@3x.png new file mode 100644 index 0000000..83f92aa Binary files /dev/null and b/JGProgressHUD Tests/JGProgressHUD Tests/Images.xcassets/LaunchImage.launchimage/Default-736h@3x.png differ diff --git a/JGProgressHUD Tests/JGProgressHUD Tests/Images.xcassets/LaunchImage.launchimage/Default@2x Kopie.png b/JGProgressHUD Tests/JGProgressHUD Tests/Images.xcassets/LaunchImage.launchimage/Default@2x Kopie.png new file mode 100644 index 0000000..b1a0d95 Binary files /dev/null and b/JGProgressHUD Tests/JGProgressHUD Tests/Images.xcassets/LaunchImage.launchimage/Default@2x Kopie.png differ diff --git a/JGProgressHUD Tests/JGProgressHUD Tests/Images.xcassets/LaunchImage.launchimage/Default@2x.png b/JGProgressHUD Tests/JGProgressHUD Tests/Images.xcassets/LaunchImage.launchimage/Default@2x.png new file mode 100644 index 0000000..b1a0d95 Binary files /dev/null and b/JGProgressHUD Tests/JGProgressHUD Tests/Images.xcassets/LaunchImage.launchimage/Default@2x.png differ diff --git a/JGProgressHUD Tests/JGProgressHUD Tests/JGViewController.m b/JGProgressHUD Tests/JGProgressHUD Tests/JGViewController.m index fccf2d6..b589fe4 100644 --- a/JGProgressHUD Tests/JGProgressHUD Tests/JGViewController.m +++ b/JGProgressHUD Tests/JGProgressHUD Tests/JGViewController.m @@ -7,13 +7,12 @@ // #import "JGViewController.h" + +#if JGProgressHUD_Framework +#import +#else #import "JGProgressHUD.h" -#import "JGProgressHUDPieIndicatorView.h" -#import "JGProgressHUDRingIndicatorView.h" -#import "JGProgressHUDFadeZoomAnimation.h" -#import "JGProgressHUDSuccessIndicatorView.h" -#import "JGProgressHUDErrorIndicatorView.h" -#import "JGProgressHUDIndeterminateIndicatorView.h" +#endif #ifndef kCFCoreFoundationVersionNumber_iOS_7_0 #define kCFCoreFoundationVersionNumber_iOS_7_0 838.00 diff --git a/JGProgressHUD.podspec b/JGProgressHUD.podspec index 7249102..81dd644 100644 --- a/JGProgressHUD.podspec +++ b/JGProgressHUD.podspec @@ -1,14 +1,14 @@ Pod::Spec.new do |s| s.name = "JGProgressHUD" - s.version = "1.2.4" + s.version = "1.2.5" s.summary = "Powerful and modern progress HUD for iOS." s.homepage = "https://github.com/JonasGessner/JGProgressHUD" s.license = { :type => "MIT", :file => "LICENSE.txt" } s.author = "Jonas Gessner" s.social_media_url = "http://twitter.com/JonasGessner" s.platform = :ios, "5.0" - s.source = { :git => "https://github.com/JonasGessner/JGProgressHUD.git", :tag => "v1.2.4" } + s.source = { :git => "https://github.com/JonasGessner/JGProgressHUD.git", :tag => "v1.2.5" } s.source_files = "JGProgressHUD/JGProgressHUD/*.{h,m}" s.resources = "JGProgressHUD/JGProgressHUD/JGProgressHUD Resources.bundle" s.frameworks = "Foundation", "UIKit", "QuartzCore" diff --git a/JGProgressHUD/JGProgressHUD Framework/Info.plist b/JGProgressHUD/JGProgressHUD Framework/Info.plist new file mode 100644 index 0000000..6808f7b --- /dev/null +++ b/JGProgressHUD/JGProgressHUD Framework/Info.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + de.j-gessner.$(PRODUCT_NAME:rfc1034identifier) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.2.5 + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + NSPrincipalClass + JGProgressHUD + + diff --git a/JGProgressHUD/JGProgressHUD.xcodeproj/project.pbxproj b/JGProgressHUD/JGProgressHUD.xcodeproj/project.pbxproj index 14a259e..6a53fde 100644 --- a/JGProgressHUD/JGProgressHUD.xcodeproj/project.pbxproj +++ b/JGProgressHUD/JGProgressHUD.xcodeproj/project.pbxproj @@ -26,6 +26,12 @@ 6BC018B3197B2ABF00DA4C49 /* JGProgressHUDRingIndicatorView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BC018AB197B2ABF00DA4C49 /* JGProgressHUDRingIndicatorView.m */; }; 6BC018B7197B2BC700DA4C49 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6BC018B6197B2BC700DA4C49 /* UIKit.framework */; }; 6BC018B9197B2BCB00DA4C49 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6BC018B8197B2BCB00DA4C49 /* QuartzCore.framework */; }; + 6BD1FA1D1AF1216800139990 /* jg_hud_error.png in Resources */ = {isa = PBXBuildFile; fileRef = 6B60B27119A3C34D00ED1A4E /* jg_hud_error.png */; }; + 6BD1FA1E1AF1216800139990 /* jg_hud_error@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6B60B27219A3C34D00ED1A4E /* jg_hud_error@2x.png */; }; + 6BD1FA1F1AF1216800139990 /* jg_hud_error@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6B29118C19CA0D4500E93DF9 /* jg_hud_error@3x.png */; }; + 6BD1FA201AF1216800139990 /* jg_hud_success.png in Resources */ = {isa = PBXBuildFile; fileRef = 6B60B27319A3C34D00ED1A4E /* jg_hud_success.png */; }; + 6BD1FA211AF1216800139990 /* jg_hud_success@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6B60B27419A3C34D00ED1A4E /* jg_hud_success@2x.png */; }; + 6BD1FA221AF1216800139990 /* jg_hud_success@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6B29118D19CA0D4500E93DF9 /* jg_hud_success@3x.png */; }; 6BF7DC4B1AEE6D39000A0AE0 /* JGProgressHUD.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6BC0189C197B2ABF00DA4C49 /* JGProgressHUD.h */; }; 6BF7DC4C1AEE6D39000A0AE0 /* JGProgressHUDAnimation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6BC0189E197B2ABF00DA4C49 /* JGProgressHUDAnimation.h */; }; 6BF7DC4D1AEE6D39000A0AE0 /* JGProgressHUDFadeAnimation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6BC018A0197B2ABF00DA4C49 /* JGProgressHUDFadeAnimation.h */; }; @@ -36,6 +42,31 @@ 6BF7DC521AEE6D39000A0AE0 /* JGProgressHUDRingIndicatorView.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6BC018AA197B2ABF00DA4C49 /* JGProgressHUDRingIndicatorView.h */; }; 6BF7DC531AEE6D39000A0AE0 /* JGProgressHUDSuccessIndicatorView.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6B60B25219A3B78B00ED1A4E /* JGProgressHUDSuccessIndicatorView.h */; }; 6BF7DC541AEE6D39000A0AE0 /* JGProgressHUDErrorIndicatorView.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6B60B25519A3BC3C00ED1A4E /* JGProgressHUDErrorIndicatorView.h */; }; + 6BF7DC731AEFD02A000A0AE0 /* JGProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BC0189D197B2ABF00DA4C49 /* JGProgressHUD.m */; }; + 6BF7DC741AEFD02A000A0AE0 /* JGProgressHUDAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BC0189F197B2ABF00DA4C49 /* JGProgressHUDAnimation.m */; }; + 6BF7DC751AEFD02A000A0AE0 /* JGProgressHUDFadeAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BC018A1197B2ABF00DA4C49 /* JGProgressHUDFadeAnimation.m */; }; + 6BF7DC761AEFD02A000A0AE0 /* JGProgressHUDFadeZoomAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BC018A3197B2ABF00DA4C49 /* JGProgressHUDFadeZoomAnimation.m */; }; + 6BF7DC771AEFD02A000A0AE0 /* JGProgressHUDIndicatorView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BC018A7197B2ABF00DA4C49 /* JGProgressHUDIndicatorView.m */; }; + 6BF7DC781AEFD02A000A0AE0 /* JGProgressHUDIndeterminateIndicatorView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BC018A5197B2ABF00DA4C49 /* JGProgressHUDIndeterminateIndicatorView.m */; }; + 6BF7DC791AEFD02A000A0AE0 /* JGProgressHUDPieIndicatorView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BC018A9197B2ABF00DA4C49 /* JGProgressHUDPieIndicatorView.m */; }; + 6BF7DC7A1AEFD02A000A0AE0 /* JGProgressHUDRingIndicatorView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BC018AB197B2ABF00DA4C49 /* JGProgressHUDRingIndicatorView.m */; }; + 6BF7DC7B1AEFD02A000A0AE0 /* JGProgressHUDSuccessIndicatorView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B60B25319A3B78B00ED1A4E /* JGProgressHUDSuccessIndicatorView.m */; }; + 6BF7DC7C1AEFD02A000A0AE0 /* JGProgressHUDErrorIndicatorView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B60B25619A3BC3C00ED1A4E /* JGProgressHUDErrorIndicatorView.m */; }; + 6BF7DC7D1AEFD045000A0AE0 /* JGProgressHUD.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BC0189C197B2ABF00DA4C49 /* JGProgressHUD.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6BF7DC7E1AEFD045000A0AE0 /* JGProgressHUDAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BC0189E197B2ABF00DA4C49 /* JGProgressHUDAnimation.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6BF7DC7F1AEFD045000A0AE0 /* JGProgressHUDFadeAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BC018A0197B2ABF00DA4C49 /* JGProgressHUDFadeAnimation.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6BF7DC801AEFD045000A0AE0 /* JGProgressHUDFadeZoomAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BC018A2197B2ABF00DA4C49 /* JGProgressHUDFadeZoomAnimation.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6BF7DC811AEFD045000A0AE0 /* JGProgressHUDIndicatorView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BC018A6197B2ABF00DA4C49 /* JGProgressHUDIndicatorView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6BF7DC821AEFD045000A0AE0 /* JGProgressHUDIndeterminateIndicatorView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BC018A4197B2ABF00DA4C49 /* JGProgressHUDIndeterminateIndicatorView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6BF7DC831AEFD045000A0AE0 /* JGProgressHUDPieIndicatorView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BC018A8197B2ABF00DA4C49 /* JGProgressHUDPieIndicatorView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6BF7DC841AEFD045000A0AE0 /* JGProgressHUDRingIndicatorView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BC018AA197B2ABF00DA4C49 /* JGProgressHUDRingIndicatorView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6BF7DC851AEFD045000A0AE0 /* JGProgressHUDSuccessIndicatorView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B60B25219A3B78B00ED1A4E /* JGProgressHUDSuccessIndicatorView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6BF7DC861AEFD045000A0AE0 /* JGProgressHUDErrorIndicatorView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B60B25519A3BC3C00ED1A4E /* JGProgressHUDErrorIndicatorView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6BF7DC871AEFD05B000A0AE0 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6BC018B6197B2BC700DA4C49 /* UIKit.framework */; }; + 6BF7DC8A1AEFD066000A0AE0 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6BC01876197B2AA500DA4C49 /* Foundation.framework */; }; + 6BF7DC8B1AEFD072000A0AE0 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6BC018B8197B2BCB00DA4C49 /* QuartzCore.framework */; }; + 6BF7DC931AEFD35D000A0AE0 /* JGProgressHUD-Defines.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BF7DC921AEFD245000A0AE0 /* JGProgressHUD-Defines.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6BF7DC941AEFD366000A0AE0 /* JGProgressHUD-Defines.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6BF7DC921AEFD245000A0AE0 /* JGProgressHUD-Defines.h */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -50,6 +81,7 @@ 6BF7DC4D1AEE6D39000A0AE0 /* JGProgressHUDFadeAnimation.h in CopyFiles */, 6BF7DC4E1AEE6D39000A0AE0 /* JGProgressHUDFadeZoomAnimation.h in CopyFiles */, 6BF7DC4F1AEE6D39000A0AE0 /* JGProgressHUDIndicatorView.h in CopyFiles */, + 6BF7DC941AEFD366000A0AE0 /* JGProgressHUD-Defines.h in CopyFiles */, 6BF7DC501AEE6D39000A0AE0 /* JGProgressHUDIndeterminateIndicatorView.h in CopyFiles */, 6BF7DC511AEE6D39000A0AE0 /* JGProgressHUDPieIndicatorView.h in CopyFiles */, 6BF7DC521AEE6D39000A0AE0 /* JGProgressHUDRingIndicatorView.h in CopyFiles */, @@ -94,6 +126,10 @@ 6BC018B6197B2BC700DA4C49 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 6BC018B8197B2BCB00DA4C49 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; 6BD009001991033600DE219C /* JGProgressHUD-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "JGProgressHUD-Prefix.pch"; sourceTree = SOURCE_ROOT; }; + 6BF7DC5A1AEFCFD9000A0AE0 /* JGProgressHUD.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JGProgressHUD.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 6BF7DC5D1AEFCFD9000A0AE0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 6BF7DC881AEFD063000A0AE0 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; + 6BF7DC921AEFD245000A0AE0 /* JGProgressHUD-Defines.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "JGProgressHUD-Defines.h"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -114,6 +150,16 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 6BF7DC561AEFCFD9000A0AE0 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 6BF7DC8B1AEFD072000A0AE0 /* QuartzCore.framework in Frameworks */, + 6BF7DC8A1AEFD066000A0AE0 /* Foundation.framework in Frameworks */, + 6BF7DC871AEFD05B000A0AE0 /* UIKit.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -135,6 +181,7 @@ children = ( 6BC01878197B2AA500DA4C49 /* JGProgressHUD */, 6BC01879197B2AA500DA4C49 /* Supporting Files */, + 6BF7DC5B1AEFCFD9000A0AE0 /* JGProgressHUD Framework */, 6BC01875197B2AA500DA4C49 /* Frameworks */, 6BC01874197B2AA500DA4C49 /* Products */, ); @@ -145,6 +192,7 @@ children = ( 6BC01873197B2AA500DA4C49 /* libJGProgressHUD.a */, 6B60B24019A3B3C500ED1A4E /* JGProgressHUD Resources.bundle */, + 6BF7DC5A1AEFCFD9000A0AE0 /* JGProgressHUD.framework */, ); name = Products; sourceTree = ""; @@ -152,6 +200,7 @@ 6BC01875197B2AA500DA4C49 /* Frameworks */ = { isa = PBXGroup; children = ( + 6BF7DC881AEFD063000A0AE0 /* CoreGraphics.framework */, 6BC018B8197B2BCB00DA4C49 /* QuartzCore.framework */, 6BC018B6197B2BC700DA4C49 /* UIKit.framework */, 6BC01876197B2AA500DA4C49 /* Foundation.framework */, @@ -165,6 +214,7 @@ children = ( 6BC0189C197B2ABF00DA4C49 /* JGProgressHUD.h */, 6BC0189D197B2ABF00DA4C49 /* JGProgressHUD.m */, + 6BF7DC921AEFD245000A0AE0 /* JGProgressHUD-Defines.h */, 6BC018B4197B2AC300DA4C49 /* Animations */, 6BC018B5197B2ACB00DA4C49 /* Progress Indicators */, 6B60B26819A3C20100ED1A4E /* Resources */, @@ -213,8 +263,45 @@ name = "Progress Indicators"; sourceTree = ""; }; + 6BF7DC5B1AEFCFD9000A0AE0 /* JGProgressHUD Framework */ = { + isa = PBXGroup; + children = ( + 6BF7DC5C1AEFCFD9000A0AE0 /* Supporting Files */, + ); + path = "JGProgressHUD Framework"; + sourceTree = ""; + }; + 6BF7DC5C1AEFCFD9000A0AE0 /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 6BF7DC5D1AEFCFD9000A0AE0 /* Info.plist */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; /* End PBXGroup section */ +/* Begin PBXHeadersBuildPhase section */ + 6BF7DC571AEFCFD9000A0AE0 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 6BF7DC7D1AEFD045000A0AE0 /* JGProgressHUD.h in Headers */, + 6BF7DC7E1AEFD045000A0AE0 /* JGProgressHUDAnimation.h in Headers */, + 6BF7DC7F1AEFD045000A0AE0 /* JGProgressHUDFadeAnimation.h in Headers */, + 6BF7DC801AEFD045000A0AE0 /* JGProgressHUDFadeZoomAnimation.h in Headers */, + 6BF7DC811AEFD045000A0AE0 /* JGProgressHUDIndicatorView.h in Headers */, + 6BF7DC821AEFD045000A0AE0 /* JGProgressHUDIndeterminateIndicatorView.h in Headers */, + 6BF7DC831AEFD045000A0AE0 /* JGProgressHUDPieIndicatorView.h in Headers */, + 6BF7DC841AEFD045000A0AE0 /* JGProgressHUDRingIndicatorView.h in Headers */, + 6BF7DC851AEFD045000A0AE0 /* JGProgressHUDSuccessIndicatorView.h in Headers */, + 6BF7DC861AEFD045000A0AE0 /* JGProgressHUDErrorIndicatorView.h in Headers */, + 6BF7DC931AEFD35D000A0AE0 /* JGProgressHUD-Defines.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + /* Begin PBXNativeTarget section */ 6B60B23F19A3B3C500ED1A4E /* JGProgressHUD Resources */ = { isa = PBXNativeTarget; @@ -250,6 +337,24 @@ productReference = 6BC01873197B2AA500DA4C49 /* libJGProgressHUD.a */; productType = "com.apple.product-type.library.static"; }; + 6BF7DC591AEFCFD9000A0AE0 /* JGProgressHUD Framework */ = { + isa = PBXNativeTarget; + buildConfigurationList = 6BF7DC6D1AEFCFD9000A0AE0 /* Build configuration list for PBXNativeTarget "JGProgressHUD Framework" */; + buildPhases = ( + 6BF7DC551AEFCFD9000A0AE0 /* Sources */, + 6BF7DC561AEFCFD9000A0AE0 /* Frameworks */, + 6BF7DC571AEFCFD9000A0AE0 /* Headers */, + 6BF7DC581AEFCFD9000A0AE0 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "JGProgressHUD Framework"; + productName = "JGProgressHUD Framework"; + productReference = 6BF7DC5A1AEFCFD9000A0AE0 /* JGProgressHUD.framework */; + productType = "com.apple.product-type.framework"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -262,6 +367,9 @@ 6B60B23F19A3B3C500ED1A4E = { CreatedOnToolsVersion = 6.0; }; + 6BF7DC591AEFCFD9000A0AE0 = { + CreatedOnToolsVersion = 6.3; + }; }; }; buildConfigurationList = 6BC0186E197B2AA500DA4C49 /* Build configuration list for PBXProject "JGProgressHUD" */; @@ -278,6 +386,7 @@ targets = ( 6BC01872197B2AA500DA4C49 /* JGProgressHUD */, 6B60B23F19A3B3C500ED1A4E /* JGProgressHUD Resources */, + 6BF7DC591AEFCFD9000A0AE0 /* JGProgressHUD Framework */, ); }; /* End PBXProject section */ @@ -296,6 +405,19 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 6BF7DC581AEFCFD9000A0AE0 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 6BD1FA1D1AF1216800139990 /* jg_hud_error.png in Resources */, + 6BD1FA1E1AF1216800139990 /* jg_hud_error@2x.png in Resources */, + 6BD1FA1F1AF1216800139990 /* jg_hud_error@3x.png in Resources */, + 6BD1FA201AF1216800139990 /* jg_hud_success.png in Resources */, + 6BD1FA211AF1216800139990 /* jg_hud_success@2x.png in Resources */, + 6BD1FA221AF1216800139990 /* jg_hud_success@3x.png in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -323,6 +445,23 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 6BF7DC551AEFCFD9000A0AE0 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 6BF7DC731AEFD02A000A0AE0 /* JGProgressHUD.m in Sources */, + 6BF7DC741AEFD02A000A0AE0 /* JGProgressHUDAnimation.m in Sources */, + 6BF7DC751AEFD02A000A0AE0 /* JGProgressHUDFadeAnimation.m in Sources */, + 6BF7DC761AEFD02A000A0AE0 /* JGProgressHUDFadeZoomAnimation.m in Sources */, + 6BF7DC771AEFD02A000A0AE0 /* JGProgressHUDIndicatorView.m in Sources */, + 6BF7DC781AEFD02A000A0AE0 /* JGProgressHUDIndeterminateIndicatorView.m in Sources */, + 6BF7DC791AEFD02A000A0AE0 /* JGProgressHUDPieIndicatorView.m in Sources */, + 6BF7DC7A1AEFD02A000A0AE0 /* JGProgressHUDRingIndicatorView.m in Sources */, + 6BF7DC7B1AEFD02A000A0AE0 /* JGProgressHUDSuccessIndicatorView.m in Sources */, + 6BF7DC7C1AEFD02A000A0AE0 /* JGProgressHUDErrorIndicatorView.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ @@ -549,6 +688,65 @@ }; name = Release; }; + 6BF7DC6E1AEFCFD9000A0AE0 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_WARN_UNREACHABLE_CODE = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + "JGProgressHUD_Framework=1", + ); + INFOPLIST_FILE = "JGProgressHUD Framework/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_NAME = JGProgressHUD; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + 6BF7DC6F1AEFCFD9000A0AE0 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_WARN_UNREACHABLE_CODE = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; + GCC_PREPROCESSOR_DEFINITIONS = "JGProgressHUD_Framework=1"; + INFOPLIST_FILE = "JGProgressHUD Framework/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = JGProgressHUD; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -579,6 +777,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 6BF7DC6D1AEFCFD9000A0AE0 /* Build configuration list for PBXNativeTarget "JGProgressHUD Framework" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 6BF7DC6E1AEFCFD9000A0AE0 /* Debug */, + 6BF7DC6F1AEFCFD9000A0AE0 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; /* End XCConfigurationList section */ }; rootObject = 6BC0186B197B2AA500DA4C49 /* Project object */; diff --git a/JGProgressHUD/JGProgressHUD/JGProgressHUD-Defines.h b/JGProgressHUD/JGProgressHUD/JGProgressHUD-Defines.h new file mode 100644 index 0000000..3887d70 --- /dev/null +++ b/JGProgressHUD/JGProgressHUD/JGProgressHUD-Defines.h @@ -0,0 +1,64 @@ +// +// JGProgressHUD-Defines.h +// JGProgressHUD +// +// Created by Jonas Gessner on 28.04.15. +// Copyright (c) 2015 Jonas Gessner. All rights reserved. +// + +#import + +/** + Positions of the HUD. + */ +typedef NS_ENUM(NSUInteger, JGProgressHUDPosition) { + /** Center position. */ + JGProgressHUDPositionCenter = 0, + /** Top left position. */ + JGProgressHUDPositionTopLeft, + /** Top center position. */ + JGProgressHUDPositionTopCenter, + /** Top right position. */ + JGProgressHUDPositionTopRight, + /** Center left position. */ + JGProgressHUDPositionCenterLeft, + /** Center right position. */ + JGProgressHUDPositionCenterRight, + /** Bottom left position. */ + JGProgressHUDPositionBottomLeft, + /** Bottom center position. */ + JGProgressHUDPositionBottomCenter, + /** Bottom right position. */ + JGProgressHUDPositionBottomRight +}; + +/** + Appearance styles of the HUD. + */ +typedef NS_ENUM(NSUInteger, JGProgressHUDStyle) { + /** Extra light HUD with dark elements. */ + JGProgressHUDStyleExtraLight = 0, + /** Light HUD with dark elemets. */ + JGProgressHUDStyleLight, + /** Dark HUD with light elements. */ + JGProgressHUDStyleDark +}; + +/** + Interaction types. + */ +typedef NS_ENUM(NSUInteger, JGProgressHUDInteractionType) { + /** Block all touches. No interaction behin the HUD is possible. */ + JGProgressHUDInteractionTypeBlockAllTouches = 0, + /** Block touches on the HUD view. */ + JGProgressHUDInteractionTypeBlockTouchesOnHUDView, + /** Block no touches. */ + JGProgressHUDInteractionTypeBlockNoTouches +}; + +/** + Macro for safe floating point comparison (for internal use in JGProgressHUD). + */ +#ifndef fequal +#define fequal(a,b) (fabs((a) - (b)) < FLT_EPSILON) +#endif diff --git a/JGProgressHUD/JGProgressHUD/JGProgressHUD.h b/JGProgressHUD/JGProgressHUD/JGProgressHUD.h index b114f0c..d5dbfd7 100755 --- a/JGProgressHUD/JGProgressHUD/JGProgressHUD.h +++ b/JGProgressHUD/JGProgressHUD/JGProgressHUD.h @@ -9,56 +9,18 @@ #import #import -#import "JGProgressHUDIndicatorView.h" +#import "JGProgressHUD-Defines.h" + #import "JGProgressHUDAnimation.h" +#import "JGProgressHUDFadeAnimation.h" +#import "JGProgressHUDFadeZoomAnimation.h" -/** - Positions of the HUD. - */ -typedef NS_ENUM(NSUInteger, JGProgressHUDPosition) { - /** Center position. */ - JGProgressHUDPositionCenter = 0, - /** Top left position. */ - JGProgressHUDPositionTopLeft, - /** Top center position. */ - JGProgressHUDPositionTopCenter, - /** Top right position. */ - JGProgressHUDPositionTopRight, - /** Center left position. */ - JGProgressHUDPositionCenterLeft, - /** Center right position. */ - JGProgressHUDPositionCenterRight, - /** Bottom left position. */ - JGProgressHUDPositionBottomLeft, - /** Bottom center position. */ - JGProgressHUDPositionBottomCenter, - /** Bottom right position. */ - JGProgressHUDPositionBottomRight -}; - -/** - Appearance styles of the HUD. - */ -typedef NS_ENUM(NSUInteger, JGProgressHUDStyle) { - /** Extra light HUD with dark elements. */ - JGProgressHUDStyleExtraLight = 0, - /** Light HUD with dark elemets. */ - JGProgressHUDStyleLight, - /** Dark HUD with light elements. */ - JGProgressHUDStyleDark -}; - -/** - Interaction types. - */ -typedef NS_ENUM(NSUInteger, JGProgressHUDInteractionType) { - /** Block all touches. No interaction behin the HUD is possible. */ - JGProgressHUDInteractionTypeBlockAllTouches = 0, - /** Block touches on the HUD view. */ - JGProgressHUDInteractionTypeBlockTouchesOnHUDView, - /** Block no touches. */ - JGProgressHUDInteractionTypeBlockNoTouches -}; +#import "JGProgressHUDIndicatorView.h" +#import "JGProgressHUDErrorIndicatorView.h" +#import "JGProgressHUDSuccessIndicatorView.h" +#import "JGProgressHUDRingIndicatorView.h" +#import "JGProgressHUDPieIndicatorView.h" +#import "JGProgressHUDIndeterminateIndicatorView.h" @class JGProgressHUD; @@ -347,12 +309,3 @@ typedef NS_ENUM(NSUInteger, JGProgressHUDInteractionType) { + (NSArray *)allProgressHUDsInViewHierarchy:(UIView *)view; @end - - - -/** - Macro for safe floating point comparison (for internal use in JGProgressHUD). - */ -#ifndef fequal -#define fequal(a,b) (fabs((a) - (b)) < FLT_EPSILON) -#endif diff --git a/JGProgressHUD/JGProgressHUD/JGProgressHUDErrorIndicatorView.m b/JGProgressHUD/JGProgressHUD/JGProgressHUDErrorIndicatorView.m index b1ad471..93f8f1e 100644 --- a/JGProgressHUD/JGProgressHUD/JGProgressHUDErrorIndicatorView.m +++ b/JGProgressHUD/JGProgressHUD/JGProgressHUDErrorIndicatorView.m @@ -7,13 +7,19 @@ // #import "JGProgressHUDErrorIndicatorView.h" +#import "JGProgressHUD.h" @implementation JGProgressHUDErrorIndicatorView - (instancetype)initWithContentView:(UIView *__unused)contentView { - NSString *bundlePath = [[NSBundle mainBundle] pathForResource:@"JGProgressHUD Resources" ofType:@"bundle"]; + NSBundle *fwBundle = [NSBundle bundleForClass:[JGProgressHUD class]]; + if ([fwBundle isEqual:[NSBundle mainBundle]]) { + fwBundle = nil; + } - UIImageView *imageView = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:[bundlePath stringByAppendingPathComponent:@"jg_hud_error.png"]]]; + NSString *imgPath = [(fwBundle ? : [NSBundle bundleWithPath:[[NSBundle mainBundle] pathForResource:@"JGProgressHUD Resources" ofType:@"bundle"]]) pathForResource:@"jg_hud_error" ofType:@"png"]; + + UIImageView *imageView = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:imgPath]]; self = [super initWithContentView:imageView]; diff --git a/JGProgressHUD/JGProgressHUD/JGProgressHUDIndeterminateIndicatorView.h b/JGProgressHUD/JGProgressHUD/JGProgressHUDIndeterminateIndicatorView.h index 1e37a7d..0abf33a 100644 --- a/JGProgressHUD/JGProgressHUD/JGProgressHUDIndeterminateIndicatorView.h +++ b/JGProgressHUD/JGProgressHUD/JGProgressHUDIndeterminateIndicatorView.h @@ -6,7 +6,7 @@ // Copyright (c) 2014 Hardtack. All rights reserved. // -#import "JGProgressHUD.h" +#import "JGProgressHUD-Defines.h" #import "JGProgressHUDIndicatorView.h" @interface JGProgressHUDIndeterminateIndicatorView : JGProgressHUDIndicatorView diff --git a/JGProgressHUD/JGProgressHUD/JGProgressHUDPieIndicatorView.h b/JGProgressHUD/JGProgressHUD/JGProgressHUDPieIndicatorView.h index fc8e775..92b7124 100755 --- a/JGProgressHUD/JGProgressHUD/JGProgressHUDPieIndicatorView.h +++ b/JGProgressHUD/JGProgressHUD/JGProgressHUDPieIndicatorView.h @@ -6,7 +6,7 @@ // Copyright (c) 2014 Hardtack. All rights reserved. // -#import "JGProgressHUD.h" +#import "JGProgressHUD-Defines.h" #import "JGProgressHUDIndicatorView.h" @interface JGProgressHUDPieIndicatorView : JGProgressHUDIndicatorView diff --git a/JGProgressHUD/JGProgressHUD/JGProgressHUDRingIndicatorView.h b/JGProgressHUD/JGProgressHUD/JGProgressHUDRingIndicatorView.h index 7351f97..ab129dc 100755 --- a/JGProgressHUD/JGProgressHUD/JGProgressHUDRingIndicatorView.h +++ b/JGProgressHUD/JGProgressHUD/JGProgressHUDRingIndicatorView.h @@ -6,7 +6,7 @@ // Copyright (c) 2014 Jonas Gessner. All rights reserved. // -#import "JGProgressHUD.h" +#import "JGProgressHUD-Defines.h" #import "JGProgressHUDIndicatorView.h" @interface JGProgressHUDRingIndicatorView : JGProgressHUDIndicatorView diff --git a/JGProgressHUD/JGProgressHUD/JGProgressHUDSuccessIndicatorView.m b/JGProgressHUD/JGProgressHUD/JGProgressHUDSuccessIndicatorView.m index dafaed1..86271d0 100644 --- a/JGProgressHUD/JGProgressHUD/JGProgressHUDSuccessIndicatorView.m +++ b/JGProgressHUD/JGProgressHUD/JGProgressHUDSuccessIndicatorView.m @@ -7,13 +7,19 @@ // #import "JGProgressHUDSuccessIndicatorView.h" +#import "JGProgressHUD.h" @implementation JGProgressHUDSuccessIndicatorView -- (instancetype)initWithContentView:(UIView * __unused)contentView { - NSString *bundlePath = [[NSBundle mainBundle] pathForResource:@"JGProgressHUD Resources" ofType:@"bundle"]; +- (instancetype)initWithContentView:(UIView *__unused)contentView { + NSBundle *fwBundle = [NSBundle bundleForClass:[JGProgressHUD class]]; + if ([fwBundle isEqual:[NSBundle mainBundle]]) { + fwBundle = nil; + } - UIImageView *imageView = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:[bundlePath stringByAppendingPathComponent:@"jg_hud_success.png"]]]; + NSString *imgPath = [(fwBundle ? : [NSBundle bundleWithPath:[[NSBundle mainBundle] pathForResource:@"JGProgressHUD Resources" ofType:@"bundle"]]) pathForResource:@"jg_hud_success" ofType:@"png"]; + + UIImageView *imageView = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:imgPath]]; self = [super initWithContentView:imageView]; diff --git a/README.md b/README.md index 644247c..5a1bff0 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Overview
The JGProgressHUD Tests example project contains all kinds of different uses of JGProgressHUD. Check out the code and see how much JGProgressHUD can do!
-#####Current Version: 1.2.4 +#####Current Version: 1.2.5 ##Customization: @@ -88,20 +88,28 @@ pod 'JGProgressHUD'
OR:

-Static Library:
+Framework (iOS >= 8.0 only):
1. Drag the `JGProgressHUD.xcodeproj` file into your Xcode project.
-2. Add `JGProgressHUD` and `JGProgressHUD Resources` as Target Dependency in your project's "Build Phases" section. -3. Add libJGProgressHUD.a in "Link Binary With Libraries".
-4. From the `JGProgressHUD.xcodeproj`'s "Products" Directory drag the `JGProgressHUD Resources.bundle` into your project's "Copy Bundle Resources" section.
-5. Finally, make sure you have added the `-ObjC` flag in Other Linker Flags.

-See the JGProgressHUD Tests project for an example implementation of JGProgressHUD as static library. +2. Add `JGProgressHUD.framework` to "Embedded Binaries" in the "General" tab of your project's target.
+3. Add the `-ObjC` flag to "Other Linker Flags" in the "Build Settings" tab of your project's target.

+See the JGProgressHUD Tests project for an example implementation of JGProgressHUD as framework. +

+After you have included JGProgressHUD as framework simply import `JGProgressHUD.h` like this: +```objc +#import +```

OR:

-Source Files:
-Add all files from JGProgressHUD to your project. +Static Library:
+1. Drag the `JGProgressHUD.xcodeproj` file into your Xcode project.
+2. Add `JGProgressHUD` and `JGProgressHUD Resources` to "Target Dependencies" in the "Build Phases" tab of your project's target.
+3. Add `libJGProgressHUD.a` to "Link Binary With Libraries".
+4. From the `JGProgressHUD.xcodeproj`'s "Products" Directory drag the `JGProgressHUD Resources.bundle` into the "Copy Bundle Resources" section.
+5. Add the `-ObjC` flag to "Other Linker Flags" in the "Build Settings" tab of your project's target.

+See the JGProgressHUD Tests project for an example implementation of JGProgressHUD as static library.

-After you have included JGProgressHUD as static library or source files simply import `JGProgressHUD.h` like this: +After you have included JGProgressHUD as static library simply import `JGProgressHUD.h` like this: ```objc #import "JGProgressHUD.h" ```