diff --git a/ios/Classes/TiPopoverProxy.m b/ios/Classes/TiPopoverProxy.m index a43ccfc..e47baeb 100644 --- a/ios/Classes/TiPopoverProxy.m +++ b/ios/Classes/TiPopoverProxy.m @@ -279,7 +279,7 @@ - (void)show:(id)args ^{ [self initAndShowPopOver]; }, - YES); + NO); } - (void)hide:(id)args @@ -405,8 +405,8 @@ - (void)initAndShowPopOver } else { [contentViewProxy windowWillOpen]; [contentViewProxy reposition]; - [contentViewProxy layoutChildrenIfNeeded]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + //[contentViewProxy layoutChildrenIfNeeded]; + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.01 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ [self updatePopoverNow]; }); //[contentViewProxy windowDidOpen]; @@ -537,9 +537,11 @@ - (void)updatePopoverNow popoverDarkenBackgroundView.alpha = 1.0; } } - [[[TiApp app] controller] presentViewController:theController animated:animated completion:nil]; + [[[TiApp app] controller] presentViewController:theController animated:animated completion:nil]; + [(TiWindowProxy *)contentViewProxy windowDidOpen]; dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + if (animated){ [UIView animateWithDuration:0.001 delay: 0.0 options: UIViewAnimationOptionCurveEaseIn animations:^{ @@ -551,7 +553,6 @@ - (void)updatePopoverNow else { [contentViewProxy view].alpha = 1.0; } - [(TiWindowProxy *)contentViewProxy windowDidOpen]; }); } @@ -581,22 +582,23 @@ - (void)updatePopoverNow popoverDarkenBackgroundView.alpha = 1.0; } } - [[[TiApp app] controller] presentViewController:theController animated:NO completion:nil]; + [contentViewProxy windowDidOpen]; - if (animated){ - [UIView animateWithDuration:0.001 delay: 0.0 options: UIViewAnimationOptionCurveEaseIn - animations:^{ + //dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + + if (animated){ + [UIView animateWithDuration:0.01 delay: 0.0 options: UIViewAnimationOptionCurveEaseIn + animations:^{ + [contentViewProxy view].alpha = 1.0; + } + completion:^(BOOL finished) { + }]; + } + else { [contentViewProxy view].alpha = 1.0; } - completion:^(BOOL finished) { - }]; - } - else { - [contentViewProxy view].alpha = 1.0; - } - [contentViewProxy windowDidOpen]; - + //}); } } diff --git a/ios/manifest b/ios/manifest index a527614..7dae2a2 100644 --- a/ios/manifest +++ b/ios/manifest @@ -2,7 +2,7 @@ # this is your module manifest and used by Titanium # during compilation, packaging, distribution, etc. # -version: 1.0.7 +version: 1.0.8 apiversion: 2 architectures: arm64 x86_64 mac: true diff --git a/ios/metadata.json b/ios/metadata.json deleted file mode 100644 index 43a62e5..0000000 --- a/ios/metadata.json +++ /dev/null @@ -1 +0,0 @@ -{"exports":[]} \ No newline at end of file diff --git a/ios/ti.popover.xcodeproj/project.xcworkspace/xcuserdata/marcbender.xcuserdatad/UserInterfaceState.xcuserstate b/ios/ti.popover.xcodeproj/project.xcworkspace/xcuserdata/marcbender.xcuserdatad/UserInterfaceState.xcuserstate index dc9383c..3de59e2 100644 Binary files a/ios/ti.popover.xcodeproj/project.xcworkspace/xcuserdata/marcbender.xcuserdatad/UserInterfaceState.xcuserstate and b/ios/ti.popover.xcodeproj/project.xcworkspace/xcuserdata/marcbender.xcuserdatad/UserInterfaceState.xcuserstate differ