Compare commits

..
5 Commits
Author SHA1 Message Date
EddyVerbruggen eed523111b bump 2015-08-04 22:07:13 +02:00
EddyVerbruggen e0420e0aef bump 2015-08-04 22:06:46 +02:00
Eddy Verbruggen 8c10bcaec5 Merge pull request #45 from martinoss/android-fix-blurry-toast
Fix blurry toast on Android 5, resolves #44
2015-08-04 21:39:56 +02:00
Martin Oss 5d9aa4f187 Fix blurry toast on Android 5, resolves EddyVerbruggen/Toast-PhoneGap-Plugin#44 2015-08-04 21:09:29 +02:00
EddyVerbruggen 50290d83de #37 Support landscape mode on iOS 7 2015-06-19 12:28:29 +02:00
3 changed files with 15 additions and 7 deletions
+1 -1
View File
@@ -2,7 +2,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="nl.x-services.plugins.toast"
version="2.1.0">
version="2.1.1">
<name>Toast</name>
+2 -2
View File
@@ -52,7 +52,7 @@ public class Toast extends CordovaPlugin {
cordova.getActivity().runOnUiThread(new Runnable() {
public void run() {
android.widget.Toast toast = android.widget.Toast.makeText(
webView.getContext(),
cordova.getActivity().getApplicationContext(),
message,
"short".equals(duration) ? android.widget.Toast.LENGTH_SHORT : android.widget.Toast.LENGTH_LONG);
@@ -92,4 +92,4 @@ public class Toast extends CordovaPlugin {
public void onResume(boolean multitasking) {
this.isPaused = false;
}
}
}
+12 -4
View File
@@ -114,9 +114,14 @@ static UIView *prevToast = NULL;
toast.exclusiveTouch = YES;
}
// make sure that if InAppBrowser is active, we're still showing Toasts on top of it
[self.superview.superview addSubview:toast];
if ([[[UIDevice currentDevice] systemVersion] compare:@"8.0" options:NSNumericSearch] != NSOrderedAscending) {
// 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
delay:0.0
options:(UIViewAnimationOptionCurveEaseOut | UIViewAnimationOptionAllowUserInteraction)
@@ -156,7 +161,7 @@ static UIView *prevToast = NULL;
- (void)handleToastTapped:(UITapGestureRecognizer *)recognizer {
NSTimer *timer = (NSTimer *)objc_getAssociatedObject(self, &CSToastTimerKey);
[timer invalidate];
[self hideToast:recognizer.view];
}
@@ -247,7 +252,10 @@ static UIView *prevToast = NULL;
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];
#pragma clang diagnostic pop
}
- (UIView *)viewForMessage:(NSString *)message title:(NSString *)title image:(UIImage *)image {