diff --git a/LeCountdown/Views/LiveTimerListView.swift b/LeCountdown/Views/LiveTimerListView.swift index 4d84140..8150cf3 100644 --- a/LeCountdown/Views/LiveTimerListView.swift +++ b/LeCountdown/Views/LiveTimerListView.swift @@ -186,11 +186,17 @@ struct LiveCountdownView: View { Group { if cancelled { - Image(systemName: "xmark.circle").foregroundColor(.accentColor) + Image(systemName: "xmark.circle") + .foregroundColor(.accentColor) } else if !running { GreenCheckmarkView() } else { - Image(systemName: "xmark.circle.fill").foregroundColor(.accentColor) + Button { + self.showConfirmationPopup = true + } label: { + Image(systemName: "xmark.circle.fill") + .foregroundColor(.accentColor) + } } }.font(.system(size: actionButtonFontSize)) @@ -198,11 +204,8 @@ struct LiveCountdownView: View { } .contentShape(Rectangle()) .onTapGesture { - if Conductor.maestro.isCountdownCancelled(self.countdown) { self._dismiss() - } else { - self.showConfirmationPopup = true } } .frame(height: liveViewSize)