diff options
| author | Siqi LIU <me@siqi.fr> | 2013-07-30 23:40:13 +0200 |
|---|---|---|
| committer | Siqi LIU <me@siqi.fr> | 2013-07-30 23:40:13 +0200 |
| commit | 677de2eb92dbdeb3f131a66922fa9ee9907d085f (patch) | |
| tree | e83a9700da477369ad11e8489baca6c93e4b69d7 /ios | |
| parent | a024948a5d00f19e97c5574ba173ee8851ab4536 (diff) | |
reconnect automatically
Change-Id: I880ede257c7aadcf29d4831952c3a55606718a5d
Diffstat (limited to 'ios')
18 files changed, 553 insertions, 254 deletions
diff --git a/ios/iosremote/iosremote.xcodeproj/project.pbxproj b/ios/iosremote/iosremote.xcodeproj/project.pbxproj index 63d541215fb9..472cb74b9e2f 100644 --- a/ios/iosremote/iosremote.xcodeproj/project.pbxproj +++ b/ios/iosremote/iosremote.xcodeproj/project.pbxproj @@ -20,10 +20,9 @@ 5753DD901781EA0300DB71BB /* serverList_vc.m in Sources */ = {isa = PBXBuildFile; fileRef = 5753DD8F1781EA0300DB71BB /* serverList_vc.m */; }; 5753DD9917834D7100DB71BB /* newServer_vc.m in Sources */ = {isa = PBXBuildFile; fileRef = 5753DD9817834D7100DB71BB /* newServer_vc.m */; }; 57701739178AC83E00B99793 /* SWRevealViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 57701738178AC83E00B99793 /* SWRevealViewController.m */; }; - 5770173F178B08A800B99793 /* SWReavealMainController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5770173E178B08A800B99793 /* SWReavealMainController.m */; }; - 57701742178B0A6900B99793 /* slideShowSwipeInList.m in Sources */ = {isa = PBXBuildFile; fileRef = 57701741178B0A6900B99793 /* slideShowSwipeInList.m */; }; + 57701742178B0A6900B99793 /* slideShowSwipeInList_iphone.m in Sources */ = {isa = PBXBuildFile; fileRef = 57701741178B0A6900B99793 /* slideShowSwipeInList_iphone.m */; }; 57867A541787172A00EBBE52 /* impress.jpeg in Resources */ = {isa = PBXBuildFile; fileRef = 57867A531787172A00EBBE52 /* impress.jpeg */; }; - 57867A571787385800EBBE52 /* slideShow_vc.m in Sources */ = {isa = PBXBuildFile; fileRef = 57867A561787385800EBBE52 /* slideShow_vc.m */; }; + 57867A571787385800EBBE52 /* slideShow_vc_iphone.m in Sources */ = {isa = PBXBuildFile; fileRef = 57867A561787385800EBBE52 /* slideShow_vc_iphone.m */; }; 57867A5A1787510700EBBE52 /* pushed_next_button.png in Resources */ = {isa = PBXBuildFile; fileRef = 57867A581787510700EBBE52 /* pushed_next_button.png */; }; 57867A5B1787510700EBBE52 /* released_next_button.png in Resources */ = {isa = PBXBuildFile; fileRef = 57867A591787510700EBBE52 /* released_next_button.png */; }; 57867A5E178752CD00EBBE52 /* pushed_previous_button.png in Resources */ = {isa = PBXBuildFile; fileRef = 57867A5C178752CD00EBBE52 /* pushed_previous_button.png */; }; @@ -50,15 +49,42 @@ 57CC48C6178B42A400075DE4 /* timer_pause_btn.png in Resources */ = {isa = PBXBuildFile; fileRef = 57CC48C4178B42A400075DE4 /* timer_pause_btn.png */; }; 57CC48C7178B42A400075DE4 /* timer_resume_btn.png in Resources */ = {isa = PBXBuildFile; fileRef = 57CC48C5178B42A400075DE4 /* timer_resume_btn.png */; }; 57CFED9917838FDC00E82E05 /* EditableTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 57CFED9817838FDC00E82E05 /* EditableTableViewCell.m */; }; - 57DC7003178D82610050FC58 /* ic_launcher.png in Resources */ = {isa = PBXBuildFile; fileRef = 57DC7002178D82610050FC58 /* ic_launcher.png */; }; - 57DC7005178D82940050FC58 /* ic_launcher@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 57DC7004178D82940050FC58 /* ic_launcher@2x.png */; }; 57DC7007178D84490050FC58 /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 57DC7006178D84490050FC58 /* CoreMotion.framework */; }; - 57DC700F178E03330050FC58 /* touchPointer_vc.m in Sources */ = {isa = PBXBuildFile; fileRef = 57DC700E178E03330050FC58 /* touchPointer_vc.m */; }; 57DC7012178E16A40050FC58 /* UIViewTransitionCategory.m in Sources */ = {isa = PBXBuildFile; fileRef = 57DC7011178E16A40050FC58 /* UIViewTransitionCategory.m */; }; 57DF0A85178FFFAB008B2D3D /* iPhone_autosize.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 57DF0A83178FFFAB008B2D3D /* iPhone_autosize.storyboard */; }; 57FE71E31785C61400B50125 /* pinValidation_vc.m in Sources */ = {isa = PBXBuildFile; fileRef = 57FE71E21785C61400B50125 /* pinValidation_vc.m */; }; - 57FE71E61785D7FE00B50125 /* slideShowPreview_vc.m in Sources */ = {isa = PBXBuildFile; fileRef = 57FE71E51785D7FE00B50125 /* slideShowPreview_vc.m */; }; 57FE71E917861A9000B50125 /* slideShowPreviewTable_vc.m in Sources */ = {isa = PBXBuildFile; fileRef = 57FE71E817861A9000B50125 /* slideShowPreviewTable_vc.m */; }; + 8C0DC83A17A4177C0099E5AE /* nextButton_pressed.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C0DC83617A4177C0099E5AE /* nextButton_pressed.png */; }; + 8C0DC83B17A4177C0099E5AE /* nextButton_pressed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C0DC83717A4177C0099E5AE /* nextButton_pressed@2x.png */; }; + 8C0DC83C17A4177C0099E5AE /* previousButton_pressed.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C0DC83817A4177C0099E5AE /* previousButton_pressed.png */; }; + 8C0DC83D17A4177C0099E5AE /* previousButton_pressed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C0DC83917A4177C0099E5AE /* previousButton_pressed@2x.png */; }; + 8C0DC84217A4185A0099E5AE /* nextButton_normal.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C0DC83E17A4185A0099E5AE /* nextButton_normal.png */; }; + 8C0DC84317A4185A0099E5AE /* nextButton_normal@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C0DC83F17A4185A0099E5AE /* nextButton_normal@2x.png */; }; + 8C0DC84417A4185A0099E5AE /* previousButton_normal.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C0DC84017A4185A0099E5AE /* previousButton_normal.png */; }; + 8C0DC84517A4185A0099E5AE /* previousButton_normal@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C0DC84117A4185A0099E5AE /* previousButton_normal@2x.png */; }; + 8C0DC84717A45B160099E5AE /* libO_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C0DC84617A45B160099E5AE /* libO_icon.png */; }; + 8C0DC85117A512250099E5AE /* AppDelegate_ipad.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C0DC85017A512250099E5AE /* AppDelegate_ipad.m */; }; + 8C1A16FB17A2853100B4BB3C /* iosremote_iphone_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C1A16FA17A2853100B4BB3C /* iosremote_iphone_icon@2x.png */; }; + 8C1A16FD17A2853700B4BB3C /* iosremote_iphone_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C1A16FC17A2853700B4BB3C /* iosremote_iphone_icon.png */; }; + 8C1A16FF17A2853F00B4BB3C /* iosremote_ipad_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C1A16FE17A2853F00B4BB3C /* iosremote_ipad_icon.png */; }; + 8C1A170117A2854300B4BB3C /* iosremote_ipad_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C1A170017A2854300B4BB3C /* iosremote_ipad_icon@2x.png */; }; + 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 */; }; + 8CAD658517A2E84A00CFB661 /* MainSplitViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CAD658417A2E84A00CFB661 /* MainSplitViewController.m */; }; + 8CAD658817A2EDB200CFB661 /* slideShowPreviewTable_vc_ipad.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CAD658717A2EDB200CFB661 /* slideShowPreviewTable_vc_ipad.m */; }; + 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 */; }; + 8CCA024917A2909B0051EA53 /* iPad_autosize.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8CCA024817A2909B0051EA53 /* iPad_autosize.storyboard */; }; BE9EBD071765BF0800283FD2 /* CoreImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE9EBD061765BF0800283FD2 /* CoreImage.framework */; }; /* End PBXBuildFile section */ @@ -77,19 +103,17 @@ 571BFAD0178AADA200EF1BDB /* more_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = more_icon.png; path = iosremote/more_icon.png; sourceTree = "<group>"; }; 571D4805178B2F080063D93B /* timer_clear_btn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = timer_clear_btn.png; path = iosremote/timer_clear_btn.png; sourceTree = "<group>"; }; 571D4806178B2F080063D93B /* timer_start_btn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = timer_start_btn.png; path = iosremote/timer_start_btn.png; sourceTree = "<group>"; }; - 5753DD8E1781EA0300DB71BB /* serverList_vc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = serverList_vc.h; sourceTree = "<group>"; }; - 5753DD8F1781EA0300DB71BB /* serverList_vc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = serverList_vc.m; sourceTree = "<group>"; }; - 5753DD9717834D7100DB71BB /* newServer_vc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = newServer_vc.h; sourceTree = "<group>"; }; - 5753DD9817834D7100DB71BB /* newServer_vc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = newServer_vc.m; sourceTree = "<group>"; }; + 5753DD8E1781EA0300DB71BB /* serverList_vc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = serverList_vc.h; path = iosremote/serverList_vc.h; sourceTree = "<group>"; }; + 5753DD8F1781EA0300DB71BB /* serverList_vc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = serverList_vc.m; path = iosremote/serverList_vc.m; sourceTree = "<group>"; }; + 5753DD9717834D7100DB71BB /* newServer_vc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = newServer_vc.h; path = iosremote/newServer_vc.h; sourceTree = "<group>"; }; + 5753DD9817834D7100DB71BB /* newServer_vc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = newServer_vc.m; path = iosremote/newServer_vc.m; sourceTree = "<group>"; }; 57701737178AC83E00B99793 /* SWRevealViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWRevealViewController.h; sourceTree = "<group>"; }; 57701738178AC83E00B99793 /* SWRevealViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWRevealViewController.m; sourceTree = "<group>"; }; - 5770173D178B08A800B99793 /* SWReavealMainController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWReavealMainController.h; sourceTree = "<group>"; }; - 5770173E178B08A800B99793 /* SWReavealMainController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWReavealMainController.m; sourceTree = "<group>"; }; - 57701740178B0A6800B99793 /* slideShowSwipeInList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = slideShowSwipeInList.h; sourceTree = "<group>"; }; - 57701741178B0A6900B99793 /* slideShowSwipeInList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = slideShowSwipeInList.m; sourceTree = "<group>"; }; + 57701740178B0A6800B99793 /* slideShowSwipeInList_iphone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = slideShowSwipeInList_iphone.h; path = iosremote/slideShowSwipeInList_iphone.h; sourceTree = "<group>"; }; + 57701741178B0A6900B99793 /* slideShowSwipeInList_iphone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = slideShowSwipeInList_iphone.m; path = iosremote/slideShowSwipeInList_iphone.m; sourceTree = "<group>"; }; 57867A531787172A00EBBE52 /* impress.jpeg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = impress.jpeg; path = iosremote/impress.jpeg; sourceTree = "<group>"; }; - 57867A551787385800EBBE52 /* slideShow_vc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = slideShow_vc.h; sourceTree = "<group>"; }; - 57867A561787385800EBBE52 /* slideShow_vc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = slideShow_vc.m; sourceTree = "<group>"; }; + 57867A551787385800EBBE52 /* slideShow_vc_iphone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = slideShow_vc_iphone.h; path = iosremote/slideShow_vc_iphone.h; sourceTree = "<group>"; }; + 57867A561787385800EBBE52 /* slideShow_vc_iphone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = slideShow_vc_iphone.m; path = iosremote/slideShow_vc_iphone.m; sourceTree = "<group>"; }; 57867A581787510700EBBE52 /* pushed_next_button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pushed_next_button.png; path = iosremote/pushed_next_button.png; sourceTree = "<group>"; }; 57867A591787510700EBBE52 /* released_next_button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = released_next_button.png; path = iosremote/released_next_button.png; sourceTree = "<group>"; }; 57867A5C178752CD00EBBE52 /* pushed_previous_button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pushed_previous_button.png; path = iosremote/pushed_previous_button.png; sourceTree = "<group>"; }; @@ -97,13 +121,13 @@ 57AEEDAE17895B67007F4F97 /* pointer.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pointer.png; path = iosremote/pointer.png; sourceTree = "<group>"; }; 57AEEDB017895BF5007F4F97 /* pointer_pushed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pointer_pushed.png; path = iosremote/pointer_pushed.png; sourceTree = "<group>"; }; 57AEEDB417899BB4007F4F97 /* slide_finished.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = slide_finished.png; path = iosremote/slide_finished.png; sourceTree = "<group>"; }; - 57B152971764703500EECC67 /* Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Base64.h; sourceTree = "<group>"; }; - 57B152981764703500EECC67 /* Base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Base64.m; sourceTree = "<group>"; }; - 57B1529D176486C300EECC67 /* CommandTransmitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommandTransmitter.h; sourceTree = "<group>"; }; - 57B1529E176486C300EECC67 /* CommandTransmitter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CommandTransmitter.m; sourceTree = "<group>"; }; - 57B7625B17621E42007703F6 /* SlideShow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SlideShow.h; sourceTree = "<group>"; }; - 57B7625C17621E42007703F6 /* SlideShow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SlideShow.m; sourceTree = "<group>"; }; - 57C6E3EF175E06E800E8BC5F /* iosremote.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iosremote.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 57B152971764703500EECC67 /* Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Base64.h; path = iosremote/Base64.h; sourceTree = "<group>"; }; + 57B152981764703500EECC67 /* Base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Base64.m; path = iosremote/Base64.m; sourceTree = "<group>"; }; + 57B1529D176486C300EECC67 /* CommandTransmitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CommandTransmitter.h; path = iosremote/Communication/CommandTransmitter.h; sourceTree = "<group>"; }; + 57B1529E176486C300EECC67 /* CommandTransmitter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CommandTransmitter.m; path = iosremote/Communication/CommandTransmitter.m; sourceTree = "<group>"; }; + 57B7625B17621E42007703F6 /* SlideShow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SlideShow.h; path = iosremote/Communication/SlideShow.h; sourceTree = "<group>"; }; + 57B7625C17621E42007703F6 /* SlideShow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SlideShow.m; path = iosremote/Communication/SlideShow.m; sourceTree = "<group>"; }; + 57C6E3EF175E06E800E8BC5F /* Impress .app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Impress .app"; sourceTree = BUILT_PRODUCTS_DIR; }; 57C6E3F2175E06E800E8BC5F /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 57C6E3F4175E06E800E8BC5F /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 57C6E3F6175E06E800E8BC5F /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; @@ -111,37 +135,79 @@ 57C6E3FC175E06E800E8BC5F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 57C6E3FE175E06E800E8BC5F /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; }; 57C6E400175E06E800E8BC5F /* iosremote-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "iosremote-Prefix.pch"; sourceTree = "<group>"; }; - 57C6E401175E06E800E8BC5F /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; }; - 57C6E402175E06E800E8BC5F /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; }; + 57C6E401175E06E800E8BC5F /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = iosremote/AppDelegate.h; sourceTree = "<group>"; }; + 57C6E402175E06E800E8BC5F /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = iosremote/AppDelegate.m; sourceTree = "<group>"; }; 57C6E404175E06E800E8BC5F /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; }; 57C6E406175E06E800E8BC5F /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; }; 57C6E408175E06E800E8BC5F /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; }; - 57C6E426175E076900E8BC5F /* Client.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Client.h; sourceTree = "<group>"; }; - 57C6E427175E076900E8BC5F /* Client.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Client.m; sourceTree = "<group>"; }; - 57C6E428175E076900E8BC5F /* CommunicationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = CommunicationManager.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - 57C6E429175E076900E8BC5F /* CommunicationManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = CommunicationManager.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; - 57C6E42A175E076900E8BC5F /* CommandInterpreter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommandInterpreter.h; sourceTree = "<group>"; }; - 57C6E42B175E076900E8BC5F /* CommandInterpreter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CommandInterpreter.m; sourceTree = "<group>"; }; - 57C6E42C175E076900E8BC5F /* Server.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Server.h; sourceTree = "<group>"; }; - 57C6E42D175E076900E8BC5F /* Server.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Server.m; sourceTree = "<group>"; }; + 57C6E426175E076900E8BC5F /* Client.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Client.h; path = iosremote/Communication/Client.h; sourceTree = "<group>"; }; + 57C6E427175E076900E8BC5F /* Client.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Client.m; path = iosremote/Communication/Client.m; sourceTree = "<group>"; }; + 57C6E428175E076900E8BC5F /* CommunicationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = CommunicationManager.h; path = iosremote/Communication/CommunicationManager.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; + 57C6E429175E076900E8BC5F /* CommunicationManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = CommunicationManager.m; path = iosremote/Communication/CommunicationManager.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; + 57C6E42A175E076900E8BC5F /* CommandInterpreter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CommandInterpreter.h; path = iosremote/Communication/CommandInterpreter.h; sourceTree = "<group>"; }; + 57C6E42B175E076900E8BC5F /* CommandInterpreter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CommandInterpreter.m; path = iosremote/Communication/CommandInterpreter.m; sourceTree = "<group>"; }; + 57C6E42C175E076900E8BC5F /* Server.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Server.h; path = iosremote/Communication/Server.h; sourceTree = "<group>"; }; + 57C6E42D175E076900E8BC5F /* Server.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Server.m; path = iosremote/Communication/Server.m; sourceTree = "<group>"; }; 57CC48C4178B42A400075DE4 /* timer_pause_btn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = timer_pause_btn.png; path = iosremote/timer_pause_btn.png; sourceTree = "<group>"; }; 57CC48C5178B42A400075DE4 /* timer_resume_btn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = timer_resume_btn.png; path = iosremote/timer_resume_btn.png; sourceTree = "<group>"; }; - 57CFED9717838FDC00E82E05 /* EditableTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditableTableViewCell.h; sourceTree = "<group>"; }; - 57CFED9817838FDC00E82E05 /* EditableTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EditableTableViewCell.m; sourceTree = "<group>"; }; - 57DC7002178D82610050FC58 /* ic_launcher.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_launcher.png; sourceTree = "<group>"; }; - 57DC7004178D82940050FC58 /* ic_launcher@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ic_launcher@2x.png"; sourceTree = "<group>"; }; + 57CFED9717838FDC00E82E05 /* EditableTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EditableTableViewCell.h; path = iosremote/EditableTableViewCell.h; sourceTree = "<group>"; }; + 57CFED9817838FDC00E82E05 /* EditableTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = EditableTableViewCell.m; path = iosremote/EditableTableViewCell.m; sourceTree = "<group>"; }; 57DC7006178D84490050FC58 /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = System/Library/Frameworks/CoreMotion.framework; sourceTree = SDKROOT; }; - 57DC700D178E03330050FC58 /* touchPointer_vc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = touchPointer_vc.h; sourceTree = "<group>"; }; - 57DC700E178E03330050FC58 /* touchPointer_vc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = touchPointer_vc.m; sourceTree = "<group>"; }; 57DC7010178E16A40050FC58 /* UIViewTransitionCategory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIViewTransitionCategory.h; sourceTree = "<group>"; }; 57DC7011178E16A40050FC58 /* UIViewTransitionCategory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIViewTransitionCategory.m; sourceTree = "<group>"; }; 57DF0A84178FFFAB008B2D3D /* en */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = en; path = en.lproj/iPhone_autoSize.storyboard; sourceTree = "<group>"; }; - 57FE71E11785C61300B50125 /* pinValidation_vc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pinValidation_vc.h; path = Communication/pinValidation_vc.h; sourceTree = "<group>"; }; - 57FE71E21785C61400B50125 /* pinValidation_vc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = pinValidation_vc.m; path = Communication/pinValidation_vc.m; sourceTree = "<group>"; }; - 57FE71E41785D7FE00B50125 /* slideShowPreview_vc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = slideShowPreview_vc.h; sourceTree = "<group>"; }; - 57FE71E51785D7FE00B50125 /* slideShowPreview_vc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = slideShowPreview_vc.m; sourceTree = "<group>"; }; + 57FE71E11785C61300B50125 /* pinValidation_vc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pinValidation_vc.h; path = iosremote/Communication/pinValidation_vc.h; sourceTree = "<group>"; }; + 57FE71E21785C61400B50125 /* pinValidation_vc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = pinValidation_vc.m; path = iosremote/Communication/pinValidation_vc.m; sourceTree = "<group>"; }; 57FE71E717861A9000B50125 /* slideShowPreviewTable_vc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = slideShowPreviewTable_vc.h; sourceTree = "<group>"; }; 57FE71E817861A9000B50125 /* slideShowPreviewTable_vc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = slideShowPreviewTable_vc.m; sourceTree = "<group>"; }; + 8C0DC83617A4177C0099E5AE /* nextButton_pressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = nextButton_pressed.png; sourceTree = "<group>"; }; + 8C0DC83717A4177C0099E5AE /* nextButton_pressed@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "nextButton_pressed@2x.png"; sourceTree = "<group>"; }; + 8C0DC83817A4177C0099E5AE /* previousButton_pressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = previousButton_pressed.png; sourceTree = "<group>"; }; + 8C0DC83917A4177C0099E5AE /* previousButton_pressed@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "previousButton_pressed@2x.png"; sourceTree = "<group>"; }; + 8C0DC83E17A4185A0099E5AE /* nextButton_normal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = nextButton_normal.png; sourceTree = "<group>"; }; + 8C0DC83F17A4185A0099E5AE /* nextButton_normal@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "nextButton_normal@2x.png"; sourceTree = "<group>"; }; + 8C0DC84017A4185A0099E5AE /* previousButton_normal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = previousButton_normal.png; sourceTree = "<group>"; }; + 8C0DC84117A4185A0099E5AE /* previousButton_normal@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "previousButton_normal@2x.png"; sourceTree = "<group>"; }; + 8C0DC84617A45B160099E5AE /* libO_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = libO_icon.png; sourceTree = "<group>"; }; + 8C0DC84F17A512250099E5AE /* AppDelegate_ipad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate_ipad.h; path = iosremote/AppDelegate_ipad.h; sourceTree = "<group>"; }; + 8C0DC85017A512250099E5AE /* AppDelegate_ipad.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate_ipad.m; path = iosremote/AppDelegate_ipad.m; sourceTree = "<group>"; }; + 8C1A16FA17A2853100B4BB3C /* iosremote_iphone_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iosremote_iphone_icon@2x.png"; sourceTree = "<group>"; }; + 8C1A16FC17A2853700B4BB3C /* iosremote_iphone_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = iosremote_iphone_icon.png; sourceTree = "<group>"; }; + 8C1A16FE17A2853F00B4BB3C /* iosremote_ipad_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = iosremote_ipad_icon.png; sourceTree = "<group>"; }; + 8C1A170017A2854300B4BB3C /* iosremote_ipad_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "iosremote_ipad_icon@2x.png"; sourceTree = "<group>"; }; + 8C26E5BE17A525FC007DA4B7 /* MGSplitCornersView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MGSplitCornersView.h; sourceTree = "<group>"; }; + 8C26E5BF17A525FC007DA4B7 /* MGSplitCornersView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MGSplitCornersView.m; sourceTree = "<group>"; }; + 8C26E5C017A525FC007DA4B7 /* MGSplitDividerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MGSplitDividerView.h; sourceTree = "<group>"; }; + 8C26E5C117A525FC007DA4B7 /* MGSplitDividerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MGSplitDividerView.m; sourceTree = "<group>"; }; + 8C26E5C217A525FC007DA4B7 /* MGSplitViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MGSplitViewController.h; sourceTree = "<group>"; }; + 8C26E5C317A525FC007DA4B7 /* MGSplitViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MGSplitViewController.m; sourceTree = "<group>"; }; + 8C26E5C517A5539D007DA4B7 /* UserDefaults.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = UserDefaults.plist; path = ../UserDefaults.plist; sourceTree = "<group>"; }; + 8C26E5C717A5731D007DA4B7 /* autoDismissKeyboardNavigationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = autoDismissKeyboardNavigationViewController.h; path = iosremote/autoDismissKeyboardNavigationViewController.h; sourceTree = "<group>"; }; + 8C26E5C817A5731D007DA4B7 /* autoDismissKeyboardNavigationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = autoDismissKeyboardNavigationViewController.m; path = iosremote/autoDismissKeyboardNavigationViewController.m; sourceTree = "<group>"; }; + 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>"; }; + 8CAD658317A2E84A00CFB661 /* MainSplitViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MainSplitViewController.h; path = iosremote/MainSplitViewController.h; sourceTree = "<group>"; }; + 8CAD658417A2E84A00CFB661 /* MainSplitViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MainSplitViewController.m; path = iosremote/MainSplitViewController.m; sourceTree = "<group>"; }; + 8CAD658617A2EDB200CFB661 /* slideShowPreviewTable_vc_ipad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = slideShowPreviewTable_vc_ipad.h; path = iosremote/slideShowPreviewTable_vc_ipad.h; sourceTree = "<group>"; }; + 8CAD658717A2EDB200CFB661 /* slideShowPreviewTable_vc_ipad.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = slideShowPreviewTable_vc_ipad.m; path = iosremote/slideShowPreviewTable_vc_ipad.m; sourceTree = "<group>"; }; + 8CAD658A17A2F02000CFB661 /* slideShowPreviewTable_vc_iphone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = slideShowPreviewTable_vc_iphone.h; path = iosremote/slideShowPreviewTable_vc_iphone.h; sourceTree = "<group>"; }; + 8CAD658B17A2F02000CFB661 /* slideShowPreviewTable_vc_iphone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = slideShowPreviewTable_vc_iphone.m; path = iosremote/slideShowPreviewTable_vc_iphone.m; sourceTree = "<group>"; }; + 8CAD658D17A3250000CFB661 /* server_list_vc_ipad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = server_list_vc_ipad.h; path = iosremote/server_list_vc_ipad.h; sourceTree = "<group>"; }; + 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>"; }; + 8CCA024817A2909B0051EA53 /* iPad_autosize.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = iPad_autosize.storyboard; sourceTree = "<group>"; }; BE9EBD061765BF0800283FD2 /* CoreImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreImage.framework; path = System/Library/Frameworks/CoreImage.framework; sourceTree = SDKROOT; }; /* End PBXFileReference section */ @@ -166,6 +232,7 @@ 571102671794127E007D343B /* TestFlightSDK1.2.6 */ = { isa = PBXGroup; children = ( + 5711026F1794128E007D343B /* libz.dylib */, 571102681794127E007D343B /* libTestFlight.a */, 571102691794127E007D343B /* README.md */, 5711026A1794127E007D343B /* release_notes.md */, @@ -184,24 +251,18 @@ 5711027917946186007D343B /* UIImage+RoundedCorner.h */, 5711027A17946186007D343B /* UIImage+RoundedCorner.m */, ); - path = "UIImage-categories"; + name = "UIImage-categories"; + path = "iosremote/UIImage-categories"; sourceTree = "<group>"; }; 571BFAD2178AB7BA00EF1BDB /* slideShow */ = { isa = PBXGroup; children = ( - 57867A551787385800EBBE52 /* slideShow_vc.h */, - 57867A561787385800EBBE52 /* slideShow_vc.m */, - 5770173D178B08A800B99793 /* SWReavealMainController.h */, - 5770173E178B08A800B99793 /* SWReavealMainController.m */, - 57701740178B0A6800B99793 /* slideShowSwipeInList.h */, - 57701741178B0A6900B99793 /* slideShowSwipeInList.m */, - 57DC700D178E03330050FC58 /* touchPointer_vc.h */, - 57DC700E178E03330050FC58 /* touchPointer_vc.m */, 57DC7010178E16A40050FC58 /* UIViewTransitionCategory.h */, 57DC7011178E16A40050FC58 /* UIViewTransitionCategory.m */, ); name = slideShow; + path = iosremote; sourceTree = "<group>"; }; 57701736178AC83E00B99793 /* SWRevealViewController */ = { @@ -210,12 +271,32 @@ 57701737178AC83E00B99793 /* SWRevealViewController.h */, 57701738178AC83E00B99793 /* SWRevealViewController.m */, ); - path = SWRevealViewController; + name = SWRevealViewController; + path = iosremote/SWRevealViewController; sourceTree = "<group>"; }; - 57AEEDAA1788D7B2007F4F97 /* Assets */ = { + 57AEEDAA1788D7B2007F4F97 /* Ressources */ = { isa = PBXGroup; children = ( + 8C26E5D117A5AFE8007DA4B7 /* slideshowRail.png */, + 8C26E5D217A5AFE8007DA4B7 /* slideshowRail@2x.png */, + 8C0DC84617A45B160099E5AE /* libO_icon.png */, + 8C0DC83E17A4185A0099E5AE /* nextButton_normal.png */, + 8C0DC83F17A4185A0099E5AE /* nextButton_normal@2x.png */, + 8C0DC84017A4185A0099E5AE /* previousButton_normal.png */, + 8C0DC84117A4185A0099E5AE /* previousButton_normal@2x.png */, + 8C0DC83617A4177C0099E5AE /* nextButton_pressed.png */, + 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 */, + 8C1A16FA17A2853100B4BB3C /* iosremote_iphone_icon@2x.png */, 57CC48C4178B42A400075DE4 /* timer_pause_btn.png */, 57CC48C5178B42A400075DE4 /* timer_resume_btn.png */, 571BFAD0178AADA200EF1BDB /* more_icon.png */, @@ -230,41 +311,36 @@ 571D4805178B2F080063D93B /* timer_clear_btn.png */, 571D4806178B2F080063D93B /* timer_start_btn.png */, ); - name = Assets; + name = Ressources; sourceTree = "<group>"; }; 57AEEDAB1789443D007F4F97 /* slideShowPreview */ = { isa = PBXGroup; children = ( - 57FE71E41785D7FE00B50125 /* slideShowPreview_vc.h */, - 57FE71E51785D7FE00B50125 /* slideShowPreview_vc.m */, 57FE71E717861A9000B50125 /* slideShowPreviewTable_vc.h */, 57FE71E817861A9000B50125 /* slideShowPreviewTable_vc.m */, ); name = slideShowPreview; + path = iosremote; sourceTree = "<group>"; }; 57C6E3E6175E06E800E8BC5F = { isa = PBXGroup; children = ( - 5711026F1794128E007D343B /* libz.dylib */, - 571102671794127E007D343B /* TestFlightSDK1.2.6 */, - 57DC7006178D84490050FC58 /* CoreMotion.framework */, - 57DC7004178D82940050FC58 /* ic_launcher@2x.png */, - 57DC7002178D82610050FC58 /* ic_launcher.png */, - 57AEEDAA1788D7B2007F4F97 /* Assets */, - BE9EBD061765BF0800283FD2 /* CoreImage.framework */, - 57C6E425175E076900E8BC5F /* Communication */, - 57C6E3F8175E06E800E8BC5F /* iosremote */, + 8C1A170217A28AB900B4BB3C /* Shared */, + 8C1A170917A28E6500B4BB3C /* iPhone */, + 8C1A170817A28E5E00B4BB3C /* iPad */, + 57AEEDAA1788D7B2007F4F97 /* Ressources */, 57C6E3F1175E06E800E8BC5F /* Frameworks */, 57C6E3F0175E06E800E8BC5F /* Products */, + 57C6E3F9175E06E800E8BC5F /* Supporting Files */, ); sourceTree = "<group>"; }; 57C6E3F0175E06E800E8BC5F /* Products */ = { isa = PBXGroup; children = ( - 57C6E3EF175E06E800E8BC5F /* iosremote.app */, + 57C6E3EF175E06E800E8BC5F /* Impress .app */, ); name = Products; sourceTree = "<group>"; @@ -279,46 +355,99 @@ name = Frameworks; sourceTree = "<group>"; }; - 57C6E3F8175E06E800E8BC5F /* iosremote */ = { + 57C6E3F9175E06E800E8BC5F /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 57C6E3FA175E06E800E8BC5F /* iosremote-Info.plist */, + 8C26E5C517A5539D007DA4B7 /* UserDefaults.plist */, + 57C6E3FB175E06E800E8BC5F /* InfoPlist.strings */, + 57C6E3FE175E06E800E8BC5F /* main.m */, + 57C6E400175E06E800E8BC5F /* iosremote-Prefix.pch */, + 57C6E404175E06E800E8BC5F /* Default.png */, + 57C6E406175E06E800E8BC5F /* Default@2x.png */, + 57C6E408175E06E800E8BC5F /* Default-568h@2x.png */, + ); + name = "Supporting Files"; + path = iosremote; + sourceTree = "<group>"; + }; + 8C0DC84E17A511C60099E5AE /* Application */ = { + isa = PBXGroup; + children = ( + 8C0DC84F17A512250099E5AE /* AppDelegate_ipad.h */, + 8C0DC85017A512250099E5AE /* AppDelegate_ipad.m */, + ); + name = Application; + sourceTree = "<group>"; + }; + 8C1A170217A28AB900B4BB3C /* Shared */ = { + isa = PBXGroup; + children = ( + 8C1A170717A28DE800B4BB3C /* Models */, + 8C1A170617A28DDF00B4BB3C /* Support */, + 5711027417946185007D343B /* UIImage-categories */, + 8C1A170517A28B0E00B4BB3C /* Library */, + 8C1A170417A28AFD00B4BB3C /* Controllers */, + 8C1A170317A28AC900B4BB3C /* Application */, + ); + name = Shared; + sourceTree = "<group>"; + }; + 8C1A170317A28AC900B4BB3C /* Application */ = { + isa = PBXGroup; + children = ( + 57C6E401175E06E800E8BC5F /* AppDelegate.h */, + 57C6E402175E06E800E8BC5F /* AppDelegate.m */, + ); + name = Application; + sourceTree = "<group>"; + }; + 8C1A170417A28AFD00B4BB3C /* Controllers */ = { isa = PBXGroup; children = ( - 57C6E3F9175E06E800E8BC5F /* Supporting Files */, - 57DF0A78178FFF8C008B2D3D /* StoryBoards */, 57FE71E11785C61300B50125 /* pinValidation_vc.h */, 57FE71E21785C61400B50125 /* pinValidation_vc.m */, - 57AEEDAB1789443D007F4F97 /* slideShowPreview */, - 571BFAD2178AB7BA00EF1BDB /* slideShow */, 5753DD9717834D7100DB71BB /* newServer_vc.h */, 5753DD9817834D7100DB71BB /* newServer_vc.m */, 5753DD8E1781EA0300DB71BB /* serverList_vc.h */, 5753DD8F1781EA0300DB71BB /* serverList_vc.m */, + 571BFAD2178AB7BA00EF1BDB /* slideShow */, + 57AEEDAB1789443D007F4F97 /* slideShowPreview */, ); - path = iosremote; + name = Controllers; sourceTree = "<group>"; }; - 57C6E3F9175E06E800E8BC5F /* Supporting Files */ = { + 8C1A170517A28B0E00B4BB3C /* Library */ = { isa = PBXGroup; children = ( - 5711027417946185007D343B /* UIImage-categories */, + BE9EBD061765BF0800283FD2 /* CoreImage.framework */, + 57DC7006178D84490050FC58 /* CoreMotion.framework */, + 8C26E5C417A52607007DA4B7 /* MGSplitViewController */, + 571102671794127E007D343B /* TestFlightSDK1.2.6 */, 57701736178AC83E00B99793 /* SWRevealViewController */, + ); + name = Library; + sourceTree = "<group>"; + }; + 8C1A170617A28DDF00B4BB3C /* Support */ = { + isa = PBXGroup; + children = ( 57B152971764703500EECC67 /* Base64.h */, 57B152981764703500EECC67 /* Base64.m */, - 57C6E401175E06E800E8BC5F /* AppDelegate.h */, - 57C6E402175E06E800E8BC5F /* AppDelegate.m */, 57CFED9717838FDC00E82E05 /* EditableTableViewCell.h */, 57CFED9817838FDC00E82E05 /* EditableTableViewCell.m */, - 57C6E3FA175E06E800E8BC5F /* iosremote-Info.plist */, - 57C6E3FB175E06E800E8BC5F /* InfoPlist.strings */, - 57C6E3FE175E06E800E8BC5F /* main.m */, - 57C6E400175E06E800E8BC5F /* iosremote-Prefix.pch */, - 57C6E404175E06E800E8BC5F /* Default.png */, - 57C6E406175E06E800E8BC5F /* Default@2x.png */, - 57C6E408175E06E800E8BC5F /* Default-568h@2x.png */, + 8C26E5C717A5731D007DA4B7 /* autoDismissKeyboardNavigationViewController.h */, + 8C26E5C817A5731D007DA4B7 /* autoDismissKeyboardNavigationViewController.m */, + 8C26E5CA17A57C20007DA4B7 /* ControlVariables.h */, + 8C26E5CE17A58703007DA4B7 /* HorizontalSlideCell.h */, + 8C26E5CF17A58703007DA4B7 /* HorizontalSlideCell.m */, + 8C26E5D517A68154007DA4B7 /* stopWatch.h */, + 8C26E5D617A68154007DA4B7 /* stopWatch.m */, ); - name = "Supporting Files"; + name = Support; sourceTree = "<group>"; }; - 57C6E425175E076900E8BC5F /* Communication */ = { + 8C1A170717A28DE800B4BB3C /* Models */ = { isa = PBXGroup; children = ( 57C6E426175E076900E8BC5F /* Client.h */, @@ -334,24 +463,77 @@ 57B1529D176486C300EECC67 /* CommandTransmitter.h */, 57B1529E176486C300EECC67 /* CommandTransmitter.m */, ); - name = Communication; - path = iosremote/Communication; + name = Models; sourceTree = "<group>"; }; - 57DF0A78178FFF8C008B2D3D /* StoryBoards */ = { + 8C1A170817A28E5E00B4BB3C /* iPad */ = { isa = PBXGroup; children = ( + 8C0DC84E17A511C60099E5AE /* Application */, + 8CAD658217A2E81F00CFB661 /* Controllers */, + 8CCA024817A2909B0051EA53 /* iPad_autosize.storyboard */, + ); + name = iPad; + sourceTree = "<group>"; + }; + 8C1A170917A28E6500B4BB3C /* iPhone */ = { + isa = PBXGroup; + children = ( + 8CAD658917A2F00500CFB661 /* Controllers */, 57DF0A83178FFFAB008B2D3D /* iPhone_autosize.storyboard */, ); - name = StoryBoards; + name = iPhone; + sourceTree = "<group>"; + }; + 8C26E5C417A52607007DA4B7 /* MGSplitViewController */ = { + isa = PBXGroup; + children = ( + 8C26E5BE17A525FC007DA4B7 /* MGSplitCornersView.h */, + 8C26E5BF17A525FC007DA4B7 /* MGSplitCornersView.m */, + 8C26E5C017A525FC007DA4B7 /* MGSplitDividerView.h */, + 8C26E5C117A525FC007DA4B7 /* MGSplitDividerView.m */, + 8C26E5C217A525FC007DA4B7 /* MGSplitViewController.h */, + 8C26E5C317A525FC007DA4B7 /* MGSplitViewController.m */, + ); + name = MGSplitViewController; + sourceTree = "<group>"; + }; + 8CAD658217A2E81F00CFB661 /* Controllers */ = { + isa = PBXGroup; + children = ( + 8CAD658317A2E84A00CFB661 /* MainSplitViewController.h */, + 8CAD658417A2E84A00CFB661 /* MainSplitViewController.m */, + 8CAD658617A2EDB200CFB661 /* slideShowPreviewTable_vc_ipad.h */, + 8CAD658717A2EDB200CFB661 /* slideShowPreviewTable_vc_ipad.m */, + 8CAD658D17A3250000CFB661 /* server_list_vc_ipad.h */, + 8CAD658E17A3250000CFB661 /* server_list_vc_ipad.m */, + 8CAD659317A3C2D400CFB661 /* BasePresentationViewController.h */, + 8CAD659417A3C2D400CFB661 /* BasePresentationViewController.m */, + 8CAD659E17A3F76300CFB661 /* slideShowSwipeInList_ipad.h */, + 8CAD659F17A3F76300CFB661 /* slideShowSwipeInList_ipad.m */, + ); + name = Controllers; + sourceTree = "<group>"; + }; + 8CAD658917A2F00500CFB661 /* Controllers */ = { + isa = PBXGroup; + children = ( + 57867A551787385800EBBE52 /* slideShow_vc_iphone.h */, + 57867A561787385800EBBE52 /* slideShow_vc_iphone.m */, + 57701740178B0A6800B99793 /* slideShowSwipeInList_iphone.h */, + 57701741178B0A6900B99793 /* slideShowSwipeInList_iphone.m */, + 8CAD658A17A2F02000CFB661 /* slideShowPreviewTable_vc_iphone.h */, + 8CAD658B17A2F02000CFB661 /* slideShowPreviewTable_vc_iphone.m */, + ); + name = Controllers; sourceTree = "<group>"; }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 57C6E3EE175E06E800E8BC5F /* iosremote */ = { + 57C6E3EE175E06E800E8BC5F /* Impress */ = { isa = PBXNativeTarget; - buildConfigurationList = 57C6E415175E06E800E8BC5F /* Build configuration list for PBXNativeTarget "iosremote" */; + buildConfigurationList = 57C6E415175E06E800E8BC5F /* Build configuration list for PBXNativeTarget "Impress " */; buildPhases = ( 57C6E3EB175E06E800E8BC5F /* Sources */, 57C6E3EC175E06E800E8BC5F /* Frameworks */, @@ -361,9 +543,9 @@ ); dependencies = ( ); - name = iosremote; + name = "Impress "; productName = iosremote; - productReference = 57C6E3EF175E06E800E8BC5F /* iosremote.app */; + productReference = 57C6E3EF175E06E800E8BC5F /* Impress .app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -388,7 +570,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 57C6E3EE175E06E800E8BC5F /* iosremote */, + 57C6E3EE175E06E800E8BC5F /* Impress */, ); }; /* End PBXProject section */ @@ -415,11 +597,30 @@ 571D4808178B2F080063D93B /* timer_start_btn.png in Resources */, 57CC48C6178B42A400075DE4 /* timer_pause_btn.png in Resources */, 57CC48C7178B42A400075DE4 /* timer_resume_btn.png in Resources */, - 57DC7003178D82610050FC58 /* ic_launcher.png in Resources */, - 57DC7005178D82940050FC58 /* ic_launcher@2x.png in Resources */, 57DF0A85178FFFAB008B2D3D /* iPhone_autosize.storyboard in Resources */, 5711026D1794127E007D343B /* README.md in Resources */, 5711026E1794127E007D343B /* release_notes.md in Resources */, + 8C1A16FB17A2853100B4BB3C /* iosremote_iphone_icon@2x.png in Resources */, + 8C1A16FD17A2853700B4BB3C /* iosremote_iphone_icon.png in Resources */, + 8C1A16FF17A2853F00B4BB3C /* iosremote_ipad_icon.png in Resources */, + 8C1A170117A2854300B4BB3C /* iosremote_ipad_icon@2x.png in Resources */, + 8CCA024917A2909B0051EA53 /* 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 */, + 8C0DC83D17A4177C0099E5AE /* previousButton_pressed@2x.png in Resources */, + 8C0DC84217A4185A0099E5AE /* nextButton_normal.png in Resources */, + 8C0DC84317A4185A0099E5AE /* nextButton_normal@2x.png in Resources */, + 8C0DC84417A4185A0099E5AE /* previousButton_normal.png in Resources */, + 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 */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -443,17 +644,24 @@ 5753DD9917834D7100DB71BB /* newServer_vc.m in Sources */, 57CFED9917838FDC00E82E05 /* EditableTableViewCell.m in Sources */, 57FE71E31785C61400B50125 /* pinValidation_vc.m in Sources */, - 57FE71E61785D7FE00B50125 /* slideShowPreview_vc.m in Sources */, 57FE71E917861A9000B50125 /* slideShowPreviewTable_vc.m in Sources */, - 57867A571787385800EBBE52 /* slideShow_vc.m in Sources */, + 57867A571787385800EBBE52 /* slideShow_vc_iphone.m in Sources */, 57701739178AC83E00B99793 /* SWRevealViewController.m in Sources */, - 5770173F178B08A800B99793 /* SWReavealMainController.m in Sources */, - 57701742178B0A6900B99793 /* slideShowSwipeInList.m in Sources */, - 57DC700F178E03330050FC58 /* touchPointer_vc.m in Sources */, + 57701742178B0A6900B99793 /* slideShowSwipeInList_iphone.m in Sources */, 57DC7012178E16A40050FC58 /* UIViewTransitionCategory.m in Sources */, 5711027B17946186007D343B /* UIImage+Alpha.m in Sources */, 5711027C17946186007D343B /* UIImage+Resize.m in Sources */, 5711027D17946186007D343B /* UIImage+RoundedCorner.m in Sources */, + 8CAD658517A2E84A00CFB661 /* MainSplitViewController.m in Sources */, + 8CAD658817A2EDB200CFB661 /* slideShowPreviewTable_vc_ipad.m in Sources */, + 8CAD658C17A2F02000CFB661 /* slideShowPreviewTable_vc_iphone.m in Sources */, + 8CAD658F17A3250000CFB661 /* server_list_vc_ipad.m in Sources */, + 8CAD659517A3C2D400CFB661 /* BasePresentationViewController.m in Sources */, + 8CAD65A017A3F76300CFB661 /* slideShowSwipeInList_ipad.m in Sources */, + 8C0DC85117A512250099E5AE /* AppDelegate_ipad.m in Sources */, + 8C26E5C917A5731D007DA4B7 /* autoDismissKeyboardNavigationViewController.m in Sources */, + 8C26E5D017A58703007DA4B7 /* HorizontalSlideCell.m in Sources */, + 8C26E5D717A68154007DA4B7 /* stopWatch.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -474,6 +682,7 @@ 57DF0A84178FFFAB008B2D3D /* en */, ); name = iPhone_autosize.storyboard; + path = iosremote; sourceTree = "<group>"; }; /* End PBXVariantGroup section */ @@ -555,7 +764,7 @@ "\"$(SRCROOT)/TestFlightSDK1.2.6\"", ); PRODUCT_NAME = "$(TARGET_NAME)"; - TARGETED_DEVICE_FAMILY = 1; + TARGETED_DEVICE_FAMILY = "1,2"; WRAPPER_EXTENSION = app; }; name = Debug; @@ -573,7 +782,7 @@ "\"$(SRCROOT)/TestFlightSDK1.2.6\"", ); PRODUCT_NAME = "$(TARGET_NAME)"; - TARGETED_DEVICE_FAMILY = 1; + TARGETED_DEVICE_FAMILY = "1,2"; WRAPPER_EXTENSION = app; }; name = Release; @@ -590,7 +799,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 57C6E415175E06E800E8BC5F /* Build configuration list for PBXNativeTarget "iosremote" */ = { + 57C6E415175E06E800E8BC5F /* Build configuration list for PBXNativeTarget "Impress " */ = { isa = XCConfigurationList; buildConfigurations = ( 57C6E416175E06E800E8BC5F /* Debug */, diff --git a/ios/iosremote/iosremote/.DS_Store b/ios/iosremote/iosremote/.DS_Store Binary files differindex ef99c3a95a49..df8452458516 100644 --- a/ios/iosremote/iosremote/.DS_Store +++ b/ios/iosremote/iosremote/.DS_Store diff --git a/ios/iosremote/iosremote/AppDelegate.m b/ios/iosremote/iosremote/AppDelegate.m index eb5a41493359..f48d4d7e8e8a 100644 --- a/ios/iosremote/iosremote/AppDelegate.m +++ b/ios/iosremote/iosremote/AppDelegate.m @@ -12,10 +12,23 @@ @synthesize window = _window; +- (NSUInteger)application:(UIApplication *)application supportedInterfaceOrientationsForWindow:(UIWindow *)window +{ + if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) + return UIInterfaceOrientationMaskAll; + else + return UIInterfaceOrientationMaskPortrait; +} + - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { [TestFlight takeOff:@"cb645cf2-a557-481e-993a-6ad3aaeb06d0"]; + NSString *defaultsPath = [[NSBundle mainBundle] pathForResource:@"UserDefaults" + ofType:@"plist"]; + NSDictionary *appDefaults = [NSDictionary dictionaryWithContentsOfFile:defaultsPath]; + [[NSUserDefaults standardUserDefaults] registerDefaults:appDefaults]; + // Override point for customization after application launch. /** * If ever we need some iOS6-only storyboard based features and we want to keep backward compatibility, we should uncomment these code to pick the right storyboard based on the existence on certains classes. @@ -32,7 +45,7 @@ // self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; // self.window.rootViewController = [mainStoryboard instantiateInitialViewController]; // [self.window makeKeyAndVisible]; - + return YES; } diff --git a/ios/iosremote/iosremote/BasePresentationViewController.h b/ios/iosremote/iosremote/BasePresentationViewController.h index 2be196aa7b0c..60a7875fd34f 100644 --- a/ios/iosremote/iosremote/BasePresentationViewController.h +++ b/ios/iosremote/iosremote/BasePresentationViewController.h @@ -38,7 +38,7 @@ @property (weak, nonatomic) IBOutlet UIButton *clearButton; @property (weak, nonatomic) IBOutlet UILabel *timeLabel; -// Reconnection -- (void) needReconnect; +//Reconnection +- (void) didReceiveDisconnection; @end diff --git a/ios/iosremote/iosremote/BasePresentationViewController.m b/ios/iosremote/iosremote/BasePresentationViewController.m index 99aaff5986a2..e72bac7da9ef 100644 --- a/ios/iosremote/iosremote/BasePresentationViewController.m +++ b/ios/iosremote/iosremote/BasePresentationViewController.m @@ -433,17 +433,6 @@ [super viewDidUnload]; } -#pragma mark - Reconnection - -- (void) needReconnect -{ - [self dismissViewControllerAnimated:YES completion:nil]; - if (self.welcome_blocking_page.hidden == NO) { - [self setWelcomePageVisible:YES]; - } -} - -#pragma mark - Slide Control - (IBAction)nextSlideAction:(id)sender { @@ -475,4 +464,15 @@ }]; } + +#pragma mark - Reconnection +- (void) didReceiveDisconnection +{ + [self dismissViewControllerAnimated:YES completion:nil]; + + if (self.welcome_blocking_page.isHidden == YES) { + [self setWelcomePageVisible:YES]; + } +} + @end diff --git a/ios/iosremote/iosremote/Communication/Client.m b/ios/iosremote/iosremote/Communication/Client.m index 466e2398eb82..6c03f05ede42 100644 --- a/ios/iosremote/iosremote/Communication/Client.m +++ b/ios/iosremote/iosremote/Communication/Client.m @@ -86,7 +86,6 @@ NSLock *streamStatusLock; - (void)dealloc { - dispatch_release(backgroundQueue); [self stopConnectionTimeoutTimer]; } @@ -110,7 +109,7 @@ NSLock *streamStatusLock; // If not, generate one. if (!newPin) { - newPin = arc4random() % 9999; + newPin = arc4random() % 8999 + 1000; [userDefaluts setInteger:newPin forKey:self.name]; } @@ -188,17 +187,15 @@ int count = 0; data = [[NSMutableData alloc] init]; } uint8_t buf[1024]; - unsigned int len = 0; + int len = 0; NSString *str; while (true) { len = [(NSInputStream *)stream read:buf maxLength:1024]; - if (len <= 0){ + if (len <= 0) { [self disconnect]; [self connect]; - NSLog(@"eroor"); break; } - [data appendBytes:(const void *)buf length:len]; if (len < 1024) { // Potentially the end of a command diff --git a/ios/iosremote/iosremote/Communication/CommunicationManager.h b/ios/iosremote/iosremote/Communication/CommunicationManager.h index af7b6c078253..7941a7c6b535 100644 --- a/ios/iosremote/iosremote/Communication/CommunicationManager.h +++ b/ios/iosremote/iosremote/Communication/CommunicationManager.h @@ -55,7 +55,6 @@ typedef enum ConnectionState : NSInteger ConnectionState; enum ConnectionState : NSInteger { DISCONNECTED, - SEARCHING, CONNECTING, CONNECTED }; diff --git a/ios/iosremote/iosremote/Communication/CommunicationManager.m b/ios/iosremote/iosremote/Communication/CommunicationManager.m index 81f7153f7ef1..d0cbe5276ea5 100644 --- a/ios/iosremote/iosremote/Communication/CommunicationManager.m +++ b/ios/iosremote/iosremote/Communication/CommunicationManager.m @@ -72,10 +72,9 @@ [message show]; }); } else { - NSLog(@"delegate type: %@", [self.delegate class]); [[self.delegate navigationController] popToRootViewControllerAnimated:YES]; - BasePresentationViewController * bpvc = [[(MainSplitViewController *)[self.delegate presentingViewController] viewControllers] objectAtIndex:1]; - [bpvc needReconnect]; + BasePresentationViewController *bpvc = [[(MainSplitViewController *)[self.delegate presentingViewController] viewControllers] objectAtIndex:1]; + [bpvc didReceiveDisconnection]; dispatch_async(dispatch_get_main_queue(), ^{ UIAlertView *message = [[UIAlertView alloc] initWithTitle:@"Connection Lost" message:@"Oups, connection lost...Please try to reconnect to your computer. " diff --git a/ios/iosremote/iosremote/Communication/SlideShow.h b/ios/iosremote/iosremote/Communication/SlideShow.h index 524b71b1884c..bf5589740922 100644 --- a/ios/iosremote/iosremote/Communication/SlideShow.h +++ b/ios/iosremote/iosremote/Communication/SlideShow.h @@ -9,13 +9,20 @@ #import <Foundation/Foundation.h> +@protocol AsyncLoadHorizontalTableDelegate <NSObject> + +@optional @property (nonatomic, weak) UITableView * horizontalTableView; +@property (nonatomic, strong) UIView * view; + +@end + @class slideShowPreview_vc; @interface SlideShow : NSObject @property uint size; @property uint currentSlide; -@property (nonatomic, strong) id delegate; +@property (nonatomic, strong) id <AsyncLoadHorizontalTableDelegate> delegate; @property (nonatomic, strong) id secondaryDelegate; - (void) putImage: (NSString *)img AtIndex: (uint) index; diff --git a/ios/iosremote/iosremote/Communication/SlideShow.m b/ios/iosremote/iosremote/Communication/SlideShow.m index 8552311aa9ee..dd3f55b50797 100644 --- a/ios/iosremote/iosremote/Communication/SlideShow.m +++ b/ios/iosremote/iosremote/Communication/SlideShow.m @@ -9,7 +9,7 @@ #import "SlideShow.h" #import "Base64.h" -#import "slideShow_vc.h" +#import "slideShow_vc_iphone.h" #import "UIImage+Resize.h" #import <dispatch/dispatch.h> @@ -34,8 +34,15 @@ dispatch_queue_t backgroundQueue; NSLock *dictLock; +- (void) setDelegate:(id<AsyncLoadHorizontalTableDelegate>)delegate +{ + NSLog(@"setting slideshow delegate to a %@", [delegate class]); + _delegate = delegate; +} + - (SlideShow *) init{ self = [super init]; + NSLog(@"SlideShow got init"); self.imagesDictionary = [[NSMutableDictionary alloc] init]; self.notesDictionary = [[NSMutableDictionary alloc] init]; self.loadBuffer = [[NSMutableDictionary alloc] init]; @@ -50,7 +57,7 @@ NSLock *dictLock; It then checks in the loadBuffer to see if there is a view waiting for this update in loadBuffer, if yes, it loads it up and remove the waiting entry. loadBuffer stores key-value pair with viewTag as a key and slideIndex as value. For the same view, we only keep the last requested slide index on the waiting list. - It is thus indispensable to identify each view with an unique tag in its view controller. Here we use 0-10 to indentify central vc views and 11-N for swipe-in tableViewController which allows direct slide number change. + It is thus indispensable to identify each view with an unique tag in its view controller. Here we use 0-20 to indentify central vc views and 21-N for swipe-in tableViewController which allows direct slide number change. We handle lecturer's notes at the same time as an entry in the load buffer via an instrospection. */ self.slideShowImageReadyObserver =[[NSNotificationCenter defaultCenter] @@ -65,13 +72,25 @@ NSLock *dictLock; UIView * view; if ([tag integerValue] > 20) view = [[self.secondaryDelegate view] viewWithTag: [tag integerValue]]; - else + else if ([tag integerValue] >= 0){ + NSLog(@"Received image, try to load for tag:%d", [tag integerValue]); view = [[self.delegate view] viewWithTag:[tag integerValue]]; + if (!view) { + if (!self.delegate) { + NSLog(@"Delegate nil"); + } else if (![self.delegate view]) + NSLog(@"view nil"); + } + NSLog(@"Will load it into a %@", [view class]); + } + else + view = [[self.delegate horizontalTableView] viewWithTag:[tag integerValue]]; if ([view isKindOfClass:[UIImageView class]]){ UIImage *image = [self.imagesDictionary objectForKey:[self.loadBuffer objectForKey:tag]]; if (image) { - image = [image resizedImage:view.frame.size interpolationQuality:kCGInterpolationDefault]; +// image = [image resizedImage:view.frame.size interpolationQuality:kCGInterpolationDefault]; dispatch_async(dispatch_get_main_queue(), ^{ + NSLog(@"Setting image to tag: %ld", (long)[tag integerValue]); [(UIImageView *)view setImage:image]; }); [self.loadBuffer removeObjectForKey:tag]; @@ -90,7 +109,7 @@ NSLock *dictLock; UIImage *image = [self.imagesDictionary objectForKey:[self.loadBuffer objectForKey:tag]]; if (image){ UIImageView *imageView = (UIImageView *)[view viewWithTag:1]; - image = [image resizedImage:imageView.frame.size interpolationQuality:kCGInterpolationDefault]; +// image = [image resizedImage:imageView.frame.size interpolationQuality:kCGInterpolationDefault]; dispatch_async(dispatch_get_main_queue(), ^{ [imageView setImage:image]; }); @@ -142,7 +161,7 @@ NSLock *dictLock; } if (![self.imagesDictionary objectForKey:[NSNumber numberWithUnsignedInt:index]]) { - NSLog(@"Didn't find %u, putting into buffer", index); + NSLog(@"Didn't find %u, putting tag: %d into buffer", index, [view tag]); [self.loadBuffer setObject:[NSNumber numberWithInt:index ] forKey:[NSNumber numberWithInt:[view tag]]]; } else{ diff --git a/ios/iosremote/iosremote/EditableTableViewCell.m b/ios/iosremote/iosremote/EditableTableViewCell.m index 73199a077863..60362030c762 100644 --- a/ios/iosremote/iosremote/EditableTableViewCell.m +++ b/ios/iosremote/iosremote/EditableTableViewCell.m @@ -22,8 +22,9 @@ { return nil; } - - CGRect bounds = [[self contentView] bounds]; + CGRect bounds = self.contentView.bounds; + if (UI_USER_INTERFACE_IDIOM()==UIUserInterfaceIdiomPad) + bounds.size.width += 160; CGRect rect = CGRectInset(bounds, 20.0, 10.0); UITextField *textField = [[UITextField alloc] initWithFrame:rect]; diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard index 4a68626ecb46..8ed63dd56318 100644 --- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard +++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard @@ -165,10 +165,9 @@ <scene sceneID="yEK-Av-SBc"> <objects> <tableViewController id="5d0-J5-Cal" customClass="slideShowSwipeInList" sceneMemberID="viewController"> - <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="132" sectionHeaderHeight="22" sectionFooterHeight="22" id="Ke1-ze-r00"> + <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="132" sectionHeaderHeight="22" sectionFooterHeight="22" id="Ke1-ze-r00"> <rect key="frame" x="0.0" y="20" width="320" height="548"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - <color key="backgroundColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/> <prototypes> <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="stopWatch" rowHeight="132" id="hig-YG-1Lg"> <rect key="frame" x="0.0" y="22" width="320" height="132"/> @@ -195,11 +194,8 @@ <state key="highlighted"> <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </state> - <connections> - <action selector="stopWatchStart:" destination="5d0-J5-Cal" eventType="touchUpInside" id="887-jd-VmR"/> - </connections> </button> - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="EVu-he-FS4"> + <button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="EVu-he-FS4"> <rect key="frame" x="130" y="77" width="44" height="44"/> <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> @@ -210,9 +206,6 @@ <state key="highlighted"> <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> </state> - <connections> - <action selector="stopWatchClear:" destination="5d0-J5-Cal" eventType="touchUpInside" id="uua-50-63G"/> - </connections> </button> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Hours" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="3UQ-XJ-SDP"> <rect key="frame" x="44" y="48" width="33" height="21"/> @@ -247,7 +240,7 @@ <rect key="frame" x="0.0" y="0.0" width="320" height="131"/> <autoresizingMask key="autoresizingMask"/> <subviews> - <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleAspectFit" image="impress.jpeg" id="del-Hz-TZI"> + <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="Default-568h@2x.png" id="del-Hz-TZI"> <rect key="frame" x="31" y="5" width="182" height="122"/> </imageView> <label clipsSubviews="YES" userInteractionEnabled="NO" tag="2" contentMode="left" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="1" highlighted="YES" id="yWM-Nx-KmF"> @@ -427,10 +420,10 @@ </objects> <point key="canvasLocation" x="2290" y="1807"/> </scene> - <!--Slide Show Preview Table vc--> + <!--Slide Show Preview Table vc iphone--> <scene sceneID="Tvi-bD-vMC"> <objects> - <tableViewController id="Ybo-9c-MB8" customClass="slideShowPreviewTable_vc" sceneMemberID="viewController"> + <tableViewController id="Ybo-9c-MB8" customClass="slideShowPreviewTable_vc_iphone" sceneMemberID="viewController"> <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="singleLineEtched" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="rWA-v3-wtf"> <rect key="frame" x="0.0" y="64" width="320" height="504"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> @@ -544,8 +537,8 @@ </scene> </scenes> <resources> - <image name="ic_launcher@2x.png" width="114" height="114"/> - <image name="impress.jpeg" width="204" height="204"/> + <image name="Default-568h@2x.png" width="640" height="1136"/> + <image name="ic_launcher@2x.png" width="16" height="16"/> <image name="pointer.png" width="143" height="147"/> <image name="pointer_pushed.png" width="143" height="147"/> <image name="pushed_next_button.png" width="315" height="220"/> @@ -555,12 +548,73 @@ <image name="timer_clear_btn.png" width="74" height="74"/> <image name="timer_start_btn.png" width="74" height="74"/> </resources> + <classes> + <class className="EditableTableViewCell" superclassName="UITableViewCell"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/> + </class> + <class className="SWRevealViewController" superclassName="UIViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/SWRevealViewController.h"/> + </class> + <class className="newServerViewController" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/> + <relationships> + <relationship kind="action" name="save:"/> + </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="outlet" name="serverTable" candidateClass="UITableView"/> + </relationships> + </class> + <class className="slideShowPreviewTable_vc" superclassName="UITableViewController"> + <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/> + <relationships> + <relationship kind="action" name="startPresentationAction:"/> + <relationship kind="outlet" name="optionsTable" candidateClass="UITableView"/> + </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="accPointerAction:"/> + <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="gCy-Mv-VrC"/> + <segue reference="eIY-4P-1sI"/> + <segue reference="EWS-Nn-mQc"/> </inferredMetricsTieBreakers> -</document> +</document>
\ No newline at end of file diff --git a/ios/iosremote/iosremote/iosremote-Info.plist b/ios/iosremote/iosremote/iosremote-Info.plist index 59dcb6f765e9..8203b179ea39 100644 --- a/ios/iosremote/iosremote/iosremote-Info.plist +++ b/ios/iosremote/iosremote/iosremote-Info.plist @@ -14,9 +14,16 @@ <dict> <key>CFBundleIconFiles</key> <array> - <string>ic_launcher.png</string> - <string>ic_launcher@2x.png</string> + <string>iosremote_iphone_icon.png</string> + <string>iosremote_iphone_icon@2x.png</string> + <string>iosremote_icon.png</string> + <string>iosremote_ipad_icon.png</string> + <string>iosremote_ipad_icon@2x.png</string> + <string>iosremote_ipad_icon@2x_3.png</string> + <string>iosremote_ipad_icon@2x_3.png</string> </array> + <key>UIPrerenderedIcon</key> + <true/> </dict> </dict> <key>CFBundleIdentifier</key> @@ -37,10 +44,24 @@ <true/> <key>UIMainStoryboardFile</key> <string>iPhone_autoSize</string> + <key>UIMainStoryboardFile~ipad</key> + <string>iPad_autosize</string> + <key>UIPrerenderedIcon</key> + <true/> <key>UIRequiredDeviceCapabilities</key> <array> <string>armv7</string> </array> + <key>UIStatusBarTintParameters</key> + <dict> + <key>UINavigationBar</key> + <dict> + <key>Style</key> + <string>UIBarStyleDefault</string> + <key>Translucent</key> + <false/> + </dict> + </dict> <key>UISupportedInterfaceOrientations</key> <array> <string>UIInterfaceOrientationPortrait</string> diff --git a/ios/iosremote/iosremote/main.m b/ios/iosremote/iosremote/main.m index ff07e61834a9..20d3bcaa357f 100644 --- a/ios/iosremote/iosremote/main.m +++ b/ios/iosremote/iosremote/main.m @@ -9,10 +9,11 @@ #import <UIKit/UIKit.h> #import "AppDelegate.h" +#import "AppDelegate_ipad.h" int main(int argc, char *argv[]) { @autoreleasepool { - return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); + return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); } } diff --git a/ios/iosremote/iosremote/newServer_vc.m b/ios/iosremote/iosremote/newServer_vc.m index 65a384645998..fb44d6622f7f 100644 --- a/ios/iosremote/iosremote/newServer_vc.m +++ b/ios/iosremote/iosremote/newServer_vc.m @@ -19,6 +19,15 @@ @synthesize nameCell = _nameCell; @synthesize addrCell = _addrCell; +- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation +{ + if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) + return YES; + else { + return toInterfaceOrientation == UIInterfaceOrientationMaskPortrait; + } +} + - (IBAction)save:(id)sender { NSString *serverName = [self.nameCell.textField text]; NSString *serverAddr = [self.addrCell.textField text]; @@ -102,6 +111,10 @@ } } +- (BOOL)disablesAutomaticKeyboardDismissal { + return NO; +} + #pragma mark - #pragma mark UITextFieldDelegate Protocol diff --git a/ios/iosremote/iosremote/serverList_vc.m b/ios/iosremote/iosremote/serverList_vc.m index 2510fdd960c5..5344c3dc577e 100644 --- a/ios/iosremote/iosremote/serverList_vc.m +++ b/ios/iosremote/iosremote/serverList_vc.m @@ -123,6 +123,18 @@ } } +# pragma mark - System defaults + +- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation +{ + if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) + return YES; + else { + return toInterfaceOrientation == UIInterfaceOrientationMaskPortrait; + } +} + + - (id)initWithStyle:(UITableViewStyle)style { self = [super initWithStyle:style]; @@ -141,6 +153,7 @@ // Uncomment the following line to display an Edit button in the navigation bar for this view controller. // self.navigationItem.rightBarButtonItem = self.editButtonItem; + self.center = [NSNotificationCenter defaultCenter]; self.comManager = [CommunicationManager sharedComManager]; self.serverTable.dataSource = self; @@ -221,14 +234,21 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - UITableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath]; + [tableView deselectRowAtIndexPath:indexPath animated:YES]; - if(self.comManager.state!=CONNECTING){ - self.lastSpinningCellIndex = indexPath; - UIActivityIndicatorView *activityView = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray]; - [activityView startAnimating]; - [cell setAccessoryView:activityView]; + // Return when nothing should be done + if (self.comManager.state == CONNECTING || + ([self.comManager.autoDiscoveryServers count] == 0 && indexPath.section == 0)) { + return; } + + UITableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath]; + + // Setting up the spinner to the right cell + self.lastSpinningCellIndex = indexPath; + UIActivityIndicatorView *activityView = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray]; + [activityView startAnimating]; + [cell setAccessoryView:activityView]; if (indexPath.section == 1){ NSLog(@"Connecting to %@:%@", [[self.comManager.servers objectAtIndex:indexPath.row] serverName], [[self.comManager.servers objectAtIndex:indexPath.row] serverAddress]); @@ -237,8 +257,6 @@ NSLog(@"Connecting to %@", [[self.comManager.autoDiscoveryServers objectAtIndex:indexPath.row] name]); [[self.comManager.autoDiscoveryServers objectAtIndex:indexPath.row] resolveWithTimeout:0.0]; } - - [tableView deselectRowAtIndexPath:indexPath animated:YES]; } - (void)viewDidUnload { @@ -258,8 +276,12 @@ sectionName = [NSString stringWithFormat:@"Custom connections"]; break; } - - UILabel *sectionHeader = [[UILabel alloc] initWithFrame:CGRectMake(10, 10, 200, 40)]; + UILabel *sectionHeader; + if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) { + sectionHeader = [[UILabel alloc] initWithFrame:CGRectMake(10, 10, 200, 40)]; + } else { + sectionHeader = [[UILabel alloc] initWithFrame:CGRectMake(25, 10, 200, 40)]; + } sectionHeader.backgroundColor = [UIColor clearColor]; sectionHeader.font = [UIFont boldSystemFontOfSize:18]; sectionHeader.textColor = [UIColor darkTextColor]; diff --git a/ios/iosremote/iosremote/slideShowPreviewTable_vc.h b/ios/iosremote/iosremote/slideShowPreviewTable_vc.h index 0b9c4615f474..6970601b9dc9 100644 --- a/ios/iosremote/iosremote/slideShowPreviewTable_vc.h +++ b/ios/iosremote/iosremote/slideShowPreviewTable_vc.h @@ -7,6 +7,7 @@ */ #import <UIKit/UIKit.h> +#import "CommunicationManager.h" #define OPTION_TIMER @"Timer auto-start" #define OPTION_POINTER @"Touch pointer" @@ -16,5 +17,10 @@ @interface slideShowPreviewTable_vc : UITableViewController <UITableViewDataSource, UITableViewDelegate> @property (strong, nonatomic) IBOutlet UITableView *optionsTable; +@property (nonatomic, strong) CommunicationManager * comManager; +@property (nonatomic, strong) id slideShowStartObserver; +@property (nonatomic, strong) NSArray * optionsArray; + +-(IBAction)startPresentationAction:(id)sender; @end diff --git a/ios/iosremote/iosremote/slideShowPreviewTable_vc.m b/ios/iosremote/iosremote/slideShowPreviewTable_vc.m index 59139fa71189..fe9be61d9c61 100644 --- a/ios/iosremote/iosremote/slideShowPreviewTable_vc.m +++ b/ios/iosremote/iosremote/slideShowPreviewTable_vc.m @@ -15,10 +15,6 @@ @interface slideShowPreviewTable_vc () @property (nonatomic, weak) UIButton * startButton; -@property (nonatomic, strong) NSArray * optionsArray; -@property (nonatomic, strong) CommunicationManager * comManager; -@property (nonatomic, strong) id slideShowStartObserver; -@property BOOL slidesRunning; @end @@ -28,6 +24,15 @@ @synthesize optionsTable = _optionsTable; @synthesize optionsArray = _optionsArray; +- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation +{ + if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) + return YES; + else { + return toInterfaceOrientation == UIInterfaceOrientationMaskPortrait; + } +} + - (id)initWithStyle:(UITableViewStyle)style { self = [super initWithStyle:style]; @@ -40,50 +45,12 @@ - (void)viewDidLoad { [super viewDidLoad]; - - // Uncomment the following line to preserve selection between presentations. - // self.clearsSelectionOnViewWillAppear = NO; - - // Uncomment the following line to display an Edit button in the navigation bar for this view controller. - // self.navigationItem.rightBarButtonItem = self.editButtonItem; - self.optionsArray = [NSArray arrayWithObjects:OPTION_TIMER, OPTION_POINTER, nil]; - self.comManager = [CommunicationManager sharedComManager]; - self.comManager.delegate = self; - self.slidesRunning = NO; - NSOperationQueue *mainQueue = [NSOperationQueue mainQueue]; - self.slideShowStartObserver = [[NSNotificationCenter defaultCenter] addObserverForName:STATUS_CONNECTED_SLIDESHOW_RUNNING - object:nil - queue:mainQueue - usingBlock:^(NSNotification *note) { - self.slidesRunning = YES; - }]; - } - -- (void) viewDidAppear:(BOOL)animated -{ - if (self.slidesRunning && [self.comManager.interpreter.slideShow size] > 0){ - self.slidesRunning = NO; - [self performSegueWithIdentifier:@"slideShowSegue" sender:self]; - } - NSOperationQueue *mainQueue = [NSOperationQueue mainQueue]; - self.slideShowStartObserver = [[NSNotificationCenter defaultCenter] addObserverForName:STATUS_CONNECTED_SLIDESHOW_RUNNING - object:nil - queue:mainQueue - usingBlock:^(NSNotification *note) { -// if (NSClassFromString(@"NSLayoutConstraint")) -// // support autolayout, this tablevc has a parent_vc which has this segue -// [self.parentViewController performSegueWithIdentifier:@"slideShowSegue" sender:self]; -// else - [self performSegueWithIdentifier:@"slideShowSegue" sender:self]; - }]; - [super viewDidAppear:animated]; } - (void) viewDidDisappear:(BOOL)animated { [[NSNotificationCenter defaultCenter] removeObserver:self.slideShowStartObserver]; self.slideShowStartObserver = nil; - self.slidesRunning = NO; [super viewDidDisappear:animated]; } @@ -122,44 +89,6 @@ return cell; } -/* -// Override to support conditional editing of the table view. -- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath -{ - // Return NO if you do not want the specified item to be editable. - return YES; -} -*/ - -/* -// Override to support editing the table view. -- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath -{ - if (editingStyle == UITableViewCellEditingStyleDelete) { - // Delete the row from the data source - [tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationFade]; - } - else if (editingStyle == UITableViewCellEditingStyleInsert) { - // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view - } -} -*/ - -/* -// Override to support rearranging the table view. -- (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath -{ -} -*/ - -/* -// Override to support conditional rearranging of the table view. -- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath -{ - // Return NO if you do not want the item to be re-orderable. - return YES; -} -*/ -(IBAction)startPresentationAction:(id)sender { for (UITableViewCell *cell in self.tableView.visibleCells) { @@ -176,9 +105,14 @@ - (UIButton *)startButton{ if (_startButton == nil) { _startButton = [UIButton buttonWithType:UIButtonTypeRoundedRect]; - _startButton.frame = CGRectMake(10.0, 10.0, 300.0, 50.0); + if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) { + _startButton.frame = CGRectMake(10.0, 30.0, 300.0, 50.0); + } else { + self.modalViewController.view.backgroundColor = [UIColor clearColor]; + _startButton.frame = CGRectMake(30.0, 50.0, 470.0, 50.0); + } [_startButton setTitle:@"Start Presentation" forState:UIControlStateNormal]; - [_startButton addTarget:self action:@selector(startPresentationAction:) forControlEvents:UIControlEventTouchDown]; + [_startButton addTarget:self action:@selector(startPresentationAction:) forControlEvents:UIControlEventTouchUpInside]; _startButton.tag = 1; } @@ -187,17 +121,21 @@ - (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section { - - UIView* customView = [[UIView alloc] initWithFrame:CGRectMake(0.0, 0.0, 320.0, 100.0)]; - + UIView* customView; + if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) { + customView = [[UIView alloc] initWithFrame:CGRectMake(0.0, 0.0, 320.0, 100.0)]; + } else if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) + customView = [[UIView alloc] initWithFrame:CGRectMake(0.0, 0.0, 540.0, 100.0)]; [customView addSubview:self.startButton]; + customView.center = CGPointMake(tableView.center.x, customView.center.y); + self.startButton.center = customView.center; return customView; } - (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section { - return 50.0; + return 100.0; } #pragma mark - Table view delegate |