From e775df4d281361dabf242c26f8c228146fcba642 Mon Sep 17 00:00:00 2001 From: Laurent Date: Mon, 4 Dec 2023 15:40:42 +0100 Subject: [PATCH] Put final end date for multiple steps countdown --- LaunchWidget/LaunchWidgetLiveActivity.swift | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/LaunchWidget/LaunchWidgetLiveActivity.swift b/LaunchWidget/LaunchWidgetLiveActivity.swift index 419ea07..fa20369 100644 --- a/LaunchWidget/LaunchWidgetLiveActivity.swift +++ b/LaunchWidget/LaunchWidgetLiveActivity.swift @@ -112,7 +112,9 @@ struct LaunchWidgetLiveActivity: Widget { } fileprivate func _name(context: ActivityViewContext) -> String { - if let name = context.state.sequence?.currentStep.name { + if let sequence = context.state.sequence, sequence.steps.count > 1 { + return context.attributes.name + } else if let name = context.state.sequence?.currentStep.name { return name } else { return context.attributes.name @@ -120,7 +122,9 @@ struct LaunchWidgetLiveActivity: Widget { } fileprivate func _date(context: ActivityViewContext) -> Date { - if let date = context.state.sequence?.currentStep.interval.end { + if let sequence = context.state.sequence, sequence.steps.count > 1 { + return sequence.end + } else if let date = context.state.sequence?.currentStep.interval.end { return date } else { return context.attributes.date