diff --git a/iOS/Settings/Settings.storyboard b/iOS/Settings/Settings.storyboard index a571f849c..3cafee91b 100644 --- a/iOS/Settings/Settings.storyboard +++ b/iOS/Settings/Settings.storyboard @@ -37,116 +37,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -176,7 +70,7 @@ - + @@ -201,10 +95,10 @@ - + - + @@ -228,7 +122,7 @@ - + @@ -245,7 +139,7 @@ - + @@ -263,6 +157,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -440,7 +440,7 @@ - + @@ -555,7 +555,7 @@ - + diff --git a/iOS/Settings/SettingsViewController.swift b/iOS/Settings/SettingsViewController.swift index 84a177d27..ebd7d52d9 100644 --- a/iOS/Settings/SettingsViewController.swift +++ b/iOS/Settings/SettingsViewController.swift @@ -109,6 +109,23 @@ class SettingsViewController: UITableViewController { self.navigationController?.pushViewController(controller, animated: true) } case 1: + if indexPath.row == 1 { + let timeline = UIStoryboard.settings.instantiateController(ofType: TimelineNumberOfLinesViewController.self) + self.navigationController?.pushViewController(timeline, animated: true) + } + case 2: + switch indexPath.row { + case 0: + let timeline = UIStoryboard.settings.instantiateController(ofType: RefreshIntervalViewController.self) + self.navigationController?.pushViewController(timeline, animated: true) + case 1: + importOPML() + case 2: + exportOPML() + default: + print("export") + } + case 3: switch indexPath.row { case 0: let timeline = UIStoryboard.settings.instantiateController(ofType: AboutViewController.self) @@ -126,23 +143,6 @@ class SettingsViewController: UITableViewController { default: UIApplication.shared.open(URL(string: "https://ranchero.com/netnewswire/")!, options: [:]) } - case 2: - if indexPath.row == 1 { - let timeline = UIStoryboard.settings.instantiateController(ofType: TimelineNumberOfLinesViewController.self) - self.navigationController?.pushViewController(timeline, animated: true) - } - case 3: - switch indexPath.row { - case 0: - let timeline = UIStoryboard.settings.instantiateController(ofType: RefreshIntervalViewController.self) - self.navigationController?.pushViewController(timeline, animated: true) - case 1: - importOPML() - case 2: - exportOPML() - default: - print("export") - } default: break }