Improvements

release
Laurent 3 years ago
parent 5ea3c3f824
commit ec1a7327b8
  1. 16
      LaunchWidget/CountdownView.swift
  2. 4
      LaunchWidget/LaunchWidget.swift
  3. 2
      LeCountdown/Views/NewCountdownView.swift

@ -6,9 +6,12 @@
// //
import SwiftUI import SwiftUI
import WidgetKit
struct CountdownView: View { struct CountdownView: View {
@Environment(\.widgetFamily) var family: WidgetFamily
var name: String? var name: String?
var duration: Double var duration: Double
@ -17,13 +20,22 @@ struct CountdownView: View {
Text(name ?? "") Text(name ?? "")
Text(duration.minuteSecond) 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 { struct CountdownView_Previews: PreviewProvider {
static var previews: some View { static var previews: some View {
CountdownView(name: "Tea", duration: 3 * 60.0) CountdownView(name: "Tea", duration: 3 * 60.0).previewContext(WidgetPreviewContext(family: .accessoryRectangular))
} }
} }

@ -70,6 +70,7 @@ struct LaunchWidgetEntryView : View {
var body: some View { var body: some View {
switch family { switch family {
case .systemSmall: CountdownWidgetView(id: entry.id, name: entry.name, duration: entry.duration) case .systemSmall: CountdownWidgetView(id: entry.id, name: entry.name, duration: entry.duration)
// case .systemMedium: GameStatusWithLastTurnResult(gameStatus) // case .systemMedium: GameStatusWithLastTurnResult(gameStatus)
// case .systemLarge: GameStatusWithStatistics(gameStatus) // case .systemLarge: GameStatusWithStatistics(gameStatus)
// case .systemExtraLarge: GameStatusWithStatisticsExtraLarge(gameStatus) // case .systemExtraLarge: GameStatusWithStatisticsExtraLarge(gameStatus)
@ -102,5 +103,8 @@ struct LaunchWidget_Previews: PreviewProvider {
static var previews: some View { static var previews: some View {
LaunchWidgetEntryView(entry: SimpleEntry(id: "", name: "Tea", duration: 3 * 60.0, date: Date(), configuration: SelectCountdownIntent())) LaunchWidgetEntryView(entry: SimpleEntry(id: "", name: "Tea", duration: 3 * 60.0, date: Date(), configuration: SelectCountdownIntent()))
.previewContext(WidgetPreviewContext(family: .systemSmall)) .previewContext(WidgetPreviewContext(family: .systemSmall))
LaunchWidgetEntryView(entry: SimpleEntry(id: "", name: "Tea", duration: 3 * 60.0, date: Date(), configuration: SelectCountdownIntent()))
.previewContext(WidgetPreviewContext(family: .accessoryRectangular))
} }
} }

@ -197,7 +197,7 @@ struct CountdownEditView : View {
self._saveContext() 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() self._popOrDismiss()
} }

Loading…
Cancel
Save