From 1a1f86febd86451357dbf86411e8fd9f30a25b40 Mon Sep 17 00:00:00 2001
From: Stuart Breckenridge <stuart.breckenridge@icloud.com>
Date: Wed, 21 Dec 2022 10:53:43 +0800
Subject: [PATCH] Changes

Extensions now use sheet
Feedbin case added so that feedbin shows
---
 iOS/Account/FeedbinAddAccountView.swift                |  2 +-
 .../Extensions/AddExtensionListView.swift              | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/iOS/Account/FeedbinAddAccountView.swift b/iOS/Account/FeedbinAddAccountView.swift
index d24230f98..581bd44ae 100644
--- a/iOS/Account/FeedbinAddAccountView.swift
+++ b/iOS/Account/FeedbinAddAccountView.swift
@@ -52,7 +52,7 @@ struct FeedbinAddAccountView: View {
 			} message: {
 				Text(accountError.0?.localizedDescription ?? "Error")
 			}
-			.navigationTitle(Text(account?.type.localizedAccountName() ?? ""))
+			.navigationTitle(Text(account?.type.localizedAccountName() ?? "Feedbin"))
 			.navigationBarTitleDisplayMode(.inline)
 			.interactiveDismissDisabled(showProgressIndicator)
 			.dismissOnExternalContextLaunch()
diff --git a/iOS/Settings/Account and Extensions/Extensions/AddExtensionListView.swift b/iOS/Settings/Account and Extensions/Extensions/AddExtensionListView.swift
index 0a4db9c0f..5ca059f17 100644
--- a/iOS/Settings/Account and Extensions/Extensions/AddExtensionListView.swift	
+++ b/iOS/Settings/Account and Extensions/Extensions/AddExtensionListView.swift	
@@ -13,6 +13,7 @@ struct AddExtensionListView: View {
 	
 	@State private var availableExtensionPointTypes = ExtensionPointManager.shared.availableExtensionPointTypes.sorted(by: { $0.title < $1.title })
 	@Environment(\.dismiss) var dismiss
+	@State private var showExtensionPointView: (ExtensionPoint.Type?, Bool) = (nil, false)
 	
 	var body: some View {
 		NavigationView {
@@ -20,8 +21,8 @@ struct AddExtensionListView: View {
 				Section(header: Text("FEED_PROVIDER_HEADER", tableName: "Settings"),
 						footer: Text("FEED_PROVIDER_FOOTER", tableName: "Settings")) {
 					ForEach(0..<availableExtensionPointTypes.count, id: \.self) { i in
-						NavigationLink {
-							EnableExtensionPointView(extensionPoint: availableExtensionPointTypes[i])
+						Button {
+							showExtensionPointView = (availableExtensionPointTypes[i], true)
 						} label: {
 							Image(uiImage: availableExtensionPointTypes[i].image)
 								.resizable()
@@ -35,6 +36,11 @@ struct AddExtensionListView: View {
 			}
 			.navigationBarTitleDisplayMode(.inline)
 			.navigationTitle(Text("ADD_EXTENSIONS_TITLE", tableName: "Settings"))
+			.sheet(isPresented: $showExtensionPointView.1, content: {
+				if showExtensionPointView.0 != nil {
+					EnableExtensionPointView(extensionPoint: showExtensionPointView.0!)
+				}
+			})
 			.toolbar {
 				ToolbarItem(placement: .navigationBarLeading) {
 					Button(role: .cancel) {