From ec6e0da8224a54dd7273adc2a797f149fd9795c8 Mon Sep 17 00:00:00 2001
From: Ariver <shanghai3168@gmail.com>
Date: Wed, 20 May 2026 12:51:53 +0800
Subject: [PATCH] chore: mark stable baseline as 7.6.0
---
Apptag/AppGridItem.swift | 450 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 424 insertions(+), 26 deletions(-)
diff --git a/Apptag/AppGridItem.swift b/Apptag/AppGridItem.swift
index a607ac9..746d384 100644
--- a/Apptag/AppGridItem.swift
+++ b/Apptag/AppGridItem.swift
@@ -7,40 +7,438 @@
let app: AppInfo
let iconSize: CGFloat
var showName: Bool = true
+ var sourceTag: String? = nil
+ var dragModeActive: Bool = false
+ var onDragModeChange: ((Bool) -> Void)? = nil
+ var onBubbleHover: ((AppInfo, CGRect, AppBubbleHoverEvent) -> Void)? = nil
+ var onEditNote: ((AppInfo, CGRect) -> Void)? = nil
+ var bubbleDisabled: Bool = false
+ var itemID: String
+ var dragResetToken: Int = 0
+ @Binding var hoveredAppItemID: String?
let onSelect: () -> Void
- @State private var isHovered = false
+ @State private var interactionFrame: CGRect = .zero
+ @AppStorage("showUncommonAppBubbles") private var showUncommonAppBubbles = AppDefaults.showUncommonAppBubbles
+
+ static let hoverScale: CGFloat = 1.22
+ static let labelHeight: CGFloat = 14
+ private static let hoverInAnimation = Animation.easeOut(duration: 0.07)
+ private static let hoverOutAnimation = Animation.easeOut(duration: 0.045)
+
+ static func stableWidth(iconSize: CGFloat) -> CGFloat {
+ iconSize * hoverScale + 8
+ }
+
+ static func stableHeight(iconSize: CGFloat) -> CGFloat {
+ iconSize * hoverScale + labelHeight + 22
+ }
+
+ private var iconSlotSize: CGFloat { iconSize * Self.hoverScale }
+ private var labelWidth: CGFloat { iconSize + 20 }
+ private var labelHeight: CGFloat { Self.labelHeight }
+ private var isHovered: Bool { hoveredAppItemID == itemID }
var body: some View {
- Button(action: onSelect) {
- VStack(spacing: 6) {
- Image(nsImage: app.icon)
- .resizable()
- .aspectRatio(contentMode: .fit)
- .frame(width: iconSize, height: iconSize)
- .scaleEffect(isHovered ? 1.22 : 1.0)
- .shadow(
- color: .black.opacity(isHovered ? 0.35 : 0),
- radius: isHovered ? 14 : 0,
- y: isHovered ? 8 : 0
- )
- .animation(.spring(response: 0.3, dampingFraction: 0.7), value: isHovered)
+ VStack(spacing: 6) {
+ ZStack {
+ DraggableAppIconView(
+ icon: app.icon,
+ iconSize: iconSize,
+ payload: "\(app.path.path)\n\(sourceTag ?? "")",
+ onLongPress: { onDragModeChange?(true) },
+ onDragEnd: { onDragModeChange?(false) },
+ onClick: onSelect
+ )
+ .frame(width: iconSize, height: iconSize)
+ .scaleEffect(isHovered ? Self.hoverScale : 1.0)
+ .shadow(
+ color: .black.opacity(isHovered ? 0.35 : 0),
+ radius: isHovered ? 14 : 0,
+ y: isHovered ? 8 : 0
+ )
+ }
+ .frame(width: iconSlotSize, height: iconSlotSize)
- if showName {
- Text(app.name)
- .font(.system(size: 11, weight: .medium))
- .lineLimit(1)
- .truncationMode(.tail)
- .frame(maxWidth: iconSize + 20)
+ Text(app.name)
+ .font(.system(size: 11, weight: .medium))
+ .lineLimit(1)
+ .truncationMode(.tail)
+ .frame(width: labelWidth, height: labelHeight)
+ .opacity(showName ? 1 : (shouldShowHoverName ? 0.85 : 0))
+ }
+ .padding(.vertical, 8)
+ .padding(.horizontal, 4)
+ .frame(width: Self.stableWidth(iconSize: iconSize), height: Self.stableHeight(iconSize: iconSize))
+ .background(
+ AppGridItemHoverTracker { hovering, frame in
+ interactionFrame = frame
+ if bubbleDisabled || dragModeActive {
+ setHoverState(false)
+ onBubbleHover?(app, frame, .exited)
+ return
+ }
+ if hovering {
+ setHoverState(true)
+ onBubbleHover?(app, frame, .entered(canShowBubble: shouldShowAppBubble))
+ } else if isHovered {
+ setHoverState(false)
+ onBubbleHover?(app, frame, .exited)
+ } else {
+ setHoverState(false)
}
}
- .padding(.vertical, 8)
- .padding(.horizontal, 4)
- .contentShape(RoundedRectangle(cornerRadius: 10))
+ )
+ .contentShape(Rectangle())
+ .contextMenu {
+ Button(tr("appNote.edit")) {
+ onEditNote?(app, interactionFrame)
+ }
}
- .buttonStyle(.plain)
- .onHover { hovering in
- isHovered = hovering
+ .opacity(dragModeActive ? 0.92 : 1)
+ .animation(.easeOut(duration: 0.08), value: dragModeActive)
+ .id("\(itemID)|reset-\(dragResetToken)")
+ .onChange(of: dragModeActive) { _, active in
+ if active {
+ setHoverState(false)
+ onBubbleHover?(app, interactionFrame, .exited)
+ }
}
+ .onChange(of: bubbleDisabled) { _, disabled in
+ if disabled {
+ setHoverState(false)
+ onBubbleHover?(app, interactionFrame, .exited)
+ }
+ }
+ .onDisappear {
+ if hoveredAppItemID == itemID {
+ hoveredAppItemID = nil
+ onBubbleHover?(app, interactionFrame, .exited)
+ }
+ }
+ }
+
+ private var shouldShowAppBubble: Bool {
+ !showUncommonAppBubbles || app.isUncommon
+ }
+
+ private var shouldShowHoverName: Bool {
+ !showName && !shouldShowAppBubble && isHovered
+ }
+
+ private func setHoverState(_ hovering: Bool) {
+ withAnimation(hovering ? Self.hoverInAnimation : Self.hoverOutAnimation) {
+ if hovering {
+ hoveredAppItemID = itemID
+ } else if hoveredAppItemID == itemID {
+ hoveredAppItemID = nil
+ }
+ }
+ }
+}
+
+enum AppBubbleHoverEvent {
+ case entered(canShowBubble: Bool)
+ case exited
+}
+
+private struct AppGridItemHoverTracker: NSViewRepresentable {
+ let onHover: (Bool, CGRect) -> Void
+
+ func makeNSView(context: Context) -> HoverTrackingNSView {
+ let view = HoverTrackingNSView()
+ view.onHover = onHover
+ return view
+ }
+
+ func updateNSView(_ view: HoverTrackingNSView, context: Context) {
+ view.onHover = onHover
+ }
+}
+
+private final class HoverTrackingNSView: NSView {
+ var onHover: ((Bool, CGRect) -> Void)?
+
+ override func updateTrackingAreas() {
+ super.updateTrackingAreas()
+ trackingAreas.forEach(removeTrackingArea)
+ addTrackingArea(
+ NSTrackingArea(
+ rect: .zero,
+ options: [.mouseEnteredAndExited, .activeAlways, .inVisibleRect],
+ owner: self,
+ userInfo: nil
+ )
+ )
+ }
+
+ override func hitTest(_ point: NSPoint) -> NSView? {
+ nil
+ }
+
+ override func mouseEntered(with event: NSEvent) {
+ onHover?(true, rootLocalFrame())
+ }
+
+ override func mouseExited(with event: NSEvent) {
+ onHover?(false, rootLocalFrame())
+ }
+
+ private func rootLocalFrame() -> CGRect {
+ guard let contentView = window?.contentView else { return .zero }
+ let rectInContent = contentView.convert(bounds, from: self)
+ let y = contentView.isFlipped
+ ? rectInContent.minY
+ : contentView.bounds.height - rectInContent.maxY
+ return CGRect(
+ x: rectInContent.minX,
+ y: y,
+ width: rectInContent.width,
+ height: rectInContent.height
+ )
+ }
+}
+
+enum BubblePlacement {
+ case above
+ case below
+}
+
+struct AppNameBubble: View {
+ let appName: String
+ let note: String?
+ let isEditing: Bool
+ let placement: BubblePlacement
+ let arrowOffset: CGFloat
+ @Binding var draftNote: String
+ var noteFocused: FocusState<Bool>.Binding
+ let onCommit: () -> Void
+ let onCancel: () -> Void
+
+ private var displayNote: String {
+ note?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+ }
+
+ var body: some View {
+ content
+ .onExitCommand(perform: onCancel)
+ }
+
+ private var content: some View {
+ VStack(spacing: isEditing || !displayNote.isEmpty ? 8 : 0) {
+ Text(appName)
+ .font(.system(size: isEditing ? 22 : 24, weight: .bold))
+ .foregroundStyle(.white)
+ .lineLimit(1)
+ .truncationMode(.middle)
+ .frame(maxWidth: .infinity)
+
+ if isEditing {
+ VStack(alignment: .trailing, spacing: 4) {
+ TextField(tr("appNote.placeholder"), text: limitedDraft)
+ .textFieldStyle(.plain)
+ .font(.system(size: 15, weight: .medium))
+ .foregroundStyle(.white)
+ .padding(.horizontal, 12)
+ .frame(height: 36)
+ .background(
+ RoundedRectangle(cornerRadius: 9)
+ .fill(Color.white.opacity(0.12))
+ )
+ .focused(noteFocused)
+ .onSubmit(onCommit)
+ Text("\(draftNote.count) / \(TagDatabase.maxAppNoteLength)")
+ .font(.system(size: 10, weight: .medium))
+ .foregroundStyle(.white.opacity(0.35))
+ }
+ } else if !displayNote.isEmpty {
+ Text(displayNote)
+ .font(.system(size: 14, weight: .medium))
+ .lineSpacing(2)
+ .foregroundStyle(.white.opacity(0.78))
+ .lineLimit(4)
+ .multilineTextAlignment(.center)
+ .fixedSize(horizontal: false, vertical: true)
+ .frame(maxWidth: .infinity)
+ }
+ }
+ .padding(.horizontal, isEditing ? 22 : 24)
+ .padding(.vertical, isEditing ? 18 : 16)
+ .background(
+ RoundedRectangle(cornerRadius: 18, style: .continuous)
+ .fill(Color.black.opacity(0.92))
+ .shadow(color: .black.opacity(0.34), radius: 24, y: 16)
+ .shadow(color: .black.opacity(0.18), radius: 8, y: 3)
+ )
+ .overlay(alignment: placement == .above ? .bottom : .top) {
+ BubbleArrow(placement: placement)
+ .fill(Color.black.opacity(0.92))
+ .frame(width: 18, height: 9)
+ .offset(x: arrowOffset, y: placement == .above ? 8 : -8)
+ }
+ }
+
+ private var limitedDraft: Binding<String> {
+ Binding(
+ get: { draftNote },
+ set: { draftNote = String($0.prefix(TagDatabase.maxAppNoteLength)) }
+ )
+ }
+}
+
+private struct BubbleArrow: Shape {
+ let placement: BubblePlacement
+
+ func path(in rect: CGRect) -> Path {
+ var path = Path()
+ switch placement {
+ case .above:
+ path.move(to: CGPoint(x: rect.minX, y: rect.minY))
+ path.addLine(to: CGPoint(x: rect.maxX, y: rect.minY))
+ path.addLine(to: CGPoint(x: rect.midX, y: rect.maxY))
+ case .below:
+ path.move(to: CGPoint(x: rect.minX, y: rect.maxY))
+ path.addLine(to: CGPoint(x: rect.maxX, y: rect.maxY))
+ path.addLine(to: CGPoint(x: rect.midX, y: rect.minY))
+ }
+ path.closeSubpath()
+ return path
+ }
+}
+
+private struct DraggableAppIconView: NSViewRepresentable {
+ let icon: NSImage
+ let iconSize: CGFloat
+ let payload: String
+ let onLongPress: () -> Void
+ let onDragEnd: () -> Void
+ let onClick: () -> Void
+
+ func makeNSView(context: Context) -> DragIconNSView {
+ let view = DragIconNSView()
+ view.image = icon
+ view.iconSize = iconSize
+ view.payload = payload
+ view.onLongPress = onLongPress
+ view.onDragEnd = onDragEnd
+ view.onClick = onClick
+ return view
+ }
+
+ func updateNSView(_ view: DragIconNSView, context: Context) {
+ view.image = icon
+ view.iconSize = iconSize
+ view.payload = payload
+ view.onLongPress = onLongPress
+ view.onDragEnd = onDragEnd
+ view.onClick = onClick
+ view.needsDisplay = true
+ }
+}
+
+private final class DragIconNSView: NSView {
+ var image: NSImage = NSImage()
+ var iconSize: CGFloat = 56
+ var payload: String = ""
+ var onLongPress: (() -> Void)?
+ var onDragEnd: (() -> Void)?
+ var onClick: (() -> Void)?
+
+ private var mouseDownEvent: NSEvent?
+ private var didStartDrag = false
+ private var isLongPressActive = false
+ private var longPressWorkItem: DispatchWorkItem?
+ override var isFlipped: Bool { true }
+
+ override func draw(_ dirtyRect: NSRect) {
+ super.draw(dirtyRect)
+ let rect = NSRect(
+ x: (bounds.width - iconSize) / 2,
+ y: (bounds.height - iconSize) / 2,
+ width: iconSize,
+ height: iconSize
+ )
+ image.draw(in: rect)
+ }
+
+ override func mouseDown(with event: NSEvent) {
+ mouseDownEvent = event
+ didStartDrag = false
+ isLongPressActive = false
+ let workItem = DispatchWorkItem { [weak self] in
+ guard let self, self.mouseDownEvent != nil else { return }
+ self.isLongPressActive = true
+ self.onLongPress?()
+ }
+ longPressWorkItem = workItem
+ DispatchQueue.main.asyncAfter(deadline: .now() + 0.5, execute: workItem)
+ }
+
+ override func mouseDragged(with event: NSEvent) {
+ if didStartDrag {
+ AppDragCoordinator.shared.updateDragLocation(
+ screenPoint(for: event),
+ copy: event.modifierFlags.contains(.option)
+ )
+ return
+ }
+
+ guard let mouseDownEvent, isLongPressActive else { return }
+ let dx = event.locationInWindow.x - mouseDownEvent.locationInWindow.x
+ let dy = event.locationInWindow.y - mouseDownEvent.locationInWindow.y
+ guard hypot(dx, dy) > 3 else { return }
+
+ didStartDrag = true
+ longPressWorkItem?.cancel()
+ AppDragCoordinator.shared.beginDrag(
+ image: makeDragImage(),
+ payload: payload,
+ at: screenPoint(for: event),
+ copy: event.modifierFlags.contains(.option),
+ in: window
+ )
+ }
+
+ override func mouseUp(with event: NSEvent) {
+ longPressWorkItem?.cancel()
+ if didStartDrag {
+ AppDragCoordinator.shared.finishDrag(
+ at: screenPoint(for: event),
+ copy: event.modifierFlags.contains(.option)
+ )
+ onDragEnd?()
+ } else if !isLongPressActive {
+ onClick?()
+ } else {
+ onDragEnd?()
+ }
+ didStartDrag = false
+ isLongPressActive = false
+ mouseDownEvent = nil
+ }
+
+ private func makeDragImage() -> NSImage {
+ let scale: CGFloat = 1.22 * 1.5
+ let imageSize = iconSize * scale
+ let padding = iconSize * 0.45
+ let canvasSize = NSSize(width: imageSize + padding * 2, height: imageSize + padding * 2)
+ let dragImage = NSImage(size: canvasSize)
+
+ dragImage.lockFocus()
+ NSGraphicsContext.current?.imageInterpolation = .high
+
+ let shadow = NSShadow()
+ shadow.shadowColor = NSColor.black.withAlphaComponent(0.48)
+ shadow.shadowBlurRadius = 24
+ shadow.shadowOffset = NSSize(width: 0, height: -14)
+ shadow.set()
+
+ image.draw(in: NSRect(x: padding, y: padding, width: imageSize, height: imageSize))
+ dragImage.unlockFocus()
+ return dragImage
+ }
+
+ private func screenPoint(for event: NSEvent) -> NSPoint {
+ window?.convertPoint(toScreen: event.locationInWindow) ?? NSEvent.mouseLocation
}
}
--
Gitblit v1.9.3