Skip to content

Commit

Permalink
Updated header copying
Browse files Browse the repository at this point in the history
  • Loading branch information
@JonasGessner
JonasGessner committed Sep 1, 2014
1 parent c7013f8 commit 7793c04
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 34 deletions.
66 changes: 33 additions & 33 deletions JGProgressHUD/JGProgressHUD.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,8 @@
objects = {

/* Begin PBXBuildFile section */
6B20E7DA197FC2C200488D60 /* JGProgressHUD.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6BC0189C197B2ABF00DA4C49 /* JGProgressHUD.h */; };
6B20E7DB197FC2C200488D60 /* JGProgressHUDAnimation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6BC0189E197B2ABF00DA4C49 /* JGProgressHUDAnimation.h */; };
6B20E7DC197FC2C200488D60 /* JGProgressHUDFadeAnimation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6BC018A0197B2ABF00DA4C49 /* JGProgressHUDFadeAnimation.h */; };
6B20E7DD197FC2C200488D60 /* JGProgressHUDFadeZoomAnimation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6BC018A2197B2ABF00DA4C49 /* JGProgressHUDFadeZoomAnimation.h */; };
6B20E7DE197FC2C200488D60 /* JGProgressHUDIndicatorView.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6BC018A6197B2ABF00DA4C49 /* JGProgressHUDIndicatorView.h */; };
6B20E7DF197FC2C200488D60 /* JGProgressHUDIndeterminateIndicatorView.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6BC018A4197B2ABF00DA4C49 /* JGProgressHUDIndeterminateIndicatorView.h */; };
6B20E7E0197FC2C200488D60 /* JGProgressHUDPieIndicatorView.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6BC018A8197B2ABF00DA4C49 /* JGProgressHUDPieIndicatorView.h */; };
6B20E7E1197FC2C200488D60 /* JGProgressHUDRingIndicatorView.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6BC018AA197B2ABF00DA4C49 /* JGProgressHUDRingIndicatorView.h */; };
6B60B25419A3B78B00ED1A4E /* JGProgressHUDSuccessIndicatorView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B60B25319A3B78B00ED1A4E /* JGProgressHUDSuccessIndicatorView.m */; };
6B60B25719A3BC3C00ED1A4E /* JGProgressHUDErrorIndicatorView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B60B25619A3BC3C00ED1A4E /* JGProgressHUDErrorIndicatorView.m */; };
6B60B25819A3BC6400ED1A4E /* JGProgressHUDSuccessIndicatorView.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6B60B25219A3B78B00ED1A4E /* JGProgressHUDSuccessIndicatorView.h */; };
6B60B25919A3BC6400ED1A4E /* JGProgressHUDErrorIndicatorView.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6B60B25519A3BC3C00ED1A4E /* JGProgressHUDErrorIndicatorView.h */; };
6B60B27519A3C34D00ED1A4E /* jg_hud_error.png in Resources */ = {isa = PBXBuildFile; fileRef = 6B60B27119A3C34D00ED1A4E /* jg_hud_error.png */; };
6B60B27619A3C34D00ED1A4E /* jg_hud_error@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6B60B27219A3C34D00ED1A4E /* jg_hud_error@2x.png */; };
6B60B27719A3C34D00ED1A4E /* jg_hud_success.png in Resources */ = {isa = PBXBuildFile; fileRef = 6B60B27319A3C34D00ED1A4E /* jg_hud_success.png */; };
Expand All @@ -34,30 +24,18 @@
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 */; };
6BFF2C7B19B5172F0018F3E7 /* JGProgressHUD.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BC0189C197B2ABF00DA4C49 /* JGProgressHUD.h */; settings = {ATTRIBUTES = (Public, ); }; };
6BFF2C7C19B5172F0018F3E7 /* JGProgressHUDAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BC0189E197B2ABF00DA4C49 /* JGProgressHUDAnimation.h */; settings = {ATTRIBUTES = (Public, ); }; };
6BFF2C7D19B5172F0018F3E7 /* JGProgressHUDFadeAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BC018A0197B2ABF00DA4C49 /* JGProgressHUDFadeAnimation.h */; settings = {ATTRIBUTES = (Public, ); }; };
6BFF2C7E19B5172F0018F3E7 /* JGProgressHUDFadeZoomAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BC018A2197B2ABF00DA4C49 /* JGProgressHUDFadeZoomAnimation.h */; settings = {ATTRIBUTES = (Public, ); }; };
6BFF2C7F19B5172F0018F3E7 /* JGProgressHUDIndicatorView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BC018A6197B2ABF00DA4C49 /* JGProgressHUDIndicatorView.h */; settings = {ATTRIBUTES = (Public, ); }; };
6BFF2C8019B5172F0018F3E7 /* JGProgressHUDIndeterminateIndicatorView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BC018A4197B2ABF00DA4C49 /* JGProgressHUDIndeterminateIndicatorView.h */; settings = {ATTRIBUTES = (Public, ); }; };
6BFF2C8119B5172F0018F3E7 /* JGProgressHUDPieIndicatorView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BC018A8197B2ABF00DA4C49 /* JGProgressHUDPieIndicatorView.h */; settings = {ATTRIBUTES = (Public, ); }; };
6BFF2C8219B5172F0018F3E7 /* JGProgressHUDRingIndicatorView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BC018AA197B2ABF00DA4C49 /* JGProgressHUDRingIndicatorView.h */; settings = {ATTRIBUTES = (Public, ); }; };
6BFF2C8319B5172F0018F3E7 /* JGProgressHUDSuccessIndicatorView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B60B25219A3B78B00ED1A4E /* JGProgressHUDSuccessIndicatorView.h */; settings = {ATTRIBUTES = (Public, ); }; };
6BFF2C8419B5172F0018F3E7 /* JGProgressHUDErrorIndicatorView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B60B25519A3BC3C00ED1A4E /* JGProgressHUDErrorIndicatorView.h */; settings = {ATTRIBUTES = (Public, ); }; };
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
6B20E7D9197FC2AC00488D60 /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = include;
dstSubfolderSpec = 16;
files = (
6B60B25819A3BC6400ED1A4E /* JGProgressHUDSuccessIndicatorView.h in CopyFiles */,
6B60B25919A3BC6400ED1A4E /* JGProgressHUDErrorIndicatorView.h in CopyFiles */,
6B20E7DA197FC2C200488D60 /* JGProgressHUD.h in CopyFiles */,
6B20E7DB197FC2C200488D60 /* JGProgressHUDAnimation.h in CopyFiles */,
6B20E7DC197FC2C200488D60 /* JGProgressHUDFadeAnimation.h in CopyFiles */,
6B20E7DD197FC2C200488D60 /* JGProgressHUDFadeZoomAnimation.h in CopyFiles */,
6B20E7DE197FC2C200488D60 /* JGProgressHUDIndicatorView.h in CopyFiles */,
6B20E7DF197FC2C200488D60 /* JGProgressHUDIndeterminateIndicatorView.h in CopyFiles */,
6B20E7E0197FC2C200488D60 /* JGProgressHUDPieIndicatorView.h in CopyFiles */,
6B20E7E1197FC2C200488D60 /* JGProgressHUDRingIndicatorView.h in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
6B334B46197DB7940010087F /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
6B60B24019A3B3C500ED1A4E /* JGProgressHUD Resources.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "JGProgressHUD Resources.bundle"; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -209,6 +187,26 @@
};
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
6BFF2C7A19B517170018F3E7 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
6BFF2C7B19B5172F0018F3E7 /* JGProgressHUD.h in Headers */,
6BFF2C7C19B5172F0018F3E7 /* JGProgressHUDAnimation.h in Headers */,
6BFF2C7D19B5172F0018F3E7 /* JGProgressHUDFadeAnimation.h in Headers */,
6BFF2C7E19B5172F0018F3E7 /* JGProgressHUDFadeZoomAnimation.h in Headers */,
6BFF2C7F19B5172F0018F3E7 /* JGProgressHUDIndicatorView.h in Headers */,
6BFF2C8019B5172F0018F3E7 /* JGProgressHUDIndeterminateIndicatorView.h in Headers */,
6BFF2C8119B5172F0018F3E7 /* JGProgressHUDPieIndicatorView.h in Headers */,
6BFF2C8219B5172F0018F3E7 /* JGProgressHUDRingIndicatorView.h in Headers */,
6BFF2C8319B5172F0018F3E7 /* JGProgressHUDSuccessIndicatorView.h in Headers */,
6BFF2C8419B5172F0018F3E7 /* JGProgressHUDErrorIndicatorView.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXHeadersBuildPhase section */

/* Begin PBXNativeTarget section */
6B60B23F19A3B3C500ED1A4E /* JGProgressHUD Resources */ = {
isa = PBXNativeTarget;
Expand All @@ -233,7 +231,7 @@
buildPhases = (
6BC0186F197B2AA500DA4C49 /* Sources */,
6BC01870197B2AA500DA4C49 /* Frameworks */,
6B20E7D9197FC2AC00488D60 /* CopyFiles */,
6BFF2C7A19B517170018F3E7 /* Headers */,
);
buildRules = (
);
Expand Down Expand Up @@ -431,6 +429,7 @@
GCC_PREFIX_HEADER = "JGProgressHUD-Prefix.pch";
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
PUBLIC_HEADERS_FOLDER_PATH = include;
SKIP_INSTALL = YES;
WARNING_CFLAGS = "-Wfloat-equal";
};
Expand All @@ -444,6 +443,7 @@
GCC_PREFIX_HEADER = "JGProgressHUD-Prefix.pch";
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
PUBLIC_HEADERS_FOLDER_PATH = include;
SKIP_INSTALL = YES;
WARNING_CFLAGS = "-Wfloat-equal";
};
Expand Down
6 changes: 5 additions & 1 deletion JGProgressHUD/JGProgressHUD/JGProgressHUD.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,10 @@ + (void)keyboardFrameDidChange:(NSNotification *)notification {
keyboardFrame = [notification.userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];
}

+ (CGRect)currentKeyboardFrame {
return keyboardFrame;
}

+ (void)load {
[super load];

Expand Down Expand Up @@ -308,7 +312,7 @@ - (void)updateHUDAnimated:(BOOL)animated animateIndicatorViewFrame:(BOOL)animate
}

- (CGRect)fullFrameInView:(UIView *)view {
CGRect _keyboardFrame = [view convertRect:keyboardFrame fromView:nil];
CGRect _keyboardFrame = [view convertRect:[[self class] currentKeyboardFrame] fromView:nil];
CGRect frame = view.bounds;

if (!CGRectIsEmpty(_keyboardFrame) && CGRectIntersectsRect(frame, _keyboardFrame)) {
Expand Down

0 comments on commit 7793c04

Please sign in to comment.