dev: Add drag and drop, fixes and review are still needed

PB/third-party/osx/skia/x86_64/all.xcodeproj/xcuserdata/cosminmihai.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,12 +7,12 @@
 		<key>All.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>0</integer>
 		</dict>
 		<key>sources.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>0</integer>
+			<integer>1</integer>
 		</dict>
 	</dict>
 </dict>

osx/PhotoBook/PhotoBook.xcodeproj/xcuserdata/cosminmihai.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>PhotoBook.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>2</integer>
 		</dict>
 	</dict>
 </dict>

osx/PhotoBook/PhotoBook/Media/MediaList.swift

@@ -27,6 +27,15 @@ class MediaListModel: ObservableObject
             self.photobook.removeImportFolder(selectedItem?.path)
         }
     }
+
+    public func selectedIndex() -> UInt?
+    {
+        if let index = list.firstIndex(where: {$0.path == selectedItem?.path})
+        {
+            return UInt(index)
+        }
+        return nil
+    }
 }
 
 struct MediaList: View

osx/PhotoBook/PhotoBook/Pages/DashboardView.swift

@@ -155,4 +155,6 @@ struct DashboardView: View, PhotobookUIListener {
     func onImageUpdated(root: String, row:UInt, index:UInt){}
 
     func onCollageThumbnailsCreated(){}
+
+    func onImageMapped(imageId: String, image: FrontendImage){}
 }

osx/PhotoBook/PhotoBook/Pages/PhotoBookApp.swift

@@ -35,6 +35,11 @@ private var noirUIListener: [NoirUIListener] = []
     {
         photobookUIListener.last?.onCollageThumbnailsCreated()
     }
+
+    func onImageMapped(_ imageId: String, image: FrontendImage)
+    {
+        photobookUIListener.last?.onImageMapped(imageId:imageId, image: image)
+    }
 }
 
 @objc extension NoirListenerWrapperCLevel
@@ -107,6 +112,7 @@ struct PhotoBookApp: App, PhotobookUIListener, NoirUIListener {
     func onMappingFinished(root: String) {}
     func onImageUpdated(root: String, row:UInt, index:UInt){}
     func onCollageThumbnailsCreated(){}
+    func onImageMapped(imageId: String, image: FrontendImage){}
     func onNoirLutAdded(item:LutItem) {
         lutGridModel.images.append(item)
     }

osx/PhotoBook/PhotoBook/Pages/TableContentView.swift

@@ -6,6 +6,7 @@
 //
 
 import SwiftUI
+import UniformTypeIdentifiers
 
 struct TableContentView: View, PhotobookUIListener {
     @State private var navigateToDashboard = false
@@ -18,6 +19,7 @@ struct TableContentView: View, PhotobookUIListener {
     @State private var showImportMediaPicker = false
 
     @State private var uplModel: UnstagedPhotoLineModel = UnstagedPhotoLineModel()
+    @State private var splModel: StagedPhotoLineModel = StagedPhotoLineModel()
 
     @State private var mediaListModel: MediaListModel
 
@@ -264,17 +266,55 @@ struct TableContentView: View, PhotobookUIListener {
                 VStack {
                     ScrollView(.horizontal, showsIndicators: false) {
                         HStack {
-
+                            StagedPhotoLine(model: splModel, canvasImage: $canvasModel.mainImage)
+                        }
+                        .frame(width:geometry.size.width, height: 80)
+                        .border(Color.BorderColor, width: 1)
+                        .onDrop(of: [.text], isTargeted: nil) { providers in
+                            guard let provider = providers.first else { return false}
+                            if provider.hasItemConformingToTypeIdentifier(UTType.plainText.identifier) {
+                                provider.loadDataRepresentation(forTypeIdentifier: UTType.plainText.identifier) { data, error in
+                                    if let data = data {
+                                        do {
+                                            let uplIdentifier = try self.decodeData(data)
+                                            var images: [String: FrontendImage] = [:]
+                                            for index in uplIdentifier.indices
+                                            {
+                                                if let row = uplIdentifier.row
+                                                {
+                                                    let image = self.photobook.projectManagementService().unstagedImagesRepo().image(UInt32(row), index:UInt32(index))
+
+                                                    let uuid = UUID()
+                                                    images[uuid.uuidString] = image
+                                                }
+                                                else
+                                                {
+                                                    assert(false, "Unreachable code")
+                                                }
+                                            }
+                                            self.photobook.mapImages(toSPL: images)
+
+                                        } catch {
+                                            print("Failed to decode dropped data: \(error)")
+                                        }
+                                    } else if let error = error {
+                                        assert(false, "Unreachable code \(error)")
+                                    }
+                                    else
+                                    {
+                                        assert(false, "Unreachable code")
+                                    }
+                                }
+                            }
+                            print("Item dropped")
+                            return true
                         }
-                        .padding(.horizontal)
-                        .frame(minHeight:80)
                     }
 
-                    UnstagedPhotoLine(model: uplModel, canvasImage: $canvasModel.mainImage)
+                    UnstagedPhotoLine(model: uplModel, canvasImage: $canvasModel.mainImage, mediaListModel: $mediaListModel)
 
                 }
                 .frame(height: geometry.size.height * 0.3)
-                .border(Color.BorderColor, width: 1)
             }
         }
         .onAppear()
@@ -291,6 +331,11 @@ struct TableContentView: View, PhotobookUIListener {
         .background(Color.PrimaryColor)
 
     }
+    func decodeData(_ data: Data) throws -> UPLIdentifier {
+        let decoder = JSONDecoder()
+        let decoded = try decoder.decode(UPLIdentifier.self, from: data)
+        return decoded
+    }
 
     func onProjectRead(){}
     func onMetadataUpdated(focusedName: String){}
@@ -337,5 +382,10 @@ struct TableContentView: View, PhotobookUIListener {
             }
         }
     }
+
+    func onImageMapped(imageId: String, image: FrontendImage)
+    {
+        self.splModel.list.append(image)
+    }
 }
 

osx/PhotoBook/PhotoBook/Photobook.h

@@ -11,6 +11,7 @@
 #include "PaperSettings.h"
 #include "CollageItem.h"
 #include "LutItem.h"
+#include "FrontendImage.h"
 #include "ProjectMetadataEntry.h"
 #include "ProjectManagementService.h"
 
@@ -20,6 +21,7 @@
 - (void)onMappingFinished:(NSString*)root;
 - (void)onImageUpdated:(NSString*)root row:(unsigned)row index:(unsigned)index;
 - (void)onCollageThumbnailsCreated;
+- (void)onImageMapped:(NSString*)imageId image:(FrontendImage*)image;
 @end
 
 @interface NoirListenerWrapperCLevel: NSObject
@@ -45,6 +47,7 @@
 - (void) addImportFolder:(NSString*)root;
 - (void) removeImportFolder:(NSString*)root;
 - (NSArray<CollageItem*>*) collageTemplatesThumbnailsList;
+- (void) mapImagesToSPL:(NSDictionary<NSString*, FrontendImage*>*)images;
 @end
 
 #endif /* Photobook_h */

osx/PhotoBook/PhotoBook/Photobook.mm

@@ -7,6 +7,7 @@
 #import <Foundation/Foundation.h>
 
 #include <memory>
+#include <unordered_map>
 
 #include <pb/PhotoBook.h>
 #include <pb/entities/LutIconInfo.h>
@@ -80,8 +81,14 @@ void post(std::function<void()> f) override {
         });
     }
     void onCollageCreated(unsigned index, PB::GenericImagePtr newImage) override {}
-    void onImageMapped(PBDev::ImageToPaperId id,
-                       PB::GenericImagePtr       image) override {}
+    void onImageMapped(PBDev::ImageToPaperId imageId,
+                       PB::GenericImagePtr       image) override {
+        std::string imageIdStr = boost::uuids::to_string(*imageId);
+        NSString* managedImageId = [NSString stringWithUTF8String:imageIdStr.c_str()];
+
+        auto managedImage = [[FrontendImage alloc] initWithCpp:image];
+        [&mManagedListener onImageMapped:managedImageId image:managedImage];
+    }
     void onProgressUpdate(PB::ProgressStatus status) override {}
 
     [[deprecated]]
@@ -212,4 +219,30 @@ - (void) removeImportFolder:(NSString*)root
     return [list copy];
 }
 
+- (void) mapImagesToSPL:(NSDictionary<NSString*, FrontendImage*>*)images
+{
+    auto imageToPaperService = mPhotobook->imageToPaperService();
+
+    std::unordered_map<PBDev::ImageToPaperId, PB::GenericImagePtr,
+                         boost::hash<PBDev::ImageToPaperId>>
+          backendMap;
+
+    for (NSString *key in images) {
+        std::string uuidStr = [key UTF8String];
+        try {
+            boost::uuids::string_generator gen;
+            boost::uuids::uuid nativeUuid = gen(uuidStr);
+
+            PBDev::ImageToPaperId imageId = PBDev::ImageToPaperId(nativeUuid);
+
+            backendMap[imageId] = [images[key] unwrap];
+
+        } catch (const std::exception& e) {
+        }
+    }
+
+    imageToPaperService->map(
+          PBDev::ImageToPaperServiceId(PB::RuntimeUUID::newUUID()), backendMap);
+}
+
 @end

osx/PhotoBook/PhotoBook/PhotobookUIListener.swift

@@ -12,4 +12,5 @@ protocol PhotobookUIListener
     func onMappingFinished(root: String)
     func onImageUpdated(root: String, row:UInt, index:UInt)
     func onCollageThumbnailsCreated()
+    func onImageMapped(imageId: String, image: FrontendImage)
 }

osx/PhotoBook/PhotoBook/SPL/StagedPhotoLine.swift

@@ -0,0 +1,50 @@
+//
+//  StagedPhotoLine.swift
+//  PhotoBook
+//
+//  Created by Cosmin Mihai on 29.01.2025.
+//
+
+import SwiftUI
+
+class StagedPhotoLineModel: ObservableObject
+{
+    @Published public var list: [FrontendImage] = []
+}
+
+struct StagedPhotoLine: View
+{
+    @ObservedObject var model: StagedPhotoLineModel
+    @Binding var canvasImage: FrontendImage?
+    @State var selectedIndex: Int = -1
+
+    var body: some View {
+        ScrollView(.horizontal, showsIndicators: false) {
+            HStack {
+                ForEach(self.model.list.indices, id: \.self) { index in
+                    if let fileName = self.model.list[index].resources().small
+                    {
+                        if let nsImage = NSImage(contentsOfFile: fileName) {
+                            Image(nsImage: nsImage)
+                                .cornerRadius(10)
+                                .frame(height: 80)
+                                .overlay(
+                                    RoundedRectangle(cornerRadius: 10)
+                                        .stroke(selectedIndex == index ? Color.yellow : Color.clear, lineWidth: 3)
+                                )
+                                .onTapGesture {
+                                    self.canvasImage = model.list[index]
+                                    selectedIndex = index
+                                }
+                        } else {
+                            Text("Image not found")
+                        }
+                    }
+                }
+            }
+            .padding(.horizontal)
+            .frame(minHeight:80)
+            .border(Color.BorderColor, width: 1)
+        }
+    }
+}

osx/PhotoBook/PhotoBook/UPL/UPLIdentifier.swift

@@ -0,0 +1,37 @@
+//
+//  UPLIdentifier.swift
+//  PhotoBook
+//
+//  Created by Cosmin Mihai on 26.01.2025.
+//
+
+import SwiftUI
+import UniformTypeIdentifiers
+
+class UPLIdentifier: NSObject, Identifiable, NSItemProviderWriting, Encodable, Decodable
+{
+    public var id = UUID()
+    public var row:UInt?;
+    public var indices:[UInt];
+
+    init(row:UInt?, indices:[UInt])
+    {
+        self.row = row
+        self.indices = indices
+    }
+
+    static var writableTypeIdentifiersForItemProvider: [String] {
+        return [UTType.plainText.identifier]
+    }
+
+    func loadData(withTypeIdentifier typeIdentifier: String, forItemProviderCompletionHandler completionHandler: @escaping @Sendable (Data?, (any Error)?) -> Void) -> Progress? {
+        do {
+            let encoder = JSONEncoder()
+            let dataToReturn = try encoder.encode(self)
+            completionHandler(dataToReturn, nil)
+        } catch {
+            completionHandler(nil, error)
+        }
+        return Progress(totalUnitCount: 100)
+    }
+}

osx/PhotoBook/PhotoBook/UPL/UnstagedPhotoLine.swift

@@ -16,6 +16,7 @@ struct UnstagedPhotoLine: View
 {
     @ObservedObject var model: UnstagedPhotoLineModel
     @Binding var canvasImage: FrontendImage?
+    @Binding var mediaListModel: MediaListModel
     @State var selectedIndex: Int = -1
 
     var body: some View {
@@ -36,6 +37,9 @@ struct UnstagedPhotoLine: View
                                     self.canvasImage = model.list[index]
                                     selectedIndex = index
                                 }
+                                .onDrag {
+                                    NSItemProvider(object: UPLIdentifier(row:mediaListModel.selectedIndex(), indices:[UInt(index)]))
+                                }
                         } else {
                             Text("Image not found")
                         }
@@ -44,6 +48,7 @@ struct UnstagedPhotoLine: View
             }
             .padding(.horizontal)
             .frame(minHeight:80)
+            .border(Color.BorderColor, width: 1)
         }
     }
 }

osx/PhotoBook/PhotoBook/Wrappers/FrontendImage/FrontendImage.h

@@ -27,6 +27,9 @@ typedef NS_ENUM(NSInteger, VirtualImageType) {
 #endif
 - (VirtualImageType)imageType;
 - (FrontendImageResources*)resources;
+#if __cplusplus
+- (PB::GenericImagePtr)unwrap;
+#endif
 @end
 
 

osx/PhotoBook/PhotoBook/Wrappers/FrontendImage/FrontendImage.mm

@@ -6,6 +6,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>
 
 #include "FrontendImage.h"
 
@@ -34,4 +35,9 @@ - (FrontendImageResources*)resources
     return frontendImage;
 }
 
+- (PB::GenericImagePtr)unwrap
+{
+    return cppImage;
+}
+
 @end