FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-01-30 02:34:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pre-populate Feed Name on Feed Info. Issue #1163

Browse Source
This commit is contained in:
Maurice Parker 2019-10-24 12:30:10 -05:00
parent 00afc3f32e
commit bedf8a19e9
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
iOS/Inspector/FeedInspectorView.swift
View File

@ -66,8 +66,12 @@ struct FeedInspectorView : View {
Text(verbatim: self.viewModel.feedLinkURL)
}
}
.onDisappear { self.viewModel.save() }
.navigationBarTitle(Text(verbatim: self.viewModel.nameForDisplay), displayMode: .inline)
.navigationBarItems(leading: Button(action: { self.viewController?.dismiss(animated: true) }) { Text("Done") } )
.navigationBarItems(leading: Button(action: {
self.viewModel.save()
self.viewController?.dismiss(animated: true)
}) { Text("Done") } )
}
}
@ -77,9 +81,11 @@ struct FeedInspectorView : View {
let objectWillChange = ObservableObjectPublisher()
let feed: Feed
@Published var name: String
init(feed: Feed) {
self.feed = feed
self.name = feed.nameForDisplay
NotificationCenter.default.addObserver(self, selector: #selector(feedIconDidBecomeAvailable(_:)), name: .FeedIconDidBecomeAvailable, object: nil)
}
@ -97,20 +103,6 @@ struct FeedInspectorView : View {
return feed.nameForDisplay
}
var name: String {
get {
return feed.editedName ?? ""
}
set {
objectWillChange.send()
if newValue.isEmpty {
feed.editedName = nil
} else {
feed.editedName = newValue
}
}
}
var isNotifyAboutNewArticles: Bool {
get {
return feed.isNotifyAboutNewArticles ?? false
@ -143,6 +135,12 @@ struct FeedInspectorView : View {
objectWillChange.send()
}
func save() {
if name != nameForDisplay {
feed.editedName = name.isEmpty ? nil : name
}
}
}
}