renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions 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
parent e5ad208730 d1f7473a02
commit 06a1a5f28b
5 changed files with 15 additions and 11 deletions
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()