Merge pull request #22 from majouji/add-tvos-app

SwiftUI Kit, on the tube!
jordansinger · Jul 12, 2020 · 1da4381 · 1da4381
2 parents a3ea804 + c0d98c2
commit 1da4381
Show file tree

Hide file tree

Showing 36 changed files with 424 additions and 291 deletions.
diff --git a/README.md b/README.md
@@ -1,16 +1,16 @@
 # SwiftUI Kit
-A SwiftUI system components and interactions demo app based on iOS 14, macOS Big Sur, and watchOS 7.
+A SwiftUI system components and interactions demo app based on iOS 14, macOS Big Sur, watchOS 7, and tvOS 14.
 
 ![SwiftUI Kit](https://user-images.githubusercontent.com/110813/87210094-5accf380-c2e2-11ea-91c9-4f21aa313bc6.png)
 
 Use the SwiftUI Kit app to see how SwiftUI views appear and interact when using the system defaults. You can view the source to see how particular examples work.
 
-Includes Buttons, Colors, Controls, Fonts, Haptics, Images, Indicators, Shapes, and Text. 
+Includes Buttons, Colors, Controls, Fonts, Haptics, Images, Indicators, Shapes, Text, and more. 
 
 ![SwiftUI Kit examples](https://user-images.githubusercontent.com/110813/87210295-00806280-c2e3-11ea-91e3-4ea6da79f73e.png)
 
 #### To run
-Make sure you're using [Xcode 12+](https://developer.apple.com/xcode/) as well as a device running iOS 14+. Works on iPhone, iPad, and Mac.
+Make sure you're using [Xcode 12+](https://developer.apple.com/xcode/) as well as a device running iOS 14+. Works on iPhone, iPad, Mac, Apple Watch, and Apple TV.
 
 #### Accent color
 To change the accent color and see how it affects the system components, go to the AccentColor section of Assets.xcassets in Xcode. You can then change the Light and Dark accent colors that will be applied to the app.

diff --git a/...ssets/App Icon - App Store.imagestack/Back.imagestacklayer/Content.imageset/Contents.json b/...ssets/App Icon - App Store.imagestack/Back.imagestacklayer/Content.imageset/Contents.json
@@ -0,0 +1,11 @@
+{
+  "images" : [
+    {
+      "idiom" : "tv"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...S Extension/Assets.xcassets/Contents.json → ...estack/Back.imagestacklayer/Contents.json b/...S Extension/Assets.xcassets/Contents.json → ...estack/Back.imagestacklayer/Contents.json
diff --git a/...ed/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Contents.json b/...ed/Assets.xcassets/Brand Assets.brandassets/App Icon - App Store.imagestack/Contents.json
@@ -0,0 +1,17 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "layers" : [
+    {
+      "filename" : "Front.imagestacklayer"
+    },
+    {
+      "filename" : "Middle.imagestacklayer"
+    },
+    {
+      "filename" : "Back.imagestacklayer"
+    }
+  ]
+}
diff --git a/...sets/App Icon - App Store.imagestack/Front.imagestacklayer/Content.imageset/Contents.json b/...sets/App Icon - App Store.imagestack/Front.imagestacklayer/Content.imageset/Contents.json
@@ -0,0 +1,11 @@
+{
+  "images" : [
+    {
+      "idiom" : "tv"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...ent/Preview Assets.xcassets/Contents.json → ...stack/Front.imagestacklayer/Contents.json b/...ent/Preview Assets.xcassets/Contents.json → ...stack/Front.imagestacklayer/Contents.json
diff --git a/...ets/App Icon - App Store.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json b/...ets/App Icon - App Store.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json
@@ -0,0 +1,11 @@
+{
+  "images" : [
+    {
+      "idiom" : "tv"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...d Assets.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Contents.json b/...d Assets.brandassets/App Icon - App Store.imagestack/Middle.imagestacklayer/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...ssets.brandassets/App Icon.imagestack/Back.imagestacklayer/Content.imageset/Contents.json b/...ssets.brandassets/App Icon.imagestack/Back.imagestacklayer/Content.imageset/Contents.json
@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "idiom" : "tv",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/....xcassets/Brand Assets.brandassets/App Icon.imagestack/Back.imagestacklayer/Contents.json b/....xcassets/Brand Assets.brandassets/App Icon.imagestack/Back.imagestacklayer/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Shared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Contents.json b/Shared/Assets.xcassets/Brand Assets.brandassets/App Icon.imagestack/Contents.json
@@ -0,0 +1,17 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "layers" : [
+    {
+      "filename" : "Front.imagestacklayer"
+    },
+    {
+      "filename" : "Middle.imagestacklayer"
+    },
+    {
+      "filename" : "Back.imagestacklayer"
+    }
+  ]
+}
diff --git a/...sets.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/Contents.json b/...sets.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/Contents.json
@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "idiom" : "tv",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...xcassets/Brand Assets.brandassets/App Icon.imagestack/Front.imagestacklayer/Contents.json b/...xcassets/Brand Assets.brandassets/App Icon.imagestack/Front.imagestacklayer/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...ets.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json b/...ets.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json
@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "idiom" : "tv",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...cassets/Brand Assets.brandassets/App Icon.imagestack/Middle.imagestacklayer/Contents.json b/...cassets/Brand Assets.brandassets/App Icon.imagestack/Middle.imagestacklayer/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Shared/Assets.xcassets/Brand Assets.brandassets/Contents.json b/Shared/Assets.xcassets/Brand Assets.brandassets/Contents.json
@@ -0,0 +1,32 @@
+{
+  "assets" : [
+    {
+      "filename" : "App Icon - App Store.imagestack",
+      "idiom" : "tv",
+      "role" : "primary-app-icon",
+      "size" : "1280x768"
+    },
+    {
+      "filename" : "App Icon.imagestack",
+      "idiom" : "tv",
+      "role" : "primary-app-icon",
+      "size" : "400x240"
+    },
+    {
+      "filename" : "Top Shelf Image Wide.imageset",
+      "idiom" : "tv",
+      "role" : "top-shelf-image-wide",
+      "size" : "2320x720"
+    },
+    {
+      "filename" : "Top Shelf Image.imageset",
+      "idiom" : "tv",
+      "role" : "top-shelf-image",
+      "size" : "1920x720"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Shared/Assets.xcassets/Brand Assets.brandassets/Top Shelf Image Wide.imageset/Contents.json b/Shared/Assets.xcassets/Brand Assets.brandassets/Top Shelf Image Wide.imageset/Contents.json
@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "idiom" : "tv",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Shared/Assets.xcassets/Brand Assets.brandassets/Top Shelf Image.imageset/Contents.json b/Shared/Assets.xcassets/Brand Assets.brandassets/Top Shelf Image.imageset/Contents.json
@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "idiom" : "tv",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Shared/ContentView.swift b/Shared/ContentView.swift
@@ -27,7 +27,7 @@ struct ContentView: View {
 
     var body: some View {
         NavigationView {
-            #if os(iOS) || os(watchOS)
+            #if os(iOS) || os(watchOS) || os(tvOS)
             list.navigationBarTitle("SwiftUI")
             Text("Select a group")
             #elseif os(OSX)

diff --git a/Shared/Groupings/ButtonsGroup.swift b/Shared/Groupings/ButtonsGroup.swift
@@ -45,7 +45,7 @@ struct ButtonsGroup: View {
                             #endif
                         }
 
-                        #if os(iOS)
+                        #if !os(OSX)
                         Button(action: {
                             self.showingActionSheet = true
                         }) {
@@ -64,7 +64,7 @@ struct ButtonsGroup: View {
                 }
             )
 
-            #if os(iOS) || os(OSX)
+            #if !os(watchOS) && !os(tvOS)
             SectionView(
                 title: "Link",
                 description: "A control for navigating to a URL.",
@@ -74,7 +74,7 @@ struct ButtonsGroup: View {
             )
             #endif
 
-            #if !os(watchOS)
+            #if !os(watchOS) && !os(tvOS)
             SectionView(
                 title: "Menu",
                 description: "A control for presenting a contextually-appropriate menu of buttons.",

diff --git a/Shared/Groupings/ControlsGroup.swift b/Shared/Groupings/ControlsGroup.swift
@@ -24,8 +24,10 @@ struct ControlsGroup: View {
                 Group {
                     Toggle("Vibrate on Ring", isOn: $vibrateOnRing)
 
+                    #if !os(tvOS)
                     Toggle("Vibrate on Silent", isOn: $vibrateOnSilent)
                         .toggleStyle(SwitchToggleStyle())
+                    #endif
                 }
             }
 
@@ -69,13 +71,15 @@ struct ControlsGroup: View {
             }
             #endif
 
+            #if !os(tvOS)
             SectionView(title: "Slider", description: "A control for selecting a value from a bounded linear range of values. It can slide continuously, or snap to fixed increments.") {
                 Group {
                     Slider(value: $volume, in: 0...100, minimumValueLabel: Text("0%"), maximumValueLabel: Text("100%"), label: { Text("Volume") })
 
                     Slider(value: $rating, in: 1...10, step: 1, minimumValueLabel: Text("0"), maximumValueLabel: Text("10"), label: { Text("Rating") })
                 }
             }
+            #endif
 
             #if os(iOS) || os(OSX)
             SectionView(title: "Stepper", description: "A control used to perform semantic increment and decrement actions.") {

diff --git a/Shared/Groupings/ShapesGroup.swift b/Shared/Groupings/ShapesGroup.swift
@@ -8,6 +8,7 @@
 import SwiftUI
 
 struct ShapesGroup: View {
+
     // Define constraints for the shape frames so they don’t stretch out too much on macOS
     let frameMinWidth: CGFloat = 16
     let frameMaxWidth: CGFloat = 256