From 548b4357f0d471309c55b26c346920255b01221e Mon Sep 17 00:00:00 2001 From: Vishnu Ravi Date: Tue, 28 Jan 2025 19:19:31 -0500 Subject: [PATCH 1/2] Change the Spezi icon in Onboarding to a star --- CS342ExampleApplication/Onboarding/Welcome.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CS342ExampleApplication/Onboarding/Welcome.swift b/CS342ExampleApplication/Onboarding/Welcome.swift index 17a42f3..1cf05b5 100644 --- a/CS342ExampleApplication/Onboarding/Welcome.swift +++ b/CS342ExampleApplication/Onboarding/Welcome.swift @@ -21,7 +21,7 @@ struct Welcome: View { areas: [ OnboardingInformationView.Content( icon: { - Image(systemName: "apps.iphone") + Image(systemName: "staroflife.fill") .accessibilityHidden(true) }, title: "The Spezi Framework", From 16c546b242c387f0fa64126e39deb6edbf777dd9 Mon Sep 17 00:00:00 2001 From: Vishnu Ravi Date: Tue, 28 Jan 2025 20:51:57 -0500 Subject: [PATCH 2/2] Resolving merge conflict about icons --- CS342ExampleApplication/Onboarding/Welcome.swift | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CS342ExampleApplication/Onboarding/Welcome.swift b/CS342ExampleApplication/Onboarding/Welcome.swift index 0a3af96..3efd3bf 100644 --- a/CS342ExampleApplication/Onboarding/Welcome.swift +++ b/CS342ExampleApplication/Onboarding/Welcome.swift @@ -21,11 +21,7 @@ struct Welcome: View { areas: [ OnboardingInformationView.Content( icon: { -<<<<<<< HEAD Image(systemName: "staroflife.fill") -======= - Image(systemName: "cat.fill") ->>>>>>> c01cd8b3f4215dcbe9a6803691bc60de14e8af8d .accessibilityHidden(true) }, title: "Cats are great!",