Lp 11143 fix accessibility elements (#343)

* set accessibilityElements focus to be on popup view

* fix popup accessibility when returning the app from background

* when app returns from background, set focus on the last view in hierarchy

* Merge branch 'master' into LP-11143_fixAccessibilityElements

* setAlpha to 1.0 for popupGroup while displaying

Authored-by: Dejan Krstevski <[email protected]>

Author: dejan2k

Leanplum-SDK/Classes/MessageTemplates/LPBaseInterstitialMessageTemplate.m

@@ -50,6 +50,11 @@ - (void)closePopupWithAnimation:(BOOL)animated
 
     void (^finishCallback)(void) = ^() {
         [self removeAllViewsFrom:self->_popupGroup];
+        UIWindow *mainWindow = [[UIApplication sharedApplication] keyWindow];
+        UIView *mainView = mainWindow.subviews.lastObject;
+        [[UIApplication sharedApplication] setAccessibilityElements:@[mainWindow, mainView]];
+        mainWindow.isAccessibilityElement = NO;
+        mainView.isAccessibilityElement = NO;
 
         if (actionName) {
             if (track) {
@@ -73,6 +78,9 @@ - (void)closePopupWithAnimation:(BOOL)animated
     [[NSNotificationCenter defaultCenter] removeObserver:self
                                                     name:UIApplicationDidChangeStatusBarOrientationNotification
                                                   object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                    name:UIApplicationDidBecomeActiveNotification
+                                                  object:nil];
 }
 
 // Displays the Center Popup, Interstitial and Web Interstitial.
@@ -87,15 +95,21 @@ - (void)showPopup
     }
     [self setupPopupView];
     [self.popupGroup setAlpha:0.0];
-    [[UIApplication sharedApplication].keyWindow addSubview:self.popupGroup];
+    [self addPopupGroupInKeyWindowAndSetupAccessibilityElement];
+    
     [UIView animateWithDuration:LPMT_POPUP_ANIMATION_LENGTH animations:^{
-        [self->_popupGroup setAlpha:0.5];
+        [self->_popupGroup setAlpha:1.0];
     }];
 
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(orientationDidChange:)
                                                  name:UIDeviceOrientationDidChangeNotification
                                                object:nil];
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(appDidBecomeActive:)
+                                            name:UIApplicationDidBecomeActiveNotification
+                                               object:nil];
 }
 
 - (void)setupPopupView {
@@ -151,6 +165,31 @@ - (void)setupPopupView {
     [self updatePopupLayout];
 }
 
+- (void)addPopupGroupInKeyWindowAndSetupAccessibilityElement {
+    //set accessibility elemements for VoiceOver
+    UIWindow *mainWindow = [[UIApplication sharedApplication] keyWindow];
+    UIView *mainView = mainWindow.subviews.lastObject;
+    [mainWindow addSubview:self.popupGroup];
+    [[UIApplication sharedApplication] setAccessibilityElements:@[mainWindow, mainView, self.popupGroup]];
+    mainWindow.isAccessibilityElement = YES;
+    mainView.isAccessibilityElement = YES;
+    self.popupGroup.isAccessibilityElement = NO;
+    [self setFocusForAccessibilityElement:_popupView];
+}
+
+- (void)setFocusForAccessibilityElement:(UIView *)accessibleView {
+    UIAccessibilityPostNotification(UIAccessibilityScreenChangedNotification,
+    accessibleView);
+}
+
+- (void)appDidBecomeActive:(NSNotification *)notification {
+    if (self.popupGroup != nil) {
+        UIWindow *mainWindow = [[UIApplication sharedApplication] keyWindow];
+        UIView *lastView = mainWindow.subviews.lastObject;
+        [self setFocusForAccessibilityElement:lastView];
+    }
+}
+
 - (void)removeAllViewsFrom:(UIView *)view
 {
     [view.subviews enumerateObjectsUsingBlock:^(UIView *obj, NSUInteger idx, BOOL *stop) {