diff options
author | Siqi LIU <me@siqi.fr> | 2013-09-16 21:18:11 +0200 |
---|---|---|
committer | Siqi LIU <me@siqi.fr> | 2013-09-16 21:18:54 +0200 |
commit | 2fbee32d3a384dc7035feb93cc216d20df7b4523 (patch) | |
tree | 515efa16d01640996b133065bb72166748c5d84b /ios/iosremote | |
parent | 839c5df887352651857067341632111dbe549d05 (diff) |
set default timer duration on first launch & bug fixes
Change-Id: I70d45ea42c7142907345a61671d4f3b303410dd7
Diffstat (limited to 'ios/iosremote')
25 files changed, 504 insertions, 609 deletions
diff --git a/ios/iosremote/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m b/ios/iosremote/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m index afaa28e309f9..7ae7af0ae8fc 100755 --- a/ios/iosremote/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m +++ b/ios/iosremote/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m @@ -153,6 +153,8 @@ CGRect IASKCGRectSwap(CGRect rect); UIBarButtonItem *backButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Done", nil) style:UIBarButtonItemStyleBordered target:self action:@selector(handleBack)]; [backButton setBackgroundImage:[UIImage imageNamed:@"backButton"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault]; self.navigationItem.leftBarButtonItem = backButton; + + self.tableView.backgroundView.backgroundColor = [UIColor colorWithRed:.968627451 green:.968627451 blue:.968627451 alpha:1.0]; } - (void)viewDidUnload { diff --git a/ios/iosremote/InAppSettingsKit/Controllers/IASKSpecifierValuesViewController.m b/ios/iosremote/InAppSettingsKit/Controllers/IASKSpecifierValuesViewController.m index 52531c0c2bdb..f1617887e06c 100755 --- a/ios/iosremote/InAppSettingsKit/Controllers/IASKSpecifierValuesViewController.m +++ b/ios/iosremote/InAppSettingsKit/Controllers/IASKSpecifierValuesViewController.m @@ -58,6 +58,8 @@ UIBarButtonItem *backButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Done", nil) style:UIBarButtonItemStyleBordered target:self action:@selector(handleBack)]; [backButton setBackgroundImage:[UIImage imageNamed:@"backButton"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault]; self.navigationItem.leftBarButtonItem = backButton; + + self.view.backgroundColor = [UIColor colorWithRed:.968627451 green:.968627451 blue:.968627451 alpha:1.0]; } - (void)viewWillAppear:(BOOL)animated { diff --git a/ios/iosremote/UserDefaults.plist b/ios/iosremote/UserDefaults.plist index 7ff0a5cb199d..a187a413415f 100644 --- a/ios/iosremote/UserDefaults.plist +++ b/ios/iosremote/UserDefaults.plist @@ -2,6 +2,8 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> + <key>TIMER_DEFAULT_DURATION</key> + <integer>10</integer> <key>HOWTO_GUIDE_SEEN</key> <false/> </dict> diff --git a/ios/iosremote/en.lproj/iPad_autosize.storyboard b/ios/iosremote/en.lproj/iPad_autosize.storyboard index bbb392b64dec..2ee5efefcbe1 100644 --- a/ios/iosremote/en.lproj/iPad_autosize.storyboard +++ b/ios/iosremote/en.lproj/iPad_autosize.storyboard @@ -638,98 +638,6 @@ <image name="timer_settime_btn.png" width="60" height="60"/> <image name="timer_start_btn_dark.png" width="60" height="60"/> </resources> - <classes> - <class className="AboutViewController" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/AboutViewController.h"/> - <relationships> - <relationship kind="outlet" name="aboutWebView" candidateClass="UIWebView"/> - </relationships> - </class> - <class className="BasePresentationViewController" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/BasePresentationViewController.h"/> - <relationships> - <relationship kind="action" name="popOverUp:"/> - <relationship kind="outlet" name="NoteWebView" candidateClass="UIWebView"/> - <relationship kind="outlet" name="NotesView" candidateClass="UIView"/> - <relationship kind="outlet" name="clearButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="currentSlideImageView" candidateClass="UIImageView"/> - <relationship kind="outlet" name="gearButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="horizontalTableView" candidateClass="UITableView"/> - <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> - <relationship kind="outlet" name="nextButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="previousButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> - <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="stopWatchTimerScrollView" candidateClass="UIScrollView"/> - <relationship kind="outlet" name="stopWatchView" candidateClass="UIView"/> - <relationship kind="outlet" name="timeLabel" candidateClass="UILabel"/> - <relationship kind="outlet" name="timerClearButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="timerSetTimeButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="timerStartButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="timerTimeLabel" candidateClass="UILabel"/> - <relationship kind="outlet" name="timerView" candidateClass="UIView"/> - </relationships> - </class> - <class className="EditableTableViewCell" superclassName="UITableViewCell"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/> - </class> - <class className="LibONavigationController" superclassName="UINavigationController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/> - </class> - <class className="MainSplitViewController" superclassName="UISplitViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/MainSplitViewController.h"/> - </class> - <class className="WalkThroughContainerViewController" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/WalkThroughContainerViewController.h"/> - </class> - <class className="autoDismissKeyboardNavigationViewController" superclassName="LibONavigationController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/autoDismissKeyboardNavigationViewController.h"/> - </class> - <class className="newServerViewController" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/> - <relationships> - <relationship kind="action" name="save:"/> - <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/> - </relationships> - </class> - <class className="pinValidation_vc" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/> - <relationships> - <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/> - <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/> - </relationships> - </class> - <class className="server_list_vc" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/> - <relationships> - <relationship kind="action" name="onClickMenuButton:"/> - <relationship kind="outlet" name="menuButton" candidateClass="UIBarButtonItem"/> - <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/> - </relationships> - </class> - <class className="server_list_vc_ipad" superclassName="server_list_vc"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc_ipad.h"/> - <relationships> - <relationship kind="action" name="cancelModalView:"/> - </relationships> - </class> - <class className="slideShowPreviewTable_vc" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/> - <relationships> - <relationship kind="action" name="startPrefSettings:"/> - <relationship kind="action" name="startPresentationAction:"/> - <relationship kind="outlet" name="prefButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> - </relationships> - </class> - <class className="slideShowPreviewTable_vc_ipad" superclassName="slideShowPreviewTable_vc"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_ipad.h"/> - </class> - <class className="slideShowSwipeInList_ipad" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList_ipad.h"/> - </class> - </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> diff --git a/ios/iosremote/en.lproj/iPad_autosize_old.storyboard b/ios/iosremote/en.lproj/iPad_autosize_old.storyboard index bbb392b64dec..2ee5efefcbe1 100644 --- a/ios/iosremote/en.lproj/iPad_autosize_old.storyboard +++ b/ios/iosremote/en.lproj/iPad_autosize_old.storyboard @@ -638,98 +638,6 @@ <image name="timer_settime_btn.png" width="60" height="60"/> <image name="timer_start_btn_dark.png" width="60" height="60"/> </resources> - <classes> - <class className="AboutViewController" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/AboutViewController.h"/> - <relationships> - <relationship kind="outlet" name="aboutWebView" candidateClass="UIWebView"/> - </relationships> - </class> - <class className="BasePresentationViewController" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/BasePresentationViewController.h"/> - <relationships> - <relationship kind="action" name="popOverUp:"/> - <relationship kind="outlet" name="NoteWebView" candidateClass="UIWebView"/> - <relationship kind="outlet" name="NotesView" candidateClass="UIView"/> - <relationship kind="outlet" name="clearButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="currentSlideImageView" candidateClass="UIImageView"/> - <relationship kind="outlet" name="gearButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="horizontalTableView" candidateClass="UITableView"/> - <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> - <relationship kind="outlet" name="nextButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="previousButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> - <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="stopWatchTimerScrollView" candidateClass="UIScrollView"/> - <relationship kind="outlet" name="stopWatchView" candidateClass="UIView"/> - <relationship kind="outlet" name="timeLabel" candidateClass="UILabel"/> - <relationship kind="outlet" name="timerClearButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="timerSetTimeButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="timerStartButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="timerTimeLabel" candidateClass="UILabel"/> - <relationship kind="outlet" name="timerView" candidateClass="UIView"/> - </relationships> - </class> - <class className="EditableTableViewCell" superclassName="UITableViewCell"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/> - </class> - <class className="LibONavigationController" superclassName="UINavigationController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/> - </class> - <class className="MainSplitViewController" superclassName="UISplitViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/MainSplitViewController.h"/> - </class> - <class className="WalkThroughContainerViewController" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/WalkThroughContainerViewController.h"/> - </class> - <class className="autoDismissKeyboardNavigationViewController" superclassName="LibONavigationController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/autoDismissKeyboardNavigationViewController.h"/> - </class> - <class className="newServerViewController" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/> - <relationships> - <relationship kind="action" name="save:"/> - <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/> - </relationships> - </class> - <class className="pinValidation_vc" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/> - <relationships> - <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/> - <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/> - </relationships> - </class> - <class className="server_list_vc" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/> - <relationships> - <relationship kind="action" name="onClickMenuButton:"/> - <relationship kind="outlet" name="menuButton" candidateClass="UIBarButtonItem"/> - <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/> - </relationships> - </class> - <class className="server_list_vc_ipad" superclassName="server_list_vc"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc_ipad.h"/> - <relationships> - <relationship kind="action" name="cancelModalView:"/> - </relationships> - </class> - <class className="slideShowPreviewTable_vc" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/> - <relationships> - <relationship kind="action" name="startPrefSettings:"/> - <relationship kind="action" name="startPresentationAction:"/> - <relationship kind="outlet" name="prefButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> - </relationships> - </class> - <class className="slideShowPreviewTable_vc_ipad" superclassName="slideShowPreviewTable_vc"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_ipad.h"/> - </class> - <class className="slideShowSwipeInList_ipad" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList_ipad.h"/> - </class> - </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> diff --git a/ios/iosremote/fr.lproj/iPad_autosize.storyboard b/ios/iosremote/fr.lproj/iPad_autosize.storyboard index 579313de3768..0520eadf3367 100644 --- a/ios/iosremote/fr.lproj/iPad_autosize.storyboard +++ b/ios/iosremote/fr.lproj/iPad_autosize.storyboard @@ -638,98 +638,6 @@ <image name="timer_settime_btn.png" width="60" height="60"/> <image name="timer_start_btn_dark.png" width="60" height="60"/> </resources> - <classes> - <class className="AboutViewController" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/AboutViewController.h"/> - <relationships> - <relationship kind="outlet" name="aboutWebView" candidateClass="UIWebView"/> - </relationships> - </class> - <class className="BasePresentationViewController" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/BasePresentationViewController.h"/> - <relationships> - <relationship kind="action" name="popOverUp:"/> - <relationship kind="outlet" name="NoteWebView" candidateClass="UIWebView"/> - <relationship kind="outlet" name="NotesView" candidateClass="UIView"/> - <relationship kind="outlet" name="clearButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="currentSlideImageView" candidateClass="UIImageView"/> - <relationship kind="outlet" name="gearButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="horizontalTableView" candidateClass="UITableView"/> - <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> - <relationship kind="outlet" name="nextButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="previousButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> - <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="stopWatchTimerScrollView" candidateClass="UIScrollView"/> - <relationship kind="outlet" name="stopWatchView" candidateClass="UIView"/> - <relationship kind="outlet" name="timeLabel" candidateClass="UILabel"/> - <relationship kind="outlet" name="timerClearButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="timerSetTimeButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="timerStartButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="timerTimeLabel" candidateClass="UILabel"/> - <relationship kind="outlet" name="timerView" candidateClass="UIView"/> - </relationships> - </class> - <class className="EditableTableViewCell" superclassName="UITableViewCell"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/> - </class> - <class className="LibONavigationController" superclassName="UINavigationController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/> - </class> - <class className="MainSplitViewController" superclassName="UISplitViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/MainSplitViewController.h"/> - </class> - <class className="WalkThroughContainerViewController" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/WalkThroughContainerViewController.h"/> - </class> - <class className="autoDismissKeyboardNavigationViewController" superclassName="LibONavigationController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/autoDismissKeyboardNavigationViewController.h"/> - </class> - <class className="newServerViewController" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/> - <relationships> - <relationship kind="action" name="save:"/> - <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/> - </relationships> - </class> - <class className="pinValidation_vc" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/> - <relationships> - <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/> - <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/> - </relationships> - </class> - <class className="server_list_vc" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/> - <relationships> - <relationship kind="action" name="onClickMenuButton:"/> - <relationship kind="outlet" name="menuButton" candidateClass="UIBarButtonItem"/> - <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/> - </relationships> - </class> - <class className="server_list_vc_ipad" superclassName="server_list_vc"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc_ipad.h"/> - <relationships> - <relationship kind="action" name="cancelModalView:"/> - </relationships> - </class> - <class className="slideShowPreviewTable_vc" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/> - <relationships> - <relationship kind="action" name="startPrefSettings:"/> - <relationship kind="action" name="startPresentationAction:"/> - <relationship kind="outlet" name="prefButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> - </relationships> - </class> - <class className="slideShowPreviewTable_vc_ipad" superclassName="slideShowPreviewTable_vc"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_ipad.h"/> - </class> - <class className="slideShowSwipeInList_ipad" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList_ipad.h"/> - </class> - </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> diff --git a/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard b/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard index 579313de3768..0520eadf3367 100644 --- a/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard +++ b/ios/iosremote/fr.lproj/iPad_autosize_old.storyboard @@ -638,98 +638,6 @@ <image name="timer_settime_btn.png" width="60" height="60"/> <image name="timer_start_btn_dark.png" width="60" height="60"/> </resources> - <classes> - <class className="AboutViewController" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/AboutViewController.h"/> - <relationships> - <relationship kind="outlet" name="aboutWebView" candidateClass="UIWebView"/> - </relationships> - </class> - <class className="BasePresentationViewController" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/BasePresentationViewController.h"/> - <relationships> - <relationship kind="action" name="popOverUp:"/> - <relationship kind="outlet" name="NoteWebView" candidateClass="UIWebView"/> - <relationship kind="outlet" name="NotesView" candidateClass="UIView"/> - <relationship kind="outlet" name="clearButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="currentSlideImageView" candidateClass="UIImageView"/> - <relationship kind="outlet" name="gearButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="horizontalTableView" candidateClass="UITableView"/> - <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> - <relationship kind="outlet" name="nextButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="previousButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> - <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="stopWatchTimerScrollView" candidateClass="UIScrollView"/> - <relationship kind="outlet" name="stopWatchView" candidateClass="UIView"/> - <relationship kind="outlet" name="timeLabel" candidateClass="UILabel"/> - <relationship kind="outlet" name="timerClearButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="timerSetTimeButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="timerStartButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="timerTimeLabel" candidateClass="UILabel"/> - <relationship kind="outlet" name="timerView" candidateClass="UIView"/> - </relationships> - </class> - <class className="EditableTableViewCell" superclassName="UITableViewCell"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/> - </class> - <class className="LibONavigationController" superclassName="UINavigationController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/> - </class> - <class className="MainSplitViewController" superclassName="UISplitViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/MainSplitViewController.h"/> - </class> - <class className="WalkThroughContainerViewController" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/WalkThroughContainerViewController.h"/> - </class> - <class className="autoDismissKeyboardNavigationViewController" superclassName="LibONavigationController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/autoDismissKeyboardNavigationViewController.h"/> - </class> - <class className="newServerViewController" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/> - <relationships> - <relationship kind="action" name="save:"/> - <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/> - </relationships> - </class> - <class className="pinValidation_vc" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/> - <relationships> - <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/> - <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/> - </relationships> - </class> - <class className="server_list_vc" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/> - <relationships> - <relationship kind="action" name="onClickMenuButton:"/> - <relationship kind="outlet" name="menuButton" candidateClass="UIBarButtonItem"/> - <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/> - </relationships> - </class> - <class className="server_list_vc_ipad" superclassName="server_list_vc"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc_ipad.h"/> - <relationships> - <relationship kind="action" name="cancelModalView:"/> - </relationships> - </class> - <class className="slideShowPreviewTable_vc" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/> - <relationships> - <relationship kind="action" name="startPrefSettings:"/> - <relationship kind="action" name="startPresentationAction:"/> - <relationship kind="outlet" name="prefButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> - </relationships> - </class> - <class className="slideShowPreviewTable_vc_ipad" superclassName="slideShowPreviewTable_vc"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_ipad.h"/> - </class> - <class className="slideShowSwipeInList_ipad" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList_ipad.h"/> - </class> - </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> diff --git a/ios/iosremote/iosremote.xcodeproj/project.pbxproj b/ios/iosremote/iosremote.xcodeproj/project.pbxproj index 6459209cb1a1..53fa32718f6c 100644 --- a/ios/iosremote/iosremote.xcodeproj/project.pbxproj +++ b/ios/iosremote/iosremote.xcodeproj/project.pbxproj @@ -90,8 +90,6 @@ 8C26E5C617A5539D007DA4B7 /* UserDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8C26E5C517A5539D007DA4B7 /* UserDefaults.plist */; }; 8C26E5C917A5731D007DA4B7 /* autoDismissKeyboardNavigationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C26E5C817A5731D007DA4B7 /* autoDismissKeyboardNavigationViewController.m */; }; 8C26E5D017A58703007DA4B7 /* HorizontalSlideCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C26E5CF17A58703007DA4B7 /* HorizontalSlideCell.m */; }; - 8C26E5D317A5AFE8007DA4B7 /* slideshowRail.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C26E5D117A5AFE8007DA4B7 /* slideshowRail.png */; }; - 8C26E5D417A5AFE8007DA4B7 /* slideshowRail@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C26E5D217A5AFE8007DA4B7 /* slideshowRail@2x.png */; }; 8C26E5D717A68154007DA4B7 /* stopWatch.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C26E5D617A68154007DA4B7 /* stopWatch.m */; }; 8C3A648817DCBE9E004A77D9 /* timer_clear_btn_dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C3A648117DCBE9E004A77D9 /* timer_clear_btn_dark.png */; }; 8C3A648A17DCBE9E004A77D9 /* timer_pause_btn_dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C3A648317DCBE9E004A77D9 /* timer_pause_btn_dark.png */; }; @@ -105,10 +103,6 @@ 8CAD658C17A2F02000CFB661 /* slideShowPreviewTable_vc_iphone.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CAD658B17A2F02000CFB661 /* slideShowPreviewTable_vc_iphone.m */; }; 8CAD658F17A3250000CFB661 /* server_list_vc_ipad.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CAD658E17A3250000CFB661 /* server_list_vc_ipad.m */; }; 8CAD659517A3C2D400CFB661 /* BasePresentationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CAD659417A3C2D400CFB661 /* BasePresentationViewController.m */; }; - 8CAD659A17A3EFE700CFB661 /* arrow_left.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CAD659617A3EFE700CFB661 /* arrow_left.png */; }; - 8CAD659B17A3EFE700CFB661 /* arrow_left@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CAD659717A3EFE700CFB661 /* arrow_left@2x.png */; }; - 8CAD659C17A3EFE700CFB661 /* arrow_right.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CAD659817A3EFE700CFB661 /* arrow_right.png */; }; - 8CAD659D17A3EFE700CFB661 /* arrow_right@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CAD659917A3EFE700CFB661 /* arrow_right@2x.png */; }; 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 */; }; @@ -281,8 +275,6 @@ 8C26E5CA17A57C20007DA4B7 /* ControlVariables.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ControlVariables.h; path = iosremote/ControlVariables.h; sourceTree = "<group>"; }; 8C26E5CE17A58703007DA4B7 /* HorizontalSlideCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HorizontalSlideCell.h; path = iosremote/HorizontalSlideCell.h; sourceTree = "<group>"; }; 8C26E5CF17A58703007DA4B7 /* HorizontalSlideCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HorizontalSlideCell.m; path = iosremote/HorizontalSlideCell.m; sourceTree = "<group>"; }; - 8C26E5D117A5AFE8007DA4B7 /* slideshowRail.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = slideshowRail.png; sourceTree = "<group>"; }; - 8C26E5D217A5AFE8007DA4B7 /* slideshowRail@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "slideshowRail@2x.png"; sourceTree = "<group>"; }; 8C26E5D517A68154007DA4B7 /* stopWatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = stopWatch.h; path = iosremote/stopWatch.h; sourceTree = "<group>"; }; 8C26E5D617A68154007DA4B7 /* stopWatch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = stopWatch.m; path = iosremote/stopWatch.m; sourceTree = "<group>"; }; 8C3A648117DCBE9E004A77D9 /* timer_clear_btn_dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = timer_clear_btn_dark.png; path = iosremote/timer_clear_btn_dark.png; sourceTree = "<group>"; }; @@ -302,10 +294,6 @@ 8CAD658E17A3250000CFB661 /* server_list_vc_ipad.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = server_list_vc_ipad.m; path = iosremote/server_list_vc_ipad.m; sourceTree = "<group>"; }; 8CAD659317A3C2D400CFB661 /* BasePresentationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BasePresentationViewController.h; path = iosremote/BasePresentationViewController.h; sourceTree = "<group>"; }; 8CAD659417A3C2D400CFB661 /* BasePresentationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BasePresentationViewController.m; path = iosremote/BasePresentationViewController.m; sourceTree = "<group>"; }; - 8CAD659617A3EFE700CFB661 /* arrow_left.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = arrow_left.png; path = iosremote/arrow_left.png; sourceTree = "<group>"; }; - 8CAD659717A3EFE700CFB661 /* arrow_left@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "arrow_left@2x.png"; path = "iosremote/arrow_left@2x.png"; sourceTree = "<group>"; }; - 8CAD659817A3EFE700CFB661 /* arrow_right.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = arrow_right.png; path = iosremote/arrow_right.png; sourceTree = "<group>"; }; - 8CAD659917A3EFE700CFB661 /* arrow_right@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "arrow_right@2x.png"; path = "iosremote/arrow_right@2x.png"; sourceTree = "<group>"; }; 8CAD659E17A3F76300CFB661 /* slideShowSwipeInList_ipad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = slideShowSwipeInList_ipad.h; path = iosremote/slideShowSwipeInList_ipad.h; sourceTree = "<group>"; }; 8CAD659F17A3F76300CFB661 /* slideShowSwipeInList_ipad.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = slideShowSwipeInList_ipad.m; path = iosremote/slideShowSwipeInList_ipad.m; sourceTree = "<group>"; }; 8CAF3DDD17D0DFFD00F931E5 /* WTcontrol~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "WTcontrol~ipad.png"; path = "iosremote/WTcontrol~ipad.png"; sourceTree = "<group>"; }; @@ -529,8 +517,6 @@ 8C19F43217B056B3005BDB61 /* navBarButtonNormal@2x.png */, 8C19F42517B04E7C005BDB61 /* navBarBackground@2x.png */, 8C19F42617B04E7C005BDB61 /* navBarBackground.png */, - 8C26E5D117A5AFE8007DA4B7 /* slideshowRail.png */, - 8C26E5D217A5AFE8007DA4B7 /* slideshowRail@2x.png */, 8C0DC84617A45B160099E5AE /* libO_icon.png */, 8C0DC83E17A4185A0099E5AE /* nextButton_normal.png */, 8C0DC83F17A4185A0099E5AE /* nextButton_normal@2x.png */, @@ -540,10 +526,6 @@ 8C0DC83717A4177C0099E5AE /* nextButton_pressed@2x.png */, 8C0DC83817A4177C0099E5AE /* previousButton_pressed.png */, 8C0DC83917A4177C0099E5AE /* previousButton_pressed@2x.png */, - 8CAD659617A3EFE700CFB661 /* arrow_left.png */, - 8CAD659717A3EFE700CFB661 /* arrow_left@2x.png */, - 8CAD659817A3EFE700CFB661 /* arrow_right.png */, - 8CAD659917A3EFE700CFB661 /* arrow_right@2x.png */, 8C1A170017A2854300B4BB3C /* iosremote_ipad_icon@2x.png */, 8C1A16FE17A2853F00B4BB3C /* iosremote_ipad_icon.png */, 8C1A16FC17A2853700B4BB3C /* iosremote_iphone_icon.png */, @@ -705,20 +687,12 @@ 8C1A170917A28E6500B4BB3C /* iPhone */ = { isa = PBXGroup; children = ( - 8C23B46217DA03D700FB4DE6 /* Views */, 8CAD658917A2F00500CFB661 /* Controllers */, 57DF0A83178FFFAB008B2D3D /* iPhone_autosize.storyboard */, ); name = iPhone; sourceTree = "<group>"; }; - 8C23B46217DA03D700FB4DE6 /* Views */ = { - isa = PBXGroup; - children = ( - ); - name = Views; - sourceTree = "<group>"; - }; 8CAD658217A2E81F00CFB661 /* Controllers */ = { isa = PBXGroup; children = ( @@ -923,10 +897,6 @@ 8C1A16FF17A2853F00B4BB3C /* iosremote_ipad_icon.png in Resources */, 8C1A170117A2854300B4BB3C /* iosremote_ipad_icon@2x.png in Resources */, 8C06B31E17B7ED1E002F5CF8 /* iPad_autosize.storyboard in Resources */, - 8CAD659A17A3EFE700CFB661 /* arrow_left.png in Resources */, - 8CAD659B17A3EFE700CFB661 /* arrow_left@2x.png in Resources */, - 8CAD659C17A3EFE700CFB661 /* arrow_right.png in Resources */, - 8CAD659D17A3EFE700CFB661 /* arrow_right@2x.png in Resources */, 8C0DC83A17A4177C0099E5AE /* nextButton_pressed.png in Resources */, 8C0DC83B17A4177C0099E5AE /* nextButton_pressed@2x.png in Resources */, 8C0DC83C17A4177C0099E5AE /* previousButton_pressed.png in Resources */, @@ -937,8 +907,6 @@ 8C0DC84517A4185A0099E5AE /* previousButton_normal@2x.png in Resources */, 8C0DC84717A45B160099E5AE /* libO_icon.png in Resources */, 8C26E5C617A5539D007DA4B7 /* UserDefaults.plist in Resources */, - 8C26E5D317A5AFE8007DA4B7 /* slideshowRail.png in Resources */, - 8C26E5D417A5AFE8007DA4B7 /* slideshowRail@2x.png in Resources */, 8C19F42717B04E7C005BDB61 /* navBarBackground@2x.png in Resources */, 8C19F42817B04E7C005BDB61 /* navBarBackground.png in Resources */, 8C19F43317B056B3005BDB61 /* navBarButtonNormal@2x.png in Resources */, diff --git a/ios/iosremote/iosremote/AppDelegate.m b/ios/iosremote/iosremote/AppDelegate.m index 2a8937dc6bda..d239acf8e8c2 100644 --- a/ios/iosremote/iosremote/AppDelegate.m +++ b/ios/iosremote/iosremote/AppDelegate.m @@ -34,6 +34,11 @@ blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0] ofType:@"plist"]; NSDictionary *appDefaults = [NSDictionary dictionaryWithContentsOfFile:defaultsPath]; [[NSUserDefaults standardUserDefaults] registerDefaults:appDefaults]; + + NSString *defaultSettingsPath = [[NSBundle mainBundle] pathForResource:@"Root" + ofType:@"plist"]; + NSDictionary *appDefaultSettings = [NSDictionary dictionaryWithContentsOfFile:defaultSettingsPath]; + [[NSUserDefaults standardUserDefaults] registerDefaults:appDefaultSettings]; [[UIBarButtonItem appearanceWhenContainedIn:[UINavigationBar class], nil] setBackgroundImage:[UIImage imageNamed:@"navBarButtonNormal"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault]; diff --git a/ios/iosremote/iosremote/Timer.m b/ios/iosremote/iosremote/Timer.m index 5e7754857341..269ff9c33efb 100644 --- a/ios/iosremote/iosremote/Timer.m +++ b/ios/iosremote/iosremote/Timer.m @@ -113,7 +113,6 @@ int vibrationCount; // On ipad this just get ignored if (kCountDownTimerVibration && vibrationCount < 3){ vibrationCount++; - NSLog(@"Vibrating..."); AudioServicesPlaySystemSound(kSystemSoundID_Vibrate); } } diff --git a/ios/iosremote/iosremote/arrow_left.png b/ios/iosremote/iosremote/arrow_left.png Binary files differdeleted file mode 100644 index d99560fea1b6..000000000000 --- a/ios/iosremote/iosremote/arrow_left.png +++ /dev/null diff --git a/ios/iosremote/iosremote/arrow_left@2x.png b/ios/iosremote/iosremote/arrow_left@2x.png Binary files differdeleted file mode 100644 index dba2497f936d..000000000000 --- a/ios/iosremote/iosremote/arrow_left@2x.png +++ /dev/null diff --git a/ios/iosremote/iosremote/arrow_right.png b/ios/iosremote/iosremote/arrow_right.png Binary files differdeleted file mode 100644 index e271d4655f8e..000000000000 --- a/ios/iosremote/iosremote/arrow_right.png +++ /dev/null diff --git a/ios/iosremote/iosremote/arrow_right@2x.png b/ios/iosremote/iosremote/arrow_right@2x.png Binary files differdeleted file mode 100644 index 44be9d652a00..000000000000 --- a/ios/iosremote/iosremote/arrow_right@2x.png +++ /dev/null diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard index c0a604af9ff0..aff6b1535051 100644 --- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard +++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard @@ -252,7 +252,7 @@ </connections> </button> </subviews> - <color key="backgroundColor" red="0.92941176469999998" green="0.92941176469999998" blue="0.92941176469999998" alpha="1" colorSpace="calibratedRGB"/> + <color key="backgroundColor" red="0.96862745098039216" green="0.96862745098039216" blue="0.96862745098039216" alpha="1" colorSpace="calibratedRGB"/> </view> <navigationItem key="navigationItem" id="AXt-EI-0Z5"/> <connections> @@ -561,8 +561,6 @@ <color key="titleColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> </state> <connections> - <action selector="accPointerAction:" destination="Ivv-3X-Nhr" eventType="touchUpOutside" id="F8W-M1-8Lb"/> - <action selector="accPointerAction:" destination="Ivv-3X-Nhr" eventType="touchUpInside" id="Lb1-HF-wdh"/> <action selector="pointerAction:" destination="Ivv-3X-Nhr" eventType="touchDown" id="gK9-ff-k1g"/> </connections> </button> @@ -625,13 +623,93 @@ <image name="timer_settime_btn.png" width="60" height="60"/> <image name="timer_start_btn.png" width="60" height="60"/> </resources> + <classes> + <class className="AboutViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/AboutViewController.h"/> + <relationships> + <relationship kind="outlet" name="aboutWebView" candidateClass="UIWebView"/> + </relationships> + </class> + <class className="EditableTableViewCell" superclassName="UITableViewCell"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/> + </class> + <class className="LibONavigationController" superclassName="UINavigationController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/> + </class> + <class className="SWRevealViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/SWRevealViewController.h"/> + <relationships> + <relationship kind="action" name="callDP:"/> + </relationships> + </class> + <class className="WalkThroughContainerViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/WalkThroughContainerViewController.h"/> + </class> + <class className="newServerViewController" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/> + <relationships> + <relationship kind="action" name="save:"/> + <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/> + </relationships> + </class> + <class className="pinValidation_vc" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/> + <relationships> + <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/> + <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/> + </relationships> + </class> + <class className="server_list_vc" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/> + <relationships> + <relationship kind="action" name="onClickMenuButton:"/> + <relationship kind="outlet" name="menuButton" candidateClass="UIBarButtonItem"/> + <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/> + </relationships> + </class> + <class className="slideShowPreviewTable_vc" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/> + <relationships> + <relationship kind="action" name="startPrefSettings:"/> + <relationship kind="action" name="startPresentationAction:"/> + <relationship kind="outlet" name="prefButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> + </relationships> + </class> + <class className="slideShowPreviewTable_vc_iphone" superclassName="slideShowPreviewTable_vc"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_iphone.h"/> + </class> + <class className="slideShowSwipeInList" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList.h"/> + </class> + <class className="slideShow_vc" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShow_vc.h"/> + <relationships> + <relationship kind="action" name="nextSlideAction:"/> + <relationship kind="action" name="pointerAction:"/> + <relationship kind="action" name="previousSlideAction:"/> + <relationship kind="outlet" name="blockingView" candidateClass="UIView"/> + <relationship kind="outlet" name="bottomView" candidateClass="UIView"/> + <relationship kind="outlet" name="lecturer_notes" candidateClass="UIWebView"/> + <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> + <relationship kind="outlet" name="notesView" candidateClass="UIView"/> + <relationship kind="outlet" name="pointerBtn" candidateClass="UIButton"/> + <relationship kind="outlet" name="revealButtonItem" candidateClass="UIBarButtonItem"/> + <relationship kind="outlet" name="secondarySlideView" candidateClass="UIImageView"/> + <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> + <relationship kind="outlet" name="slideView" candidateClass="UIImageView"/> + <relationship kind="outlet" name="touchPointerImage" candidateClass="UIImageView"/> + </relationships> + </class> + </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> <simulatedScreenMetrics key="destination" type="retina4"/> </simulatedMetricsContainer> <inferredMetricsTieBreakers> + <segue reference="5gZ-R8-9y7"/> <segue reference="UPp-kY-X3T"/> - <segue reference="0SL-2n-fWY"/> </inferredMetricsTieBreakers> </document>
\ No newline at end of file diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard index c0a604af9ff0..aff6b1535051 100644 --- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard +++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard @@ -252,7 +252,7 @@ </connections> </button> </subviews> - <color key="backgroundColor" red="0.92941176469999998" green="0.92941176469999998" blue="0.92941176469999998" alpha="1" colorSpace="calibratedRGB"/> + <color key="backgroundColor" red="0.96862745098039216" green="0.96862745098039216" blue="0.96862745098039216" alpha="1" colorSpace="calibratedRGB"/> </view> <navigationItem key="navigationItem" id="AXt-EI-0Z5"/> <connections> @@ -561,8 +561,6 @@ <color key="titleColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> </state> <connections> - <action selector="accPointerAction:" destination="Ivv-3X-Nhr" eventType="touchUpOutside" id="F8W-M1-8Lb"/> - <action selector="accPointerAction:" destination="Ivv-3X-Nhr" eventType="touchUpInside" id="Lb1-HF-wdh"/> <action selector="pointerAction:" destination="Ivv-3X-Nhr" eventType="touchDown" id="gK9-ff-k1g"/> </connections> </button> @@ -625,13 +623,93 @@ <image name="timer_settime_btn.png" width="60" height="60"/> <image name="timer_start_btn.png" width="60" height="60"/> </resources> + <classes> + <class className="AboutViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/AboutViewController.h"/> + <relationships> + <relationship kind="outlet" name="aboutWebView" candidateClass="UIWebView"/> + </relationships> + </class> + <class className="EditableTableViewCell" superclassName="UITableViewCell"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/> + </class> + <class className="LibONavigationController" superclassName="UINavigationController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/> + </class> + <class className="SWRevealViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/SWRevealViewController.h"/> + <relationships> + <relationship kind="action" name="callDP:"/> + </relationships> + </class> + <class className="WalkThroughContainerViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/WalkThroughContainerViewController.h"/> + </class> + <class className="newServerViewController" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/> + <relationships> + <relationship kind="action" name="save:"/> + <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/> + </relationships> + </class> + <class className="pinValidation_vc" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/> + <relationships> + <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/> + <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/> + </relationships> + </class> + <class className="server_list_vc" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/> + <relationships> + <relationship kind="action" name="onClickMenuButton:"/> + <relationship kind="outlet" name="menuButton" candidateClass="UIBarButtonItem"/> + <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/> + </relationships> + </class> + <class className="slideShowPreviewTable_vc" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/> + <relationships> + <relationship kind="action" name="startPrefSettings:"/> + <relationship kind="action" name="startPresentationAction:"/> + <relationship kind="outlet" name="prefButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> + </relationships> + </class> + <class className="slideShowPreviewTable_vc_iphone" superclassName="slideShowPreviewTable_vc"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_iphone.h"/> + </class> + <class className="slideShowSwipeInList" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList.h"/> + </class> + <class className="slideShow_vc" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShow_vc.h"/> + <relationships> + <relationship kind="action" name="nextSlideAction:"/> + <relationship kind="action" name="pointerAction:"/> + <relationship kind="action" name="previousSlideAction:"/> + <relationship kind="outlet" name="blockingView" candidateClass="UIView"/> + <relationship kind="outlet" name="bottomView" candidateClass="UIView"/> + <relationship kind="outlet" name="lecturer_notes" candidateClass="UIWebView"/> + <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> + <relationship kind="outlet" name="notesView" candidateClass="UIView"/> + <relationship kind="outlet" name="pointerBtn" candidateClass="UIButton"/> + <relationship kind="outlet" name="revealButtonItem" candidateClass="UIBarButtonItem"/> + <relationship kind="outlet" name="secondarySlideView" candidateClass="UIImageView"/> + <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> + <relationship kind="outlet" name="slideView" candidateClass="UIImageView"/> + <relationship kind="outlet" name="touchPointerImage" candidateClass="UIImageView"/> + </relationships> + </class> + </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> <simulatedScreenMetrics key="destination" type="retina4"/> </simulatedMetricsContainer> <inferredMetricsTieBreakers> + <segue reference="5gZ-R8-9y7"/> <segue reference="UPp-kY-X3T"/> - <segue reference="0SL-2n-fWY"/> </inferredMetricsTieBreakers> </document>
\ No newline at end of file diff --git a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard index 832c7ae9f0e0..8e1cf0dd987e 100644 --- a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard +++ b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard @@ -254,7 +254,7 @@ Contrôle Distant</string> </connections> </button> </subviews> - <color key="backgroundColor" red="0.92941176469999998" green="0.92941176469999998" blue="0.92941176469999998" alpha="1" colorSpace="calibratedRGB"/> + <color key="backgroundColor" red="0.96862745098039216" green="0.96862745098039216" blue="0.96862745098039216" alpha="1" colorSpace="calibratedRGB"/> </view> <navigationItem key="navigationItem" id="AXt-EI-0Z5"/> <connections> @@ -563,8 +563,6 @@ Contrôle Distant</string> <color key="titleColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> </state> <connections> - <action selector="accPointerAction:" destination="Ivv-3X-Nhr" eventType="touchUpOutside" id="F8W-M1-8Lb"/> - <action selector="accPointerAction:" destination="Ivv-3X-Nhr" eventType="touchUpInside" id="Lb1-HF-wdh"/> <action selector="pointerAction:" destination="Ivv-3X-Nhr" eventType="touchDown" id="gK9-ff-k1g"/> </connections> </button> @@ -627,13 +625,93 @@ Contrôle Distant</string> <image name="timer_settime_btn.png" width="60" height="60"/> <image name="timer_start_btn.png" width="60" height="60"/> </resources> + <classes> + <class className="AboutViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/AboutViewController.h"/> + <relationships> + <relationship kind="outlet" name="aboutWebView" candidateClass="UIWebView"/> + </relationships> + </class> + <class className="EditableTableViewCell" superclassName="UITableViewCell"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/> + </class> + <class className="LibONavigationController" superclassName="UINavigationController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/> + </class> + <class className="SWRevealViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/SWRevealViewController.h"/> + <relationships> + <relationship kind="action" name="callDP:"/> + </relationships> + </class> + <class className="WalkThroughContainerViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/WalkThroughContainerViewController.h"/> + </class> + <class className="newServerViewController" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/> + <relationships> + <relationship kind="action" name="save:"/> + <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/> + </relationships> + </class> + <class className="pinValidation_vc" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/> + <relationships> + <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/> + <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/> + </relationships> + </class> + <class className="server_list_vc" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/> + <relationships> + <relationship kind="action" name="onClickMenuButton:"/> + <relationship kind="outlet" name="menuButton" candidateClass="UIBarButtonItem"/> + <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/> + </relationships> + </class> + <class className="slideShowPreviewTable_vc" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/> + <relationships> + <relationship kind="action" name="startPrefSettings:"/> + <relationship kind="action" name="startPresentationAction:"/> + <relationship kind="outlet" name="prefButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> + </relationships> + </class> + <class className="slideShowPreviewTable_vc_iphone" superclassName="slideShowPreviewTable_vc"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_iphone.h"/> + </class> + <class className="slideShowSwipeInList" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList.h"/> + </class> + <class className="slideShow_vc" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShow_vc.h"/> + <relationships> + <relationship kind="action" name="nextSlideAction:"/> + <relationship kind="action" name="pointerAction:"/> + <relationship kind="action" name="previousSlideAction:"/> + <relationship kind="outlet" name="blockingView" candidateClass="UIView"/> + <relationship kind="outlet" name="bottomView" candidateClass="UIView"/> + <relationship kind="outlet" name="lecturer_notes" candidateClass="UIWebView"/> + <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> + <relationship kind="outlet" name="notesView" candidateClass="UIView"/> + <relationship kind="outlet" name="pointerBtn" candidateClass="UIButton"/> + <relationship kind="outlet" name="revealButtonItem" candidateClass="UIBarButtonItem"/> + <relationship kind="outlet" name="secondarySlideView" candidateClass="UIImageView"/> + <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> + <relationship kind="outlet" name="slideView" candidateClass="UIImageView"/> + <relationship kind="outlet" name="touchPointerImage" candidateClass="UIImageView"/> + </relationships> + </class> + </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> <simulatedScreenMetrics key="destination" type="retina4"/> </simulatedMetricsContainer> <inferredMetricsTieBreakers> + <segue reference="5gZ-R8-9y7"/> <segue reference="UPp-kY-X3T"/> - <segue reference="0SL-2n-fWY"/> </inferredMetricsTieBreakers> </document>
\ No newline at end of file diff --git a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard index 832c7ae9f0e0..8e1cf0dd987e 100644 --- a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard +++ b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard @@ -254,7 +254,7 @@ Contrôle Distant</string> </connections> </button> </subviews> - <color key="backgroundColor" red="0.92941176469999998" green="0.92941176469999998" blue="0.92941176469999998" alpha="1" colorSpace="calibratedRGB"/> + <color key="backgroundColor" red="0.96862745098039216" green="0.96862745098039216" blue="0.96862745098039216" alpha="1" colorSpace="calibratedRGB"/> </view> <navigationItem key="navigationItem" id="AXt-EI-0Z5"/> <connections> @@ -563,8 +563,6 @@ Contrôle Distant</string> <color key="titleColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> </state> <connections> - <action selector="accPointerAction:" destination="Ivv-3X-Nhr" eventType="touchUpOutside" id="F8W-M1-8Lb"/> - <action selector="accPointerAction:" destination="Ivv-3X-Nhr" eventType="touchUpInside" id="Lb1-HF-wdh"/> <action selector="pointerAction:" destination="Ivv-3X-Nhr" eventType="touchDown" id="gK9-ff-k1g"/> </connections> </button> @@ -627,13 +625,93 @@ Contrôle Distant</string> <image name="timer_settime_btn.png" width="60" height="60"/> <image name="timer_start_btn.png" width="60" height="60"/> </resources> + <classes> + <class className="AboutViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/AboutViewController.h"/> + <relationships> + <relationship kind="outlet" name="aboutWebView" candidateClass="UIWebView"/> + </relationships> + </class> + <class className="EditableTableViewCell" superclassName="UITableViewCell"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/> + </class> + <class className="LibONavigationController" superclassName="UINavigationController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/> + </class> + <class className="SWRevealViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/SWRevealViewController.h"/> + <relationships> + <relationship kind="action" name="callDP:"/> + </relationships> + </class> + <class className="WalkThroughContainerViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/WalkThroughContainerViewController.h"/> + </class> + <class className="newServerViewController" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/> + <relationships> + <relationship kind="action" name="save:"/> + <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/> + </relationships> + </class> + <class className="pinValidation_vc" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/> + <relationships> + <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/> + <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/> + </relationships> + </class> + <class className="server_list_vc" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/> + <relationships> + <relationship kind="action" name="onClickMenuButton:"/> + <relationship kind="outlet" name="menuButton" candidateClass="UIBarButtonItem"/> + <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/> + </relationships> + </class> + <class className="slideShowPreviewTable_vc" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/> + <relationships> + <relationship kind="action" name="startPrefSettings:"/> + <relationship kind="action" name="startPresentationAction:"/> + <relationship kind="outlet" name="prefButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> + </relationships> + </class> + <class className="slideShowPreviewTable_vc_iphone" superclassName="slideShowPreviewTable_vc"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_iphone.h"/> + </class> + <class className="slideShowSwipeInList" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList.h"/> + </class> + <class className="slideShow_vc" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShow_vc.h"/> + <relationships> + <relationship kind="action" name="nextSlideAction:"/> + <relationship kind="action" name="pointerAction:"/> + <relationship kind="action" name="previousSlideAction:"/> + <relationship kind="outlet" name="blockingView" candidateClass="UIView"/> + <relationship kind="outlet" name="bottomView" candidateClass="UIView"/> + <relationship kind="outlet" name="lecturer_notes" candidateClass="UIWebView"/> + <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> + <relationship kind="outlet" name="notesView" candidateClass="UIView"/> + <relationship kind="outlet" name="pointerBtn" candidateClass="UIButton"/> + <relationship kind="outlet" name="revealButtonItem" candidateClass="UIBarButtonItem"/> + <relationship kind="outlet" name="secondarySlideView" candidateClass="UIImageView"/> + <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> + <relationship kind="outlet" name="slideView" candidateClass="UIImageView"/> + <relationship kind="outlet" name="touchPointerImage" candidateClass="UIImageView"/> + </relationships> + </class> + </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> <simulatedScreenMetrics key="destination" type="retina4"/> </simulatedMetricsContainer> <inferredMetricsTieBreakers> + <segue reference="5gZ-R8-9y7"/> <segue reference="UPp-kY-X3T"/> - <segue reference="0SL-2n-fWY"/> </inferredMetricsTieBreakers> </document>
\ No newline at end of file diff --git a/ios/iosremote/iosremote/slideShow_vc_iphone.m b/ios/iosremote/iosremote/slideShow_vc_iphone.m index 148166662ded..9a7bddf3cd6c 100644 --- a/ios/iosremote/iosremote/slideShow_vc_iphone.m +++ b/ios/iosremote/iosremote/slideShow_vc_iphone.m @@ -265,6 +265,7 @@ { [[NSNotificationCenter defaultCenter] removeObserver:self.slideShowFinishedObserver]; [[NSNotificationCenter defaultCenter] removeObserver:self.slideShowImageNoteReadyObserver]; + [[(slideShowSwipeInList *)self.revealViewController.rearViewController timer] clear]; [super viewDidDisappear:animated]; } diff --git a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard index 81dd61476688..6c5be556c739 100644 --- a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard +++ b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard @@ -252,7 +252,7 @@ </connections> </button> </subviews> - <color key="backgroundColor" red="0.92941176469999998" green="0.92941176469999998" blue="0.92941176469999998" alpha="1" colorSpace="calibratedRGB"/> + <color key="backgroundColor" red="0.96862745098039216" green="0.96862745098039216" blue="0.96862745098039216" alpha="1" colorSpace="calibratedRGB"/> </view> <navigationItem key="navigationItem" id="AXt-EI-0Z5"/> <connections> @@ -561,8 +561,6 @@ <color key="titleColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> </state> <connections> - <action selector="accPointerAction:" destination="Ivv-3X-Nhr" eventType="touchUpOutside" id="F8W-M1-8Lb"/> - <action selector="accPointerAction:" destination="Ivv-3X-Nhr" eventType="touchUpInside" id="Lb1-HF-wdh"/> <action selector="pointerAction:" destination="Ivv-3X-Nhr" eventType="touchDown" id="gK9-ff-k1g"/> </connections> </button> @@ -625,13 +623,93 @@ <image name="timer_settime_btn.png" width="60" height="60"/> <image name="timer_start_btn.png" width="60" height="60"/> </resources> + <classes> + <class className="AboutViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/AboutViewController.h"/> + <relationships> + <relationship kind="outlet" name="aboutWebView" candidateClass="UIWebView"/> + </relationships> + </class> + <class className="EditableTableViewCell" superclassName="UITableViewCell"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/> + </class> + <class className="LibONavigationController" superclassName="UINavigationController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/> + </class> + <class className="SWRevealViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/SWRevealViewController.h"/> + <relationships> + <relationship kind="action" name="callDP:"/> + </relationships> + </class> + <class className="WalkThroughContainerViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/WalkThroughContainerViewController.h"/> + </class> + <class className="newServerViewController" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/> + <relationships> + <relationship kind="action" name="save:"/> + <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/> + </relationships> + </class> + <class className="pinValidation_vc" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/> + <relationships> + <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/> + <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/> + </relationships> + </class> + <class className="server_list_vc" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/> + <relationships> + <relationship kind="action" name="onClickMenuButton:"/> + <relationship kind="outlet" name="menuButton" candidateClass="UIBarButtonItem"/> + <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/> + </relationships> + </class> + <class className="slideShowPreviewTable_vc" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/> + <relationships> + <relationship kind="action" name="startPrefSettings:"/> + <relationship kind="action" name="startPresentationAction:"/> + <relationship kind="outlet" name="prefButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> + </relationships> + </class> + <class className="slideShowPreviewTable_vc_iphone" superclassName="slideShowPreviewTable_vc"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_iphone.h"/> + </class> + <class className="slideShowSwipeInList" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList.h"/> + </class> + <class className="slideShow_vc" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShow_vc.h"/> + <relationships> + <relationship kind="action" name="nextSlideAction:"/> + <relationship kind="action" name="pointerAction:"/> + <relationship kind="action" name="previousSlideAction:"/> + <relationship kind="outlet" name="blockingView" candidateClass="UIView"/> + <relationship kind="outlet" name="bottomView" candidateClass="UIView"/> + <relationship kind="outlet" name="lecturer_notes" candidateClass="UIWebView"/> + <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> + <relationship kind="outlet" name="notesView" candidateClass="UIView"/> + <relationship kind="outlet" name="pointerBtn" candidateClass="UIButton"/> + <relationship kind="outlet" name="revealButtonItem" candidateClass="UIBarButtonItem"/> + <relationship kind="outlet" name="secondarySlideView" candidateClass="UIImageView"/> + <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> + <relationship kind="outlet" name="slideView" candidateClass="UIImageView"/> + <relationship kind="outlet" name="touchPointerImage" candidateClass="UIImageView"/> + </relationships> + </class> + </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> <simulatedScreenMetrics key="destination" type="retina4"/> </simulatedMetricsContainer> <inferredMetricsTieBreakers> + <segue reference="5gZ-R8-9y7"/> <segue reference="UPp-kY-X3T"/> - <segue reference="0SL-2n-fWY"/> </inferredMetricsTieBreakers> </document>
\ No newline at end of file diff --git a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard index 81dd61476688..6c5be556c739 100644 --- a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard +++ b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard @@ -252,7 +252,7 @@ </connections> </button> </subviews> - <color key="backgroundColor" red="0.92941176469999998" green="0.92941176469999998" blue="0.92941176469999998" alpha="1" colorSpace="calibratedRGB"/> + <color key="backgroundColor" red="0.96862745098039216" green="0.96862745098039216" blue="0.96862745098039216" alpha="1" colorSpace="calibratedRGB"/> </view> <navigationItem key="navigationItem" id="AXt-EI-0Z5"/> <connections> @@ -561,8 +561,6 @@ <color key="titleColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> </state> <connections> - <action selector="accPointerAction:" destination="Ivv-3X-Nhr" eventType="touchUpOutside" id="F8W-M1-8Lb"/> - <action selector="accPointerAction:" destination="Ivv-3X-Nhr" eventType="touchUpInside" id="Lb1-HF-wdh"/> <action selector="pointerAction:" destination="Ivv-3X-Nhr" eventType="touchDown" id="gK9-ff-k1g"/> </connections> </button> @@ -625,13 +623,93 @@ <image name="timer_settime_btn.png" width="60" height="60"/> <image name="timer_start_btn.png" width="60" height="60"/> </resources> + <classes> + <class className="AboutViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/AboutViewController.h"/> + <relationships> + <relationship kind="outlet" name="aboutWebView" candidateClass="UIWebView"/> + </relationships> + </class> + <class className="EditableTableViewCell" superclassName="UITableViewCell"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/> + </class> + <class className="LibONavigationController" superclassName="UINavigationController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/> + </class> + <class className="SWRevealViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/SWRevealViewController.h"/> + <relationships> + <relationship kind="action" name="callDP:"/> + </relationships> + </class> + <class className="WalkThroughContainerViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/WalkThroughContainerViewController.h"/> + </class> + <class className="newServerViewController" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/> + <relationships> + <relationship kind="action" name="save:"/> + <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/> + </relationships> + </class> + <class className="pinValidation_vc" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/> + <relationships> + <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/> + <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/> + </relationships> + </class> + <class className="server_list_vc" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/> + <relationships> + <relationship kind="action" name="onClickMenuButton:"/> + <relationship kind="outlet" name="menuButton" candidateClass="UIBarButtonItem"/> + <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/> + </relationships> + </class> + <class className="slideShowPreviewTable_vc" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/> + <relationships> + <relationship kind="action" name="startPrefSettings:"/> + <relationship kind="action" name="startPresentationAction:"/> + <relationship kind="outlet" name="prefButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> + <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> + </relationships> + </class> + <class className="slideShowPreviewTable_vc_iphone" superclassName="slideShowPreviewTable_vc"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_iphone.h"/> + </class> + <class className="slideShowSwipeInList" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList.h"/> + </class> + <class className="slideShow_vc" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShow_vc.h"/> + <relationships> + <relationship kind="action" name="nextSlideAction:"/> + <relationship kind="action" name="pointerAction:"/> + <relationship kind="action" name="previousSlideAction:"/> + <relationship kind="outlet" name="blockingView" candidateClass="UIView"/> + <relationship kind="outlet" name="bottomView" candidateClass="UIView"/> + <relationship kind="outlet" name="lecturer_notes" candidateClass="UIWebView"/> + <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> + <relationship kind="outlet" name="notesView" candidateClass="UIView"/> + <relationship kind="outlet" name="pointerBtn" candidateClass="UIButton"/> + <relationship kind="outlet" name="revealButtonItem" candidateClass="UIBarButtonItem"/> + <relationship kind="outlet" name="secondarySlideView" candidateClass="UIImageView"/> + <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> + <relationship kind="outlet" name="slideView" candidateClass="UIImageView"/> + <relationship kind="outlet" name="touchPointerImage" candidateClass="UIImageView"/> + </relationships> + </class> + </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> <simulatedScreenMetrics key="destination" type="retina4"/> </simulatedMetricsContainer> <inferredMetricsTieBreakers> + <segue reference="5gZ-R8-9y7"/> <segue reference="UPp-kY-X3T"/> - <segue reference="0SL-2n-fWY"/> </inferredMetricsTieBreakers> </document>
\ No newline at end of file diff --git a/ios/iosremote/slideshowRail.png b/ios/iosremote/slideshowRail.png Binary files differdeleted file mode 100644 index db4a03cae739..000000000000 --- a/ios/iosremote/slideshowRail.png +++ /dev/null diff --git a/ios/iosremote/slideshowRail@2x.png b/ios/iosremote/slideshowRail@2x.png Binary files differdeleted file mode 100644 index f736b58ad81a..000000000000 --- a/ios/iosremote/slideshowRail@2x.png +++ /dev/null diff --git a/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard b/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard index e6dd3f14213e..8b1e36f977c2 100644 --- a/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard +++ b/ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard @@ -638,98 +638,6 @@ <image name="timer_settime_btn.png" width="60" height="60"/> <image name="timer_start_btn_dark.png" width="60" height="60"/> </resources> - <classes> - <class className="AboutViewController" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/AboutViewController.h"/> - <relationships> - <relationship kind="outlet" name="aboutWebView" candidateClass="UIWebView"/> - </relationships> - </class> - <class className="BasePresentationViewController" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/BasePresentationViewController.h"/> - <relationships> - <relationship kind="action" name="popOverUp:"/> - <relationship kind="outlet" name="NoteWebView" candidateClass="UIWebView"/> - <relationship kind="outlet" name="NotesView" candidateClass="UIView"/> - <relationship kind="outlet" name="clearButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="currentSlideImageView" candidateClass="UIImageView"/> - <relationship kind="outlet" name="gearButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="horizontalTableView" candidateClass="UITableView"/> - <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> - <relationship kind="outlet" name="nextButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="previousButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> - <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="stopWatchTimerScrollView" candidateClass="UIScrollView"/> - <relationship kind="outlet" name="stopWatchView" candidateClass="UIView"/> - <relationship kind="outlet" name="timeLabel" candidateClass="UILabel"/> - <relationship kind="outlet" name="timerClearButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="timerSetTimeButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="timerStartButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="timerTimeLabel" candidateClass="UILabel"/> - <relationship kind="outlet" name="timerView" candidateClass="UIView"/> - </relationships> - </class> - <class className="EditableTableViewCell" superclassName="UITableViewCell"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/> - </class> - <class className="LibONavigationController" superclassName="UINavigationController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/> - </class> - <class className="MainSplitViewController" superclassName="UISplitViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/MainSplitViewController.h"/> - </class> - <class className="WalkThroughContainerViewController" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/WalkThroughContainerViewController.h"/> - </class> - <class className="autoDismissKeyboardNavigationViewController" superclassName="LibONavigationController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/autoDismissKeyboardNavigationViewController.h"/> - </class> - <class className="newServerViewController" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/> - <relationships> - <relationship kind="action" name="save:"/> - <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/> - </relationships> - </class> - <class className="pinValidation_vc" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/> - <relationships> - <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/> - <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/> - </relationships> - </class> - <class className="server_list_vc" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/> - <relationships> - <relationship kind="action" name="onClickMenuButton:"/> - <relationship kind="outlet" name="menuButton" candidateClass="UIBarButtonItem"/> - <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/> - </relationships> - </class> - <class className="server_list_vc_ipad" superclassName="server_list_vc"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc_ipad.h"/> - <relationships> - <relationship kind="action" name="cancelModalView:"/> - </relationships> - </class> - <class className="slideShowPreviewTable_vc" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/> - <relationships> - <relationship kind="action" name="startPrefSettings:"/> - <relationship kind="action" name="startPresentationAction:"/> - <relationship kind="outlet" name="prefButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> - </relationships> - </class> - <class className="slideShowPreviewTable_vc_ipad" superclassName="slideShowPreviewTable_vc"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_ipad.h"/> - </class> - <class className="slideShowSwipeInList_ipad" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList_ipad.h"/> - </class> - </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> diff --git a/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard b/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard index e6dd3f14213e..8b1e36f977c2 100644 --- a/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard +++ b/ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard @@ -638,98 +638,6 @@ <image name="timer_settime_btn.png" width="60" height="60"/> <image name="timer_start_btn_dark.png" width="60" height="60"/> </resources> - <classes> - <class className="AboutViewController" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/AboutViewController.h"/> - <relationships> - <relationship kind="outlet" name="aboutWebView" candidateClass="UIWebView"/> - </relationships> - </class> - <class className="BasePresentationViewController" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/BasePresentationViewController.h"/> - <relationships> - <relationship kind="action" name="popOverUp:"/> - <relationship kind="outlet" name="NoteWebView" candidateClass="UIWebView"/> - <relationship kind="outlet" name="NotesView" candidateClass="UIView"/> - <relationship kind="outlet" name="clearButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="currentSlideImageView" candidateClass="UIImageView"/> - <relationship kind="outlet" name="gearButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="horizontalTableView" candidateClass="UITableView"/> - <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/> - <relationship kind="outlet" name="nextButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="previousButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/> - <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="stopWatchTimerScrollView" candidateClass="UIScrollView"/> - <relationship kind="outlet" name="stopWatchView" candidateClass="UIView"/> - <relationship kind="outlet" name="timeLabel" candidateClass="UILabel"/> - <relationship kind="outlet" name="timerClearButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="timerSetTimeButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="timerStartButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="timerTimeLabel" candidateClass="UILabel"/> - <relationship kind="outlet" name="timerView" candidateClass="UIView"/> - </relationships> - </class> - <class className="EditableTableViewCell" superclassName="UITableViewCell"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/> - </class> - <class className="LibONavigationController" superclassName="UINavigationController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/> - </class> - <class className="MainSplitViewController" superclassName="UISplitViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/MainSplitViewController.h"/> - </class> - <class className="WalkThroughContainerViewController" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/WalkThroughContainerViewController.h"/> - </class> - <class className="autoDismissKeyboardNavigationViewController" superclassName="LibONavigationController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/autoDismissKeyboardNavigationViewController.h"/> - </class> - <class className="newServerViewController" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/> - <relationships> - <relationship kind="action" name="save:"/> - <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/> - </relationships> - </class> - <class className="pinValidation_vc" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/> - <relationships> - <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/> - <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/> - </relationships> - </class> - <class className="server_list_vc" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/> - <relationships> - <relationship kind="action" name="onClickMenuButton:"/> - <relationship kind="outlet" name="menuButton" candidateClass="UIBarButtonItem"/> - <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/> - </relationships> - </class> - <class className="server_list_vc_ipad" superclassName="server_list_vc"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc_ipad.h"/> - <relationships> - <relationship kind="action" name="cancelModalView:"/> - </relationships> - </class> - <class className="slideShowPreviewTable_vc" superclassName="UIViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/> - <relationships> - <relationship kind="action" name="startPrefSettings:"/> - <relationship kind="action" name="startPresentationAction:"/> - <relationship kind="outlet" name="prefButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="startButton" candidateClass="UIButton"/> - <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> - </relationships> - </class> - <class className="slideShowPreviewTable_vc_ipad" superclassName="slideShowPreviewTable_vc"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_ipad.h"/> - </class> - <class className="slideShowSwipeInList_ipad" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList_ipad.h"/> - </class> - </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> <simulatedOrientationMetrics key="orientation"/> |