From 8e840c18bd301aa08758eaeeb38c8bfd9f2eb5f2 Mon Sep 17 00:00:00 2001
From: Ariver <ar@MacBook-Air.local>
Date: Sun, 10 May 2026 23:27:26 +0800
Subject: [PATCH] Add grid container display modes
---
Apptag/ContentView.swift | 331 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 286 insertions(+), 45 deletions(-)
diff --git a/Apptag/ContentView.swift b/Apptag/ContentView.swift
index def0d2b..14a9452 100644
--- a/Apptag/ContentView.swift
+++ b/Apptag/ContentView.swift
@@ -4,7 +4,6 @@
// MARK: - Notification for manual re-index
extension Notification.Name {
- static let apptagReindex = Notification.Name("ApptagReindex")
static let apptagEditModeChanged = Notification.Name("ApptagEditModeChanged")
}
@@ -204,7 +203,9 @@
@State private var successToast: String? = nil
@State private var draggedTagNames: [String] = [] // live drag order
@State private var dragItem: String? = nil // currently dragged tag
- @State private var highlightedGroup: String? = nil // container highlight
+ @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
// Configurable defaults
@AppStorage("defaultGroupName") private var defaultGroupName = "Other"
@@ -217,6 +218,14 @@
private var isSideLayout: Bool {
tagPosition == "left" || tagPosition == "right"
+ }
+
+ private var isColorlessContainerMode: Bool {
+ displayMode == "container" || displayMode == "gridContainer"
+ }
+
+ private var isColoredContainerMode: Bool {
+ displayMode == "coloredContainer" || displayMode == "coloredGridContainer"
}
var body: some View {
@@ -253,9 +262,6 @@
refreshApps()
}
.onReceive(NotificationCenter.default.publisher(for: NSApplication.didBecomeActiveNotification)) { _ in
- refreshApps()
- }
- .onReceive(NotificationCenter.default.publisher(for: .apptagReindex)) { _ in
refreshApps()
}
.onChange(of: editPhase) { _, newPhase in
@@ -341,12 +347,16 @@
ForEach(tagLabels) { tag in
TagPill(name: tag.name, colorIndex: tag.colorIndex,
action: {
- if highlightedGroup == tag.id { highlightedGroup = nil }
- else { highlightedGroup = tag.id }
+ if isColorlessContainerMode {
+ toggleColorlessFill(tag.id)
+ }
scrollTo(tag.id)
})
.onHover { hovering in
- if hovering { scrollTo(tag.id) }
+ if hovering {
+ fillColorlessContainer(tag.id)
+ scrollTo(tag.id)
+ }
}
}
}.padding(.horizontal, 24)
@@ -359,12 +369,16 @@
ForEach(tagLabels) { tag in
SideTagPill(name: tag.name, colorIndex: tag.colorIndex,
action: {
- if highlightedGroup == tag.id { highlightedGroup = nil }
- else { highlightedGroup = tag.id }
+ if isColorlessContainerMode {
+ toggleColorlessFill(tag.id)
+ }
scrollTo(tag.id)
})
.onHover { hovering in
- if hovering { scrollTo(tag.id) }
+ if hovering {
+ fillColorlessContainer(tag.id)
+ scrollTo(tag.id)
+ }
}
}
}.padding(12)
@@ -381,7 +395,9 @@
Spacer()
ProgressView().scaleEffect(0.8)
Spacer()
- } else if displayMode == "container" {
+ } else if displayMode == "gridContainer" || displayMode == "coloredGridContainer" {
+ gridContainerGrid
+ } else if displayMode == "container" || displayMode == "coloredContainer" {
containerGrid
} else {
flatGrid
@@ -462,8 +478,11 @@
}
private func masonryCard(_ group: TagGroup, width: CGFloat) -> some View {
- let isHL = highlightedGroup == group.name
- let hlColor = Color(nsColor: TagColor.nsColor(for: tagColors[group.name] ?? 0))
+ let isColored = displayMode == "coloredContainer"
+ let isColorless = isColorlessContainerMode
+ let isColorlessFilled = isColorless && filledColorlessContainer == group.name
+ let isHovered = hoveredContainer == group.name
+ 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)
@@ -492,13 +511,172 @@
.padding(16)
.background(
RoundedRectangle(cornerRadius: 14)
- .fill(.ultraThinMaterial)
+ .fill((isColored || isColorlessFilled) ? tagColor.opacity(0.30) : Color.clear)
+ .background(
+ RoundedRectangle(cornerRadius: 14)
+ .fill(.ultraThinMaterial)
+ )
)
.overlay(
RoundedRectangle(cornerRadius: 14)
- .stroke(isHL ? hlColor : Color.primary.opacity(0.08),
- lineWidth: isHL ? 3 : 1)
+ .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)
+ .scaleEffect(isColored && isHovered ? 1.015 : 1.0)
+ .animation(.spring(response: 0.25, dampingFraction: 0.82), value: isHovered)
+ .onHover { hovering in
+ if isColored {
+ hoveredContainer = hovering ? group.name : nil
+ } else if hovering {
+ fillColorlessContainer(group.name)
+ }
+ }
+ .contentShape(RoundedRectangle(cornerRadius: 14))
+ .onTapGesture {
+ if isColorlessFilled {
+ filledColorlessContainer = nil
+ }
+ }
+ }
+
+ 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, preferredCount: preferredCount)
+
+ ScrollViewReader { proxy in
+ ScrollView {
+ LazyVStack(alignment: .leading, spacing: gap) {
+ ForEach(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)
+ }
+ }
+ }
+ }
+ .padding(outerPad)
+ .frame(maxWidth: .infinity, alignment: .topLeading)
+ }
+ .id(displayMode)
+ .onAppear { scrollProxy = proxy }
+ }
+ }
+ }
+
+ private func preferredGridContainersPerRow(availableWidth: CGFloat) -> Int {
+ let minCardWidth = max(260, iconSize * 3 + 88)
+ 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]] = []
+ 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
+ }
+ return rows
+ }
+
+ private func iconColumns(width: CGFloat) -> Int {
+ let inner = width - 32
+ let itemW = iconSize + 34
+ 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 isColorless = isColorlessContainerMode
+ let isColorlessFilled = isColorless && filledColorlessContainer == group.name
+ let isHovered = hoveredContainer == group.name
+ let cols = iconColumns(width: width)
+ let maxCells = max(cols, fixedRows * cols)
+ let emptyCells = max(0, maxCells - group.apps.count)
+ 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)
+ }
+
+ 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))
+ }
+ }
+ }
+ .frame(width: width)
+ .padding(16)
+ .background(
+ RoundedRectangle(cornerRadius: 14)
+ .fill((isColored || isColorlessFilled) ? tagColor.opacity(0.30) : Color.clear)
+ .background(
+ RoundedRectangle(cornerRadius: 14)
+ .fill(.ultraThinMaterial)
+ )
+ )
+ .overlay(
+ 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)
+ .scaleEffect(isColored && isHovered ? 1.015 : 1.0)
+ .animation(.spring(response: 0.25, dampingFraction: 0.82), value: isHovered)
+ .onHover { hovering in
+ if isColored {
+ hoveredContainer = hovering ? group.name : nil
+ } else if hovering {
+ fillColorlessContainer(group.name)
+ }
+ }
+ .contentShape(RoundedRectangle(cornerRadius: 14))
+ .onTapGesture {
+ if isColorlessFilled {
+ filledColorlessContainer = nil
+ }
+ }
}
// MARK: - Edit Tags View
@@ -509,12 +687,12 @@
Button {
setEditPhase(.none)
} label: {
- Label("Exit editing", systemImage: "rectangle.portrait.and.arrow.right")
+ Label(tr("edit.exit"), systemImage: "rectangle.portrait.and.arrow.right")
.font(.system(size: 12))
}
.buttonStyle(.bordered)
Spacer()
- Text("Edit Tags").font(.headline)
+ Text(tr("edit.tags")).font(.headline)
Spacer()
}
.padding(.horizontal, 24)
@@ -537,14 +715,14 @@
VStack(spacing: 0) {
HStack {
Button { cancelEditApps(); setEditPhase(.none) } label: {
- Label("Exit editing", systemImage: "rectangle.portrait.and.arrow.right")
+ Label(tr("edit.exit"), systemImage: "rectangle.portrait.and.arrow.right")
.font(.system(size: 12))
}
.buttonStyle(.bordered)
Spacer()
- Text("Edit App Categories").font(.headline)
+ Text(tr("edit.title")).font(.headline)
Spacer()
- Button("Confirm") { confirmAssign() }
+ Button(tr("edit.confirm")) { confirmAssign() }
.buttonStyle(.borderedProminent)
.disabled(selectedAppPaths.isEmpty || selectedTagNames.isEmpty)
}
@@ -556,8 +734,8 @@
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)
+ Text(tr("edit.selectTags")).font(.caption).foregroundStyle(.secondary).padding(.bottom, 4)
+ Text(tr("edit.dragHint")).font(.caption2).foregroundStyle(.tertiary).padding(.bottom, 2)
ScrollView(.vertical, showsIndicators: false) {
VStack(spacing: 4) {
ForEach(sortedTagNames, id: \.self) { tagName in
@@ -589,23 +767,7 @@
if allApps.isEmpty {
Spacer(); ProgressView().scaleEffect(0.8); Spacer()
} else {
- ScrollView {
- LazyVStack(alignment: .leading, spacing: 24) {
- ForEach(groups) { group in
- 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)
- }
- LazyVGrid(columns: [GridItem(.adaptive(minimum: iconSize + 28, maximum: iconSize + 64), spacing: 6)], spacing: 2) {
- ForEach(group.apps) { app in editableAppItem(app) }
- }
- }
- }
- }.padding(20)
- }
+ editAppsGrid
}
}
@@ -621,6 +783,66 @@
}
}
}
+ }
+
+ 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)
+ }
+ }
+ }
+ }
+ .padding(outerPad)
+ .frame(maxWidth: .infinity, alignment: .topLeading)
+ }
+ }
+ }
+
+ private func editGroupCard(_ group: TagGroup, width: CGFloat) -> some View {
+ 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)
+ }
+ LazyVGrid(
+ columns: [GridItem(.adaptive(minimum: iconSize + 28, maximum: iconSize + 64), 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 {
@@ -650,7 +872,7 @@
}
selectedAppPaths = []; selectedTagNames = []
refreshApps()
- withAnimation { successToast = "分类成功" }
+ withAnimation { successToast = tr("edit.success") }
}
private func cancelEditApps() {
@@ -700,7 +922,17 @@
let order = draggedTagNames.isEmpty
? TagEditor.orderedTagNames()
: draggedTagNames
- return AppIndexer.group(apps: allApps, defaultGroupName: defaultGroupName, tagOrder: order)
+ let raw = AppIndexer.group(apps: allApps, defaultGroupName: defaultGroupName, tagOrder: order)
+ // Translate stable keys for display
+ return raw.map { group in
+ if group.name == defaultGroupName {
+ return TagGroup(name: tr("group.uncategorized"), apps: group.apps)
+ }
+ if group.name == "Mac自带" {
+ return TagGroup(name: tr("group.appleBuiltIn"), apps: group.apps)
+ }
+ return group
+ }
}
// MARK: - Actions
@@ -709,11 +941,20 @@
withAnimation(.easeInOut(duration: 0.25)) { scrollProxy?.scrollTo(id, anchor: .top) }
}
+ private func fillColorlessContainer(_ id: String) {
+ guard displayMode == "container" else { return }
+ filledColorlessContainer = id
+ }
+
+ private func toggleColorlessFill(_ id: String) {
+ guard displayMode == "container" else { return }
+ filledColorlessContainer = (filledColorlessContainer == id) ? nil : id
+ }
+
func refreshApps() {
DispatchQueue.global(qos: .userInitiated).async {
var apps = AppIndexer.scan()
- // Ensure migration ran at least once
- let store = TagDatabase.migrateFromFinderIfNeeded(apps: apps)
+ let store = TagDatabase.load()
apps = TagEditor.annotate(apps: apps)
let colors = store.tags.mapValues { $0.color }
let order = TagEditor.orderedTagNames()
--
Gitblit v1.9.3