From d22329f7de162266c7c5841e9e66a42d440487de Mon Sep 17 00:00:00 2001
From: Ariver <ar@MacBook-Air.local>
Date: Wed, 06 May 2026 14:44:52 +0800
Subject: [PATCH] checkpoint: v3.0.2 — Pinterest 瀑布流布局，HStack+LazyVStack 按最短列分配容器，无横纵间隙
---
Apptag/ContentView.swift | 182 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 149 insertions(+), 33 deletions(-)
diff --git a/Apptag/ContentView.swift b/Apptag/ContentView.swift
index a9e24e6..ff24e20 100644
--- a/Apptag/ContentView.swift
+++ b/Apptag/ContentView.swift
@@ -202,6 +202,8 @@
@State private var selectedAppPaths: Set<URL> = []
@State private var selectedTagNames: Set<String> = []
@State private var successToast: String? = nil
+ @State private var draggedTagNames: [String] = [] // live drag order
+ @State private var dragItem: String? = nil // currently dragged tag
// Configurable defaults
@AppStorage("defaultGroupName") private var defaultGroupName = "Other"
@@ -209,6 +211,7 @@
@AppStorage("iconSize") private var iconSize: Double = 56
@AppStorage("tagPosition") private var tagPosition = "left"
@State private var notchHeight: CGFloat = 0
+ @AppStorage("displayMode") private var displayMode = "flat"
private var isSideLayout: Bool {
tagPosition == "left" || tagPosition == "right"
@@ -267,8 +270,11 @@
func setEditPhase(_ phase: EditPhase) {
if phase != .none {
NotificationCenter.default.post(name: .apptagEditModeChanged, object: nil, userInfo: ["active": true])
- // Re-activate to ensure overlay window stays key during view transition
NSApp.activate(ignoringOtherApps: true)
+ // Sync drag order from database when entering edit mode
+ if draggedTagNames.isEmpty {
+ draggedTagNames = TagEditor.orderedTagNames()
+ }
}
editPhase = phase
if phase == .none {
@@ -359,23 +365,108 @@
Spacer()
ProgressView().scaleEffect(0.8)
Spacer()
+ } else if displayMode == "container" {
+ containerGrid
} else {
- 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
- ).id(group.id)
+ flatGrid
+ }
+ }
+ }
+
+ 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
+ ).id(group.id)
+ }
+ }.padding(20)
+ }.onAppear { scrollProxy = proxy }
+ }
+ }
+
+ private var containerGrid: some View {
+ GeometryReader { geo in
+ let totalWidth = geo.size.width - 40 // outer padding
+ let gap: CGFloat = 12
+ let containerMin: CGFloat = 300
+ let colCount = max(1, Int(totalWidth / containerMin))
+ let colWidth = (totalWidth - gap * CGFloat(colCount - 1)) / CGFloat(colCount)
+ let columns = distributeColumns(groups: groups, colCount: colCount, colWidth: colWidth)
+ ScrollView {
+ HStack(alignment: .top, spacing: gap) {
+ ForEach(0..<colCount, id: \.self) { col in
+ LazyVStack(spacing: gap) {
+ ForEach(columns[col]) { group in
+ containerView(for: group, width: colWidth)
+ .id(group.id)
}
- }.padding(20)
- }.onAppear { scrollProxy = proxy }
+ }
+ }
+ }
+ .padding(20)
+ }
+ }
+ }
+
+ /// Distribute groups across columns, putting each group in the shortest column.
+ private func distributeColumns(groups: [TagGroup], colCount: Int, colWidth: CGFloat) -> [[TagGroup]] {
+ var columns = Array(repeating: [TagGroup](), count: colCount)
+ var heights = Array(repeating: CGFloat(0), count: colCount)
+ for group in groups {
+ let h = estimatedHeight(for: group, width: colWidth)
+ let col = heights.firstIndex(of: heights.min()!)!
+ columns[col].append(group)
+ heights[col] += h
+ }
+ return columns
+ }
+
+ /// Rough height estimate for a container.
+ private func estimatedHeight(for group: TagGroup, width: CGFloat) -> CGFloat {
+ let innerWidth = width - 32 // padding
+ let itemW = iconSize + 28 + 6 // item + spacing
+ let perRow = max(1, Int(innerWidth / itemW))
+ let rows = (group.apps.count + perRow - 1) / perRow
+ return 30 + CGFloat(rows) * (iconSize + 30) + 32
+ }
+
+ /// Single container: header + app grid inside rounded rect.
+ private func containerView(for group: TagGroup, width: CGFloat) -> some View {
+ VStack(alignment: .leading, spacing: 6) {
+ HStack(spacing: 0) {
+ Rectangle().fill(.secondary.opacity(0.25)).frame(height: 1)
+ Text(group.name)
+ .font(.system(size: tagFontSize, weight: .semibold))
+ .foregroundStyle(.secondary)
+ .padding(.horizontal, 10)
+ Rectangle().fill(.secondary.opacity(0.25)).frame(height: 1)
+ }
+ let itemSize = iconSize + 28
+ LazyVGrid(
+ columns: [GridItem(.adaptive(minimum: itemSize, maximum: itemSize + 36), spacing: 6)],
+ spacing: 2
+ ) {
+ ForEach(group.apps) { app in
+ AppGridItem(app: app, iconSize: iconSize, onSelect: { openApp(app) })
}
}
}
+ .frame(width: width)
+ .padding(16)
+ .background(
+ RoundedRectangle(cornerRadius: 14)
+ .fill(.ultraThinMaterial)
+ )
+ .overlay(
+ RoundedRectangle(cornerRadius: 14)
+ .stroke(Color.primary.opacity(0.08), lineWidth: 1)
+ )
}
// MARK: - Edit Tags View
@@ -434,13 +525,32 @@
HStack(spacing: 0) {
VStack(alignment: .leading, spacing: 4) {
Text("Select tags:").font(.caption).foregroundStyle(.secondary).padding(.bottom, 4)
+ Text("Drag to reorder").font(.caption2).foregroundStyle(.tertiary).padding(.bottom, 2)
ScrollView(.vertical, showsIndicators: false) {
VStack(spacing: 4) {
ForEach(sortedTagNames, id: \.self) { tagName in
selectableTagItem(tagName)
+ .onDrag {
+ dragItem = tagName
+ return NSItemProvider(object: tagName as NSString)
+ }
+ .onDrop(of: [.text], isTargeted: nil) { providers, _ in
+ guard let fromName = dragItem,
+ var names = draggedTagNames as [String]?,
+ let fromIdx = names.firstIndex(of: fromName),
+ let toIdx = names.firstIndex(of: tagName),
+ fromIdx != toIdx
+ else { return false }
+ let toOffset = toIdx > fromIdx ? toIdx + 1 : toIdx
+ names.move(fromOffsets: [fromIdx], toOffset: toOffset)
+ draggedTagNames = names
+ TagEditor.reorderTags(names)
+ dragItem = nil
+ return true
+ }
}
}.padding(12)
- }.frame(width: 145)
+ }.frame(width: 155)
}
Rectangle().fill(.secondary.opacity(0.12)).frame(width: 1)
@@ -483,22 +593,21 @@
private func selectableTagItem(_ tagName: String) -> some View {
let isSelected = selectedTagNames.contains(tagName)
- return Button {
- if isSelected { selectedTagNames.remove(tagName) } else { selectedTagNames.insert(tagName) }
- } label: {
- HStack(spacing: 6) {
- Circle()
- .fill(isSelected ? Color.accentColor : Color.secondary.opacity(0.3))
- .frame(width: 16, height: 16)
- .overlay(isSelected ? Image(systemName: "checkmark").font(.system(size: 8, weight: .bold)).foregroundStyle(.white) : nil)
- Text(tagName).font(.system(size: 13, weight: .medium)).foregroundStyle(.primary)
- }
- .padding(.horizontal, 10).padding(.vertical, 5)
- .frame(maxWidth: .infinity, alignment: .leading)
- .background(RoundedRectangle(cornerRadius: 6)
- .fill(Color(nsColor: TagColor.nsColor(for: tagColors[tagName] ?? 0).withAlphaComponent(0.3))))
+ return HStack(spacing: 6) {
+ Circle()
+ .fill(isSelected ? Color.accentColor : Color.secondary.opacity(0.3))
+ .frame(width: 16, height: 16)
+ .overlay(isSelected ? Image(systemName: "checkmark").font(.system(size: 8, weight: .bold)).foregroundStyle(.white) : nil)
+ Text(tagName).font(.system(size: 13, weight: .medium)).foregroundStyle(.primary)
}
- .buttonStyle(.plain)
+ .padding(.horizontal, 10).padding(.vertical, 5)
+ .frame(maxWidth: .infinity, alignment: .leading)
+ .background(RoundedRectangle(cornerRadius: 6)
+ .fill(Color(nsColor: TagColor.nsColor(for: tagColors[tagName] ?? 0).withAlphaComponent(0.3))))
+ .contentShape(RoundedRectangle(cornerRadius: 6))
+ .onTapGesture {
+ if isSelected { selectedTagNames.remove(tagName) } else { selectedTagNames.insert(tagName) }
+ }
}
private func confirmAssign() {
@@ -544,9 +653,11 @@
// MARK: - Computed
private var sortedTagNames: [String] {
- tagColors.keys
- .filter { $0 != "Mac自带" && $0 != defaultGroupName }
- .sorted { $0.localizedStandardCompare($1) == .orderedAscending }
+ let filtered = tagColors.keys.filter { $0 != "Mac自带" && $0 != defaultGroupName }
+ // Use user-defined order, fall back to alpha
+ let ordered = draggedTagNames.filter { filtered.contains($0) }
+ let remaining = filtered.filter { !ordered.contains($0) }.sorted()
+ return ordered + remaining
}
private var tagLabels: [TagLabel] {
@@ -554,7 +665,10 @@
}
private var groups: [TagGroup] {
- AppIndexer.group(apps: allApps, defaultGroupName: defaultGroupName)
+ let order = draggedTagNames.isEmpty
+ ? TagEditor.orderedTagNames()
+ : draggedTagNames
+ return AppIndexer.group(apps: allApps, defaultGroupName: defaultGroupName, tagOrder: order)
}
// MARK: - Actions
@@ -570,9 +684,11 @@
let store = TagDatabase.migrateFromFinderIfNeeded(apps: apps)
apps = TagEditor.annotate(apps: apps)
let colors = store.tags.mapValues { $0.color }
+ let order = TagEditor.orderedTagNames()
DispatchQueue.main.async {
allApps = apps
tagColors = colors
+ draggedTagNames = order
}
}
}
--
Gitblit v1.9.3