staxriver
/
LeCountdown
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor improvements in widgets

Browse Source
release
Laurent 3 years ago
parent 31618c9f7d
commit 3e69ef40f1
4 changed files with 64 additions and 24 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 38
      LaunchWidget/DefaultView.swift
  2. 44
      LaunchWidget/LaunchWidget.swift
  3. 2
      LaunchWidget/SingleTimerView.swift
  4. 4
      LeCountdown.xcodeproj/project.pbxproj

38
LaunchWidget/DefaultView.swift
Unescape View File

@ -0,0 +1,38 @@
//
// DefaultView.swift
// LeCountdown
//
// Created by Laurent Morvillier on 17/02/2023.
//
import SwiftUI
import WidgetKit
struct DefaultView: View {
@Environment(\.widgetFamily) var family: WidgetFamily
var body: some View {
switch family {
case .accessoryCorner, .accessoryCircular, .accessoryRectangular, .accessoryInline:
VStack {
Text("Configure me!").monospaced()
}
default:
VStack {
Text("Configure me!\n")
Text("Tea".uppercased()).monospaced()
Text("4:00").monospaced()
}
}
}
}
struct DefaultView_Previews: PreviewProvider {
static var previews: some View {
DefaultView().previewContext(WidgetPreviewContext(family: .systemSmall))
}
}

44
LaunchWidget/LaunchWidget.swift
Unescape View File

@ -10,6 +10,7 @@ import SwiftUI
import Intents
struct Provider: IntentTimelineProvider {
func placeholder(in context: Context) -> SimpleEntry {
SimpleEntry(timers: [], date: Date(), configuration: SelectTimerIntent())
}
@ -74,15 +75,6 @@ struct CountdownMultiWidgetView: View {
}
struct VoidView : View {
var body: some View {
VStack {
Text("Tea!")
Text("4:00")
}
}
}
struct LaunchWidgetEntryView : View {
@Environment(\.widgetFamily) var family: WidgetFamily
@ -97,25 +89,29 @@ struct LaunchWidgetEntryView : View {
CountdownSimpleWidgetView(timer: timer)
.background(Image(timer.imageName))
} else {
VoidView()
DefaultView()
}
case .accessoryCircular:
if let countdown = entry.timers.first {
LockScreenCountdownView(timer: countdown)
.frame(maxWidth: .infinity, maxHeight: .infinity)
.background(Color.black)
} else {
VoidView()
Group {
if let countdown = entry.timers.first {
LockScreenCountdownView(timer: countdown)
} else {
DefaultView()
}
}
.frame(maxWidth: .infinity, maxHeight: .infinity)
.background(Color.white.opacity(0.1))
case .accessoryRectangular:
if let timer = entry.timers.first {
LockScreenCountdownView(timer: timer)
.frame(maxWidth: .infinity, maxHeight: .infinity)
.background(Color.black)
.cornerRadius(16.0)
} else {
VoidView()
Group {
if let timer = entry.timers.first {
LockScreenCountdownView(timer: timer)
} else {
DefaultView()
}
}
.frame(maxWidth: .infinity, maxHeight: .infinity)
.background(Color.white.opacity(0.1))
.cornerRadius(16.0)
default:
MultiCountdownView(timers: entry.timers)
}
@ -147,6 +143,8 @@ struct LaunchWidget_Previews: PreviewProvider {
.previewContext(WidgetPreviewContext(family: .systemSmall))
LaunchWidgetEntryView(entry: SimpleEntry(timers: [fake, fake, fake, fake], date: Date(), configuration: SelectTimerIntent()))
.previewContext(WidgetPreviewContext(family: .systemMedium))
LaunchWidgetEntryView(entry: SimpleEntry(timers: [fake], date: Date(), configuration: SelectTimerIntent()))
.previewContext(WidgetPreviewContext(family: .accessoryCircular))
LaunchWidgetEntryView(entry: SimpleEntry(timers: [fake], date: Date(), configuration: SelectTimerIntent()))
.previewContext(WidgetPreviewContext(family: .accessoryRectangular))

2
LaunchWidget/SingleTimerView.swift
Unescape View File

@ -111,7 +111,7 @@ struct MultiCountdownView: View {
var body: some View {
if self.timers.isEmpty {
VoidView()
DefaultView()
} else {
LazyVGrid(

4
LeCountdown.xcodeproj/project.pbxproj
Unescape View File

@ -110,6 +110,7 @@
C4BA2B25299D35C100CB4FBA /* HomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4BA2B24299D35C100CB4FBA /* HomeView.swift */; };
C4BA2B2D299E2DEE00CB4FBA /* Preferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4BA2B2C299E2DEE00CB4FBA /* Preferences.swift */; };
C4BA2B2F299E69A000CB4FBA /* View+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4BA2B2E299E69A000CB4FBA /* View+Extension.swift */; };
C4BA2B32299F75DE00CB4FBA /* DefaultView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4BA2B30299F759700CB4FBA /* DefaultView.swift */; };
C4F8B1532987FE6F005C86A5 /* LaunchWidgetLiveActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = C438C7D72981216200BF3EF9 /* LaunchWidgetLiveActivity.swift */; };
C4F8B15729891271005C86A5 /* Conductor.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4F8B15629891271005C86A5 /* Conductor.swift */; };
C4F8B15929891528005C86A5 /* forest_stream.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = C4F8B15829891528005C86A5 /* forest_stream.mp3 */; };
@ -293,6 +294,7 @@
C4BA2B24299D35C100CB4FBA /* HomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeView.swift; sourceTree = "<group>"; };
C4BA2B2C299E2DEE00CB4FBA /* Preferences.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Preferences.swift; sourceTree = "<group>"; };
C4BA2B2E299E69A000CB4FBA /* View+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+Extension.swift"; sourceTree = "<group>"; };
C4BA2B30299F759700CB4FBA /* DefaultView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultView.swift; sourceTree = "<group>"; };
C4F8B15629891271005C86A5 /* Conductor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Conductor.swift; sourceTree = "<group>"; };
C4F8B15829891528005C86A5 /* forest_stream.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = forest_stream.mp3; sourceTree = "<group>"; };
C4F8B15E298961A7005C86A5 /* ReorderableForEach.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReorderableForEach.swift; sourceTree = "<group>"; };
@ -453,6 +455,7 @@
C438C7D72981216200BF3EF9 /* LaunchWidgetLiveActivity.swift */,
C438C7D92981216200BF3EF9 /* LaunchWidget.swift */,
C438C7E92981260D00BF3EF9 /* SingleTimerView.swift */,
C4BA2B30299F759700CB4FBA /* DefaultView.swift */,
C438C7DB2981216200BF3EF9 /* LaunchWidget.intentdefinition */,
C438C7DC2981216300BF3EF9 /* Assets.xcassets */,
C438C7DE2981216300BF3EF9 /* Info.plist */,
@ -954,6 +957,7 @@
C4BA2B18299BE6A000CB4FBA /* Interval+CoreDataClass.swift in Sources */,
C4F8B18E298AC288005C86A5 /* AbstractTimer+CoreDataProperties.swift in Sources */,
C4F8B1AE298AC451005C86A5 /* Alarm+CoreDataProperties.swift in Sources */,
C4BA2B32299F75DE00CB4FBA /* DefaultView.swift in Sources */,
C4F8B18D298AC288005C86A5 /* Stopwatch+CoreDataClass.swift in Sources */,
C4BA2B14299BE6A000CB4FBA /* IntervalGroup+CoreDataProperties.swift in Sources */,
C438C8182982BFC100BF3EF9 /* Persistence.swift in Sources */,

Write Preview
Loading…
Cancel
Save