From c8a1b811bffd13dc6dfa39a7c5c0d4ee76cd11e5 Mon Sep 17 00:00:00 2001
From: Ariver <ar@MacBook-Air.local>
Date: Mon, 11 May 2026 12:53:34 +0800
Subject: [PATCH] Release TagLauncher 5.5.0
---
Apptag/ContentView.swift | 524 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 418 insertions(+), 106 deletions(-)
diff --git a/Apptag/ContentView.swift b/Apptag/ContentView.swift
index 14a9452..c3eb159 100644
--- a/Apptag/ContentView.swift
+++ b/Apptag/ContentView.swift
@@ -1,10 +1,11 @@
import SwiftUI
import AppKit
+import UniformTypeIdentifiers
// MARK: - Notification for manual re-index
extension Notification.Name {
- static let apptagEditModeChanged = Notification.Name("ApptagEditModeChanged")
+ static let tagLauncherEditModeChanged = Notification.Name("TagLauncherEditModeChanged")
}
// MARK: - Edit Phase
@@ -206,6 +207,11 @@
@State private var hoveredContainer: String? = nil // colored container lift
// Fixed interaction for "Colorless Container": hover fills persistently; click clears.
@State private var filledColorlessContainer: String? = nil
+ @State private var appDragModeActive = false
+ @State private var dropWarningToast: String? = nil
+ @State private var dropRefreshVisible = false
+ @State private var dropRefreshStartedAt: Date? = nil
+ @State private var layoutRefreshID = UUID()
// Configurable defaults
@AppStorage("defaultGroupName") private var defaultGroupName = "Other"
@@ -252,6 +258,41 @@
case .editingApps:
editAppsView
}
+
+ if let message = dropWarningToast {
+ Text(message)
+ .font(.system(size: 16, weight: .semibold))
+ .foregroundStyle(.primary)
+ .padding(.horizontal, 22)
+ .padding(.vertical, 12)
+ .background(
+ RoundedRectangle(cornerRadius: 10)
+ .fill(.ultraThickMaterial)
+ .shadow(color: .black.opacity(0.22), radius: 18, y: 10)
+ )
+ .transition(.scale(scale: 0.96).combined(with: .opacity))
+ .allowsHitTesting(false)
+ }
+
+ if dropRefreshVisible {
+ Color.black.opacity(0.08)
+ .ignoresSafeArea()
+ .transition(.opacity)
+ .allowsHitTesting(false)
+
+ ProgressView()
+ .progressViewStyle(.circular)
+ .controlSize(.large)
+ .scaleEffect(1.15)
+ .padding(24)
+ .background(
+ RoundedRectangle(cornerRadius: 12)
+ .fill(.ultraThickMaterial)
+ .shadow(color: .black.opacity(0.26), radius: 24, y: 12)
+ )
+ .transition(.scale(scale: 0.92).combined(with: .opacity))
+ .allowsHitTesting(false)
+ }
}
.onAppear {
let mousePoint = NSEvent.mouseLocation
@@ -267,7 +308,7 @@
.onChange(of: editPhase) { _, newPhase in
let active = newPhase != .none
NotificationCenter.default.post(
- name: .apptagEditModeChanged,
+ name: .tagLauncherEditModeChanged,
object: nil,
userInfo: ["active": active]
)
@@ -277,7 +318,7 @@
/// Set edit phase with synchronous notification BEFORE state change.
func setEditPhase(_ phase: EditPhase) {
if phase != .none {
- NotificationCenter.default.post(name: .apptagEditModeChanged, object: nil, userInfo: ["active": true])
+ NotificationCenter.default.post(name: .tagLauncherEditModeChanged, object: nil, userInfo: ["active": true])
NSApp.activate(ignoringOtherApps: true)
// Always sync tag list from database when entering edit mode
let store = TagDatabase.load()
@@ -287,7 +328,7 @@
editPhase = phase
if phase == .none {
DispatchQueue.main.async {
- NotificationCenter.default.post(name: .apptagEditModeChanged, object: nil, userInfo: ["active": false])
+ NotificationCenter.default.post(name: .tagLauncherEditModeChanged, object: nil, userInfo: ["active": false])
}
}
}
@@ -403,6 +444,7 @@
flatGrid
}
}
+ .id(layoutRefreshID)
}
private var flatGrid: some View {
@@ -415,7 +457,12 @@
onSelectApp: { app in openApp(app) },
tagFontSize: tagFontSize,
iconSize: iconSize,
- showNames: !hideAppNames
+ showNames: !hideAppNames,
+ dragModeActive: appDragModeActive,
+ onDragModeChange: { setAppDragMode($0) },
+ onDropApp: { path, source, copy in
+ dropApp(path: path, sourceTag: source, targetTag: group.name, copy: copy)
+ }
).id(group.id)
}
}.padding(20)
@@ -471,10 +518,12 @@
private func estimatedCardHeight(_ group: TagGroup, width: CGFloat) -> CGFloat {
let inner = width - 32
- let itemW = iconSize + 28 + 6
+ let itemW = AppGridItem.stableWidth(iconSize: iconSize) + 6
let perRow = max(1, Int(inner / itemW))
let rows = (group.apps.count + perRow - 1) / perRow
- return 32 + CGFloat(rows) * (iconSize + 30)
+ return 32
+ + CGFloat(rows) * AppGridItem.stableHeight(iconSize: iconSize)
+ + CGFloat(max(0, rows - 1)) * 2
}
private func masonryCard(_ group: TagGroup, width: CGFloat) -> some View {
@@ -482,6 +531,7 @@
let isColorless = isColorlessContainerMode
let isColorlessFilled = isColorless && filledColorlessContainer == group.name
let isHovered = hoveredContainer == group.name
+ let isColorlessActive = isColorless && (isColorlessFilled || isHovered)
let tagColor = Color(nsColor: TagColor.nsColor(for: tagColors[group.name] ?? 0))
return VStack(alignment: .leading, spacing: 6) {
HStack(spacing: 0) {
@@ -497,13 +547,21 @@
Rectangle().fill(.secondary.opacity(0.25)).frame(height: 1)
.layoutPriority(0)
}
- let itemSize = iconSize + 28
+ let itemSize = AppGridItem.stableWidth(iconSize: iconSize)
LazyVGrid(
columns: [GridItem(.adaptive(minimum: itemSize, maximum: itemSize + 36), spacing: 6)],
spacing: 2
) {
ForEach(group.apps) { app in
- AppGridItem(app: app, iconSize: iconSize, showName: !hideAppNames, onSelect: { openApp(app) })
+ AppGridItem(
+ app: app,
+ iconSize: iconSize,
+ showName: !hideAppNames,
+ sourceTag: group.name,
+ dragModeActive: appDragModeActive,
+ onDragModeChange: { setAppDragMode($0) },
+ onSelect: { openApp(app) }
+ )
}
}
}
@@ -511,7 +569,7 @@
.padding(16)
.background(
RoundedRectangle(cornerRadius: 14)
- .fill((isColored || isColorlessFilled) ? tagColor.opacity(0.30) : Color.clear)
+ .fill((isColored || isColorlessActive) ? tagColor.opacity(0.30) : Color.clear)
.background(
RoundedRectangle(cornerRadius: 14)
.fill(.ultraThinMaterial)
@@ -521,23 +579,31 @@
RoundedRectangle(cornerRadius: 14)
.stroke(Color.primary.opacity(0.08), lineWidth: 1)
)
- .shadow(color: .black.opacity(isColored && isHovered ? 0.22 : 0),
- radius: isColored && isHovered ? 18 : 0,
- y: isColored && isHovered ? 10 : 0)
+ .overlay {
+ AppDropTargetView(targetTag: group.name) { path, source, copy in
+ dropApp(path: path, sourceTag: source, targetTag: group.name, copy: copy)
+ }
+ .allowsHitTesting(false)
+ }
+ .shadow(color: .black.opacity((isColored && isHovered) || isColorlessActive ? 0.22 : 0),
+ radius: (isColored && isHovered) || isColorlessActive ? 18 : 0,
+ y: (isColored && isHovered) || isColorlessActive ? 10 : 0)
.scaleEffect(isColored && isHovered ? 1.015 : 1.0)
.animation(.spring(response: 0.25, dampingFraction: 0.82), value: isHovered)
+ .animation(.spring(response: 0.25, dampingFraction: 0.82), value: isColorlessFilled)
.onHover { hovering in
- if isColored {
+ if isColored || isColorless {
hoveredContainer = hovering ? group.name : nil
- } else if hovering {
- fillColorlessContainer(group.name)
}
}
.contentShape(RoundedRectangle(cornerRadius: 14))
.onTapGesture {
- if isColorlessFilled {
- filledColorlessContainer = nil
+ if isColorless {
+ toggleColorlessFill(group.name)
}
+ }
+ .onDrop(of: [UTType.plainText], isTargeted: nil) { providers in
+ handleAppDrop(providers, targetTag: group.name)
}
}
@@ -547,23 +613,19 @@
let gap: CGFloat = 16
let available = geo.size.width - outerPad * 2
let preferredCount = preferredGridContainersPerRow(availableWidth: available)
- let rows = gridContainerRows(groups: groups, preferredCount: preferredCount)
+ let rows = gridContainerRows(groups: groups, trackCount: preferredCount, availableWidth: available, gap: gap)
ScrollViewReader { proxy in
ScrollView {
- LazyVStack(alignment: .leading, spacing: gap) {
- ForEach(rows.indices, id: \.self) { rowIndex in
+ VStack(alignment: .leading, spacing: gap) {
+ ForEach(Array(rows.indices), id: \.self) { rowIndex in
let row = rows[rowIndex]
- let rowCount = max(1, row.count)
- let cardWidth = (available - gap * CGFloat(rowCount - 1)) / CGFloat(rowCount)
- let fixedRows = row.map {
- iconRows(appCount: $0.apps.count, width: cardWidth)
- }.max() ?? 1
HStack(alignment: .top, spacing: gap) {
- ForEach(row) { group in
- gridContainerCard(group, width: cardWidth, fixedRows: fixedRows)
- .id(group.id)
+ ForEach(Array(row.items.indices), id: \.self) { itemIndex in
+ let item = row.items[itemIndex]
+ gridContainerCard(item.group, width: item.width, fixedRows: row.fixedRows)
+ .id(item.group.id)
}
}
}
@@ -578,27 +640,111 @@
}
private func preferredGridContainersPerRow(availableWidth: CGFloat) -> Int {
- let minCardWidth = max(260, iconSize * 3 + 88)
+ let minCardWidth = max(260, AppGridItem.stableWidth(iconSize: iconSize) * 3 + 64)
if availableWidth >= minCardWidth * 3 + 32 { return 3 }
if availableWidth >= minCardWidth * 2 + 16 { return 2 }
return 1
}
- private func gridContainerRows(groups: [TagGroup], preferredCount: Int) -> [[TagGroup]] {
- var rows: [[TagGroup]] = []
+ private struct GridContainerLayoutItem {
+ let group: TagGroup
+ let width: CGFloat
+ }
+
+ private struct GridContainerLayoutRow {
+ let items: [GridContainerLayoutItem]
+ let fixedRows: Int
+ }
+
+ private struct GridContainerCandidate {
+ let spans: [Int]
+ let rows: Int
+ let cost: CGFloat
+ }
+
+ private func gridContainerRows(groups: [TagGroup], trackCount: Int, availableWidth: CGFloat, gap: CGFloat) -> [GridContainerLayoutRow] {
+ let trackCount = max(1, trackCount)
+ let trackWidth = (availableWidth - gap * CGFloat(trackCount - 1)) / CGFloat(trackCount)
+ let patterns = gridContainerSpanPatterns(trackCount: trackCount)
+ let n = groups.count
+ guard n > 0 else { return [] }
+
+ var bestCost = Array(repeating: CGFloat.greatestFiniteMagnitude, count: n + 1)
+ var bestPattern = Array(repeating: [Int](), count: n)
+ bestCost[n] = 0
+
+ for index in stride(from: n - 1, through: 0, by: -1) {
+ for pattern in patterns where index + pattern.count <= n {
+ let candidate = gridContainerCandidate(
+ groups: groups,
+ startIndex: index,
+ spans: pattern,
+ trackWidth: trackWidth,
+ availableWidth: availableWidth,
+ gap: gap
+ )
+ let totalCost = candidate.cost + bestCost[index + pattern.count]
+ if totalCost < bestCost[index] {
+ bestCost[index] = totalCost
+ bestPattern[index] = candidate.spans
+ }
+ }
+ }
+
+ var rows: [GridContainerLayoutRow] = []
var index = 0
- while index < groups.count {
- let remaining = groups.count - index
- let count = min(max(1, preferredCount), remaining)
- rows.append(Array(groups[index..<index + count]))
- index += count
+ while index < n {
+ let spans = bestPattern[index].isEmpty ? [trackCount] : bestPattern[index]
+ let widths = spans.map { gridContainerWidth(trackWidth: trackWidth, span: $0, gap: gap) }
+ let fixedRows = widths.indices.map {
+ iconRows(appCount: groups[index + $0].apps.count, width: widths[$0])
+ }.max() ?? 1
+ let items = widths.indices.map {
+ GridContainerLayoutItem(group: groups[index + $0], width: widths[$0])
+ }
+ rows.append(GridContainerLayoutRow(items: items, fixedRows: fixedRows))
+ index += spans.count
}
return rows
}
+ private func gridContainerSpanPatterns(trackCount: Int) -> [[Int]] {
+ switch trackCount {
+ case 3:
+ return [[1, 1, 1], [1, 2], [2, 1], [3]]
+ case 2:
+ return [[1, 1], [2]]
+ default:
+ return [[1]]
+ }
+ }
+
+ private func gridContainerCandidate(
+ groups: [TagGroup],
+ startIndex: Int,
+ spans: [Int],
+ trackWidth: CGFloat,
+ availableWidth: CGFloat,
+ gap: CGFloat
+ ) -> GridContainerCandidate {
+ let widths = spans.map { gridContainerWidth(trackWidth: trackWidth, span: $0, gap: gap) }
+ let rowCounts = widths.indices.map {
+ iconRows(appCount: groups[startIndex + $0].apps.count, width: widths[$0])
+ }
+ let fixedRows = rowCounts.max() ?? 1
+ let rowArea = CGFloat(fixedRows) * iconCellHeight() * availableWidth
+ let paddingCost = CGFloat(spans.count) * 0.001
+ return GridContainerCandidate(spans: spans, rows: fixedRows, cost: rowArea + paddingCost)
+ }
+
+ private func gridContainerWidth(trackWidth: CGFloat, span: Int, gap: CGFloat) -> CGFloat {
+ let span = max(1, span)
+ return trackWidth * CGFloat(span) + gap * CGFloat(span - 1)
+ }
+
private func iconColumns(width: CGFloat) -> Int {
let inner = width - 32
- let itemW = iconSize + 34
+ let itemW = AppGridItem.stableWidth(iconSize: iconSize) + 6
return max(1, Int((inner + 6) / itemW))
}
@@ -609,12 +755,17 @@
private func gridContainerCard(_ group: TagGroup, width: CGFloat, fixedRows: Int) -> some View {
let isColored = displayMode == "coloredGridContainer"
+ let isColorlessGrid = displayMode == "gridContainer"
let isColorless = isColorlessContainerMode
let isColorlessFilled = isColorless && filledColorlessContainer == group.name
let isHovered = hoveredContainer == group.name
+ let isColorlessGridActive = isColorlessGrid && (isColorlessFilled || isHovered)
let cols = iconColumns(width: width)
- let maxCells = max(cols, fixedRows * cols)
- let emptyCells = max(0, maxCells - group.apps.count)
+ let contentWidth = max(1, width - 32)
+ let cellWidth = max(1, (contentWidth - 6 * CGFloat(cols - 1)) / CGFloat(cols))
+ let cellHeight = iconCellHeight()
+ let gridHeight = CGFloat(fixedRows) * cellHeight + CGFloat(max(0, fixedRows - 1)) * 2
+ let rows = appRows(group.apps, columns: cols, fixedRows: fixedRows)
let tagColor = Color(nsColor: TagColor.nsColor(for: tagColors[group.name] ?? 0))
return VStack(alignment: .leading, spacing: 6) {
@@ -632,24 +783,39 @@
.layoutPriority(0)
}
- LazyVGrid(
- columns: Array(repeating: GridItem(.flexible(), spacing: 6), count: cols),
- spacing: 2
- ) {
- ForEach(group.apps) { app in
- AppGridItem(app: app, iconSize: iconSize, showName: !hideAppNames, onSelect: { openApp(app) })
- }
- ForEach(0..<emptyCells, id: \.self) { _ in
- Color.clear
- .frame(width: iconSize + 20, height: iconSize + (hideAppNames ? 16 : 42))
+ VStack(alignment: .leading, spacing: 2) {
+ ForEach(rows.indices, id: \.self) { rowIndex in
+ HStack(alignment: .top, spacing: 6) {
+ ForEach(rows[rowIndex]) { app in
+ AppGridItem(
+ app: app,
+ iconSize: iconSize,
+ showName: !hideAppNames,
+ sourceTag: group.name,
+ dragModeActive: appDragModeActive,
+ onDragModeChange: { setAppDragMode($0) },
+ onSelect: { openApp(app) }
+ )
+ .frame(width: cellWidth)
+ .frame(height: cellHeight)
+ }
+
+ let emptyCells = max(0, cols - rows[rowIndex].count)
+ ForEach(0..<emptyCells, id: \.self) { _ in
+ Color.clear
+ .frame(width: cellWidth, height: cellHeight)
+ }
+ }
+ .frame(height: cellHeight)
}
}
+ .frame(height: gridHeight, alignment: .topLeading)
}
- .frame(width: width)
+ .frame(width: contentWidth)
.padding(16)
.background(
RoundedRectangle(cornerRadius: 14)
- .fill((isColored || isColorlessFilled) ? tagColor.opacity(0.30) : Color.clear)
+ .fill((isColored || isColorlessGridActive) ? tagColor.opacity(0.30) : Color.clear)
.background(
RoundedRectangle(cornerRadius: 14)
.fill(.ultraThinMaterial)
@@ -659,13 +825,20 @@
RoundedRectangle(cornerRadius: 14)
.stroke(Color.primary.opacity(0.08), lineWidth: 1)
)
- .shadow(color: .black.opacity(isColored && isHovered ? 0.22 : 0),
- radius: isColored && isHovered ? 18 : 0,
- y: isColored && isHovered ? 10 : 0)
+ .overlay {
+ AppDropTargetView(targetTag: group.name) { path, source, copy in
+ dropApp(path: path, sourceTag: source, targetTag: group.name, copy: copy)
+ }
+ .allowsHitTesting(false)
+ }
+ .shadow(color: .black.opacity((isColored && isHovered) || isColorlessGridActive ? 0.22 : 0),
+ radius: (isColored && isHovered) || isColorlessGridActive ? 18 : 0,
+ y: (isColored && isHovered) || isColorlessGridActive ? 10 : 0)
.scaleEffect(isColored && isHovered ? 1.015 : 1.0)
.animation(.spring(response: 0.25, dampingFraction: 0.82), value: isHovered)
+ .animation(.spring(response: 0.25, dampingFraction: 0.82), value: isColorlessFilled)
.onHover { hovering in
- if isColored {
+ if isColored || isColorlessGrid {
hoveredContainer = hovering ? group.name : nil
} else if hovering {
fillColorlessContainer(group.name)
@@ -673,9 +846,27 @@
}
.contentShape(RoundedRectangle(cornerRadius: 14))
.onTapGesture {
- if isColorlessFilled {
- filledColorlessContainer = nil
+ if isColorlessGrid {
+ toggleColorlessFill(group.name)
}
+ }
+ .onDrop(of: [UTType.plainText], isTargeted: nil) { providers in
+ handleAppDrop(providers, targetTag: group.name)
+ }
+ }
+
+ private func iconCellHeight() -> CGFloat {
+ AppGridItem.stableHeight(iconSize: iconSize)
+ }
+
+ private func appRows(_ apps: [AppInfo], columns: Int, fixedRows: Int) -> [[AppInfo]] {
+ let columns = max(1, columns)
+ let rowCount = max(1, fixedRows)
+ return (0..<rowCount).map { rowIndex in
+ let start = rowIndex * columns
+ guard start < apps.count else { return [] }
+ let end = min(start + columns, apps.count)
+ return Array(apps[start..<end])
}
}
@@ -724,7 +915,7 @@
Spacer()
Button(tr("edit.confirm")) { confirmAssign() }
.buttonStyle(.borderedProminent)
- .disabled(selectedAppPaths.isEmpty || selectedTagNames.isEmpty)
+ .disabled(selectedAppPaths.isEmpty)
}
.padding(.horizontal, 24)
.padding(.top, notchHeight > 0 ? notchHeight + 10 : 20)
@@ -786,63 +977,43 @@
}
private var editAppsGrid: some View {
- GeometryReader { geo in
- let outerPad: CGFloat = 20
- let gap: CGFloat = 16
- let available = geo.size.width - outerPad * 2
- let colW: CGFloat = 300
- let colCount = max(1, Int((available + gap) / (colW + gap)))
- let actualColW = (available - gap * CGFloat(colCount - 1)) / CGFloat(colCount)
- let columns = distributeToColumns(groups: groups, colCount: colCount, colWidth: actualColW)
-
- ScrollView {
- HStack(alignment: .top, spacing: gap) {
- ForEach(0..<colCount, id: \.self) { ci in
- LazyVStack(spacing: gap) {
- ForEach(columns[ci]) { group in
- editGroupCard(group, width: actualColW)
- }
- }
- }
+ ScrollView {
+ LazyVStack(alignment: .leading, spacing: 24) {
+ ForEach(groups) { group in
+ editFlatGroup(group)
}
- .padding(outerPad)
- .frame(maxWidth: .infinity, alignment: .topLeading)
}
+ .padding(20)
}
}
- private func editGroupCard(_ group: TagGroup, width: CGFloat) -> some View {
- VStack(alignment: .leading, spacing: 6) {
+ private func editFlatGroup(_ group: TagGroup) -> some View {
+ VStack(alignment: .leading, spacing: 0) {
HStack(spacing: 0) {
Rectangle().fill(.secondary.opacity(0.25)).frame(height: 1)
- .layoutPriority(0)
Text(group.name)
.font(.system(size: tagFontSize, weight: .semibold))
.foregroundStyle(.secondary)
- .lineLimit(1)
- .truncationMode(.middle)
.padding(.horizontal, 10)
- .layoutPriority(1)
Rectangle().fill(.secondary.opacity(0.25)).frame(height: 1)
- .layoutPriority(0)
}
+ .padding(.bottom, 6)
+
LazyVGrid(
- columns: [GridItem(.adaptive(minimum: iconSize + 28, maximum: iconSize + 64), spacing: 6)],
+ columns: [
+ GridItem(
+ .adaptive(
+ minimum: AppGridItem.stableWidth(iconSize: iconSize),
+ maximum: AppGridItem.stableWidth(iconSize: iconSize) + 36
+ ),
+ spacing: 6
+ )
+ ],
spacing: 2
) {
ForEach(group.apps) { app in editableAppItem(app) }
}
}
- .frame(maxWidth: width)
- .padding(16)
- .background(
- RoundedRectangle(cornerRadius: 14)
- .fill(.ultraThinMaterial)
- )
- .overlay(
- RoundedRectangle(cornerRadius: 14)
- .stroke(Color.primary.opacity(0.08), lineWidth: 1)
- )
}
private func selectableTagItem(_ tagName: String) -> some View {
@@ -865,11 +1036,10 @@
}
private func confirmAssign() {
- guard !selectedAppPaths.isEmpty, !selectedTagNames.isEmpty else { return }
+ guard !selectedAppPaths.isEmpty else { return }
let paths = selectedAppPaths.map { $0.path }
- for tagName in selectedTagNames {
- TagEditor.assignTag(tagName, color: tagColors[tagName] ?? 0, to: paths)
- }
+ let tags = sortedTagNames.filter { selectedTagNames.contains($0) }
+ TagEditor.setTags(tags, to: paths)
selectedAppPaths = []; selectedTagNames = []
refreshApps()
withAnimation { successToast = tr("edit.success") }
@@ -882,7 +1052,7 @@
private func editableAppItem(_ app: AppInfo) -> some View {
let isSelected = selectedAppPaths.contains(app.path)
return Button {
- if isSelected { selectedAppPaths.remove(app.path) } else { selectedAppPaths.insert(app.path) }
+ toggleEditableAppSelection(app)
} label: {
VStack(spacing: 4) {
ZStack(alignment: .topTrailing) {
@@ -902,6 +1072,33 @@
.opacity(isSelected ? 1.0 : 0.65)
}
.buttonStyle(.plain)
+ }
+
+ private func toggleEditableAppSelection(_ app: AppInfo) {
+ if selectedAppPaths.contains(app.path) {
+ selectedAppPaths.remove(app.path)
+ } else {
+ selectedAppPaths.insert(app.path)
+ }
+ syncSelectedTagsFromSelectedApps()
+ }
+
+ private func syncSelectedTagsFromSelectedApps() {
+ let selectedApps = allApps.filter { selectedAppPaths.contains($0.path) }
+ guard !selectedApps.isEmpty else {
+ selectedTagNames = []
+ return
+ }
+
+ let editableTags = Set(sortedTagNames)
+ if selectedApps.count == 1 {
+ selectedTagNames = Set(selectedApps[0].tags.filter { editableTags.contains($0) })
+ return
+ }
+
+ selectedTagNames = selectedApps.reduce(into: Set<String>()) { result, app in
+ result.formUnion(app.tags.filter { editableTags.contains($0) })
+ }
}
// MARK: - Computed
@@ -942,16 +1139,113 @@
}
private func fillColorlessContainer(_ id: String) {
- guard displayMode == "container" else { return }
+ guard isColorlessContainerMode else { return }
filledColorlessContainer = id
}
private func toggleColorlessFill(_ id: String) {
- guard displayMode == "container" else { return }
+ guard isColorlessContainerMode else { return }
filledColorlessContainer = (filledColorlessContainer == id) ? nil : id
}
- func refreshApps() {
+ private func handleAppDrop(_ providers: [NSItemProvider], targetTag: String) -> Bool {
+ guard let provider = providers.first(where: { $0.hasItemConformingToTypeIdentifier(UTType.plainText.identifier) }) else {
+ return false
+ }
+ provider.loadItem(forTypeIdentifier: UTType.plainText.identifier, options: nil) { item, _ in
+ let text: String?
+ if let data = item as? Data {
+ text = String(data: data, encoding: .utf8)
+ } else if let string = item as? String {
+ text = string
+ } else if let string = item as? NSString {
+ text = string as String
+ } else {
+ text = nil
+ }
+ guard let text else { return }
+ let parts = text.components(separatedBy: "\n")
+ guard let path = parts.first, !path.isEmpty else { return }
+ let source = parts.dropFirst().first ?? ""
+ let copy = NSEvent.modifierFlags.contains(.option)
+ DispatchQueue.main.async {
+ dropApp(path: path, sourceTag: source, targetTag: targetTag, copy: copy)
+ }
+ }
+ return true
+ }
+
+ private func dropApp(path: String, sourceTag: String, targetTag: String, copy: Bool) {
+ appDragModeActive = false
+ guard !isSystemDefaultDropTarget(targetTag) else {
+ showDropWarning()
+ return
+ }
+ guard tagColors[targetTag] != nil else { return }
+ guard sourceTag != targetTag || copy else { return }
+ TagEditor.moveApp(
+ path: path,
+ from: sourceTag,
+ to: targetTag,
+ color: tagColors[targetTag] ?? 0,
+ copy: copy
+ )
+ showDropRefresh()
+ refreshApps(forceLayoutRefresh: true)
+ }
+
+ private func isSystemDefaultDropTarget(_ targetTag: String) -> Bool {
+ let defaultNames = [
+ defaultGroupName,
+ tr("group.uncategorized"),
+ "Mac自带",
+ tr("group.appleBuiltIn")
+ ]
+ return defaultNames.contains(targetTag)
+ }
+
+ private func showDropWarning() {
+ withAnimation(.spring(response: 0.24, dampingFraction: 0.82)) {
+ dropWarningToast = tr("drop.systemDefaultWarning")
+ }
+ DispatchQueue.main.asyncAfter(deadline: .now() + 1.6) {
+ withAnimation(.easeOut(duration: 0.18)) {
+ dropWarningToast = nil
+ }
+ }
+ }
+
+ private func showDropRefresh() {
+ dropRefreshStartedAt = Date()
+ withAnimation(.spring(response: 0.22, dampingFraction: 0.82)) {
+ dropRefreshVisible = true
+ }
+ }
+
+ private func finishDropRefreshAfterMinimumDuration() {
+ let minimumDuration: TimeInterval = 0.85
+ let elapsed = dropRefreshStartedAt.map { Date().timeIntervalSince($0) } ?? minimumDuration
+ let delay = max(0, minimumDuration - elapsed)
+ DispatchQueue.main.asyncAfter(deadline: .now() + delay) {
+ withAnimation(.easeOut(duration: 0.18)) {
+ dropRefreshVisible = false
+ }
+ dropRefreshStartedAt = nil
+ }
+ }
+
+ private func setAppDragMode(_ active: Bool) {
+ appDragModeActive = active
+ if active {
+ DispatchQueue.main.asyncAfter(deadline: .now() + 8) {
+ if appDragModeActive {
+ appDragModeActive = false
+ }
+ }
+ }
+ }
+
+ func refreshApps(forceLayoutRefresh: Bool = false) {
DispatchQueue.global(qos: .userInitiated).async {
var apps = AppIndexer.scan()
let store = TagDatabase.load()
@@ -962,13 +1256,31 @@
allApps = apps
tagColors = colors
draggedTagNames = order
+ if forceLayoutRefresh {
+ withAnimation(.spring(response: 0.28, dampingFraction: 0.86)) {
+ layoutRefreshID = UUID()
+ }
+ finishDropRefreshAfterMinimumDuration()
+ }
}
}
}
func openApp(_ app: AppInfo) {
+ appDragModeActive = false
hideOverlay()
- NSWorkspace.shared.open(app.path)
+ if let bundleIdentifier = app.bundleIdentifier {
+ NSWorkspace.shared.launchApplication(
+ withBundleIdentifier: bundleIdentifier,
+ options: [],
+ additionalEventParamDescriptor: nil,
+ launchIdentifier: nil
+ )
+ return
+ }
+
+ let configuration = NSWorkspace.OpenConfiguration()
+ NSWorkspace.shared.openApplication(at: app.path, configuration: configuration)
}
}
--
Gitblit v1.9.3