FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pr/2218' into swiftui

Browse Source
This commit is contained in:
Maurice Parker 2020-07-06 16:39:36 -05:00
commit 06a1a5f28b
5 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Multiplatform/Shared/AppDefaults.swift
View File

@ -172,7 +172,7 @@ final class AppDefaults: ObservableObject {
// MARK: Timeline
@AppStorage(wrappedValue: false, Key.timelineGroupByFeed, store: store) var timelineGroupByFeed: Bool
@AppStorage(wrappedValue: 3, Key.timelineNumberOfLines, store: store) var timelineNumberOfLines: Int {
@AppStorage(wrappedValue: 2.0, Key.timelineNumberOfLines, store: store) var timelineNumberOfLines: Double {
didSet {
objectWillChange.send()
}

4
Multiplatform/Shared/Sidebar/SidebarToolbarModifier.swift
View File

@ -10,7 +10,7 @@ import SwiftUI
struct SidebarToolbarModifier: ViewModifier {
@EnvironmentObject private var appSettings: AppDefaults
@EnvironmentObject private var defaults: AppDefaults
@StateObject private var viewModel = SidebarToolbarModel()
@ViewBuilder func body(content: Content) -> some View {
@ -75,7 +75,7 @@ struct SidebarToolbarModifier: ViewModifier {
AddFolderView()
}
if viewModel.sheetToShow == .settings {
SettingsView().modifier(PreferredColorSchemeModifier(preferredColorScheme: appSettings.userInterfaceColorPalette))
SettingsView().modifier(PreferredColorSchemeModifier(preferredColorScheme: defaults.userInterfaceColorPalette))
}
}
#else

2
Multiplatform/Shared/Timeline/TimelineItemView.swift
View File

@ -33,7 +33,7 @@ struct TimelineItemView: View {
VStack {
Text(verbatim: timelineItem.article.title ?? "N/A")
.fontWeight(.semibold)
.lineLimit(defaults.timelineNumberOfLines)
.lineLimit(Int(defaults.timelineNumberOfLines))
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.trailing, 4)
Spacer()

16
Multiplatform/iOS/Settings/TimelineLayoutView.swift
View File

@ -10,7 +10,7 @@ import SwiftUI
struct TimelineLayoutView: View {
@EnvironmentObject private var appSettings: AppDefaults
@EnvironmentObject private var defaults: AppDefaults
private let sampleTitle = "Lorem dolor sed viverra ipsum. Gravida rutrum quisque non tellus. Rutrum tellus pellentesque eu tincidunt tortor. Sed blandit libero volutpat sed cras ornare. Et netus et malesuada fames ac. Ultrices eros in cursus turpis massa tincidunt dui ut ornare. Lacus sed viverra tellus in. Sollicitudin ac orci phasellus egestas. Purus in mollis nunc sed. Sollicitudin ac orci phasellus egestas tellus rutrum tellus pellentesque. Interdum consectetur libero id faucibus nisl tincidunt eget."
@ -33,15 +33,17 @@ struct TimelineLayoutView: View {
}
var iconSize: some View {
Slider(value: $appSettings.timelineIconDimensions, in: 20...60, step: 10, minimumValueLabel: Text("Small"), maximumValueLabel: Text("Large"), label: {
Text(String(appSettings.timelineIconDimensions))
Slider(value: $defaults.timelineIconDimensions, in: 20...60, step: 10, minimumValueLabel: Text("Small"), maximumValueLabel: Text("Large"), label: {
Text(String(defaults.timelineIconDimensions))
})
}
var numberOfLines: some View {
Stepper(value: $appSettings.timelineNumberOfLines, in: 1...5, label: {
Text("Title")
Slider(value: $defaults.timelineNumberOfLines, in: 1...5, step: 1, minimumValueLabel: Text("1"), maximumValueLabel: Text("5"), label: {
Text("Article Title")
})
}
var timelineRowPreview: some View {
@ -54,13 +56,13 @@ struct TimelineLayoutView: View {
Image(systemName: "paperplane.circle")
.resizable()
.frame(width: CGFloat(appSettings.timelineIconDimensions), height: CGFloat(appSettings.timelineIconDimensions), alignment: .top)
.frame(width: CGFloat(defaults.timelineIconDimensions), height: CGFloat(defaults.timelineIconDimensions), alignment: .top)
.foregroundColor(.accentColor)
VStack(alignment: .leading, spacing: 4) {
Text(sampleTitle)
.font(.headline)
.lineLimit(appSettings.timelineNumberOfLines)
.lineLimit(Int(defaults.timelineNumberOfLines))
HStack {
Text("Feed Name")
.foregroundColor(.secondary)

2
NetNewsWire.xcodeproj/project.pbxproj
View File

@ -2426,6 +2426,8 @@
children = (
65CBAD5924AE03C20006DD91 /* ColorPaletteContainerView.swift */,
65C2E40024B05D8A000AFDF6 /* FeedsSettingsModel.swift */,
17B223DB24AC24D2001E4592 /* TimelineLayoutView.swift */,
65CBAD5924AE03C20006DD91 /* ColorPaletteContainerView.swift */,
5181C66124B0C326002E0F70 /* SettingsModel.swift */,
172199C824AB228900A31D04 /* SettingsView.swift */,
17B223DB24AC24D2001E4592 /* TimelineLayoutView.swift */,