checkpoint: v3.0.2 — 自适应网格布局，容器宽度灵活可变 260-500pt，等距 16pt 间距

Ariver

2026-05-06 9e9f4d32731c1e846aca528a7080ce77edd3dc47

 Apptag/ContentView.swift

@@ -211,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"
@@ -364,23 +365,80 @@
                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)
                            }
                        }.padding(20)
                    }.onAppear { scrollProxy = proxy }
                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 {
        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(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