Make ProfileView look good on visionOS and in dark mode

StanfordSpezi · Feb 2, 2024 · dba8c2b · dba8c2b
1 parent ebb9e13
commit dba8c2b
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 16 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -25,23 +25,23 @@ jobs:
       scheme: SpeziViews-Package
   buildandtestwatchos:
     name: Build and Test Swift Package watchOS
-    uses: StanfordBDHG/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
+    uses: StanfordSpezi/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
     with:
       artifactname: SpeziViews-Package-watchOS.xcresult
       runsonlabels: '["macOS", "self-hosted"]'
       scheme: SpeziViews-Package
       destination: 'platform=watchOS Simulator,name=Apple Watch Series 9 (45mm)'
   buildandtestvisionos:
     name: Build and Test Swift Package visionOS
-    uses: StanfordBDHG/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
+    uses: StanfordSpezi/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
     with:
       artifactname: SpeziViews-Package-visionOS.xcresult
       runsonlabels: '["macOS", "self-hosted"]'
       scheme: SpeziViews-Package
       destination: 'platform=visionOS Simulator,name=Apple Vision Pro'
   buildandtesttvos:
     name: Build and Test Swift Package tvOS
-    uses: StanfordBDHG/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
+    uses: StanfordSpezi/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
     with:
       artifactname: SpeziViews-Package-tvOS.xcresult
       runsonlabels: '["macOS", "self-hosted"]'

diff --git a/Sources/SpeziPersonalInfo/UserProfileView.swift b/Sources/SpeziPersonalInfo/UserProfileView.swift
@@ -6,6 +6,7 @@
 // SPDX-License-Identifier: MIT
 //
 
+// TODO: support this on tvOS!
 #if !os(tvOS)
 import SwiftUI
 
@@ -16,9 +17,11 @@ public struct UserProfileView: View {
     private let imageLoader: () async -> Image?
 
     @State private var image: Image?
-
-
-    // TODO: doesnt look good on visionOS
+
+    @Environment(\.colorScheme)
+    private var colorScheme
+
+
     public var body: some View {
         GeometryReader { context in
             ZStack {
@@ -31,7 +34,7 @@ public struct UserProfileView: View {
                     Circle()
                         .foregroundColor(Color(.systemGray3))
                     Text(name.formatted(.name(style: .abbreviated)))
-                        .foregroundColor(.init(UIColor.systemBackground))
+                        .foregroundColor(colorScheme == .dark ? .secondary : Color(.systemBackground))
                         .font(
                             .system(
                                 size: min(context.size.height, context.size.width) * 0.45,
@@ -69,8 +72,8 @@ public struct UserProfileView: View {
     UserProfileView(
         name: PersonNameComponents(givenName: "Paul", familyName: "Schmiedmayer")
     )
-    .frame(width: 100, height: 100)
-    .padding()
+        .frame(width: 100, height: 100)
+        .padding()
 }
 
 #Preview {
@@ -82,10 +85,9 @@ public struct UserProfileView: View {
             familyName: "Aalami"
         )
     )
-    .frame(width: 100, height: 100)
-    .padding()
-    .background(Color(.systemBackground))
-    .colorScheme(.dark)
+        .frame(width: 100, height: 100)
+        .padding()
+        .preferredColorScheme(.dark)
 }
 
 #Preview {
@@ -96,9 +98,8 @@ public struct UserProfileView: View {
             return Image(systemName: "person.crop.circle")
         }
     )
-    .frame(width: 50, height: 100)
-    .padding()
+        .frame(width: 50, height: 100)
+        .padding()
 }
 #endif
 #endif
-
diff --git a/Tests/SpeziViewsTests/SnapshotTests.swift b/Tests/SpeziViewsTests/SnapshotTests.swift
@@ -30,6 +30,8 @@ final class SnapshotTests: XCTestCase {
 
         assertSnapshot(of: largeRow, as: .image(layout: .device(config: .iPhone13Pro)), named: "iphone-XA3")
         assertSnapshot(of: largeRow, as: .image(layout: .device(config: .iPadPro11)), named: "ipad-XA3")
+#elseif os(visionOS)
+
 #endif
     }
 }
diff --git a/Tests/UITests/TestApp/TestApp.entitlements.license b/Tests/UITests/TestApp/TestApp.entitlements.license
@@ -0,0 +1,5 @@
+This source file is part of the Stanford Spezi open-source project
+
+SPDX-FileCopyrightText: 2024 Stanford University and the project authors (see CONTRIBUTORS.md)
+
+SPDX-License-Identifier: MIT