From 9e9f4d32731c1e846aca528a7080ce77edd3dc47 Mon Sep 17 00:00:00 2001
From: Ariver <ar@MacBook-Air.local>
Date: Wed, 06 May 2026 14:49:09 +0800
Subject: [PATCH] checkpoint: v3.0.2 — 自适应网格布局，容器宽度灵活可变 260-500pt，等距 16pt 间距
---
Apptag/ContentView.swift | 85 ++++++++++++++++++++++--------------------
1 files changed, 44 insertions(+), 41 deletions(-)
diff --git a/Apptag/ContentView.swift b/Apptag/ContentView.swift
index a094b56..ec7baae 100644
--- a/Apptag/ContentView.swift
+++ b/Apptag/ContentView.swift
@@ -391,51 +391,54 @@
}
private var containerGrid: some View {
- GeometryReader { geo in
- let availableWidth = geo.size.width - 40 // padding
- let spacing: CGFloat = 16
- let containerMin: CGFloat = 320
- let colCount = max(1, Int((availableWidth + spacing) / (containerMin + spacing)))
- let cols = Array(repeating: GridItem(.flexible(), spacing: spacing), count: colCount)
- ScrollView {
- LazyVGrid(columns: cols, alignment: .leading, spacing: spacing) {
- ForEach(groups) { group in
- VStack(alignment: .leading, spacing: 6) {
- // Group header
- 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)
- }
- // App grid — adaptive inside the container
- 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) })
- }
- }
- }
+ let gap: CGFloat = 16
+ let minCardW: CGFloat = 260
+ let maxCardW: CGFloat = 500
+ return ScrollView {
+ LazyVGrid(
+ columns: [GridItem(.adaptive(minimum: minCardW, maximum: maxCardW), spacing: gap)],
+ spacing: gap
+ ) {
+ ForEach(groups) { group in
+ containerView(for: group)
.id(group.id)
- .padding(16)
- .background(
- RoundedRectangle(cornerRadius: 14)
- .fill(.ultraThinMaterial)
- )
- .overlay(
- RoundedRectangle(cornerRadius: 14)
- .stroke(Color.primary.opacity(0.08), lineWidth: 1)
- )
- }
}
- .padding(20)
+ }
+ .padding(20)
+ }
+ }
+
+ /// Single container: header + app grid inside rounded rect.
+ /// Width is intrinsic (not fixed) — adapts to content and grid column.
+ private func containerView(for group: TagGroup) -> 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) })
+ }
}
}
+ .padding(16)
+ .background(
+ RoundedRectangle(cornerRadius: 14)
+ .fill(.ultraThinMaterial)
+ )
+ .overlay(
+ RoundedRectangle(cornerRadius: 14)
+ .stroke(Color.primary.opacity(0.08), lineWidth: 1)
+ )
}
// MARK: - Edit Tags View
--
Gitblit v1.9.3