fix: avoid duplicate gateway reconnecting pill
This commit is contained in:
@@ -118,13 +118,7 @@ fun RootScreen(viewModel: MainViewModel) {
|
|||||||
contentDescription = "Approval pending",
|
contentDescription = "Approval pending",
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
if (lowerStatus.contains("reconnecting") || lowerStatus.contains("connecting")) {
|
// Avoid duplicating the primary bridge status ("Connecting…") in the activity slot.
|
||||||
return@remember StatusActivity(
|
|
||||||
title = "Gateway reconnecting…",
|
|
||||||
icon = Icons.Default.Refresh,
|
|
||||||
contentDescription = "Gateway reconnecting",
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (screenRecordActive) {
|
if (screenRecordActive) {
|
||||||
return@remember StatusActivity(
|
return@remember StatusActivity(
|
||||||
|
|||||||
@@ -216,9 +216,7 @@ private struct CanvasContent: View {
|
|||||||
if bridgeLower.contains("approval") || bridgeLower.contains("pairing") {
|
if bridgeLower.contains("approval") || bridgeLower.contains("pairing") {
|
||||||
return StatusPill.Activity(title: "Approval pending", systemImage: "person.crop.circle.badge.clock")
|
return StatusPill.Activity(title: "Approval pending", systemImage: "person.crop.circle.badge.clock")
|
||||||
}
|
}
|
||||||
if bridgeLower.contains("reconnecting") || bridgeLower.contains("connecting") {
|
// Avoid duplicating the primary bridge status ("Connecting…") in the activity slot.
|
||||||
return StatusPill.Activity(title: "Gateway reconnecting…", systemImage: "arrow.triangle.2.circlepath")
|
|
||||||
}
|
|
||||||
|
|
||||||
if self.appModel.screenRecordActive {
|
if self.appModel.screenRecordActive {
|
||||||
return StatusPill.Activity(title: "Recording screen…", systemImage: "record.circle.fill", tint: .red)
|
return StatusPill.Activity(title: "Recording screen…", systemImage: "record.circle.fill", tint: .red)
|
||||||
|
|||||||
@@ -98,9 +98,7 @@ struct RootTabs: View {
|
|||||||
if bridgeLower.contains("approval") || bridgeLower.contains("pairing") {
|
if bridgeLower.contains("approval") || bridgeLower.contains("pairing") {
|
||||||
return StatusPill.Activity(title: "Approval pending", systemImage: "person.crop.circle.badge.clock")
|
return StatusPill.Activity(title: "Approval pending", systemImage: "person.crop.circle.badge.clock")
|
||||||
}
|
}
|
||||||
if bridgeLower.contains("reconnecting") || bridgeLower.contains("connecting") {
|
// Avoid duplicating the primary bridge status ("Connecting…") in the activity slot.
|
||||||
return StatusPill.Activity(title: "Gateway reconnecting…", systemImage: "arrow.triangle.2.circlepath")
|
|
||||||
}
|
|
||||||
|
|
||||||
if self.appModel.screenRecordActive {
|
if self.appModel.screenRecordActive {
|
||||||
return StatusPill.Activity(title: "Recording screen…", systemImage: "record.circle.fill", tint: .red)
|
return StatusPill.Activity(title: "Recording screen…", systemImage: "record.circle.fill", tint: .red)
|
||||||
|
|||||||
Reference in New Issue
Block a user