-
Notifications
You must be signed in to change notification settings - Fork 206
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
[iOS] Support Achievement Rally with NFC #1110
Merged
Merged
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
60f064d
wip
ry-itto b51258d
add achieve rally uis connect with kmp
ry-itto 047da10
add nfc reader & save achievements
ry-itto 7ea746d
add animation for obtaining achievement
ry-itto c0eb70f
update ui
ry-itto 05ee4da
Merge remote-tracking branch 'origin/main' into ios-add-dynamic-links…
ry-itto 4b52db4
stamp to achievement
ry-itto e999b35
fix entitlements
ry-itto 1ba9e8b
remove ndef
ry-itto ce34f8f
add achievement with dynamic links
ry-itto 27b4f65
Merge branch 'main' into ios-add-dynamic-links-nfc
ry-itto 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
27 changes: 27 additions & 0 deletions
27
app-ios/App/DroidKaigi2023/DroidKaigi2023/Assets.xcassets/AccentColor.colorset/Contents.json
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
124 changes: 108 additions & 16 deletions
124
app-ios/Modules/Sources/Achievements/AchievementsView.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
89 changes: 89 additions & 0 deletions
89
app-ios/Modules/Sources/Achievements/AchievementsViewModel.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 |
|---|---|---|
| @@ -1 +1,90 @@ | ||
| import AsyncAlgorithms | ||
| import CryptoKit | ||
| import Dependencies | ||
| import Foundation | ||
| import KMPContainer | ||
| import Model | ||
| import NFC | ||
| import shared | ||
|
|
||
| struct AchievementsViewState: ViewModelState { | ||
| struct LoadedState: Equatable { | ||
| var description: String | ||
| var achievements: Set<Achievement> | ||
| } | ||
|
|
||
| var loadedState: LoadingState<LoadedState> = .initial | ||
| } | ||
|
|
||
| @MainActor | ||
| class AchievementsViewModel: ObservableObject { | ||
| @Dependency(\.achievementData) var achievementData | ||
| @Published var state: AchievementsViewState = .init() | ||
| private let nfcReader = NFCReader() | ||
| private var loadTask: Task<Void, Error>? | ||
|
|
||
| deinit { | ||
| loadTask?.cancel() | ||
| } | ||
|
|
||
| func load() async { | ||
| state.loadedState = .loading | ||
|
|
||
| loadTask = Task.detached { @MainActor in | ||
| do { | ||
| for try await (description, achievements) in combineLatest( | ||
| self.achievementData.achievementDetailDescription(), | ||
| self.achievementData.achievements() | ||
| ) { | ||
| self.state.loadedState = .loaded( | ||
| .init( | ||
| description: description, | ||
| achievements: achievements | ||
| ) | ||
| ) | ||
| } | ||
| } catch { | ||
| self.state.loadedState = .failed(error) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func read() async -> Achievement? { | ||
| do { | ||
| if let urlString = try await nfcReader.read(), let url = URL(string: urlString) { | ||
| let hashedString = idToSha256(id: url.lastPathComponent) | ||
|
|
||
| let target: Achievement? = switch hashedString { | ||
| case Achievement.arcticfox.sha256: | ||
| Achievement.arcticfox | ||
| case Achievement.bumblebee.sha256: | ||
| Achievement.bumblebee | ||
| case Achievement.chipmunk.sha256: | ||
| Achievement.chipmunk | ||
| case Achievement.dolphin.sha256: | ||
| Achievement.dolphin | ||
| case Achievement.electriceel.sha256: | ||
| Achievement.electriceel | ||
| default: | ||
| nil | ||
| } | ||
|
|
||
| if let achievement = target { | ||
| try await achievementData.saveAchievement(achievement) | ||
| return achievement | ||
| } | ||
| } | ||
| } catch { | ||
| print(error) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| private func idToSha256(id: String) -> String? { | ||
| guard let data = id.data(using: .utf8) else { | ||
| return nil | ||
| } | ||
| let digest = SHA256.hash(data: data) | ||
| return digest.compactMap { String(format: "%02x", $0) }.joined() | ||
| } | ||
| } |
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
Oops, something went wrong.
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.
Oh, we need an action just before reading NFC tags 👀