Update 2.0 bond stats layout
This commit is contained in:
@@ -4204,64 +4204,38 @@ fun Greeting(name: String, modifier: Modifier = Modifier) {
|
|||||||
verticalArrangement = Arrangement.spacedBy(4.dp)
|
verticalArrangement = Arrangement.spacedBy(4.dp)
|
||||||
) {
|
) {
|
||||||
Text(
|
Text(
|
||||||
text = "PET RECORD",
|
text = "Bond",
|
||||||
fontWeight = FontWeight.Bold,
|
fontWeight = FontWeight.Bold
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
modifier = Modifier.fillMaxWidth()
|
|
||||||
)
|
)
|
||||||
|
|
||||||
Row {
|
Row {
|
||||||
Text(
|
Text(
|
||||||
text = "Bond",
|
text = "Time",
|
||||||
modifier = Modifier.width(92.dp),
|
modifier = Modifier.width(104.dp),
|
||||||
maxLines = 1,
|
|
||||||
softWrap = false
|
|
||||||
)
|
|
||||||
Text(text = "$bondPercent% $bondRelationship")
|
|
||||||
}
|
|
||||||
|
|
||||||
Row {
|
|
||||||
Text(
|
|
||||||
text = "Age",
|
|
||||||
modifier = Modifier.width(92.dp),
|
|
||||||
maxLines = 1,
|
maxLines = 1,
|
||||||
softWrap = false
|
softWrap = false
|
||||||
)
|
)
|
||||||
Text(text = petAgeText)
|
Text(text = petAgeText)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Row {
|
Row {
|
||||||
Text(
|
Text(
|
||||||
text = "Care",
|
text = "Strength",
|
||||||
modifier = Modifier.width(92.dp),
|
modifier = Modifier.width(104.dp),
|
||||||
maxLines = 1,
|
maxLines = 1,
|
||||||
softWrap = false
|
softWrap = false
|
||||||
)
|
)
|
||||||
Text(text = "$careScore")
|
Text(text = "$bondPercent%")
|
||||||
}
|
}
|
||||||
|
|
||||||
Row {
|
Row {
|
||||||
Text(
|
Text(
|
||||||
text = "Neglect",
|
text = "Status",
|
||||||
modifier = Modifier.width(92.dp),
|
modifier = Modifier.width(104.dp),
|
||||||
maxLines = 1,
|
maxLines = 1,
|
||||||
softWrap = false
|
softWrap = false
|
||||||
)
|
)
|
||||||
Text(text = "$neglectScore")
|
Text(text = bondRelationship)
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (testingMode) {
|
|
||||||
Row {
|
|
||||||
Text(
|
|
||||||
text = "Want",
|
|
||||||
modifier = Modifier.width(72.dp)
|
|
||||||
)
|
|
||||||
Text(text = currentWant.ifBlank { "None" })
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Spacer(modifier = Modifier.height(4.dp))
|
Spacer(modifier = Modifier.height(4.dp))
|
||||||
@@ -4311,7 +4285,7 @@ fun Greeting(name: String, modifier: Modifier = Modifier) {
|
|||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
LCDSubButton(
|
LCDSubButton(
|
||||||
text = "TRADE PET IN",
|
text = "SET PET FREE",
|
||||||
enabled = !isFindingNewPet,
|
enabled = !isFindingNewPet,
|
||||||
lcdDark = lcdDark,
|
lcdDark = lcdDark,
|
||||||
lcdFaded = lcdFaded,
|
lcdFaded = lcdFaded,
|
||||||
|
|||||||
Reference in New Issue
Block a user