Initial macOS support

giuuliorusso · giuuliorusso · commit a10b55b0e65e · 2020-09-25T23:06:00.000+02:00
diff --git a/Shared/Components/LaunchRow.swift b/Shared/Components/LaunchRow.swift
@@ -11,6 +11,12 @@ import SwiftUI
 struct LaunchRow: View {
   let launch: Launch
 
+  #if os(iOS)
+  let padding: CGFloat = 0
+  #else
+  let padding: CGFloat = 8
+  #endif
+
   var body: some View {
     NavigationLink(destination: LaunchDetailView(launch: launch)) {
       HStack {
@@ -31,7 +37,7 @@ struct LaunchRow: View {
             .font(.subheadline)
             .foregroundColor(.secondary)
         }
-      }
+      }.padding(.vertical, padding)
     }
   }
 }
diff --git a/Shared/Navigation/AppSidebarNavigation.swift b/Shared/Navigation/AppSidebarNavigation.swift
@@ -25,10 +25,12 @@ struct AppSidebarNavigation: View {
           .tag(NavigationItem.launches)
       }
 
+      #if os(iOS)
       NavigationLink(destination: SearchView()) {
         Label("Search", systemImage: "magnifyingglass")
           .tag(NavigationItem.search)
       }
+      #endif
     }
     .listStyle(SidebarListStyle())
     .navigationTitle("SpaceX")
diff --git a/Shared/Views/LaunchDetailView.swift b/Shared/Views/LaunchDetailView.swift
@@ -11,6 +11,12 @@ import SwiftUI
 struct LaunchDetailView: View {
   let launch: Launch
 
+  #if os(iOS)
+  let listStyle = GroupedListStyle()
+  #else
+  let listStyle = DefaultListStyle()
+  #endif
+
   var body: some View {
     List {
       // Patch
@@ -59,7 +65,7 @@ struct LaunchDetailView: View {
         }
       }
     }
-    .listStyle(GroupedListStyle())
+    .listStyle(listStyle)
     .navigationTitle(launch.name)
   }
 }
diff --git a/Shared/Views/LaunchesView.swift b/Shared/Views/LaunchesView.swift
@@ -10,6 +10,12 @@ import SwiftUI
 struct LaunchesView: View {
   @EnvironmentObject private var store: Store
 
+  #if os(iOS)
+  let listStyle = PlainListStyle()
+  #else
+  let listStyle = DefaultListStyle()
+  #endif
+
   var body: some View {
     if store.upcomingLaunches.isEmpty || store.pastLaunches.isEmpty {
       ProgressView()
@@ -38,7 +44,7 @@ struct LaunchesView: View {
           LaunchRow(launch: launch)
         }
       }
-    }.listStyle(PlainListStyle())
+    }.listStyle(listStyle)
   }
 
   struct Header: View {
diff --git a/SpaceX.xcodeproj/project.pbxproj b/SpaceX.xcodeproj/project.pbxproj
@@ -35,9 +35,7 @@
 		C2D2C3C0251A92D500E19B68 /* KingfisherSwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = C2D2C3BF251A92D500E19B68 /* KingfisherSwiftUI */; };
 		C2D2C3C5251A92EF00E19B68 /* KingfisherSwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = C2D2C3C4251A92EF00E19B68 /* KingfisherSwiftUI */; };
 		C2F23821251B492300F43577 /* SearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2F23820251B492300F43577 /* SearchBar.swift */; };
-		C2F23822251B492300F43577 /* SearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2F23820251B492300F43577 /* SearchBar.swift */; };
 		C2F23826251B4AB800F43577 /* SearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2F23825251B4AB800F43577 /* SearchView.swift */; };
-		C2F23827251B4AB800F43577 /* SearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2F23825251B4AB800F43577 /* SearchView.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -87,7 +85,6 @@
 			isa = PBXGroup;
 			children = (
 				C2ADB2EA251AA51200B1C144 /* LaunchesView.swift */,
-				C2F23825251B4AB800F43577 /* SearchView.swift */,
 				C21EFD5D251C396D0026D25B /* LaunchDetailView.swift */,
 			);
 			path = Views;
@@ -97,7 +94,6 @@
 			isa = PBXGroup;
 			children = (
 				C2ADB2D7251A9E4E00B1C144 /* LaunchRow.swift */,
-				C2F23820251B492300F43577 /* SearchBar.swift */,
 				C21EFD58251C37630026D25B /* ClickableDate.swift */,
 			);
 			path = Components;
@@ -153,6 +149,8 @@
 			children = (
 				C2794798251981FC008F8FFD /* Info.plist */,
 				C223DB46251B7E090042A438 /* AppTabNavigation.swift */,
+				C2F23820251B492300F43577 /* SearchBar.swift */,
+				C2F23825251B4AB800F43577 /* SearchView.swift */,
 			);
 			path = iOS;
 			sourceTree = "<group>";
@@ -308,15 +306,13 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C2F23827251B4AB800F43577 /* SearchView.swift in Sources */,
 				C2ADB2D4251A9CE200B1C144 /* Store.swift in Sources */,
 				C21EFD5A251C37630026D25B /* ClickableDate.swift in Sources */,
 				C223DB4C251B7F070042A438 /* AppSidebarNavigation.swift in Sources */,
 				C2ADB2D9251A9E4E00B1C144 /* LaunchRow.swift in Sources */,
 				C27947A4251981FC008F8FFD /* ContentView.swift in Sources */,
 				C2ADB2EC251AA51200B1C144 /* LaunchesView.swift in Sources */,
 				C2ADB2DE251AA17100B1C144 /* Utils.swift in Sources */,
-				C2F23822251B492300F43577 /* SearchBar.swift in Sources */,
 				C2161C3D25198E2900ECE862 /* API.swift in Sources */,
 				C21EFD5F251C396D0026D25B /* LaunchDetailView.swift in Sources */,
 				C2ADB2CF251A9B1000B1C144 /* Launch.swift in Sources */,
diff --git a/iOS/SearchBar.swift b/iOS/SearchBar.swift
diff --git a/iOS/SearchView.swift b/iOS/SearchView.swift
diff --git a/macOS/macOS.entitlements b/macOS/macOS.entitlements
@@ -2,9 +2,11 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>com.apple.security.app-sandbox</key>
-    <true/>
-    <key>com.apple.security.files.user-selected.read-only</key>
-    <true/>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.files.user-selected.read-only</key>
+	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
 </dict>
 </plist>

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,12 @@ import SwiftUI`
`11`	`11`	`struct LaunchRow: View {`
`12`	`12`	`let launch: Launch`
`13`	`13`
	`14`	`+ #if os(iOS)`
	`15`	`+ let padding: CGFloat = 0`
	`16`	`+ #else`
	`17`	`+ let padding: CGFloat = 8`
	`18`	`+ #endif`
	`19`	`+`
`14`	`20`	`var body: some View {`
`15`	`21`	`NavigationLink(destination: LaunchDetailView(launch: launch)) {`
`16`	`22`	`HStack {`
`@@ -31,7 +37,7 @@ struct LaunchRow: View {`
`31`	`37`	`.font(.subheadline)`
`32`	`38`	`.foregroundColor(.secondary)`
`33`	`39`	`}`
`34`		`- }`
	`40`	`+ }.padding(.vertical, padding)`
`35`	`41`	`}`
`36`	`42`	`}`
`37`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,10 +25,12 @@ struct AppSidebarNavigation: View {`
`25`	`25`	`.tag(NavigationItem.launches)`
`26`	`26`	`}`
`27`	`27`
	`28`	`+ #if os(iOS)`
`28`	`29`	`NavigationLink(destination: SearchView()) {`
`29`	`30`	`Label("Search", systemImage: "magnifyingglass")`
`30`	`31`	`.tag(NavigationItem.search)`
`31`	`32`	`}`
	`33`	`+ #endif`
`32`	`34`	`}`
`33`	`35`	`.listStyle(SidebarListStyle())`
`34`	`36`	`.navigationTitle("SpaceX")`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,12 @@ import SwiftUI`
`10`	`10`	`struct LaunchesView: View {`
`11`	`11`	`@EnvironmentObject private var store: Store`
`12`	`12`
	`13`	`+ #if os(iOS)`
	`14`	`+ let listStyle = PlainListStyle()`
	`15`	`+ #else`
	`16`	`+ let listStyle = DefaultListStyle()`
	`17`	`+ #endif`
	`18`	`+`
`13`	`19`	`var body: some View {`
`14`	`20`	`if store.upcomingLaunches.isEmpty \|\| store.pastLaunches.isEmpty {`
`15`	`21`	`ProgressView()`
`@@ -38,7 +44,7 @@ struct LaunchesView: View {`
`38`	`44`	`LaunchRow(launch: launch)`
`39`	`45`	`}`
`40`	`46`	`}`
`41`		`- }.listStyle(PlainListStyle())`
	`47`	`+ }.listStyle(listStyle)`
`42`	`48`	`}`
`43`	`49`
`44`	`50`	`struct Header: View {`