From ba41d0dee01e462507bd42b22bc63c9bc29ebeea Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Tue, 18 Jun 2019 16:54:51 -0500
Subject: [PATCH] Change Settings to use Form instead of List/grouped

---
 iOS/Settings/SettingsAddAccountView.swift     | 3 +--
 iOS/Settings/SettingsDetailAccountView.swift  | 3 +--
 iOS/Settings/SettingsFeedbinAccountView.swift | 3 +--
 iOS/Settings/SettingsLocalAccountView.swift   | 3 +--
 iOS/Settings/SettingsView.swift               | 3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/iOS/Settings/SettingsAddAccountView.swift b/iOS/Settings/SettingsAddAccountView.swift
index 00b9107d8..22fd2ca7c 100644
--- a/iOS/Settings/SettingsAddAccountView.swift
+++ b/iOS/Settings/SettingsAddAccountView.swift
@@ -11,7 +11,7 @@ import Account
 
 struct SettingsAddAccountView : View {
     var body: some View {
-		List {
+		Form {
 			PresentationButton(destination: SettingsLocalAccountView(name: "")) {
 				SettingsAccountLabelView(accountImage: "accountLocal", accountLabel: Account.defaultLocalAccountName)
 			}
@@ -21,7 +21,6 @@ struct SettingsAddAccountView : View {
 			}
 			.padding(4)
 		}
-		.listStyle(.grouped)
 		.navigationBarTitle(Text("Add Account"), displayMode: .inline)
 	}
 }
diff --git a/iOS/Settings/SettingsDetailAccountView.swift b/iOS/Settings/SettingsDetailAccountView.swift
index dab8f30ce..606a6f487 100644
--- a/iOS/Settings/SettingsDetailAccountView.swift
+++ b/iOS/Settings/SettingsDetailAccountView.swift
@@ -17,7 +17,7 @@ struct SettingsDetailAccountView : View {
 	@State private var showFeedbinCredentials = false
 	
     var body: some View {
-		List {
+		Form {
 			Section {
 				HStack {
 					Text("Name")
@@ -63,7 +63,6 @@ struct SettingsDetailAccountView : View {
 				}
 			}
 		}
-		.listStyle(.grouped)
 		.navigationBarTitle(Text(verbatim: viewModel.nameForDisplay), displayMode: .inline)
 
 	}
diff --git a/iOS/Settings/SettingsFeedbinAccountView.swift b/iOS/Settings/SettingsFeedbinAccountView.swift
index c867c94d2..2412ff993 100644
--- a/iOS/Settings/SettingsFeedbinAccountView.swift
+++ b/iOS/Settings/SettingsFeedbinAccountView.swift
@@ -19,7 +19,7 @@ struct SettingsFeedbinAccountView : View {
 
 	var body: some View {
 		NavigationView {
-			List {
+			Form {
 				Section(header:
 					SettingsAccountLabelView(accountImage: "accountFeedbin", accountLabel: "Feedbin").padding()
 				)  {
@@ -57,7 +57,6 @@ struct SettingsFeedbinAccountView : View {
 				}
 			}
 			.disabled(busy)
-			.listStyle(.grouped)
 			.navigationBarTitle(Text(""), displayMode: .inline)
 			.navigationBarItems(leading:
 				Button(action: { self.dismiss() }) { Text("Cancel") }
diff --git a/iOS/Settings/SettingsLocalAccountView.swift b/iOS/Settings/SettingsLocalAccountView.swift
index 6247aea77..0c2b68569 100644
--- a/iOS/Settings/SettingsLocalAccountView.swift
+++ b/iOS/Settings/SettingsLocalAccountView.swift
@@ -15,7 +15,7 @@ struct SettingsLocalAccountView : View {
 
     var body: some View {
 		NavigationView {
-			List {
+			Form {
 				Section(header:
 					SettingsAccountLabelView(accountImage: "accountLocal", accountLabel: Account.defaultLocalAccountName).padding()
 				)  {
@@ -35,7 +35,6 @@ struct SettingsLocalAccountView : View {
 					}
 				}
 			}
-			.listStyle(.grouped)
 			.navigationBarTitle(Text(""), displayMode: .inline)
 			.navigationBarItems(leading: Button(action: { self.dismiss() }) { Text("Cancel") } )
 		}
diff --git a/iOS/Settings/SettingsView.swift b/iOS/Settings/SettingsView.swift
index 73a734db5..6a0f7d5da 100644
--- a/iOS/Settings/SettingsView.swift
+++ b/iOS/Settings/SettingsView.swift
@@ -19,7 +19,7 @@ struct SettingsView : View {
 
     var body: some View {
 		NavigationView {
-			List {
+			Form {
 				
 				Section(header: Text("ACCOUNTS")) {
 					ForEach(viewModel.accounts.identified(by: \.self)) { account in
@@ -86,7 +86,6 @@ struct SettingsView : View {
 				.foregroundColor(.primary)
 
 			}
-			.listStyle(.grouped)
 			.navigationBarTitle(Text("Settings"), displayMode: .inline)
 
 		}