Laurent 3 years ago
parent 9bb6e824cb
commit ded4d7b32d
  1. 13
      LeCountdown/Views/LiveTimerListView.swift

@ -186,11 +186,17 @@ struct LiveCountdownView: View {
Group { Group {
if cancelled { if cancelled {
Image(systemName: "xmark.circle").foregroundColor(.accentColor) Image(systemName: "xmark.circle")
.foregroundColor(.accentColor)
} else if !running { } else if !running {
GreenCheckmarkView() GreenCheckmarkView()
} else { } else {
Image(systemName: "xmark.circle.fill").foregroundColor(.accentColor) Button {
self.showConfirmationPopup = true
} label: {
Image(systemName: "xmark.circle.fill")
.foregroundColor(.accentColor)
}
} }
}.font(.system(size: actionButtonFontSize)) }.font(.system(size: actionButtonFontSize))
@ -198,11 +204,8 @@ struct LiveCountdownView: View {
} }
.contentShape(Rectangle()) .contentShape(Rectangle())
.onTapGesture { .onTapGesture {
if Conductor.maestro.isCountdownCancelled(self.countdown) { if Conductor.maestro.isCountdownCancelled(self.countdown) {
self._dismiss() self._dismiss()
} else {
self.showConfirmationPopup = true
} }
} }
.frame(height: liveViewSize) .frame(height: liveViewSize)

Loading…
Cancel
Save