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

Removes @ViewBuilder from var body

Browse Source
This commit is contained in:
Stuart Breckenridge 2020-08-12 21:04:56 +08:00
parent 646a3190e5
commit 3ae4a85969
No known key found for this signature in database
GPG Key ID: 79BD673276AE83CE
10 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Multiplatform/Shared/Add/AddFolderView.swift
View File

@ -15,7 +15,7 @@ struct AddFolderView: View {
@Environment(\.presentationMode) private var presentationMode @Environment(\.presentationMode) private var presentationMode
@ObservedObject private var viewModel = AddFolderModel() @ObservedObject private var viewModel = AddFolderModel()
@ViewBuilder var body: some View { var body: some View {
#if os(iOS) #if os(iOS)
iosForm iosForm
.onReceive(viewModel.$shouldDismiss, perform: { .onReceive(viewModel.$shouldDismiss, perform: {

2
Multiplatform/Shared/Add/AddWebFeedView.swift
View File

@ -16,7 +16,7 @@ struct AddWebFeedView: View {
@Environment(\.presentationMode) private var presentationMode @Environment(\.presentationMode) private var presentationMode
@StateObject private var viewModel = AddWebFeedModel() @StateObject private var viewModel = AddWebFeedModel()
@ViewBuilder var body: some View { var body: some View {
#if os(iOS) #if os(iOS)
iosForm iosForm
.onAppear { .onAppear {

2
Multiplatform/Shared/Article/ArticleContainerView.swift
View File

@ -11,7 +11,7 @@ import Articles
struct ArticleContainerView: View { struct ArticleContainerView: View {
@ViewBuilder var body: some View { var body: some View {
ArticleView() ArticleView()
.modifier(ArticleToolbarModifier()) .modifier(ArticleToolbarModifier())
} }

2
Multiplatform/Shared/Images/IconImageView.swift
View File

@ -13,7 +13,7 @@ struct IconImageView: View {
@Environment(\.colorScheme) var colorScheme @Environment(\.colorScheme) var colorScheme
var iconImage: IconImage var iconImage: IconImage
@ViewBuilder var body: some View { var body: some View {
GeometryReader { proxy in GeometryReader { proxy in
let newSize = newImageSize(viewSize: proxy.size) let newSize = newImageSize(viewSize: proxy.size)

2
Multiplatform/Shared/Sidebar/SidebarContainerView.swift
View File

@ -15,7 +15,7 @@ struct SidebarContainerView: View {
@State var sidebarItems = [SidebarItem]() @State var sidebarItems = [SidebarItem]()
@ViewBuilder var body: some View { var body: some View {
SidebarView(sidebarItems: $sidebarItems) SidebarView(sidebarItems: $sidebarItems)
.modifier(SidebarToolbarModifier()) .modifier(SidebarToolbarModifier())
.modifier(SidebarListStyleModifier()) .modifier(SidebarListStyleModifier())

2
Multiplatform/Shared/Sidebar/SidebarContextMenu.swift
View File

@ -19,7 +19,7 @@ struct SidebarContextMenu: View {
var sidebarItem: SidebarItem var sidebarItem: SidebarItem
@ViewBuilder var body: some View { var body: some View {
// MARK: Account Context Menu // MARK: Account Context Menu
if sidebarItem.representedType == .account { if sidebarItem.representedType == .account {
Button { Button {

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

@ -26,7 +26,7 @@ struct SidebarView: View {
@State var pulling: Bool = false @State var pulling: Bool = false
@State var refreshing: Bool = false @State var refreshing: Bool = false
@ViewBuilder var body: some View { var body: some View {
#if os(macOS) #if os(macOS)
VStack { VStack {
HStack { HStack {
@ -182,7 +182,7 @@ struct SidebarView: View {
@EnvironmentObject private var sidebarModel: SidebarModel @EnvironmentObject private var sidebarModel: SidebarModel
var sidebarItem: SidebarItem var sidebarItem: SidebarItem
@ViewBuilder var body: some View { var body: some View {
#if os(macOS) #if os(macOS)
SidebarItemView(sidebarItem: sidebarItem) SidebarItemView(sidebarItem: sidebarItem)
.tag(sidebarItem.feed!.feedID!) .tag(sidebarItem.feed!.feedID!)

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

@ -17,7 +17,7 @@ struct TimelineContainerView: View {
@State private var timelineItems = TimelineItems() @State private var timelineItems = TimelineItems()
@State private var isReadFiltered: Bool? = nil @State private var isReadFiltered: Bool? = nil
@ViewBuilder var body: some View { var body: some View {
TimelineView(timelineItems: $timelineItems, isReadFiltered: $isReadFiltered) TimelineView(timelineItems: $timelineItems, isReadFiltered: $isReadFiltered)
.modifier(TimelineToolbarModifier()) .modifier(TimelineToolbarModifier())
.environmentObject(sceneModel.timelineModel) .environmentObject(sceneModel.timelineModel)

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

@ -13,7 +13,7 @@ struct TimelineContextMenu: View {
@EnvironmentObject private var timelineModel: TimelineModel @EnvironmentObject private var timelineModel: TimelineModel
var timelineItem: TimelineItem var timelineItem: TimelineItem
@ViewBuilder var body: some View { var body: some View {
if timelineModel.canMarkIndicatedArticlesAsRead(timelineItem) { if timelineModel.canMarkIndicatedArticlesAsRead(timelineItem) {
Button { Button {

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

@ -17,7 +17,7 @@ struct TimelineView: View {
@State private var timelineItemFrames = [String: CGRect]() @State private var timelineItemFrames = [String: CGRect]()
@ViewBuilder var body: some View { var body: some View {
GeometryReader { geometryReaderProxy in GeometryReader { geometryReaderProxy in
#if os(macOS) #if os(macOS)
VStack { VStack {