-
Notifications
You must be signed in to change notification settings - Fork 29
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[WIP] Siri and shortcuts support #127
Closed
+266
−15
Closed
Changes from 1 commit
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
89 changes: 89 additions & 0 deletions
89
Sabbath School/Siri/Intents/ListenTodaySabbathSchoolIntent.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| /* | ||
| * Copyright (c) 2021 Adventech <info@adventech.io> | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
|
|
||
| import AppIntents | ||
| import UIKit | ||
| import SwiftAudio | ||
|
|
||
| @available(iOS 16.0, *) | ||
| struct ListenTodaySabbathSchoolIntent: AudioStartingIntent { | ||
|
|
||
| static var title: LocalizedStringResource = "Starting Sabbath School" | ||
| static var openAppWhenRun: Bool = false | ||
|
|
||
| @MainActor | ||
| func perform() async throws -> some IntentResult { | ||
| let lastQuarterlyIndex = Preferences.currentQuarterly() | ||
| retrieveAudio(quarterlyIndex: lastQuarterlyIndex) | ||
|
|
||
| return .result(value: true) | ||
| } | ||
|
|
||
| func retrieveAudio(quarterlyIndex: String) { | ||
| let audioInteractor = AudioInteractor() | ||
| let lessonInteractor = LessonInteractor() | ||
|
|
||
| lessonInteractor.retrieveQuarterlyInfo(quarterlyIndex: quarterlyIndex) { quarterlyInfo in | ||
| audioInteractor.retrieveAudio(quarterlyIndex: quarterlyIndex) { audio in | ||
| let finalAudio = audio.filter { $0.targetIndex.starts(with: getTodaysLessonIndex(dataSource: quarterlyInfo)) } | ||
|
|
||
| let audioItems: [AudioItem] = finalAudio.map { $0.audioItem() } | ||
|
|
||
| AudioPlayback.configure() | ||
| try? AudioPlayback.shared.add(items: audioItems, playWhenReady: false) | ||
| try? AudioPlayback.shared.jumpToItem(atIndex: 1, playWhenReady: true) | ||
|
|
||
| AudioPlayback.play() | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
| func getTodaysLessonIndex(dataSource: QuarterlyInfo?) -> String { | ||
| guard let lessons = dataSource?.lessons else { return "" } | ||
| let today = Date() | ||
| let weekday = Calendar.current.component(.weekday, from: today) | ||
| let hour = Calendar.current.component(.hour, from: today) | ||
| var prevLessonIndex: String? = nil | ||
|
|
||
| for lesson in lessons { | ||
| let start = Calendar.current.compare(lesson.startDate, to: today, toGranularity: .day) | ||
| let end = Calendar.current.compare(lesson.endDate, to: today, toGranularity: .day) | ||
| let fallsBetween = ((start == .orderedAscending) || (start == .orderedSame)) && ((end == .orderedDescending) || (end == .orderedSame)) | ||
|
|
||
| if fallsBetween { | ||
| if (weekday == 7 && hour < 12 && prevLessonIndex != nil) { | ||
| return prevLessonIndex! | ||
| } else { | ||
| return lesson.index | ||
| } | ||
| } | ||
| prevLessonIndex = lesson.index | ||
| } | ||
|
|
||
| if let firstLesson = lessons.first { | ||
| return firstLesson.index | ||
| } | ||
|
|
||
| return "" | ||
| } | ||
| } |
39 changes: 39 additions & 0 deletions
39
Sabbath School/Siri/Intents/ReadTodaySabbathSchoolIntent.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /* | ||
| * Copyright (c) 2021 Adventech <info@adventech.io> | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
|
|
||
| import AppIntents | ||
| import UIKit | ||
|
|
||
| @available(iOS 16.0, *) | ||
| struct ReadTodaySabbathSchoolIntent: AppIntent { | ||
|
|
||
| static var title: LocalizedStringResource = "Starting Sabbath School" | ||
| static var openAppWhenRun: Bool = true | ||
|
|
||
| @MainActor | ||
| func perform() async throws -> some IntentResult { | ||
| let appDelegate = UIApplication.shared.delegate as? AppDelegate | ||
| appDelegate?.launchQuarterlies(initiateOpen: true) | ||
|
|
||
| return .result(value: true) | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Curious on why did you had to disable bitcode? Is possible to work around it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It has been deprecated with Xcode 14
https://developer.apple.com/documentation/xcode-release-notes/xcode-14-release-notes
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TIL... I guess it's good then 😅