From 6c5655191eb430398f6d680cbaeea36b899f135b Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sun, 5 Jul 2020 19:21:23 -0500 Subject: [PATCH] Implement hack to hide disclosure chevrons --- Multiplatform/Shared/Sidebar/SidebarView.swift | 15 ++++++++++++--- Multiplatform/Shared/Timeline/TimelineView.swift | 5 ++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Multiplatform/Shared/Sidebar/SidebarView.swift b/Multiplatform/Shared/Sidebar/SidebarView.swift index ba44a48fc..4f5073f88 100644 --- a/Multiplatform/Shared/Sidebar/SidebarView.swift +++ b/Multiplatform/Shared/Sidebar/SidebarView.swift @@ -25,18 +25,27 @@ struct SidebarView: View { if let containerID = sidebarItem.containerID { DisclosureGroup(isExpanded: $expandedContainers[containerID]) { ForEach(sidebarItem.children) { sidebarItem in - NavigationLink(destination: (TimelineContainerView(feed: sidebarItem.feed))) { + ZStack { SidebarItemView(sidebarItem: sidebarItem) + NavigationLink(destination: (TimelineContainerView(feed: sidebarItem.feed))) { + EmptyView() + }.buttonStyle(PlainButtonStyle()) } } } label: { - NavigationLink(destination: (TimelineContainerView(feed: sidebarItem.feed))) { + ZStack { SidebarItemView(sidebarItem: sidebarItem) + NavigationLink(destination: (TimelineContainerView(feed: sidebarItem.feed))) { + EmptyView() + }.buttonStyle(PlainButtonStyle()) } } } else { - NavigationLink(destination: (TimelineContainerView(feed: sidebarItem.feed))) { + ZStack { SidebarItemView(sidebarItem: sidebarItem) + NavigationLink(destination: (TimelineContainerView(feed: sidebarItem.feed))) { + EmptyView() + }.buttonStyle(PlainButtonStyle()) } } } diff --git a/Multiplatform/Shared/Timeline/TimelineView.swift b/Multiplatform/Shared/Timeline/TimelineView.swift index a1414408a..03ffa09e7 100644 --- a/Multiplatform/Shared/Timeline/TimelineView.swift +++ b/Multiplatform/Shared/Timeline/TimelineView.swift @@ -14,11 +14,14 @@ struct TimelineView: View { var body: some View { List(timelineModel.timelineItems) { timelineItem in - NavigationLink(destination: (ArticleContainerView(article: timelineItem.article))) { + ZStack { TimelineItemView(timelineItem: timelineItem) .onAppear { timelineModel.loadMoreTimelineItemsIfNecessary(timelineItem) } + NavigationLink(destination: (ArticleContainerView(article: timelineItem.article))) { + EmptyView() + }.buttonStyle(PlainButtonStyle()) } } }