Merge pull request #531 from woocommerce/issue/252-notif-settings

Settings: Added link to Settings.app

Author: bummytime

WooCommerce/Classes/ViewRelated/Dashboard/Settings/SettingsViewController.swift

@@ -86,16 +86,18 @@ private extension SettingsViewController {
     }
 
     func configureSections() {
-        let primaryStoreTitle = NSLocalizedString("PRIMARY STORE", comment: "My Store > Settings > Primary Store information section").uppercased()
-        let privacySettingsTitle = NSLocalizedString("HELP IMPROVE THE APP", comment: "My Store > Settings > Privacy settings section").uppercased()
+        let primaryStoreTitle = NSLocalizedString("Primary Store", comment: "My Store > Settings > Primary Store information section").uppercased()
+        let improveTheAppTitle = NSLocalizedString("Help Improve The App", comment: "My Store > Settings > Privacy settings section").uppercased()
         let aboutSettingsTitle = NSLocalizedString("About the app", comment: "My Store > Settings > About app section").uppercased()
+        let otherTitle = NSLocalizedString("Other", comment: "My Store > Settings > Other app section").uppercased()
 
         sections = [
-            Section(title: primaryStoreTitle, rows: [.primaryStore]),
-            Section(title: nil, rows: [.support]),
-            Section(title: privacySettingsTitle, rows: [.privacy, .featureRequest]),
-            Section(title: aboutSettingsTitle, rows: [.about, .licenses]),
-            Section(title: nil, rows: [.logout]),
+            Section(title: primaryStoreTitle, rows: [.primaryStore], footerHeight: CGFloat.leastNonzeroMagnitude),
+            Section(title: nil, rows: [.support], footerHeight: UITableView.automaticDimension),
+            Section(title: improveTheAppTitle, rows: [.privacy, .featureRequest], footerHeight: UITableView.automaticDimension),
+            Section(title: aboutSettingsTitle, rows: [.about, .licenses], footerHeight: UITableView.automaticDimension),
+            Section(title: otherTitle, rows: [.appSettings], footerHeight: CGFloat.leastNonzeroMagnitude),
+            Section(title: nil, rows: [.logout], footerHeight: CGFloat.leastNonzeroMagnitude)
         ]
     }
 
@@ -121,6 +123,8 @@ private extension SettingsViewController {
             configureAbout(cell: cell)
         case let cell as BasicTableViewCell where row == .licenses:
             configureLicenses(cell: cell)
+        case let cell as BasicTableViewCell where row == .appSettings:
+            configureAppSettings(cell: cell)
         case let cell as BasicTableViewCell where row == .logout:
             configureLogout(cell: cell)
         default:
@@ -131,6 +135,7 @@ private extension SettingsViewController {
     func configurePrimaryStore(cell: HeadlineLabelTableViewCell) {
         cell.headline = siteUrl
         cell.body = accountName
+        cell.selectionStyle = .none
     }
 
     func configureSupport(cell: BasicTableViewCell) {
@@ -163,7 +168,14 @@ private extension SettingsViewController {
         cell.textLabel?.text = NSLocalizedString("Open source licenses", comment: "Navigates to open source licenses screen")
     }
 
+    func configureAppSettings(cell: BasicTableViewCell) {
+        cell.accessoryType = .disclosureIndicator
+        cell.selectionStyle = .default
+        cell.textLabel?.text = NSLocalizedString("Open device settings", comment: "Opens iOS's Device Settings for the app")
+    }
+
     func configureLogout(cell: BasicTableViewCell) {
+        cell.selectionStyle = .default
         cell.textLabel?.textAlignment = .center
         cell.textLabel?.textColor = StyleManager.destructiveActionColor
         cell.textLabel?.text = NSLocalizedString("Logout account", comment: "Logout Action")
@@ -230,6 +242,13 @@ private extension SettingsViewController {
         present(safariViewController, animated: true, completion: nil)
     }
 
+    func appSettingsWasPressed() {
+        guard let targetURL = URL(string: UIApplication.openSettingsURLString) else {
+            return
+        }
+        UIApplication.shared.open(targetURL)
+    }
+
     func logOutUser() {
         StoresManager.shared.deauthenticate()
         navigationController?.popToRootViewController(animated: true)
@@ -267,8 +286,7 @@ extension SettingsViewController: UITableViewDataSource {
     }
 
     func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
-        // iOS 11 table bug. Must return a tiny value to collapse `nil` or `empty` section headers.
-        return CGFloat.leastNonzeroMagnitude
+        return sections[section].footerHeight
     }
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
@@ -305,6 +323,8 @@ extension SettingsViewController: UITableViewDelegate {
             licensesWasPressed()
         case .about:
             aboutWasPressed()
+        case .appSettings:
+            appSettingsWasPressed()
         default:
             break
         }
@@ -322,6 +342,7 @@ private struct Constants {
 private struct Section {
     let title: String?
     let rows: [Row]
+    let footerHeight: CGFloat
 }
 
 private enum Row: CaseIterable {
@@ -332,6 +353,7 @@ private enum Row: CaseIterable {
     case featureRequest
     case about
     case licenses
+    case appSettings
 
     var type: UITableViewCell.Type {
         switch self {
@@ -349,6 +371,8 @@ private enum Row: CaseIterable {
             return BasicTableViewCell.self
         case .licenses:
             return BasicTableViewCell.self
+        case .appSettings:
+            return BasicTableViewCell.self
         }
     }