mirror of
https://github.com/writeas/writefreely-swiftui-multiplatform.git
synced 2024-11-15 01:11:02 +00:00
Remove unnecessary SidebarView
SidebarView literally just calls CollectionListView and provides no other functionality or state management; ContentView can therefore just call CollectionListView directly.
This commit is contained in:
parent
b3489354e7
commit
d51fa4672a
@ -6,7 +6,7 @@ struct ContentView: View {
|
|||||||
var body: some View {
|
var body: some View {
|
||||||
NavigationView {
|
NavigationView {
|
||||||
#if os(macOS)
|
#if os(macOS)
|
||||||
SidebarView()
|
CollectionListView()
|
||||||
.toolbar {
|
.toolbar {
|
||||||
Button(
|
Button(
|
||||||
action: {
|
action: {
|
||||||
@ -49,12 +49,12 @@ struct ContentView: View {
|
|||||||
.help("Create a new local draft.")
|
.help("Create a new local draft.")
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
SidebarView()
|
CollectionListView()
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if os(macOS)
|
#if os(macOS)
|
||||||
ZStack {
|
ZStack {
|
||||||
PostListView(selectedCollection: nil, showAllPosts: model.account.isLoggedIn)
|
PostListView(selectedCollection: nil, showAllPosts: false) //model.account.isLoggedIn)
|
||||||
if model.isProcessingRequest {
|
if model.isProcessingRequest {
|
||||||
ZStack {
|
ZStack {
|
||||||
Color(NSColor.controlBackgroundColor).opacity(0.75)
|
Color(NSColor.controlBackgroundColor).opacity(0.75)
|
||||||
|
@ -1,18 +0,0 @@
|
|||||||
import SwiftUI
|
|
||||||
|
|
||||||
struct SidebarView: View {
|
|
||||||
var body: some View {
|
|
||||||
CollectionListView()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
struct SidebarView_Previews: PreviewProvider {
|
|
||||||
static var previews: some View {
|
|
||||||
let context = LocalStorageManager.persistentContainer.viewContext
|
|
||||||
let model = WriteFreelyModel()
|
|
||||||
|
|
||||||
return SidebarView()
|
|
||||||
.environment(\.managedObjectContext, context)
|
|
||||||
.environmentObject(model)
|
|
||||||
}
|
|
||||||
}
|
|
@ -48,8 +48,6 @@
|
|||||||
1756DC0224FEE18400207AB8 /* WFACollection+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1756DBFF24FEE18400207AB8 /* WFACollection+CoreDataClass.swift */; };
|
1756DC0224FEE18400207AB8 /* WFACollection+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1756DBFF24FEE18400207AB8 /* WFACollection+CoreDataClass.swift */; };
|
||||||
1756DC0324FEE18400207AB8 /* WFACollection+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1756DC0024FEE18400207AB8 /* WFACollection+CoreDataProperties.swift */; };
|
1756DC0324FEE18400207AB8 /* WFACollection+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1756DC0024FEE18400207AB8 /* WFACollection+CoreDataProperties.swift */; };
|
||||||
1756DC0424FEE18400207AB8 /* WFACollection+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1756DC0024FEE18400207AB8 /* WFACollection+CoreDataProperties.swift */; };
|
1756DC0424FEE18400207AB8 /* WFACollection+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1756DC0024FEE18400207AB8 /* WFACollection+CoreDataProperties.swift */; };
|
||||||
1765F62A24E18EA200C9EBF0 /* SidebarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1765F62924E18EA200C9EBF0 /* SidebarView.swift */; };
|
|
||||||
1765F62B24E18EA200C9EBF0 /* SidebarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1765F62924E18EA200C9EBF0 /* SidebarView.swift */; };
|
|
||||||
17681E412519410E00D394AE /* UINavigationController+Appearance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17681E402519410E00D394AE /* UINavigationController+Appearance.swift */; };
|
17681E412519410E00D394AE /* UINavigationController+Appearance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17681E402519410E00D394AE /* UINavigationController+Appearance.swift */; };
|
||||||
1780F6EF25895EDB00FE45FF /* PostCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1780F6EE25895EDB00FE45FF /* PostCommands.swift */; };
|
1780F6EF25895EDB00FE45FF /* PostCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1780F6EE25895EDB00FE45FF /* PostCommands.swift */; };
|
||||||
17A4FEDA25924AF70037E96B /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = 17A4FED925924AF70037E96B /* Sparkle */; };
|
17A4FEDA25924AF70037E96B /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = 17A4FED925924AF70037E96B /* Sparkle */; };
|
||||||
@ -146,7 +144,6 @@
|
|||||||
1756DBB924FED45500207AB8 /* LocalStorageManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalStorageManager.swift; sourceTree = "<group>"; };
|
1756DBB924FED45500207AB8 /* LocalStorageManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalStorageManager.swift; sourceTree = "<group>"; };
|
||||||
1756DBFF24FEE18400207AB8 /* WFACollection+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WFACollection+CoreDataClass.swift"; sourceTree = SOURCE_ROOT; };
|
1756DBFF24FEE18400207AB8 /* WFACollection+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WFACollection+CoreDataClass.swift"; sourceTree = SOURCE_ROOT; };
|
||||||
1756DC0024FEE18400207AB8 /* WFACollection+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WFACollection+CoreDataProperties.swift"; sourceTree = SOURCE_ROOT; };
|
1756DC0024FEE18400207AB8 /* WFACollection+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WFACollection+CoreDataProperties.swift"; sourceTree = SOURCE_ROOT; };
|
||||||
1765F62924E18EA200C9EBF0 /* SidebarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SidebarView.swift; sourceTree = "<group>"; };
|
|
||||||
17681E402519410E00D394AE /* UINavigationController+Appearance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UINavigationController+Appearance.swift"; sourceTree = "<group>"; };
|
17681E402519410E00D394AE /* UINavigationController+Appearance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UINavigationController+Appearance.swift"; sourceTree = "<group>"; };
|
||||||
1780F6EE25895EDB00FE45FF /* PostCommands.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostCommands.swift; sourceTree = "<group>"; };
|
1780F6EE25895EDB00FE45FF /* PostCommands.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostCommands.swift; sourceTree = "<group>"; };
|
||||||
17A4FEDF25924E810037E96B /* MacSoftwareUpdater.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = MacSoftwareUpdater.md; sourceTree = "<group>"; };
|
17A4FEDF25924E810037E96B /* MacSoftwareUpdater.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = MacSoftwareUpdater.md; sourceTree = "<group>"; };
|
||||||
@ -457,7 +454,6 @@
|
|||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
17DF328224C87D3300BCE2E3 /* ContentView.swift */,
|
17DF328224C87D3300BCE2E3 /* ContentView.swift */,
|
||||||
1765F62924E18EA200C9EBF0 /* SidebarView.swift */,
|
|
||||||
);
|
);
|
||||||
path = Navigation;
|
path = Navigation;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
@ -745,7 +741,6 @@
|
|||||||
1756AE7724CB2EDD00FD7257 /* PostEditorView.swift in Sources */,
|
1756AE7724CB2EDD00FD7257 /* PostEditorView.swift in Sources */,
|
||||||
17DF32D524C8CA3400BCE2E3 /* PostStatusBadgeView.swift in Sources */,
|
17DF32D524C8CA3400BCE2E3 /* PostStatusBadgeView.swift in Sources */,
|
||||||
17D435E824E3128F0036B539 /* PreferencesModel.swift in Sources */,
|
17D435E824E3128F0036B539 /* PreferencesModel.swift in Sources */,
|
||||||
1765F62A24E18EA200C9EBF0 /* SidebarView.swift in Sources */,
|
|
||||||
1756AE7A24CB65DF00FD7257 /* PostListView.swift in Sources */,
|
1756AE7A24CB65DF00FD7257 /* PostListView.swift in Sources */,
|
||||||
17B996D82502D23E0017B536 /* WFAPost+CoreDataClass.swift in Sources */,
|
17B996D82502D23E0017B536 /* WFAPost+CoreDataClass.swift in Sources */,
|
||||||
1756DC0124FEE18400207AB8 /* WFACollection+CoreDataClass.swift in Sources */,
|
1756DC0124FEE18400207AB8 /* WFACollection+CoreDataClass.swift in Sources */,
|
||||||
@ -769,7 +764,6 @@
|
|||||||
buildActionMask = 2147483647;
|
buildActionMask = 2147483647;
|
||||||
files = (
|
files = (
|
||||||
17DF32AD24C87D3500BCE2E3 /* ContentView.swift in Sources */,
|
17DF32AD24C87D3500BCE2E3 /* ContentView.swift in Sources */,
|
||||||
1765F62B24E18EA200C9EBF0 /* SidebarView.swift in Sources */,
|
|
||||||
1756DBBB24FED45500207AB8 /* LocalStorageManager.swift in Sources */,
|
1756DBBB24FED45500207AB8 /* LocalStorageManager.swift in Sources */,
|
||||||
17A4FEED25927E730037E96B /* AppDelegate.swift in Sources */,
|
17A4FEED25927E730037E96B /* AppDelegate.swift in Sources */,
|
||||||
174D313324EC2831006CA9EE /* WriteFreelyModel.swift in Sources */,
|
174D313324EC2831006CA9EE /* WriteFreelyModel.swift in Sources */,
|
||||||
|
@ -7,12 +7,12 @@
|
|||||||
<key>WriteFreely-MultiPlatform (iOS).xcscheme_^#shared#^_</key>
|
<key>WriteFreely-MultiPlatform (iOS).xcscheme_^#shared#^_</key>
|
||||||
<dict>
|
<dict>
|
||||||
<key>orderHint</key>
|
<key>orderHint</key>
|
||||||
<integer>0</integer>
|
<integer>1</integer>
|
||||||
</dict>
|
</dict>
|
||||||
<key>WriteFreely-MultiPlatform (macOS).xcscheme_^#shared#^_</key>
|
<key>WriteFreely-MultiPlatform (macOS).xcscheme_^#shared#^_</key>
|
||||||
<dict>
|
<dict>
|
||||||
<key>orderHint</key>
|
<key>orderHint</key>
|
||||||
<integer>1</integer>
|
<integer>0</integer>
|
||||||
</dict>
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
|
Loading…
Reference in New Issue
Block a user