Skip to content

Fix demo compatibility after Storybook update #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
muukii merged 1 commit into from
Oct 4, 2026
Merged

Fix demo compatibility after Storybook update #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions Development/FluidInterfaceKit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
F182100300000001A0000002 /* DemoGridView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F182100300000001A0000001 /* DemoGridView.swift */; };
4B01AFE1281939CB00A44537 /* DemoSheetViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B01AFE0281939CB00A44537 /* DemoSheetViewController.swift */; };
4B2AFC4A2A7EBF05001B5BEF /* FluidGesture in Frameworks */ = {isa = PBXBuildFile; productRef = 4B2AFC492A7EBF05001B5BEF /* FluidGesture */; };
4B2AFC4C2A7EC243001B5BEF /* DemoDragViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B2AFC4B2A7EC243001B5BEF /* DemoDragViewController.swift */; };
Expand Down Expand Up @@ -54,7 +55,6 @@
4BC726342992679F0074A828 /* SwiftUISupport in Frameworks */ = {isa = PBXBuildFile; productRef = 4BC726332992679F0074A828 /* SwiftUISupport */; };
4BC7B20D284E3C7F0087BC7A /* DemoPictureInPictureCoolController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BC7B20C284E3C7F0087BC7A /* DemoPictureInPictureCoolController.swift */; };
4BC8F5F427B6B02300095412 /* StorybookKit in Frameworks */ = {isa = PBXBuildFile; productRef = 4BC8F5F327B6B02300095412 /* StorybookKit */; };
4BC8F5F627B6B02300095412 /* StorybookUI in Frameworks */ = {isa = PBXBuildFile; productRef = 4BC8F5F527B6B02300095412 /* StorybookUI */; };
4BDDD3CE28DB627500452B7D /* CompositionKit in Frameworks */ = {isa = PBXBuildFile; productRef = 4BDDD3CD28DB627500452B7D /* CompositionKit */; };
4BDDF269277F50C100636B00 /* MondrianLayout in Frameworks */ = {isa = PBXBuildFile; productRef = 4BDDF268277F50C100636B00 /* MondrianLayout */; };
4BFB8FA22AD90E8100F0048D /* FluidPictureInPicture in Frameworks */ = {isa = PBXBuildFile; productRef = 4BFB8FA12AD90E8100F0048D /* FluidPictureInPicture */; };
Expand All @@ -72,6 +72,8 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
F182100300000001A0000003 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
F182100300000001A0000001 /* DemoGridView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoGridView.swift; sourceTree = "<group>"; };
4B01AFE0281939CB00A44537 /* DemoSheetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoSheetViewController.swift; sourceTree = "<group>"; };
4B2AFC4B2A7EC243001B5BEF /* DemoDragViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoDragViewController.swift; sourceTree = "<group>"; };
4B2F619427B818E800363580 /* DemoListContainerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DemoListContainerViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -147,7 +149,6 @@
4BBDECE0276648FD00982229 /* CompositionKit in Frameworks */,
4BDDD3CE28DB627500452B7D /* CompositionKit in Frameworks */,
4B658D0F276A59F700A17878 /* Wrap in Frameworks */,
4BC8F5F627B6B02300095412 /* StorybookUI in Frameworks */,
4BDDF269277F50C100636B00 /* MondrianLayout in Frameworks */,
4B2AFC4A2A7EBF05001B5BEF /* FluidGesture in Frameworks */,
4BB5B31C277077EA00EE1028 /* MockKit in Frameworks */,
Expand Down Expand Up @@ -190,6 +191,8 @@
4B46805F279C58E800625FCB /* DemoApplicationViewController.swift */,
4B7410B827ACE975003D8AB5 /* DemoCompositionOrderViewController.swift */,
4B46805C279C58E800625FCB /* DemoContextMenuViewController.swift */,
F182100300000001A0000001 /* DemoGridView.swift */,
F182100300000001A0000003 /* Info.plist */,
4B46804F279C58E800625FCB /* DemoControlCenterViewController.swift */,
4B2F619427B818E800363580 /* DemoListContainerViewController.swift */,
4B468052279C58E800625FCB /* DemoPictureInPictureController.swift */,
Expand Down Expand Up @@ -325,7 +328,6 @@
4BB5B31B277077EA00EE1028 /* MockKit */,
4BDDF268277F50C100636B00 /* MondrianLayout */,
4BC8F5F327B6B02300095412 /* StorybookKit */,
4BC8F5F527B6B02300095412 /* StorybookUI */,
4BDDD3CD28DB627500452B7D /* CompositionKit */,
4BC726332992679F0074A828 /* SwiftUISupport */,
4B2AFC492A7EBF05001B5BEF /* FluidGesture */,
Expand Down Expand Up @@ -461,6 +463,7 @@
4B33622B2B0FBABA00A7D094 /* Color.swift in Sources */,
4B468067279C58E800625FCB /* DemoThreadsMessagesViewController.swift in Sources */,
4B468072279C58E800625FCB /* DemoContextMenuViewController.swift in Sources */,
F182100300000001A0000002 /* DemoGridView.swift in Sources */,
4BC7B20D284E3C7F0087BC7A /* DemoPictureInPictureCoolController.swift in Sources */,
4B2F619527B818E800363580 /* DemoListContainerViewController.swift in Sources */,
4B468065279C58E800625FCB /* RootContainerViewController.swift in Sources */,
Expand Down Expand Up @@ -674,7 +677,8 @@
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 18.0;
INFOPLIST_FILE = "Sources/FluidInterfaceKit-Demo/Info.plist";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -703,7 +707,8 @@
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 18.0;
INFOPLIST_FILE = "Sources/FluidInterfaceKit-Demo/Info.plist";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -853,7 +858,7 @@
repositoryURL = "https://github.com/FluidGroup/swiftui-hosting.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 2.3.0;
minimumVersion = 3.0.0;
};
};
4BFFBFD22AD6C1ED0028A73B /* XCRemoteSwiftPackageReference "StackScrollView" */ = {
Expand Down Expand Up @@ -916,11 +921,6 @@
package = 4BC8F5F227B6B02300095412 /* XCRemoteSwiftPackageReference "Storybook-ios" */;
productName = StorybookKit;
};
4BC8F5F527B6B02300095412 /* StorybookUI */ = {
isa = XCSwiftPackageProductDependency;
package = 4BC8F5F227B6B02300095412 /* XCRemoteSwiftPackageReference "Storybook-ios" */;
productName = StorybookUI;
};
4BDDD3CD28DB627500452B7D /* CompositionKit */ = {
isa = XCSwiftPackageProductDependency;
package = 4BDDD3CC28DB627500452B7D /* XCRemoteSwiftPackageReference "CompositionKit" */;
Expand Down
96 changes: 12 additions & 84 deletions ...ent/FluidInterfaceKit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions Development/Sources/FluidInterfaceKit-Demo/AnimatorPlaygroundViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ import MondrianLayout
import Ne
import UIKit

// Internal animation dumps are available only when FluidStack enables testing.
#if DEBUG
@testable import FluidStack
#else
import FluidStack
#endif

final class AnimatorPlaygroundViewController: UIViewController {

Expand Down Expand Up @@ -83,7 +88,9 @@ final class AnimatorPlaygroundViewController: UIViewController {

animator.startAnimation()
}
#if DEBUG
view.layer.dumpAllAnimations()
#endif
}
}
.viewBlock
Expand All @@ -98,7 +105,9 @@ final class AnimatorPlaygroundViewController: UIViewController {
view.layer.add(e, forKey: i)
}

#if DEBUG
view.layer.dumpAllAnimations()
#endif
}
}
.viewBlock
Expand Down Expand Up @@ -134,7 +143,9 @@ final class AnimatorPlaygroundViewController: UIViewController {
}
a.startAnimation()

#if DEBUG
box1.layer.dumpAllAnimations()
#endif

state.alphaFlag.toggle()

Expand All @@ -159,7 +170,9 @@ final class AnimatorPlaygroundViewController: UIViewController {
}


#if DEBUG
box2.layer.dumpAllAnimations()
#endif

state.positionFlag.toggle()

Expand Down
16 changes: 13 additions & 3 deletions Development/Sources/FluidInterfaceKit-Demo/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,29 @@ import UIKit
@_exported import MockKit
@_exported import Ne

/// Provides the application's entry point; each scene owns its demo window.
@main
final class AppDelegate: UIResponder, UIApplicationDelegate {
}

/// Creates and retains the catalog window for the connected UIKit scene.
final class SceneDelegate: UIResponder, UIWindowSceneDelegate {

var window: UIWindow?

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
func scene(
_ scene: UIScene,
willConnectTo session: UISceneSession,
options connectionOptions: UIScene.ConnectionOptions
) {

guard let windowScene = scene as? UIWindowScene else { return }

let newWindow = UIWindow()
let newWindow = UIWindow(windowScene: windowScene)
newWindow.rootViewController = RootContainerViewController()
newWindow.tintColor = .systemBlue//.neon(.violet)
newWindow.makeKeyAndVisible()
self.window = newWindow
return true
}

}
Loading
Loading