Fix example

oversizedev · Nov 11, 2024 · f14ba91 · f14ba91
1 parent 93712c8
commit f14ba91
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 15 deletions.
diff --git a/AppExample/Example.xcodeproj/project.pbxproj b/AppExample/Example.xcodeproj/project.pbxproj
@@ -621,12 +621,12 @@
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = UIInterfaceOrientationPortrait;
-				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 18.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 14.0;
+				MACOSX_DEPLOYMENT_TARGET = 15.0;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = app.oversize.Example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -636,7 +636,7 @@
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3";
-				TVOS_DEPLOYMENT_TARGET = 17.0;
+				TVOS_DEPLOYMENT_TARGET = 18.0;
 			};
 			name = Debug;
 		};
@@ -657,12 +657,12 @@
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = UIInterfaceOrientationPortrait;
-				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 18.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 14.0;
+				MACOSX_DEPLOYMENT_TARGET = 15.0;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = app.oversize.Example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -672,7 +672,7 @@
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3";
-				TVOS_DEPLOYMENT_TARGET = 17.0;
+				TVOS_DEPLOYMENT_TARGET = 18.0;
 			};
 			name = Release;
 		};

diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/AppExample/Example.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/xcschememanagement.plist b/AppExample/Example.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -12,7 +12,7 @@
 		<key>Example.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>0</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>

diff --git a/AppExample/Example/Screens/Onboarding/OnboardingView.swift b/AppExample/Example/Screens/Onboarding/OnboardingView.swift
@@ -35,11 +35,11 @@ struct OnboardingView: View {
                 VStack(spacing: .medium) {
                     Text("Welcome to\nExample")
                         .largeTitle()
-                        .onBackgroundHighEmphasisForegroundColor()
+                        .onBackgroundPrimaryForeground()
 
                     Text("Welcome text")
                         .title2(.semibold)
-                        .onBackgroundMediumEmphasisForegroundColor()
+                        .onBackgroundSecondaryForeground()
                 }
                 .paddingContent(.horizontal)
                 .multilineTextAlignment(.center)
@@ -81,11 +81,11 @@ struct OnboardingView: View {
                 VStack(spacing: .medium) {
                     Text("Welcome to\nExample")
                         .largeTitle()
-                        .onBackgroundHighEmphasisForegroundColor()
+                        .onBackgroundPrimaryForeground()
 
                     Text("Welcome text")
                         .title2(.semibold)
-                        .onBackgroundMediumEmphasisForegroundColor()
+                        .onBackgroundSecondaryForeground()
                 }
                 .paddingContent(.horizontal)
                 .multilineTextAlignment(.center)
@@ -123,11 +123,11 @@ struct OnboardingView: View {
                 VStack(spacing: .medium) {
                     Text("Example")
                         .largeTitle()
-                        .onBackgroundHighEmphasisForegroundColor()
+                        .onBackgroundPrimaryForeground()
 
                     Text("Welcome text")
                         .title2(.semibold)
-                        .onBackgroundMediumEmphasisForegroundColor()
+                        .onBackgroundSecondaryForeground()
                 }
                 .paddingContent(.horizontal)
                 .multilineTextAlignment(.center)

diff --git a/Sources/OversizeOnboardingKit/OnboardingView.swift b/Sources/OversizeOnboardingKit/OnboardingView.swift
@@ -96,8 +96,10 @@ public struct OnboardView<C, A>: View where A: View, C: View {
                 if let helpAction {
                     Button("Help", action: helpAction)
                         .help("Help")
+                    #if !os(tvOS)
                         .controlSize(.extraLarge)
                         .buttonStyle(.bordered)
+                    #endif
                 }
 
                 Spacer()
@@ -107,13 +109,17 @@ public struct OnboardView<C, A>: View where A: View, C: View {
                         "Back",
                         action: backAction
                     )
+                    #if !os(tvOS)
                     .controlSize(.extraLarge)
+                    #endif
                     .buttonStyle(.bordered)
                 }
 
                 actions
-                    .controlSize(.extraLarge)
-                    .buttonStyle(.borderedProminent)
+                #if !os(tvOS)
+                .controlSize(.extraLarge)
+                #endif
+                .buttonStyle(.borderedProminent)
             }
             .padding(.small)
             .background(Color.surfacePrimary)