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

ver 1.6 kosmetyka

Browse Source
This commit is contained in:
rapafun
2026-08-19 01:28:01 +02:00
parent 55309f8d79
commit a0817af855
1 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/bartek/iwentaryzacja/MainActivity.kt
+34 -33
View File
@@ -574,45 +574,46 @@ fun InventoryScreen(viewModel: InventoryViewModel = viewModel()) {
shape = RoundedCornerShape(8.dp), shape = RoundedCornerShape(8.dp),
modifier = Modifier.fillMaxWidth() modifier = Modifier.fillMaxWidth()
) { ) {
Column(modifier = Modifier.padding(8.dp)) { Column(modifier = Modifier.padding(vertical = 2.dp, horizontal = 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( Row(
modifier = Modifier.fillMaxWidth(), 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( Text(
"$checkedCount / $totalCount (${(progress * 100).toInt()}%)", text = "$checkedCount/$totalCount (${(progress * 100).toInt()}%)",
color = Color.White, color = Color.White,
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
fontSize = 12.sp fontSize = 11.sp
) )
} }
Spacer(modifier = Modifier.height(4.dp))
LinearProgressIndicator( LinearProgressIndicator(
progress = { progress }, progress = { progress },
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.height(4.dp) .height(3.dp)
.clip(RoundedCornerShape(2.dp)), .clip(RoundedCornerShape(2.dp)),
color = Color(0xFF11CAA0), color = Color(0xFF11CAA0),
trackColor = Color(0xFF2A3447) trackColor = Color(0xFF2A3447)
@@ -624,7 +625,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(4.dp), verticalArrangement = Arrangement.spacedBy(2.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 ->
@@ -644,7 +645,7 @@ fun InventoryScreen(viewModel: InventoryViewModel = viewModel()) {
viewModel.setSearchQuery(it) viewModel.setSearchQuery(it)
viewModel.setNumericOnlySearch(false) 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), modifier = Modifier.fillMaxWidth().height(48.dp),
shape = RoundedCornerShape(8.dp), shape = RoundedCornerShape(8.dp),
singleLine = true, singleLine = true,
@@ -907,7 +908,7 @@ fun MachineItem(
) { ) {
Row( Row(
modifier = Modifier modifier = Modifier
.padding(8.dp) .padding(vertical = 4.dp, horizontal = 8.dp)
.fillMaxWidth(), .fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.SpaceBetween horizontalArrangement = Arrangement.SpaceBetween
@@ -916,12 +917,12 @@ fun MachineItem(
Text( Text(
text = machine.id, text = machine.id,
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
fontSize = 14.sp, fontSize = 13.sp,
color = Color.White color = Color.White
) )
Text( Text(
text = machine.name, text = machine.name,
fontSize = 11.sp, fontSize = 10.sp,
color = Color.LightGray, color = Color.LightGray,
maxLines = 1 maxLines = 1
) )
@@ -930,7 +931,7 @@ fun MachineItem(
if (machine.originalStatus.isNotEmpty()) { if (machine.originalStatus.isNotEmpty()) {
Text( Text(
text = machine.originalStatus, text = machine.originalStatus,
fontSize = 12.sp, fontSize = 11.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)