connect to server list implemented

Change-Id: I7a59c79119be610b85ec5b048d920603a5cb2eb6

3 files changed, 11 insertions, 47 deletions

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
deleted file mode 100644
index 28f6741dd3f1..000000000000
--- a/ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/siqi.xcuserdatad/WorkspaceSettings.xcsettings
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>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/newServer_vc.m b/ios/iosremote/iosremote/newServer_vc.m
index 9681638ebc22..d81dd451cc06 100644
--- a/ios/iosremote/iosremote/newServer_vc.m
+++ b/ios/iosremote/iosremote/newServer_vc.m
@@ -36,6 +36,9 @@
                                                 otherButtonTitles:nil];
         [message show];
     }
+    NSLog(@"New server name:%@ ip:%@", serverName, serverAddr);
+    [self.comManager addServersWithName:serverName AtAddress:serverAddr];
+    [self.navigationController popViewControllerAnimated:YES];
 }
 
 - (BOOL)isModal
@@ -283,7 +286,10 @@ titleForHeaderInSection:(NSInteger)section
     [cell.textField setPlaceholder:placeholder];
     [cell setTag:tag];
     [cell.textField setText:text];
+<<<<<<< HEAD
     [cell.textField setKeyboardType:keyboardType];
+=======
+>>>>>>> connect to server list implemented
     return cell;
 }
 
diff --git a/ios/iosremote/iosremote/serverList_vc.m b/ios/iosremote/iosremote/serverList_vc.m
index 607cd5453c6d..4164c78d8811 100644
--- a/ios/iosremote/iosremote/serverList_vc.m
+++ b/ios/iosremote/iosremote/serverList_vc.m
@@ -47,14 +47,6 @@
     self.comManager = [CommunicationManager sharedComManager];
     self.serverTable.dataSource = self;
     self.serverTable.delegate = self;
-    
-    NSOperationQueue *mainQueue = [NSOperationQueue mainQueue];
-    self.slideShowPreviewStartObserver = [[NSNotificationCenter defaultCenter] addObserverForName:STATUS_CONNECTED_SLIDESHOW_RUNNING
-                                                                                           object:nil
-                                                                                            queue:mainQueue
-                                                                                       usingBlock:^(NSNotification *note) {
-                                                                                           [self performSegueWithIdentifier:@"SlideShowPreview" sender:self ];
-                                                                                    }];
 }
 
 -(void)viewWillAppear:(BOOL)animated
@@ -69,13 +61,15 @@
     // Dispose of any resources that can be recreated.
 }
 
-#pragma mark - Table view delegate
+#pragma mark - Table view data source
 
-- (void)disableSpinner
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
 {
-    [self.tableView cellForRowAtIndexPath:self.lastSpinningCellIndex].accessoryView = nil;
+    return 1;
 }
 
+#pragma mark - Table view delegate
+
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
 }
@@ -101,21 +95,7 @@
     return cell;
 }
 
-- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath
-{
-    return YES;
-}
 
-- (UITableViewCellEditingStyle)tableView:(UITableView *)tableView editingStyleForRowAtIndexPath:(NSIndexPath *)indexPath{
-    return UITableViewCellEditingStyleDelete;
-}
 
-- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath{
-    
-    if(editingStyle == UITableViewCellEditingStyleDelete){
-        [self.comManager removeServerAtIndex:indexPath.row];
-        [tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:UITableViewRowAnimationFade];
-    }
-}
 
 @end