ui: Allow multiple selection.

cosmin42 · Feb 1, 2025 · 33fa93f · 33fa93f
1 parent 6e02e67
commit 33fa93f
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/...86_64/all.xcodeproj/xcuserdata/cosminmihai.xcuserdatad/xcschemes/xcschememanagement.plist b/...86_64/all.xcodeproj/xcuserdata/cosminmihai.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,12 +7,12 @@
 		<key>All.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>0</integer>
+			<integer>1</integer>
 		</dict>
 		<key>sources.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>2</integer>
 		</dict>
 	</dict>
 </dict>

diff --git a/...PhotoBook.xcodeproj/xcuserdata/cosminmihai.xcuserdatad/xcschemes/xcschememanagement.plist b/...PhotoBook.xcodeproj/xcuserdata/cosminmihai.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
 		<key>PhotoBook.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>0</integer>
 		</dict>
 	</dict>
 </dict>

diff --git a/osx/PhotoBook/PhotoBook/SPL/StagedPhotoLine.swift b/osx/PhotoBook/PhotoBook/SPL/StagedPhotoLine.swift
@@ -16,7 +16,7 @@ struct StagedPhotoLine: View
 {
     @ObservedObject var model: StagedPhotoLineModel
     @Binding var canvasImage: FrontendImage?
-    @State var selectedIndex: Int = -1
+    @State var selectedIndices: [Int] = []
 
     var body: some View {
         ScrollView(.horizontal, showsIndicators: false) {
@@ -30,11 +30,18 @@ struct StagedPhotoLine: View
                                 .frame(height: 80)
                                 .overlay(
                                     RoundedRectangle(cornerRadius: 10)
-                                        .stroke(selectedIndex == index ? Color.yellow : Color.clear, lineWidth: 3)
+                                        .stroke(selectedIndices.contains(index) ? Color.yellow : Color.clear, lineWidth: 3)
                                 )
                                 .onTapGesture {
                                     self.canvasImage = model.list[index]
-                                    selectedIndex = index
+                                    if selectedIndices.contains(index)
+                                    {
+                                        selectedIndices.removeAll { $0 == index }
+                                    }
+                                    else
+                                    {
+                                        selectedIndices.append(index)
+                                    }
                                 }
                         } else {
                             Text("Image not found")

diff --git a/osx/PhotoBook/PhotoBook/UPL/UnstagedPhotoLine.swift b/osx/PhotoBook/PhotoBook/UPL/UnstagedPhotoLine.swift
@@ -17,7 +17,7 @@ struct UnstagedPhotoLine: View
     @ObservedObject var model: UnstagedPhotoLineModel
     @Binding var canvasImage: FrontendImage?
     @Binding var mediaListModel: MediaListModel
-    @State var selectedIndex: Int = -1
+    @State var selectedIndices: [Int] = []
 
     var body: some View {
         ScrollView(.horizontal, showsIndicators: false) {
@@ -31,11 +31,18 @@ struct UnstagedPhotoLine: View
                                 .frame(height: 80)
                                 .overlay(
                                     RoundedRectangle(cornerRadius: 10)
-                                        .stroke(selectedIndex == index ? Color.yellow : Color.clear, lineWidth: 3)
+                                        .stroke(selectedIndices.contains(index) ? Color.yellow : Color.clear, lineWidth: 3)
                                 )
                                 .onTapGesture {
                                     self.canvasImage = model.list[index]
-                                    selectedIndex = index
+                                    if selectedIndices.contains(index)
+                                    {
+                                        selectedIndices.removeAll { $0 == index }
+                                    }
+                                    else
+                                    {
+                                        selectedIndices.append(index)
+                                    }
                                 }
                                 .onDrag {
                                     NSItemProvider(object: UPLIdentifier(row:mediaListModel.selectedIndex(), indices:[UInt(index)]))