feat: folder bookmarks, unify quick actions, routes and hand-off user activities

Signed-off-by: Tommy van der Vorst <tommy@pixelspark.nl>

Author: pixelspark

Localizable.xcstrings

@@ -62,6 +62,7 @@
 		65C9E1542C42B9AE00EDCE6C /* ExtraFilesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65C9E1532C42B9AE00EDCE6C /* ExtraFilesView.swift */; };
 		65D40FCC2CBDB10600CAE91A /* SelectiveFolderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65D40FCB2CBDB10300CAE91A /* SelectiveFolderView.swift */; };
 		65DE11A72D69CC60002FDB08 /* PreviewWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65DE11A62D69CC5E002FDB08 /* PreviewWindow.swift */; };
+		65E359732EAE1EB20051D5A9 /* Route.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65E359722EAE1EB00051D5A9 /* Route.swift */; };
 		65F15BFC2CA03CBE00E13DDD /* BackgroundManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65F15BFB2CA03CBA00E13DDD /* BackgroundManager.swift */; };
 		65F15BFD2CA03DCE00E13DDD /* SushitrainCore.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65AE125A2C3AB03E00E721D4 /* SushitrainCore.xcframework */; };
 		65F15C012CA06B2300E13DDD /* UploadsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65F15C002CA06B2100E13DDD /* UploadsView.swift */; };
@@ -154,6 +155,7 @@
 		65C9E1532C42B9AE00EDCE6C /* ExtraFilesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExtraFilesView.swift; sourceTree = "<group>"; };
 		65D40FCB2CBDB10300CAE91A /* SelectiveFolderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectiveFolderView.swift; sourceTree = "<group>"; };
 		65DE11A62D69CC5E002FDB08 /* PreviewWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreviewWindow.swift; sourceTree = "<group>"; };
+		65E359722EAE1EB00051D5A9 /* Route.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Route.swift; sourceTree = "<group>"; };
 		65F15BFB2CA03CBA00E13DDD /* BackgroundManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundManager.swift; sourceTree = "<group>"; };
 		65F15C002CA06B2100E13DDD /* UploadsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UploadsView.swift; sourceTree = "<group>"; };
 		65F15C022CA1F85D00E13DDD /* SafariView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SafariView.swift; sourceTree = "<group>"; };
@@ -240,6 +242,7 @@
 				65DE11A62D69CC5E002FDB08 /* PreviewWindow.swift */,
 				65AE123B2C39F34B00E721D4 /* PrivacyInfo.xcprivacy */,
 				657603F02D045D0900B36D78 /* QuickActions.swift */,
+				65E359722EAE1EB00051D5A9 /* Route.swift */,
 				65F15C022CA1F85D00E13DDD /* SafariView.swift */,
 				652879A72C4D06F5004AF46F /* SearchView.swift */,
 				65D40FCB2CBDB10300CAE91A /* SelectiveFolderView.swift */,
@@ -401,6 +404,7 @@
 				657603EF2D0457B400B36D78 /* Intents.swift in Sources */,
 				654272982C7BC77000F2CEF8 /* FileQuickLookView.swift in Sources */,
 				6510F19E2DAA52CF003E4D3C /* FolderSettings.swift in Sources */,
+				65E359732EAE1EB20051D5A9 /* Route.swift in Sources */,
 				6596E2422E04ABD70069B31C /* DownloadsView.swift in Sources */,
 				6505643F2CA98D22009FFFB9 /* ThumbnailView.swift in Sources */,
 				65F7EFF72E5F58B8008A64E0 /* SupportView.swift in Sources */,

Sushitrain.xcodeproj/project.pbxproj

@@ -11,8 +11,7 @@ import AppIntents
 
 @main
 struct SushitrainApp: App {
-	static var browseFolderActivityID = "nl.t-shaped.Sushitrain.browse-folder"
-	static var viewFileActivityID = "nl.t-shaped.Sushitrain.view-file"
+	static var viewRouteActivityID = "nl.t-shaped.Sushitrain.view-route"
 
 	@State fileprivate var appState: AppState
 
@@ -181,12 +180,8 @@ struct SushitrainApp: App {
 				#endif
 
 				#if os(macOS)
-					.onContinueUserActivity(SushitrainApp.browseFolderActivityID) { ua in
-						Log.info("Receive browse-folder handoff at app level: \(String(describing: ua.userInfo))")
-					}
-
-					.onContinueUserActivity(SushitrainApp.viewFileActivityID) { ua in
-						Log.info("Receive view-file handoff at app level: \(String(describing: ua.userInfo))")
+					.onContinueUserActivity(SushitrainApp.viewRouteActivityID) { ua in
+						Log.info("Receive view-route handoff at app level: \(String(describing: ua.userInfo))")
 					}
 				#endif
 		}

Sushitrain/App.swift

@@ -95,11 +95,6 @@ class SushitrainDelegate: NSObject {
 	@AppStorage("ignoreLongTimeNoSeeDevices") var ignoreLongTimeNoSeeDevices = Set<String>()
 	@AppStorage("ignoreDiscoveredDevices") var ignoreDiscoveredDevices = Set<String>()
 
-	#if os(iOS)
-		// Whether to re-enable hideHiddenFolders when app comes to the foreground
-		@AppStorage("rehideHiddenFoldersOnActivate") var rehideHiddenFoldersOnActivate: Bool = false
-	#endif
-
 	@AppStorage("onboardingVersionShown") var onboardingVersionShown = 0
 
 	// Number of seconds after which we remind the user that a device hasn't connected in a while
@@ -114,6 +109,14 @@ class SushitrainDelegate: NSObject {
 	// Whether to show the onboarding on the next startup, regardless of whether it has been shown before
 	@AppStorage("forceOnboardingOnNextStartup") var forceOnboardingOnNextStartup = false
 
+	#if os(iOS)
+		// Whether to re-enable hideHiddenFolders when app comes to the foreground
+		@AppStorage("rehideHiddenFoldersOnActivate") var rehideHiddenFoldersOnActivate: Bool = false
+
+		// Bookmarked places in the app
+		@AppStorage("bookmarkedRoutes") var bookmarkedRoutes: [URL] = []
+	#endif
+
 	#if os(macOS)
 		// The action to perform when a user clicks a folder in the dock menu
 		@AppStorage("menuFolderAction") var menuFolderAction: MenuFolderAction = .finderExceptSelective
@@ -723,11 +726,19 @@ struct SyncState {
 		#endif
 	}
 
+	#if os(iOS)
+		private var bookmarkedRoutesAsRoute: [Route] {
+			return self.userSettings.bookmarkedRoutes.compactMap { url in
+				return Route(url: url)
+			}
+		}
+	#endif
+
 	func sleep() async {
 		self.stopNetworkMonitor()
 
 		#if os(iOS)
-			QuickActionService.provideActions()
+			QuickActionService.provideActions(bookmarks: self.bookmarkedRoutesAsRoute)
 
 			if userSettings.lingeringEnabled {
 				Log.info("Background time remaining: \(UIApplication.shared.backgroundTimeRemaining)")
@@ -788,6 +799,7 @@ struct SyncState {
 				#if os(iOS)
 					self.backgroundManager.inactivate()
 					self.reduceMemoryUsage()
+					QuickActionService.provideActions(bookmarks: self.bookmarkedRoutesAsRoute)
 				#endif
 			}
 			#if os(iOS)

Sushitrain/AppState.swift

@@ -47,7 +47,9 @@ struct BrowserListView: View {
 			Section {
 				ForEach(subdirectories, id: \.self) { (subDirEntry: SushitrainEntry) in
 					let fileName = subDirEntry.fileName()
-					NavigationLink(destination: BrowserView(folder: folder, prefix: "\(prefix)\(fileName)/")) {
+					NavigationLink(
+						destination: BrowserView(folder: folder, prefix: "\(prefix)\(fileName)/", userSettings: appState.userSettings)
+					) {
 						ItemSelectSwipeView(file: subDirEntry) {
 							// Subdirectory name
 							HStack(spacing: 9.0) {
@@ -145,7 +147,8 @@ struct EntryView: View {
 				if targetEntry.isDirectory() {
 					if let targetFolder = targetEntry.folder {
 						NavigationLink(
-							destination: BrowserView(folder: targetFolder, prefix: targetEntry.path() + "/")
+							destination: BrowserView(
+								folder: targetFolder, prefix: targetEntry.path() + "/", userSettings: appState.userSettings)
 						) { self.entryView(entry: entry) }.contextMenu {
 							NavigationLink(
 								destination: FileView(file: targetEntry, showPath: self.folder == nil, siblings: nil)
@@ -297,7 +300,9 @@ struct FileEntryLink<Content: View>: View {
 			// Show 'go to location' in list if we are not in the file's folder already
 			if self.inFolder == nil {
 				if let folder = entry.folder {
-					NavigationLink(destination: BrowserView(folder: folder, prefix: entry.parentPath())) {
+					NavigationLink(
+						destination: BrowserView(folder: folder, prefix: entry.parentPath(), userSettings: appState.userSettings)
+					) {
 						let parentFolderName = entry.parentFolderName
 						if parentFolderName.isEmpty {
 							Label("Go to location", systemImage: "document.circle")

Sushitrain/BrowserListView.swift

@@ -207,7 +207,7 @@ struct BrowserTableView: View {
 					// Symlink to a directory
 					if targetEntry.isDirectory() {
 						if let targetFolder = targetEntry.folder {
-							BrowserView(folder: targetFolder, prefix: targetEntry.path() + "/")
+							BrowserView(folder: targetFolder, prefix: targetEntry.path() + "/", userSettings: appState.userSettings)
 						}
 					}
 					else {
@@ -233,7 +233,7 @@ struct BrowserTableView: View {
 			}
 			else if oe.isDirectory() {
 				if honorTapToPreview {
-					BrowserView(folder: folder, prefix: oe.path() + "/")
+					BrowserView(folder: folder, prefix: oe.path() + "/", userSettings: appState.userSettings)
 				}
 				else {
 					FileView(file: oe, showPath: false, siblings: self.entries)

Sushitrain/BrowserTableView.swift

@@ -5,6 +5,7 @@
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 import SwiftUI
 import QuickLook
+import UniformTypeIdentifiers
 @preconcurrency import SushitrainCore
 
 enum BrowserViewStyle: String {
@@ -26,8 +27,10 @@ private struct FolderPopoverView: View {
 
 struct BrowserView: View {
 	@Environment(AppState.self) private var appState
+
 	var folder: SushitrainFolder
 	var prefix: String
+	@ObservedObject var userSettings: AppUserSettings
 
 	@State private var showSettings = false
 	@State private var searchText = ""
@@ -232,14 +235,14 @@ struct BrowserView: View {
 				dismissButton: .default(Text("OK")))
 		}
 
-		.userActivity(SushitrainApp.browseFolderActivityID) { ua in
+		.userActivity(SushitrainApp.viewRouteActivityID) { ua in
+			let routeURL = self.route.url
 			ua.title = self.folderName
 			ua.isEligibleForHandoff = true
-			ua.targetContentIdentifier = "browse:\(self.folder.folderID):\(prefix)"  // Not really used
+			ua.targetContentIdentifier = routeURL.absoluteString
 			ua.userInfo = [
 				"version": 1,
-				"folderID": self.folder.folderID,
-				"prefix": self.prefix,
+				"url": routeURL.absoluteString,
 			]
 			ua.needsSave = true
 		}
@@ -375,7 +378,17 @@ struct BrowserView: View {
 						self.showInFinder()
 					}.disabled(!canShowInFinder)
 				#endif
+			}
 
+			#if os(iOS)
+				Toggle(isOn: Binding(get: { self.isBookmarked }, set: { self.setBookmarked($0) })) {
+					Label("Bookmark", systemImage: self.isBookmarked ? "bookmark.fill" : "bookmark")
+				}
+			#endif
+
+			Divider()
+
+			if folderExists {
 				#if os(iOS)
 					Button("Folder statistics...", systemImage: "chart.pie") {
 						showFolderStatistics = true
@@ -412,6 +425,25 @@ struct BrowserView: View {
 		}.disabled(!folderExists)
 	}
 
+	private var route: Route {
+		return Route.folder(folderID: self.folder.folderID, prefix: self.prefix)
+	}
+
+	#if os(iOS)
+		private var isBookmarked: Bool {
+			let url = self.route.url
+			return userSettings.bookmarkedRoutes.contains(where: { $0 == url })
+		}
+
+		private func setBookmarked(_ fav: Bool) {
+			let url = self.route.url
+			userSettings.bookmarkedRoutes.removeAll(where: { $0 == url })
+			if fav {
+				userSettings.bookmarkedRoutes.append(url)
+			}
+		}
+	#endif
+
 	private func onDrop(_ providers: [NSItemProvider]) async throws {
 		var urls: [URL] = []