tvOS fixes (#3350)

Author: rlepinski

Airship/Airship.xcodeproj/project.pbxproj

@@ -1041,13 +1041,6 @@
 			remoteGlobalIDString = 494DD9561B0EB677009C134E;
 			remoteInfo = AirshipCore;
 		};
-		6E0B8746294A9C950064B7BD /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 494DD94E1B0EB677009C134E /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 494DD9561B0EB677009C134E;
-			remoteInfo = AirshipCore;
-		};
 		6E107F032B30B887007AFC4D /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 494DD94E1B0EB677009C134E /* Project object */;
@@ -4783,7 +4776,6 @@
 			);
 			dependencies = (
 				6E0B8743294A9C780064B7BD /* PBXTargetDependency */,
-				6E0B8747294A9C950064B7BD /* PBXTargetDependency */,
 			);
 			name = AirshipAutomation;
 			productName = AirshipAutomationSwift;
@@ -6257,11 +6249,6 @@
 			target = 494DD9561B0EB677009C134E /* AirshipCore */;
 			targetProxy = 6E0B8742294A9C780064B7BD /* PBXContainerItemProxy */;
 		};
-		6E0B8747294A9C950064B7BD /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 494DD9561B0EB677009C134E /* AirshipCore */;
-			targetProxy = 6E0B8746294A9C950064B7BD /* PBXContainerItemProxy */;
-		};
 		6E107F042B30B887007AFC4D /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 494DD9561B0EB677009C134E /* AirshipCore */;

Airship/AirshipAutomation/Source/InAppMessage/View/ButtonGroup.swift

@@ -163,6 +163,9 @@ struct ButtonView: View {
                            borderWidth: 2)
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .center)
+#if os(tvOS)
+        .buttonStyle(.card)
+#endif
     }
 
     private func onTap() {

Airship/AirshipAutomation/Source/InAppMessage/View/CloseButton.swift

@@ -43,17 +43,16 @@ struct CloseButton: View {
 
     var body: some View {
         Button(action: onTap) {
-            VStack(alignment: .center, spacing: 0) {
-                Spacer()
-                dismissButtonImage
-                Spacer()
-            }
+            dismissButtonImage
+                .frame(
+                    width: max(tappableWidth, width),
+                    height: max(tappableHeight, height)
+                )
         }
-        .frame(
-            width: max(tappableWidth, width),
-            height: max(tappableHeight, height)
-        )
-            .accessibilityLabel("Dismiss")
+        .accessibilityLabel("Dismiss")
+#if os(tvOS)
+        .buttonStyle(.card)
+#endif
     }
 }
 

Airship/AirshipAutomation/Source/InAppMessage/View/InAppMessageBannerView.swift

@@ -213,7 +213,9 @@ struct InAppMessageBannerView: View {
             .padding(theme.padding)
             .applyTransitioningPlacement(placement: displayContent.placement ?? .bottom)
             .offset(x: 0, y: swipeOffset)
+#if !os(tvOS)
             .simultaneousGesture(swipeGesture)
+#endif
             .onAppear {
                 setShowing(state: true)
                 timer.onAppear()
@@ -253,6 +255,7 @@ struct InAppMessageBannerView: View {
         }
     }
 
+#if !os(tvOS)
     private var swipeGesture: some Gesture {
         let minSwipeDistance: CGFloat = if self.bannerConstraints.size.height > 0 {
             min(100.0,  self.bannerConstraints.size.height * 0.5)
@@ -292,6 +295,7 @@ struct InAppMessageBannerView: View {
                 }
             }
     }
+#endif
 }
 
 fileprivate extension View {

tvOSSample/tvOSSample.xcodeproj/project.pbxproj

@@ -109,6 +109,13 @@
 			remoteGlobalIDString = 847BFFF3267CD739007CD249;
 			remoteInfo = AirshipPreferenceCenter;
 		};
+		6EAF57842D36F96200DF01BB /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 6E65D5492396E99A00AF2D1A /* Airship.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = A641E1472BDBBDB400DE6FAA;
+			remoteInfo = AirshipObjectiveC;
+		};
 		6EB1B40326EAA526000421B9 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 6E65D5492396E99A00AF2D1A /* Airship.xcodeproj */;
@@ -183,6 +190,7 @@
 				6E6DD1612CE80FE8009CB521 /* AirshipFeatureFlags.framework */,
 				6E65D5672396E99A00AF2D1A /* AirshipMessageCenter.framework */,
 				6EB1B40826EAA526000421B9 /* AirshipPreferenceCenter.framework */,
+				6EAF57852D36F96200DF01BB /* AirshipObjectiveC.framework */,
 				6E65D5632396E99A00AF2D1A /* AirshipDebug.framework */,
 				6E65D55F2396E99A00AF2D1A /* AirshipTests.xctest */,
 				6E250F2929DFF1480016A030 /* AirshipAutomationTests.xctest */,
@@ -360,6 +368,13 @@
 			remoteRef = 6E6DD1622CE80FE8009CB521 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		6EAF57852D36F96200DF01BB /* AirshipObjectiveC.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = AirshipObjectiveC.framework;
+			remoteRef = 6EAF57842D36F96200DF01BB /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		6EB1B40426EAA526000421B9 /* AirshipBasement.framework */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.framework;