fix: make Message and ApprovalRequest text containers scrollable and remove Acknowledge button from loading screens
This commit is contained in:
@@ -304,8 +304,10 @@ fun ApprovalRequestComponent(
|
|||||||
Box(
|
Box(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
|
.weight(1f, fill = false)
|
||||||
.background(DeepBg, RoundedCornerShape(12.dp))
|
.background(DeepBg, RoundedCornerShape(12.dp))
|
||||||
.border(1.dp, Color.White.copy(alpha = 0.1f), RoundedCornerShape(12.dp))
|
.border(1.dp, Color.White.copy(alpha = 0.1f), RoundedCornerShape(12.dp))
|
||||||
|
.verticalScroll(rememberScrollState())
|
||||||
.padding(12.dp)
|
.padding(12.dp)
|
||||||
) {
|
) {
|
||||||
Text(
|
Text(
|
||||||
@@ -459,8 +461,10 @@ fun MessageComponent(
|
|||||||
Box(
|
Box(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
|
.weight(1f, fill = false)
|
||||||
.background(DeepBg, RoundedCornerShape(12.dp))
|
.background(DeepBg, RoundedCornerShape(12.dp))
|
||||||
.border(1.dp, Color.White.copy(alpha = 0.1f), RoundedCornerShape(12.dp))
|
.border(1.dp, Color.White.copy(alpha = 0.1f), RoundedCornerShape(12.dp))
|
||||||
|
.verticalScroll(rememberScrollState())
|
||||||
.padding(16.dp)
|
.padding(16.dp)
|
||||||
) {
|
) {
|
||||||
Text(
|
Text(
|
||||||
@@ -472,6 +476,7 @@ fun MessageComponent(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (message.primaryAction != null) {
|
||||||
Button(
|
Button(
|
||||||
onClick = { onAcknowledge(message.primaryAction?.id) },
|
onClick = { onAcknowledge(message.primaryAction?.id) },
|
||||||
colors = ButtonDefaults.buttonColors(backgroundColor = MaterialTheme.colors.primary),
|
colors = ButtonDefaults.buttonColors(backgroundColor = MaterialTheme.colors.primary),
|
||||||
@@ -489,4 +494,5 @@ fun MessageComponent(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user