Merge remote-tracking branch 'main/master'

app/src/main/java/com/bartek/iwentaryzacja/MainActivity.kt

@@ -595,45 +595,46 @@ fun InventoryScreen(viewModel: InventoryViewModel = viewModel()) {
                     shape = RoundedCornerShape(8.dp),
                     modifier = Modifier.fillMaxWidth()
                 ) {
-                    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))
-                        }
+                    Column(modifier = Modifier.padding(vertical = 2.dp, horizontal = 8.dp)) {
                         Row(
                             modifier = Modifier.fillMaxWidth(),
-                            horizontalArrangement = Arrangement.SpaceBetween
+                            horizontalArrangement = Arrangement.SpaceBetween,
+                            verticalAlignment = Alignment.CenterVertically
                         ) {
-                            Text("Postęp:", color = Color.Gray, fontSize = 12.sp)
+                            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(
-                                "$checkedCount / $totalCount (${(progress * 100).toInt()}%)",
+                                text = "$checkedCount/$totalCount (${(progress * 100).toInt()}%)",
                                 color = Color.White,
                                 fontWeight = FontWeight.Bold,
-                                fontSize = 12.sp
+                                fontSize = 11.sp
                             )
                         }
-                        Spacer(modifier = Modifier.height(4.dp))
                         LinearProgressIndicator(
                             progress = { progress },
                             modifier = Modifier
                                 .fillMaxWidth()
-                                .height(4.dp)
+                                .height(3.dp)
                                 .clip(RoundedCornerShape(2.dp)),
                             color = Color(0xFF11CAA0),
                             trackColor = Color(0xFF2A3447)
@@ -645,7 +646,7 @@ fun InventoryScreen(viewModel: InventoryViewModel = viewModel()) {
 
                 // Lista zajmuje elastyczną przestrzeń, ale zostanie ograniczona przez klawiaturę
                 LazyColumn(
-                    verticalArrangement = Arrangement.spacedBy(4.dp),
+                    verticalArrangement = Arrangement.spacedBy(2.dp),
                     modifier = Modifier.weight(1f) // Używamy weight, aby zajęła resztę miejsca przed klawiaturą
                 ) {
                     items(filteredMachines, key = { it.id }) { machine ->
@@ -665,7 +666,7 @@ fun InventoryScreen(viewModel: InventoryViewModel = viewModel()) {
                         viewModel.setSearchQuery(it)
                         viewModel.setNumericOnlySearch(false)
                     },
-                    placeholder = { Text("Szukaj...", fontSize = 12.sp, color = Color.Gray) },
+                    placeholder = { Text("szukanie po nazwie", fontSize = 12.sp, color = Color.Gray) },
                     modifier = Modifier.fillMaxWidth().height(48.dp),
                     shape = RoundedCornerShape(8.dp),
                     singleLine = true,
@@ -943,7 +944,7 @@ fun MachineItem(
     ) {
         Row(
             modifier = Modifier
-                .padding(8.dp)
+                .padding(vertical = 4.dp, horizontal = 8.dp)
                 .fillMaxWidth(),
             verticalAlignment = Alignment.CenterVertically,
             horizontalArrangement = Arrangement.SpaceBetween
@@ -952,12 +953,12 @@ fun MachineItem(
                 Text(
                     text = machine.id,
                     fontWeight = FontWeight.Bold,
-                    fontSize = 14.sp,
+                    fontSize = 13.sp,
                     color = Color.White
                 )
                 Text(
                     text = machine.name,
-                    fontSize = 11.sp,
+                    fontSize = 10.sp,
                     color = Color.LightGray,
                     maxLines = 1
                 )
@@ -966,7 +967,7 @@ fun MachineItem(
             if (machine.originalStatus.isNotEmpty()) {
                 Text(
                     text = machine.originalStatus,
-                    fontSize = 12.sp,
+                    fontSize = 11.sp,
                     fontWeight = FontWeight.Medium,
                     color = Color(0xFF11CAA0),
                     modifier = Modifier.padding(start = 8.dp)