Fix: dynamically position title/content input fields below image grid based on layout type

app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,4 +1,4 @@
-#Fri Mar 06 23:02:01 CST 2026
+#Fri Mar 06 23:09:36 CST 2026
 path.4=14/classes.dex
 path.3=12/classes.dex
 path.2=10/classes.dex

app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.s

@@ -1 +1 @@
-פ8מ)ת*ר'‗&ט%<EFBFBD>!רש#
+פ8מ)ת*ר'‗&ט%<EFBFBD>!רש#<EFBFBD>#

app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/counters.tab

@@ -1,2 +1,2 @@
-40
+41
 0

app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.s

@@ -1 +1 @@
-ëXè¾
ú¹
Ñ~Ì>Ňô­
ï`ý¿
ÄJùÉ
ïNÔ›
î×
úbå4å²
×?Í#à“À2èjÓ*ú3ð²
À
+ëXè¾
ú¹
Ñ~Ì>Ňô­
ï`ý¿
ÄJùÉ
ïNÔ›
î×
úbå4å²
×?Í#à“À2èjÓ*ú3ð²
ÀÚë
ð2ã;

app/src/main/java/com/inspection/camera/ui/merge/MergeScreen.kt

@@ -258,87 +258,88 @@ fun MergeScreen(
                 }
             }
 
-            // 图片网格
-            LazyVerticalGrid(
-                columns = GridCells.Fixed(layoutType.cols),
-                contentPadding = PaddingValues(16.dp),
+            // 图片网格 - 根据布局类型动态调整高度
+            Column(
                 modifier = Modifier
-                    .weight(1f)
-                    .fillMaxWidth(),
-                horizontalArrangement = Arrangement.spacedBy(8.dp),
-                verticalArrangement = Arrangement.spacedBy(8.dp)
+                    .fillMaxWidth()
+                    .padding(horizontal = 16.dp)
             ) {
-                itemsIndexed(images) { index, imageWithCache ->
-                    Box(
-                        modifier = Modifier
-                            .aspectRatio(1f)
-                            .clip(RoundedCornerShape(8.dp))
-                            .background(Color.LightGray)
-                            .clickable {
-                                selectedImageIndex = index
-                                imagePickerLauncher.launch("image/*")
+                // 图片网格
+                Column(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                ) {
+                    // 动态创建行
+                    for (row in 0 until layoutType.rows) {
+                        Row(
+                            modifier = Modifier.fillMaxWidth(),
+                            horizontalArrangement = Arrangement.spacedBy(8.dp)
+                        ) {
+                            for (col in 0 until layoutType.cols) {
+                                val index = row * layoutType.cols + col
+                                if (index < images.size || index < layoutType.maxImages) {
+                                    Box(
+                                        modifier = Modifier
+                                            .weight(1f)
+                                            .aspectRatio(1f)
+                                            .clip(RoundedCornerShape(8.dp))
+                                            .background(Color.LightGray)
+                                            .then(
+                                                if (index < images.size) {
+                                                    Modifier.clickable {
+                                                        selectedImageIndex = index
+                                                        imagePickerLauncher.launch("image/*")
+                                                    }
+                                                } else {
+                                                    Modifier.clickable {
+                                                        imagePickerLauncher.launch("image/*")
+                                                    }
+                                                }
+                                            )
+                                    ) {
+                                        if (index < images.size) {
+                                            val imageWithCache = images[index]
+                                            AsyncImage(
+                                                model = ImageRequest.Builder(context)
+                                                    .data(imageWithCache.uri)
+                                                    .crossfade(true)
+                                                    .build(),
+                                                contentDescription = null,
+                                                contentScale = ContentScale.Crop,
+                                                modifier = Modifier.fillMaxSize()
+                                            )
+                                            
+                                            // 删除按钮
+                                            IconButton(
+                                                onClick = { images.removeAt(index) },
+                                                modifier = Modifier
+                                                    .align(Alignment.TopEnd)
+                                                    .size(32.dp)
+                                                    .background(Color.Black.copy(alpha = 0.5f), CircleShape)
+                                            ) {
+                                                Icon(
+                                                    Icons.Default.Close,
+                                                    contentDescription = "删除",
+                                                    tint = Color.White,
+                                                    modifier = Modifier.size(16.dp)
+                                                )
+                                            }
+                                        } else {
+                                            Icon(
+                                                Icons.Default.Add,
+                                                contentDescription = "添加图片",
+                                                tint = Color.Gray,
+                                                modifier = Modifier.size(48.dp)
+                                            )
+                                        }
+                                    }
+                                } else {
+                                    Spacer(modifier = Modifier.weight(1f))
+                                }
                             }
-                    ) {
-                        AsyncImage(
-                            model = ImageRequest.Builder(context)
-                                .data(imageWithCache.uri)
-                                .crossfade(true)
-                                .build(),
-                            contentDescription = null,
-                            contentScale = ContentScale.Crop,
-                            modifier = Modifier.fillMaxSize()
-                        )
-
-                        // 删除按钮
-                        IconButton(
-                            onClick = { images.removeAt(index) },
-                            modifier = Modifier
-                                .align(Alignment.TopEnd)
-                                .size(32.dp)
-                                .background(Color.Black.copy(alpha = 0.5f), CircleShape)
-                        ) {
-                            Icon(
-                                Icons.Default.Close,
-                                contentDescription = "删除",
-                                tint = Color.White,
-                                modifier = Modifier.size(16.dp)
-                            )
                         }
-
-                        // 替换图标
-                        Icon(
-                            Icons.Default.Refresh,
-                            contentDescription = "替换",
-                            tint = Color.White,
-                            modifier = Modifier
-                                .align(Alignment.BottomEnd)
-                                .size(32.dp)
-                                .padding(4.dp)
-                                .background(Color.Black.copy(alpha = 0.5f), CircleShape)
-                                .padding(4.dp)
-                        )
-                    }
-                }
-
-                // 添加图片按钮
-                if (images.size < layoutType.maxImages) {
-                    item {
-                        Box(
-                            modifier = Modifier
-                                .aspectRatio(1f)
-                                .clip(RoundedCornerShape(8.dp))
-                                .background(Color.LightGray.copy(alpha = 0.5f))
-                                .clickable {
-                                    imagePickerLauncher.launch("image/*")
-                                },
-                            contentAlignment = Alignment.Center
-                        ) {
-                            Icon(
-                                Icons.Default.Add,
-                                contentDescription = "添加图片",
-                                tint = Color.Gray,
-                                modifier = Modifier.size(48.dp)
-                            )
+                        if (row < layoutType.rows - 1) {
+                            Spacer(modifier = Modifier.height(8.dp))
                         }
                     }
                 }