Improved visionOS experience

hiddevdploeg · Nov 26, 2024 · 5c90047 · 5c90047
1 parent a287664
commit 5c90047
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 14 deletions.
diff --git a/Sources/Views/BillboardBannerView.swift b/Sources/Views/BillboardBannerView.swift
@@ -77,7 +77,6 @@ public struct BillboardBannerView : View {
                 .contentShape(Rectangle())
             }
             .buttonStyle(.plain)
-            Spacer()
 
             Group {
                 if !hideDismissButtonAndTimer {
@@ -90,16 +89,28 @@ public struct BillboardBannerView : View {
                             #endif
                             showAdvertisement = false
                         } label: {
-                            Label("Dismiss advertisement", systemImage: "xmark.circle.fill")
-                                .labelStyle(.iconOnly)
-                                .font(.system(.title2, design: .rounded, weight: .bold))
-                                .symbolRenderingMode(.hierarchical)
-                                .imageScale(.large)
+#if os(visionOS)
+        Label("Dismiss advertisement", systemImage: "xmark")
+            .labelStyle(.iconOnly)
+            .font(.system(.title3, design: .rounded, weight: .bold))
+            .symbolRenderingMode(.hierarchical)
+#else
+        Label("Dismiss advertisement", systemImage: "xmark.circle.fill")
+            .labelStyle(.iconOnly)
+            .font(.system(.title2, design: .rounded, weight: .bold))
+            .symbolRenderingMode(.hierarchical)
+            .imageScale(.large)
+#endif
                         }
 #if !os(tvOS)
                         .controlSize(.large)
 #endif
+#if os(visionOS)
+
+                        #else
                         .tint(advert.tint)
+
+                        #endif
                     } else {
                         BillboardCountdownView(advert:advert,
                                                totalDuration: config.duration,

diff --git a/Sources/Views/BillboardTextView.swift b/Sources/Views/BillboardTextView.swift
@@ -42,10 +42,6 @@ struct BillboardTextView : View {
     }
 }
 
-struct BillboardTextView_Previews: PreviewProvider {
-    static var previews: some View {
-        DefaultAdView(advert: BillboardSamples.sampleDefaultAd)
-    }
+#Preview {
+    BillboardTextView(advert: BillboardSamples.sampleDefaultAd)
 }
-
-
diff --git a/Sources/Views/BillboardView.swift b/Sources/Views/BillboardView.swift
@@ -198,3 +198,13 @@ public struct BillboardView<Content:View>: View {
 #endif
 }
 
+
+#Preview {
+    BillboardView(advert: BillboardSamples.sampleDefaultAd) {
+        VStack {
+            Spacer()
+            BillboardBannerView(advert: BillboardSamples.sampleDefaultAd)
+            Spacer()
+        }
+    }
+}
diff --git a/Sources/Views/DefaultAdView.swift b/Sources/Views/DefaultAdView.swift
@@ -32,7 +32,9 @@ struct DefaultAdView : View {
             }
 
         }
-        .background(backgroundView)
+        .background {
+            backgroundView
+        }
     }
 
 
@@ -45,6 +47,9 @@ struct DefaultAdView : View {
                     ZStack {
                         advert.background
                             .ignoresSafeArea()
+#if os(visionOS)
+    .opacity(0.75)
+#endif
                         image
                             .resizable()
                             .opacity(0.1)
@@ -55,8 +60,9 @@ struct DefaultAdView : View {
 
 
                 default:
-                    Color(hex: advert.backgroundColor)
+                    advert.background
                         .ignoresSafeArea()
+
                 }
             })
         }