From 34f379b65de23a1e7d3c64dbaadc252944413eb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=B0=D1=88=D0=B8=D0=BD=20=D0=9C=D0=B0=D0=BA=D1=81?=
 =?UTF-8?q?=D0=B8=D0=BC?= <kashin20031984@mail.ru>
Date: Mon, 25 Dec 2023 23:39:52 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=8B=D1=82=D0=B0=D0=BB=D1=81=D1=8F=20?=
 =?UTF-8?q?=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D1=82=D1=8C=20=D0=BA=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B8=D1=81=D0=B2=D0=BE,=20=D0=BD=D0=B8=D1=87=D0=B5=D0=B3?=
 =?UTF-8?q?=D0=BE=20=D0=BD=D0=B5=20=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B8?=
 =?UTF-8?q?=D0=BE=D0=BB=D0=BE=D1=81=D1=8C,=20=D1=82=D0=BE=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=BA=D0=BE=20=D0=BD=D0=BE=D1=80=D0=BC=20=D0=BE=D1=82=D1=87?=
 =?UTF-8?q?=D0=B5=D1=82.=20=D0=A1=D0=B5=D0=B9=D1=87=D0=B0=D1=81=20=D1=81?=
 =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D0=B0=D1=8E=20=D0=BF=D1=80=D0=BE=D1=81=D1=82?=
 =?UTF-8?q?=D0=BE=20=D0=BD=D0=BE=D1=80=D0=BC=20=D0=B4=D0=B5=D0=B7=D0=B8?=
 =?UTF-8?q?=D0=B3=D0=BD,=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D1=81=D1=83=20?=
 =?UTF-8?q?=D0=B1=D0=B8=D0=B7=D0=BD=D0=B5=D1=81=D1=81=20=D0=BB=D0=BE=D0=B3?=
 =?UTF-8?q?=D0=B8=D0=BA=D1=83,=20=D0=B0=20=D1=82=D0=B0=D0=BC=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D1=81=D0=BC=D0=BE=D1=82=D1=80=D0=B8=D0=BC,=20=D1=83?=
 =?UTF-8?q?=D0=B6=D0=B5=200:00....?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../database/entities/composeui/ReportPage.kt | 42 ++++++++++++++-----
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/example/myapplication/database/entities/composeui/ReportPage.kt b/app/src/main/java/com/example/myapplication/database/entities/composeui/ReportPage.kt
index dc2bbc4..6ec1958 100644
--- a/app/src/main/java/com/example/myapplication/database/entities/composeui/ReportPage.kt
+++ b/app/src/main/java/com/example/myapplication/database/entities/composeui/ReportPage.kt
@@ -228,8 +228,8 @@ private fun createPdfContent(outputStream: OutputStream, reportData: List<Report
     val canvas = page.canvas
 
     val paint = Paint()
-    paint.color = android.graphics.Color.BLACK
-    paint.textSize = 24f
+    paint.textSize = 16f // Уменьшаем размер шрифта для лучшей видимости
+    paint.isAntiAlias = true
 
     // Отображаем заголовок
     val title = "Отчет"
@@ -237,14 +237,22 @@ private fun createPdfContent(outputStream: OutputStream, reportData: List<Report
     val yTitle = 40f
     canvas.drawText(title, xTitle, yTitle, paint)
 
-    // Отображаем данные из запроса
-    val yStart = yTitle + 40f
-    val lineHeight = 40f
+    // Отображаем данные в виде таблицы
+    val tableStartY = yTitle + 80f
+    val columnWidths = floatArrayOf(0.5f, 1.5f, 1f, 1.5f, 1f) // Увеличиваем ширину столбцов
+    val rowHeight = 30f // Увеличиваем высоту строки
+
+    drawTableRow(canvas, arrayOf("ID", "Дата проверки", "Вес", "Количество", "ID велосипеда"), columnWidths, tableStartY, paint)
+
     for ((index, report) in reportData.withIndex()) {
-        val y = yStart + index * lineHeight
-        Log.d("Проверка данных","${report.id} | ${report.dateTime} | ${report.weight} | ${report.maxCount} | ${report.bikeId}")
-        val text = "${report.id} | ${report.dateTime} | ${report.weight} | ${report.maxCount} | ${report.bikeId}"
-        canvas.drawText(text, 40f, y, paint)
+        val row = arrayOf(
+            report.id.toString(),
+            report.dateTime.toString(),
+            report.weight.toString(),
+            report.maxCount.toString(),
+            report.bikeId.toString()
+        )
+        drawTableRow(canvas, row, columnWidths, tableStartY + (index + 1) * rowHeight, paint)
     }
 
     pdfDocument.finishPage(page)
@@ -253,6 +261,18 @@ private fun createPdfContent(outputStream: OutputStream, reportData: List<Report
     pdfDocument.close()
 }
 
-private fun drawCell(canvas: Canvas, paint: Paint, text: String, x: Float, y: Float, width: Int) {
-    canvas.drawText(text, x + (width - paint.measureText(text)) / 2, y + paint.textSize, paint)
+private fun drawTableRow(
+    canvas: Canvas,
+    row: Array<String>,
+    columnWidths: FloatArray,
+    y: Float,
+    paint: Paint
+) {
+    var x = 40f
+    for (i in row.indices) {
+        val text = row[i]
+        canvas.drawText(text, x, y, paint)
+        x += columnWidths[i] * 80 // Увеличиваем ширину столбцов
+    }
 }
+