Skip to content

Commit

Permalink
Ios out of band
Browse files Browse the repository at this point in the history
few bits to sort out
- [x] make our mix of simulator/emulator consistent, settling on emulator
- [x] passing the factory in works great for just in time asset decoding, but its not amazing when you want to decode ahead of time.
- [x] couple of places left to pass this function signature through. (Question) is there a neater way to get this done, feels a bit like we are going back to parameter explosion a bit?
- [x] should do a few examples, i think the complexity grows quite a bit in this one as you add caching, or callbacks
- [x] should get the cached images/fonts to draw on init as well, either warming up cache, or jitting
- [x] examples loading assets from the bundle (also there seem to be actual asset things too? should we use those?!)
- [x] add test
- [x] re-add "preview" project & rev the preview project once this has been deployed. (do this after new ios deploy)
- [x] fix up race condition (see comment)

https://github.com/rive-app/rive/assets/1216025/2c14330f-e8a4-481b-bc27-4807cabe3b82

(simple example, both swift ui and standard)

![CleanShot 2023-11-20 at 16 54 59](https://github.com/rive-app/rive/assets/1216025/a71e207c-30ad-44dd-9e4b-ad7431b22186)

Diffs=
fabb7f97f Ios out of band (#6232)

Co-authored-by: Gordon Hayes <[email protected]>
Co-authored-by: Maxwell Talbot <[email protected]>
  • Loading branch information
3 people committed Dec 5, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 4a6b607 commit 27de5ab
Showing 57 changed files with 1,599 additions and 857 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -49,6 +49,9 @@ playground.xcworkspace
# hence it is not needed unless you have added a package configuration file to your project
# .swiftpm

# our previews will install packages from swiftpm, which will result in references here.
Rive.xcworkspace/xcshareddata/swiftpm/Package.resolved

.build/

# CocoaPods
@@ -93,4 +96,4 @@ fastlane/test_output
iOSInjectionProject/

# used for us to put our tar.gz lib cache
cache/
cache/
2 changes: 1 addition & 1 deletion .rive_head
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ed4474d1ab3aa1e68d47cfcb2c178f39c376257e
fabb7f97fe7b69368c9a7369febfecbc90be49cd
2 changes: 1 addition & 1 deletion .rive_renderer
Original file line number Diff line number Diff line change
@@ -1 +1 @@
05e26a46fb68d9de2595c7d21ce8db48a78892e1
7b7595392d849217e43a829b71dfad58ecf29b06
Binary file added Example-iOS/Assets/Inter-45562.ttf
Binary file not shown.
Binary file added Example-iOS/Assets/picture-47982.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Example-iOS/Assets/simple_assets.riv
Binary file not shown.

This file was deleted.

10 changes: 0 additions & 10 deletions Example-iOS/Preview (macOS)/Preview__macOS_.entitlements

This file was deleted.

25 changes: 0 additions & 25 deletions Example-iOS/Preview/Info.plist

This file was deleted.

605 changes: 42 additions & 563 deletions Example-iOS/RiveExample.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -5,8 +5,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/rive-app/rive-ios/",
"state" : {
"revision" : "9030b8c2c2bd52c22114850c3666a4eef2a2acd8",
"version" : "5.3.2"
"revision" : "5e4e9b42d732e7fc3254848939338b4c192b19c6",
"version" : "5.6.0"
}
}
],

This file was deleted.

This file was deleted.

14 changes: 14 additions & 0 deletions Example-iOS/Source/DismissableView.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
//
// DismissableView.swift
// RiveExample
//
// Created by Peter G Hayes on 03/11/2023.
// Copyright © 2023 Rive. All rights reserved.
//

import SwiftUI

public protocol DismissableView: View {
init()
var dismiss: () -> Void { get set }
}
Loading

0 comments on commit 27de5ab

Please sign in to comment.