checkpoint: v3.0.2 — 自适应网格布局,容器宽度灵活可变 260-500pt,等距 16pt 间距
1 files modified
56 ■■■■ changed files
Apptag/ContentView.swift 56 ●●●● patch | view | raw | blame | history
Apptag/ContentView.swift
@@ -391,53 +391,26 @@
    }
    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)
                            }
                        }
                    }
        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)
            }
            .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 {
    /// 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)
@@ -457,7 +430,6 @@
                }
            }
        }
        .frame(width: width)
        .padding(16)
        .background(
            RoundedRectangle(cornerRadius: 14)