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 pull request #2330 from stuartbreckenridge/ios-multiplat-updates

Browse Source 
Multiplatform updates
This commit is contained in:
Maurice Parker
2020-08-14 15:59:42 -05:00
committed by GitHub
parent 24f1371a9a 0a51508abf
commit 9218b4d95c
26 changed files with 255 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@@ -81,10 +81,10 @@ struct SidebarToolbarModifier: ViewModifier {
}
.sheet(isPresented: $viewModel.showSheet, onDismiss: { viewModel.sheetToShow = .none }) {
if viewModel.sheetToShow == .web {
AddWebFeedView()
AddWebFeedView(isPresented: $viewModel.showSheet)
}
if viewModel.sheetToShow == .folder {
AddFolderView()
AddFolderView(isPresented: $viewModel.showSheet)
}
if viewModel.sheetToShow == .settings {
SettingsView()

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

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