diff options
author | siqi <me@siqi.fr> | 2013-07-04 14:22:39 +0200 |
---|---|---|
committer | siqi <me@siqi.fr> | 2013-07-05 09:56:03 +0200 |
commit | 86f02abee1b4949bda34725637deeecd79efed7f (patch) | |
tree | 9953c86faae777658a3dd72a4fbc63330c71516e /ios | |
parent | fixup nanosecond precision (diff) | |
download | core-86f02abee1b4949bda34725637deeecd79efed7f.tar.gz core-86f02abee1b4949bda34725637deeecd79efed7f.zip |
connect to server list implemented
Change-Id: I7a59c79119be610b85ec5b048d920603a5cb2eb6
Diffstat (limited to 'ios')
-rw-r--r-- | ios/iosremote/iosremote.xcodeproj/project.pbxproj | 38 | ||||
-rw-r--r-- | ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/siqi.xcuserdatad/UserInterfaceState.xcuserstate | bin | 73210 -> 55508 bytes | |||
-rw-r--r-- | ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/siqi.xcuserdatad/WorkspaceSettings.xcsettings | 12 | ||||
-rw-r--r-- | ios/iosremote/iosremote/Communication/CommunicationManager.h | 2 | ||||
-rw-r--r-- | ios/iosremote/iosremote/Communication/CommunicationManager.m | 18 | ||||
-rw-r--r-- | ios/iosremote/iosremote/en.lproj/MainStoryboard_iPad.storyboard | 185 | ||||
-rw-r--r-- | ios/iosremote/iosremote/en.lproj/MainStoryboard_iPhone.storyboard | 4 | ||||
-rw-r--r-- | ios/iosremote/iosremote/iosremote-Info.plist | 2 | ||||
-rw-r--r-- | ios/iosremote/iosremote/main.m | 1 | ||||
-rw-r--r-- | ios/iosremote/iosremote/newServer_vc.m | 5 | ||||
-rw-r--r-- | ios/iosremote/iosremote/serverList_vc.h (renamed from ios/iosremote/iosremote/server_list_vc.h) | 2 | ||||
-rw-r--r-- | ios/iosremote/iosremote/serverList_vc.m (renamed from ios/iosremote/iosremote/server_list_vc.m) | 49 |
12 files changed, 59 insertions, 259 deletions
diff --git a/ios/iosremote/iosremote.xcodeproj/project.pbxproj b/ios/iosremote/iosremote.xcodeproj/project.pbxproj index 3a3ba147ca6f..86fa0c38e232 100644 --- a/ios/iosremote/iosremote.xcodeproj/project.pbxproj +++ b/ios/iosremote/iosremote.xcodeproj/project.pbxproj @@ -7,10 +7,9 @@ objects = { /* Begin PBXBuildFile section */ - 5753DD901781EA0300DB71BB /* server_list_vc.m in Sources */ = {isa = PBXBuildFile; fileRef = 5753DD8F1781EA0300DB71BB /* server_list_vc.m */; }; + 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 */; }; 57B152991764703500EECC67 /* Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 57B152981764703500EECC67 /* Base64.m */; }; - 57B1529C1764714900EECC67 /* slideShowViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 57B1529B1764714900EECC67 /* slideShowViewController.m */; }; 57B1529F176486C300EECC67 /* CommandTransmitter.m in Sources */ = {isa = PBXBuildFile; fileRef = 57B1529E176486C300EECC67 /* CommandTransmitter.m */; }; 57B7625D17621E42007703F6 /* SlideShow.m in Sources */ = {isa = PBXBuildFile; fileRef = 57B7625C17621E42007703F6 /* SlideShow.m */; }; 57C6E3F3175E06E800E8BC5F /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 57C6E3F2175E06E800E8BC5F /* UIKit.framework */; }; @@ -23,8 +22,6 @@ 57C6E407175E06E800E8BC5F /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 57C6E406175E06E800E8BC5F /* Default@2x.png */; }; 57C6E409175E06E800E8BC5F /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 57C6E408175E06E800E8BC5F /* Default-568h@2x.png */; }; 57C6E40C175E06E800E8BC5F /* MainStoryboard_iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 57C6E40A175E06E800E8BC5F /* MainStoryboard_iPhone.storyboard */; }; - 57C6E40F175E06E800E8BC5F /* MainStoryboard_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 57C6E40D175E06E800E8BC5F /* MainStoryboard_iPad.storyboard */; }; - 57C6E412175E06E800E8BC5F /* libreoffice_sdremoteViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 57C6E411175E06E800E8BC5F /* libreoffice_sdremoteViewController.m */; }; 57C6E42E175E076900E8BC5F /* Client.m in Sources */ = {isa = PBXBuildFile; fileRef = 57C6E427175E076900E8BC5F /* Client.m */; }; 57C6E42F175E076900E8BC5F /* CommunicationManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 57C6E429175E076900E8BC5F /* CommunicationManager.m */; }; 57C6E430175E076900E8BC5F /* CommandInterpreter.m in Sources */ = {isa = PBXBuildFile; fileRef = 57C6E42B175E076900E8BC5F /* CommandInterpreter.m */; }; @@ -34,14 +31,12 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 5753DD8E1781EA0300DB71BB /* server_list_vc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = server_list_vc.h; sourceTree = "<group>"; }; - 5753DD8F1781EA0300DB71BB /* server_list_vc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = server_list_vc.m; 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>"; }; 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>"; }; - 57B1529A1764714900EECC67 /* slideShowViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = slideShowViewController.h; sourceTree = "<group>"; }; - 57B1529B1764714900EECC67 /* slideShowViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = slideShowViewController.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>"; }; @@ -60,9 +55,6 @@ 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>"; }; 57C6E40B175E06E800E8BC5F /* en */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = en; path = en.lproj/MainStoryboard_iPhone.storyboard; sourceTree = "<group>"; }; - 57C6E40E175E06E800E8BC5F /* en */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = en; path = en.lproj/MainStoryboard_iPad.storyboard; sourceTree = "<group>"; }; - 57C6E410175E06E800E8BC5F /* libreoffice_sdremoteViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = libreoffice_sdremoteViewController.h; sourceTree = "<group>"; }; - 57C6E411175E06E800E8BC5F /* libreoffice_sdremoteViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = libreoffice_sdremoteViewController.m; 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; path = CommunicationManager.h; sourceTree = "<group>"; }; @@ -130,14 +122,9 @@ 57C6E40A175E06E800E8BC5F /* MainStoryboard_iPhone.storyboard */, 5753DD9717834D7100DB71BB /* newServer_vc.h */, 5753DD9817834D7100DB71BB /* newServer_vc.m */, - 5753DD8E1781EA0300DB71BB /* server_list_vc.h */, - 5753DD8F1781EA0300DB71BB /* server_list_vc.m */, - 57C6E40D175E06E800E8BC5F /* MainStoryboard_iPad.storyboard */, - 57C6E410175E06E800E8BC5F /* libreoffice_sdremoteViewController.h */, - 57C6E411175E06E800E8BC5F /* libreoffice_sdremoteViewController.m */, + 5753DD8E1781EA0300DB71BB /* serverList_vc.h */, + 5753DD8F1781EA0300DB71BB /* serverList_vc.m */, 57C6E3F9175E06E800E8BC5F /* Supporting Files */, - 57B1529A1764714900EECC67 /* slideShowViewController.h */, - 57B1529B1764714900EECC67 /* slideShowViewController.m */, 57CFED9717838FDC00E82E05 /* EditableTableViewCell.h */, 57CFED9817838FDC00E82E05 /* EditableTableViewCell.m */, ); @@ -235,7 +222,6 @@ 57C6E407175E06E800E8BC5F /* Default@2x.png in Resources */, 57C6E409175E06E800E8BC5F /* Default-568h@2x.png in Resources */, 57C6E40C175E06E800E8BC5F /* MainStoryboard_iPhone.storyboard in Resources */, - 57C6E40F175E06E800E8BC5F /* MainStoryboard_iPad.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -248,16 +234,14 @@ files = ( 57C6E3FF175E06E800E8BC5F /* main.m in Sources */, 57C6E403175E06E800E8BC5F /* libreoffice_sdremoteAppDelegate.m in Sources */, - 57C6E412175E06E800E8BC5F /* libreoffice_sdremoteViewController.m in Sources */, 57C6E42E175E076900E8BC5F /* Client.m in Sources */, 57C6E42F175E076900E8BC5F /* CommunicationManager.m in Sources */, 57C6E430175E076900E8BC5F /* CommandInterpreter.m in Sources */, 57C6E431175E076900E8BC5F /* Server.m in Sources */, 57B7625D17621E42007703F6 /* SlideShow.m in Sources */, 57B152991764703500EECC67 /* Base64.m in Sources */, - 57B1529C1764714900EECC67 /* slideShowViewController.m in Sources */, 57B1529F176486C300EECC67 /* CommandTransmitter.m in Sources */, - 5753DD901781EA0300DB71BB /* server_list_vc.m in Sources */, + 5753DD901781EA0300DB71BB /* serverList_vc.m in Sources */, 5753DD9917834D7100DB71BB /* newServer_vc.m in Sources */, 57CFED9917838FDC00E82E05 /* EditableTableViewCell.m in Sources */, ); @@ -282,14 +266,6 @@ name = MainStoryboard_iPhone.storyboard; sourceTree = "<group>"; }; - 57C6E40D175E06E800E8BC5F /* MainStoryboard_iPad.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 57C6E40E175E06E800E8BC5F /* en */, - ); - name = MainStoryboard_iPad.storyboard; - sourceTree = "<group>"; - }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ @@ -359,6 +335,7 @@ INFOPLIST_FILE = "iosremote/iosremote-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 5.1; PRODUCT_NAME = "$(TARGET_NAME)"; + TARGETED_DEVICE_FAMILY = 1; WRAPPER_EXTENSION = app; }; name = Debug; @@ -371,6 +348,7 @@ INFOPLIST_FILE = "iosremote/iosremote-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 5.1; PRODUCT_NAME = "$(TARGET_NAME)"; + TARGETED_DEVICE_FAMILY = 1; WRAPPER_EXTENSION = app; }; name = Release; diff --git a/ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/siqi.xcuserdatad/UserInterfaceState.xcuserstate b/ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/siqi.xcuserdatad/UserInterfaceState.xcuserstate Binary files differindex 7941e44d7774..6d49ab0d5aef 100644 --- a/ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/siqi.xcuserdatad/UserInterfaceState.xcuserstate +++ b/ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/siqi.xcuserdatad/UserInterfaceState.xcuserstate diff --git a/ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/siqi.xcuserdatad/WorkspaceSettings.xcsettings b/ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/siqi.xcuserdatad/WorkspaceSettings.xcsettings index 659c8766e0c0..28f6741dd3f1 100644 --- a/ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/siqi.xcuserdatad/WorkspaceSettings.xcsettings +++ b/ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/siqi.xcuserdatad/WorkspaceSettings.xcsettings @@ -2,9 +2,21 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> + <key>BuildLocationStyle</key> + <string>UseAppPreferences</string> + <key>CustomBuildLocationType</key> + <string>RelativeToDerivedData</string> + <key>DerivedDataLocationStyle</key> + <string>Default</string> <key>HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges</key> <true/> + <key>IssueFilterStyle</key> + <string>ShowActiveSchemeOnly</string> + <key>LiveSourceIssuesEnabled</key> + <true/> <key>SnapshotAutomaticallyBeforeSignificantChanges</key> <true/> + <key>SnapshotLocationStyle</key> + <string>Default</string> </dict> </plist> diff --git a/ios/iosremote/iosremote/Communication/CommunicationManager.h b/ios/iosremote/iosremote/Communication/CommunicationManager.h index 7fe5451a0af1..82f6970bc45a 100644 --- a/ios/iosremote/iosremote/Communication/CommunicationManager.h +++ b/ios/iosremote/iosremote/Communication/CommunicationManager.h @@ -51,7 +51,7 @@ enum ConnectionState : NSInteger { CONNECTED }; -@interface CommunicationManager : NSObject <UITableViewDataSource> +@interface CommunicationManager : NSObject - (id) initWithExistingServers; - (void) connectToServer:(Server*)server; diff --git a/ios/iosremote/iosremote/Communication/CommunicationManager.m b/ios/iosremote/iosremote/Communication/CommunicationManager.m index 701d4ebc5185..2b2e81b112c2 100644 --- a/ios/iosremote/iosremote/Communication/CommunicationManager.m +++ b/ios/iosremote/iosremote/Communication/CommunicationManager.m @@ -139,24 +139,6 @@ return [self sharedComManager]; } - --(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return [self.servers count]; -} - --(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - - static NSString *cellIdentifier = @"server_item_cell"; - - UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:cellIdentifier]; - - Server *s = [self.servers objectAtIndex:indexPath.row]; - - [cell.textLabel setText:[s serverName]]; - [cell.detailTextLabel setText:[s serverAddress]]; - return cell; -} - - (void) addServersWithName:(NSString*)name AtAddress:(NSString*)addr { diff --git a/ios/iosremote/iosremote/en.lproj/MainStoryboard_iPad.storyboard b/ios/iosremote/iosremote/en.lproj/MainStoryboard_iPad.storyboard deleted file mode 100644 index 9eab508b5e99..000000000000 --- a/ios/iosremote/iosremote/en.lproj/MainStoryboard_iPad.storyboard +++ /dev/null @@ -1,185 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="13A497d" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="KFV-Ae-zm8"> - <dependencies> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> - </dependencies> - <scenes> - <!--Libreoffice sdremote View Controller--> - <scene sceneID="4"> - <objects> - <viewController id="2" customClass="libreoffice_sdremoteViewController" sceneMemberID="viewController"> - <view key="view" contentMode="scaleToFill" id="5"> - <rect key="frame" x="0.0" y="64" width="768" height="916"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - <subviews> - <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="192.168.40.101" borderStyle="roundedRect" minimumFontSize="17" id="9w1-Ym-HcF"> - <rect key="frame" x="234" y="402" width="301" height="30"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="system" pointSize="14"/> - <textInputTraits key="textInputTraits"/> - </textField> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="pinLabel" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Cg3-f5-zuM"> - <rect key="frame" x="253" y="218" width="263" height="82"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="system" pointSize="64"/> - <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> - <nil key="highlightedColor"/> - </label> - </subviews> - <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> - </view> - <toolbarItems> - <barButtonItem title="Start Presentation" id="R1W-H8-kVN"> - <connections> - <action selector="startPresentation:" destination="2" id="D8F-FY-mIu"/> - </connections> - </barButtonItem> - </toolbarItems> - <navigationItem key="navigationItem" id="7ye-Vv-ZD0"> - <barButtonItem key="rightBarButtonItem" title="Connect" id="ZJB-Ei-Sa9"> - <connections> - <action selector="connectToServer:" destination="2" id="58D-7s-OuE"/> - </connections> - </barButtonItem> - </navigationItem> - <simulatedToolbarMetrics key="simulatedBottomBarMetrics"/> - <connections> - <outlet property="ipAddressTextEdit" destination="9w1-Ym-HcF" id="hab-JH-3Lf"/> - <outlet property="pinLabel" destination="Cg3-f5-zuM" id="HaU-jr-8oJ"/> - <segue destination="zdX-BL-bmY" kind="push" identifier="slidesPreviewSegue" id="9Yb-di-Q6v"/> - </connections> - </viewController> - <placeholder placeholderIdentifier="IBFirstResponder" id="3" sceneMemberID="firstResponder"/> - </objects> - <point key="canvasLocation" x="2766" y="-569"/> - </scene> - <!--Table View Controller--> - <scene sceneID="Whz-cu-Rds"> - <objects> - <tableViewController id="Q3M-g5-7cc" sceneMemberID="viewController"> - <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="Wpt-pb-meU"> - <rect key="frame" x="0.0" y="20" width="768" height="1004"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - <prototypes> - <tableViewCell contentMode="scaleToFill" selectionStyle="blue" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" textLabel="PmM-ch-mza" detailTextLabel="epJ-IU-4Ja" style="IBUITableViewCellStyleValue1" id="Jgt-j6-gHM"> - <rect key="frame" x="0.0" y="22" width="768" height="44"/> - <autoresizingMask key="autoresizingMask"/> - <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> - <rect key="frame" x="0.0" y="0.0" width="748" height="43"/> - <autoresizingMask key="autoresizingMask"/> - <subviews> - <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Servername" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="PmM-ch-mza"> - <rect key="frame" x="10" y="11" width="98" height="21"/> - <autoresizingMask key="autoresizingMask"/> - <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/> - <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> - <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> - </label> - <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="IP Address" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="epJ-IU-4Ja"> - <rect key="frame" x="654" y="11" width="84" height="21"/> - <autoresizingMask key="autoresizingMask"/> - <fontDescription key="fontDescription" type="system" pointSize="17"/> - <color key="textColor" red="0.2196078431372549" green="0.32941176470588235" blue="0.52941176470588236" alpha="1" colorSpace="calibratedRGB"/> - <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> - </label> - </subviews> - <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> - </view> - </tableViewCell> - </prototypes> - <connections> - <outlet property="dataSource" destination="Q3M-g5-7cc" id="Ram-95-c0p"/> - <outlet property="delegate" destination="Q3M-g5-7cc" id="B8s-db-s0A"/> - </connections> - </tableView> - <navigationItem key="navigationItem" id="Jgb-PO-hv6"> - <barButtonItem key="rightBarButtonItem" title="Add new Server" id="OYa-b3-ARI"/> - </navigationItem> - <connections> - <segue destination="2" kind="push" id="e6A-u1-Kqr"/> - </connections> - </tableViewController> - <placeholder placeholderIdentifier="IBFirstResponder" id="Nq5-gt-sEh" userLabel="First Responder" sceneMemberID="firstResponder"/> - </objects> - <point key="canvasLocation" x="1640" y="-1071"/> - </scene> - <!--Navigation Controller--> - <scene sceneID="00H-XM-3gJ"> - <objects> - <navigationController toolbarHidden="NO" id="KFV-Ae-zm8" sceneMemberID="viewController"> - <toolbarItems> - <barButtonItem title="Diconnect" id="U8F-bC-QHV"/> - </toolbarItems> - <simulatedToolbarMetrics key="simulatedBottomBarMetrics" barStyle="blackTranslucent"/> - <navigationBar key="navigationBar" contentMode="scaleToFill" id="QnQ-yW-KgX"> - <rect key="frame" x="0.0" y="0.0" width="768" height="44"/> - <autoresizingMask key="autoresizingMask"/> - </navigationBar> - <nil name="viewControllers"/> - <toolbar key="toolbar" opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" barStyle="blackTranslucent" id="Eh6-CN-U8v"> - <rect key="frame" x="0.0" y="980" width="768" height="44"/> - <autoresizingMask key="autoresizingMask"/> - </toolbar> - <connections> - <segue destination="2" kind="relationship" relationship="rootViewController" id="m46-Fm-sAa"/> - </connections> - </navigationController> - <placeholder placeholderIdentifier="IBFirstResponder" id="sOJ-6b-jVh" userLabel="First Responder" sceneMemberID="firstResponder"/> - </objects> - <point key="canvasLocation" x="1666" y="89"/> - </scene> - <!--Slide Show View Controller--> - <scene sceneID="wDH-NE-E5t"> - <objects> - <viewController id="zdX-BL-bmY" customClass="slideShowViewController" sceneMemberID="viewController"> - <view key="view" contentMode="scaleToFill" id="Tkv-NW-1bl"> - <rect key="frame" x="0.0" y="64" width="768" height="916"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <subviews> - <imageView userInteractionEnabled="NO" contentMode="scaleToFill" id="T6z-xu-j8h"> - <rect key="frame" x="14" y="20" width="741" height="398"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - </imageView> - <webView contentMode="scaleToFill" id="y0E-Wp-yUc"> - <rect key="frame" x="20" y="487.5" width="728" height="359.5"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/> - <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> - </webView> - </subviews> - <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> - </view> - <toolbarItems> - <barButtonItem title="Previous" id="fEE-h8-5be"> - <connections> - <action selector="previousSlide:" destination="zdX-BL-bmY" id="DMr-Rh-WfD"/> - </connections> - </barButtonItem> - </toolbarItems> - <navigationItem key="navigationItem" id="uc0-p3-wnG"> - <barButtonItem key="rightBarButtonItem" title="Next" id="502-Fp-Hjs"> - <connections> - <action selector="nextSlide:" destination="zdX-BL-bmY" id="YU1-0k-qPi"/> - </connections> - </barButtonItem> - </navigationItem> - <simulatedToolbarMetrics key="simulatedBottomBarMetrics"/> - <connections> - <outlet property="image" destination="T6z-xu-j8h" id="o1L-LM-TbP"/> - <outlet property="lecturer_notes" destination="y0E-Wp-yUc" id="qNC-Bc-jAZ"/> - </connections> - </viewController> - <placeholder placeholderIdentifier="IBFirstResponder" id="Dqn-Ae-ABD" userLabel="First Responder" sceneMemberID="firstResponder"/> - </objects> - <point key="canvasLocation" x="3804" y="-569"/> - </scene> - </scenes> - <simulatedMetricsContainer key="defaultSimulatedMetrics"> - <simulatedStatusBarMetrics key="statusBar" statusBarStyle="blackTranslucent"/> - <simulatedOrientationMetrics key="orientation"/> - <simulatedScreenMetrics key="destination"/> - </simulatedMetricsContainer> - <inferredMetricsTieBreakers> - <segue reference="m46-Fm-sAa"/> - </inferredMetricsTieBreakers> -</document>
\ No newline at end of file diff --git a/ios/iosremote/iosremote/en.lproj/MainStoryboard_iPhone.storyboard b/ios/iosremote/iosremote/en.lproj/MainStoryboard_iPhone.storyboard index fd0b6cb2f826..b93e264e9d70 100644 --- a/ios/iosremote/iosremote/en.lproj/MainStoryboard_iPhone.storyboard +++ b/ios/iosremote/iosremote/en.lproj/MainStoryboard_iPhone.storyboard @@ -36,6 +36,10 @@ </view> </tableViewCell> </prototypes> + <connections> + <outlet property="dataSource" destination="2" id="dcg-jo-7eE"/> + <outlet property="delegate" destination="2" id="owZ-Ow-VEc"/> + </connections> </tableView> <navigationItem key="navigationItem" title="Connect" id="yR1-m8-JWN"> <barButtonItem key="rightBarButtonItem" systemItem="add" id="bHy-yX-SPg"> diff --git a/ios/iosremote/iosremote/iosremote-Info.plist b/ios/iosremote/iosremote/iosremote-Info.plist index f2b1ca676dd1..2bd910bf530a 100644 --- a/ios/iosremote/iosremote/iosremote-Info.plist +++ b/ios/iosremote/iosremote/iosremote-Info.plist @@ -26,8 +26,6 @@ <true/> <key>UIMainStoryboardFile</key> <string>MainStoryboard_iPhone</string> - <key>UIMainStoryboardFile~ipad</key> - <string>MainStoryboard_iPad</string> <key>UIRequiredDeviceCapabilities</key> <array> <string>armv7</string> diff --git a/ios/iosremote/iosremote/main.m b/ios/iosremote/iosremote/main.m index 60d8585ee850..126838a75b05 100644 --- a/ios/iosremote/iosremote/main.m +++ b/ios/iosremote/iosremote/main.m @@ -9,7 +9,6 @@ #import <UIKit/UIKit.h> #import "libreoffice_sdremoteAppDelegate.h" -#import "TPKeyboardAvoidingScrollView.h" int main(int argc, char *argv[]) { diff --git a/ios/iosremote/iosremote/newServer_vc.m b/ios/iosremote/iosremote/newServer_vc.m index 64c969319868..e1f7ff406ad5 100644 --- a/ios/iosremote/iosremote/newServer_vc.m +++ b/ios/iosremote/iosremote/newServer_vc.m @@ -9,6 +9,7 @@ #import "newServer_vc.h" #import "CommunicationManager.h" #import "EditableTableViewCell.h" +#import "serverList_vc.h" #import "Server.h" @implementation newServerViewController @@ -23,7 +24,6 @@ NSString *serverAddr = [self.addrCell.textField text]; NSLog(@"New server name:%@ ip:%@", serverName, serverAddr); [self.comManager addServersWithName:serverName AtAddress:serverAddr]; - [self save]; [self.navigationController popViewControllerAnimated:YES]; } @@ -266,6 +266,9 @@ titleForHeaderInSection:(NSInteger)section break; } } + [cell.textField setPlaceholder:placeholder]; + [cell setTag:tag]; + [cell.textField setText:text]; return cell; } diff --git a/ios/iosremote/iosremote/server_list_vc.h b/ios/iosremote/iosremote/serverList_vc.h index a895660c6a0b..44fbd755e28e 100644 --- a/ios/iosremote/iosremote/server_list_vc.h +++ b/ios/iosremote/iosremote/serverList_vc.h @@ -8,7 +8,7 @@ #import <UIKit/UIKit.h> -@interface server_list_vc : UITableViewController +@interface server_list_vc : UITableViewController <UITableViewDelegate, UITableViewDataSource> @property (weak, nonatomic) IBOutlet UITableView *serverTable; diff --git a/ios/iosremote/iosremote/server_list_vc.m b/ios/iosremote/iosremote/serverList_vc.m index 8bbbbb4aadf2..4164c78d8811 100644 --- a/ios/iosremote/iosremote/server_list_vc.m +++ b/ios/iosremote/iosremote/serverList_vc.m @@ -6,9 +6,10 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. -#import "server_list_vc.h" +#import "serverList_vc.h" #import "CommunicationManager.h" #import "newServer_vc.h" +#import "Server.h" @interface server_list_vc () @@ -43,11 +44,15 @@ // self.navigationItem.rightBarButtonItem = self.editButtonItem; self.center = [NSNotificationCenter defaultCenter]; - self.comManager = [[CommunicationManager alloc] initWithExistingServers]; - self.serverTable.dataSource = self.comManager; + self.comManager = [CommunicationManager sharedComManager]; + self.serverTable.dataSource = self; + self.serverTable.delegate = self; } -- (void)viewDidAppear:(BOOL)animated { +-(void)viewWillAppear:(BOOL)animated +{ + [self.serverTable reloadData]; + [super viewWillAppear:animated]; } - (void)didReceiveMemoryWarning @@ -60,22 +65,7 @@ - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return 0; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section -{ - return 0; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath -{ - static NSString *CellIdentifier = @"Cell"; - UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath]; - - // Configure the cell... - - return cell; + return 1; } #pragma mark - Table view delegate @@ -89,4 +79,23 @@ [super viewDidUnload]; } +-(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { + return [self.comManager.servers count]; +} + +-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + static NSString *cellIdentifier = @"server_item_cell"; + + UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:cellIdentifier]; + + Server *s = [self.comManager.servers objectAtIndex:indexPath.row]; + + [cell.textLabel setText:[s serverName]]; + [cell.detailTextLabel setText:[s serverAddress]]; + return cell; +} + + + + @end |