github/Toast-PhoneGap-Plugin
github/Toast-PhoneGap-Plugin
4
0
Fork 1
mirror of https://github.com/EddyVerbruggen/Toast-PhoneGap-Plugin.git synced 2025-04-16 05:58:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

#37 Support landscape mode on iOS 7

Browse Source
This commit is contained in:
EddyVerbruggen 2015-06-19 12:28:29 +02:00
parent 3d0b2927ae
commit 50290d83de
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin.xml
View File

@ -2,7 +2,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
id="nl.x-services.plugins.toast" id="nl.x-services.plugins.toast"
version="2.1.0"> version="2.1.1">
<name>Toast</name> <name>Toast</name>

16
src/ios/Toast+UIView.m
View File

@ -114,9 +114,14 @@ static UIView *prevToast = NULL;
toast.exclusiveTouch = YES; toast.exclusiveTouch = YES;
} }
// make sure that if InAppBrowser is active, we're still showing Toasts on top of it if ([[[UIDevice currentDevice] systemVersion] compare:@"8.0" options:NSNumericSearch] != NSOrderedAscending) {
[self.superview.superview addSubview:toast]; // on iOS8 when InAppBrowser is active, the Toast is below it,
[self.superview.superview addSubview:toast];
} else {
// ..on iOS7 however with this fix on landscape the Toast isn't rotated automatically
[self.superview addSubview:toast];
}
[UIView animateWithDuration:CSToastFadeDuration [UIView animateWithDuration:CSToastFadeDuration
delay:0.0 delay:0.0
options:(UIViewAnimationOptionCurveEaseOut | UIViewAnimationOptionAllowUserInteraction) options:(UIViewAnimationOptionCurveEaseOut | UIViewAnimationOptionAllowUserInteraction)
@ -156,7 +161,7 @@ static UIView *prevToast = NULL;
- (void)handleToastTapped:(UITapGestureRecognizer *)recognizer { - (void)handleToastTapped:(UITapGestureRecognizer *)recognizer {
NSTimer *timer = (NSTimer *)objc_getAssociatedObject(self, &CSToastTimerKey); NSTimer *timer = (NSTimer *)objc_getAssociatedObject(self, &CSToastTimerKey);
[timer invalidate]; [timer invalidate];
[self hideToast:recognizer.view]; [self hideToast:recognizer.view];
} }
@ -247,7 +252,10 @@ static UIView *prevToast = NULL;
return CGSizeMake(ceilf(boundingRect.size.width), ceilf(boundingRect.size.height)); return CGSizeMake(ceilf(boundingRect.size.width), ceilf(boundingRect.size.height));
} }
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
return [string sizeWithFont:font constrainedToSize:constrainedSize lineBreakMode:lineBreakMode]; return [string sizeWithFont:font constrainedToSize:constrainedSize lineBreakMode:lineBreakMode];
#pragma clang diagnostic pop
} }
- (UIView *)viewForMessage:(NSString *)message title:(NSString *)title image:(UIImage *)image { - (UIView *)viewForMessage:(NSString *)message title:(NSString *)title image:(UIImage *)image {