diff --git a/ios/.DS_Store b/ios/.DS_Store
index 3776bea3d936..121d1d84f0d0 100644
Binary files a/ios/.DS_Store and b/ios/.DS_Store differ
diff --git a/ios/iosremote/en.lproj/iPad_autosize.storyboard b/ios/iosremote/en.lproj/iPad_autosize.storyboard
index 1210c72f0c21..40484059871b 100644
--- a/ios/iosremote/en.lproj/iPad_autosize.storyboard
+++ b/ios/iosremote/en.lproj/iPad_autosize.storyboard
@@ -365,29 +365,24 @@
+
-
-
-
-
-
-
@@ -405,7 +400,6 @@
-
@@ -514,8 +508,7 @@
-
-
+
@@ -527,9 +520,7 @@
-
-
@@ -542,7 +533,6 @@
-
diff --git a/ios/iosremote/en.lproj/iPad_autosize_old.storyboard b/ios/iosremote/en.lproj/iPad_autosize_old.storyboard
index 1210c72f0c21..f8dd5ec7cb9e 100644
--- a/ios/iosremote/en.lproj/iPad_autosize_old.storyboard
+++ b/ios/iosremote/en.lproj/iPad_autosize_old.storyboard
@@ -365,29 +365,24 @@
+
-
-
-
-
-
-
@@ -405,7 +400,6 @@
-
@@ -514,8 +508,7 @@
-
-
+
@@ -527,9 +520,7 @@
-
-
@@ -542,7 +533,6 @@
-
diff --git a/ios/iosremote/fr.lproj/iPad_autosize.storyboard b/ios/iosremote/fr.lproj/iPad_autosize.storyboard
index 1a2681334a5d..e4d2e858042e 100644
--- a/ios/iosremote/fr.lproj/iPad_autosize.storyboard
+++ b/ios/iosremote/fr.lproj/iPad_autosize.storyboard
@@ -365,29 +365,24 @@
+
-
-
-
-
-
-
@@ -405,7 +400,6 @@
-
@@ -514,8 +508,7 @@
-
-
+
@@ -527,9 +520,7 @@
-
-
@@ -542,7 +533,6 @@
-
diff --git a/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard b/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard
index 1a2681334a5d..3bc753d29018 100644
--- a/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard
+++ b/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard
@@ -365,29 +365,24 @@
+
-
-
-
-
-
-
@@ -405,7 +400,6 @@
-
@@ -514,8 +508,7 @@
-
-
+
@@ -527,9 +520,7 @@
-
-
@@ -542,7 +533,6 @@
-
diff --git a/ios/iosremote/iosremote.xcodeproj/project.pbxproj b/ios/iosremote/iosremote.xcodeproj/project.pbxproj
index c5770a0b3188..45e36b5ce345 100644
--- a/ios/iosremote/iosremote.xcodeproj/project.pbxproj
+++ b/ios/iosremote/iosremote.xcodeproj/project.pbxproj
@@ -107,6 +107,8 @@
8CAD65A017A3F76300CFB661 /* slideShowSwipeInList_ipad.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CAD659F17A3F76300CFB661 /* slideShowSwipeInList_ipad.m */; };
8CAF3DDF17D0DFFD00F931E5 /* WTcontrol~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CAF3DDD17D0DFFD00F931E5 /* WTcontrol~ipad.png */; };
8CAF3DE017D0DFFD00F931E5 /* WTcontrol~iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CAF3DDE17D0DFFD00F931E5 /* WTcontrol~iphone.png */; };
+ 8CAF3DE317D1D5D700F931E5 /* more_ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CAF3DE117D1D5D600F931E5 /* more_ipad.png */; };
+ 8CAF3DE417D1D5D700F931E5 /* more_ipad@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CAF3DE217D1D5D700F931E5 /* more_ipad@2x.png */; };
8CD6EC6817CBBAF40071827A /* WalkThroughPageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CD6EC6617CBBAF40071827A /* WalkThroughPageViewController.m */; };
8CD6EC6917CBBAF40071827A /* WalkThroughPageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8CD6EC6717CBBAF40071827A /* WalkThroughPageViewController.xib */; };
8CD6EC7017CC3FA00071827A /* WalkThroughContainerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CD6EC6F17CC3FA00071827A /* WalkThroughContainerViewController.m */; };
@@ -275,6 +277,8 @@
8CAD659F17A3F76300CFB661 /* slideShowSwipeInList_ipad.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = slideShowSwipeInList_ipad.m; path = iosremote/slideShowSwipeInList_ipad.m; sourceTree = ""; };
8CAF3DDD17D0DFFD00F931E5 /* WTcontrol~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "WTcontrol~ipad.png"; path = "iosremote/WTcontrol~ipad.png"; sourceTree = ""; };
8CAF3DDE17D0DFFD00F931E5 /* WTcontrol~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "WTcontrol~iphone.png"; path = "iosremote/WTcontrol~iphone.png"; sourceTree = ""; };
+ 8CAF3DE117D1D5D600F931E5 /* more_ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = more_ipad.png; path = iosremote/more_ipad.png; sourceTree = ""; };
+ 8CAF3DE217D1D5D700F931E5 /* more_ipad@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "more_ipad@2x.png"; path = "iosremote/more_ipad@2x.png"; sourceTree = ""; };
8CD6EC6517CBBAF40071827A /* WalkThroughPageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WalkThroughPageViewController.h; path = iosremote/WalkThroughPageViewController.h; sourceTree = ""; };
8CD6EC6617CBBAF40071827A /* WalkThroughPageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WalkThroughPageViewController.m; path = iosremote/WalkThroughPageViewController.m; sourceTree = ""; };
8CD6EC6717CBBAF40071827A /* WalkThroughPageViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = WalkThroughPageViewController.xib; path = iosremote/WalkThroughPageViewController.xib; sourceTree = ""; };
@@ -415,6 +419,8 @@
8C06B31917B7EC62002F5CF8 /* assets */ = {
isa = PBXGroup;
children = (
+ 8CAF3DE117D1D5D600F931E5 /* more_ipad.png */,
+ 8CAF3DE217D1D5D700F931E5 /* more_ipad@2x.png */,
8CAF3DDD17D0DFFD00F931E5 /* WTcontrol~ipad.png */,
8CAF3DDE17D0DFFD00F931E5 /* WTcontrol~iphone.png */,
8C94E69517CF7BF000B4848D /* WTPairingScreenshot.png */,
@@ -495,6 +501,7 @@
8C1A170217A28AB900B4BB3C /* Shared */ = {
isa = PBXGroup;
children = (
+ 8CD6EC6A17CBBAFF0071827A /* Views */,
8C1A170717A28DE800B4BB3C /* Models */,
8C1A170617A28DDF00B4BB3C /* Support */,
8C1A170517A28B0E00B4BB3C /* Library */,
@@ -516,6 +523,10 @@
8C1A170417A28AFD00B4BB3C /* Controllers */ = {
isa = PBXGroup;
children = (
+ 8CD6EC6517CBBAF40071827A /* WalkThroughPageViewController.h */,
+ 8CD6EC6617CBBAF40071827A /* WalkThroughPageViewController.m */,
+ 8CD6EC6E17CC3FA00071827A /* WalkThroughContainerViewController.h */,
+ 8CD6EC6F17CC3FA00071827A /* WalkThroughContainerViewController.m */,
57FE71E11785C61300B50125 /* pinValidation_vc.h */,
57FE71E21785C61400B50125 /* pinValidation_vc.m */,
5753DD9717834D7100DB71BB /* newServer_vc.h */,
@@ -602,7 +613,6 @@
8C1A170917A28E6500B4BB3C /* iPhone */ = {
isa = PBXGroup;
children = (
- 8CD6EC6A17CBBAFF0071827A /* Views */,
8CAD658917A2F00500CFB661 /* Controllers */,
57DF0A83178FFFAB008B2D3D /* iPhone_autosize.storyboard */,
);
@@ -648,10 +658,6 @@
57701741178B0A6900B99793 /* slideShowSwipeInList_iphone.m */,
8CAD658A17A2F02000CFB661 /* slideShowPreviewTable_vc_iphone.h */,
8CAD658B17A2F02000CFB661 /* slideShowPreviewTable_vc_iphone.m */,
- 8CD6EC6517CBBAF40071827A /* WalkThroughPageViewController.h */,
- 8CD6EC6617CBBAF40071827A /* WalkThroughPageViewController.m */,
- 8CD6EC6E17CC3FA00071827A /* WalkThroughContainerViewController.h */,
- 8CD6EC6F17CC3FA00071827A /* WalkThroughContainerViewController.m */,
);
name = Controllers;
sourceTree = "";
@@ -788,6 +794,8 @@
8C94E69617CF7BF000B4848D /* WTPairingScreenshot.png in Resources */,
8CAF3DDF17D0DFFD00F931E5 /* WTcontrol~ipad.png in Resources */,
8CAF3DE017D0DFFD00F931E5 /* WTcontrol~iphone.png in Resources */,
+ 8CAF3DE317D1D5D700F931E5 /* more_ipad.png in Resources */,
+ 8CAF3DE417D1D5D700F931E5 /* more_ipad@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/ios/iosremote/iosremote/BasePresentationViewController.h b/ios/iosremote/iosremote/BasePresentationViewController.h
index 3aa28bcac3b3..690df0a6be01 100644
--- a/ios/iosremote/iosremote/BasePresentationViewController.h
+++ b/ios/iosremote/iosremote/BasePresentationViewController.h
@@ -28,7 +28,7 @@
// Welcome page
-(void)startConnectionModal:(id)sender;
- (void) setWelcomePageVisible:(BOOL)visible;
-@property (weak, nonatomic) IBOutlet UIView *welcome_blocking_page;
+@property (strong, nonatomic) UIView *welcome_blocking_page;
@property (weak, nonatomic) IBOutlet UITableView *horizontalTableView;
@property (weak, nonatomic) IBOutlet UIButton *startButton;
diff --git a/ios/iosremote/iosremote/BasePresentationViewController.m b/ios/iosremote/iosremote/BasePresentationViewController.m
index 37691ffac055..d77b45b7a33a 100644
--- a/ios/iosremote/iosremote/BasePresentationViewController.m
+++ b/ios/iosremote/iosremote/BasePresentationViewController.m
@@ -269,6 +269,12 @@
- (void)viewDidLoad
{
[super viewDidLoad];
+ self.welcome_blocking_page = [[UIView alloc] initWithFrame:self.view.bounds];
+ self.welcome_blocking_page.backgroundColor = [UIColor orangeColor];
+ self.welcome_blocking_page.autoresizingMask = UIViewAutoresizingFlexibleHeight |
+ UIViewAutoresizingFlexibleWidth;
+ [self.view addSubview:self.welcome_blocking_page];
+
self.masterIsHiddenWhenLandscape = YES;
[self.currentSlideImageView setTag:CURRENT_SLIDE_IMAGEVIEW];
[self.NoteWebView setTag:CURRENT_SLIDE_NOTES];
@@ -475,12 +481,13 @@
static BOOL isBlank = NO;
#pragma mark - Popover toggle
- (IBAction)popOverUp:(id)sender {
+ CGPoint popOverPoint = CGPointMake([self.gearButton.superview convertPoint:self.gearButton.center toView:self.view].x, [self.gearButton.superview convertPoint:self.gearButton.center toView:self.view].y - self.gearButton.frame.size.height/2);
if (!isBlank) {
- [PopoverView showPopoverAtPoint:self.gearButton.frame.origin inView:self.view withStringArray:
+ [PopoverView showPopoverAtPoint:popOverPoint inView:self.view withStringArray:
[NSArray arrayWithObjects:NSLocalizedString(@"Stop Presentation", @"Popover option"), NSLocalizedString(@"Restart", @"Popover option"), NSLocalizedString(@"Blank Screen", @"Popover option"), nil]
delegate:self];
} else {
- [PopoverView showPopoverAtPoint:self.gearButton.frame.origin inView:self.view withStringArray:
+ [PopoverView showPopoverAtPoint:popOverPoint inView:self.view withStringArray:
[NSArray arrayWithObjects:NSLocalizedString(@"Stop Presentation", @"Popover option"), NSLocalizedString(@"Restart", @"Popover option"), NSLocalizedString(@"Resume from blank Screen", @"Popover option"), nil]
delegate:self];
}
diff --git a/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard b/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard
index 2b4c9a62fbb8..11be2a63888c 100644
--- a/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard
+++ b/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard
@@ -365,29 +365,24 @@
+
-
-
-
-
-
-
@@ -405,7 +400,6 @@
-
@@ -514,8 +508,7 @@
-
-
+
@@ -527,9 +520,7 @@
-
-
@@ -542,7 +533,6 @@
-
diff --git a/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard b/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard
index 2b4c9a62fbb8..100b34899bb2 100644
--- a/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard
+++ b/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard
@@ -365,29 +365,24 @@
+
-
-
-
-
-
-
@@ -405,7 +400,6 @@
-
@@ -514,8 +508,7 @@
-
-
+
@@ -527,9 +520,7 @@
-
-
@@ -542,7 +533,6 @@
-