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 | 255 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 238 insertions(+), 17 deletions(-)
diff --git a/Apptag/ContentView.swift b/Apptag/ContentView.swift
index 8962e5a..c3eb159 100644
--- a/Apptag/ContentView.swift
+++ b/Apptag/ContentView.swift
@@ -1,5 +1,6 @@
import SwiftUI
import AppKit
+import UniformTypeIdentifiers
// MARK: - Notification for manual re-index
@@ -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"
@@ -251,6 +257,41 @@
editTagsView
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 {
@@ -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 {
@@ -498,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) }
+ )
}
}
}
@@ -522,6 +579,12 @@
RoundedRectangle(cornerRadius: 14)
.stroke(Color.primary.opacity(0.08), lineWidth: 1)
)
+ .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)
@@ -538,6 +601,9 @@
if isColorless {
toggleColorlessFill(group.name)
}
+ }
+ .onDrop(of: [UTType.plainText], isTargeted: nil) { providers in
+ handleAppDrop(providers, targetTag: group.name)
}
}
@@ -574,7 +640,7 @@
}
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
@@ -678,7 +744,7 @@
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))
}
@@ -721,7 +787,15 @@
ForEach(rows.indices, id: \.self) { rowIndex in
HStack(alignment: .top, spacing: 6) {
ForEach(rows[rowIndex]) { 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) }
+ )
.frame(width: cellWidth)
.frame(height: cellHeight)
}
@@ -751,6 +825,12 @@
RoundedRectangle(cornerRadius: 14)
.stroke(Color.primary.opacity(0.08), lineWidth: 1)
)
+ .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)
@@ -770,10 +850,13 @@
toggleColorlessFill(group.name)
}
}
+ .onDrop(of: [UTType.plainText], isTargeted: nil) { providers in
+ handleAppDrop(providers, targetTag: group.name)
+ }
}
private func iconCellHeight() -> CGFloat {
- iconSize + (hideAppNames ? 16 : 42)
+ AppGridItem.stableHeight(iconSize: iconSize)
}
private func appRows(_ apps: [AppInfo], columns: Int, fixedRows: Int) -> [[AppInfo]] {
@@ -832,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)
@@ -917,7 +1000,15 @@
.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) }
@@ -945,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") }
@@ -962,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) {
@@ -982,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
@@ -1031,7 +1148,104 @@
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()
@@ -1042,11 +1256,18 @@
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()
if let bundleIdentifier = app.bundleIdentifier {
NSWorkspace.shared.launchApplication(
--
Gitblit v1.9.3