Update to work with the latest SwiftUI API's

This commit is contained in:
Maurice C Parker 2019-06-17 17:48:32 -05:00
parent e5f06a4217
commit 011a93a41f
2 changed files with 23 additions and 9 deletions

View File

@ -12,10 +12,14 @@ import Account
struct SettingsAddAccountView : View { struct SettingsAddAccountView : View {
var body: some View { var body: some View {
List { List {
PresentationButton(SettingsAccountLabelView(accountImage: "accountLocal", accountLabel: Account.defaultLocalAccountName), PresentationButton(destination: SettingsLocalAccountView(name: "")) {
destination: SettingsLocalAccountView(name: "")).padding(.all, 4) SettingsAccountLabelView(accountImage: "accountLocal", accountLabel: Account.defaultLocalAccountName)
PresentationButton(SettingsAccountLabelView(accountImage: "accountFeedbin", accountLabel: "Feedbin"), }
destination: SettingsFeedbinAccountView(viewModel: SettingsFeedbinAccountView.ViewModel())).padding(.all, 4) .padding(4)
PresentationButton(destination: SettingsFeedbinAccountView(viewModel: SettingsFeedbinAccountView.ViewModel())) {
SettingsAccountLabelView(accountImage: "accountFeedbin", accountLabel: "Feedbin")
}
.padding(4)
} }
.listStyle(.grouped) .listStyle(.grouped)
.navigationBarTitle(Text("Add Account"), displayMode: .inline) .navigationBarTitle(Text("Add Account"), displayMode: .inline)

View File

@ -34,11 +34,21 @@ struct SettingsView : View {
Section(header: Text("ABOUT")) { Section(header: Text("ABOUT")) {
Text("About NetNewsWire") Text("About NetNewsWire")
PresentationButton(Text("Website"), destination: SafariView(url: URL(string: "https://ranchero.com/netnewswire/")!)) PresentationButton(destination: SafariView(url: URL(string: "https://ranchero.com/netnewswire/")!)) {
PresentationButton(Text("Github Repository"), destination: SafariView(url: URL(string: "https://github.com/brentsimmons/NetNewsWire")!)) Text("Website")
PresentationButton(Text("Bug Tracker"), destination: SafariView(url: URL(string: "https://github.com/brentsimmons/NetNewsWire/issues")!)) }
PresentationButton(Text("Technotes"), destination: SafariView(url: URL(string: "https://github.com/brentsimmons/NetNewsWire/tree/master/Technotes")!)) PresentationButton(destination: SafariView(url: URL(string: "https://github.com/brentsimmons/NetNewsWire")!)) {
PresentationButton(Text("How to Support NetNewsWire"), destination: SafariView(url: URL(string: "https://github.com/brentsimmons/NetNewsWire/blob/master/Technotes/HowToSupportNetNewsWire.markdown")!)) Text("Github Repository")
}
PresentationButton(destination: SafariView(url: URL(string: "https://github.com/brentsimmons/NetNewsWire/issues")!)) {
Text("Bug Tracker")
}
PresentationButton(destination: SafariView(url: URL(string: "https://github.com/brentsimmons/NetNewsWire/tree/master/Technotes")!)) {
Text("Technotes")
}
PresentationButton(destination: SafariView(url: URL(string: "https://github.com/brentsimmons/NetNewsWire/blob/master/Technotes/HowToSupportNetNewsWire.markdown")!)) {
Text("How to Support NetNewsWire")
}
Text("Add NetNewsWire News Feed") Text("Add NetNewsWire News Feed")
} }
.foregroundColor(.primary) .foregroundColor(.primary)