FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add cloud kit view for settings accounts

This commit is contained in:
Rizwan Mohamed Ibrahim 2020-07-13 20:39:19 +05:30
parent 17e1247ff0
commit de0edd3c0b
No known key found for this signature in database
GPG Key ID: D5BEE468D448BCC5
4 changed files with 69 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Multiplatform/iOS/Settings/Accounts/SettingsAddAccountModel.swift
View File

@ -34,7 +34,11 @@ class SettingsAddAccountModel: ObservableObject {
init() {
self.accounts = [
SettingsAddAccount(name: Account.defaultLocalAccountName, accountType: .onMyMac),
SettingsAddAccount(name: "Feedbin", accountType: .feedbin)
SettingsAddAccount(name: "Feedbin", accountType: .feedbin),
SettingsAddAccount(name: "Feedly", accountType: .feedly),
SettingsAddAccount(name: "Feed Wrangler", accountType: .feedWrangler),
SettingsAddAccount(name: "iCloud", accountType: .cloudKit),
SettingsAddAccount(name: "NewsBlur", accountType: .newsBlur)
]
}

14
Multiplatform/iOS/Settings/Accounts/SettingsAddAccountView.swift
View File

@ -27,11 +27,19 @@ struct SettingsAddAccountView: View {
}
.listStyle(InsetGroupedListStyle())
.sheet(isPresented: $model.isAddPresented) {
if model.selectedAccountType == .onMyMac {
switch model.selectedAccountType {
case .onMyMac:
SettingsLocalAccountView()
}
if model.selectedAccountType == .feedbin {
case .feedbin:
SettingsFeedbinAccountView()
case .cloudKit:
SettingsCloudKitAccountView()
default:
EmptyView()
}
}
.navigationBarTitle(Text("Add Account"), displayMode: .inline)

49
Multiplatform/iOS/Settings/Accounts/SettingsCloudKitAccountView.swift Normal file
View File

@ -0,0 +1,49 @@
//
// SettingsCloudKitAccountView.swift
// Multiplatform iOS
//
// Created by Rizwan on 13/07/20.
// Copyright © 2020 Ranchero Software. All rights reserved.
//
import SwiftUI
import Account
struct SettingsCloudKitAccountView: View {
@Environment(\.presentationMode) var presentationMode
var body: some View {
NavigationView {
List {
Section(header: AccountHeaderImageView(image: AppAssets.image(for: .cloudKit)!)) { }
Section {
HStack {
Spacer()
Button(action: { self.addAccount() }) {
Text("Add Account")
}
Spacer()
}
}
}
.listStyle(InsetGroupedListStyle())
.navigationBarTitle(Text(verbatim: "iCloud"), displayMode: .inline)
.navigationBarItems(leading: Button(action: { self.dismiss() }) { Text("Cancel") } )
}
}
private func addAccount() {
_ = AccountManager.shared.createAccount(type: .cloudKit)
dismiss()
}
private func dismiss() {
presentationMode.wrappedValue.dismiss()
}
}
struct SettingsCloudKitAccountView_Previews: PreviewProvider {
static var previews: some View {
SettingsCloudKitAccountView()
}
}

4
NetNewsWire.xcodeproj/project.pbxproj
View File

@ -675,6 +675,7 @@
55E15BCB229D65A900D6602A /* AccountsReaderAPI.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55E15BC1229D65A900D6602A /* AccountsReaderAPI.xib */; };
55E15BCC229D65A900D6602A /* AccountsReaderAPIWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55E15BCA229D65A900D6602A /* AccountsReaderAPIWindowController.swift */; };
5F323809231DF9F000706F6B /* VibrantTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F323808231DF9F000706F6B /* VibrantTableViewCell.swift */; };
653A4E7924BCA5BB00EF2D7F /* SettingsCloudKitAccountView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 653A4E7824BCA5BB00EF2D7F /* SettingsCloudKitAccountView.swift */; };
65422D1724B75CD1008A2FA2 /* SettingsAddAccountModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65422D1624B75CD1008A2FA2 /* SettingsAddAccountModel.swift */; };
6581C73820CED60100F4AD34 /* SafariExtensionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6581C73720CED60100F4AD34 /* SafariExtensionHandler.swift */; };
6581C73A20CED60100F4AD34 /* SafariExtensionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6581C73920CED60100F4AD34 /* SafariExtensionViewController.swift */; };
@ -2093,6 +2094,7 @@
55E15BC1229D65A900D6602A /* AccountsReaderAPI.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AccountsReaderAPI.xib; sourceTree = "<group>"; };
55E15BCA229D65A900D6602A /* AccountsReaderAPIWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountsReaderAPIWindowController.swift; sourceTree = "<group>"; };
5F323808231DF9F000706F6B /* VibrantTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VibrantTableViewCell.swift; sourceTree = "<group>"; };
653A4E7824BCA5BB00EF2D7F /* SettingsCloudKitAccountView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsCloudKitAccountView.swift; sourceTree = "<group>"; };
65422D1624B75CD1008A2FA2 /* SettingsAddAccountModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsAddAccountModel.swift; sourceTree = "<group>"; };
6543108B2322D90900658221 /* common */ = {isa = PBXFileReference; lastKnownFileType = folder; path = common; sourceTree = "<group>"; };
6581C73320CED60000F4AD34 /* Subscribe to Feed.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "Subscribe to Feed.appex"; sourceTree = BUILT_PRODUCTS_DIR; };
@ -3176,6 +3178,7 @@
6591723024B5C35400B638E8 /* AccountHeaderImageView.swift */,
6591727E24B5D19500B638E8 /* SettingsDetailAccountView.swift */,
6586A5F624B632F8002BCF4F /* SettingsDetailAccountModel.swift */,
653A4E7824BCA5BB00EF2D7F /* SettingsCloudKitAccountView.swift */,
);
path = Accounts;
sourceTree = "<group>";
@ -5113,6 +5116,7 @@
51E4991524A808FF00B667CB /* ArticleStringFormatter.swift in Sources */,
51919FEE24AB85E400541E64 /* TimelineContainerView.swift in Sources */,
FFA2BBD624AF751100B3149D /* PreviewProvider+RefreshProgressModel.swift in Sources */,
653A4E7924BCA5BB00EF2D7F /* SettingsCloudKitAccountView.swift in Sources */,
51E4995724A8734D00B667CB /* ExtensionPoint.swift in Sources */,
1776E88E24AC5F8A00E78166 /* AppDefaults.swift in Sources */,
51E4991124A808DE00B667CB /* SmallIconProvider.swift in Sources */,