Merge branch 'release/4.0.1'

SRGSSR · Sep 22, 2021 · 4754703 · 4754703
2 parents fe65fea + d65c380
commit 4754703
Show file tree

Hide file tree

Showing 15 changed files with 172 additions and 86 deletions.
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/SRGAppearance.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/SRGAppearance.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Demo/Demo.xcconfig b/Demo/Demo.xcconfig
@@ -1,5 +1,5 @@
 // Version information
-MARKETING_VERSION = 4.0.0
+MARKETING_VERSION = 4.0.1
 
 // Deployment targets
 IPHONEOS_DEPLOYMENT_TARGET = 12.0

diff --git a/Demo/Info.plist b/Demo/Info.plist
@@ -43,5 +43,22 @@
 	</array>
 	<key>UIUserInterfaceStyle</key>
 	<string>Automatic</string>
+	<key>UIApplicationSceneManifest</key>
+	<dict>
+		<key>UIApplicationSupportsMultipleScenes</key>
+		<true/>
+		<key>UISceneConfigurations</key>
+		<dict>
+			<key>UIWindowSceneSessionRoleApplication</key>
+			<array>
+				<dict>
+					<key>UISceneConfigurationName</key>
+					<string>Default</string>
+					<key>UISceneDelegateClassName</key>
+					<string>SceneDelegate</string>
+				</dict>
+			</array>
+		</dict>
+	</dict>
 </dict>
 </plist>
diff --git a/Demo/SRGAppearance-demo.xcodeproj/project.pbxproj b/Demo/SRGAppearance-demo.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		6F052B5326DFAE3800855BB0 /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 6F052B5226DFAE3700855BB0 /* SceneDelegate.m */; };
 		6F0EE5882316B40500328674 /* Resources.m in Sources */ = {isa = PBXBuildFile; fileRef = 6F0EE5872316B40500328674 /* Resources.m */; };
 		6F9453D5223FF5890039974F /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6F9453D4223FF5890039974F /* Images.xcassets */; };
 		6FC82AD424C5AA4100459101 /* SRGAppearance in Frameworks */ = {isa = PBXBuildFile; productRef = 6FC82AD324C5AA4100459101 /* SRGAppearance */; };
@@ -21,6 +22,8 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		6F052B5126DFAE3700855BB0 /* SceneDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SceneDelegate.h; sourceTree = "<group>"; };
+		6F052B5226DFAE3700855BB0 /* SceneDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SceneDelegate.m; sourceTree = "<group>"; };
 		6F0EE5822316AE8B00328674 /* Demo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Demo.xcconfig; sourceTree = "<group>"; };
 		6F0EE5862316B40500328674 /* Resources.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Resources.h; sourceTree = "<group>"; };
 		6F0EE5872316B40500328674 /* Resources.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Resources.m; sourceTree = "<group>"; };
@@ -108,6 +111,8 @@
 				6FE08CBD1E8A86FB00EC4716 /* AppDelegate.h */,
 				6FE08CBE1E8A86FB00EC4716 /* AppDelegate.m */,
 				6FE08CBF1E8A86FB00EC4716 /* main.m */,
+				6F052B5126DFAE3700855BB0 /* SceneDelegate.h */,
+				6F052B5226DFAE3700855BB0 /* SceneDelegate.m */,
 			);
 			path = Application;
 			sourceTree = "<group>";
@@ -165,7 +170,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = SRG;
-				LastUpgradeCheck = 1250;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "SRG SSR";
 				TargetAttributes = {
 					6FE08C5E1E8A865800EC4716 = {
@@ -215,6 +220,7 @@
 				6FE08CC61E8A877200EC4716 /* FontsViewController.m in Sources */,
 				6FE48649260B515C00671546 /* PlaygroundView.swift in Sources */,
 				6F0EE5882316B40500328674 /* Resources.m in Sources */,
+				6F052B5326DFAE3800855BB0 /* SceneDelegate.m in Sources */,
 				6FE08CC31E8A86FB00EC4716 /* main.m in Sources */,
 				6FE48639260B292E00671546 /* PlaygroundViewController~ios.m in Sources */,
 				6FE08CC21E8A86FB00EC4716 /* AppDelegate.m in Sources */,

diff --git a/Demo/SRGAppearance-demo.xcodeproj/xcshareddata/xcschemes/SRGAppearance-demo.xcscheme b/Demo/SRGAppearance-demo.xcodeproj/xcshareddata/xcschemes/SRGAppearance-demo.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Demo/Sources/Application/AppDelegate.m b/Demo/Sources/Application/AppDelegate.m
@@ -12,12 +12,20 @@ @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
-    self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-    [self.window makeKeyAndVisible];
-
-    FontsViewController *fontsViewController = [[FontsViewController alloc] init];
-    self.window.rootViewController = [[UINavigationController alloc] initWithRootViewController:fontsViewController];
+    if (@available(iOS 13, tvOS 13, *)) {}
+    else {
+        self.window = [[UIWindow alloc] initWithFrame:UIScreen.mainScreen.bounds];
+        [self.window makeKeyAndVisible];
+
+        FontsViewController *fontsViewController = [[FontsViewController alloc] init];
+        self.window.rootViewController = [[UINavigationController alloc] initWithRootViewController:fontsViewController];
+    }
     return YES;
 }
 
+- (UISceneConfiguration *)application:(UIApplication *)application configurationForConnectingSceneSession:(UISceneSession *)connectingSceneSession options:(UISceneConnectionOptions *)options API_AVAILABLE(ios(13.0))
+{
+    return [[UISceneConfiguration alloc] initWithName:@"Default" sessionRole:connectingSceneSession.role];
+}
+
 @end
diff --git a/Demo/Sources/Application/SceneDelegate.h b/Demo/Sources/Application/SceneDelegate.h
@@ -0,0 +1,18 @@
+//
+//  Copyright (c) SRG SSR. All rights reserved.
+//
+//  License information is available from the LICENSE file.
+//
+
+@import UIKit;
+
+NS_ASSUME_NONNULL_BEGIN
+
+API_AVAILABLE(ios(13.0))
+@interface SceneDelegate : UIResponder <UIWindowSceneDelegate>
+
+@property (nonatomic) UIWindow *window;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/Demo/Sources/Application/SceneDelegate.m b/Demo/Sources/Application/SceneDelegate.m
@@ -0,0 +1,25 @@
+//
+//  Copyright (c) SRG SSR. All rights reserved.
+//
+//  License information is available from the LICENSE file.
+//
+
+#import "SceneDelegate.h"
+
+#import "FontsViewController.h"
+
+@implementation SceneDelegate
+
+- (void)scene:(UIScene *)scene willConnectToSession:(UISceneSession *)session options:(UISceneConnectionOptions *)connectionOptions
+{
+    if ([scene isKindOfClass:UIWindowScene.class]) {
+        UIWindowScene *windowScene = (UIWindowScene *)scene;
+        self.window = [[UIWindow alloc] initWithWindowScene:windowScene];
+        [self.window makeKeyAndVisible];
+
+        FontsViewController *fontsViewController = [[FontsViewController alloc] init];
+        self.window.rootViewController = [[UINavigationController alloc] initWithRootViewController:fontsViewController];
+    }
+}
+
+@end
diff --git a/Demo/Sources/Fonts/PlaygroundView.swift b/Demo/Sources/Fonts/PlaygroundView.swift
@@ -13,7 +13,7 @@ import SwiftUI
 class PlaygroundHostViewController: UIViewController {
     override func loadView() {
         let view = UIView(frame: UIScreen.main.bounds)
-        view.backgroundColor = .white
+        view.backgroundColor = .systemBackground
         self.view = view
     }
 
@@ -31,7 +31,7 @@ class PlaygroundHostViewController: UIViewController {
                 hostView.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor),
                 hostView.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor),
                 hostView.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor),
-                hostView.bottomAnchor.constraint(equalTo: view.safeAreaLayoutGuide.bottomAnchor)
+                hostView.bottomAnchor.constraint(equalTo: view.bottomAnchor)
             ])
         }