From 7a96731ceecfe085437b519e86dc84575b4dd3ad Mon Sep 17 00:00:00 2001
From: rapaf <rapafun@gmail.com>
Date: Wed, 19 Aug 2026 15:43:34 +0200
Subject: [PATCH] Revert "ver 1.6 kosmetyka"

This reverts commit a0817af855956e67ce038aebf6691a26740e70ba.
---
 .../com/bartek/iwentaryzacja/MainActivity.kt  | 67 +++++++++----------
 1 file changed, 33 insertions(+), 34 deletions(-)

diff --git a/app/src/main/java/com/bartek/iwentaryzacja/MainActivity.kt b/app/src/main/java/com/bartek/iwentaryzacja/MainActivity.kt
index 94bffb2..f514009 100644
--- a/app/src/main/java/com/bartek/iwentaryzacja/MainActivity.kt
+++ b/app/src/main/java/com/bartek/iwentaryzacja/MainActivity.kt
@@ -574,46 +574,45 @@ fun InventoryScreen(viewModel: InventoryViewModel = viewModel()) {
                     shape = RoundedCornerShape(8.dp),
                     modifier = Modifier.fillMaxWidth()
                 ) {
-                    Column(modifier = Modifier.padding(vertical = 2.dp, horizontal = 8.dp)) {
+                    Column(modifier = Modifier.padding(8.dp)) {
+                        if (branchName.isNotEmpty() || reportDate.isNotEmpty()) {
+                            Row(
+                                modifier = Modifier.fillMaxWidth(),
+                                horizontalArrangement = Arrangement.SpaceBetween
+                            ) {
+                                Text(
+                                    text = branchName,
+                                    color = Color(0xFF11CAA0),
+                                    fontSize = 11.sp,
+                                    fontWeight = FontWeight.Bold,
+                                    maxLines = 1
+                                )
+                                Text(
+                                    text = reportDate,
+                                    color = Color.Gray,
+                                    fontSize = 10.sp
+                                )
+                            }
+                            Spacer(modifier = Modifier.height(4.dp))
+                        }
                         Row(
                             modifier = Modifier.fillMaxWidth(),
-                            horizontalArrangement = Arrangement.SpaceBetween,
-                            verticalAlignment = Alignment.CenterVertically
+                            horizontalArrangement = Arrangement.SpaceBetween
                         ) {
-                            Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.weight(1f)) {
-                                if (branchName.isNotEmpty()) {
-                                    Text(
-                                        text = branchName,
-                                        color = Color(0xFF11CAA0),
-                                        fontSize = 10.sp,
-                                        fontWeight = FontWeight.Bold,
-                                        maxLines = 1
-                                    )
-                                    Spacer(modifier = Modifier.width(6.dp))
-                                }
-                                if (reportDate.isNotEmpty()) {
-                                    Text(
-                                        text = reportDate,
-                                        color = Color.Gray,
-                                        fontSize = 9.sp
-                                    )
-                                }
-                                if (branchName.isEmpty() && reportDate.isEmpty()) {
-                                    Text("Postęp:", color = Color.Gray, fontSize = 10.sp)
-                                }
-                            }
+                            Text("Postęp:", color = Color.Gray, fontSize = 12.sp)
                             Text(
-                                text = "$checkedCount/$totalCount (${(progress * 100).toInt()}%)",
+                                "$checkedCount / $totalCount (${(progress * 100).toInt()}%)",
                                 color = Color.White,
                                 fontWeight = FontWeight.Bold,
-                                fontSize = 11.sp
+                                fontSize = 12.sp
                             )
                         }
+                        Spacer(modifier = Modifier.height(4.dp))
                         LinearProgressIndicator(
                             progress = { progress },
                             modifier = Modifier
                                 .fillMaxWidth()
-                                .height(3.dp)
+                                .height(4.dp)
                                 .clip(RoundedCornerShape(2.dp)),
                             color = Color(0xFF11CAA0),
                             trackColor = Color(0xFF2A3447)
@@ -625,7 +624,7 @@ fun InventoryScreen(viewModel: InventoryViewModel = viewModel()) {
 
                 // Lista zajmuje elastyczną przestrzeń, ale zostanie ograniczona przez klawiaturę
                 LazyColumn(
-                    verticalArrangement = Arrangement.spacedBy(2.dp),
+                    verticalArrangement = Arrangement.spacedBy(4.dp),
                     modifier = Modifier.weight(1f) // Używamy weight, aby zajęła resztę miejsca przed klawiaturą
                 ) {
                     items(filteredMachines, key = { it.id }) { machine ->
@@ -645,7 +644,7 @@ fun InventoryScreen(viewModel: InventoryViewModel = viewModel()) {
                         viewModel.setSearchQuery(it)
                         viewModel.setNumericOnlySearch(false)
                     },
-                    placeholder = { Text("szukanie po nazwie", fontSize = 12.sp, color = Color.Gray) },
+                    placeholder = { Text("Szukaj...", fontSize = 12.sp, color = Color.Gray) },
                     modifier = Modifier.fillMaxWidth().height(48.dp),
                     shape = RoundedCornerShape(8.dp),
                     singleLine = true,
@@ -908,7 +907,7 @@ fun MachineItem(
     ) {
         Row(
             modifier = Modifier
-                .padding(vertical = 4.dp, horizontal = 8.dp)
+                .padding(8.dp)
                 .fillMaxWidth(),
             verticalAlignment = Alignment.CenterVertically,
             horizontalArrangement = Arrangement.SpaceBetween
@@ -917,12 +916,12 @@ fun MachineItem(
                 Text(
                     text = machine.id,
                     fontWeight = FontWeight.Bold,
-                    fontSize = 13.sp,
+                    fontSize = 14.sp,
                     color = Color.White
                 )
                 Text(
                     text = machine.name,
-                    fontSize = 10.sp,
+                    fontSize = 11.sp,
                     color = Color.LightGray,
                     maxLines = 1
                 )
@@ -931,7 +930,7 @@ fun MachineItem(
             if (machine.originalStatus.isNotEmpty()) {
                 Text(
                     text = machine.originalStatus,
-                    fontSize = 11.sp,
+                    fontSize = 12.sp,
                     fontWeight = FontWeight.Medium,
                     color = Color(0xFF11CAA0),
                     modifier = Modifier.padding(start = 8.dp)