diff --git a/iOS/Model Extensions/Account-Extensions.swift b/iOS/Model Extensions/Account-Extensions.swift index 9574f3553..bdad16270 100644 --- a/iOS/Model Extensions/Account-Extensions.swift +++ b/iOS/Model Extensions/Account-Extensions.swift @@ -9,6 +9,12 @@ import Foundation import Account +extension AccountType: Identifiable { + public var id: Int { + return rawValue + } +} + extension Account: Identifiable { public var id: String { return accountID diff --git a/iOS/Settings/Account/SettingsAddAccountView.swift b/iOS/Settings/Account/SettingsAddAccountView.swift index 10f1b7108..9c2027bcf 100644 --- a/iOS/Settings/Account/SettingsAddAccountView.swift +++ b/iOS/Settings/Account/SettingsAddAccountView.swift @@ -11,7 +11,6 @@ import Account struct SettingsAddAccountView : View { - @State private var isAddPresented = false @State private var selectedAccountType: AccountType = nil var body: some View { @@ -19,25 +18,23 @@ struct SettingsAddAccountView : View { Button(action: { self.selectedAccountType = AccountType.onMyMac - self.isAddPresented.toggle() }) { SettingsAccountLabelView(accountImage: "accountLocal", accountLabel: Account.defaultLocalAccountName) } Button(action: { self.selectedAccountType = AccountType.feedbin - self.isAddPresented.toggle() }) { SettingsAccountLabelView(accountImage: "accountFeedbin", accountLabel: "Feedbin") } } - .sheet(isPresented: $isAddPresented) { - if self.selectedAccountType == .onMyMac { + .sheet(item: $selectedAccountType) { accountType in + if accountType == .onMyMac { SettingsLocalAccountView(name: "") } - if self.selectedAccountType == .feedbin { + if accountType == .feedbin { SettingsFeedbinAccountView(viewModel: SettingsFeedbinAccountView.ViewModel()) } }