From 4ac78d9b416c997e48faed6b6b370f459e5ccc00 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Tue, 23 May 2017 10:25:47 -0400
Subject: [PATCH] Replace app settings segue.

// FREEBIE
---
 Signal/src/Storyboard/Main.storyboard              | 12 +++++-------
 .../ViewControllers/CountryCodeViewController.m    |  1 -
 .../ViewControllers/SettingsTableViewController.h  | 14 --------------
 .../ViewControllers/SettingsTableViewController.m  |  9 +++++++++
 Signal/src/ViewControllers/SignalsViewController.m |  5 ++++-
 5 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/Signal/src/Storyboard/Main.storyboard b/Signal/src/Storyboard/Main.storyboard
index 3ca92767b..b7fab93a7 100644
--- a/Signal/src/Storyboard/Main.storyboard
+++ b/Signal/src/Storyboard/Main.storyboard
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12118" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="tuk-0x-yCb">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12118" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="tuk-0x-yCb">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
+        <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
@@ -85,9 +86,6 @@
                         <barButtonItem key="leftBarButtonItem" image="settings" width="100" id="PYj-7F-J24">
                             <inset key="imageInsets" minX="-10" minY="0.0" maxX="0.0" maxY="0.0"/>
                             <color key="tintColor" red="0.99987119436264038" green="0.99998223781585693" blue="0.99984109401702881" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                            <connections>
-                                <segue destination="u7y-N1-6Ba" kind="modal" identifier="ShowAppSettingsSegue" id="0Mt-zV-9BX"/>
-                            </connections>
                         </barButtonItem>
                         <barButtonItem key="rightBarButtonItem" systemItem="compose" id="Oft-fU-tf5">
                             <inset key="imageInsets" minX="-10" minY="0.0" maxX="10" maxY="0.0"/>
@@ -398,7 +396,7 @@
             <objects>
                 <navigationController storyboardIdentifier="UserInitialViewController" automaticallyAdjustsScrollViewInsets="NO" useStoryboardIdentifierAsRestorationIdentifier="YES" id="tuk-0x-yCb" customClass="SignalsNavigationController" sceneMemberID="viewController">
                     <toolbarItems/>
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="VNq-cN-pk9">
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="VNq-cN-pk9">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <color key="barTintColor" red="0.082137122750282288" green="0.46843802928924561" blue="0.91112053394317627" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -508,7 +506,7 @@
         <scene sceneID="nF7-wR-ITu">
             <objects>
                 <navigationController storyboardIdentifier="SettingsNavigationController" id="u7y-N1-6Ba" sceneMemberID="viewController">
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="OEe-gh-9Ii">
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="OEe-gh-9Ii">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
@@ -627,7 +625,7 @@
             <objects>
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="cZ7-de-SUi" sceneMemberID="viewController">
                     <toolbarItems/>
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" translucent="NO" id="gzw-fh-en2">
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" translucent="NO" id="gzw-fh-en2">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <color key="barTintColor" red="0.082137122750282288" green="0.46843802928924561" blue="0.91112053394317627" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
diff --git a/Signal/src/ViewControllers/CountryCodeViewController.m b/Signal/src/ViewControllers/CountryCodeViewController.m
index e76652358..60196297a 100644
--- a/Signal/src/ViewControllers/CountryCodeViewController.m
+++ b/Signal/src/ViewControllers/CountryCodeViewController.m
@@ -113,7 +113,6 @@
     [self dismissViewControllerAnimated:YES completion:nil];
 }
 
-
 #pragma mark - UISearchBarDelegate
 
 - (void)searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)searchText
diff --git a/Signal/src/ViewControllers/SettingsTableViewController.h b/Signal/src/ViewControllers/SettingsTableViewController.h
index c41d718b1..f9bb8bf3c 100644
--- a/Signal/src/ViewControllers/SettingsTableViewController.h
+++ b/Signal/src/ViewControllers/SettingsTableViewController.h
@@ -6,18 +6,4 @@
 
 @interface SettingsTableViewController : OWSTableViewController
 
-//@property (strong, nonatomic) IBOutlet UILabel *registeredName;
-//@property (strong, nonatomic) IBOutlet UILabel *registeredNumber;
-//@property (strong, nonatomic) IBOutlet UILabel *networkStatusLabel;
-//@property (strong, nonatomic) IBOutlet UILabel *networkStatusHeader;
-//@property (strong, nonatomic) IBOutlet UILabel *privacyLabel;
-//@property (strong, nonatomic) IBOutlet UILabel *notificationsLabel;
-//@property (strong, nonatomic) IBOutlet UILabel *linkedDevicesLabel;
-//@property (strong, nonatomic) IBOutlet UILabel *advancedLabel;
-//@property (strong, nonatomic) IBOutlet UILabel *aboutLabel;
-//@property (strong, nonatomic) IBOutlet UILabel *inviteLabel;
-//@property (strong, nonatomic) IBOutlet UIButton *destroyAccountButton;
-//
-//- (IBAction)unregisterUser:(id)sender;
-
 @end
diff --git a/Signal/src/ViewControllers/SettingsTableViewController.m b/Signal/src/ViewControllers/SettingsTableViewController.m
index 97fb9ad84..26286121b 100644
--- a/Signal/src/ViewControllers/SettingsTableViewController.m
+++ b/Signal/src/ViewControllers/SettingsTableViewController.m
@@ -63,6 +63,10 @@
     [self.navigationItem setHidesBackButton:YES];
 
     [self.navigationController.navigationBar setTranslucent:NO];
+    self.navigationItem.leftBarButtonItem =
+        [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemStop
+                                                      target:self
+                                                      action:@selector(dismissWasPressed:)];
 
     [self observeNotifications];
 
@@ -246,6 +250,11 @@
     [self.navigationController pushViewController:vc animated:YES];
 }
 
+- (void)dismissWasPressed:(id)sender
+{
+    [self dismissViewControllerAnimated:YES completion:nil];
+}
+
 #pragma mark - Table view data source
 
 - (void)unregisterUser
diff --git a/Signal/src/ViewControllers/SignalsViewController.m b/Signal/src/ViewControllers/SignalsViewController.m
index 2b042202b..f4169b21d 100644
--- a/Signal/src/ViewControllers/SignalsViewController.m
+++ b/Signal/src/ViewControllers/SignalsViewController.m
@@ -11,6 +11,7 @@
 #import "OWSContactsManager.h"
 #import "PropertyListPreferences.h"
 #import "PushManager.h"
+#import "SettingsTableViewController.h"
 #import "Signal-Swift.h"
 #import "TSAccountManager.h"
 #import "TSDatabaseView.h"
@@ -225,7 +226,9 @@ NSString *const SignalsViewControllerSegueShowIncomingCall = @"ShowIncomingCallS
 }
 
 - (void)settingsButtonPressed:(id)sender {
-    [self performSegueWithIdentifier:@"ShowAppSettingsSegue" sender:sender];
+    SettingsTableViewController *vc = [SettingsTableViewController new];
+    UINavigationController *navigationController = [[UINavigationController alloc] initWithRootViewController:vc];
+    [self presentViewController:navigationController animated:YES completion:nil];
 }
 
 - (UIViewController *)previewingContext:(id<UIViewControllerPreviewing>)previewingContext