FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-01-24 16:10:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

add feed changes

Browse Source 
sorts alignment issues with monospaced fonts.
This commit is contained in:
Stuart Breckenridge 2020-07-03 21:43:55 +08:00
parent 6fb5af81af
commit 467c16465f
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Multiplatform/Shared/Add/AddFeedView.swift
View File

@ -77,15 +77,25 @@ struct AddFeedView: View {
#if os(macOS)
var macForm: some View {
VStack(alignment: .leading) {
HStack {
Spacer()
Image(systemName: "globe").foregroundColor(.accentColor).font(.title)
Text("Add a Web Feed")
.font(.title)
Spacer()
}
urlTextField
.textFieldStyle(RoundedBorderTextFieldStyle())
.help("The URL of the feed you want to add.")
providedNameTextField
.textFieldStyle(RoundedBorderTextFieldStyle())
.help("The name of the feed. (Optional.)")
folderPicker
.help("Pick the folder you want to add the feed to.")
buttonStack
}
.padding()
.frame(minWidth: 400)
.frame(minWidth: 450)
}
#endif
@ -101,20 +111,20 @@ struct AddFeedView: View {
var urlTextField: some View {
HStack {
Text("Feed URL:")
Text("Feed: ").font(.system(.body, design: .monospaced))
TextField("URL", text: $viewModel.providedURL)
}
}
var providedNameTextField: some View {
HStack(alignment: .lastTextBaseline) {
Text("Name:")
Text("Name: ").font(.system(.body, design: .monospaced))
TextField("Optional", text: $viewModel.providedName)
}
}
var folderPicker: some View {
Picker("Folder", selection: $viewModel.selectedFolderIndex, content: {
Picker("Folder:", selection: $viewModel.selectedFolderIndex, content: {
ForEach(0..<viewModel.containers.count, id: \.self, content: { index in
if let containerName = (viewModel.containers[index] as? DisplayNameProvider)?.nameForDisplay {
if viewModel.containers[index] is Folder {
@ -124,7 +134,7 @@ struct AddFeedView: View {
}
}
})
})
}).font(.system(.body, design: .monospaced))
}
var buttonStack: some View {
@ -132,14 +142,19 @@ struct AddFeedView: View {
if viewModel.showProgressIndicator == true {
ProgressView()
.frame(width: 25, height: 25)
.help("Adding Feed")
}
Spacer()
Button("Cancel", action: {
presentationMode.wrappedValue.dismiss()
})
.help("Cancel Add Feed")
Button("Add", action: {
addWebFeed()
}).disabled(!viewModel.providedURL.isValidURL)
})
.disabled(!viewModel.providedURL.isValidURL)
.help("Add Feed")
}
}