diff --git a/LaunchWidget/CountdownView.swift b/LaunchWidget/CountdownView.swift index 396219f..d3c4507 100644 --- a/LaunchWidget/CountdownView.swift +++ b/LaunchWidget/CountdownView.swift @@ -6,9 +6,12 @@ // import SwiftUI +import WidgetKit struct CountdownView: View { + @Environment(\.widgetFamily) var family: WidgetFamily + var name: String? var duration: Double @@ -17,13 +20,22 @@ struct CountdownView: View { Text(name ?? "") Text(duration.minuteSecond) } - .font(.title2) + .font(self.font) + } + + private var font: Font { + switch family { + case .systemSmall, .systemMedium, .systemLarge, .systemExtraLarge: + return .title2 + default: + return .body + } } } struct CountdownView_Previews: PreviewProvider { static var previews: some View { - CountdownView(name: "Tea", duration: 3 * 60.0) + CountdownView(name: "Tea", duration: 3 * 60.0).previewContext(WidgetPreviewContext(family: .accessoryRectangular)) } } diff --git a/LaunchWidget/LaunchWidget.swift b/LaunchWidget/LaunchWidget.swift index 1c810c5..3099134 100644 --- a/LaunchWidget/LaunchWidget.swift +++ b/LaunchWidget/LaunchWidget.swift @@ -70,6 +70,7 @@ struct LaunchWidgetEntryView : View { var body: some View { switch family { case .systemSmall: CountdownWidgetView(id: entry.id, name: entry.name, duration: entry.duration) + // case .systemMedium: GameStatusWithLastTurnResult(gameStatus) // case .systemLarge: GameStatusWithStatistics(gameStatus) // case .systemExtraLarge: GameStatusWithStatisticsExtraLarge(gameStatus) @@ -102,5 +103,8 @@ struct LaunchWidget_Previews: PreviewProvider { static var previews: some View { LaunchWidgetEntryView(entry: SimpleEntry(id: "", name: "Tea", duration: 3 * 60.0, date: Date(), configuration: SelectCountdownIntent())) .previewContext(WidgetPreviewContext(family: .systemSmall)) + LaunchWidgetEntryView(entry: SimpleEntry(id: "", name: "Tea", duration: 3 * 60.0, date: Date(), configuration: SelectCountdownIntent())) + .previewContext(WidgetPreviewContext(family: .accessoryRectangular)) + } } diff --git a/LeCountdown/Views/NewCountdownView.swift b/LeCountdown/Views/NewCountdownView.swift index 4e8117b..427375a 100644 --- a/LeCountdown/Views/NewCountdownView.swift +++ b/LeCountdown/Views/NewCountdownView.swift @@ -197,7 +197,7 @@ struct CountdownEditView : View { self._saveContext() - WidgetCenter.shared.reloadTimelines(ofKind: "com.staxriver.launch-widget") // refreshes the visual of existing widgets + WidgetCenter.shared.reloadAllTimelines() // refreshes the visual of existing widgets self._popOrDismiss() }