New PhotosUI (#222)

FluidGroup · Feb 23, 2024 · a667587 · a667587
1 parent 6241538
commit a667587
Show file tree

Hide file tree

Showing 11 changed files with 715 additions and 376 deletions.
diff --git a/Dev/Brightroom.xcodeproj/project.pbxproj b/Dev/Brightroom.xcodeproj/project.pbxproj
@@ -73,6 +73,7 @@
 		4B98CCC325EFF31400E4F61F /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4B98CCC225EFF31400E4F61F /* Preview Assets.xcassets */; };
 		4B98CCE725EFF4EF00E4F61F /* Mocks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B98CCE625EFF4EF00E4F61F /* Mocks.swift */; };
 		4B98CF5325F0122000E4F61F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4B600B29216B7C9E001E1456 /* Assets.xcassets */; };
+		4BA2B1B42B86282D00E6DE64 /* BrightroomUIPhotosCrop in Frameworks */ = {isa = PBXBuildFile; productRef = 4BA2B1B32B86282D00E6DE64 /* BrightroomUIPhotosCrop */; };
 		4BA41C82260CE817005E6FA7 /* orientation_up_mirrored.HEIC in Resources */ = {isa = PBXBuildFile; fileRef = 4B254FEB260BB32600F77E9A /* orientation_up_mirrored.HEIC */; };
 		4BA41C83260CE817005E6FA7 /* orientation_right_mirrored.HEIC in Resources */ = {isa = PBXBuildFile; fileRef = 4B254FE7260BB32600F77E9A /* orientation_right_mirrored.HEIC */; };
 		4BA41C84260CE817005E6FA7 /* orientation_left_mirrored.HEIC in Resources */ = {isa = PBXBuildFile; fileRef = 4B254FE6260BB32600F77E9A /* orientation_left_mirrored.HEIC */; };
@@ -1062,6 +1063,7 @@
 				4B7513CB2B6BEE2100A4743E /* SwiftUISupport in Frameworks */,
 				FC06C87F2A53AF4500215B89 /* BrightroomEngine in Frameworks */,
 				4B7513C82B6BEDFD00A4743E /* SwiftUIHosting in Frameworks */,
+				4BA2B1B42B86282D00E6DE64 /* BrightroomUIPhotosCrop in Frameworks */,
 				4B5E72BC2B6B761800DE7A2A /* Reveal-SDK in Frameworks */,
 				FC06C8812A53AF4500215B89 /* BrightroomUI in Frameworks */,
 			);
@@ -1784,6 +1786,7 @@
 				4B7513C72B6BEDFD00A4743E /* SwiftUIHosting */,
 				4B7513CA2B6BEE2100A4743E /* SwiftUISupport */,
 				4B46E71A2B762E20003179C2 /* MondrianLayout */,
+				4BA2B1B32B86282D00E6DE64 /* BrightroomUIPhotosCrop */,
 			);
 			productName = SwiftUIDemo;
 			productReference = 4B98CCB925EFF31300E4F61F /* SwiftUIDemo.app */;
@@ -3006,6 +3009,10 @@
 			package = 4B7513C92B6BEE2100A4743E /* XCRemoteSwiftPackageReference "swiftui-support" */;
 			productName = SwiftUISupport;
 		};
+		4BA2B1B32B86282D00E6DE64 /* BrightroomUIPhotosCrop */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = BrightroomUIPhotosCrop;
+		};
 		FC06C87E2A53AF4500215B89 /* BrightroomEngine */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = BrightroomEngine;

diff --git a/Dev/Brightroom.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Dev/Brightroom.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -36,6 +36,15 @@
         "version" : "0.10.0"
       }
     },
+    {
+      "identity" : "precisionlevelslider",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/FluidGroup/PrecisionLevelSlider",
+      "state" : {
+        "revision" : "6a6d1cbe962225d097012f47038f536c72e26c91",
+        "version" : "2.0.2"
+      }
+    },
     {
       "identity" : "rxswift",
       "kind" : "remoteSourceControl",
@@ -131,8 +140,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/VergeGroup/Verge.git",
       "state" : {
-        "revision" : "a338c22b82c9a686a7131b54fa84ddad773f5c2a",
-        "version" : "12.0.0-beta.4"
+        "revision" : "790f1ef9af22f62fc7944f924ef4466dde071c2a",
+        "version" : "12.1.0"
       }
     }
   ],

diff --git a/Dev/Sources/SwiftUIDemo/ContentView.swift b/Dev/Sources/SwiftUIDemo/ContentView.swift
@@ -7,7 +7,8 @@ struct ContentView: View {
 
   @State private var fullScreenView: FullscreenIdentifiableView?
 
-  @State var stack = Mocks.makeEditingStack(image: Mocks.imageHorizontal())
+  @State var horizontalStack = Mocks.makeEditingStack(image: Mocks.imageHorizontal())
+  @State var verticalStack = Mocks.makeEditingStack(image: Mocks.imageVertical())
 
   var body: some View {
     NavigationView {
@@ -22,17 +23,33 @@ struct ContentView: View {
             }
           }
 
-          Section("Restoration") {
+          Section("Restoration Horizontal") {
             Button("Crop") {
               fullScreenView = .init {
-                DemoCropView(editingStack: { stack })
+                DemoCropView(editingStack: { horizontalStack })
               }
             }
 
             Button("Masking") {
               fullScreenView = .init {
                 DemoMaskingView {
-                  stack
+                  horizontalStack
+                }
+              }
+            }
+          }
+
+          Section("Restoration Vertical") {
+            Button("Crop") {
+              fullScreenView = .init {
+                DemoCropView(editingStack: { verticalStack })
+              }
+            }
+
+            Button("Masking") {
+              fullScreenView = .init {
+                DemoMaskingView {
+                  verticalStack
                 }
               }
             }