Skip to content
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

Vision camera v3 #1121

Merged
merged 92 commits into from
Mar 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
74bc156
Bump vision-camera
jtklein Oct 24, 2023
184adfc
Refactor patch
jtklein Oct 24, 2023
4949fc9
Move patched orientation into patch functions file
jtklein Oct 24, 2023
f96d2cc
Update react-native-vision-camera+3.4.1.patch
jtklein Oct 24, 2023
699662d
Switch to MacOS 13 runner
jtklein Oct 25, 2023
f994dd7
Add step to specify XCode 15
jtklein Oct 25, 2023
b948eaa
Higher level of logging
jtklein Oct 25, 2023
e2c58dd
Increase test timeout
jtklein Oct 26, 2023
35bbd69
Add comment
jtklein Oct 26, 2023
28e56ba
Remove navigation to obs without evidence for signed out user
jtklein Oct 26, 2023
a8c1b82
Patch for location permission not working on iOS
jtklein Oct 26, 2023
542699b
Increase setup timeout
jtklein Oct 26, 2023
f0d86f1
Increase some more timeouts
jtklein Oct 26, 2023
02742bf
Revert back to less logging in CI
jtklein Oct 27, 2023
010a8fb
Does it have to do with timeouts?
jtklein Oct 27, 2023
dfe8799
Trace log level
jtklein Oct 28, 2023
450c27e
Update README.md
jtklein Oct 30, 2023
a6b0831
Disable Homebrew’s auto update and install cleanup
jtklein Oct 31, 2023
2f473ab
Setup ruby step
jtklein Oct 31, 2023
88c01f6
Install pods only if not cached
jtklein Oct 31, 2023
ef41f11
Revert "Install pods only if not cached"
jtklein Oct 31, 2023
e5e2012
Run simulator in headless mode, record all logs
jtklein Oct 31, 2023
eb614b4
Increase timeouts again
jtklein Oct 31, 2023
edd77a9
Revert "Remove navigation to obs without evidence for signed out user"
jtklein Nov 6, 2023
6665091
Add boolean to run use effect only once
jtklein Nov 7, 2023
715e3cb
Did merge wrong code
jtklein Nov 7, 2023
0d07332
There is one more permission gate when entering obs edit now
jtklein Nov 7, 2023
6e3aad3
Add permission gate dismissal to signed out user test
jtklein Nov 7, 2023
9c81cd8
Add comment, rename state
jtklein Nov 13, 2023
59e67da
Lower action timeout
jtklein Nov 13, 2023
d715bfc
Update react-native-vision-camera to 3.6, update Reanimated to v3 (#838)
jtklein Nov 28, 2023
ee82832
Update vision camera
jtklein Nov 28, 2023
03d53e4
Bump vision camera
jtklein Jan 11, 2024
778fa6d
Update vision camera patch version
jtklein Jan 12, 2024
212efd6
Remove superfluous patch
jtklein Feb 1, 2024
8d456f4
Update vision camera
jtklein Feb 1, 2024
30106ec
Update vision-camera and plugin
jtklein Feb 8, 2024
b17007b
Use latest vision plugin = rebased v3
jtklein Feb 9, 2024
6bda7fc
Run npm clean-start
jtklein Feb 9, 2024
5115c10
No longer needed
jtklein Feb 9, 2024
35675aa
Duplicate prop
jtklein Feb 9, 2024
aca8823
Switch back to v3 code
jtklein Feb 9, 2024
2e2047a
Upgrading Detox fixes issue with iOS tests failing
jtklein Feb 9, 2024
3c20b49
Update to latest detox version
jtklein Feb 9, 2024
ad76cb5
Npm i force
jtklein Feb 9, 2024
2dadc97
Vision 3 e2e testing, (#1126)
jtklein Feb 10, 2024
a077b39
Merge branch 'main' into vision-camera-3
jtklein Feb 10, 2024
a3e5fb4
Adding comma back in
jtklein Feb 12, 2024
bef30d3
Remove spaces
jtklein Feb 12, 2024
0785aa5
Use latest vision-camera and plugin
jtklein Feb 16, 2024
15dc056
Use release version of vision-camera
jtklein Feb 16, 2024
b652d90
Remove force flag
jtklein Feb 16, 2024
d010b24
Merge branch 'main' into vision-camera-3
jtklein Feb 16, 2024
2bc63b1
Update react-native-worklets-core
jtklein Feb 20, 2024
a4966fe
Upgrade reanimated
jtklein Feb 21, 2024
28c2f14
Update babel.config to allow nested worklets
jtklein Feb 21, 2024
ad21622
Run frame processor async
jtklein Feb 21, 2024
307ccac
Remove enableGpuBuffers flag
jtklein Feb 21, 2024
2bcdfd7
Remove no longer needed comment
jtklein Feb 21, 2024
d256b08
Update comments about version
jtklein Feb 21, 2024
3ebb697
Merge branch 'main' into vision-camera-3
jtklein Feb 21, 2024
4715dd8
Merge branch 'main' into vision-camera-3
jtklein Feb 21, 2024
0d44018
Update vision-camera and plugin
jtklein Mar 10, 2024
4904ac5
Merge branch 'main' into vision-camera-3
jtklein Mar 10, 2024
289e45e
Code format
jtklein Mar 10, 2024
f64c321
Rename param
jtklein Mar 10, 2024
e865c31
Use latest-plugin
jtklein Mar 12, 2024
eb1ec44
Remove fps param from camera view
jtklein Mar 12, 2024
79321d2
Change confidenceThreshold to number
jtklein Mar 12, 2024
a3dd51b
API change for results structure
jtklein Mar 13, 2024
cdc35b4
Refactor fps to be checked inside hook
jtklein Mar 13, 2024
eb57c64
Remove updates of non-camera related
jtklein Mar 13, 2024
85e903f
Update comment
jtklein Mar 13, 2024
4342f91
Code format
jtklein Mar 13, 2024
b6b7ad5
Merge branch 'main' into vision-camera-3
jtklein Mar 13, 2024
50129f5
Snapshot updates
jtklein Mar 13, 2024
c9ffc54
Revert changes to ios e2e
jtklein Mar 13, 2024
5001604
Add a log for the average time it takes a frame to be processed
jtklein Mar 13, 2024
938627e
Use release version of plugin
jtklein Mar 13, 2024
2a2689b
Add a patch for runAsync to work in release builds
jtklein Mar 14, 2024
bca4680
Update react-native-worklets-core to 0.4.0
kueda Mar 14, 2024
fc00525
Use latest plugin version
jtklein Mar 22, 2024
232f8c5
Add a shift method to worklet arrays
jtklein Mar 25, 2024
146ebd6
Use latest vision-plugin
jtklein Mar 25, 2024
e141675
Set result timestamp and show age of result in debug mode
jtklein Mar 25, 2024
3eecb5a
Fix an error with timestamp being undefined
jtklein Mar 25, 2024
c265f45
Remove log
jtklein Mar 25, 2024
ba67bac
Use latest vision plugin
jtklein Mar 25, 2024
8dc9c8a
Merge branch 'main' into vision-camera-3
jtklein Mar 25, 2024
6dd518f
Change result timestamp to pink
jtklein Mar 26, 2024
b6bd13f
Merge branch 'main' into vision-camera-3
jtklein Mar 26, 2024
cefcd83
Comment
jtklein Mar 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions .github/workflows/e2e_ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ jobs:
with:
node-version: 18

- name: Setup Ruby version according to .ruby-version with cached gems
uses: ruby/setup-ruby@v1
with:
bundler-cache: true

- name: Cache node modules
uses: actions/cache@v3
id: cache
Expand Down Expand Up @@ -98,8 +103,13 @@ jobs:
run: echo "MOCK_MODE=e2e" >> "$GITHUB_ENV"

# Install prerequisites for detox and build app, and test
- run: brew tap wix/brew
- run: brew install applesimutils
- name: Install macOS dependencies
env:
HOMEBREW_NO_AUTO_UPDATE: 1
HOMEBREW_NO_INSTALL_CLEANUP: 1
run: |
brew tap wix/brew
brew install applesimutils

- name: Build test app
run: npm run e2e:build:ios
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ See [CONTRIBUTING](CONTRIBUTING.md) for guidelines on contributing to this proje

### Requirements

* Xcode 13 or above
* Xcode 15 or above
* [Android and iOS environment setup](https://reactnative.dev/docs/environment-setup) described in the RN docs

### Install packages and pods
Expand Down
7 changes: 2 additions & 5 deletions babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,11 @@ module.exports = {
tests: "./tests"
}
}],
// Reanimated 2 plugin has to be listed last https://docs.swmansion.com/react-native-reanimated/docs/fundamentals/installation/
// react-native-vision-camera v3
// "react-native-reanimated/plugin",
// react-native-vision-camera v2
// Reanimated plugin has to be listed last https://docs.swmansion.com/react-native-reanimated/docs/fundamentals/installation/
[
"react-native-reanimated/plugin",
{
globals: ["__inatVision"]
processNestedWorklets: true
}
]
],
Expand Down
2 changes: 1 addition & 1 deletion e2e/signedIn.e2e.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ describe( "Signed in user", () => {
await expect( uploadNowButton ).toBeVisible();
await uploadNowButton.tap();
} else {
// Press Upload now button
// Press Save button
const saveButton = element( by.id( "ObsEdit.saveButton" ) );
await expect( saveButton ).toBeVisible();
await saveButton.tap();
Expand Down
42 changes: 10 additions & 32 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ PODS:
- React-Core
- react-native-webview (11.23.1):
- React-Core
- react-native-worklets-core (0.2.0):
- react-native-worklets-core (0.4.0):
- React
- React-callinvoker
- React-Core
Expand Down Expand Up @@ -435,33 +435,10 @@ PODS:
- React-Core
- RNPermissions (3.10.0):
- React-Core
- RNReanimated (2.17.0):
- DoubleConversion
- FBLazyVector
- FBReactNativeSpec
- glog
- RCT-Folly
- RCTRequired
- RCTTypeSafety
- React-callinvoker
- RNReanimated (3.7.1):
- RCT-Folly (= 2021.07.22.00)
- React-Core
- React-Core/DevSupport
- React-Core/RCTWebSocket
- React-CoreModules
- React-cxxreact
- React-jsi
- React-jsiexecutor
- React-jsinspector
- React-RCTActionSheet
- React-RCTAnimation
- React-RCTBlob
- React-RCTImage
- React-RCTLinking
- React-RCTNetwork
- React-RCTSettings
- React-RCTText
- ReactCommon/turbomodule/core
- Yoga
- RNScreens (3.21.1):
- React-Core
- React-RCTImage
Expand All @@ -479,11 +456,12 @@ PODS:
- SDWebImageWebPCoder (0.8.5):
- libwebp (~> 1.0)
- SDWebImage/Core (~> 5.10)
- VisionCamera (2.15.6):
- VisionCamera (3.9.1):
- React
- React-callinvoker
- React-Core
- VisionCameraPluginInatVision (2.2.0):
- react-native-worklets-core
- VisionCameraPluginInatVision (3.0.0):
- React-Core
- Yoga (1.14.0)

Expand Down Expand Up @@ -768,7 +746,7 @@ SPEC CHECKSUMS:
react-native-sensitive-info: d44e909d065f9c0e15734245e5dd6a24b82e3dcd
react-native-slider: cc89964e1432fa31aa9db7a0fa9b21e26b5d5152
react-native-webview: d33e2db8925d090871ffeb232dfa50cb3a727581
react-native-worklets-core: 7ad416a8965086b98b07964f7f6932560a54a14c
react-native-worklets-core: 2efe80a3ee87fe5e6fefa814e0e20c2708d3ad25
React-perflogger: c944b06edad34f5ecded0f29a6e66290a005d365
React-RCTActionSheet: fa467f37777dacba2c72da4be7ae065da4482d7d
React-RCTAnimation: 0591ee5f9e3d8c864a0937edea2165fe968e7099
Expand Down Expand Up @@ -796,16 +774,16 @@ SPEC CHECKSUMS:
RNGestureHandler: 6e4dc6b7ab3a385386d4e36228bd065e5a611394
RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81
RNPermissions: 0332875c444efe864dd97071dc848529bd7cc692
RNReanimated: f186e85d9f28c9383d05ca39e11dd194f59093ec
RNReanimated: e626b8c31f56bf320fd27ee5ca0d5349792f2a8d
RNScreens: d3675ab2878704de70c9dae57fa5d024802404cc
RNShareMenu: cb9dac548c8bf147d06f0bf07296ad51ea9f5fc3
RNStoreReview: 31dbfd0dac2eea9675f0b84f1dd3261c2110c337
RNSVG: d00c8f91c3cbf6d476451313a18f04d220d4f396
RNVectorIcons: fcc2f6cb32f5735b586e66d14103a74ce6ad61f8
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
VisionCamera: 523b49054bee9dace64189ab6631cb41e8b83fe0
VisionCameraPluginInatVision: 7e09a4ca0b34dd81afd4b68aa26a27eff5bb8fd4
VisionCamera: 609b194489f336792caa5eda305a3fdd4ba5d44c
VisionCameraPluginInatVision: edd58cf80291675d1a1523a3d8d3b2c2f1bff26a
Yoga: e29645ec5a66fb00934fad85338742d1c247d4cb

PODFILE CHECKSUM: 77ed9526d4011b245ce5afa1ea331dea4c67d753
Expand Down
120 changes: 67 additions & 53 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading