AR/InwentARyzacja
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Revert "ver 1.6 kosmetyka"

Browse Source 
This reverts commit a0817af855.
This commit is contained in:
rapafun
2026-08-19 15:43:34 +02:00
parent a0817af855
commit 7a96731cee
1 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/bartek/iwentaryzacja/MainActivity.kt
+21 -22
View File
@@ -574,46 +574,45 @@ fun InventoryScreen(viewModel: InventoryViewModel = viewModel()) {
shape = RoundedCornerShape(8.dp), shape = RoundedCornerShape(8.dp),
modifier = Modifier.fillMaxWidth() 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( Row(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.SpaceBetween, horizontalArrangement = Arrangement.SpaceBetween
verticalAlignment = Alignment.CenterVertically
) { ) {
Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.weight(1f)) {
if (branchName.isNotEmpty()) {
Text( Text(
text = branchName, text = branchName,
color = Color(0xFF11CAA0), color = Color(0xFF11CAA0),
fontSize = 10.sp, fontSize = 11.sp,
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
maxLines = 1 maxLines = 1
) )
Spacer(modifier = Modifier.width(6.dp))
}
if (reportDate.isNotEmpty()) {
Text( Text(
text = reportDate, text = reportDate,
color = Color.Gray, color = Color.Gray,
fontSize = 9.sp fontSize = 10.sp
) )
} }
if (branchName.isEmpty() && reportDate.isEmpty()) { Spacer(modifier = Modifier.height(4.dp))
Text("Postęp:", color = Color.Gray, fontSize = 10.sp)
}
} }
Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.SpaceBetween
) {
Text("Postęp:", color = Color.Gray, fontSize = 12.sp)
Text( Text(
text = "$checkedCount/$totalCount (${(progress * 100).toInt()}%)", "$checkedCount / $totalCount (${(progress * 100).toInt()}%)",
color = Color.White, color = Color.White,
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
fontSize = 11.sp fontSize = 12.sp
) )
} }
Spacer(modifier = Modifier.height(4.dp))
LinearProgressIndicator( LinearProgressIndicator(
progress = { progress }, progress = { progress },
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.height(3.dp) .height(4.dp)
.clip(RoundedCornerShape(2.dp)), .clip(RoundedCornerShape(2.dp)),
color = Color(0xFF11CAA0), color = Color(0xFF11CAA0),
trackColor = Color(0xFF2A3447) trackColor = Color(0xFF2A3447)
@@ -625,7 +624,7 @@ fun InventoryScreen(viewModel: InventoryViewModel = viewModel()) {
// Lista zajmuje elastyczną przestrzeń, ale zostanie ograniczona przez klawiaturę // Lista zajmuje elastyczną przestrzeń, ale zostanie ograniczona przez klawiaturę
LazyColumn( 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ą modifier = Modifier.weight(1f) // Używamy weight, aby zajęła resztę miejsca przed klawiaturą
) { ) {
items(filteredMachines, key = { it.id }) { machine -> items(filteredMachines, key = { it.id }) { machine ->
@@ -645,7 +644,7 @@ fun InventoryScreen(viewModel: InventoryViewModel = viewModel()) {
viewModel.setSearchQuery(it) viewModel.setSearchQuery(it)
viewModel.setNumericOnlySearch(false) 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), modifier = Modifier.fillMaxWidth().height(48.dp),
shape = RoundedCornerShape(8.dp), shape = RoundedCornerShape(8.dp),
singleLine = true, singleLine = true,
@@ -908,7 +907,7 @@ fun MachineItem(
) { ) {
Row( Row(
modifier = Modifier modifier = Modifier
.padding(vertical = 4.dp, horizontal = 8.dp) .padding(8.dp)
.fillMaxWidth(), .fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.SpaceBetween horizontalArrangement = Arrangement.SpaceBetween
@@ -917,12 +916,12 @@ fun MachineItem(
Text( Text(
text = machine.id, text = machine.id,
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
fontSize = 13.sp, fontSize = 14.sp,
color = Color.White color = Color.White
) )
Text( Text(
text = machine.name, text = machine.name,
fontSize = 10.sp, fontSize = 11.sp,
color = Color.LightGray, color = Color.LightGray,
maxLines = 1 maxLines = 1
) )
@@ -931,7 +930,7 @@ fun MachineItem(
if (machine.originalStatus.isNotEmpty()) { if (machine.originalStatus.isNotEmpty()) {
Text( Text(
text = machine.originalStatus, text = machine.originalStatus,
fontSize = 11.sp, fontSize = 12.sp,
fontWeight = FontWeight.Medium, fontWeight = FontWeight.Medium,
color = Color(0xFF11CAA0), color = Color(0xFF11CAA0),
modifier = Modifier.padding(start = 8.dp) modifier = Modifier.padding(start = 8.dp)