meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

feat: implement PacketResponseState.Error (#633)

Browse source
This commit is contained in:
Andre K 2023-05-12 18:29:31 -03:00 • committed by GitHub
parent 2502bee55f
commit 068f5e7544
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

33
app/src/main/java/com/geeksville/mesh/ui/components/config/PacketResponseStateDialog.kt
View file

@ -21,10 +21,9 @@ import com.geeksville.mesh.ui.PacketResponseState
@Composable
fun PacketResponseStateDialog(
state: PacketResponseState.Loading,
state: PacketResponseState,
onDismiss: () -> Unit
) {
val progress = state.completed.toFloat() / state.total.toFloat()
AlertDialog(
onDismissRequest = { },
text = {
@ -32,14 +31,20 @@ fun PacketResponseStateDialog(
modifier = Modifier.fillMaxWidth(),
horizontalAlignment = Alignment.CenterHorizontally
) {
Text("%.0f%%".format(progress * 100))
LinearProgressIndicator(
progress = progress,
modifier = Modifier
.fillMaxWidth()
.padding(top = 8.dp),
color = MaterialTheme.colors.onSurface,
)
if (state is PacketResponseState.Loading) {
val progress = state.completed.toFloat() / state.total.toFloat()
Text("%.0f%%".format(progress * 100))
LinearProgressIndicator(
progress = progress,
modifier = Modifier
.fillMaxWidth()
.padding(top = 8.dp),
color = MaterialTheme.colors.onSurface,
)
}
if (state is PacketResponseState.Error) {
Text("Error: ${state.error}")
}
}
},
buttons = {
@ -50,7 +55,13 @@ fun PacketResponseStateDialog(
Button(
onClick = onDismiss,
modifier = Modifier.padding(bottom = 16.dp)
) { Text(stringResource(R.string.cancel)) }
) {
if (state is PacketResponseState.Loading) {
Text(stringResource(R.string.cancel))
} else {
Text(stringResource(R.string.close))
}
}
}
}
)