From 6d1513601dee27efc79e592a21a230851df8b270 Mon Sep 17 00:00:00 2001
From: Ariver <shanghai3168@gmail.com>
Date: Sat, 23 May 2026 21:54:18 +0800
Subject: [PATCH] Prepare TagLauncher 7.6.0 release
---
Apptag/ContentView.swift | 704 +++++++++++++--------------------------------------------
1 files changed, 166 insertions(+), 538 deletions(-)
diff --git a/Apptag/ContentView.swift b/Apptag/ContentView.swift
index 117a25e..c163918 100644
--- a/Apptag/ContentView.swift
+++ b/Apptag/ContentView.swift
@@ -1,6 +1,5 @@
import SwiftUI
import AppKit
-import UniformTypeIdentifiers
// MARK: - Notification for manual re-index
@@ -201,7 +200,6 @@
let colorIndex: Int
var dragModeActive: Bool = false
var isDragging: Bool = false
- var dragResetToken: Int = 0
let action: () -> Void
private var bgColor: Color {
@@ -227,7 +225,6 @@
.opacity(dragModeActive ? (isDragging ? 1.0 : 0.62) : 1.0)
.animation(.easeOut(duration: 0.08), value: isDragging)
.animation(.easeOut(duration: 0.08), value: dragModeActive)
- .id("\(name)|reset-\(dragResetToken)")
.contentShape(RoundedRectangle(cornerRadius: 7))
.onTapGesture {
action()
@@ -242,7 +239,6 @@
let colorIndex: Int
var dragModeActive: Bool = false
var isDragging: Bool = false
- var dragResetToken: Int = 0
let action: () -> Void
private var bgColor: Color {
@@ -264,7 +260,6 @@
.opacity(dragModeActive ? (isDragging ? 1.0 : 0.62) : 1.0)
.animation(.easeOut(duration: 0.08), value: isDragging)
.animation(.easeOut(duration: 0.08), value: dragModeActive)
- .id("\(name)|reset-\(dragResetToken)")
.contentShape(RoundedRectangle(cornerRadius: 6))
.onTapGesture {
action()
@@ -319,6 +314,7 @@
let id = UUID()
let app: AppInfo
let assignedTags: [String]
+ let removableTags: [String]
}
private enum SmartStartNoticeMode {
@@ -339,9 +335,13 @@
let hideOverlay: () -> Void
private let initialQuickSearchSource: String?
+ @Environment(\.colorScheme) private var colorScheme
@State private var allApps: [AppInfo] = []
+ @State private var displayGroups: [TagGroup] = []
@State private var tagColors: [String: Int] = [:]
- @State private var scrollProxy: ScrollViewProxy? = nil
+ @State private var groupLayoutVersion = 0
+ @State private var appGridScrollTargetID: String? = nil
+ @State private var appGridScrollRequestToken = 0
// Edit mode
@State private var editPhase: EditPhase = .none
@@ -355,10 +355,8 @@
@State private var tagReorderFrames: [String: CGRect] = [:]
@State private var tagNavDragModeActive = false
@State private var tagNavDragItem: String? = nil
- @State private var tagNavDragResetToken = 0
@State private var tagNavReorderFrames: [String: CGRect] = [:]
@State private var tagNavReorderDidMove = false
- @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
@@ -370,7 +368,6 @@
@State private var refreshInProgress = false
@State private var refreshAgainAfterCurrent = false
@State private var refreshAgainForceLayout = false
- @State private var hoveredAppItemID: String? = nil
@State private var hoveredBubble: AppBubbleContext? = nil
@State private var editingBubble: AppBubbleContext? = nil
@State private var pendingUncategorizedDrop: PendingUncategorizedDrop? = nil
@@ -386,6 +383,7 @@
@State private var quickSearchSelectedID: URL? = nil
@State private var quickSearchManualSelection = false
@State private var quickSearchFocusToken = 0
+ @State private var quickSearchSelectionScrollToken = 0
@State private var quickSearchCloseHidesOverlay = false
@State private var quickSearchErrorMessage: String? = nil
@State private var initialQuickSearchConsumed = false
@@ -407,6 +405,7 @@
@State private var notchHeight: CGFloat = 0
@AppStorage("displayMode") private var displayMode = AppDefaults.displayMode
@AppStorage("hideAppNames") private var hideAppNames = AppDefaults.hideAppNames
+ @AppStorage("showUncommonAppBubbles") private var showUncommonAppBubbles = AppDefaults.showUncommonAppBubbles
private let editSidebarWidth: CGFloat = 188
private let editSidebarHorizontalInset: CGFloat = 12
@@ -416,6 +415,12 @@
appDragModeActive || pendingUncategorizedDrop != nil
}
private let rightSidebarFloatingClearance: CGFloat = 44
+
+ private var floatingButtonSurfaceColor: Color {
+ colorScheme == .dark
+ ? Color.white.opacity(0.10)
+ : Color.white.opacity(0.78)
+ }
private var isSideLayout: Bool {
tagPosition == "left" || tagPosition == "right"
@@ -429,23 +434,19 @@
displayMode == "container" || displayMode == "gridContainer"
}
- private var isColoredContainerMode: Bool {
- displayMode == "coloredContainer" || displayMode == "coloredGridContainer"
- }
-
- private var quickSearchOnlyMode: Bool {
- quickSearchVisible && quickSearchCloseHidesOverlay
+ private var shouldRenderAppGridBehindQuickSearch: Bool {
+ !quickSearchVisible || !quickSearchCloseHidesOverlay
}
var body: some View {
ZStack {
- if !quickSearchOnlyMode {
+ if shouldRenderAppGridBehindQuickSearch {
VisualEffectView(material: .hudWindow, blendingMode: .behindWindow)
.ignoresSafeArea()
.allowsHitTesting(false)
}
- if !quickSearchOnlyMode {
+ if shouldRenderAppGridBehindQuickSearch {
if notchHeight > 0 {
VStack {
Rectangle().fill(.black)
@@ -473,7 +474,7 @@
quickSearchOverlay
- if !quickSearchOnlyMode, let message = dropWarningToast {
+ if shouldRenderAppGridBehindQuickSearch, let message = dropWarningToast {
Text(message)
.font(.system(size: 16, weight: .semibold))
.foregroundStyle(.primary)
@@ -488,7 +489,7 @@
.allowsHitTesting(false)
}
- if !quickSearchOnlyMode && dropRefreshVisible {
+ if shouldRenderAppGridBehindQuickSearch && dropRefreshVisible {
Color.black.opacity(0.08)
.ignoresSafeArea()
.transition(.opacity)
@@ -510,12 +511,15 @@
}
.onAppear {
refreshNotchHeight()
- refreshApps()
+ refreshAppsIfNeeded()
if let initialQuickSearchSource, !initialQuickSearchConsumed {
initialQuickSearchConsumed = true
quickSearchCloseHidesOverlay = initialQuickSearchSource == QuickSearchOpenSource.globalHidden
- quickSearchVisible = true
- quickSearchFocusToken &+= 1
+ if !quickSearchVisible {
+ quickSearchVisible = true
+ quickSearchFocusToken &+= 1
+ }
+ refreshQuickSearchResults()
NotificationCenter.default.post(
name: .tagLauncherQuickSearchVisibilityChanged,
object: nil,
@@ -526,7 +530,7 @@
.onReceive(NotificationCenter.default.publisher(for: .tagLauncherOverlayDidShow)) { _ in
resetTransientDragState()
refreshNotchHeight()
- refreshApps()
+ refreshAppsIfNeeded()
}
.onReceive(NotificationCenter.default.publisher(for: .tagLauncherOverlayDidHide)) { _ in
resetTransientDragState()
@@ -568,6 +572,12 @@
if editingBubble != nil && !focused {
commitBubbleNote()
}
+ }
+ .onChange(of: draggedTagNames) { _, newOrder in
+ rebuildDisplayGroups(apps: allApps, tagOrder: newOrder)
+ }
+ .onChange(of: defaultGroupName) { _, _ in
+ rebuildDisplayGroups(apps: allApps, tagOrder: draggedTagNames)
}
.onChange(of: quickSearchQuery) { _, _ in
quickSearchErrorMessage = nil
@@ -627,6 +637,7 @@
results: quickSearchResults,
selectedID: quickSearchSelectedID,
focusToken: quickSearchFocusToken,
+ selectionScrollToken: quickSearchSelectionScrollToken,
isLoading: quickSearchDocuments.isEmpty && refreshInProgress,
maxVisibleRows: quickSearchMaxVisibleRows(in: proxy.size),
errorMessage: quickSearchErrorMessage,
@@ -758,9 +769,11 @@
let nextIndex = min(max(currentIndex + delta, 0), quickSearchResults.count - 1)
quickSearchSelectedID = quickSearchResults[nextIndex].id
quickSearchManualSelection = true
+ quickSearchSelectionScrollToken &+= 1
}
private func selectQuickSearchResult(_ result: QuickSearchResult) {
+ guard quickSearchSelectedID != result.id || !quickSearchManualSelection else { return }
quickSearchSelectedID = result.id
quickSearchManualSelection = true
}
@@ -821,7 +834,7 @@
) -> some View {
NativeFloatingIconButton(systemImage: systemImage, action: action)
.frame(width: 36, height: 36)
- .background(Circle().fill(.ultraThinMaterial))
+ .background(Circle().fill(floatingButtonSurfaceColor))
}
// MARK: - Top / Side Layouts
@@ -854,7 +867,6 @@
TagPill(name: tag.name, colorIndex: tag.colorIndex,
dragModeActive: tagNavDragModeActive && canReorderTag(tag.name),
isDragging: tagNavDragItem == tag.name,
- dragResetToken: tagNavDragResetToken,
action: {
activateTagNavigation(tag.id)
})
@@ -896,7 +908,6 @@
SideTagPill(name: tag.name, colorIndex: tag.colorIndex,
dragModeActive: tagNavDragModeActive && canReorderTag(tag.name),
isDragging: tagNavDragItem == tag.name,
- dragResetToken: tagNavDragResetToken,
action: {
activateTagNavigation(tag.id)
})
@@ -929,12 +940,33 @@
Spacer()
ProgressView().scaleEffect(0.8)
Spacer()
- } else if displayMode == "gridContainer" || displayMode == "coloredGridContainer" {
- gridContainerGrid
- } else if displayMode == "container" || displayMode == "coloredContainer" {
- containerGrid
} else {
- flatGrid
+ AppGridCollectionView(
+ groups: displayGroups,
+ tagColors: tagColors,
+ displayMode: displayMode,
+ iconSize: iconSize,
+ showNames: !hideAppNames,
+ bubbleDisabled: appBubbleDisabled,
+ showUncommonAppBubbles: showUncommonAppBubbles,
+ highlightedGroupName: filledColorlessContainer,
+ contentRevision: groupLayoutVersion,
+ scrollTargetID: appGridScrollTargetID,
+ scrollRequestToken: appGridScrollRequestToken,
+ onSelectApp: { app in openApp(app) },
+ onBubbleHover: handleBubbleHover,
+ onEditNote: beginEditingBubbleNote,
+ onDropApp: { path, source, target, copy in
+ dropApp(path: path, sourceTag: source, targetTag: target, copy: copy)
+ },
+ onGroupActivate: { groupName in
+ if isColorlessContainerMode {
+ toggleColorlessFill(groupName)
+ }
+ },
+ onScrollActivity: handleAppGridScrollActivity,
+ onDragModeChange: { setAppDragMode($0) }
+ )
}
}
}
@@ -956,7 +988,7 @@
)
AppNameBubble(
- appName: context.app.name,
+ appName: context.app.displayName,
note: currentNote(for: context.app),
isEditing: editing,
placement: placement,
@@ -1061,446 +1093,6 @@
.ignoresSafeArea()
.allowsHitTesting(smartStartNotice != nil)
}
- private var flatGrid: some View {
- ScrollViewReader { proxy in
- ScrollView {
- LazyVStack(alignment: .leading, spacing: 24) {
- ForEach(groups) { group in
- TagGroupView(
- group: group,
- onSelectApp: { app in openApp(app) },
- tagFontSize: tagFontSize,
- iconSize: iconSize,
- showNames: !hideAppNames,
- dragModeActive: appDragModeActive,
- onDragModeChange: { setAppDragMode($0) },
- onBubbleHover: handleBubbleHover,
- onEditNote: beginEditingBubbleNote,
- bubbleDisabled: appBubbleDisabled,
- dragResetToken: appDragResetToken,
- hoveredAppItemID: $hoveredAppItemID,
- onDropApp: { path, source, copy in
- dropApp(path: path, sourceTag: source, targetTag: group.name, copy: copy)
- }
- ).id(group.id)
- }
- }.padding(20)
- }
- .id(displayMode) // force rebuild on mode switch
- .onAppear { scrollProxy = proxy }
- }
- }
-
- private var containerGrid: some View {
- GeometryReader { geo in
- let outerPad: CGFloat = 20
- let gap: CGFloat = 16
- let available = geo.size.width - outerPad * 2
- let colW: CGFloat = 280
- 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)
-
- ScrollViewReader { proxy in
- ScrollView {
- HStack(alignment: .top, spacing: gap) {
- ForEach(0..<colCount, id: \.self) { ci in
- LazyVStack(spacing: gap) {
- ForEach(columns[ci]) { group in
- masonryCard(group, width: actualColW)
- .id(group.id)
- }
- }
- }
- }
- .padding(outerPad)
- }
- .id(displayMode) // force rebuild on mode switch
- .onAppear { scrollProxy = proxy }
- }
- }
- }
-
- /// Distribute groups to the shortest column.
- private func distributeToColumns(groups: [TagGroup], colCount: Int, colWidth: CGFloat) -> [[TagGroup]] {
- var cols = Array(repeating: [TagGroup](), count: colCount)
- var h = Array(repeating: CGFloat(0), count: colCount)
- for g in groups {
- let est = estimatedCardHeight(g, width: colWidth)
- let ci = h.firstIndex(of: h.min()!)!
- cols[ci].append(g)
- h[ci] += est + 16
- }
- return cols
- }
-
- private func estimatedCardHeight(_ group: TagGroup, width: CGFloat) -> CGFloat {
- let inner = width - 32
- 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) * AppGridItem.stableHeight(iconSize: iconSize)
- + CGFloat(max(0, rows - 1)) * 2
- }
-
- private func masonryCard(_ group: TagGroup, width: CGFloat) -> some View {
- let isColored = displayMode == "coloredContainer"
- 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) {
- 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)
- }
- 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,
- sourceTag: group.name,
- dragModeActive: appDragModeActive,
- onDragModeChange: { setAppDragMode($0) },
- onBubbleHover: handleBubbleHover,
- onEditNote: beginEditingBubbleNote,
- bubbleDisabled: appBubbleDisabled,
- itemID: "\(group.name)|\(app.path.path)",
- dragResetToken: appDragResetToken,
- hoveredAppItemID: $hoveredAppItemID,
- onSelect: { openApp(app) }
- )
- }
- }
- }
- .frame(maxWidth: width)
- .padding(16)
- .background(
- RoundedRectangle(cornerRadius: 14)
- .fill((isColored || isColorlessActive) ? tagColor.opacity(0.30) : Color.clear)
- .background(
- RoundedRectangle(cornerRadius: 14)
- .fill(.ultraThinMaterial)
- )
- )
- .overlay(
- 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 ? 8 : 0,
- y: (isColored && isHovered) || isColorlessActive ? 3 : 0)
- .zIndex(isHovered ? 50 : 0)
- .animation(.easeOut(duration: 0.045), value: isHovered)
- .animation(.easeOut(duration: 0.08), value: isColorlessFilled)
- .onHover { hovering in
- if isColored || isColorless {
- hoveredContainer = hovering ? group.name : nil
- }
- }
- .contentShape(RoundedRectangle(cornerRadius: 14))
- .onTapGesture {
- if isColorless {
- toggleColorlessFill(group.name)
- }
- }
- .onDrop(of: [UTType.plainText], isTargeted: nil) { providers in
- handleAppDrop(providers, targetTag: group.name)
- }
- }
-
- private var gridContainerGrid: some View {
- GeometryReader { geo in
- let outerPad: CGFloat = 20
- let gap: CGFloat = 16
- let available = geo.size.width - outerPad * 2
- let preferredCount = preferredGridContainersPerRow(availableWidth: available)
- let rows = gridContainerRows(groups: groups, trackCount: preferredCount, availableWidth: available, gap: gap)
-
- ScrollViewReader { proxy in
- ScrollView {
- VStack(alignment: .leading, spacing: gap) {
- ForEach(Array(rows.indices), id: \.self) { rowIndex in
- let row = rows[rowIndex]
-
- HStack(alignment: .top, spacing: gap) {
- 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)
- }
- }
- }
- }
- .padding(outerPad)
- .frame(maxWidth: .infinity, alignment: .topLeading)
- }
- .id(displayMode)
- .onAppear { scrollProxy = proxy }
- }
- }
- }
-
- private func preferredGridContainersPerRow(availableWidth: CGFloat) -> Int {
- 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 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 < 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 = AppGridItem.stableWidth(iconSize: iconSize) + 6
- return max(1, Int((inner + 6) / itemW))
- }
-
- private func iconRows(appCount: Int, width: CGFloat) -> Int {
- let cols = iconColumns(width: width)
- return max(1, (appCount + cols - 1) / cols)
- }
-
- 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 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) {
- 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)
- }
-
- 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) },
- onBubbleHover: handleBubbleHover,
- onEditNote: beginEditingBubbleNote,
- bubbleDisabled: appBubbleDisabled,
- itemID: "\(group.name)|\(app.path.path)",
- dragResetToken: appDragResetToken,
- hoveredAppItemID: $hoveredAppItemID,
- 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: contentWidth)
- .padding(16)
- .background(
- RoundedRectangle(cornerRadius: 14)
- .fill((isColored || isColorlessGridActive) ? tagColor.opacity(0.30) : Color.clear)
- .background(
- RoundedRectangle(cornerRadius: 14)
- .fill(.ultraThinMaterial)
- )
- )
- .overlay(
- 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 ? 8 : 0,
- y: (isColored && isHovered) || isColorlessGridActive ? 3 : 0)
- .zIndex(isHovered ? 50 : 0)
- .animation(.easeOut(duration: 0.045), value: isHovered)
- .animation(.easeOut(duration: 0.08), value: isColorlessFilled)
- .onHover { hovering in
- if isColored || isColorlessGrid {
- hoveredContainer = hovering ? group.name : nil
- } else if hovering {
- fillColorlessContainer(group.name)
- }
- }
- .contentShape(RoundedRectangle(cornerRadius: 14))
- .onTapGesture {
- 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])
- }
- }
-
// MARK: - Edit Tags View
private var editTagsView: some View {
@@ -1625,8 +1217,8 @@
columns: [
GridItem(
.adaptive(
- minimum: AppGridItem.stableWidth(iconSize: iconSize),
- maximum: AppGridItem.stableWidth(iconSize: iconSize) + 36
+ minimum: AppGridItemMetrics.stableWidth(iconSize: iconSize),
+ maximum: AppGridItemMetrics.stableWidth(iconSize: iconSize) + 36
),
spacing: 6
)
@@ -1995,14 +1587,20 @@
let result = SmartStartService.applySuggestion(draft)
let store = result.store
let apps = TagEditor.annotate(apps: scannedApps, store: store)
+ let quickSearchDocs = QuickSearchEngine.makeDocuments(apps: apps, store: store)
let colors = store.tags.mapValues { $0.color }
let order = TagEditor.orderedTagNames()
DispatchQueue.main.async {
pendingSmartStartDraft = nil
allApps = apps
+ quickSearchDocuments = quickSearchDocs
tagColors = colors
draggedTagNames = order
+ rebuildDisplayGroups(apps: apps, tagOrder: order)
+ if quickSearchVisible {
+ refreshQuickSearchResults()
+ }
if let summary = result.summary {
showSmartStartNotice(mode: .manuallyApplied, summary: summary)
} else {
@@ -2061,17 +1659,10 @@
tagName == TagDatabase.uncommonTagKey ? tr("group.uncommon") : tagName
}
- private var tagLabels: [TagLabel] {
- groups.map { TagLabel(name: $0.name, colorIndex: tagColors[$0.name] ?? 0) }
- }
-
- private var groups: [TagGroup] {
- let order = draggedTagNames.isEmpty
- ? TagEditor.orderedTagNames()
- : draggedTagNames
- let raw = AppIndexer.group(apps: allApps, defaultGroupName: defaultGroupName, tagOrder: order)
- // Translate stable keys for display
- return raw.map { group in
+ private func makeDisplayGroups(apps: [AppInfo], tagOrder: [String]) -> [TagGroup] {
+ let order = tagOrder.isEmpty ? TagEditor.orderedTagNames() : tagOrder
+ let rawGroups = AppIndexer.group(apps: apps, defaultGroupName: defaultGroupName, tagOrder: order)
+ return rawGroups.map { group in
if group.name == defaultGroupName {
return TagGroup(name: tr("group.uncategorized"), apps: group.apps)
}
@@ -2082,8 +1673,17 @@
}
}
+ private func rebuildDisplayGroups(apps: [AppInfo], tagOrder: [String]) {
+ displayGroups = makeDisplayGroups(apps: apps, tagOrder: tagOrder)
+ groupLayoutVersion &+= 1
+ }
+
+ private var tagLabels: [TagLabel] {
+ displayGroups.map { TagLabel(name: $0.name, colorIndex: tagColors[$0.name] ?? 0) }
+ }
+
private var editGroups: [TagGroup] {
- groups + [
+ displayGroups + [
TagGroup(
name: tr("group.uncommon"),
apps: allApps.filter(\.isUncommon).sorted {
@@ -2095,12 +1695,21 @@
// MARK: - Actions
+ private func refreshAppsIfNeeded() {
+ guard allApps.isEmpty, !refreshInProgress else { return }
+ refreshApps()
+ }
+
private func refreshNotchHeight() {
let mousePoint = NSEvent.mouseLocation
let activeScreen = NSScreen.screens.first(where: {
NSMouseInRect(mousePoint, $0.frame, false)
}) ?? NSScreen.main
notchHeight = activeScreen?.safeAreaInsets.top ?? 0
+ }
+
+ private func handleAppGridScrollActivity() {
+ hoveredBubble = nil
}
private func handleBubbleHover(app: AppInfo, frame: CGRect, event: AppBubbleHoverEvent) {
@@ -2158,13 +1767,16 @@
}
private func clearAppBubbleState() {
- hoveredAppItemID = nil
- hoveredBubble = nil
+ if hoveredBubble != nil {
+ hoveredBubble = nil
+ }
if editingBubble != nil {
notifyAppNoteEditing(active: false)
+ editingBubble = nil
}
- editingBubble = nil
- bubbleNoteFocused = false
+ if bubbleNoteFocused {
+ bubbleNoteFocused = false
+ }
}
private func notifyAppNoteEditing(active: Bool) {
@@ -2228,7 +1840,8 @@
}
func scrollTo(_ id: String) {
- withAnimation(.easeInOut(duration: 0.25)) { scrollProxy?.scrollTo(id, anchor: .top) }
+ appGridScrollTargetID = id
+ appGridScrollRequestToken &+= 1
}
private func activateTagNavigation(_ id: String) {
@@ -2299,13 +1912,14 @@
}
private func endTagNavReorder() {
+ let hadDragState = tagNavDragModeActive || tagNavDragItem != nil
+ guard hadDragState else { return }
if tagNavDragModeActive && tagNavReorderDidMove {
TagEditor.reorderTags(draggedTagNames)
}
tagNavDragModeActive = false
tagNavDragItem = nil
tagNavReorderDidMove = false
- tagNavDragResetToken &+= 1
}
private func cancelTagNavReorderVisualState() {
@@ -2313,7 +1927,6 @@
tagNavDragModeActive = false
tagNavDragItem = nil
tagNavReorderDidMove = false
- tagNavDragResetToken &+= 1
}
private func reorderTagNavItem(at location: CGPoint) {
@@ -2329,33 +1942,6 @@
let destination = toIndex > fromIndex ? toIndex + 1 : toIndex
draggedTagNames.move(fromOffsets: IndexSet(integer: fromIndex), toOffset: destination)
}
- }
-
- 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) {
@@ -2386,18 +1972,34 @@
private func confirmAndMoveAppToUncategorized(path: String) {
guard let app = allApps.first(where: { $0.path.path == path }) else { return }
- let assignedTags = assignedRegularDisplayTags(for: app)
- guard !assignedTags.isEmpty else { return }
+ let removableTags = removableRegularTags(for: app)
+ guard !removableTags.isEmpty else { return }
+ let assignedTags = assignedRegularDisplayTags(for: removableTags)
clearAppBubbleState()
withAnimation(.spring(response: 0.24, dampingFraction: 0.84)) {
- pendingUncategorizedDrop = PendingUncategorizedDrop(app: app, assignedTags: assignedTags)
+ pendingUncategorizedDrop = PendingUncategorizedDrop(
+ app: app,
+ assignedTags: assignedTags,
+ removableTags: removableTags
+ )
}
}
- private func assignedRegularDisplayTags(for app: AppInfo) -> [String] {
+ private func removableRegularTags(for app: AppInfo) -> [String] {
var result: [String] = []
for tag in app.tags {
+ guard isRemovableRegularTag(tag) else { continue }
+ if !result.contains(tag) {
+ result.append(tag)
+ }
+ }
+ return result
+ }
+
+ private func assignedRegularDisplayTags(for tags: [String]) -> [String] {
+ var result: [String] = []
+ for tag in tags {
let name = displayTagName(tag)
if !result.contains(name) {
result.append(name)
@@ -2410,7 +2012,7 @@
formattedFeedbackMessage(
forKey: "drop.uncategorizedConfirmMessage",
replacements: [
- "%appName%": pendingDrop.app.name,
+ "%appName%": pendingDrop.app.displayName,
"%tagCount%": "\(pendingDrop.assignedTags.count)",
"%tagNames%": pendingDrop.assignedTags.joined(separator: localizedListSeparator)
]
@@ -2427,11 +2029,12 @@
private func confirmPendingUncategorizedDrop() {
guard let pendingDrop = pendingUncategorizedDrop else { return }
let path = pendingDrop.app.path.path
- let tags = pendingDrop.app.tags
+ let tags = pendingDrop.removableTags
resetTransientDragState(keepingPendingUncategorizedDrop: true)
withAnimation(.easeOut(duration: 0.16)) {
pendingUncategorizedDrop = nil
}
+ guard !tags.isEmpty else { return }
TagEditor.removeTags(tags, from: [path])
showDropRefresh()
refreshApps(forceLayoutRefresh: true)
@@ -2451,6 +2054,18 @@
tr("group.appleBuiltIn")
]
return defaultNames.contains(targetTag)
+ }
+
+ private func isRemovableRegularTag(_ tag: String) -> Bool {
+ let protectedNames = [
+ "Mac自带",
+ tr("group.appleBuiltIn"),
+ defaultGroupName,
+ tr("group.uncategorized"),
+ TagDatabase.uncommonTagKey,
+ tr("group.uncommon")
+ ]
+ return !protectedNames.contains(tag) && tagColors[tag] != nil
}
private func showDropWarning() {
@@ -2484,6 +2099,7 @@
}
private func setAppDragMode(_ active: Bool) {
+ guard appDragModeActive != active else { return }
if active {
endTagNavReorder()
clearAppBubbleState()
@@ -2491,7 +2107,7 @@
appDragModeActive = active
if active {
DispatchQueue.main.asyncAfter(deadline: .now() + 8) {
- if appDragModeActive {
+ if appDragModeActive && !AppDragCoordinator.shared.hasActiveDrag {
appDragModeActive = false
}
}
@@ -2499,18 +2115,28 @@
}
private func resetTransientDragState(keepingPendingUncategorizedDrop: Bool = false) {
+ let hadAppDragState = appDragModeActive
AppDragCoordinator.shared.cancelDrag()
- appDragModeActive = false
- appDragResetToken &+= 1
- tagNavDragModeActive = false
- tagNavDragItem = nil
- tagNavReorderDidMove = false
- tagNavDragResetToken &+= 1
- dragItem = nil
- hoveredAppItemID = nil
- hoveredContainer = nil
+ if appDragModeActive {
+ appDragModeActive = false
+ }
+ if hadAppDragState {
+ appDragResetToken &+= 1
+ }
+ if tagNavDragModeActive {
+ tagNavDragModeActive = false
+ }
+ if tagNavDragItem != nil {
+ tagNavDragItem = nil
+ }
+ if tagNavReorderDidMove {
+ tagNavReorderDidMove = false
+ }
+ if dragItem != nil {
+ dragItem = nil
+ }
clearAppBubbleState()
- if !keepingPendingUncategorizedDrop {
+ if !keepingPendingUncategorizedDrop, pendingUncategorizedDrop != nil {
pendingUncategorizedDrop = nil
}
}
@@ -2542,6 +2168,7 @@
quickSearchDocuments = quickSearchDocs
tagColors = colors
draggedTagNames = order
+ rebuildDisplayGroups(apps: apps, tagOrder: order)
if quickSearchVisible {
refreshQuickSearchResults()
}
@@ -2590,7 +2217,8 @@
}
func openApp(_ app: AppInfo) {
- launchApp(app)
+ hideOverlay()
+ launchApp(app, closeOverlayOnSuccess: false)
}
}
--
Gitblit v1.9.3