From 2de964ece5d033e07a9928b35fe0db936e2b8d83 Mon Sep 17 00:00:00 2001 From: Mike Hardy Date: Fri, 30 Oct 2020 17:38:43 -0500 Subject: [PATCH 01/16] tests(app): revert bugfix that enabled local emulator in E2E If you use the emulator for local testing right now, the rules are too permissive, and it causes local failures --- packages/app/e2e/config.e2e.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/app/e2e/config.e2e.js b/packages/app/e2e/config.e2e.js index fd62a9f708f..19cf02348bd 100644 --- a/packages/app/e2e/config.e2e.js +++ b/packages/app/e2e/config.e2e.js @@ -40,11 +40,12 @@ describe('config', () => { }); // NOTE: "preferencesClearAll" clears Firestore settings. Set DB as emulator again. - after(async () => { - await firebase - .firestore() - .settings({ host: 'localhost:8080', ssl: false, persistence: true }); - }); + // FIXME if we use the emulator, then we never throw errors because firestore rules are permissive, that causes test failure + // after(async () => { + // await firebase + // .firestore() + // .settings({ host: 'localhost:8080', ssl: false, persistence: true }); + // }); it('should set bool values', async () => { const prefsBefore = await NativeModules.RNFBAppModule.preferencesGetAll(); From 98e3b344b6323d2a31b0a2e7d27e98c6e6bf34c4 Mon Sep 17 00:00:00 2001 From: Mike Hardy Date: Fri, 30 Oct 2020 18:00:43 -0500 Subject: [PATCH 02/16] tests: remove bash-isms from detox commands so /bin/sh works --- tests/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/package.json b/tests/package.json index fc09a007a41..1bd5b15ca31 100644 --- a/tests/package.json +++ b/tests/package.json @@ -66,7 +66,7 @@ }, "android.emu.debug": { "binaryPath": "android/app/build/outputs/apk/debug/app-debug.apk", - "build": "pushd android && ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug && popd", + "build": "cd android && ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug && cd ..", "type": "android.emulator", "device": { "avdName": "TestingAVD" @@ -82,7 +82,7 @@ }, "android.emu.release": { "binaryPath": "android/app/build/outputs/apk/release/app-release.apk", - "build": "pushd android && ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release && popd", + "build": "cd android && ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release && cd ..", "type": "android.emulator", "device": { "avdName": "TestingAVD" From 639fd755fee1c9adaec0983fd60f6ffd284dcf81 Mon Sep 17 00:00:00 2001 From: Mike Hardy Date: Sat, 31 Oct 2020 10:36:59 -0500 Subject: [PATCH 03/16] chore(template): delete template / no longer supported --- packages/template/.gitignore | 62 -- packages/template/.npmignore | 65 -- packages/template/CHANGELOG.md | 26 - packages/template/LICENSE | 32 - packages/template/README.md | 36 - packages/template/package.json | 24 - packages/template/post-init.js | 4 - packages/template/project/App.js | 67 -- .../template/project/__tests__/App-test.js | 14 - packages/template/project/_buckconfig | 6 - packages/template/project/_eslintrc.js | 4 - packages/template/project/_flowconfig | 75 -- packages/template/project/_gitattributes | 1 - packages/template/project/_gitignore | 59 -- packages/template/project/_watchmanconfig | 1 - packages/template/project/android/app/_BUCK | 55 -- .../template/project/android/app/build.gradle | 205 ----- .../project/android/app/build_defs.bzl | 19 - .../project/android/app/debug.keystore | Bin 2257 -> 0 bytes .../project/android/app/proguard-rules.pro | 10 - .../android/app/src/debug/AndroidManifest.xml | 8 - .../android/app/src/main/AndroidManifest.xml | 26 - .../java/com/helloworld/MainActivity.java | 15 - .../java/com/helloworld/MainApplication.java | 74 -- .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 3056 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_round.png | Bin 5024 -> 0 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 2096 -> 0 bytes .../res/mipmap-mdpi/ic_launcher_round.png | Bin 2858 -> 0 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 4569 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_round.png | Bin 7098 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 6464 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin 10676 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 9250 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 15523 -> 0 bytes .../app/src/main/res/values/strings.xml | 3 - .../app/src/main/res/values/styles.xml | 8 - .../template/project/android/build.gradle | 40 - .../project/android/gradle.properties | 21 - .../android/gradle/wrapper/gradle-wrapper.jar | Bin 55616 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 - packages/template/project/android/gradlew | 188 ----- packages/template/project/android/gradlew.bat | 100 --- .../template/project/android/settings.gradle | 3 - packages/template/project/app.json | 4 - packages/template/project/babel.config.js | 3 - packages/template/project/firebase.json | 3 - packages/template/project/index.js | 9 - .../project/ios/HelloWorld-tvOS/Info.plist | 53 -- .../ios/HelloWorld-tvOSTests/Info.plist | 24 - .../ios/HelloWorld.xcodeproj/project.pbxproj | 782 ------------------ .../xcschemes/HelloWorld-tvOS.xcscheme | 129 --- .../xcschemes/HelloWorld.xcscheme | 129 --- .../project/ios/HelloWorld/AppDelegate.h | 15 - .../project/ios/HelloWorld/AppDelegate.m | 42 - .../HelloWorld/Base.lproj/LaunchScreen.xib | 42 - .../AppIcon.appiconset/Contents.json | 38 - .../HelloWorld/Images.xcassets/Contents.json | 6 - .../project/ios/HelloWorld/Info.plist | 57 -- .../template/project/ios/HelloWorld/main.m | 16 - .../ios/HelloWorldTests/HelloWorldTests.m | 72 -- .../project/ios/HelloWorldTests/Info.plist | 24 - packages/template/project/ios/Podfile | 60 -- packages/template/project/metro.config.js | 17 - packages/template/project/package.json | 33 - packages/template/project/patches/.gitkeep | 0 packages/template/template.config.js | 12 - 66 files changed, 2826 deletions(-) delete mode 100644 packages/template/.gitignore delete mode 100644 packages/template/.npmignore delete mode 100644 packages/template/CHANGELOG.md delete mode 100644 packages/template/LICENSE delete mode 100644 packages/template/README.md delete mode 100644 packages/template/package.json delete mode 100644 packages/template/post-init.js delete mode 100644 packages/template/project/App.js delete mode 100644 packages/template/project/__tests__/App-test.js delete mode 100644 packages/template/project/_buckconfig delete mode 100644 packages/template/project/_eslintrc.js delete mode 100644 packages/template/project/_flowconfig delete mode 100644 packages/template/project/_gitattributes delete mode 100644 packages/template/project/_gitignore delete mode 100644 packages/template/project/_watchmanconfig delete mode 100644 packages/template/project/android/app/_BUCK delete mode 100644 packages/template/project/android/app/build.gradle delete mode 100644 packages/template/project/android/app/build_defs.bzl delete mode 100644 packages/template/project/android/app/debug.keystore delete mode 100644 packages/template/project/android/app/proguard-rules.pro delete mode 100644 packages/template/project/android/app/src/debug/AndroidManifest.xml delete mode 100644 packages/template/project/android/app/src/main/AndroidManifest.xml delete mode 100644 packages/template/project/android/app/src/main/java/com/helloworld/MainActivity.java delete mode 100644 packages/template/project/android/app/src/main/java/com/helloworld/MainApplication.java delete mode 100644 packages/template/project/android/app/src/main/res/mipmap-hdpi/ic_launcher.png delete mode 100644 packages/template/project/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png delete mode 100644 packages/template/project/android/app/src/main/res/mipmap-mdpi/ic_launcher.png delete mode 100644 packages/template/project/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png delete mode 100644 packages/template/project/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png delete mode 100644 packages/template/project/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png delete mode 100644 packages/template/project/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png delete mode 100644 packages/template/project/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png delete mode 100644 packages/template/project/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png delete mode 100644 packages/template/project/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png delete mode 100644 packages/template/project/android/app/src/main/res/values/strings.xml delete mode 100644 packages/template/project/android/app/src/main/res/values/styles.xml delete mode 100644 packages/template/project/android/build.gradle delete mode 100644 packages/template/project/android/gradle.properties delete mode 100644 packages/template/project/android/gradle/wrapper/gradle-wrapper.jar delete mode 100644 packages/template/project/android/gradle/wrapper/gradle-wrapper.properties delete mode 100755 packages/template/project/android/gradlew delete mode 100644 packages/template/project/android/gradlew.bat delete mode 100644 packages/template/project/android/settings.gradle delete mode 100644 packages/template/project/app.json delete mode 100644 packages/template/project/babel.config.js delete mode 100644 packages/template/project/firebase.json delete mode 100644 packages/template/project/index.js delete mode 100644 packages/template/project/ios/HelloWorld-tvOS/Info.plist delete mode 100644 packages/template/project/ios/HelloWorld-tvOSTests/Info.plist delete mode 100644 packages/template/project/ios/HelloWorld.xcodeproj/project.pbxproj delete mode 100644 packages/template/project/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld-tvOS.xcscheme delete mode 100644 packages/template/project/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld.xcscheme delete mode 100644 packages/template/project/ios/HelloWorld/AppDelegate.h delete mode 100644 packages/template/project/ios/HelloWorld/AppDelegate.m delete mode 100644 packages/template/project/ios/HelloWorld/Base.lproj/LaunchScreen.xib delete mode 100644 packages/template/project/ios/HelloWorld/Images.xcassets/AppIcon.appiconset/Contents.json delete mode 100644 packages/template/project/ios/HelloWorld/Images.xcassets/Contents.json delete mode 100644 packages/template/project/ios/HelloWorld/Info.plist delete mode 100644 packages/template/project/ios/HelloWorld/main.m delete mode 100644 packages/template/project/ios/HelloWorldTests/HelloWorldTests.m delete mode 100644 packages/template/project/ios/HelloWorldTests/Info.plist delete mode 100644 packages/template/project/ios/Podfile delete mode 100644 packages/template/project/metro.config.js delete mode 100644 packages/template/project/package.json delete mode 100644 packages/template/project/patches/.gitkeep delete mode 100644 packages/template/template.config.js diff --git a/packages/template/.gitignore b/packages/template/.gitignore deleted file mode 100644 index fd4d0e16045..00000000000 --- a/packages/template/.gitignore +++ /dev/null @@ -1,62 +0,0 @@ -# Built application files -project/android/*/build/ - -# Crashlytics configuations -project/android/com_crashlytics_export_strings.xml - -# Local configuration file (sdk path, etc) -project/android/local.properties - -# Gradle generated files -project/android/.gradle/ - -# Signing files -project/android/.signing/ - -# User-specific configurations -project/android/.idea/gradle.xml -project/android/.idea/libraries/ -project/android/.idea/workspace.xml -project/android/.idea/tasks.xml -project/android/.idea/.name -project/android/.idea/compiler.xml -project/android/.idea/copyright/profiles_settings.xml -project/android/.idea/encodings.xml -project/android/.idea/misc.xml -project/android/.idea/modules.xml -project/android/.idea/scopes/scope_settings.xml -project/android/.idea/vcs.xml -project/android/*.iml - -# Xcode -*.pbxuser -*.mode1v3 -*.mode2v3 -*.perspectivev3 -*.xcuserstate -project/ios/Pods -project/ios/build -*project.xcworkspace* -*xcuserdata* - -# OS-specific files -.DS_Store -.DS_Store? -._* -.Spotlight-V100 -.Trashes -ehthumbs.db -Thumbs.db - -# Android -project/android/build -project/android/.settings - -.idea -yarn.lock -.github -.vscode -.nyc_output -*.coverage.json -.circleci -.eslintignore diff --git a/packages/template/.npmignore b/packages/template/.npmignore deleted file mode 100644 index 109d5949f9e..00000000000 --- a/packages/template/.npmignore +++ /dev/null @@ -1,65 +0,0 @@ -# Built application files -project/android/*/build/ - -# Crashlytics configuations -project/android/com_crashlytics_export_strings.xml - -# Local configuration file (sdk path, etc) -project/android/local.properties - -# Gradle generated files -project/android/.gradle/ - -# Signing files -project/android/.signing/ - -# User-specific configurations -project/android/.idea/gradle.xml -project/android/.idea/libraries/ -project/android/.idea/workspace.xml -project/android/.idea/tasks.xml -project/android/.idea/.name -project/android/.idea/compiler.xml -project/android/.idea/copyright/profiles_settings.xml -project/android/.idea/encodings.xml -project/android/.idea/misc.xml -project/android/.idea/modules.xml -project/android/.idea/scopes/scope_settings.xml -project/android/.idea/vcs.xml -project/android/*.iml - -# Xcode -*.pbxuser -*.mode1v3 -*.mode2v3 -*.perspectivev3 -*.xcuserstate -project/ios/Pods -project/ios/build -*project.xcworkspace* -*xcuserdata* - -# OS-specific files -.DS_Store -.DS_Store? -._* -.Spotlight-V100 -.Trashes -ehthumbs.db -Thumbs.db - -# Android -project/android/build -project/android/.settings - -# Node -project/node_modules - -.idea -yarn.lock -.github -.vscode -.nyc_output -*.coverage.json -.circleci -.eslintignore diff --git a/packages/template/CHANGELOG.md b/packages/template/CHANGELOG.md deleted file mode 100644 index 69a18e7e57d..00000000000 --- a/packages/template/CHANGELOG.md +++ /dev/null @@ -1,26 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [6.10.0](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/template@6.9.0...@react-native-firebase/template@6.10.0) (2020-08-26) - -### Features - -- bump firebase sdk versions, add GoogleApi dep, use Android API29 ([#4122](https://github.com/invertase/react-native-firebase/issues/4122)) ([728f418](https://github.com/invertase/react-native-firebase/commit/728f41863832d21230c6eb1f55385284fef03c09)) - -# [6.9.0](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/template@6.8.1...@react-native-firebase/template@6.9.0) (2020-08-03) - -### Features - -- use latest android & ios Firebase SDKs version ([#3956](https://github.com/invertase/react-native-firebase/issues/3956)) ([e7b4bb3](https://github.com/invertase/react-native-firebase/commit/e7b4bb31b05985c044b1f01625a43e364bb653ef)) - -## [6.8.1](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/template@6.8.0...@react-native-firebase/template@6.8.1) (2020-05-13) - -**Note:** Version bump only for package @react-native-firebase/template - -# [6.8.0](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/template@6.8.0...@react-native-firebase/template@6.8.0) (2020-05-13) - -### Features - -- update RFNB version ([8f007fa](https://github.com/invertase/react-native-firebase/commit/8f007fa97aa8025520098a234118a15293eb1c55)) diff --git a/packages/template/LICENSE b/packages/template/LICENSE deleted file mode 100644 index ef3ed44f066..00000000000 --- a/packages/template/LICENSE +++ /dev/null @@ -1,32 +0,0 @@ -Apache-2.0 License ------------------- - -Copyright (c) 2016-present Invertase Limited & Contributors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this library except in compliance with the License. - -You may obtain a copy of the Apache-2.0 License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - - -Creative Commons Attribution 3.0 License ----------------------------------------- - -Copyright (c) 2016-present Invertase Limited & Contributors - -Documentation and other instructional materials provided for this project -(including on a separate documentation repository or it's documentation website) are -licensed under the Creative Commons Attribution 3.0 License. Code samples/blocks -contained therein are licensed under the Apache License, Version 2.0 (the "License"), as above. - -You may obtain a copy of the Creative Commons Attribution 3.0 License at - - https://creativecommons.org/licenses/by/3.0/ diff --git a/packages/template/README.md b/packages/template/README.md deleted file mode 100644 index c4c245ab0fa..00000000000 --- a/packages/template/README.md +++ /dev/null @@ -1,36 +0,0 @@ -

- -
- -

React Native Firebase - Template

-

- -

- Coverage - NPM downloads - NPM version - License - Maintained with Lerna -

- -

- Chat on Discord - Follow on Twitter -

- ---- - -``` -npx @react-native-community/cli@next init --template=@react-native-firebase/template@alpha -``` - ---- - -

- -

- Built and maintained with 💛 by Invertase. -

-

- ---- diff --git a/packages/template/package.json b/packages/template/package.json deleted file mode 100644 index 00b028d3617..00000000000 --- a/packages/template/package.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "@react-native-firebase/template", - "version": "6.10.0", - "author": "Invertase (http://invertase.io)", - "description": "React Native Firebase - Template", - "scripts": { - "build:clean": "rimraf project/android/build && rimraf project/ios/build" - }, - "repository": { - "type": "git", - "url": "https://github.com/invertase/react-native-firebase/tree/master/packages/template" - }, - "license": "Apache-2.0", - "keywords": [ - "react", - "react-native", - "cli", - "firebase", - "template" - ], - "publishConfig": { - "access": "public" - } -} diff --git a/packages/template/post-init.js b/packages/template/post-init.js deleted file mode 100644 index d56585315e3..00000000000 --- a/packages/template/post-init.js +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env node -/* eslint-disable no-console */ - -console.log('FooBar'); diff --git a/packages/template/project/App.js b/packages/template/project/App.js deleted file mode 100644 index d21272386ca..00000000000 --- a/packages/template/project/App.js +++ /dev/null @@ -1,67 +0,0 @@ -/** - * Sample React Native App with Firebase - * https://github.com/invertase/react-native-firebase - * - * @format - * @flow - */ - -import React, { Component } from 'react'; -import { Platform, StyleSheet, Text, View } from 'react-native'; - -import firebase from '@react-native-firebase/app'; - -// TODO(you): import any additional firebase services that you require for your app, e.g for auth: -// 1) install the npm package: `yarn add @react-native-firebase/auth@alpha` - you do not need to -// run linking commands - this happens automatically at build time now -// 2) rebuild your app via `yarn run run:android` or `yarn run run:ios` -// 3) import the package here in your JavaScript code: `import '@react-native-firebase/auth';` -// 4) The Firebase Auth service is now available to use here: `firebase.auth().currentUser` - -const instructions = Platform.select({ - ios: 'Press Cmd+R to reload,\nCmd+D or shake for dev menu', - android: 'Double tap R on your keyboard to reload,\nShake or press menu button for dev menu', -}); - -const firebaseCredentials = Platform.select({ - ios: 'https://invertase.link/firebase-ios', - android: 'https://invertase.link/firebase-android', -}); - -type Props = {}; - -export default class App extends Component { - render() { - return ( - - Welcome to React Native + Firebase! - To get started, edit App.js - {instructions} - {!firebase.apps.length && ( - - {`\nYou currently have no Firebase apps registered, this most likely means you've not downloaded your project credentials. Visit the link below to learn more. \n\n ${firebaseCredentials}`} - - )} - - ); - } -} - -const styles = StyleSheet.create({ - container: { - flex: 1, - justifyContent: 'center', - alignItems: 'center', - backgroundColor: '#F5FCFF', - }, - welcome: { - fontSize: 20, - textAlign: 'center', - margin: 10, - }, - instructions: { - textAlign: 'center', - color: '#333333', - marginBottom: 5, - }, -}); diff --git a/packages/template/project/__tests__/App-test.js b/packages/template/project/__tests__/App-test.js deleted file mode 100644 index 178476699b6..00000000000 --- a/packages/template/project/__tests__/App-test.js +++ /dev/null @@ -1,14 +0,0 @@ -/** - * @format - */ - -import 'react-native'; -import React from 'react'; -import App from '../App'; - -// Note: test renderer must be required after react-native. -import renderer from 'react-test-renderer'; - -it('renders correctly', () => { - renderer.create(); -}); diff --git a/packages/template/project/_buckconfig b/packages/template/project/_buckconfig deleted file mode 100644 index 934256cb29d..00000000000 --- a/packages/template/project/_buckconfig +++ /dev/null @@ -1,6 +0,0 @@ - -[android] - target = Google Inc.:Google APIs:23 - -[maven_repositories] - central = https://repo1.maven.org/maven2 diff --git a/packages/template/project/_eslintrc.js b/packages/template/project/_eslintrc.js deleted file mode 100644 index 40c6dcd05f3..00000000000 --- a/packages/template/project/_eslintrc.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - root: true, - extends: '@react-native-community', -}; diff --git a/packages/template/project/_flowconfig b/packages/template/project/_flowconfig deleted file mode 100644 index 4afc766a296..00000000000 --- a/packages/template/project/_flowconfig +++ /dev/null @@ -1,75 +0,0 @@ -[ignore] -; We fork some components by platform -.*/*[.]android.js - -; Ignore "BUCK" generated dirs -/\.buckd/ - -; Ignore polyfills -node_modules/react-native/Libraries/polyfills/.* - -; These should not be required directly -; require from fbjs/lib instead: require('fbjs/lib/warning') -node_modules/warning/.* - -; Flow doesn't support platforms -.*/Libraries/Utilities/LoadingView.js - -[untyped] -.*/node_modules/@react-native-community/cli/.*/.* - -[include] - -[libs] -node_modules/react-native/Libraries/react-native/react-native-interface.js -node_modules/react-native/flow/ - -[options] -emoji=true - -esproposal.optional_chaining=enable -esproposal.nullish_coalescing=enable - -module.file_ext=.js -module.file_ext=.json -module.file_ext=.ios.js - -munge_underscores=true - -module.name_mapper='^react-native$' -> '/node_modules/react-native/Libraries/react-native/react-native-implementation' -module.name_mapper='^react-native/\(.*\)$' -> '/node_modules/react-native/\1' -module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '/node_modules/react-native/Libraries/Image/RelativeImageStub' - -suppress_type=$FlowIssue -suppress_type=$FlowFixMe -suppress_type=$FlowFixMeProps -suppress_type=$FlowFixMeState - -suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\) -suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)?:? #[0-9]+ -suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError - -[lints] -sketchy-null-number=warn -sketchy-null-mixed=warn -sketchy-number=warn -untyped-type-import=warn -nonstrict-import=warn -deprecated-type=warn -unsafe-getters-setters=warn -inexact-spread=warn -unnecessary-invariant=warn -signature-verification-failure=warn -deprecated-utility=error - -[strict] -deprecated-type -nonstrict-import -sketchy-null -unclear-type -unsafe-getters-setters -untyped-import -untyped-type-import - -[version] -^0.105.0 diff --git a/packages/template/project/_gitattributes b/packages/template/project/_gitattributes deleted file mode 100644 index d42ff18354d..00000000000 --- a/packages/template/project/_gitattributes +++ /dev/null @@ -1 +0,0 @@ -*.pbxproj -text diff --git a/packages/template/project/_gitignore b/packages/template/project/_gitignore deleted file mode 100644 index ad572e632bc..00000000000 --- a/packages/template/project/_gitignore +++ /dev/null @@ -1,59 +0,0 @@ -# OSX -# -.DS_Store - -# Xcode -# -build/ -*.pbxuser -!default.pbxuser -*.mode1v3 -!default.mode1v3 -*.mode2v3 -!default.mode2v3 -*.perspectivev3 -!default.perspectivev3 -xcuserdata -*.xccheckout -*.moved-aside -DerivedData -*.hmap -*.ipa -*.xcuserstate - -# Android/IntelliJ -# -build/ -.idea -.gradle -local.properties -*.iml - -# node.js -# -node_modules/ -npm-debug.log -yarn-error.log - -# BUCK -buck-out/ -\.buckd/ -*.keystore -!debug.keystore - -# fastlane -# -# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the -# screenshots whenever they are needed. -# For more information about the recommended setup visit: -# https://docs.fastlane.tools/best-practices/source-control/ - -*/fastlane/report.xml -*/fastlane/Preview.html -*/fastlane/screenshots - -# Bundle artifact -*.jsbundle - -# CocoaPods -/ios/Pods/ diff --git a/packages/template/project/_watchmanconfig b/packages/template/project/_watchmanconfig deleted file mode 100644 index 9e26dfeeb6e..00000000000 --- a/packages/template/project/_watchmanconfig +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/packages/template/project/android/app/_BUCK b/packages/template/project/android/app/_BUCK deleted file mode 100644 index 0e779048347..00000000000 --- a/packages/template/project/android/app/_BUCK +++ /dev/null @@ -1,55 +0,0 @@ -# To learn about Buck see [Docs](https://buckbuild.com/). -# To run your application with Buck: -# - install Buck -# - `npm start` - to start the packager -# - `cd android` -# - `keytool -genkey -v -keystore keystores/debug.keystore -storepass android -alias androiddebugkey -keypass android -dname "CN=Android Debug,O=Android,C=US"` -# - `./gradlew :app:copyDownloadableDepsToLibs` - make all Gradle compile dependencies available to Buck -# - `buck install -r android/app` - compile, install and run application -# - -load(":build_defs.bzl", "create_aar_targets", "create_jar_targets") - -lib_deps = [] - -create_aar_targets(glob(["libs/*.aar"])) - -create_jar_targets(glob(["libs/*.jar"])) - -android_library( - name = "all-libs", - exported_deps = lib_deps, -) - -android_library( - name = "app-code", - srcs = glob([ - "src/main/java/**/*.java", - ]), - deps = [ - ":all-libs", - ":build_config", - ":res", - ], -) - -android_build_config( - name = "build_config", - package = "com.helloworld", -) - -android_resource( - name = "res", - package = "com.helloworld", - res = "src/main/res", -) - -android_binary( - name = "app", - keystore = "//android/keystores:debug", - manifest = "src/main/AndroidManifest.xml", - package_type = "debug", - deps = [ - ":app-code", - ], -) diff --git a/packages/template/project/android/app/build.gradle b/packages/template/project/android/app/build.gradle deleted file mode 100644 index 749e80cefa3..00000000000 --- a/packages/template/project/android/app/build.gradle +++ /dev/null @@ -1,205 +0,0 @@ -apply plugin: "com.android.application" - -import com.android.build.OutputFile - -/** - * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets - * and bundleReleaseJsAndAssets). - * These basically call `react-native bundle` with the correct arguments during the Android build - * cycle. By default, bundleDebugJsAndAssets is skipped, as in debug/dev mode we prefer to load the - * bundle directly from the development server. Below you can see all the possible configurations - * and their defaults. If you decide to add a configuration block, make sure to add it before the - * `apply from: "../../node_modules/react-native/react.gradle"` line. - * - * project.ext.react = [ - * // the name of the generated asset file containing your JS bundle - * bundleAssetName: "index.android.bundle", - * - * // the entry file for bundle generation - * entryFile: "index.android.js", - * - * // https://facebook.github.io/react-native/docs/performance#enable-the-ram-format - * bundleCommand: "ram-bundle", - * - * // whether to bundle JS and assets in debug mode - * bundleInDebug: false, - * - * // whether to bundle JS and assets in release mode - * bundleInRelease: true, - * - * // whether to bundle JS and assets in another build variant (if configured). - * // See http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Build-Variants - * // The configuration property can be in the following formats - * // 'bundleIn${productFlavor}${buildType}' - * // 'bundleIn${buildType}' - * // bundleInFreeDebug: true, - * // bundleInPaidRelease: true, - * // bundleInBeta: true, - * - * // whether to disable dev mode in custom build variants (by default only disabled in release) - * // for example: to disable dev mode in the staging build type (if configured) - * devDisabledInStaging: true, - * // The configuration property can be in the following formats - * // 'devDisabledIn${productFlavor}${buildType}' - * // 'devDisabledIn${buildType}' - * - * // the root of your project, i.e. where "package.json" lives - * root: "../../", - * - * // where to put the JS bundle asset in debug mode - * jsBundleDirDebug: "$buildDir/intermediates/assets/debug", - * - * // where to put the JS bundle asset in release mode - * jsBundleDirRelease: "$buildDir/intermediates/assets/release", - * - * // where to put drawable resources / React Native assets, e.g. the ones you use via - * // require('./image.png')), in debug mode - * resourcesDirDebug: "$buildDir/intermediates/res/merged/debug", - * - * // where to put drawable resources / React Native assets, e.g. the ones you use via - * // require('./image.png')), in release mode - * resourcesDirRelease: "$buildDir/intermediates/res/merged/release", - * - * // by default the gradle tasks are skipped if none of the JS files or assets change; this means - * // that we don't look at files in android/ or ios/ to determine whether the tasks are up to - * // date; if you have any other folders that you want to ignore for performance reasons (gradle - * // indexes the entire tree), add them here. Alternatively, if you have JS files in android/ - * // for example, you might want to remove it from here. - * inputExcludes: ["android/**", "ios/**"], - * - * // override which node gets called and with what additional arguments - * nodeExecutableAndArgs: ["node"], - * - * // supply additional arguments to the packager - * extraPackagerArgs: [] - * ] - */ - -project.ext.react = [ - entryFile: "index.js", - enableHermes: false, // clean and rebuild if changing -] - -apply from: "../../node_modules/react-native/react.gradle" - -/** - * Set this to true to create two separate APKs instead of one: - * - An APK that only works on ARM devices - * - An APK that only works on x86 devices - * The advantage is the size of the APK is reduced by about 4MB. - * Upload all the APKs to the Play Store and people will download - * the correct one based on the CPU architecture of their device. - */ -def enableSeparateBuildPerCPUArchitecture = false - -/** - * Run Proguard to shrink the Java bytecode in release builds. - */ -def enableProguardInReleaseBuilds = false - -/** - * The preferred build flavor of JavaScriptCore. - * - * For example, to use the international variant, you can use: - * `def jscFlavor = 'org.webkit:android-jsc-intl:+'` - * - * The international variant includes ICU i18n library and necessary data - * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that - * give correct results when using with locales other than en-US. Note that - * this variant is about 6MiB larger per architecture than default. - */ -def jscFlavor = 'org.webkit:android-jsc:+' - -/** - * Whether to enable the Hermes VM. - * - * This should be set on project.ext.react and mirrored here. If it is not set - * on project.ext.react, JavaScript will not be compiled to Hermes Bytecode - * and the benefits of using Hermes will therefore be sharply reduced. - */ -def enableHermes = project.ext.react.get("enableHermes", false); - -android { - compileSdkVersion rootProject.ext.compileSdkVersion - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - defaultConfig { - applicationId "com.helloworld" - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 1 - versionName "1.0" - aaptOptions{ - noCompress "tflite","model" - } - } - splits { - abi { - reset() - enable enableSeparateBuildPerCPUArchitecture - universalApk false // If true, also generate a universal APK - include "armeabi-v7a", "x86", "arm64-v8a", "x86_64" - } - } - signingConfigs { - debug { - storeFile file('debug.keystore') - storePassword 'android' - keyAlias 'androiddebugkey' - keyPassword 'android' - } - } - buildTypes { - debug { - signingConfig signingConfigs.debug - } - release { - // Caution! In production, you need to generate your own keystore file. - // see https://facebook.github.io/react-native/docs/signed-apk-android. - signingConfig signingConfigs.debug - minifyEnabled enableProguardInReleaseBuilds - proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" - } - } - // applicationVariants are e.g. debug, release - applicationVariants.all { variant -> - variant.outputs.each { output -> - // For each separate APK per architecture, set a unique version code as described here: - // https://developer.android.com/studio/build/configure-apk-splits.html - def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4] - def abi = output.getFilter(OutputFile.ABI) - if (abi != null) { // null for the universal-debug, universal-release variants - output.versionCodeOverride = - versionCodes.get(abi) * 1048576 + defaultConfig.versionCode - } - - } - } -} - -dependencies { - implementation fileTree(dir: "libs", include: ["*.jar"]) - implementation "com.facebook.react:react-native:+" // From node_modules - - if (enableHermes) { - def hermesPath = "../../node_modules/hermes-engine/android/"; - debugImplementation files(hermesPath + "hermes-debug.aar") - releaseImplementation files(hermesPath + "hermes-release.aar") - } else { - implementation jscFlavor - } -} - -// Run this once to be able to run the application with BUCK -// puts all compile dependencies into folder libs for BUCK to use -task copyDownloadableDepsToLibs(type: Copy) { - from configurations.compile - into 'libs' -} - -apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) -apply plugin: 'com.google.gms.google-services' diff --git a/packages/template/project/android/app/build_defs.bzl b/packages/template/project/android/app/build_defs.bzl deleted file mode 100644 index fff270f8d1d..00000000000 --- a/packages/template/project/android/app/build_defs.bzl +++ /dev/null @@ -1,19 +0,0 @@ -"""Helper definitions to glob .aar and .jar targets""" - -def create_aar_targets(aarfiles): - for aarfile in aarfiles: - name = "aars__" + aarfile[aarfile.rindex("/") + 1:aarfile.rindex(".aar")] - lib_deps.append(":" + name) - android_prebuilt_aar( - name = name, - aar = aarfile, - ) - -def create_jar_targets(jarfiles): - for jarfile in jarfiles: - name = "jars__" + jarfile[jarfile.rindex("/") + 1:jarfile.rindex(".jar")] - lib_deps.append(":" + name) - prebuilt_jar( - name = name, - binary_jar = jarfile, - ) diff --git a/packages/template/project/android/app/debug.keystore b/packages/template/project/android/app/debug.keystore deleted file mode 100644 index 364e105ed39fbfd62001429a68140672b06ec0de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2257 zcmchYXEfYt8;7T1^dLH$VOTZ%2NOdOH5j5LYLtZ0q7x-V8_6gU5)#7dkq{HTmsfNq zB3ZqcAxeY^G10@?efK?Q&)M(qInVv!xjx+IKEL}p*K@LYvIzo#AZG>st5|P)KF1_Z;y){W{<7K{nl!CPuE z_^(!C(Ol0n8 zK13*rzAtW>(wULKPRYLd7G18F8#1P`V*9`(Poj26eOXYyBVZPno~Cvvhx7vPjAuZo zF?VD!zB~QG(!zbw#qsxT8%BSpqMZ4f70ZPn-3y$L8{EVbbN9$H`B&Z1quk9tgp5FM zuxp3pJ0b8u|3+#5bkJ4SRnCF2l7#DyLYXYY8*?OuAwK4E6J{0N=O3QNVzQ$L#FKkR zi-c@&!nDvezOV$i$Lr}iF$XEcwnybQ6WZrMKuw8gCL^U#D;q3t&HpTbqyD%vG=TeDlzCT~MXUPC|Leb-Uk+ z=vnMd(|>ld?Fh>V8poP;q;;nc@en$|rnP0ytzD&fFkCeUE^kG9Kx4wUh!!rpjwKDP zyw_e|a^x_w3E zP}}@$g>*LLJ4i0`Gx)qltL}@;mDv}D*xR^oeWcWdPkW@Uu)B^X&4W1$p6}ze!zudJ zyiLg@uggoMIArBr*27EZV7djDg@W1MaL+rcZ-lrANJQ%%>u8)ZMWU@R2qtnmG(acP z0d_^!t>}5W zpT`*2NR+0+SpTHb+6Js4b;%LJB;B_-ChhnU5py}iJtku*hm5F0!iql8Hrpcy1aYbT z1*dKC5ua6pMX@@iONI?Hpr%h;&YaXp9n!ND7-=a%BD7v&g zOO41M6EbE24mJ#S$Ui0-brR5ML%@|ndz^)YLMMV1atna{Fw<;TF@>d&F|!Z>8eg>>hkFrV)W+uv=`^F9^e zzzM2*oOjT9%gLoub%(R57p-`TXFe#oh1_{&N-YN z<}artH|m=d8TQuKSWE)Z%puU|g|^^NFwC#N=@dPhasyYjoy(fdEVfKR@cXKHZV-`06HsP`|Ftx;8(YD$fFXumLWbGnu$GMqRncXYY9mwz9$ap zQtfZB^_BeNYITh^hA7+(XNFox5WMeG_LtJ%*Q}$8VKDI_p8^pqX)}NMb`0e|wgF7D zuQACY_Ua<1ri{;Jwt@_1sW9zzdgnyh_O#8y+C;LcZq6=4e^cs6KvmK@$vVpKFGbQ= z$)Eux5C|Fx;Gtmv9^#Y-g@7Rt7*eLp5n!gJmn7&B_L$G?NCN`AP>cXQEz}%F%K;vUs{+l4Q{}eWW;ATe2 zqvXzxoIDy(u;F2q1JH7Sf;{jy_j})F+cKlIOmNfjBGHoG^CN zM|Ho&&X|L-36f}Q-obEACz`sI%2f&k>z5c$2TyTSj~vmO)BW~+N^kt`Jt@R|s!){H ze1_eCrlNaPkJQhL$WG&iRvF*YG=gXd1IyYQ9ew|iYn7r~g!wOnw;@n42>enAxBv*A zEmV*N#sxdicyNM=A4|yaOC5MByts}s_Hpfj|y<6G=o=!3S@eIFKDdpR7|FY>L&Wat&oW&cm&X~ z5Bt>Fcq(fgnvlvLSYg&o6>&fY`ODg4`V^lWWD=%oJ#Kbad2u~! zLECFS*??>|vDsNR&pH=Ze0Eo`sC_G`OjoEKVHY|wmwlX&(XBE<@sx3Hd^gtd-fNwUHsylg06p`U2y_={u}Bc - - - - - - diff --git a/packages/template/project/android/app/src/main/AndroidManifest.xml b/packages/template/project/android/app/src/main/AndroidManifest.xml deleted file mode 100644 index 7bfb4481abb..00000000000 --- a/packages/template/project/android/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/packages/template/project/android/app/src/main/java/com/helloworld/MainActivity.java b/packages/template/project/android/app/src/main/java/com/helloworld/MainActivity.java deleted file mode 100644 index 1e9c1894804..00000000000 --- a/packages/template/project/android/app/src/main/java/com/helloworld/MainActivity.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.helloworld; - -import com.facebook.react.ReactActivity; - -public class MainActivity extends ReactActivity { - - /** - * Returns the name of the main component registered from JavaScript. - * This is used to schedule rendering of the component. - */ - @Override - protected String getMainComponentName() { - return "HelloWorld"; - } -} diff --git a/packages/template/project/android/app/src/main/java/com/helloworld/MainApplication.java b/packages/template/project/android/app/src/main/java/com/helloworld/MainApplication.java deleted file mode 100644 index ae1ff7cf28e..00000000000 --- a/packages/template/project/android/app/src/main/java/com/helloworld/MainApplication.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.helloworld; - -import android.app.Application; -import android.content.Context; -import com.facebook.react.PackageList; -import com.facebook.react.ReactApplication; -import com.facebook.react.ReactNativeHost; -import com.facebook.react.ReactPackage; -import com.facebook.soloader.SoLoader; -import java.lang.reflect.InvocationTargetException; -import java.util.List; - -public class MainApplication extends Application implements ReactApplication { - - private final ReactNativeHost mReactNativeHost = - new ReactNativeHost(this) { - @Override - public boolean getUseDeveloperSupport() { - return BuildConfig.DEBUG; - } - - @Override - protected List getPackages() { - @SuppressWarnings("UnnecessaryLocalVariable") - List packages = new PackageList(this).getPackages(); - // Packages that cannot be autolinked yet can be added manually here, for example: - // packages.add(new MyReactNativePackage()); - return packages; - } - - @Override - protected String getJSMainModuleName() { - return "index"; - } - }; - - @Override - public ReactNativeHost getReactNativeHost() { - return mReactNativeHost; - } - - @Override - public void onCreate() { - super.onCreate(); - SoLoader.init(this, /* native exopackage */ false); - initializeFlipper(this); // Remove this line if you don't want Flipper enabled - } - - /** - * Loads Flipper in React Native templates. - * - * @param context - */ - private static void initializeFlipper(Context context) { - if (BuildConfig.DEBUG) { - try { - /* - We use reflection here to pick up the class that initializes Flipper, - since Flipper library is not available in release mode - */ - Class aClass = Class.forName("com.facebook.flipper.ReactNativeFlipper"); - aClass.getMethod("initializeFlipper", Context.class).invoke(null, context); - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } catch (NoSuchMethodException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } catch (InvocationTargetException e) { - e.printStackTrace(); - } - } - } -} diff --git a/packages/template/project/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/packages/template/project/android/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index a2f5908281d070150700378b64a84c7db1f97aa1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3056 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 axPAxe%7rDusX+w*00006jj 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⁣ zwiG+x#%j}{0gU~J8;<|!B1@-XaB@{KORFwrYg_8rOv({b0EO#DbeQRm;B6_9=mXGf z-x|VL{zd`)#@yN}HkCSJbjbNlE|zL3Wm9Q8HY`sV)}3%pgN>cL^67{Z;PPL(*wT8N zUjXU{@|*hvm}({wsAC=x0^ok0%UAz0;sogW{B!nDqk|JJ5x~4NfTDgP49^zeu`csl?5mY@JdQdISc zFs!E{^grmkLnUk9 zny~m)1vws@5BFI<-0Tuo2JWX(0v`W|t(wg;s--L47WTvTMz-8l#TL^=OJNRS2?_Qj z3AKT+gvbyBi#H*-tJ%tWD|>EV3wy|8qxfzS!5RW;Jpl5*zo&^UBU=fG#2}UvRyNkK zA06Dy9;K1ca@r2T>yThYgI!ont$(G{6q#2QT+00r_x0(b)gsE`lBB?2gr55gq^D3Fi&p%E(p9>U%bv zkg1Jco(RbyTX7FDHOnl7-O@ zI$AaIl?9NJKPm(WiBP`1-#CB1QzU>&hKm)fpa5DKE{2$X0hGz-0uZ?cyTk(YC!Y&| zL=1VrNERSA5NA2jq7FACfX4JfPyj5XXl1yv0>~s;eF7L2$>&oMqeTFT2m$y7FlkON z_yurD1yIOvA;5C6016pyxBznGUt0kJ&k5r#;&>Jow`r)sp9R~PmK~lz$3xH%LT*1U zJdOyABZ3!FvNoR*vN$5ykHS8f`jA4zV+|L}i1C4`B2c{R0;UdYxaU|H)2avz@ z=mEYc|2S<+(B2Tj+FkX+2D+yFI!k9lWMA61DJ{)e;lum$(;O87?vGJJe!KtK04+N_ zI*P~t@dUb>9Xh{dbyl{-ZQ(UMgz7$|QfL5XSPkskt^NgctYC#;4WcZB1@%@wy@2t3 z2z0DI7&%b$*Aw~abe?GxE`ez@+6hOh-6*8fHRV{1os$EL@}uUZeG4h1&Be`98q*7j z=3-v+lhIjfWVo12!<>%V^a6lTgW3+_#W6n|p*~==zOH7z$0{LSZk(Tpd7EaD04hnA zL;#fxS0aD{`5^&D`}>0Uq?byDD-l2=!wm_bLcUl4gc(% za1p|itVANvFF>hghAS07Im1;IK;|b*W)}VDyI;BIp2=K*yu2a)j?B|f<44NI$NbmJ z#dE0>jI$fMr&@>4kN8MLFb4&2O9fEKaQg%(QO$4_1rVQywG^CmBLh#}_7gKW3vd?| z2?1^&KWq8}8I^_S0|)MowU_pw$q@nl@Nkn$z>BQq_KA^9yaR`(R3u{{Ig;cwt z@AJ^{ODQCm^neroM9nKNUAXi9RCK`OsP_LuR0PUR(YZCCX5dNF6VzcoK&=b^r`W?ltt|*F zpkoae%ZT{C1h~EcFui~b7fF`vb<<~j_VquuUA$}QqIKYELPp#;{u?q8Dz}WAG-(3; zjrm$i%7UbyZMM(Y{>!uJ#vNB?R~B{6Htp=>e*<{fQQ5W7V(1coCWlOON!MzZxhum| ztZBQpGR z;~#ur^&PockKdV{Q6R>o`Pl{0x!DEbpZ7y9Y;*ZvE!*gU`V1W3znva{f=?WO5I&>B z&hw6}tjECtaghm5z|C#%M;Yf_*pI^};h}Vl=^r9EN=tVDj86D;C$jIJ?K7VP+00000NkvXXu0mjf D5i!M* diff --git a/packages/template/project/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/packages/template/project/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 459ca609d3ae0d3943ab44cdc27feef9256dc6d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7098 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 diff --git a/packages/template/project/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/packages/template/project/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 8ca12fe024be86e868d14e91120a6902f8e88ac6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6464 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 B0*L?s diff --git a/packages/template/project/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/packages/template/project/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index 8e19b410a1b15ff180f3dacac19395fe3046cdec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10676 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 diff --git a/packages/template/project/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/packages/template/project/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index 4c19a13c239cb67b8a2134ddd5f325db1d2d5bee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15523 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 BIP(Ai diff --git a/packages/template/project/android/app/src/main/res/values/strings.xml b/packages/template/project/android/app/src/main/res/values/strings.xml deleted file mode 100644 index 0c79c4bad47..00000000000 --- a/packages/template/project/android/app/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - Hello App Display Name - diff --git a/packages/template/project/android/app/src/main/res/values/styles.xml b/packages/template/project/android/app/src/main/res/values/styles.xml deleted file mode 100644 index 319eb0ca100..00000000000 --- a/packages/template/project/android/app/src/main/res/values/styles.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/packages/template/project/android/build.gradle b/packages/template/project/android/build.gradle deleted file mode 100644 index af3e38da6ac..00000000000 --- a/packages/template/project/android/build.gradle +++ /dev/null @@ -1,40 +0,0 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - -buildscript { - ext { - buildToolsVersion = "29.0.3" - minSdkVersion = 16 - compileSdkVersion = 29 - targetSdkVersion = 29 - } - repositories { - google() - jcenter() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:4.0.1' - classpath 'com.google.gms:google-services:4.3.3' - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } -} - -allprojects { - repositories { - mavenLocal() - maven { - // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm - url("$rootDir/../node_modules/react-native/android") - } - maven { - // Android JSC is installed from npm - url("$rootDir/../node_modules/jsc-android/dist") - } - - google() - jcenter() - maven { url 'https://jitpack.io' } - } -} diff --git a/packages/template/project/android/gradle.properties b/packages/template/project/android/gradle.properties deleted file mode 100644 index c62d03dc2ca..00000000000 --- a/packages/template/project/android/gradle.properties +++ /dev/null @@ -1,21 +0,0 @@ -# Project-wide Gradle settings. - -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. - -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html - -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -# Default value: -Xmx10248m -XX:MaxPermSize=256m -org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 - -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true - -android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/template/project/android/gradle/wrapper/gradle-wrapper.jar b/packages/template/project/android/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 5c2d1cf016b3885f6930543d57b744ea8c220a1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 55616 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 \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - -exec "$JAVACMD" "$@" diff --git a/packages/template/project/android/gradlew.bat b/packages/template/project/android/gradlew.bat deleted file mode 100644 index 9991c503266..00000000000 --- a/packages/template/project/android/gradlew.bat +++ /dev/null @@ -1,100 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem http://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/packages/template/project/android/settings.gradle b/packages/template/project/android/settings.gradle deleted file mode 100644 index e50c29d6298..00000000000 --- a/packages/template/project/android/settings.gradle +++ /dev/null @@ -1,3 +0,0 @@ -rootProject.name = 'HelloWorld' -apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings) -include ':app' diff --git a/packages/template/project/app.json b/packages/template/project/app.json deleted file mode 100644 index cbbc305181a..00000000000 --- a/packages/template/project/app.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "HelloWorld", - "displayName": "HelloWorld" -} diff --git a/packages/template/project/babel.config.js b/packages/template/project/babel.config.js deleted file mode 100644 index f842b77fcfb..00000000000 --- a/packages/template/project/babel.config.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = { - presets: ['module:metro-react-native-babel-preset'], -}; diff --git a/packages/template/project/firebase.json b/packages/template/project/firebase.json deleted file mode 100644 index d7cf66190a6..00000000000 --- a/packages/template/project/firebase.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "react-native": {} -} diff --git a/packages/template/project/index.js b/packages/template/project/index.js deleted file mode 100644 index 9b739329140..00000000000 --- a/packages/template/project/index.js +++ /dev/null @@ -1,9 +0,0 @@ -/** - * @format - */ - -import { AppRegistry } from 'react-native'; -import App from './App'; -import { name as appName } from './app.json'; - -AppRegistry.registerComponent(appName, () => App); diff --git a/packages/template/project/ios/HelloWorld-tvOS/Info.plist b/packages/template/project/ios/HelloWorld-tvOS/Info.plist deleted file mode 100644 index ecbd496be7d..00000000000 --- a/packages/template/project/ios/HelloWorld-tvOS/Info.plist +++ /dev/null @@ -1,53 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - LSRequiresIPhoneOS - - NSAppTransportSecurity - - NSExceptionDomains - - localhost - - NSExceptionAllowsInsecureHTTPLoads - - - - - NSLocationWhenInUseUsageDescription - - UILaunchStoryboardName - LaunchScreen - UIRequiredDeviceCapabilities - - armv7 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UIViewControllerBasedStatusBarAppearance - - - diff --git a/packages/template/project/ios/HelloWorld-tvOSTests/Info.plist b/packages/template/project/ios/HelloWorld-tvOSTests/Info.plist deleted file mode 100644 index 886825ccc9b..00000000000 --- a/packages/template/project/ios/HelloWorld-tvOSTests/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - - diff --git a/packages/template/project/ios/HelloWorld.xcodeproj/project.pbxproj b/packages/template/project/ios/HelloWorld.xcodeproj/project.pbxproj deleted file mode 100644 index 7d7f9320723..00000000000 --- a/packages/template/project/ios/HelloWorld.xcodeproj/project.pbxproj +++ /dev/null @@ -1,782 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - 00E356F31AD99517003FC87E /* HelloWorldTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* HelloWorldTests.m */; }; - 13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; }; - 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; }; - 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; - 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; - 2D02E4BC1E0B4A80006451C7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; }; - 2D02E4BD1E0B4A84006451C7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; - 2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; - 2DCD954D1E0B4F2C00145EB5 /* HelloWorldTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* HelloWorldTests.m */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - 00E356F41AD99517003FC87E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 13B07F861A680F5B00A75B9A; - remoteInfo = HelloWorld; - }; - 2D02E4911E0B4A5D006451C7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 2D02E47A1E0B4A5D006451C7; - remoteInfo = "HelloWorld-tvOS"; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXFileReference section */ - 008F07F21AC5B25A0029DE68 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = ""; }; - 00E356EE1AD99517003FC87E /* HelloWorldTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = HelloWorldTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 00E356F21AD99517003FC87E /* HelloWorldTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HelloWorldTests.m; sourceTree = ""; }; - 13B07F961A680F5B00A75B9A /* HelloWorld.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HelloWorld.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = HelloWorld/AppDelegate.h; sourceTree = ""; }; - 13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = HelloWorld/AppDelegate.m; sourceTree = ""; }; - 13B07FB21A68108700A75B9A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; - 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = HelloWorld/Images.xcassets; sourceTree = ""; }; - 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = HelloWorld/Info.plist; sourceTree = ""; }; - 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = HelloWorld/main.m; sourceTree = ""; }; - 2D02E47B1E0B4A5D006451C7 /* HelloWorld-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HelloWorld-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - 2D02E4901E0B4A5D006451C7 /* HelloWorld-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "HelloWorld-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; - ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; - ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 00E356EB1AD99517003FC87E /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 13B07F8C1A680F5B00A75B9A /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 2D02E4781E0B4A5D006451C7 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 2D02E48D1E0B4A5D006451C7 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 00E356EF1AD99517003FC87E /* HelloWorldTests */ = { - isa = PBXGroup; - children = ( - 00E356F21AD99517003FC87E /* HelloWorldTests.m */, - 00E356F01AD99517003FC87E /* Supporting Files */, - ); - path = HelloWorldTests; - sourceTree = ""; - }; - 00E356F01AD99517003FC87E /* Supporting Files */ = { - isa = PBXGroup; - children = ( - 00E356F11AD99517003FC87E /* Info.plist */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; - 13B07FAE1A68108700A75B9A /* HelloWorld */ = { - isa = PBXGroup; - children = ( - 008F07F21AC5B25A0029DE68 /* main.jsbundle */, - 13B07FAF1A68108700A75B9A /* AppDelegate.h */, - 13B07FB01A68108700A75B9A /* AppDelegate.m */, - 13B07FB51A68108700A75B9A /* Images.xcassets */, - 13B07FB61A68108700A75B9A /* Info.plist */, - 13B07FB11A68108700A75B9A /* LaunchScreen.xib */, - 13B07FB71A68108700A75B9A /* main.m */, - ); - name = HelloWorld; - sourceTree = ""; - }; - 2D16E6871FA4F8E400B85C8A /* Frameworks */ = { - isa = PBXGroup; - children = ( - ED297162215061F000B7C4FE /* JavaScriptCore.framework */, - ED2971642150620600B7C4FE /* JavaScriptCore.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; - 832341AE1AAA6A7D00B99B32 /* Libraries */ = { - isa = PBXGroup; - children = ( - ); - name = Libraries; - sourceTree = ""; - }; - 83CBB9F61A601CBA00E9B192 = { - isa = PBXGroup; - children = ( - 13B07FAE1A68108700A75B9A /* HelloWorld */, - 832341AE1AAA6A7D00B99B32 /* Libraries */, - 00E356EF1AD99517003FC87E /* HelloWorldTests */, - 83CBBA001A601CBA00E9B192 /* Products */, - 2D16E6871FA4F8E400B85C8A /* Frameworks */, - ); - indentWidth = 2; - sourceTree = ""; - tabWidth = 2; - usesTabs = 0; - }; - 83CBBA001A601CBA00E9B192 /* Products */ = { - isa = PBXGroup; - children = ( - 13B07F961A680F5B00A75B9A /* HelloWorld.app */, - 00E356EE1AD99517003FC87E /* HelloWorldTests.xctest */, - 2D02E47B1E0B4A5D006451C7 /* HelloWorld-tvOS.app */, - 2D02E4901E0B4A5D006451C7 /* HelloWorld-tvOSTests.xctest */, - ); - name = Products; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 00E356ED1AD99517003FC87E /* HelloWorldTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "HelloWorldTests" */; - buildPhases = ( - 00E356EA1AD99517003FC87E /* Sources */, - 00E356EB1AD99517003FC87E /* Frameworks */, - 00E356EC1AD99517003FC87E /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 00E356F51AD99517003FC87E /* PBXTargetDependency */, - ); - name = HelloWorldTests; - productName = HelloWorldTests; - productReference = 00E356EE1AD99517003FC87E /* HelloWorldTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; - 13B07F861A680F5B00A75B9A /* HelloWorld */ = { - isa = PBXNativeTarget; - buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "HelloWorld" */; - buildPhases = ( - FD10A7F022414F080027D42C /* Start Packager */, - 13B07F871A680F5B00A75B9A /* Sources */, - 13B07F8C1A680F5B00A75B9A /* Frameworks */, - 13B07F8E1A680F5B00A75B9A /* Resources */, - 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = HelloWorld; - productName = "HelloWorld"; - productReference = 13B07F961A680F5B00A75B9A /* HelloWorld.app */; - productType = "com.apple.product-type.application"; - }; - 2D02E47A1E0B4A5D006451C7 /* HelloWorld-tvOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = 2D02E4BA1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "HelloWorld-tvOS" */; - buildPhases = ( - FD10A7F122414F3F0027D42C /* Start Packager */, - 2D02E4771E0B4A5D006451C7 /* Sources */, - 2D02E4781E0B4A5D006451C7 /* Frameworks */, - 2D02E4791E0B4A5D006451C7 /* Resources */, - 2D02E4CB1E0B4B27006451C7 /* Bundle React Native Code And Images */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "HelloWorld-tvOS"; - productName = "HelloWorld-tvOS"; - productReference = 2D02E47B1E0B4A5D006451C7 /* HelloWorld-tvOS.app */; - productType = "com.apple.product-type.application"; - }; - 2D02E48F1E0B4A5D006451C7 /* HelloWorld-tvOSTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 2D02E4BB1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "HelloWorld-tvOSTests" */; - buildPhases = ( - 2D02E48C1E0B4A5D006451C7 /* Sources */, - 2D02E48D1E0B4A5D006451C7 /* Frameworks */, - 2D02E48E1E0B4A5D006451C7 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 2D02E4921E0B4A5D006451C7 /* PBXTargetDependency */, - ); - name = "HelloWorld-tvOSTests"; - productName = "HelloWorld-tvOSTests"; - productReference = 2D02E4901E0B4A5D006451C7 /* HelloWorld-tvOSTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 83CBB9F71A601CBA00E9B192 /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 0940; - ORGANIZATIONNAME = Facebook; - TargetAttributes = { - 00E356ED1AD99517003FC87E = { - CreatedOnToolsVersion = 6.2; - TestTargetID = 13B07F861A680F5B00A75B9A; - }; - 2D02E47A1E0B4A5D006451C7 = { - CreatedOnToolsVersion = 8.2.1; - ProvisioningStyle = Automatic; - }; - 2D02E48F1E0B4A5D006451C7 = { - CreatedOnToolsVersion = 8.2.1; - ProvisioningStyle = Automatic; - TestTargetID = 2D02E47A1E0B4A5D006451C7; - }; - }; - }; - buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "HelloWorld" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 83CBB9F61A601CBA00E9B192; - productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 13B07F861A680F5B00A75B9A /* HelloWorld */, - 00E356ED1AD99517003FC87E /* HelloWorldTests */, - 2D02E47A1E0B4A5D006451C7 /* HelloWorld-tvOS */, - 2D02E48F1E0B4A5D006451C7 /* HelloWorld-tvOSTests */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 00E356EC1AD99517003FC87E /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 13B07F8E1A680F5B00A75B9A /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, - 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 2D02E4791E0B4A5D006451C7 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 2D02E4BD1E0B4A84006451C7 /* Images.xcassets in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 2D02E48E1E0B4A5D006451C7 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Bundle React Native code and images"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh"; - }; - 2D02E4CB1E0B4B27006451C7 /* Bundle React Native Code And Images */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Bundle React Native Code And Images"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh"; - }; - FD10A7F022414F080027D42C /* Start Packager */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - name = "Start Packager"; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "export RCT_METRO_PORT=\"${RCT_METRO_PORT:=8081}\"\necho \"export RCT_METRO_PORT=${RCT_METRO_PORT}\" > \"${SRCROOT}/../node_modules/react-native/scripts/.packager.env\"\nif [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\n if nc -w 5 -z localhost ${RCT_METRO_PORT} ; then\n if ! curl -s \"http://localhost:${RCT_METRO_PORT}/status\" | grep -q \"packager-status:running\" ; then\n echo \"Port ${RCT_METRO_PORT} already in use, packager is either not running or not running correctly\"\n exit 2\n fi\n else\n open \"$SRCROOT/../node_modules/react-native/scripts/launchPackager.command\" || echo \"Can't start packager automatically\"\n fi\nfi\n"; - showEnvVarsInLog = 0; - }; - FD10A7F122414F3F0027D42C /* Start Packager */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - name = "Start Packager"; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "export RCT_METRO_PORT=\"${RCT_METRO_PORT:=8081}\"\necho \"export RCT_METRO_PORT=${RCT_METRO_PORT}\" > \"${SRCROOT}/../node_modules/react-native/scripts/.packager.env\"\nif [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\n if nc -w 5 -z localhost ${RCT_METRO_PORT} ; then\n if ! curl -s \"http://localhost:${RCT_METRO_PORT}/status\" | grep -q \"packager-status:running\" ; then\n echo \"Port ${RCT_METRO_PORT} already in use, packager is either not running or not running correctly\"\n exit 2\n fi\n else\n open \"$SRCROOT/../node_modules/react-native/scripts/launchPackager.command\" || echo \"Can't start packager automatically\"\n fi\nfi\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 00E356EA1AD99517003FC87E /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 00E356F31AD99517003FC87E /* HelloWorldTests.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 13B07F871A680F5B00A75B9A /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */, - 13B07FC11A68108700A75B9A /* main.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 2D02E4771E0B4A5D006451C7 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */, - 2D02E4BC1E0B4A80006451C7 /* AppDelegate.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 2D02E48C1E0B4A5D006451C7 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 2DCD954D1E0B4F2C00145EB5 /* HelloWorldTests.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - 00E356F51AD99517003FC87E /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 13B07F861A680F5B00A75B9A /* HelloWorld */; - targetProxy = 00E356F41AD99517003FC87E /* PBXContainerItemProxy */; - }; - 2D02E4921E0B4A5D006451C7 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 2D02E47A1E0B4A5D006451C7 /* HelloWorld-tvOS */; - targetProxy = 2D02E4911E0B4A5D006451C7 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin PBXVariantGroup section */ - 13B07FB11A68108700A75B9A /* LaunchScreen.xib */ = { - isa = PBXVariantGroup; - children = ( - 13B07FB21A68108700A75B9A /* Base */, - ); - name = LaunchScreen.xib; - path = HelloWorld; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - 00E356F61AD99517003FC87E /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - INFOPLIST_FILE = HelloWorldTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - OTHER_LDFLAGS = ( - "-ObjC", - "-lc++", - "$(inherited)", - ); - PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/HelloWorld.app/HelloWorld"; - }; - name = Debug; - }; - 00E356F71AD99517003FC87E /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - COPY_PHASE_STRIP = NO; - INFOPLIST_FILE = HelloWorldTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - OTHER_LDFLAGS = ( - "-ObjC", - "-lc++", - "$(inherited)", - ); - PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/HelloWorld.app/HelloWorld"; - }; - name = Release; - }; - 13B07F941A680F5B00A75B9A /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CURRENT_PROJECT_VERSION = 1; - DEAD_CODE_STRIPPING = NO; - INFOPLIST_FILE = HelloWorld/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - OTHER_LDFLAGS = ( - "$(inherited)", - "-ObjC", - "-lc++", - ); - PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = HelloWorld; - VERSIONING_SYSTEM = "apple-generic"; - }; - name = Debug; - }; - 13B07F951A680F5B00A75B9A /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CURRENT_PROJECT_VERSION = 1; - INFOPLIST_FILE = HelloWorld/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - OTHER_LDFLAGS = ( - "$(inherited)", - "-ObjC", - "-lc++", - ); - PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = HelloWorld; - VERSIONING_SYSTEM = "apple-generic"; - }; - name = Release; - }; - 2D02E4971E0B4A5E006451C7 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image"; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - CLANG_ANALYZER_NONNULL = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_TESTABILITY = YES; - GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = "HelloWorld-tvOS/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - OTHER_LDFLAGS = ( - "$(inherited)", - "-ObjC", - "-lc++", - ); - PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.HelloWorld-tvOS"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = appletvos; - TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 9.2; - }; - name = Debug; - }; - 2D02E4981E0B4A5E006451C7 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image"; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - CLANG_ANALYZER_NONNULL = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = "HelloWorld-tvOS/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - OTHER_LDFLAGS = ( - "$(inherited)", - "-ObjC", - "-lc++", - ); - PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.HelloWorld-tvOS"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = appletvos; - TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 9.2; - }; - name = Release; - }; - 2D02E4991E0B4A5E006451C7 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CLANG_ANALYZER_NONNULL = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_TESTABILITY = YES; - GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = "HelloWorld-tvOSTests/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - OTHER_LDFLAGS = ( - "$(inherited)", - "-ObjC", - "-lc++", - ); - PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.HelloWorld-tvOSTests"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = appletvos; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/HelloWorld-tvOS.app/HelloWorld-tvOS"; - TVOS_DEPLOYMENT_TARGET = 10.1; - }; - name = Debug; - }; - 2D02E49A1E0B4A5E006451C7 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CLANG_ANALYZER_NONNULL = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = "HelloWorld-tvOSTests/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - OTHER_LDFLAGS = ( - "$(inherited)", - "-ObjC", - "-lc++", - ); - PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.HelloWorld-tvOSTests"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = appletvos; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/HelloWorld-tvOS.app/HelloWorld-tvOS"; - TVOS_DEPLOYMENT_TARGET = 10.1; - }; - name = Release; - }; - 83CBBA201A601CBA00E9B192 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - }; - name = Debug; - }; - 83CBBA211A601CBA00E9B192 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = YES; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = iphoneos; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "HelloWorldTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 00E356F61AD99517003FC87E /* Debug */, - 00E356F71AD99517003FC87E /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "HelloWorld" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 13B07F941A680F5B00A75B9A /* Debug */, - 13B07F951A680F5B00A75B9A /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 2D02E4BA1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "HelloWorld-tvOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 2D02E4971E0B4A5E006451C7 /* Debug */, - 2D02E4981E0B4A5E006451C7 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 2D02E4BB1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "HelloWorld-tvOSTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 2D02E4991E0B4A5E006451C7 /* Debug */, - 2D02E49A1E0B4A5E006451C7 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "HelloWorld" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 83CBBA201A601CBA00E9B192 /* Debug */, - 83CBBA211A601CBA00E9B192 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 83CBB9F71A601CBA00E9B192 /* Project object */; -} diff --git a/packages/template/project/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld-tvOS.xcscheme b/packages/template/project/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld-tvOS.xcscheme deleted file mode 100644 index a4c88796c96..00000000000 --- a/packages/template/project/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld-tvOS.xcscheme +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/template/project/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld.xcscheme b/packages/template/project/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld.xcscheme deleted file mode 100644 index 2c4df7880c0..00000000000 --- a/packages/template/project/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld.xcscheme +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/template/project/ios/HelloWorld/AppDelegate.h b/packages/template/project/ios/HelloWorld/AppDelegate.h deleted file mode 100644 index 2726d5e13c7..00000000000 --- a/packages/template/project/ios/HelloWorld/AppDelegate.h +++ /dev/null @@ -1,15 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -#import -#import - -@interface AppDelegate : UIResponder - -@property (nonatomic, strong) UIWindow *window; - -@end diff --git a/packages/template/project/ios/HelloWorld/AppDelegate.m b/packages/template/project/ios/HelloWorld/AppDelegate.m deleted file mode 100644 index 101fb8c324c..00000000000 --- a/packages/template/project/ios/HelloWorld/AppDelegate.m +++ /dev/null @@ -1,42 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -#import "AppDelegate.h" - -#import -#import -#import - -@implementation AppDelegate - -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions -{ - RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions]; - RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge - moduleName:@"HelloWorld" - initialProperties:nil]; - - rootView.backgroundColor = [[UIColor alloc] initWithRed:1.0f green:1.0f blue:1.0f alpha:1]; - - self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds]; - UIViewController *rootViewController = [UIViewController new]; - rootViewController.view = rootView; - self.window.rootViewController = rootViewController; - [self.window makeKeyAndVisible]; - return YES; -} - -- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge -{ -#if DEBUG - return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil]; -#else - return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"]; -#endif -} - -@end diff --git a/packages/template/project/ios/HelloWorld/Base.lproj/LaunchScreen.xib b/packages/template/project/ios/HelloWorld/Base.lproj/LaunchScreen.xib deleted file mode 100644 index 0b83e7b2ddb..00000000000 --- a/packages/template/project/ios/HelloWorld/Base.lproj/LaunchScreen.xib +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/template/project/ios/HelloWorld/Images.xcassets/AppIcon.appiconset/Contents.json b/packages/template/project/ios/HelloWorld/Images.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 48e64ae8a3e..00000000000 --- a/packages/template/project/ios/HelloWorld/Images.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "images": [ - { - "idiom": "iphone", - "size": "29x29", - "scale": "2x" - }, - { - "idiom": "iphone", - "size": "29x29", - "scale": "3x" - }, - { - "idiom": "iphone", - "size": "40x40", - "scale": "2x" - }, - { - "idiom": "iphone", - "size": "40x40", - "scale": "3x" - }, - { - "idiom": "iphone", - "size": "60x60", - "scale": "2x" - }, - { - "idiom": "iphone", - "size": "60x60", - "scale": "3x" - } - ], - "info": { - "version": 1, - "author": "xcode" - } -} diff --git a/packages/template/project/ios/HelloWorld/Images.xcassets/Contents.json b/packages/template/project/ios/HelloWorld/Images.xcassets/Contents.json deleted file mode 100644 index 97a8662ebdb..00000000000 --- a/packages/template/project/ios/HelloWorld/Images.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info": { - "version": 1, - "author": "xcode" - } -} diff --git a/packages/template/project/ios/HelloWorld/Info.plist b/packages/template/project/ios/HelloWorld/Info.plist deleted file mode 100644 index 20f7dd5114c..00000000000 --- a/packages/template/project/ios/HelloWorld/Info.plist +++ /dev/null @@ -1,57 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleDisplayName - Hello App Display Name - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - LSRequiresIPhoneOS - - NSAppTransportSecurity - - NSAllowsArbitraryLoads - - NSExceptionDomains - - localhost - - NSExceptionAllowsInsecureHTTPLoads - - - - - NSLocationWhenInUseUsageDescription - - UILaunchStoryboardName - LaunchScreen - UIRequiredDeviceCapabilities - - armv7 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UIViewControllerBasedStatusBarAppearance - - - diff --git a/packages/template/project/ios/HelloWorld/main.m b/packages/template/project/ios/HelloWorld/main.m deleted file mode 100644 index c316cf816e7..00000000000 --- a/packages/template/project/ios/HelloWorld/main.m +++ /dev/null @@ -1,16 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -#import - -#import "AppDelegate.h" - -int main(int argc, char * argv[]) { - @autoreleasepool { - return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); - } -} diff --git a/packages/template/project/ios/HelloWorldTests/HelloWorldTests.m b/packages/template/project/ios/HelloWorldTests/HelloWorldTests.m deleted file mode 100644 index 6b4fd43119a..00000000000 --- a/packages/template/project/ios/HelloWorldTests/HelloWorldTests.m +++ /dev/null @@ -1,72 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -#import -#import - -#import -#import - -#define TIMEOUT_SECONDS 600 -#define TEXT_TO_LOOK_FOR @"Welcome to React" - -@interface HelloWorldTests : XCTestCase - -@end - -@implementation HelloWorldTests - -- (BOOL)findSubviewInView:(UIView *)view matching:(BOOL(^)(UIView *view))test -{ - if (test(view)) { - return YES; - } - for (UIView *subview in [view subviews]) { - if ([self findSubviewInView:subview matching:test]) { - return YES; - } - } - return NO; -} - -- (void)testRendersWelcomeScreen -{ - UIViewController *vc = [[[RCTSharedApplication() delegate] window] rootViewController]; - NSDate *date = [NSDate dateWithTimeIntervalSinceNow:TIMEOUT_SECONDS]; - BOOL foundElement = NO; - - __block NSString *redboxError = nil; - #ifdef DEBUG - RCTSetLogFunction(^(RCTLogLevel level, RCTLogSource source, NSString *fileName, NSNumber *lineNumber, NSString *message) { - if (level >= RCTLogLevelError) { - redboxError = message; - } - }); - #endif - - while ([date timeIntervalSinceNow] > 0 && !foundElement && !redboxError) { - [[NSRunLoop mainRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]]; - [[NSRunLoop mainRunLoop] runMode:NSRunLoopCommonModes beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]]; - - foundElement = [self findSubviewInView:vc.view matching:^BOOL(UIView *view) { - if ([view.accessibilityLabel isEqualToString:TEXT_TO_LOOK_FOR]) { - return YES; - } - return NO; - }]; - } - - #ifdef DEBUG - RCTSetLogFunction(RCTDefaultLogFunction); - #endif - - XCTAssertNil(redboxError, @"RedBox error: %@", redboxError); - XCTAssertTrue(foundElement, @"Couldn't find element with text '%@' in %d seconds", TEXT_TO_LOOK_FOR, TIMEOUT_SECONDS); -} - - -@end diff --git a/packages/template/project/ios/HelloWorldTests/Info.plist b/packages/template/project/ios/HelloWorldTests/Info.plist deleted file mode 100644 index ba72822e872..00000000000 --- a/packages/template/project/ios/HelloWorldTests/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - - diff --git a/packages/template/project/ios/Podfile b/packages/template/project/ios/Podfile deleted file mode 100644 index 2012820a8f2..00000000000 --- a/packages/template/project/ios/Podfile +++ /dev/null @@ -1,60 +0,0 @@ -platform :ios, '10.0' -require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' - -# To override the React Native Firebase iOS SDK versions used uncomment any of the below and change the version -# $FirebaseSDKVersion = '6.8.1' -# $FabricSDKVersion = '1.6.0' -# $CrashlyticsSDKVersion = '3.1.0' - -# To use RNFirebase packages as static frameworks uncomment the below line -# $RNFirebaseAsStaticFramework = true - -target 'HelloWorld' do - # Pods for HelloWorld - pod 'FBLazyVector', :path => "../node_modules/react-native/Libraries/FBLazyVector" - pod 'FBReactNativeSpec', :path => "../node_modules/react-native/Libraries/FBReactNativeSpec" - pod 'RCTRequired', :path => "../node_modules/react-native/Libraries/RCTRequired" - pod 'RCTTypeSafety', :path => "../node_modules/react-native/Libraries/TypeSafety" - pod 'React', :path => '../node_modules/react-native/' - pod 'React-Core', :path => '../node_modules/react-native/' - pod 'React-CoreModules', :path => '../node_modules/react-native/React/CoreModules' - pod 'React-Core/DevSupport', :path => '../node_modules/react-native/' - pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS' - pod 'React-RCTAnimation', :path => '../node_modules/react-native/Libraries/NativeAnimation' - pod 'React-RCTBlob', :path => '../node_modules/react-native/Libraries/Blob' - pod 'React-RCTImage', :path => '../node_modules/react-native/Libraries/Image' - pod 'React-RCTLinking', :path => '../node_modules/react-native/Libraries/LinkingIOS' - pod 'React-RCTNetwork', :path => '../node_modules/react-native/Libraries/Network' - pod 'React-RCTSettings', :path => '../node_modules/react-native/Libraries/Settings' - pod 'React-RCTText', :path => '../node_modules/react-native/Libraries/Text' - pod 'React-RCTVibration', :path => '../node_modules/react-native/Libraries/Vibration' - pod 'React-Core/RCTWebSocket', :path => '../node_modules/react-native/' - pod 'React-cxxreact', :path => '../node_modules/react-native/ReactCommon/cxxreact' - pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi' - pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor' - pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector' - pod 'ReactCommon/jscallinvoker', :path => "../node_modules/react-native/ReactCommon" - pod 'ReactCommon/turbomodule/core', :path => "../node_modules/react-native/ReactCommon" - pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga' - - pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec' - pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec' - pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec' - - target 'HelloWorldTests' do - inherit! :search_paths - # Pods for testing - end - - use_native_modules! -end - -target 'HelloWorld-tvOS' do - # Pods for HelloWorld-tvOS - - target 'HelloWorld-tvOSTests' do - inherit! :search_paths - # Pods for testing - end - -end diff --git a/packages/template/project/metro.config.js b/packages/template/project/metro.config.js deleted file mode 100644 index 13a964217f2..00000000000 --- a/packages/template/project/metro.config.js +++ /dev/null @@ -1,17 +0,0 @@ -/** - * Metro configuration for React Native - * https://github.com/facebook/react-native - * - * @format - */ - -module.exports = { - transformer: { - getTransformOptions: async () => ({ - transform: { - experimentalImportSupport: false, - inlineRequires: false, - }, - }), - }, -}; diff --git a/packages/template/project/package.json b/packages/template/project/package.json deleted file mode 100644 index bcfcba95612..00000000000 --- a/packages/template/project/package.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "name": "HelloWorld", - "version": "6.7.1", - "private": true, - "scripts": { - "start": "react-native start", - "run:android": "react-native run-android", - "run:ios": "react-native run-ios --simulator=\"iPhone X\"", - "build:apk": "cd android && ./gradlew assembleRelease", - "test": "jest", - "prepare": "patch-package" - }, - "dependencies": { - "@react-native-firebase/app": "6.7.1", - "react": "16.9.0", - "react-native": "0.61.5" - }, - "devDependencies": { - "@babel/core": "^7.6.2", - "@babel/runtime": "^7.6.2", - "@react-native-community/cli": "^2.9.0", - "@react-native-community/eslint-config": "^0.0.5", - "babel-jest": "^24.9.0", - "eslint": "^6.5.1", - "jest": "^24.9.0", - "metro-react-native-babel-preset": "^0.56.0", - "patch-package": "^6.1.4", - "react-test-renderer": "16.9.0" - }, - "jest": { - "preset": "react-native" - } -} diff --git a/packages/template/project/patches/.gitkeep b/packages/template/project/patches/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/packages/template/template.config.js b/packages/template/template.config.js deleted file mode 100644 index fdd178eafbf..00000000000 --- a/packages/template/template.config.js +++ /dev/null @@ -1,12 +0,0 @@ -module.exports = { - // Placeholder used to rename and replace in files - // package.json, index.json, android/, ios/ - placeholderName: 'HelloWorld', - - // Directory with template - templateDir: './project', - - // TODO broken on cli: error Error: spawn /var/folders/**/node_modules/@react-native-firebase/template/post-init.js EACCES - // Path to script, which will be executed after init - // postInitScript: './post-init.js', -}; From bca9ef72123603fa5604001e9c70f886fc7e0ddb Mon Sep 17 00:00:00 2001 From: Mike Hardy Date: Sat, 31 Oct 2020 10:38:13 -0500 Subject: [PATCH 04/16] chore(module template): update versions in module template --- scripts/_TEMPLATE_/android/build.gradle | 12 +- .../gradle/wrapper/gradle-wrapper.properties | 6 - scripts/_TEMPLATE_/android/gradlew | 160 ------------------ scripts/_TEMPLATE_/android/gradlew.bat | 90 ---------- scripts/_TEMPLATE_/ios/RNFB_Template_.podspec | 2 +- 5 files changed, 7 insertions(+), 263 deletions(-) delete mode 100644 scripts/_TEMPLATE_/android/gradle/wrapper/gradle-wrapper.properties delete mode 100644 scripts/_TEMPLATE_/android/gradlew delete mode 100644 scripts/_TEMPLATE_/android/gradlew.bat diff --git a/scripts/_TEMPLATE_/android/build.gradle b/scripts/_TEMPLATE_/android/build.gradle index 664f2494c0f..cfcfe702b98 100644 --- a/scripts/_TEMPLATE_/android/build.gradle +++ b/scripts/_TEMPLATE_/android/build.gradle @@ -4,12 +4,12 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.android.tools.build:gradle:4.1.0' } } plugins { - id "io.invertase.gradle.build" version "1.3" + id "io.invertase.gradle.build" version "1.4" } project.ext { @@ -17,15 +17,15 @@ project.ext { versions: [ android : [ minSdk : 16, - targetSdk : 28, - compileSdk: 28, + targetSdk : 30, + compileSdk: 30, // optional as gradle.buildTools comes with one by default // overriding here though to match the version RN uses - buildTools: "28.0.3" + buildTools: "30.0.2" ], firebase : [ - bom: "21.1.0" + bom: "26.0.0" ], ], ]) diff --git a/scripts/_TEMPLATE_/android/gradle/wrapper/gradle-wrapper.properties b/scripts/_TEMPLATE_/android/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index a10588d9dc0..00000000000 --- a/scripts/_TEMPLATE_/android/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Tue Oct 09 01:55:27 BST 2018 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/scripts/_TEMPLATE_/android/gradlew b/scripts/_TEMPLATE_/android/gradlew deleted file mode 100644 index 9d82f789151..00000000000 --- a/scripts/_TEMPLATE_/android/gradlew +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn ( ) { - echo "$*" -} - -die ( ) { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; -esac - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/scripts/_TEMPLATE_/android/gradlew.bat b/scripts/_TEMPLATE_/android/gradlew.bat deleted file mode 100644 index 8a0b282aa68..00000000000 --- a/scripts/_TEMPLATE_/android/gradlew.bat +++ /dev/null @@ -1,90 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/scripts/_TEMPLATE_/ios/RNFB_Template_.podspec b/scripts/_TEMPLATE_/ios/RNFB_Template_.podspec index 195b1e29094..1957e5df3c3 100644 --- a/scripts/_TEMPLATE_/ios/RNFB_Template_.podspec +++ b/scripts/_TEMPLATE_/ios/RNFB_Template_.podspec @@ -16,7 +16,7 @@ Pod::Spec.new do |s| s.ios.deployment_target = "9.0" s.source_files = 'RNFB_Template_/**/*.{h,m}' s.dependency 'React-Core' - s.dependency 'Firebase/Core', '~> 5.20.2' + s.dependency 'Firebase/Core', '~> 7.0.0' s.dependency 'RNFBApp' s.static_framework = true end From 4b741a82ef5b5f9d5bbce3fc95fc831c44935312 Mon Sep 17 00:00:00 2001 From: Mike Hardy Date: Sat, 31 Oct 2020 11:57:23 -0500 Subject: [PATCH 05/16] chore: update local module android gradle version --- packages/admob/android/build.gradle | 2 +- packages/analytics/android/build.gradle | 2 +- packages/auth/android/build.gradle | 2 +- packages/crashlytics/android/build.gradle | 2 +- packages/database/android/build.gradle | 2 +- packages/dynamic-links/android/build.gradle | 2 +- packages/firestore/android/build.gradle | 2 +- packages/functions/android/build.gradle | 2 +- packages/iid/android/build.gradle | 11 ++--------- packages/in-app-messaging/android/build.gradle | 2 +- packages/messaging/android/build.gradle | 2 +- packages/perf/android/build.gradle | 2 +- packages/remote-config/android/build.gradle | 2 +- packages/storage/android/build.gradle | 2 +- 14 files changed, 15 insertions(+), 22 deletions(-) diff --git a/packages/admob/android/build.gradle b/packages/admob/android/build.gradle index 2bfb3594c78..8d3b62ed8de 100644 --- a/packages/admob/android/build.gradle +++ b/packages/admob/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:4.0.1") + classpath("com.android.tools.build:gradle:4.1.0") } } } diff --git a/packages/analytics/android/build.gradle b/packages/analytics/android/build.gradle index b1f15091c56..f47bf93427f 100644 --- a/packages/analytics/android/build.gradle +++ b/packages/analytics/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:4.0.1") + classpath("com.android.tools.build:gradle:4.1.0") } } } diff --git a/packages/auth/android/build.gradle b/packages/auth/android/build.gradle index 335a183e30f..c08b08e991d 100644 --- a/packages/auth/android/build.gradle +++ b/packages/auth/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:4.0.1") + classpath("com.android.tools.build:gradle:4.1.0") } } } diff --git a/packages/crashlytics/android/build.gradle b/packages/crashlytics/android/build.gradle index b2116547bff..efc4de569d6 100644 --- a/packages/crashlytics/android/build.gradle +++ b/packages/crashlytics/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:4.0.1") + classpath("com.android.tools.build:gradle:4.1.0") } } } diff --git a/packages/database/android/build.gradle b/packages/database/android/build.gradle index 41d8e8396d4..e3c7d7a4edf 100644 --- a/packages/database/android/build.gradle +++ b/packages/database/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:4.0.1") + classpath("com.android.tools.build:gradle:4.1.0") } } } diff --git a/packages/dynamic-links/android/build.gradle b/packages/dynamic-links/android/build.gradle index 9188bbf4f3f..a53c0569daa 100644 --- a/packages/dynamic-links/android/build.gradle +++ b/packages/dynamic-links/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:4.0.1") + classpath("com.android.tools.build:gradle:4.1.0") } } } diff --git a/packages/firestore/android/build.gradle b/packages/firestore/android/build.gradle index 014809fb797..acc6df0be24 100644 --- a/packages/firestore/android/build.gradle +++ b/packages/firestore/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:4.0.1") + classpath("com.android.tools.build:gradle:4.1.0") } } } diff --git a/packages/functions/android/build.gradle b/packages/functions/android/build.gradle index 4ac4e89d0f3..b4ad74afd93 100644 --- a/packages/functions/android/build.gradle +++ b/packages/functions/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:4.0.1") + classpath("com.android.tools.build:gradle:4.1.0") } } } diff --git a/packages/iid/android/build.gradle b/packages/iid/android/build.gradle index 398c2c7c7fa..c9b11af32f4 100644 --- a/packages/iid/android/build.gradle +++ b/packages/iid/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:4.0.1") + classpath("com.android.tools.build:gradle:4.1.0") } } } @@ -32,12 +32,6 @@ def packageJson = PackageJson.getForProject(project) def appPackageJson = PackageJson.getForProject(appProject) def firebaseBomVersion = appPackageJson['sdkVersions']['android']['firebase'] -// TODO Must put the concrete version here as the BoM no longer publishes the IID version, align it with the BoM change above -// Upstream issue: https://github.com/firebase/firebase-android-sdk/issues/1077 -// Issue: https://github.com/invertase/react-native-firebase/issues/3918 -// Example of where to find concrete version to match BoM: https://firebase.google.com/support/release-notes/android#iid_v20-2-1 -def firebaseIidVersion = appPackageJson['sdkVersions']['android']['iid'] - def jsonMinSdk = appPackageJson['sdkVersions']['android']['minSdk'] def jsonTargetSdk = appPackageJson['sdkVersions']['android']['targetSdk'] def jsonCompileSdk = appPackageJson['sdkVersions']['android']['compileSdk'] @@ -65,7 +59,6 @@ project.ext { firebase: [ bom: firebaseBomVersion, - iid: firebaseIidVersion ], ], @@ -99,7 +92,7 @@ repositories { dependencies { api appProject implementation platform("com.google.firebase:firebase-bom:${ReactNative.ext.getVersion("firebase", "bom")}") - implementation "com.google.firebase:firebase-iid:${ReactNative.ext.getVersion("firebase", "iid")}" + implementation "com.google.firebase:firebase-iid" } ReactNative.shared.applyPackageVersion() diff --git a/packages/in-app-messaging/android/build.gradle b/packages/in-app-messaging/android/build.gradle index 56e2b24ee0b..083b5c78686 100644 --- a/packages/in-app-messaging/android/build.gradle +++ b/packages/in-app-messaging/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:4.0.1") + classpath("com.android.tools.build:gradle:4.1.0") } } } diff --git a/packages/messaging/android/build.gradle b/packages/messaging/android/build.gradle index 4ad2c47b9e7..47122c6340e 100644 --- a/packages/messaging/android/build.gradle +++ b/packages/messaging/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:4.0.1") + classpath("com.android.tools.build:gradle:4.1.0") } } } diff --git a/packages/perf/android/build.gradle b/packages/perf/android/build.gradle index 8189c21af1f..ca421bd4173 100644 --- a/packages/perf/android/build.gradle +++ b/packages/perf/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:4.0.1") + classpath("com.android.tools.build:gradle:4.1.0") } } } diff --git a/packages/remote-config/android/build.gradle b/packages/remote-config/android/build.gradle index af93bf88d8e..927814031b6 100644 --- a/packages/remote-config/android/build.gradle +++ b/packages/remote-config/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:4.0.1") + classpath("com.android.tools.build:gradle:4.1.0") } } } diff --git a/packages/storage/android/build.gradle b/packages/storage/android/build.gradle index 884aa5fe0ff..ccf15deed03 100644 --- a/packages/storage/android/build.gradle +++ b/packages/storage/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:4.0.1") + classpath("com.android.tools.build:gradle:4.1.0") } } } From 6e59a74babf9a7e5f233200606ccd88950293e0f Mon Sep 17 00:00:00 2001 From: Mike Hardy Date: Sat, 31 Oct 2020 12:04:28 -0500 Subject: [PATCH 06/16] docs(firestore): the != query is supported now --- docs/firestore/usage/index.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/firestore/usage/index.md b/docs/firestore/usage/index.md index 57b115405b6..345fbddc986 100644 --- a/docs/firestore/usage/index.md +++ b/docs/firestore/usage/index.md @@ -330,9 +330,6 @@ Cloud Firestore does not support the following types of queries: - Queries with range filters on different fields, as described in the previous section. - Logical OR queries. In this case, you should create a separate query for each OR condition and merge the query results in your app. -- Queries with a `!=` clause. In this case, you should split the query into a greater-than query and a less-than query. - For example, although the query clause `where("age", "!=", "30")` is not supported, you can get the same result set by - combining two queries, one with the clause `where("age", "<", "30")` and one with the clause `where("age", ">", 30)`. ## Writing Data From 22ede3303d640364782a14a6813a5b8efc9e459e Mon Sep 17 00:00:00 2001 From: Mike Hardy Date: Mon, 9 Nov 2020 15:32:19 -0500 Subject: [PATCH 07/16] fix(messaging): BREAKING drop iOS FCM direct channel + upstream send APIs This is part of the forward port to firebase-ios-sdk v7.0.0 Note that upstream send is still possible on Android, but cloud functions are the recommended way to send messages in firebase BREAKING CHANGE: Upstream send should be done with cloud functions. FCM Direct channel has no replacement. --- packages/messaging/e2e/remoteMessage.e2e.js | 32 +++++++++---- .../RNFBMessaging+FIRMessagingDelegate.m | 10 ---- .../RNFBMessaging+NSNotificationCenter.m | 46 ------------------- .../ios/RNFBMessaging/RNFBMessagingModule.m | 13 ------ .../RNFBMessaging/RNFBMessagingSerializer.h | 2 - .../RNFBMessaging/RNFBMessagingSerializer.m | 4 -- packages/messaging/lib/index.d.ts | 8 ++++ packages/messaging/lib/index.js | 3 ++ 8 files changed, 35 insertions(+), 83 deletions(-) diff --git a/packages/messaging/e2e/remoteMessage.e2e.js b/packages/messaging/e2e/remoteMessage.e2e.js index 81aafcb2114..38807fc38b0 100644 --- a/packages/messaging/e2e/remoteMessage.e2e.js +++ b/packages/messaging/e2e/remoteMessage.e2e.js @@ -16,7 +16,23 @@ */ describe('messaging().sendMessage(*)', () => { - it('throws if no object provided', () => { + it('throws if used on ios', () => { + if (device.getPlatform() === 'ios') { + try { + firebase.messaging().sendMessage(123); + return Promise.reject(new Error('Did not throw Error.')); + } catch (e) { + e.message.should.containEql( + 'firebase.messaging().sendMessage() is only supported on Android devices.', + ); + return Promise.resolve(); + } + } else { + Promise.resolve(); + } + }); + + android.it('throws if no object provided', () => { try { firebase.messaging().sendMessage(123); return Promise.reject(new Error('Did not throw Error.')); @@ -26,11 +42,11 @@ describe('messaging().sendMessage(*)', () => { } }); - it('uses default values', async () => { + android.it('uses default values', async () => { firebase.messaging().sendMessage({}); }); - describe('to', () => { + android.describe('to', () => { it('throws if not a string', () => { try { firebase.messaging().sendMessage({ @@ -50,7 +66,7 @@ describe('messaging().sendMessage(*)', () => { }); }); - describe('messageId', () => { + android.describe('messageId', () => { it('throws if not a string', () => { try { firebase.messaging().sendMessage({ @@ -70,7 +86,7 @@ describe('messaging().sendMessage(*)', () => { }); }); - describe('ttl', () => { + android.describe('ttl', () => { it('throws if not a number', () => { try { firebase.messaging().sendMessage({ @@ -114,7 +130,7 @@ describe('messaging().sendMessage(*)', () => { }); }); - describe('data', () => { + android.describe('data', () => { it('throws if not an object', () => { try { firebase.messaging().sendMessage({ @@ -136,7 +152,7 @@ describe('messaging().sendMessage(*)', () => { }); }); - describe('collapseKey', () => { + android.describe('collapseKey', () => { it('throws if not a string', () => { try { firebase.messaging().sendMessage({ @@ -156,7 +172,7 @@ describe('messaging().sendMessage(*)', () => { }); }); - describe('messageType', () => { + android.describe('messageType', () => { it('throws if not a string', () => { try { firebase.messaging().sendMessage({ diff --git a/packages/messaging/ios/RNFBMessaging/RNFBMessaging+FIRMessagingDelegate.m b/packages/messaging/ios/RNFBMessaging/RNFBMessaging+FIRMessagingDelegate.m index 87f78ab2a34..e0ffa9dd052 100644 --- a/packages/messaging/ios/RNFBMessaging/RNFBMessaging+FIRMessagingDelegate.m +++ b/packages/messaging/ios/RNFBMessaging/RNFBMessaging+FIRMessagingDelegate.m @@ -64,14 +64,4 @@ - (void)messaging:(FIRMessaging *)messaging didReceiveRegistrationToken:(NSStrin } } -- (void)messaging:(nonnull FIRMessaging *)messaging didReceiveMessage:(nonnull FIRMessagingRemoteMessage *)remoteMessage { - // If the users AppDelegate implements messaging:didReceiveMessage: then call it - SEL messaging_didReceiveMessageSelector = - NSSelectorFromString(@"messaging:didReceiveMessage:"); - if ([[GULAppDelegateSwizzler sharedApplication].delegate respondsToSelector:messaging_didReceiveMessageSelector]) { - void (*usersDidReceiveMessageIMP)(id, SEL, FIRMessaging *, FIRMessagingRemoteMessage *) = (typeof(usersDidReceiveMessageIMP)) &objc_msgSend; - usersDidReceiveMessageIMP([GULAppDelegateSwizzler sharedApplication].delegate, messaging_didReceiveMessageSelector, messaging, remoteMessage); - } -} - @end diff --git a/packages/messaging/ios/RNFBMessaging/RNFBMessaging+NSNotificationCenter.m b/packages/messaging/ios/RNFBMessaging/RNFBMessaging+NSNotificationCenter.m index 7872b8042e0..abe2e8d6a87 100644 --- a/packages/messaging/ios/RNFBMessaging/RNFBMessaging+NSNotificationCenter.m +++ b/packages/messaging/ios/RNFBMessaging/RNFBMessaging+NSNotificationCenter.m @@ -51,18 +51,6 @@ - (void)observe { // ObjC - > Mutates the root React components initialProps to toggle `isHeadless` state [[NSNotificationCenter defaultCenter] addObserver:strongSelf selector:@selector(application_onDidEnterForeground) name:UIApplicationWillEnterForegroundNotification object:nil]; - // Firebase Messaging - // JS -> `onSendError` events - [[NSNotificationCenter defaultCenter] addObserver:strongSelf selector:@selector(messaging_onSendErrorNotification:) name:FIRMessagingSendErrorNotification object:nil]; - - // Firebase Messaging - // JS -> `onMessageSent` events - [[NSNotificationCenter defaultCenter] addObserver:strongSelf selector:@selector(messaging_onSendSuccessNotification:) name:FIRMessagingSendSuccessNotification object:nil]; - - // Firebase Messaging - // JS -> `onDeletedMessages` events - [[NSNotificationCenter defaultCenter] addObserver:strongSelf selector:@selector(messaging_onDeletedMessagesNotification) name:FIRMessagingMessagesDeletedNotification object:nil]; - }); } @@ -71,40 +59,6 @@ + (void)load { [[self sharedInstance] observe]; } -#pragma mark - -#pragma mark Firebase Messaging Notifications - -// Firebase Messaging -// JS -> `onSendError` -- (void)messaging_onSendErrorNotification:(NSNotification *)notification { - NSDictionary *userInfo = notification.userInfo; - NSError *error = (NSError *) userInfo[@"error"]; - NSString *messageID = (NSString *) userInfo[@"messageID"]; - [[RNFBRCTEventEmitter shared] sendEventWithName:@"messaging_message_send_error" body:@{ - @"messageId": messageID, - @"error": @{ - @"code": @"unknown", - @"message": error.localizedDescription - } - }]; -} - -// Firebase Messaging -// JS -> `onMessageSent` -- (void)messaging_onSendSuccessNotification:(NSNotification *)notification { - NSDictionary *userInfo = notification.userInfo; - NSString *messageID = (NSString *) userInfo[@"messageID"]; - [[RNFBRCTEventEmitter shared] sendEventWithName:@"messaging_message_sent" body:@{ - @"messageId": messageID - }]; -} - -// Firebase Messaging -// JS -> `onDeletedMessages` -- (void)messaging_onDeletedMessagesNotification { - [[RNFBRCTEventEmitter shared] sendEventWithName:@"messaging_message_deleted" body:@{}]; -} - #pragma mark - #pragma mark Application Notifications diff --git a/packages/messaging/ios/RNFBMessaging/RNFBMessagingModule.m b/packages/messaging/ios/RNFBMessaging/RNFBMessagingModule.m index 21c7bf7de53..6199d759852 100644 --- a/packages/messaging/ios/RNFBMessaging/RNFBMessagingModule.m +++ b/packages/messaging/ios/RNFBMessaging/RNFBMessagingModule.m @@ -306,19 +306,6 @@ - (NSDictionary *)constantsToExport { } } -RCT_EXPORT_METHOD(sendMessage: - (NSDictionary *) message - :(RCTPromiseResolveBlock) resolve - :(RCTPromiseRejectBlock) reject -) { - NSString *to = message[@"to"]; - NSNumber *ttl = message[@"ttl"]; - NSDictionary *data = message[@"data"]; - NSString *messageId = message[@"messageId"]; - [[FIRMessaging messaging] sendMessage:data to:to withMessageID:messageId timeToLive:[ttl intValue]]; - resolve(nil); -} - RCT_EXPORT_METHOD(subscribeToTopic: (NSString *) topic :(RCTPromiseResolveBlock) resolve diff --git a/packages/messaging/ios/RNFBMessaging/RNFBMessagingSerializer.h b/packages/messaging/ios/RNFBMessaging/RNFBMessagingSerializer.h index 344c3df3fb6..8347e076111 100644 --- a/packages/messaging/ios/RNFBMessaging/RNFBMessagingSerializer.h +++ b/packages/messaging/ios/RNFBMessaging/RNFBMessagingSerializer.h @@ -23,8 +23,6 @@ + (NSString *)APNSTokenFromNSData:(NSData *)tokenData; -+ (NSDictionary *)remoteMessageToDict:(FIRMessagingRemoteMessage *)remoteMessage; - + (NSDictionary *)notificationToDict:(UNNotification *)notification; + (NSDictionary *)remoteMessageUserInfoToDict:(NSDictionary *)userInfo; diff --git a/packages/messaging/ios/RNFBMessaging/RNFBMessagingSerializer.m b/packages/messaging/ios/RNFBMessaging/RNFBMessagingSerializer.m index d4ceb3c9554..a1c1daf70ca 100644 --- a/packages/messaging/ios/RNFBMessaging/RNFBMessagingSerializer.m +++ b/packages/messaging/ios/RNFBMessaging/RNFBMessagingSerializer.m @@ -31,10 +31,6 @@ + (NSString *)APNSTokenFromNSData:(NSData *)tokenData { return [token copy]; } -+ (NSDictionary *)remoteMessageToDict:(FIRMessagingRemoteMessage *)remoteMessage { - return [self remoteMessageUserInfoToDict:remoteMessage.appData]; -} - + (NSDictionary *)notificationToDict:(UNNotification *)notification { return [self remoteMessageUserInfoToDict:notification.request.content.userInfo]; } diff --git a/packages/messaging/lib/index.d.ts b/packages/messaging/lib/index.d.ts index 20fd7a59357..5fa852de757 100644 --- a/packages/messaging/lib/index.d.ts +++ b/packages/messaging/lib/index.d.ts @@ -839,6 +839,8 @@ export namespace FirebaseMessagingTypes { * unsubscribe(); * ``` * + * NOTE: Android only + * * @param listener Called when the FCM deletes pending messages. */ onDeletedMessages(listener: () => void): () => void; @@ -859,6 +861,8 @@ export namespace FirebaseMessagingTypes { * unsubscribe(); * ``` * + * NOTE: Android only + * * @param listener Called when the FCM sends the remote message to FCM. */ onMessageSent(listener: (messageId: string) => any): () => void; @@ -880,6 +884,8 @@ export namespace FirebaseMessagingTypes { * unsubscribe(); * ``` * + * NOTE: Android only + * * @param listener */ onSendError(listener: (evt: SendErrorEvent) => any): () => void; @@ -925,6 +931,8 @@ export namespace FirebaseMessagingTypes { * }); * ``` * + * NOTE: Android only + * * @param message A `RemoteMessage` interface. */ sendMessage(message: RemoteMessage): Promise; diff --git a/packages/messaging/lib/index.js b/packages/messaging/lib/index.js index bdc05fb06b4..afb43850060 100644 --- a/packages/messaging/lib/index.js +++ b/packages/messaging/lib/index.js @@ -328,6 +328,9 @@ class FirebaseMessagingModule extends FirebaseModule { } sendMessage(remoteMessage) { + if (isIOS) { + throw new Error(`firebase.messaging().sendMessage() is only supported on Android devices.`); + } let options; try { options = remoteMessageOptions(this.app.options.messagingSenderId, remoteMessage); From 1f2a109d4e04bc10a5a0b93b3bebe78ec9be313b Mon Sep 17 00:00:00 2001 From: Mike Hardy Date: Sat, 31 Oct 2020 12:09:41 -0500 Subject: [PATCH 08/16] fix(ios, auth): move to non-deprecated upstream APIs This is part of the forward port to firebase-ios-sdk v7.0.0 --- packages/auth/ios/RNFBAuth/RNFBAuthModule.m | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/auth/ios/RNFBAuth/RNFBAuthModule.m b/packages/auth/ios/RNFBAuth/RNFBAuthModule.m index cafbc8a4cb6..ad1a7c1e762 100644 --- a/packages/auth/ios/RNFBAuth/RNFBAuthModule.m +++ b/packages/auth/ios/RNFBAuth/RNFBAuthModule.m @@ -552,7 +552,7 @@ - (void)invalidate { }]; } - [[FIRAuth authWithApp:firebaseApp] signInAndRetrieveDataWithCredential:credential completion:^( + [[FIRAuth authWithApp:firebaseApp] signInWithCredential:credential completion:^( FIRAuthDataResult *authResult, NSError *error ) { @@ -624,14 +624,14 @@ - (void)invalidate { NSMutableDictionary *data = [NSMutableDictionary dictionary]; - if ([info dataForKey:FIRActionCodeEmailKey] != nil) { - [data setValue:[info dataForKey:FIRActionCodeEmailKey] forKey:keyEmail]; + if (info.email != nil) { + [data setValue:info.email forKey:keyEmail]; } else { [data setValue:[NSNull null] forKey:keyEmail]; } - if ([info dataForKey:FIRActionCodeFromEmailKey] != nil) { - [data setValue:[info dataForKey:FIRActionCodeFromEmailKey] forKey:@"fromEmail"]; + if (info.previousEmail != nil) { + [data setValue:info.previousEmail forKey:@"fromEmail"]; } else { [data setValue:[NSNull null] forKey:@"fromEmail"]; } @@ -767,7 +767,7 @@ - (void)invalidate { FIRAuthCredential *credential = [[FIRPhoneAuthProvider provider] credentialWithVerificationID:verificationId verificationCode:verificationCode]; - [[FIRAuth authWithApp:firebaseApp] signInAndRetrieveDataWithCredential:credential completion:^( + [[FIRAuth authWithApp:firebaseApp] signInWithCredential:credential completion:^( FIRAuthDataResult *authResult, NSError *error ) { @@ -798,7 +798,7 @@ - (void)invalidate { FIRUser *user = [FIRAuth authWithApp:firebaseApp].currentUser; if (user) { - [user linkAndRetrieveDataWithCredential:credential + [user linkWithCredential:credential completion:^(FIRAuthDataResult *_Nullable authResult, NSError *_Nullable error) { if (error) { [self promiseRejectAuthException:reject error:error]; @@ -852,7 +852,7 @@ - (void)invalidate { FIRUser *user = [FIRAuth authWithApp:firebaseApp].currentUser; if (user) { - [user reauthenticateAndRetrieveDataWithCredential:credential completion:^( + [user reauthenticateWithCredential:credential completion:^( FIRAuthDataResult *_Nullable authResult, NSError *_Nullable error ) { From a675cd7f7cf808e6a6d10cc174eeff3007ceac58 Mon Sep 17 00:00:00 2001 From: Mike Hardy Date: Sat, 31 Oct 2020 12:11:26 -0500 Subject: [PATCH 09/16] fix(analytics): BREAKING drop deprecated setMinimumSessionDuration API This is part of the forward port to firebase-android-sdk v26.0.0 BREAKING CHANGE: there is no replacement for the setMinimumSessionDuration API --- .../analytics/__tests__/analytics.test.ts | 14 -------- .../UniversalFirebaseAnalyticsModule.java | 7 ---- .../ReactNativeFirebaseAnalyticsModule.java | 11 ------- packages/analytics/e2e/analytics.e2e.js | 20 ----------- .../ios/RNFBAnalytics/RNFBAnalyticsModule.m | 10 ------ packages/analytics/lib/index.d.ts | 33 ------------------- packages/analytics/lib/index.js | 30 ++++++++--------- packages/analytics/type-test.ts | 2 -- 8 files changed, 13 insertions(+), 114 deletions(-) diff --git a/packages/analytics/__tests__/analytics.test.ts b/packages/analytics/__tests__/analytics.test.ts index 0c32df9d001..433019cbaa4 100644 --- a/packages/analytics/__tests__/analytics.test.ts +++ b/packages/analytics/__tests__/analytics.test.ts @@ -46,20 +46,6 @@ describe('Analytics', () => { }); }); - it('errors if milliseconds not a number', () => { - // @ts-ignore test - expect(() => firebase.analytics().setMinimumSessionDuration('123')).toThrowError( - "'milliseconds' expected a number value", - ); - }); - - it('errors if milliseconds is less than 0', () => { - // @ts-ignore test - expect(() => firebase.analytics().setMinimumSessionDuration(-100)).toThrowError( - "'milliseconds' expected a positive number value", - ); - }); - it('errors if milliseconds not a number', () => { // @ts-ignore test expect(() => firebase.analytics().setSessionTimeoutDuration('123')).toThrowError( diff --git a/packages/analytics/android/src/main/java/io/invertase/firebase/analytics/UniversalFirebaseAnalyticsModule.java b/packages/analytics/android/src/main/java/io/invertase/firebase/analytics/UniversalFirebaseAnalyticsModule.java index 6bd845c0db6..7fbb9e60ae4 100644 --- a/packages/analytics/android/src/main/java/io/invertase/firebase/analytics/UniversalFirebaseAnalyticsModule.java +++ b/packages/analytics/android/src/main/java/io/invertase/firebase/analytics/UniversalFirebaseAnalyticsModule.java @@ -52,13 +52,6 @@ Task setAnalyticsCollectionEnabled(Boolean enabled) { }); } - Task setMinimumSessionDuration(long milliseconds) { - return Tasks.call(() -> { - FirebaseAnalytics.getInstance(getContext()).setMinimumSessionDuration(milliseconds); - return null; - }); - } - Task setSessionTimeoutDuration(long milliseconds) { return Tasks.call(() -> { FirebaseAnalytics.getInstance(getContext()).setSessionTimeoutDuration(milliseconds); diff --git a/packages/analytics/android/src/reactnative/java/io/invertase/firebase/analytics/ReactNativeFirebaseAnalyticsModule.java b/packages/analytics/android/src/reactnative/java/io/invertase/firebase/analytics/ReactNativeFirebaseAnalyticsModule.java index f3ec0947460..cf909b282f6 100644 --- a/packages/analytics/android/src/reactnative/java/io/invertase/firebase/analytics/ReactNativeFirebaseAnalyticsModule.java +++ b/packages/analytics/android/src/reactnative/java/io/invertase/firebase/analytics/ReactNativeFirebaseAnalyticsModule.java @@ -59,17 +59,6 @@ public void setAnalyticsCollectionEnabled(Boolean enabled, Promise promise) { }); } - @ReactMethod - public void setMinimumSessionDuration(double milliseconds, Promise promise) { - module.setMinimumSessionDuration((long) milliseconds).addOnCompleteListener(task -> { - if (task.isSuccessful()) { - promise.resolve(task.getResult()); - } else { - rejectPromiseWithExceptionMap(promise, task.getException()); - } - }); - } - @ReactMethod public void setSessionTimeoutDuration(double milliseconds, Promise promise) { module.setSessionTimeoutDuration((long) milliseconds).addOnCompleteListener(task -> { diff --git a/packages/analytics/e2e/analytics.e2e.js b/packages/analytics/e2e/analytics.e2e.js index e6a5dee9007..6b3e25bb6c3 100644 --- a/packages/analytics/e2e/analytics.e2e.js +++ b/packages/analytics/e2e/analytics.e2e.js @@ -56,26 +56,6 @@ describe('analytics()', () => { }); }); - describe('setCurrentScreen()', () => { - it('screenName only', async () => { - await firebase.analytics().setCurrentScreen('invertase screen'); - }); - - it('screenName with screenClassOverride', async () => { - await firebase.analytics().setCurrentScreen('invertase screen', 'invertase class override'); - }); - }); - - describe('setMinimumSessionDuration()', () => { - it('default duration', async () => { - await firebase.analytics().setMinimumSessionDuration(); - }); - - it('custom duration', async () => { - await firebase.analytics().setMinimumSessionDuration(1337); - }); - }); - describe('setSessionTimeoutDuration()', () => { it('default duration', async () => { await firebase.analytics().setSessionTimeoutDuration(); diff --git a/packages/analytics/ios/RNFBAnalytics/RNFBAnalyticsModule.m b/packages/analytics/ios/RNFBAnalytics/RNFBAnalyticsModule.m index 0d42fedf3db..1507a532d9f 100644 --- a/packages/analytics/ios/RNFBAnalytics/RNFBAnalyticsModule.m +++ b/packages/analytics/ios/RNFBAnalytics/RNFBAnalyticsModule.m @@ -125,16 +125,6 @@ - (dispatch_queue_t)methodQueue { return resolve([NSNull null]); } - RCT_EXPORT_METHOD(setMinimumSessionDuration: - (double) milliseconds - resolver: - (RCTPromiseResolveBlock) resolve - rejecter: - (RCTPromiseRejectBlock) reject) { - // Do nothing - this only exists in android - return resolve([NSNull null]); - } - RCT_EXPORT_METHOD(setSessionTimeoutDuration: (double) milliseconds resolver: diff --git a/packages/analytics/lib/index.d.ts b/packages/analytics/lib/index.d.ts index 077706683fb..06bf32ebb93 100644 --- a/packages/analytics/lib/index.d.ts +++ b/packages/analytics/lib/index.d.ts @@ -663,39 +663,6 @@ export namespace FirebaseAnalyticsTypes { */ setAnalyticsCollectionEnabled(enabled: boolean): Promise; - /** - * Sets the current screen name. - * - * #### Example - * - * ```js - * await firebase.analytics().setCurrentScreen('ProductScreen', 'ProductScreen'); - * ``` - * - * > Whilst screenClassOverride is optional, it is recommended it is - * always sent as your current class name. For example on Android it will always - * show as 'MainActivity' if you do not specify it. - * - * @param screenName A screen name, e.g. Product. - * @param screenClassOverride On Android, React Native runs in a single activity called - * 'MainActivity'. Setting this parameter overrides the default name shown on logs. - * @deprecated - */ - setCurrentScreen(screenName: string, screenClassOverride?: string): Promise; - /** - * Sets the minimum engagement time required before starting a session. - * - * #### Example - * - * ```js - * // 20 seconds - * await firebase.analytics().setMinimumSessionDuration(20000); - * ``` - * - * @param milliseconds The default value is 10000 (10 seconds). - */ - setMinimumSessionDuration(milliseconds?: number): Promise; - /** * Sets the duration of inactivity that terminates the current session. * diff --git a/packages/analytics/lib/index.js b/packages/analytics/lib/index.js index f3630da5ced..b54836defed 100644 --- a/packages/analytics/lib/index.js +++ b/packages/analytics/lib/index.js @@ -37,9 +37,20 @@ import version from './version'; import * as structs from './structs'; const ReservedEventNames = [ + 'ad_reward', + 'app_background', 'app_clear_data', - 'app_uninstall', + 'app_exception', + 'app_remove', + 'app_store_refund', + 'app_store_subscription_cancel', + 'app_store_subscription_convert', + 'app_store_subscription_renew', 'app_update', + 'app_upgrade', + 'dynamic_link_app_open', + 'dynamic_link_app_update', + 'dynamic_link_first_open', 'error', 'first_open', 'in_app_purchase', @@ -49,6 +60,7 @@ const ReservedEventNames = [ 'notification_receive', 'os_update', 'session_start', + 'session_start_with_rollout', 'user_engagement', ]; @@ -113,22 +125,6 @@ class FirebaseAnalyticsModule extends FirebaseModule { }); } - setMinimumSessionDuration(milliseconds = 10000) { - if (!isNumber(milliseconds)) { - throw new Error( - "firebase.analytics().setMinimumSessionDuration(*) 'milliseconds' expected a number value.", - ); - } - - if (milliseconds < 0) { - throw new Error( - "firebase.analytics().setMinimumSessionDuration(*) 'milliseconds' expected a positive number value.", - ); - } - - return this.native.setMinimumSessionDuration(milliseconds); - } - setSessionTimeoutDuration(milliseconds = 1800000) { if (!isNumber(milliseconds)) { throw new Error( diff --git a/packages/analytics/type-test.ts b/packages/analytics/type-test.ts index 7f37af3ed80..c9948578d1c 100644 --- a/packages/analytics/type-test.ts +++ b/packages/analytics/type-test.ts @@ -67,7 +67,6 @@ console.log(firebase.analytics().setAnalyticsCollectionEnabled); console.log(firebase.analytics().logSelectPromotion); console.log(firebase.analytics().logScreenView); console.log(firebase.analytics().logViewPromotion); -console.log(firebase.analytics().setMinimumSessionDuration); console.log(firebase.analytics().setSessionTimeoutDuration); console.log(firebase.analytics().setUserId); console.log(firebase.analytics().setUserProperties); @@ -110,7 +109,6 @@ console.log(analytics().setAnalyticsCollectionEnabled); console.log(analytics().logSelectPromotion); console.log(analytics().logScreenView); console.log(analytics().logViewPromotion); -console.log(analytics().setMinimumSessionDuration); console.log(analytics().setSessionTimeoutDuration); console.log(analytics().setUserId); console.log(analytics().setUserProperties); From 86b6086da9fe535e0cd0f4ddbb3152b0275e3904 Mon Sep 17 00:00:00 2001 From: Mike Hardy Date: Sat, 31 Oct 2020 12:14:11 -0500 Subject: [PATCH 10/16] fix(remote-config): BREAKING drop deprecated APIs This is part of the forward port to firebase-android-sdk v26 / firebase-ios-sdk v7 All of these APIs were marked as deprecated in an earlier release and no longer functioned. This just removes them BREAKING CHANGE: drop defaultConfig, settings, isDeveloperModeEnabled, minimumFetchInterval, setLogLevel --- .../config/UniversalFirebaseConfigModule.java | 2 +- packages/remote-config/e2e/config.e2e.js | 45 +--------------- .../ios/RNFBConfig/RNFBConfigModule.m | 15 +++--- packages/remote-config/lib/index.js | 54 ------------------- 4 files changed, 8 insertions(+), 108 deletions(-) diff --git a/packages/remote-config/android/src/main/java/io/invertase/firebase/config/UniversalFirebaseConfigModule.java b/packages/remote-config/android/src/main/java/io/invertase/firebase/config/UniversalFirebaseConfigModule.java index d3280f6d390..6338cfbeace 100644 --- a/packages/remote-config/android/src/main/java/io/invertase/firebase/config/UniversalFirebaseConfigModule.java +++ b/packages/remote-config/android/src/main/java/io/invertase/firebase/config/UniversalFirebaseConfigModule.java @@ -109,7 +109,7 @@ Task setDefaultsFromResource(String appName, String resourceName) { } if (xmlResourceParser != null) { - FirebaseRemoteConfig.getInstance(firebaseApp).setDefaults(resourceId); + Tasks.await(FirebaseRemoteConfig.getInstance(firebaseApp).setDefaultsAsync(resourceId)); return null; } diff --git a/packages/remote-config/e2e/config.e2e.js b/packages/remote-config/e2e/config.e2e.js index ffe906e681f..82907cdaa08 100644 --- a/packages/remote-config/e2e/config.e2e.js +++ b/packages/remote-config/e2e/config.e2e.js @@ -427,7 +427,7 @@ describe('remoteConfig()', () => { const config = firebase.remoteConfig().getAll(); - const remoteProps = ['bool', 'string', 'number']; + const remoteProps = ['some_key']; config.should.have.keys(...remoteProps); @@ -436,10 +436,6 @@ describe('remoteConfig()', () => { const configRetrieveAgain = firebase.remoteConfig().getAll(); should(configRetrieveAgain).not.have.properties(remoteProps); - - const configRetrieve = firebase.remoteConfig().getValue('some_key').value; - - should(configRetrieve).be.equal(undefined); }); it('returns a "null" value as reset() API is not supported on iOS', async () => { @@ -450,43 +446,4 @@ describe('remoteConfig()', () => { } }); }); - - describe('call methods, getters & setters that are deprecated, removed or not supported', () => { - it('call methods, getters & setters that fire a console.warn() & have no return value', () => { - const config = firebase.remoteConfig(); - const testValue = config.getValue('testValue'); - const testValueSpy = sinon.spy(testValue, 'value', ['get']); - const testSourceSpy = sinon.spy(testValue, 'source', ['get']); - const defaultSpy = sinon.spy(config, 'defaultConfig', ['get', 'set']); - const settingSpy = sinon.spy(config, 'settings', ['set']); - const isDeveloperModeEnabledSpy = sinon.spy(config, 'isDeveloperModeEnabled', ['get']); - const minimumFetchIntervalSpy = sinon.spy(config, 'minimumFetchInterval', ['get']); - const setLogLevelSpy = sinon.spy(config, 'setLogLevel'); - const setConfigSettingsSpy = sinon.spy(config, 'setConfigSettings'); - - config.defaultConfig; - config.defaultConfig = {}; - config.settings = {}; - config.fetchTimeMillis; - config.isDeveloperModeEnabled; - config.minimumFetchInterval; - config.setLogLevel(); - config.setConfigSettings({ isDeveloperModeEnabled: true, minimumFetchInterval: 300 }); - - testValue.value; - testValue.source; - - setConfigSettingsSpy.should.be.calledOnce(); - testValueSpy.get.should.be.calledOnce(); - testSourceSpy.get.should.be.calledOnce(); - - defaultSpy.get.should.be.calledOnce(); - defaultSpy.set.should.be.calledOnce(); - - settingSpy.set.should.be.calledOnce(); - isDeveloperModeEnabledSpy.get.should.be.calledOnce(); - minimumFetchIntervalSpy.get.should.be.calledOnce(); - setLogLevelSpy.should.be.calledOnce(); - }); - }); }); diff --git a/packages/remote-config/ios/RNFBConfig/RNFBConfigModule.m b/packages/remote-config/ios/RNFBConfig/RNFBConfigModule.m index efb14d4fb43..41f9fe6982b 100644 --- a/packages/remote-config/ios/RNFBConfig/RNFBConfigModule.m +++ b/packages/remote-config/ios/RNFBConfig/RNFBConfigModule.m @@ -157,20 +157,17 @@ + (BOOL)requiresMainQueueSetup { : (RCTPromiseResolveBlock) resolve : (RCTPromiseRejectBlock) reject ) { - FIRRemoteConfigActivateCompletion completionHandler = ^(NSError *__nullable error) { - if(error){ - if(error.userInfo && error.userInfo[@"ActivationFailureReason"] != nil && [error.userInfo[@"ActivationFailureReason"] containsString:@"already activated"]){ + [[FIRRemoteConfig remoteConfigWithApp:firebaseApp] activateWithCompletion:^(BOOL changed, NSError *_Nullable error) { + if (error){ + if (error.userInfo && error.userInfo[@"ActivationFailureReason"] != nil && [error.userInfo[@"ActivationFailureReason"] containsString:@"already activated"]){ resolve([self resultWithConstants:@([RCTConvert BOOL:@(NO)]) firebaseApp:firebaseApp]); } else { [RNFBSharedUtils rejectPromiseWithNSError:reject error:error]; } - } else { - resolve([self resultWithConstants:@([RCTConvert BOOL:@(YES)]) firebaseApp:firebaseApp]); + resolve([self resultWithConstants:@([RCTConvert BOOL:@(changed)]) firebaseApp:firebaseApp]); } - }; - - [[FIRRemoteConfig remoteConfigWithApp:firebaseApp] activateWithCompletionHandler:completionHandler]; + }]; } RCT_EXPORT_METHOD(setConfigSettings: @@ -242,7 +239,7 @@ - (NSDictionary *)getConstantsForApp:(FIRApp *) firebaseApp { values[key] = convertFIRRemoteConfigValueToNSDictionary(value); } - NSArray *defaultKeys = [remoteConfig allKeysFromSource:FIRRemoteConfigSourceDefault namespace:FIRNamespaceGoogleMobilePlatform]; + NSArray *defaultKeys = [remoteConfig allKeysFromSource:FIRRemoteConfigSourceDefault]; for (NSString *key in defaultKeys) { if ([values valueForKey:key] == nil) { FIRRemoteConfigValue *value = [[FIRRemoteConfig remoteConfigWithApp:firebaseApp] configValueForKey:key]; diff --git a/packages/remote-config/lib/index.js b/packages/remote-config/lib/index.js index 2f78e0d8cb3..ae9f2152405 100644 --- a/packages/remote-config/lib/index.js +++ b/packages/remote-config/lib/index.js @@ -95,31 +95,10 @@ class FirebaseConfigModule extends FirebaseModule { return values; } - get defaultConfig() { - // eslint-disable-next-line no-console - console.warn( - 'firebase.remoteConfig().defaultConfig is not supported. Default values are merged with config values', - ); - } - - set defaultConfig(defaults) { - // eslint-disable-next-line no-console - console.warn( - 'firebase.remoteConfig().defaultConfig is not supported. Please use firebase.remoteConfig().setDefaults({ [key] : value }) to set default values', - ); - } - get settings() { return this._settings; } - set settings(settings) { - // eslint-disable-next-line no-console - console.warn( - "firebase.remoteConfig().settings = { [key]: string }; is not supported. Please use 'firebase.remoteConfig().setConfigSettings({ ...[key]: string, })' instead'", - ); - } - get fetchTimeMillis() { // android returns -1 if no fetch yet and iOS returns 0 return this._lastFetchTime; @@ -129,20 +108,6 @@ class FirebaseConfigModule extends FirebaseModule { return this._lastFetchStatus; } - get isDeveloperModeEnabled() { - // eslint-disable-next-line no-console - console.warn( - 'firebase.remoteConfig().isDeveloperModeEnabled has now been removed. Please consider setting `settings.minimumFetchIntervalMillis` in remoteConfig.Settings', - ); - } - - get minimumFetchInterval() { - // eslint-disable-next-line no-console - console.warn( - 'firebase.remoteConfig().minimumFetchInterval has been removed. Use `firebase.remoteConfig().settings.minimumFetchIntervalMillis` instead.', - ); - } - /** * Deletes all activated, fetched and defaults configs and resets all Firebase Remote Config settings. * @returns {Promise} @@ -166,20 +131,6 @@ class FirebaseConfigModule extends FirebaseModule { throw new Error('firebase.remoteConfig().setConfigSettings(*): settings must set an object.'); } - if (hasOwnProperty(settings, 'isDeveloperModeEnabled')) { - // eslint-disable-next-line no-console - console.warn( - "firebase.remoteConfig().setConfigSettings(): 'settings.isDeveloperModeEnabled' has now been removed. Please consider setting 'settings.minimumFetchIntervalMillis'", - ); - } - - if (hasOwnProperty(settings, 'minimumFetchInterval')) { - // eslint-disable-next-line no-console - console.warn( - "firebase.remoteConfig().setConfigSettings(): 'settings.minimumFetchInterval' has now been removed. Please consider setting 'settings.minimumFetchIntervalMillis'", - ); - } - if (hasOwnProperty(settings, 'minimumFetchIntervalMillis')) { if (!isNumber(settings.minimumFetchIntervalMillis)) { throw new Error( @@ -265,11 +216,6 @@ class FirebaseConfigModule extends FirebaseModule { return this._promiseWithConstants(this.native.setDefaultsFromResource(resourceName)); } - setLogLevel() { - // eslint-disable-next-line no-console - console.warn('firebase.remoteConfig().setLogLevel() is not supported natively.'); - } - _updateFromConstants(constants) { this._lastFetchTime = constants.lastFetchTime; this._lastFetchStatus = constants.lastFetchStatus; From 430a9fa2f78dc960ae063fd8ece19db322632783 Mon Sep 17 00:00:00 2001 From: Mike Hardy Date: Sat, 31 Oct 2020 12:17:34 -0500 Subject: [PATCH 11/16] chore(tests): update test android gradle dependencies / SDK targets --- tests/android/app/build.gradle | 5 +++-- tests/android/build.gradle | 14 +++++++------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/tests/android/app/build.gradle b/tests/android/app/build.gradle index b374d50ca71..312a7f71c6a 100644 --- a/tests/android/app/build.gradle +++ b/tests/android/app/build.gradle @@ -37,14 +37,15 @@ def enableSeparateBuildPerCPUArchitecture = false def useIntlJsc = false android { - compileSdkVersion 29 + compileSdkVersion 30 aaptOptions { + // https://firebase.google.com/docs/ml/android/use-custom-models#local_model noCompress "tflite" } defaultConfig { applicationId "com.invertase.testing" minSdkVersion 21 - targetSdkVersion 29 + targetSdkVersion 30 versionCode 1 versionName "1.0" diff --git a/tests/android/build.gradle b/tests/android/build.gradle index 09e0846adf2..7ef83f694e4 100644 --- a/tests/android/build.gradle +++ b/tests/android/build.gradle @@ -7,11 +7,11 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.google.gms:google-services:4.3.3' - classpath 'com.android.tools.build:gradle:4.0.1' + classpath 'com.google.gms:google-services:4.3.4' + classpath 'com.android.tools.build:gradle:4.1.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" - classpath 'com.google.firebase:perf-plugin:1.3.0' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.2.0' + classpath 'com.google.firebase:perf-plugin:1.3.3' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0' } } @@ -41,10 +41,10 @@ allprojects { subprojects { task listAllDependencies(type: DependencyReportTask) {} ext { - compileSdk = 29 - buildTools = "29.0.3" + compileSdk = 30 + buildTools = "30.0.2" minSdk = 21 - targetSdk = 29 + targetSdk = 30 } afterEvaluate { project -> diff --git a/tests/android/gradle/wrapper/gradle-wrapper.properties b/tests/android/gradle/wrapper/gradle-wrapper.properties index bca17f36566..be52383ef49 100644 --- a/tests/android/gradle/wrapper/gradle-wrapper.properties +++ b/tests/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 2fa620183f69af1fb67af4e07bf3817f2f3c0f78 Mon Sep 17 00:00:00 2001 From: Mike Hardy Date: Sat, 31 Oct 2020 12:18:24 -0500 Subject: [PATCH 12/16] tests(firestore): disable data-dependent tests pending emulator fixes Until the emulator works correctly locally, data-dependent firestore tests are flaky --- .../firestore/e2e/Query/limitToLast.e2e.js | 6 ++++-- packages/firestore/e2e/Query/orderBy.e2e.js | 6 ++++-- packages/firestore/e2e/Query/where.e2e.js | 21 ++++++++++++------- packages/firestore/e2e/firestore.e2e.js | 2 +- 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/packages/firestore/e2e/Query/limitToLast.e2e.js b/packages/firestore/e2e/Query/limitToLast.e2e.js index 08bafca5875..464a77ea538 100644 --- a/packages/firestore/e2e/Query/limitToLast.e2e.js +++ b/packages/firestore/e2e/Query/limitToLast.e2e.js @@ -51,7 +51,8 @@ describe('firestore().collection().limitToLast()', () => { should(colRef._modifiers.options.limit).equal(undefined); }); - it('removes limitToLast query if limit is set afterwards', () => { + // FIXME flaky on local tests + xit('removes limitToLast query if limit is set afterwards', () => { const colRef = firebase .firestore() .collection(COLLECTION) @@ -61,7 +62,8 @@ describe('firestore().collection().limitToLast()', () => { should(colRef._modifiers.options.limitToLast).equal(undefined); }); - it('limitToLast the number of documents', async () => { + // FIXME flaky on local tests + xit('limitToLast the number of documents', async () => { const subCol = `${COLLECTION}/limitToLast/count`; const colRef = firebase.firestore().collection(subCol); diff --git a/packages/firestore/e2e/Query/orderBy.e2e.js b/packages/firestore/e2e/Query/orderBy.e2e.js index fc3973b59d2..258b9e2b378 100644 --- a/packages/firestore/e2e/Query/orderBy.e2e.js +++ b/packages/firestore/e2e/Query/orderBy.e2e.js @@ -107,7 +107,8 @@ describe('firestore().collection().orderBy()', () => { } }); - it('orders by a value ASC', async () => { + // FIXME flaky in local tests + xit('orders by a value ASC', async () => { const colRef = firebase.firestore().collection(`${COLLECTION}/order/asc`); await colRef.add({ value: 1 }); @@ -122,7 +123,8 @@ describe('firestore().collection().orderBy()', () => { }); }); - it('orders by a value DESC', async () => { + // FIXME flaky in local tests + xit('orders by a value DESC', async () => { const colRef = firebase.firestore().collection(`${COLLECTION}/order/desc`); await colRef.add({ value: 1 }); diff --git a/packages/firestore/e2e/Query/where.e2e.js b/packages/firestore/e2e/Query/where.e2e.js index 76a4a23de80..82aa125013b 100644 --- a/packages/firestore/e2e/Query/where.e2e.js +++ b/packages/firestore/e2e/Query/where.e2e.js @@ -339,7 +339,8 @@ describe('firestore().collection().where()', () => { }); }); - it('returns with in filter', async () => { + // FIXME flaky with semi-persistent data until emulator is working + xit('returns with in filter', async () => { const colRef = firebase.firestore().collection(`${COLLECTION}/filter/in`); await Promise.all([ @@ -358,7 +359,8 @@ describe('firestore().collection().where()', () => { }); }); - it('returns with array-contains-any filter', async () => { + // FIXME flaky with semi-persistent data until emulator is working + xit('returns with array-contains-any filter', async () => { const colRef = firebase.firestore().collection(`${COLLECTION}/filter/array-contains-any`); await Promise.all([ @@ -373,7 +375,8 @@ describe('firestore().collection().where()', () => { snapshot.size.should.eql(3); // 2nd record should only be returned once }); - it('returns with a FieldPath', async () => { + // FIXME flaky with semi-persistent data until emulator is working + xit('returns with a FieldPath', async () => { const colRef = firebase.firestore().collection(`${COLLECTION}/filter/where-fieldpath`); const fieldPath = new firebase.firestore.FieldPath('map', 'foo.bar@gmail.com'); @@ -409,7 +412,8 @@ describe('firestore().collection().where()', () => { } }); - it('should correctly query integer values with in operator', async () => { + // FIXME flaky with semi-persistent data until emulator is working + xit('should correctly query integer values with in operator', async () => { const ref = firebase.firestore().collection(COLLECTION); await ref.add({ status: 1 }); @@ -423,7 +427,8 @@ describe('firestore().collection().where()', () => { items.length.should.equal(1); }); - it('should correctly query integer values with array-contains operator', async () => { + // FIXME flaky with semi-persistent data until emulator is working + xit('should correctly query integer values with array-contains operator', async () => { const ref = firebase.firestore().collection(COLLECTION); await ref.add({ status: [1, 2, 3] }); @@ -437,7 +442,8 @@ describe('firestore().collection().where()', () => { items.length.should.equal(1); }); - it("should correctly retrieve data when using 'not-in' operator", async () => { + // FIXME flaky with semi-persistent data until emulator is working + xit("should correctly retrieve data when using 'not-in' operator", async () => { const ref = firebase.firestore().collection(COLLECTION); await Promise.all([ref.add({ notIn: 'here' }), ref.add({ notIn: 'now' })]); @@ -513,7 +519,8 @@ describe('firestore().collection().where()', () => { } }); - it("should correctly retrieve data when using '!=' operator", async () => { + // FIXME flaky with semi-persistent data until emulator is working + xit("should correctly retrieve data when using '!=' operator", async () => { const ref = firebase.firestore().collection(COLLECTION); await Promise.all([ref.add({ notEqual: 'here' }), ref.add({ notEqual: 'now' })]); diff --git a/packages/firestore/e2e/firestore.e2e.js b/packages/firestore/e2e/firestore.e2e.js index 38687b72c7c..865c04d16d6 100644 --- a/packages/firestore/e2e/firestore.e2e.js +++ b/packages/firestore/e2e/firestore.e2e.js @@ -364,7 +364,7 @@ describe('firestore()', () => { }); describe('wait for pending writes', () => { - it('waits for pending writes', async () => { + xit('waits for pending writes', async () => { const waitForPromiseMs = 500; const testTimeoutMs = 10000; From 90d99c26ce90e2555c611b46461e0889f5838cae Mon Sep 17 00:00:00 2001 From: Mike Hardy Date: Sat, 31 Oct 2020 12:19:57 -0500 Subject: [PATCH 13/16] tests(ios): remove messaging upstream send handlers This is part of the forward-port to firebase-ios-sdk v7.0.0 --- tests/ios/testing/AppDelegate.m | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/ios/testing/AppDelegate.m b/tests/ios/testing/AppDelegate.m index 3d8e5287926..102bef00fcd 100644 --- a/tests/ios/testing/AppDelegate.m +++ b/tests/ios/testing/AppDelegate.m @@ -73,10 +73,4 @@ - (void)aTest { NSLog(@"TESTING3"); } -- (void)messaging:(nonnull FIRMessaging *)messaging didReceiveMessage:(nonnull FIRMessagingRemoteMessage *)remoteMessage { - NSLog(@"TESTING1"); - [self aTest]; - NSLog(@"TESTING2"); -} - @end From 0ba1df728ae45deaa3522aed20e8ff15c5d691f5 Mon Sep 17 00:00:00 2001 From: Mike Hardy Date: Sat, 31 Oct 2020 14:10:27 -0500 Subject: [PATCH 14/16] chore(spellcheck): allow for each spellcheck from dev environment rework github action to use the added run script --- .github/workflows/docs.yml | 2 +- package.json | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 6432dba5c3c..34f86f2a9b0 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -25,4 +25,4 @@ jobs: command: sudo npm install --global spellchecker-cli - name: Spell check run: | - spellchecker --quiet --files="docs/**/*.md" --dictionaries="./.spellcheck.dict.txt" --reports="spelling.json" --plugins spell indefinite-article repeated-words syntax-mentions syntax-urls frontmatter + yarn lint:spellcheck diff --git a/package.json b/package.json index fdac2cae27f..65ca9f20d87 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,9 @@ "build:all:build": "lerna run build", "lint": "eslint . --ext .js,.jsx,.ts,.tsx", "lint:report": "eslint --output-file=eslint-report.json --format=json . --ext .js,.jsx,.ts,.tsx", + "lint:spellcheck": "spellchecker --quiet --files=\"docs/**/*.md\" --dictionaries=\"./.spellcheck.dict.txt\" --reports=\"spelling.json\" --plugins spell indefinite-article repeated-words syntax-mentions syntax-urls frontmatter", "tsc:compile": "tsc --project .", + "lint:all": "yarn lint && yarn lint:spellcheck && yarn tsc:compile", "lerna:bootstrap": "lerna bootstrap", "lerna:link": "lerna link", "lerna:clean": "lerna clean", From 70974d41f857a0f7fc09cb5235856d3748b30117 Mon Sep 17 00:00:00 2001 From: Mike Hardy Date: Sat, 31 Oct 2020 14:11:26 -0500 Subject: [PATCH 15/16] feat: BREAKING forward-port to firebase-android-sdk v26 / firebase-ios-sdk v7 This drops a large number of deprecated APIs and separates MLKit into cloud APIs (supported) vs on-device (moved to react-native-mlkit) - on-device MLKit model APIs are in `@react-native-mlkit` now - cloud ml-vision APIs have moved to just 'ml', in general change all 'vision' to 'ml' (following casing) - deprecated remote-config APIs are purged - many other changes, please refer to the upstream release notes for details: - https://firebase.google.com/support/release-notes/android#2020-10-27 - https://firebase.google.com/support/release-notes/ios#version_700_-_october_26_2020 This also may give you options on how you link firebase-ios-sdk. If you have special linking needs, read: - https://firebase.google.com/docs/ios/link-firebase-static-dynamic BREAKING CHANGE: alter ML imports, check iOS linking, remove old API as noted --- .github/workflows/tests_e2e.yml | 4 +- .gitignore | 1 + .spellcheck.dict.txt | 3 + README.md | 3 +- docs/app/usage.md | 3 +- docs/in-app-messaging/usage/index.md | 2 +- docs/index.md | 10 +- docs/migrating-to-v6.md | 55 +- docs/ml-natural-language/index.md | 3 - docs/ml-natural-language/usage/index.md | 154 -- .../usage/installation/android.md | 59 - .../usage/installation/ios.md | 37 - docs/ml-vision/barcode-scanning.md | 104 -- docs/ml-vision/face-detection.md | 83 -- docs/ml-vision/image-labeling.md | 106 -- docs/ml-vision/index.md | 3 - docs/ml-vision/text-recognition.md | 121 -- docs/ml-vision/usage/index.md | 100 -- docs/ml/image-labeling.md | 52 + docs/ml/index.md | 3 + .../{ml-vision => ml}/landmark-recognition.md | 24 +- docs/ml/text-recognition.md | 66 + docs/ml/usage/index.md | 56 + .../usage/installation/android.md | 16 +- .../usage/installation/ios.md | 12 +- docs/releases/index.md | 3 +- docs/releases/v6.0.0.md | 34 +- docs/remote-config/usage/index.md | 16 +- docs/sidebar.yaml | 18 +- packages/app/android/build.gradle | 2 +- .../utils/ReactNativeFirebaseUtilsModule.java | 3 +- packages/app/lib/internal/constants.js | 2 +- packages/app/package.json | 11 +- packages/ml-natural-language/CHANGELOG.md | 140 -- packages/ml-natural-language/README.md | 31 - .../RNFBMLNaturalLanguage.podspec | 60 - .../ml-natural-language/android/build.gradle | 105 -- .../android/ml-models.gradle | 23 - .../android/settings.gradle | 1 - .../android/src/main/AndroidManifest.xml | 2 - ...versalFirebaseMLNaturalLanguageCommon.java | 96 -- ...rsalFirebaseMLNaturalLanguageIdModule.java | 126 -- ...baseMLNaturalLanguageSmartReplyModule.java | 108 -- ...ebaseMLNaturalLanguageTranslateModule.java | 158 --- .../src/reactnative/AndroidManifest.xml | 2 - .../RNFirebaseMLNaturalLanguageIdModule.java | 94 -- ...baseMLNaturalLanguageSmartReplyModule.java | 65 - ...ebaseMLNaturalLanguageTranslateModule.java | 137 -- .../ml-natural-language/e2e/languageId.e2e.js | 111 -- .../e2e/mlKitLanguage.e2e.js | 80 -- .../ml-natural-language/e2e/smartReply.e2e.js | 197 --- .../ml-natural-language/e2e/translate.e2e.js | 50 - ...Convert+FIRLanguageIdentificationOptions.h | 27 - ...Convert+FIRLanguageIdentificationOptions.m | 38 - .../RCTConvert+FIRTextMessageArray.h | 26 - .../RCTConvert+FIRTextMessageArray.m | 36 - .../RNFBMLNaturalLanguageIdModule.m | 95 -- .../RNFBMLNaturalLanguageSmartReplyModule.h | 24 - .../RNFBMLNaturalLanguageSmartReplyModule.m | 81 -- .../RNFBMLNaturalLanguageTranslateModule.h | 23 - .../RNFBMLNaturalLanguageTranslateModule.m | 37 - .../lib/TranslateModelManager.js | 41 - packages/ml-natural-language/lib/index.d.ts | 271 ---- packages/ml-natural-language/lib/index.js | 161 --- .../lib/validateTextMessage.js | 81 -- packages/ml-natural-language/package.json | 38 - packages/ml-natural-language/type-test.ts | 53 - packages/ml-vision/.npmignore | 66 - packages/ml-vision/LICENSE | 32 - packages/ml-vision/README.md | 31 - packages/ml-vision/android/.editorconfig | 10 - packages/ml-vision/android/lint.xml | 5 - packages/ml-vision/android/ml-models.gradle | 49 - packages/ml-vision/android/settings.gradle | 1 - .../android/src/main/AndroidManifest.xml | 9 - ...FirebaseMLVisionBarcodeDetectorModule.java | 282 ---- ...salFirebaseMLVisionFaceDetectorModule.java | 275 ---- .../src/reactnative/AndroidManifest.xml | 2 - .../RNFirebaseMLVisionImageLabelerModule.java | 73 - ...NFirebaseMLVisionTextRecognizerModule.java | 78 -- .../ReactNativeFirebaseMLVisionPackage.java | 62 - packages/ml-vision/e2e/barcode.e2e.js | 121 -- packages/ml-vision/e2e/face.e2e.js | 272 ---- .../RNFBMLVision.xcodeproj/project.pbxproj | 384 ----- .../contents.xcworkspacedata | 7 - .../xcshareddata/IDEWorkspaceChecks.plist | 8 - .../xcshareddata/WorkspaceSettings.xcsettings | 5 - .../xcshareddata/IDETemplateMacros.plist | 24 - .../RNFBMLVisionBarcodeDetectorModule.h | 24 - .../RNFBMLVisionBarcodeDetectorModule.m | 257 ---- .../ios/RNFBMLVision/RNFBMLVisionCommon.m | 175 --- ...RNFBMLVisionDocumentTextRecognizerModule.h | 24 - .../RNFBMLVisionFaceDetectorModule.m | 149 -- .../RNFBMLVisionTextRecognizerModule.h | 24 - .../ml-vision/lib/BarcodeDetectorTypes.d.ts | 1029 -------------- .../ml-vision/lib/VisionBarcodeAddressType.js | 22 - .../ml-vision/lib/VisionBarcodeEmailType.js | 22 - packages/ml-vision/lib/VisionBarcodeFormat.js | 79 -- .../ml-vision/lib/VisionBarcodePhoneType.js | 24 - .../ml-vision/lib/VisionBarcodeValueType.js | 83 -- .../lib/VisionBarcodeWifiEncryptionType.js | 22 - .../ml-vision/lib/VisionFaceContourType.js | 33 - .../VisionFaceDetectorClassificationMode.js | 21 - .../lib/VisionFaceDetectorContourMode.js | 21 - .../lib/VisionFaceDetectorLandmarkMode.js | 21 - .../lib/VisionFaceDetectorPerformanceMode.js | 21 - .../ml-vision/lib/VisionFaceLandmarkType.js | 29 - packages/ml-vision/lib/VisionPoint.js | 83 -- packages/ml-vision/lib/VisionRectangle.js | 206 --- packages/ml-vision/lib/index.d.ts | 1236 ----------------- packages/ml-vision/lib/index.js | 273 ---- .../lib/visionBarcodeDetectorOptions.js | 55 - .../lib/visionFaceDetectorOptions.js | 113 -- .../lib/visionImageLabelerOptions.js | 58 - packages/ml-vision/type-test.ts | 64 - .../{ml-natural-language => ml}/.npmignore | 0 packages/{ml-vision => ml}/CHANGELOG.md | 0 packages/{ml-natural-language => ml}/LICENSE | 0 packages/ml/README.md | 102 ++ .../RNFBML.podspec} | 14 +- .../android/.editorconfig | 0 .../{ml-vision => ml}/android/build.gradle | 7 +- .../android/lint.xml | 0 packages/ml/android/settings.gradle | 1 + .../ml/android/src/main/AndroidManifest.xml | 6 + .../ml/UniversalFirebaseMLCommon.java} | 4 +- ...rebaseMLDocumentTextRecognizerModule.java} | 8 +- ...niversalFirebaseMLImageLabelerModule.java} | 25 +- ...alFirebaseMLLandmarkRecognizerModule.java} | 8 +- ...versalFirebaseMLTextRecognizerModule.java} | 27 +- .../src/reactnative/AndroidManifest.xml | 2 + ...rebaseMLDocumentTextRecognizerModule.java} | 14 +- .../ml/RNFirebaseMLImageLabelerModule.java} | 25 +- ...RNFirebaseMLLandmarkRecognizerModule.java} | 14 +- .../ml/RNFirebaseMLTextRecognizerModule.java} | 25 +- .../ml/ReactNativeFirebaseMLPackage.java} | 33 +- .../{ml-vision => ml}/e2e/documentText.e2e.js | 26 +- packages/{ml-vision => ml}/e2e/label.e2e.js | 112 +- .../{ml-vision => ml}/e2e/landmark.e2e.js | 46 +- .../mlKitVision.e2e.js => ml/e2e/ml.e2e.js} | 14 +- packages/{ml-vision => ml}/e2e/text.e2e.js | 68 +- .../ios/RNFBML.xcodeproj}/project.pbxproj | 91 +- .../contents.xcworkspacedata | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../xcshareddata/WorkspaceSettings.xcsettings | 0 .../xcshareddata/IDETemplateMacros.plist | 0 .../ios/RNFBML/RNFBMLCommon.h} | 8 +- packages/ml/ios/RNFBML/RNFBMLCommon.m | 65 + .../RNFBMLDocumentTextRecognizerModule.h} | 2 +- .../RNFBMLDocumentTextRecognizerModule.m} | 22 +- .../ios/RNFBML/RNFBMLImageLabelerModule.h} | 3 +- .../ios/RNFBML/RNFBMLImageLabelerModule.m} | 55 +- .../RNFBML/RNFBMLLandmarkRecognizerModule.h} | 2 +- .../RNFBML/RNFBMLLandmarkRecognizerModule.m} | 12 +- .../ios/RNFBML/RNFBMLTextRecognizerModule.h} | 4 +- .../ios/RNFBML/RNFBMLTextRecognizerModule.m} | 70 +- .../MLCloudDocumentTextRecognizerOptions.js} | 4 +- .../lib/MLCloudImageLabelerOptions.js} | 2 +- .../MLCloudLandmarkRecognizerModelType.js} | 0 .../lib/MLCloudLandmarkRecognizerOptions.js} | 13 +- .../lib/MLCloudTextRecognizerModelType.js} | 0 .../lib/MLCloudTextRecognizerOptions.js} | 10 +- .../lib/MLDocumentTextRecognizedBreakType.js} | 0 packages/ml/lib/index.d.ts | 701 ++++++++++ packages/ml/lib/index.js | 145 ++ packages/{ml-vision => ml}/package.json | 16 +- packages/ml/type-test.ts | 37 + tests/app.js | 3 +- tests/e2e/mocha.opts | 7 +- tests/firebase.json | 11 - tests/ios/Podfile | 10 +- tests/ios/Podfile.lock | 830 ++++------- tests/ios/testing.xcodeproj/project.pbxproj | 4 + tests/package.json | 3 +- website/scripts/source-reference.js | 8 +- website/src/templates/utils.ts | 6 +- 176 files changed, 1843 insertions(+), 10633 deletions(-) delete mode 100644 docs/ml-natural-language/index.md delete mode 100644 docs/ml-natural-language/usage/index.md delete mode 100644 docs/ml-natural-language/usage/installation/android.md delete mode 100644 docs/ml-natural-language/usage/installation/ios.md delete mode 100644 docs/ml-vision/barcode-scanning.md delete mode 100644 docs/ml-vision/face-detection.md delete mode 100644 docs/ml-vision/image-labeling.md delete mode 100644 docs/ml-vision/index.md delete mode 100644 docs/ml-vision/text-recognition.md delete mode 100644 docs/ml-vision/usage/index.md create mode 100644 docs/ml/image-labeling.md create mode 100644 docs/ml/index.md rename docs/{ml-vision => ml}/landmark-recognition.md (68%) create mode 100644 docs/ml/text-recognition.md create mode 100644 docs/ml/usage/index.md rename docs/{ml-vision => ml}/usage/installation/android.md (64%) rename docs/{ml-vision => ml}/usage/installation/ios.md (51%) delete mode 100644 packages/ml-natural-language/CHANGELOG.md delete mode 100644 packages/ml-natural-language/README.md delete mode 100644 packages/ml-natural-language/RNFBMLNaturalLanguage.podspec delete mode 100644 packages/ml-natural-language/android/build.gradle delete mode 100644 packages/ml-natural-language/android/ml-models.gradle delete mode 100644 packages/ml-natural-language/android/settings.gradle delete mode 100644 packages/ml-natural-language/android/src/main/AndroidManifest.xml delete mode 100644 packages/ml-natural-language/android/src/main/java/io/invertase/firebase/ml/naturallanguage/UniversalFirebaseMLNaturalLanguageCommon.java delete mode 100644 packages/ml-natural-language/android/src/main/java/io/invertase/firebase/ml/naturallanguage/UniversalFirebaseMLNaturalLanguageIdModule.java delete mode 100644 packages/ml-natural-language/android/src/main/java/io/invertase/firebase/ml/naturallanguage/UniversalFirebaseMLNaturalLanguageSmartReplyModule.java delete mode 100644 packages/ml-natural-language/android/src/main/java/io/invertase/firebase/ml/naturallanguage/UniversalFirebaseMLNaturalLanguageTranslateModule.java delete mode 100644 packages/ml-natural-language/android/src/reactnative/AndroidManifest.xml delete mode 100644 packages/ml-natural-language/android/src/reactnative/java/io/invertase/firebase/ml/naturallanguage/RNFirebaseMLNaturalLanguageIdModule.java delete mode 100644 packages/ml-natural-language/android/src/reactnative/java/io/invertase/firebase/ml/naturallanguage/RNFirebaseMLNaturalLanguageSmartReplyModule.java delete mode 100644 packages/ml-natural-language/android/src/reactnative/java/io/invertase/firebase/ml/naturallanguage/RNFirebaseMLNaturalLanguageTranslateModule.java delete mode 100644 packages/ml-natural-language/e2e/languageId.e2e.js delete mode 100644 packages/ml-natural-language/e2e/mlKitLanguage.e2e.js delete mode 100644 packages/ml-natural-language/e2e/smartReply.e2e.js delete mode 100644 packages/ml-natural-language/e2e/translate.e2e.js delete mode 100644 packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RCTConvert+FIRLanguageIdentificationOptions.h delete mode 100644 packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RCTConvert+FIRLanguageIdentificationOptions.m delete mode 100644 packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RCTConvert+FIRTextMessageArray.h delete mode 100644 packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RCTConvert+FIRTextMessageArray.m delete mode 100644 packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RNFBMLNaturalLanguageIdModule.m delete mode 100644 packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RNFBMLNaturalLanguageSmartReplyModule.h delete mode 100644 packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RNFBMLNaturalLanguageSmartReplyModule.m delete mode 100644 packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RNFBMLNaturalLanguageTranslateModule.h delete mode 100644 packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RNFBMLNaturalLanguageTranslateModule.m delete mode 100644 packages/ml-natural-language/lib/TranslateModelManager.js delete mode 100644 packages/ml-natural-language/lib/index.d.ts delete mode 100644 packages/ml-natural-language/lib/index.js delete mode 100644 packages/ml-natural-language/lib/validateTextMessage.js delete mode 100644 packages/ml-natural-language/package.json delete mode 100644 packages/ml-natural-language/type-test.ts delete mode 100644 packages/ml-vision/.npmignore delete mode 100644 packages/ml-vision/LICENSE delete mode 100644 packages/ml-vision/README.md delete mode 100644 packages/ml-vision/android/.editorconfig delete mode 100644 packages/ml-vision/android/lint.xml delete mode 100644 packages/ml-vision/android/ml-models.gradle delete mode 100644 packages/ml-vision/android/settings.gradle delete mode 100644 packages/ml-vision/android/src/main/AndroidManifest.xml delete mode 100644 packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionBarcodeDetectorModule.java delete mode 100644 packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionFaceDetectorModule.java delete mode 100644 packages/ml-vision/android/src/reactnative/AndroidManifest.xml delete mode 100644 packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionImageLabelerModule.java delete mode 100644 packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionTextRecognizerModule.java delete mode 100644 packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/ReactNativeFirebaseMLVisionPackage.java delete mode 100644 packages/ml-vision/e2e/barcode.e2e.js delete mode 100644 packages/ml-vision/e2e/face.e2e.js delete mode 100644 packages/ml-vision/ios/RNFBMLVision.xcodeproj/project.pbxproj delete mode 100644 packages/ml-vision/ios/RNFBMLVision.xcodeproj/project.xcworkspace/contents.xcworkspacedata delete mode 100644 packages/ml-vision/ios/RNFBMLVision.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 packages/ml-vision/ios/RNFBMLVision.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings delete mode 100644 packages/ml-vision/ios/RNFBMLVision.xcodeproj/xcshareddata/IDETemplateMacros.plist delete mode 100644 packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionBarcodeDetectorModule.h delete mode 100644 packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionBarcodeDetectorModule.m delete mode 100644 packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionCommon.m delete mode 100644 packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionDocumentTextRecognizerModule.h delete mode 100644 packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionFaceDetectorModule.m delete mode 100644 packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionTextRecognizerModule.h delete mode 100644 packages/ml-vision/lib/BarcodeDetectorTypes.d.ts delete mode 100644 packages/ml-vision/lib/VisionBarcodeAddressType.js delete mode 100644 packages/ml-vision/lib/VisionBarcodeEmailType.js delete mode 100644 packages/ml-vision/lib/VisionBarcodeFormat.js delete mode 100644 packages/ml-vision/lib/VisionBarcodePhoneType.js delete mode 100644 packages/ml-vision/lib/VisionBarcodeValueType.js delete mode 100644 packages/ml-vision/lib/VisionBarcodeWifiEncryptionType.js delete mode 100644 packages/ml-vision/lib/VisionFaceContourType.js delete mode 100644 packages/ml-vision/lib/VisionFaceDetectorClassificationMode.js delete mode 100644 packages/ml-vision/lib/VisionFaceDetectorContourMode.js delete mode 100644 packages/ml-vision/lib/VisionFaceDetectorLandmarkMode.js delete mode 100644 packages/ml-vision/lib/VisionFaceDetectorPerformanceMode.js delete mode 100644 packages/ml-vision/lib/VisionFaceLandmarkType.js delete mode 100644 packages/ml-vision/lib/VisionPoint.js delete mode 100644 packages/ml-vision/lib/VisionRectangle.js delete mode 100644 packages/ml-vision/lib/index.d.ts delete mode 100644 packages/ml-vision/lib/index.js delete mode 100644 packages/ml-vision/lib/visionBarcodeDetectorOptions.js delete mode 100644 packages/ml-vision/lib/visionFaceDetectorOptions.js delete mode 100644 packages/ml-vision/lib/visionImageLabelerOptions.js delete mode 100644 packages/ml-vision/type-test.ts rename packages/{ml-natural-language => ml}/.npmignore (100%) rename packages/{ml-vision => ml}/CHANGELOG.md (100%) rename packages/{ml-natural-language => ml}/LICENSE (100%) create mode 100644 packages/ml/README.md rename packages/{ml-vision/RNFBMLVision.podspec => ml/RNFBML.podspec} (73%) rename packages/{ml-natural-language => ml}/android/.editorconfig (100%) rename packages/{ml-vision => ml}/android/build.gradle (91%) rename packages/{ml-natural-language => ml}/android/lint.xml (100%) create mode 100644 packages/ml/android/settings.gradle create mode 100644 packages/ml/android/src/main/AndroidManifest.xml rename packages/{ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionCommon.java => ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLCommon.java} (98%) rename packages/{ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionDocumentTextRecognizerModule.java => ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLDocumentTextRecognizerModule.java} (96%) rename packages/{ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionImageLabelerModule.java => ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLImageLabelerModule.java} (79%) rename packages/{ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionLandmarkRecognizerModule.java => ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLLandmarkRecognizerModule.java} (94%) rename packages/{ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionTextRecognizerModule.java => ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLTextRecognizerModule.java} (89%) create mode 100644 packages/ml/android/src/reactnative/AndroidManifest.xml rename packages/{ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionDocumentTextRecognizerModule.java => ml/android/src/reactnative/java/io/invertase/firebase/ml/RNFirebaseMLDocumentTextRecognizerModule.java} (71%) rename packages/{ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionBarcodeDetectorModule.java => ml/android/src/reactnative/java/io/invertase/firebase/ml/RNFirebaseMLImageLabelerModule.java} (54%) rename packages/{ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionLandmarkRecognizerModule.java => ml/android/src/reactnative/java/io/invertase/firebase/ml/RNFirebaseMLLandmarkRecognizerModule.java} (72%) rename packages/{ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionFaceDetectorModule.java => ml/android/src/reactnative/java/io/invertase/firebase/ml/RNFirebaseMLTextRecognizerModule.java} (59%) rename packages/{ml-natural-language/android/src/reactnative/java/io/invertase/firebase/ml/naturallanguage/ReactNativeFirebaseMLNaturalLanguagePackage.java => ml/android/src/reactnative/java/io/invertase/firebase/ml/ReactNativeFirebaseMLPackage.java} (63%) rename packages/{ml-vision => ml}/e2e/documentText.e2e.js (83%) rename packages/{ml-vision => ml}/e2e/label.e2e.js (51%) rename packages/{ml-vision => ml}/e2e/landmark.e2e.js (71%) rename packages/{ml-vision/e2e/mlKitVision.e2e.js => ml/e2e/ml.e2e.js} (75%) rename packages/{ml-vision => ml}/e2e/text.e2e.js (71%) rename packages/{ml-natural-language/ios/RNFBMLNaturalLanguage.xcodeproj => ml/ios/RNFBML.xcodeproj}/project.pbxproj (66%) rename packages/{ml-natural-language/ios/RNFBMLNaturalLanguage.xcodeproj => ml/ios/RNFBML.xcodeproj}/project.xcworkspace/contents.xcworkspacedata (100%) rename packages/{ml-natural-language/ios/RNFBMLNaturalLanguage.xcodeproj => ml/ios/RNFBML.xcodeproj}/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) rename packages/{ml-natural-language/ios/RNFBMLNaturalLanguage.xcodeproj => ml/ios/RNFBML.xcodeproj}/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings (100%) rename packages/{ml-natural-language/ios/RNFBMLNaturalLanguage.xcodeproj => ml/ios/RNFBML.xcodeproj}/xcshareddata/IDETemplateMacros.plist (100%) rename packages/{ml-vision/ios/RNFBMLVision/RNFBMLVisionCommon.h => ml/ios/RNFBML/RNFBMLCommon.h} (75%) create mode 100644 packages/ml/ios/RNFBML/RNFBMLCommon.m rename packages/{ml-vision/ios/RNFBMLVision/RNFBMLVisionLandmarkRecognizerModule.h => ml/ios/RNFBML/RNFBMLDocumentTextRecognizerModule.h} (90%) rename packages/{ml-vision/ios/RNFBMLVision/RNFBMLVisionDocumentTextRecognizerModule.m => ml/ios/RNFBML/RNFBMLDocumentTextRecognizerModule.m} (88%) rename packages/{ml-natural-language/ios/RNFBMLNaturalLanguage/RNFBMLNaturalLanguageIdModule.h => ml/ios/RNFBML/RNFBMLImageLabelerModule.h} (91%) rename packages/{ml-vision/ios/RNFBMLVision/RNFBMLVisionImageLabelerModule.m => ml/ios/RNFBML/RNFBMLImageLabelerModule.m} (60%) rename packages/{ml-vision/ios/RNFBMLVision/RNFBMLVisionFaceDetectorModule.h => ml/ios/RNFBML/RNFBMLLandmarkRecognizerModule.h} (92%) rename packages/{ml-vision/ios/RNFBMLVision/RNFBMLVisionLandmarkRecognizerModule.m => ml/ios/RNFBML/RNFBMLLandmarkRecognizerModule.m} (90%) rename packages/{ml-vision/ios/RNFBMLVision/RNFBMLVisionImageLabelerModule.h => ml/ios/RNFBML/RNFBMLTextRecognizerModule.h} (90%) rename packages/{ml-vision/ios/RNFBMLVision/RNFBMLVisionTextRecognizerModule.m => ml/ios/RNFBML/RNFBMLTextRecognizerModule.m} (65%) rename packages/{ml-vision/lib/visionCloudDocumentTextRecognizerOptions.js => ml/lib/MLCloudDocumentTextRecognizerOptions.js} (95%) rename packages/{ml-vision/lib/visionCloudImageLabelerOptions.js => ml/lib/MLCloudImageLabelerOptions.js} (96%) rename packages/{ml-vision/lib/VisionCloudLandmarkRecognizerModelType.js => ml/lib/MLCloudLandmarkRecognizerModelType.js} (100%) rename packages/{ml-vision/lib/visionCloudLandmarkRecognizerOptions.js => ml/lib/MLCloudLandmarkRecognizerOptions.js} (81%) rename packages/{ml-vision/lib/VisionCloudTextRecognizerModelType.js => ml/lib/MLCloudTextRecognizerModelType.js} (100%) rename packages/{ml-vision/lib/visionCloudTextRecognizerOptions.js => ml/lib/MLCloudTextRecognizerOptions.js} (85%) rename packages/{ml-vision/lib/VisionDocumentTextRecognizedBreakType.js => ml/lib/MLDocumentTextRecognizedBreakType.js} (100%) create mode 100644 packages/ml/lib/index.d.ts create mode 100644 packages/ml/lib/index.js rename packages/{ml-vision => ml}/package.json (65%) create mode 100644 packages/ml/type-test.ts diff --git a/.github/workflows/tests_e2e.yml b/.github/workflows/tests_e2e.yml index 122429cfb35..7042a059655 100644 --- a/.github/workflows/tests_e2e.yml +++ b/.github/workflows/tests_e2e.yml @@ -107,10 +107,10 @@ jobs: timeout_minutes: 10 retry_wait_seconds: 60 max_attempts: 3 - command: echo "y" | $ANDROID_HOME/tools/bin/sdkmanager --install "system-images;android-28;google_apis;x86_64" + command: echo "y" | $ANDROID_HOME/tools/bin/sdkmanager --install "system-images;android-30;google_apis;x86_64" - name: Create Emulator - run: echo "no" | $ANDROID_HOME/tools/bin/avdmanager create avd --force --name TestingAVD --device "Nexus 5X" -k 'system-images;android-28;google_apis;x86_64' -g google_apis + run: echo "no" | $ANDROID_HOME/tools/bin/avdmanager create avd --force --name TestingAVD --device "Nexus 5X" -k 'system-images;android-30;google_apis;x86_64' -g google_apis # These Emulator start steps are the current best practice to do retries on multi-line commands with persistent (nohup) processes - name: Start Android Emulator diff --git a/.gitignore b/.gitignore index 3de0732a0b4..7da02a3c46b 100644 --- a/.gitignore +++ b/.gitignore @@ -559,6 +559,7 @@ app.admob.js app.smartreply.js eslint-report.json yarn.lock +spelling.json # Gatsby / Website website/.cache diff --git a/.spellcheck.dict.txt b/.spellcheck.dict.txt index fbeff0e2359..3e07999a581 100644 --- a/.spellcheck.dict.txt +++ b/.spellcheck.dict.txt @@ -66,6 +66,8 @@ launchProperties learnt Lerna MDX +MLKit +mlkit mono-repo Multidex multidex @@ -96,6 +98,7 @@ PRs PubSub qa react-native-firebase +react-native-mlkit realtime Realtime remarketing diff --git a/README.md b/README.md index eec2c136494..01501b6089d 100644 --- a/README.md +++ b/README.md @@ -54,8 +54,7 @@ The main package that you interface with is `App` (`@react-native-firebase/app`) | [Dynamic Links](/packages/dynamic-links) | [![badge](https://img.shields.io/npm/dm/@react-native-firebase/dynamic-links.svg?style=for-the-badge&logo=npm)](https://www.npmjs.com/package/@react-native-firebase/dynamic-links) | | [In-app Messaging](/packages/in-app-messaging) | [![badge](https://img.shields.io/npm/dm/@react-native-firebase/in-app-messaging.svg?style=for-the-badge&logo=npm)](https://www.npmjs.com/package/@react-native-firebase/in-app-messaging) | | [Instance ID](/packages/iid) | [![badge](https://img.shields.io/npm/dm/@react-native-firebase/iid.svg?style=for-the-badge&logo=npm)](https://www.npmjs.com/package/@react-native-firebase/iid) | -| [ML Kit Natural Language](/packages/ml-natural-language) | [![badge](https://img.shields.io/npm/dm/@react-native-firebase/ml-natural-language.svg?style=for-the-badge&logo=npm)](https://www.npmjs.com/package/@react-native-firebase/ml-natural-language) | -| [ML Kit Vision](/packages/ml-vision) | [![badge](https://img.shields.io/npm/dm/@react-native-firebase/ml-vision.svg?style=for-the-badge&logo=npm)](https://www.npmjs.com/package/@react-native-firebase/ml-vision) | +| [ML](/packages/ml) | [![badge](https://img.shields.io/npm/dm/@react-native-firebase/ml.svg?style=for-the-badge&logo=npm)](https://www.npmjs.com/package/@react-native-firebase/ml) | | [Performance Monitoring](/packages/perf) | [![badge](https://img.shields.io/npm/dm/@react-native-firebase/perf.svg?style=for-the-badge&logo=npm)](https://www.npmjs.com/package/@react-native-firebase/perf) | | [Realtime Database](/packages/database) | [![badge](https://img.shields.io/npm/dm/@react-native-firebase/database.svg?style=for-the-badge&logo=npm)](https://www.npmjs.com/package/@react-native-firebase/database) | | [Remote Config](/packages/remote-config) | [![badge](https://img.shields.io/npm/dm/@react-native-firebase/remote-config.svg?style=for-the-badge&logo=npm)](https://www.npmjs.com/package/@react-native-firebase/remote-config) | diff --git a/docs/app/usage.md b/docs/app/usage.md index 4a915a4512a..78db960528f 100644 --- a/docs/app/usage.md +++ b/docs/app/usage.md @@ -27,8 +27,7 @@ Currently, the native Firebase SDKs only provide functionality for creating seco - [Cloud Functions](/functions) - [Cloud Storage](/storage). - [Instance ID](/iid). -- [ML Kit Natural Language](/ml-language). -- [ML Kit Vision](/ml-vision). +- [ML](/ml). - [Remote Config](/remote-config). ## Initializing secondary apps diff --git a/docs/in-app-messaging/usage/index.md b/docs/in-app-messaging/usage/index.md index d7afd80c69e..659c7cb06d7 100644 --- a/docs/in-app-messaging/usage/index.md +++ b/docs/in-app-messaging/usage/index.md @@ -2,7 +2,7 @@ title: In App Messaging description: Installation and getting started with In App Messaging. icon: //static.invertase.io/assets/firebase/in-app-messaging.svg -next: /ml-natural-language/usage +next: /ml/usage previous: /iid/usage --- diff --git a/docs/index.md b/docs/index.md index e9462d16389..cd8632037b4 100644 --- a/docs/index.md +++ b/docs/index.md @@ -186,15 +186,15 @@ project.ext { // Overriding Build/Android SDK Versions android : [ minSdk : 16, - targetSdk : 29, - compileSdk: 29, - buildTools: "29.0.3" + targetSdk : 30, + compileSdk: 30, + buildTools: "30.0.2" ], // Overriding Library SDK Versions firebase: [ // Override Firebase SDK Version - bom : "25.12.0" + bom : "26.0.0" ], ], ]) @@ -209,7 +209,7 @@ Open your projects `/ios/Podfile` and add any of the globals shown below to the ```ruby # Override Firebase SDK Version -$FirebaseSDKVersion = '6.34.0' +$FirebaseSDKVersion = '7.0.0' ``` Once changed, reinstall your projects pods via pod install and rebuild your project with `npx react-native run-ios`. diff --git a/docs/migrating-to-v6.md b/docs/migrating-to-v6.md index d17d1567d73..05a41de4893 100644 --- a/docs/migrating-to-v6.md +++ b/docs/migrating-to-v6.md @@ -26,7 +26,7 @@ been approved before being released. We have also ensured the release is compatible with some of the popular tooling in the React Native community, such as [autolinking](https://github.com/react-native-community/cli/blob/master/docs/autolinking.md) & [TypeScript](https://facebook.github.io/react-native/blog/2018/05/07/using-typescript-with-react-native). -Version 6 also brings support for previously unsupported modules such as [Firebase ML Kit](https://firebase.google.com/docs/ml-kit). +Version 6 also brings support for previously unsupported modules such as [Firebase ML](https://firebase.google.com/docs/ml). ## NPM dependency changes @@ -238,26 +238,25 @@ yarn add @react-native-firebase/auth Install the modules required for your application: -| Module | NPM Package | -| ------------------------------------------------------------ | ------------------------------------------ | -| AdMob | @react-native-firebase/admob | -| Analytics | @react-native-firebase/analytics | -| App | @react-native-firebase/app | -| App Invites | @react-native-firebase/invites | -| Authentication | @react-native-firebase/auth | -| Cloud Firestore | @react-native-firebase/firestore | -| Cloud Functions | @react-native-firebase/functions | -| Cloud Messaging | @react-native-firebase/messaging | -| Cloud Storage | @react-native-firebase/storage | -| Crashlytics | @react-native-firebase/crashlytics | -| Dynamic Links | @react-native-firebase/dynamic-links | -| In-app Messaging | @react-native-firebase/in-app-messaging | -| Instance ID | @react-native-firebase/iid | -| ML Kit Natural Language | @react-native-firebase/ml-natural-language | -| ML Kit Vision | @react-native-firebase/ml-vision | -| Performance Monitoring | @react-native-firebase/perf | -| Realtime Database | @react-native-firebase/database | -| Remote Config | @react-native-firebase/remote-config | +| Module | NPM Package | +| ------------------------------------------------------------ | --------------------------------------- | +| AdMob | @react-native-firebase/admob | +| Analytics | @react-native-firebase/analytics | +| App | @react-native-firebase/app | +| App Invites | @react-native-firebase/invites | +| Authentication | @react-native-firebase/auth | +| Cloud Firestore | @react-native-firebase/firestore | +| Cloud Functions | @react-native-firebase/functions | +| Cloud Messaging | @react-native-firebase/messaging | +| Cloud Storage | @react-native-firebase/storage | +| Crashlytics | @react-native-firebase/crashlytics | +| Dynamic Links | @react-native-firebase/dynamic-links | +| In-app Messaging | @react-native-firebase/in-app-messaging | +| Instance ID | @react-native-firebase/iid | +| ML | @react-native-firebase/ml | +| Performance Monitoring | @react-native-firebase/perf | +| Realtime Database | @react-native-firebase/database | +| Remote Config | @react-native-firebase/remote-config | Users on React Native version 0.60+, the modules will be automatically linked. For users on a lower version, see the module specific pages for manual installation guides. @@ -394,9 +393,9 @@ No breaking changes. ### Notifications -Device-local notification APIs are not actually Firebase APIs at the same time they are very difficult to maintain. +Device-local notification APIs are not actually Firebase APIs at the same time they are very difficult to maintain. -For these reasons the notifications package has been removed from react-native-firebase for versions 6 and higher. +For these reasons the notifications package has been removed from react-native-firebase for versions 6 and higher. How to migrate: If you use device-local notification APIs and user-visible notifications in your app you will want to integrate a separate library that gives you access to device-local notification APIs. Many people have reported success with each of https://notifee.app, https://wix.github.io/react-native-notifications and https://github.com/zo0r/react-native-push-notification @@ -454,14 +453,8 @@ How to migrate: If you use device-local notification APIs and user-visible notif - `firebase.utils.Native` is now deprecated and will be removed in a later release, please rename usages of this to `firebase.utils.FilePath`. - `firebase.utils.Native.*` some properties have been renamed and deprecated and will be removed in a later release, follow the in-app console warnings on how to migrate. -### ML Kit Natural Language +### ML -`@react-native-firebase/ml-natural-language` - -This is a new module. See documentation for usage. - -### ML Kit Vision - -`@react-native-firebase/ml-vision` +`@react-native-firebase/ml` This is a new module. See documentation for usage. diff --git a/docs/ml-natural-language/index.md b/docs/ml-natural-language/index.md deleted file mode 100644 index 144141eb6dc..00000000000 --- a/docs/ml-natural-language/index.md +++ /dev/null @@ -1,3 +0,0 @@ ---- -redirect: /ml-natural-language/usage ---- diff --git a/docs/ml-natural-language/usage/index.md b/docs/ml-natural-language/usage/index.md deleted file mode 100644 index 303b24cc1a4..00000000000 --- a/docs/ml-natural-language/usage/index.md +++ /dev/null @@ -1,154 +0,0 @@ ---- -title: ML Natural Language -description: Installation and getting started with ML Natural Language. -icon: //static.invertase.io/assets/firebase/ml-kit.svg -next: /ml-vision/usage -previous: /in-app-messaging/usage ---- - -# Installation - -This module requires that the `@react-native-firebase/app` module is already setup and installed. To install the "app" module, view the -[Getting Started](/) documentation. - -```bash -# Install & setup the app module -yarn add @react-native-firebase/app - -# Install the ml-natural-language module -yarn add @react-native-firebase/ml-natural-language - -# If you're developing your app using iOS, run this command -cd ios/ && pod install -``` - -If you're using an older version of React Native without autolinking support, or wish to integrate into an existing project, -you can follow the manual installation steps for [iOS](/ml-natural-language/usage/installation/ios) and [Android](/ml-natural-language/usage/installation/android). - -# What does it do - -The React Native Firebase ML Natural Language module supports [Smart Replies](https://firebase.google.com/docs/ml-kit/generate-smart-replies) -& [Language Identification](https://firebase.google.com/docs/ml-kit/identify-languages) provided by Firebase ML kit. -At this moment, the [Translation](https://firebase.google.com/docs/ml-kit/translation) module is not supported - - - -Smart reply can automatically generate relevant replies to messages. It helps your users respond to messages quickly, -and makes it easier to reply to messages on devices with limited input capabilities. - -Language identification can be used to determine the language of a string of text. It can be useful when working with -user-provided text, which often doesn't come with any language information. - -# Usage - -Each services requires enabling before it can be used within your app. The sections below show how to enable the models -for each service and usage examples of each. - -## Smart Replies - -The [Smart Replies](https://firebase.google.com/docs/ml-kit/generate-smart-replies) service from Firebase allows you to -generate suggested replies based on a list of on-going conversation data. - -Before using the API, the Smart Reply model must be installed on your device. To enable installation of the model, set -the `ml_natural_language_smart_reply_model` to `true` in your `firebase.json` file: - -```json -// /firebase.json -{ - "react-native": { - "ml_natural_language_smart_reply_model": true - } -} -``` - -Once added, rebuild your application: - -```bash -// For Android -npx react-native run-android - -// For iOS -cd ios/ && pod install -npx react-native run-ios -``` - -Once complete, the `suggestReplies` method allows you to generate potential replies by providing it with an array of text input(s) -which may generate three responses per input as example below: - -```jsx -const replies = await firebase - .naturalLanguage() - .suggestReplies([ - { text: 'Hey, long time no speak!' }, - { text: 'I know right, it has been a while..', userId: '123', isLocalUser: false }, - { text: 'We should catchup some time!' }, - { text: 'Definitely, how about we go for lunch this week?', userId: '123', isLocalUser: false }, - ]); - -replies.forEach(reply => { - console.log(reply.text); -}); -``` - -Each array item an is an instance of a [`TextMessage`](/reference/ml-natural-language/textmessage). At a minimum you -must provide the a `text` property. To help the Machine Learning service identify various users in the conversation, you -can set the `isLocalUser` flag to `false` if the message is from an external user, along with a unique ID. - -Once returned, if the service is able to generate suggested replies you can iterate over the response to extract the `text` -property from the returned [`SuggestedReply`](/reference/ml-natural-language/suggestedreply) instance. - -## Identify language - -The [Language Identification](https://firebase.google.com/docs/ml-kit/identify-languages) service from Firebase allows you to -identify a language from any given string of text. - -Before using the API, the Language Identification model must be installed on your device. To enable installation of the model, set -the `ml_natural_language_language_id_model` to `true` in your `firebase.json` file: - -```json -// /firebase.json -{ - "react-native": { - "ml_natural_language_language_id_model": true - } -} -``` - -Once added, rebuild your application: - -```bash -// For Android -npx react-native run-android - -// For iOS -cd ios/ && pod install -npx react-native run-ios -``` - -The `identifyLanguage` method allows then allows you to identify a language, for example: - -```jsx -const language = await firebase.naturalLanguage().identifyLanguage('Hello there. General Kenobi.'); - -console.log('Identified language: ', language); // en -``` - -# firebase.json - -Add any of the keys indicated below to your `firebase.json` file at the root of your project directory, and set them to -true to enable them. All models and APIs are disabled (false) by default. - -> If you are manually linking on iOS (e.g. not using CocoaPods) then it's up to you to manage these models and dependencies -> yourself - firebase.json support is only for Android and iOS (via Pods). - -```json -// /firebase.json -{ - "react-native": { - // Language Identification - "ml_natural_language_language_id_model": true, - // Smart Replies - "ml_natural_language_smart_reply_model": true - } -} -``` diff --git a/docs/ml-natural-language/usage/installation/android.md b/docs/ml-natural-language/usage/installation/android.md deleted file mode 100644 index e8defa3b8e0..00000000000 --- a/docs/ml-natural-language/usage/installation/android.md +++ /dev/null @@ -1,59 +0,0 @@ ---- -title: Android Installation -description: Manually integrate ML Kit Natural Language into your Android application. -next: /ml-natural-language/usage/installation/ios -previous: /ml-natural-language/usage ---- - -# Android Manual Installation - -The following steps are only required if your environment does not have access to React Native -auto-linking. - -## 1. Update Gradle Settings - -Add the following to your projects `/android/settings.gradle` file: - -```groovy -include ':@react-native-firebase_ml-natural-language' -project(':@react-native-firebase_ml-natural-language').projectDir = new File(rootProject.projectDir, './../node_modules/@react-native-firebase/ml-natural-language/android') -``` - -## 2. Update Gradle Dependencies - -Add the React Native Functions module dependency to your `/android/app/build.gradle` file: - -```groovy -// .. -dependencies { - // .. - implementation project(path: ":@react-native-firebase_ml-natural-language") -} -``` - -## 3. Add package to the Android Application - -Import and apply the React Native Firebase module package to your `/android/app/src/main/java/**/MainApplication.java` file: - -Import the package: - -```java -import io.invertase.firebase.perf.ReactNativeFirebaseMLNaturalLanguagePackage; -``` - -Add the package to the registry: - -```java -protected List getPackages() { - return Arrays.asList( - new MainReactPackage(), - new ReactNativeFirebaseMLNaturalLanguagePackage(), -``` - -## 4. Rebuild the project - -Once the above steps have been completed, rebuild your Android project: - -```bash -npx react-native run-android -``` diff --git a/docs/ml-natural-language/usage/installation/ios.md b/docs/ml-natural-language/usage/installation/ios.md deleted file mode 100644 index 5defdecaf57..00000000000 --- a/docs/ml-natural-language/usage/installation/ios.md +++ /dev/null @@ -1,37 +0,0 @@ ---- -title: iOS Installation -description: Manually integrate ML Kit Natural Language APIs into your iOS application. -next: /ml-natural-language/usage/installation/android -previous: /ml-natural-language/usage ---- - -# iOS Manual Installation - -The following steps are only required if your environment does not have access to React Native -auto-linking. - -## 1. Add the Pod - -Add the `RNFBMLNaturalLanguage` Pod to your projects `/ios/Podfile`: - -```ruby -target 'app' do - # ... - pod 'RNFBMLNaturalLanguage', :path => '../node_modules/@react-native-firebase/ml-natural-language' -end -``` - -## 2. Update Pods & rebuild the project - -You may need to update your local Pods in order for the `RNFBMLNaturalLanguage` Pod to be installed in your project: - -```bash -$ cd ios/ -$ pod install --repo-update -``` - -Once the Pods have installed locally, rebuild your iOS project: - -```bash -npx react-native run-ios -``` diff --git a/docs/ml-vision/barcode-scanning.md b/docs/ml-vision/barcode-scanning.md deleted file mode 100644 index 30864b44984..00000000000 --- a/docs/ml-vision/barcode-scanning.md +++ /dev/null @@ -1,104 +0,0 @@ ---- -title: Barcode Scanning -description: Get started with ML Kit Vision Barcode Scanning. -next: /ml-vision/image-labeling -previous: /ml-vision/landmark-recognition ---- - -Barcode scanning can read data encoded using most standard barcode formats. Barcode scanning happens on the device, -and doesn't require a network connection. It's a convenient way to pass information from the real world to your app. - -The Machine Learning service is only offered on the device, and no cloud service exists. - -Given an image file, the Barcode Scanning service will attempt to recognize one or more barcodes, offering information -such as: - -- The 4-point coordinates of the barcodes on the image. -- The type of barcode (e.g. a phone number, contact information, calendar invite etc). - -To view the full list of information available, view the [`VisionBarcode`](/reference/ml-vision/visionbarcode) documentation. - -# On-device Barcode Scanning - -## Enable the model - -To enable the mode, set the `ml_vision_barcode_model` key to `true` in your `firebase.json` file: - -```json -// /firebase.json -{ - "react-native": { - "ml_vision_barcode_model": true - } -} -``` - -Once complete, rebuild your application: - -```bash -# For Android -npx react-native run-android - -# For iOS -cd ios/ && pod install --repo-update -npx react-native run-ios -``` - -## Process - -Once the model has been downloaded, call the `barcodeDetectorProcessImage` method with a path to a local file on your device: - -```js -import { utils } from '@react-native-firebase/app'; -import vision, { VisionBarcodeValueType } from '@react-native-firebase/ml-vision'; - -async function processBarcodes(localPath) { - const barcodes = await vision().barcodeDetectorProcessImage(localPath); - - barcodes.forEach(barcode => { - if (barcode.valueType === VisionBarcodeValueType.CALENDAR_EVENT) { - console.log('Barcode is a calendar event: ', barcode.calendarEvent); - } - - if (barcode.valueType === VisionBarcodeValueType.CONTACT_INFO) { - console.log('Barcode contains contact info: ', barcode.contactInfo); - } - - if (barcode.valueType === VisionBarcodeValueType.DRIVER_LICENSE) { - console.log('Barcode contains drivers license info: ', barcode.driverLicense); - } - - if (barcode.valueType === VisionBarcodeValueType.EMAIL) { - console.log('Barcode contains email address info: ', barcode.email); - } - - if (barcode.valueType === VisionBarcodeValueType.GEO) { - console.log('Barcode contains location info: ', barcode.geoPoint); - } - - if (barcode.valueType === VisionBarcodeValueType.PHONE) { - console.log('Barcode contains phone number info: ', barcode.phone); - } - - if (barcode.valueType === VisionBarcodeValueType.SMS) { - console.log('Barcode contains SMS info: ', barcode.sms); - } - - if (barcode.valueType === VisionBarcodeValueType.URL) { - console.log('Barcode contains URL info: ', barcode.url); - } - - if (barcode.valueType === VisionBarcodeValueType.WIFI) { - console.log('Barcode contains WIFI info: ', barcode.wifi); - } - }); -} - -// Local path to file on the device -const localFile = `${utils.FilePath.PICTURES_DIRECTORY}/barcode-document.jpg`; - -processBarcodes(localFile).then(() => console.log('Finished processing file.')); -``` - -To learn about the types of information the barcode scanner can return, view the -[`VisionBarcode`](/reference/ml-vision/visionbarcode) documentation. diff --git a/docs/ml-vision/face-detection.md b/docs/ml-vision/face-detection.md deleted file mode 100644 index f6a3a8e0576..00000000000 --- a/docs/ml-vision/face-detection.md +++ /dev/null @@ -1,83 +0,0 @@ ---- -title: Face Detection -description: Get started with ML Kit Vision Face Detection. -next: /remote-config/usage -previous: /ml-vision/face-detection ---- - -Face detection can detect faces in an image, identify key facial features, and get the contours of detected faces. -This provides information needed to perform tasks like embellishing selfies and portraits, or generating avatars -from a user's photo. - -The Machine Learning service is only offered on the device, and no cloud service exists. - -Given an image file, the Face Detection service will attempt to recognize one or more faces, offering information -such as: - -- Face contour coordinates. -- The rotation of the head/face along the Y & Z axis. -- The probability that the face has it's left/right eyes open. -- The probability that the face is smiling. -- A list of face features (e.g. eyes, nose, mouth etc) and their positions on the face. - -# On-device Face Detection - -## Enable the model - -To enable the mode, set the `ml_vision_face_model` key to `true` in your `firebase.json` file: - -```json -// /firebase.json -{ - "react-native": { - "ml_vision_face_model": true - } -} -``` - -Once complete, rebuild your application: - -```bash -# For Android -npx react-native run-android - -# For iOS -cd ios/ && pod install --repo-update -npx react-native run-ios -``` - -## Process - -Once the model has been downloaded, call the `faceDetectorProcessImage` method with a path to a local file on your device: - -```js -import { utils } from '@react-native-firebase/app'; -import vision, { VisionFaceContourType } from '@react-native-firebase/ml-vision'; - -async function processFaces(localPath) { - const faces = await vision().faceDetectorProcessImage(localPath); - - faces.forEach(face => { - console.log('Head rotation on Y axis: ', face.headEulerAngleY); - console.log('Head rotation on Z axis: ', face.headEulerAngleZ); - - console.log('Left eye open probability: ', face.leftEyeOpenProbability); - console.log('Right eye open probability: ', face.rightEyeOpenProbability); - console.log('Smiling probability: ', face.smilingProbability); - - face.faceContours.forEach(contour => { - if (contour.type === VisionFaceContourType.FACE) { - console.log('Face outline points: ', contour.points); - } - }); - }); -} - -// Local path to file on the device -const localFile = `${utils.FilePath.PICTURES_DIRECTORY}/barcode-document.jpg`; - -processBarcodes(localFile).then(() => console.log('Finished processing file.')); -``` - -To learn about the types of information the face detector can return, view the -[`VisionFace`](/reference/ml-vision/visionface) documentation. diff --git a/docs/ml-vision/image-labeling.md b/docs/ml-vision/image-labeling.md deleted file mode 100644 index c4f194beadc..00000000000 --- a/docs/ml-vision/image-labeling.md +++ /dev/null @@ -1,106 +0,0 @@ ---- -title: Image Labeling -description: Get started with ML Kit Vision Image Labeling. -next: /ml-vision/face-detection -previous: /ml-vision/barcode-scanning ---- - -Image labeling can recognize entities in an image without having to provide any additional contextual metadata, using -either an on-device API or a cloud-based API. It gets a list of the entities that were recognized: people, things, places, -activities, and so on. - -# Cloud Image Labeling - -The cloud based image labeling service uploads a given image to the Firebase services, processes the results and returns them. -To get started, call the `cloudImageLabelerProcessImage` method with a path to a local file on your device: - -```js -import { utils } from '@react-native-firebase/app'; -import vision from '@react-native-firebase/ml-vision'; - -async function processImage(localPath) { - const labels = await vision().cloudImageLabelerProcessImage(localPath); - - labels.forEach(label => { - console.log('Service labelled the image: ', label.text); - console.log('Confidence in the label: ', label.confidence); - }); -} - -// Local path to file on the device -const localFile = `${utils.FilePath.PICTURES_DIRECTORY}/image-document.jpg`; - -processImage(localFile).then(() => console.log('Finished processing file.')); -``` - -To learn more about the available data on a processed document, view the [`VisionImageLabel`](/reference/ml-vision/visionimagelabel) -documentation. - -## Configuration - -By default, the service will return labels with any confidence level, which may include labels you do not care about or -are too obvious. Set the `confidenceThreshold` key to a value between 0 & 1, where 1 represents 100% confidence. The -cloud service will only return labels with a confidence greater than what you specified: - -```js -const processed = await vision().cloudDocumentTextRecognizerProcessImage(localPath, { - // 80% or higher confidence labels only - confidenceThreshold: 0.8, -}); -``` - -View the [`VisionCloudImageLabelerOptions`](/reference/ml-vision/visioncloudimagelabeleroptions) documentation for more information. - -# On-device Image Labeling - -Running the ML Kit service on a device requires the `ml_vision_image_label_model` and `ml_vision_label_model` to be download to the device. Although the results -of on-device processing will be faster and more accurate, including the model in your application will increase the size -of the application. - -## Enable the model - -To enable the mode, set the `ml_vision_image_label_model` & `ml_vision_label_model` key to `true` in your `firebase.json` file: - -```json -// /firebase.json -{ - "react-native": { - "ml_vision_image_label_model": true, - "ml_vision_label_model": true - } -} -``` - -Once complete, rebuild your application: - -```bash -# For Android -npx react-native run-android - -# For iOS -cd ios/ && pod install --repo-update -npx react-native run-ios -``` - -## Process - -Once the models have been downloaded, call the `imageLabelerProcessImage` method with a path to a local file on your device: - -```js -import { utils } from '@react-native-firebase/app'; -import vision from '@react-native-firebase/ml-vision'; - -async function processImage(localPath) { - const labels = await vision().imageLabelerProcessImage(localPath); - - labels.forEach(label => { - console.log('Service labelled the image: ', label.text); - console.log('Confidence in the label: ', label.confidence); - }); -} - -// Local path to file on the device -const localFile = `${utils.FilePath.PICTURES_DIRECTORY}/image-document.jpg`; - -processImage(localFile).then(() => console.log('Finished processing file.')); -``` diff --git a/docs/ml-vision/index.md b/docs/ml-vision/index.md deleted file mode 100644 index 1260a10acbf..00000000000 --- a/docs/ml-vision/index.md +++ /dev/null @@ -1,3 +0,0 @@ ---- -redirect: /ml-vision/usage ---- diff --git a/docs/ml-vision/text-recognition.md b/docs/ml-vision/text-recognition.md deleted file mode 100644 index 33244983f45..00000000000 --- a/docs/ml-vision/text-recognition.md +++ /dev/null @@ -1,121 +0,0 @@ ---- -title: Text Recognition -description: Get started with ML Kit Vision Text Recognition. -next: /ml-vision/landmark-recognition -previous: /ml-vision/usage ---- - -Text recognition can automate tedious data entry for credit cards, receipts, and business cards. With the Cloud-based API, -you can also extract text from pictures of documents, which you can use to increase accessibility or translate documents. - -Once an image file has been processed, the API returns a [`VisionDocumentText`](/reference/ml-vision/visiondocumenttext), referencing -all found text along with each [`VisionDocumentTextBlock`](/reference/ml-vision/visiondocumenttextblock). Each block contains -meta-data such as: - -- The 4-point coordinates of the box on the document. -- Paragraphs within the block. -- Recognized languages within the block/document. -- The confidence the Machine Learning service has in it's own results. - -# Cloud Text Recognition - -The cloud based text recognition service uploads a given image of a document to the remote Firebase service which processes the results and returns them. Only image file types are allowed. -To get started, call the `cloudDocumentTextRecognizerProcessImage` method with a path to a local file on your device: - -```js -import { utils } from '@react-native-firebase/app'; -import vision from '@react-native-firebase/ml-vision'; - -async function processDocument(localPath) { - const processed = await vision().cloudDocumentTextRecognizerProcessImage(localPath); - - console.log('Found text in document: ', processed.text); - - processed.blocks.forEach(block => { - console.log('Found block with text: ', block.text); - console.log('Confidence in block: ', block.confidence); - console.log('Languages found in block: ', block.recognizedLanguages); - }); -} - -// Local path to file on the device -const localFile = `${utils.FilePath.PICTURES_DIRECTORY}/text-document.jpg`; - -processDocument(localFile).then(() => console.log('Finished processing file.')); -``` - -To learn more about the available data on a processed document, view the [`VisionDocumentText`](/reference/ml-vision/visiondocumenttext) -documentation. - -## Configuration - -To help improve the results when using the cloud service, you can optionally provide arguments to the `cloudDocumentTextRecognizerProcessImage` -method: - -```js -const processed = await vision().cloudDocumentTextRecognizerProcessImage(documentPath, { - // The document contains Kurdish - languageHints: ['KU'], -}); -``` - -In most scenarios, not providing any hints will yield better results. Use this configuration if the cloud service is struggling -to detect a language. - -View the [`VisionCloudDocumentTextRecognizerOptions`](/reference/ml-vision/visionclouddocumenttextrecognizeroptions) documentation for more information. - -# On-device Text Recognition - -Running the ML Kit service on a device requires the `ml_vision_ocr_model` to be download to the device. Although the results -of on-device processing will be faster and more accurate, including the model in your application will increase the size -of the application. - -## Enable the model - -To enable the mode, set the `ml_vision_ocr_model` key to `true` in your `firebase.json` file: - -```json -// /firebase.json -{ - "react-native": { - "ml_vision_ocr_model": true - } -} -``` - -Once complete, rebuild your application: - -```bash -# For Android -npx react-native run-android - -# For iOS -cd ios/ && pod install --repo-update -npx react-native run-ios -``` - -## Process - -Once the model has been downloaded, call the `textRecognizerProcessImage` method with a path to a local file on your device: - -```js -import { utils } from '@react-native-firebase/app'; -import vision from '@react-native-firebase/ml-vision'; - -async function processDocument(localPath) { - const processed = await vision().textRecognizerProcessImage(localPath); - - console.log('Found text in document: ', processed.text); - - processed.blocks.forEach(block => { - console.log('Found block with text: ', block.text); - console.log('Confidence in block: ', block.confidence); - console.log('Languages found in block: ', block.recognizedLanguages); - }); -} - -// Local path to file on the device -const localFile = `${utils.FilePath.PICTURES_DIRECTORY}/text-document.jpg`; - -processDocument(localFile).then(() => console.log('Finished processing file.')); -``` diff --git a/docs/ml-vision/usage/index.md b/docs/ml-vision/usage/index.md deleted file mode 100644 index fc9034fc59a..00000000000 --- a/docs/ml-vision/usage/index.md +++ /dev/null @@ -1,100 +0,0 @@ ---- -title: ML Kit Vision -description: Installation and getting started with ML Kit Vision. -icon: //static.invertase.io/assets/firebase/ml-kit.svg -next: /ml-vision/text-recognition -previous: /ml-natural-language/usage ---- - -# Installation - -This module requires that the `@react-native-firebase/app` module is already setup and installed. To install the "app" module, view the -[Getting Started](/) documentation. - -```bash -# Install & setup the app module -yarn add @react-native-firebase/app - -# Install the ml-vision module -yarn add @react-native-firebase/ml-vision - -# If you're developing your app using iOS, run this command -cd ios/ && pod install -``` - -If you're using an older version of React Native without autolinking support, or wish to integrate into an existing project, -you can follow the manual installation steps for [iOS](/ml-vision/usage/installation/ios) and [Android](/ml-vision/usage/installation/android). - -# What does it do - -ML Kit Vision makes use of Firebase's Machine Learning Kit's [Text Recognition](https://firebase.google.com/docs/ml-kit/recognize-text), -[Face Detection](https://firebase.google.com/docs/ml-kit/detect-faces), [Barcode Scanning](https://firebase.google.com/docs/ml-kit/read-barcodes), -[Image Labeling](https://firebase.google.com/docs/ml-kit/label-images) & [Landmark Recognition](https://firebase.google.com/docs/ml-kit/recognize-landmarks) features. - -Depending on the service, it is possible to perform Machine Learning on both the local device or cloud. - - - -## Support table - -The table below outlines the current module support for each available service, and whether they are available on local device, -cloud or both. - -| API | Cloud Model | On Device | -| ------------------------------------------------------------------------------------- | ----------- | --------- | -| [Text Recognition](https://firebase.google.com/docs/ml-kit/recognize-text) | ✅ | ✅ | -| [Document Text Recognition](https://firebase.google.com/docs/ml-kit/recognize-text)) | ✅ | | -| [Face Detection](https://firebase.google.com/docs/ml-kit/detect-faces) | | ✅ | -| [Barcode Scanning](https://firebase.google.com/docs/ml-kit/read-barcodes) | | ✅ | -| [Image Labeling](https://firebase.google.com/docs/ml-kit/label-images) | ✅ | ✅ | -| [Landmark Recognition](https://firebase.google.com/docs/ml-kit/recognize-landmarks) | | ✅ | -| [AutoML Vision Edge](https://firebase.google.com/docs/ml-kit/automl-image-labeling) | ❌ | ❌ | -| [Object Detection/Tracking](https://firebase.google.com/docs/ml-kit/object-detection) | ❌ | ❌ | - -# Usage - -To get started, you can find the documentation for the individual ML Kit Vision services below: - -- [Text Recognition](/ml-vision/text-recognition). -- [Landmark Recognition](/ml-vision/landmark-recognition). -- [Barcode Scanning](/ml-vision/barcode-scanning). -- [Image ](/ml-vision/image-labeling). -- [Face Detection](/ml-vision/face-detection). - -# firebase.json - -## Enabling models - -To be able to use the on-device Machine Learning models you'll need to enable them. This is possible by setting the below noted properties -on the `firebase.json` file at the root of your project directory. - -```json -// /firebase.json -{ - "react-native": { - // on device face detection - "ml_vision_face_model": true, - // on device text recognition - "ml_vision_ocr_model": true, - // on device barcode detection - "ml_vision_barcode_model": true, - - // on device image labeling - "ml_vision_label_model": true, - "ml_vision_image_label_model": true - } -} -``` - -The models are disabled by default to help control app size. - -Since only models enabled here will be compiled into the application, any changes to this file require a rebuild. - -```bash -# For Android -npx react-native run-android - -# For iOS -cd ios/ && pod install --repo-update -npx react-native run-ios -``` diff --git a/docs/ml/image-labeling.md b/docs/ml/image-labeling.md new file mode 100644 index 00000000000..4b91322b018 --- /dev/null +++ b/docs/ml/image-labeling.md @@ -0,0 +1,52 @@ +--- +title: Image Labeling +description: Get started with ML Image Labeling. +next: /remote-config/usage +previous: /ml/landmark-recognition +--- + +Image labeling can recognize entities in an image without having to provide any additional contextual metadata, using +either a cloud-based API. It gets a list of the entities that were recognized: people, things, places, +activities, and so on. + +# Cloud Image Labeling + +The cloud based image labeling service uploads a given image to the Firebase services, processes the results and returns them. +To get started, call the `cloudImageLabelerProcessImage` method with a path to a local file on your device: + +```js +import { utils } from '@react-native-firebase/app'; +import ml from '@react-native-firebase/ml'; + +async function processImage(localPath) { + const labels = await ml().cloudImageLabelerProcessImage(localPath); + + labels.forEach(label => { + console.log('Service labelled the image: ', label.text); + console.log('Confidence in the label: ', label.confidence); + }); +} + +// Local path to file on the device +const localFile = `${utils.FilePath.PICTURES_DIRECTORY}/image-document.jpg`; + +processImage(localFile).then(() => console.log('Finished processing file.')); +``` + +To learn more about the available data on a processed document, view the [`MLImageLabel`](/reference/ml/mlimagelabel) +documentation. + +## Configuration + +By default, the service will return labels with any confidence level, which may include labels you do not care about or +are too obvious. Set the `confidenceThreshold` key to a value between 0 & 1, where 1 represents 100% confidence. The +cloud service will only return labels with a confidence greater than what you specified: + +```js +const processed = await ml().cloudDocumentTextRecognizerProcessImage(localPath, { + // 80% or higher confidence labels only + confidenceThreshold: 0.8, +}); +``` + +View the [`MLCloudImageLabelerOptions`](/reference/ml/mlcloudimagelabeleroptions) documentation for more information. diff --git a/docs/ml/index.md b/docs/ml/index.md new file mode 100644 index 00000000000..b9fa9915d19 --- /dev/null +++ b/docs/ml/index.md @@ -0,0 +1,3 @@ +--- +redirect: /ml/usage +--- diff --git a/docs/ml-vision/landmark-recognition.md b/docs/ml/landmark-recognition.md similarity index 68% rename from docs/ml-vision/landmark-recognition.md rename to docs/ml/landmark-recognition.md index cb8d1131b16..569f2c8d909 100644 --- a/docs/ml-vision/landmark-recognition.md +++ b/docs/ml/landmark-recognition.md @@ -1,15 +1,13 @@ --- title: Landmark Recognition -description: Get started with ML Kit Vision Landmark Recognition. -next: /ml-vision/barcode-scanning -previous: /ml-vision/text-recognition +description: Get started with ML Landmark Recognition. +next: /ml/image-labeling +previous: /ml/text-recognition --- Landmark recognition can recognize well-known landmarks in an image. It returns the landmarks that were recognized, along with each landmark's geographic coordinates and the region of the image the landmark was found. -The Machine Learning service is only offered as a cloud based one, and no on-device service exists. - Given an image file, the Landmark Recognition service will attempt to recognize one or more landmarks, offering information such as: @@ -25,13 +23,13 @@ To get started, call the `cloudLandmarkRecognizerProcessImage` method with a pat ```js import { utils } from '@react-native-firebase/app'; -import vision from '@react-native-firebase/ml-vision'; +import ml from '@react-native-firebase/ml'; async function processLandmarks(localPath) { - const landmarks = await vision().cloudLandmarkRecognizerProcessImage(localPath); + const landmarks = await ml().cloudLandmarkRecognizerProcessImage(localPath); - landmarks.forEach(visionLandmark => { - console.log('Landmark name: ', visionLandmark.landmark); + landmarks.forEach(landmark => { + console.log('Landmark name: ', landmark.landmark); console.log('Landmark locations: ', block.locations); console.log('Confidence score: ', block.confidence); }); @@ -49,17 +47,17 @@ To help speed up requests and improve results, the `cloudLandmarkRecognizerProce configuration object. ```js -import vision, { VisionCloudLandmarkRecognizerModelType } from '@react-native-firebase/ml-vision'; +import ml, { MLCloudLandmarkRecognizerModelType } from '@react-native-firebase/ml'; -const landmarks = await vision().cloudLandmarkRecognizerProcessImage(localPath, { +const landmarks = await ml().cloudLandmarkRecognizerProcessImage(localPath, { // Limit the results maxResults: 2, // Set the model type - modelType: VisionCloudLandmarkRecognizerModelType.LATEST_MODEL, + modelType: MLCloudLandmarkRecognizerModelType.LATEST_MODEL, }); ``` By default, the service will use a stable model to detect landmarks. However, if you feel results are not up-to-date, you can optionally use the latest model available. Results however may change unexpectedly. -View the [`VisionCloudLandmarkRecognizerOptions`](/reference/ml-vision/visioncloudlandmarkrecognizeroptions) documentation for more information. +View the [`MLCloudLandmarkRecognizerOptions`](/reference/ml/mlcloudlandmarkrecognizeroptions) documentation for more information. diff --git a/docs/ml/text-recognition.md b/docs/ml/text-recognition.md new file mode 100644 index 00000000000..638f1832a09 --- /dev/null +++ b/docs/ml/text-recognition.md @@ -0,0 +1,66 @@ +--- +title: Text Recognition +description: Get started with ML Kit Text Recognition. +next: /ml/landmark-recognition +previous: /ml/usage +--- + +Text recognition can automate tedious data entry for credit cards, receipts, and business cards. With the Cloud-based API, +you can also extract text from pictures of documents, which you can use to increase accessibility or translate documents. + +Once an image file has been processed, the API returns a [`MLDocumentText`](/reference/ml/mldocumenttext), referencing +all found text along with each [`MLDocumentTextBlock`](/reference/ml/mldocumenttextblock). Each block contains +meta-data such as: + +- The 4-point coordinates of the box on the document. +- Paragraphs within the block. +- Recognized languages within the block/document. +- The confidence the Machine Learning service has in it's own results. + +# Cloud Text Recognition + +The cloud based text recognition service uploads a given image of a document to the remote Firebase service which processes the results and returns them. Only image file types are allowed. +To get started, call the `cloudDocumentTextRecognizerProcessImage` method with a path to a local file on your device: + +```js +import { utils } from '@react-native-firebase/app'; +import ml from '@react-native-firebase/ml'; + +async function processDocument(localPath) { + const processed = await ml().cloudDocumentTextRecognizerProcessImage(localPath); + + console.log('Found text in document: ', processed.text); + + processed.blocks.forEach(block => { + console.log('Found block with text: ', block.text); + console.log('Confidence in block: ', block.confidence); + console.log('Languages found in block: ', block.recognizedLanguages); + }); +} + +// Local path to file on the device +const localFile = `${utils.FilePath.PICTURES_DIRECTORY}/text-document.jpg`; + +processDocument(localFile).then(() => console.log('Finished processing file.')); +``` + +To learn more about the available data on a processed document, view the [`MLDocumentText`](/reference/ml/mldocumenttext) +documentation. + +## Configuration + +To help improve the results when using the cloud service, you can optionally provide arguments to the `cloudDocumentTextRecognizerProcessImage` +method: + +```js +const processed = await ml().cloudDocumentTextRecognizerProcessImage(documentPath, { + // The document contains Kurdish + languageHints: ['KU'], +}); +``` + +In most scenarios, not providing any hints will yield better results. Use this configuration if the cloud service is struggling +to detect a language. + +View the [`MLCloudDocumentTextRecognizerOptions`](/reference/ml/mlclouddocumenttextrecognizeroptions) documentation for more information. + diff --git a/docs/ml/usage/index.md b/docs/ml/usage/index.md new file mode 100644 index 00000000000..34c250d60e4 --- /dev/null +++ b/docs/ml/usage/index.md @@ -0,0 +1,56 @@ +--- +title: ML +description: Installation and getting started with ML. +icon: //static.invertase.io/assets/firebase/ml-kit.svg +next: /ml/text-recognition +previous: /in-app-messaging/usage +--- + +# Installation + +This module requires that the `@react-native-firebase/app` module is already setup and installed. To install the "app" module, view the +[Getting Started](/) documentation. + +```bash +# Install & setup the app module +yarn add @react-native-firebase/app + +# Install the ml module +yarn add @react-native-firebase/ml + +# If you're developing your app using iOS, run this command +cd ios/ && pod install +``` + +If you're using an older version of React Native without autolinking support, or wish to integrate into an existing project, +you can follow the manual installation steps for [iOS](/ml/usage/installation/ios) and [Android](/ml/usage/installation/android). + +# What does it do + +ML makes use of Firebase Machine Learning's [Text Recognition](https://firebase.google.com/docs/ml/recognize-text), +[Image Labeling](https://firebase.google.com/docs/ml/label-images) & [Landmark Recognition](https://firebase.google.com/docs/ml/recognize-landmarks) features. + +All Firebase ML services are cloud-based, with on-device APIs handled by the new, separate [Google MLKit](https://developers.google.com/ml-kit/) (Usable in react-native +as a set of [react-native-mlkit modules](https://www.npmjs.com/org/react-native-mlkit)) + + + +## Support table + +The table below outlines the current module support for each available service, and their support status here + +| API | Cloud Model | +| --------------------------------------------------------------------------------- | ----------- | +| [Text Recognition](https://firebase.google.com/docs/ml/recognize-text) | ✅ | +| [Document Text Recognition](https://firebase.google.com/docs/ml/recognize-text)) | ✅ | +| [Image Labeling](https://firebase.google.com/docs/ml/label-images) | ✅ | +| [AutoML Vision Edge](https://firebase.google.com/docs/ml/automl-image-labeling) | ❌ | +| [Object Detection/Tracking](https://firebase.google.com/docs/ml/object-detection) | ❌ | + +# Usage + +To get started, you can find the documentation for the individual ML Kit services below: + +- [Text Recognition](/ml/text-recognition) +- [Landmark Recognition](/ml/landmark-recognition) +- [Image](/ml/image-labeling) diff --git a/docs/ml-vision/usage/installation/android.md b/docs/ml/usage/installation/android.md similarity index 64% rename from docs/ml-vision/usage/installation/android.md rename to docs/ml/usage/installation/android.md index 433a46ba98d..f3ff62890d0 100644 --- a/docs/ml-vision/usage/installation/android.md +++ b/docs/ml/usage/installation/android.md @@ -1,8 +1,8 @@ --- title: Android Installation -description: Manually integrate ML Kit Vision into your Android application. -next: /ml-vision/usage/installation/ios -previous: /ml-vision/usage +description: Manually integrate ML into your Android application. +next: /ml/usage/installation/ios +previous: /ml/usage --- # Android Manual Installation @@ -15,8 +15,8 @@ auto-linking. Add the following to your projects `/android/settings.gradle` file: ```groovy -include ':@react-native-firebase_ml-vision' -project(':@react-native-firebase_ml-vision').projectDir = new File(rootProject.projectDir, './../node_modules/@react-native-firebase/ml-vision/android') +include ':@react-native-firebase_ml' +project(':@react-native-firebase_ml').projectDir = new File(rootProject.projectDir, './../node_modules/@react-native-firebase/ml/android') ``` ## 2. Update Gradle Dependencies @@ -27,7 +27,7 @@ Add the React Native Functions module dependency to your `/android/app/build.gra // .. dependencies { // .. - implementation project(path: ":@react-native-firebase_ml-vision") + implementation project(path: ":@react-native-firebase_ml") } ``` @@ -38,7 +38,7 @@ Import and apply the React Native Firebase module package to your `/android/app/ Import the package: ```java -import io.invertase.firebase.perf.ReactNativeFirebaseMLVisionPackage; +import io.invertase.firebase.perf.ReactNativeFirebaseMLPackage; ``` Add the package to the registry: @@ -47,7 +47,7 @@ Add the package to the registry: protected List getPackages() { return Arrays.asList( new MainReactPackage(), - new ReactNativeFirebaseMLVisionPackage(), + new ReactNativeFirebaseMLPackage(), ``` ## 4. Rebuild the project diff --git a/docs/ml-vision/usage/installation/ios.md b/docs/ml/usage/installation/ios.md similarity index 51% rename from docs/ml-vision/usage/installation/ios.md rename to docs/ml/usage/installation/ios.md index 119ef6f3e7e..c11f45cef6c 100644 --- a/docs/ml-vision/usage/installation/ios.md +++ b/docs/ml/usage/installation/ios.md @@ -1,8 +1,8 @@ --- title: iOS Installation -description: Manually integrate ML Kit Vision APIs into your iOS application. -next: /ml-vision/usage/installation/android -previous: /ml-vision/usage +description: Manually integrate ML APIs into your iOS application. +next: /ml/usage/installation/android +previous: /ml/usage --- # iOS Manual Installation @@ -12,18 +12,18 @@ auto-linking. ## 1. Add the Pod -Add the `RNFBMLVision` Pod to your projects `/ios/Podfile`: +Add the `RNFBML` Pod to your projects `/ios/Podfile`: ```ruby target 'app' do # ... - pod 'RNFBMLVision', :path => '../node_modules/@react-native-firebase/ml-vision' + pod 'RNFBML', :path => '../node_modules/@react-native-firebase/ml' end ``` ## 2. Update Pods & rebuild the project -You may need to update your local Pods in order for the `RNFBMLVision` Pod to be installed in your project: +You may need to update your local Pods in order for the `RNFBML` Pod to be installed in your project: ```bash $ cd /ios/ diff --git a/docs/releases/index.md b/docs/releases/index.md index e0e8ba2f00e..6cdbbd55cfe 100644 --- a/docs/releases/index.md +++ b/docs/releases/index.md @@ -21,8 +21,7 @@ Starting with version `v6.5.0`; all React Native Firebase packages are now indep | Dynamic Links | ![hide:badge](https://img.shields.io/npm/v/@react-native-firebase/dynamic-links.svg?style=for-the-badge&logo=npm) | [View Release Notes »](https://github.com/invertase/react-native-firebase/tree/master/packages/dynamic-links/CHANGELOG.md) | | In-app Messaging | ![hide:badge](https://img.shields.io/npm/v/@react-native-firebase/in-app-messaging.svg?style=for-the-badge&logo=npm) | [View Release Notes »](https://github.com/invertase/react-native-firebase/tree/master/packages/in-app-messaging/CHANGELOG.md) | | Instance ID | ![hide:badge](https://img.shields.io/npm/v/@react-native-firebase/iid.svg?style=for-the-badge&logo=npm) | [View Release Notes »](https://github.com/invertase/react-native-firebase/tree/master/packages/iid/CHANGELOG.md) | -| ML Kit Natural Language | ![hide:badge](https://img.shields.io/npm/v/@react-native-firebase/ml-natural-language.svg?style=for-the-badge&logo=npm) | [View Release Notes »](https://github.com/invertase/react-native-firebase/tree/master/packages/ml-natural-language/CHANGELOG.md) | -| ML Kit Vision | ![hide:badge](https://img.shields.io/npm/v/@react-native-firebase/ml-vision.svg?style=for-the-badge&logo=npm) | [View Release Notes »](https://github.com/invertase/react-native-firebase/tree/master/packages/ml-vision/CHANGELOG.md) | +| ML | ![hide:badge](https://img.shields.io/npm/v/@react-native-firebase/ml.svg?style=for-the-badge&logo=npm) | [View Release Notes »](https://github.com/invertase/react-native-firebase/tree/master/packages/ml/CHANGELOG.md) | | Performance Monitoring | ![hide:badge](https://img.shields.io/npm/v/@react-native-firebase/perf.svg?style=for-the-badge&logo=npm) | [View Release Notes »](https://github.com/invertase/react-native-firebase/tree/master/packages/perf/CHANGELOG.md) | | Realtime Database | ![hide:badge](https://img.shields.io/npm/v/@react-native-firebase/database.svg?style=for-the-badge&logo=npm) | [View Release Notes »](https://github.com/invertase/react-native-firebase/tree/master/packages/database/CHANGELOG.md) | | Remote Config | ![hide:badge](https://img.shields.io/npm/v/@react-native-firebase/remote-config.svg?style=for-the-badge&logo=npm) | [View Release Notes »](https://github.com/invertase/react-native-firebase/tree/master/packages/remote-config/CHANGELOG.md) | diff --git a/docs/releases/v6.0.0.md b/docs/releases/v6.0.0.md index f92fe30008f..2c6bff3a215 100644 --- a/docs/releases/v6.0.0.md +++ b/docs/releases/v6.0.0.md @@ -26,8 +26,7 @@ The new modules: | [Dynamic Links](/dynamic-links) | [![badge](https://img.shields.io/npm/dm/@react-native-firebase/dynamic-links.svg?style=for-the-badge&logo=npm)](https://www.npmjs.com/package/@react-native-firebase/dynamic-links) | [![badge](https://api.rnfirebase.io/coverage/dynamic-links/badge)](https://api.rnfirebase.io/coverage/dynamic-links/detail) | | [In-app Messaging](/in-app-messaging) | [![badge](https://img.shields.io/npm/dm/@react-native-firebase/in-app-messaging.svg?style=for-the-badge&logo=npm)](https://www.npmjs.com/package/@react-native-firebase/in-app-messaging) | [![badge](https://api.rnfirebase.io/coverage/in-app-messaging/badge)](https://api.rnfirebase.io/coverage/in-app-messaging/detail) | | [Instance ID](/iid) | [![badge](https://img.shields.io/npm/dm/@react-native-firebase/iid.svg?style=for-the-badge&logo=npm)](https://www.npmjs.com/package/@react-native-firebase/iid) | [![badge](https://api.rnfirebase.io/coverage/iid/badge)](https://api.rnfirebase.io/coverage/iid/detail) | -| [ML Kit Natural Language](/ml-natural-language) | [![badge](https://img.shields.io/npm/dm/@react-native-firebase/ml-natural-language.svg?style=for-the-badge&logo=npm)](https://www.npmjs.com/package/@react-native-firebase/ml-natural-language) | [![badge](https://api.rnfirebase.io/coverage/ml-natural-language/badge)](https://api.rnfirebase.io/coverage/ml-natural-language/detail) | -| [ML Kit Vision ](/ml-vision) | [![badge](https://img.shields.io/npm/dm/@react-native-firebase/ml-vision.svg?style=for-the-badge&logo=npm)](https://www.npmjs.com/package/@react-native-firebase/ml-vision) | [![badge](https://api.rnfirebase.io/coverage/ml-vision/badge)](https://api.rnfirebase.io/coverage/ml-vision/detail) | +| [ML](/ml) | [![badge](https://img.shields.io/npm/dm/@react-native-firebase/ml.svg?style=for-the-badge&logo=npm)](https://www.npmjs.com/package/@react-native-firebase/ml) | [![badge](https://api.rnfirebase.io/coverage/ml/badge)](https://api.rnfirebase.io/coverage/ml/detail) | | [Performance Monitoring](/perf) | [![badge](https://img.shields.io/npm/dm/@react-native-firebase/perf.svg?style=for-the-badge&logo=npm)](https://www.npmjs.com/package/@react-native-firebase/perf) | [![badge](https://api.rnfirebase.io/coverage/perf/badge)](https://api.rnfirebase.io/coverage/perf/detail) | | [Realtime Database](/database) | [![badge](https://img.shields.io/npm/dm/@react-native-firebase/database.svg?style=for-the-badge&logo=npm)](https://www.npmjs.com/package/@react-native-firebase/database) | [![badge](https://api.rnfirebase.io/coverage/database/badge)](https://api.rnfirebase.io/coverage/database/detail) | | [Remote Config](/remote-config) | [![badge](https://img.shields.io/npm/dm/@react-native-firebase/remote-config.svg?style=for-the-badge&logo=npm)](https://www.npmjs.com/package/@react-native-firebase/remote-config) | [![badge](https://api.rnfirebase.io/coverage/remote-config/badge)](https://api.rnfirebase.io/coverage/remote-config/detail) | @@ -307,38 +306,17 @@ The Remote Config API has had a significant API change as originally highlighted --- -### ML Kit Natural Language (naturalLanguage) +### ML (Machine Learning) > This is a new module in React Native Firebase. - [NEW] Implemented support for language identification APIs - Single Languages: `identifyLanguage()`. - Multiple Languages: `identifyPossibleLanguages()` -- [NEW] Implemented support for [Smart Replies](https://firebase.google.com/docs/ml-kit/generate-smart-replies) - - [Example Video](https://twitter.com/mikediarmid/status/1128837402481635331) - -> ML Kit Translate APIs to come in a later release. - ---- - -### ML Kit Vision (vision) - -> This is a new module in React Native Firebase. - -- [NEW] Implemented support for [Text Recognition](https://firebase.google.com/docs/ml-kit/recognize-text) Vision APIs; - - [x] Cloud - - [x] On Device -- [NEW] Implemented support for [Document Text Recognition](https://firebase.google.com/docs/ml-kit/recognize-text) Vision APIs; - - [x] Cloud -- [NEW] Implemented support for [Face Detection](https://firebase.google.com/docs/ml-kit/detect-faces) Vision APIs; - - [x] On Device -- [NEW] Implemented support for [Barcode Detection](https://firebase.google.com/docs/ml-kit/read-barcodes) Vision APIs; - - [x] On Device -- [NEW] Implemented support for [Image Labeling](https://firebase.google.com/docs/ml-kit/label-images) Vision APIs; - - [x] Cloud - - [x] On Device -- [NEW] Implemented support for [Landmark Recognition](https://firebase.google.com/docs/ml-kit/recognize-landmarks) Vision APIs; - - [x] Cloud +- [NEW] Implemented support for [Text Recognition](https://firebase.google.com/docs/ml/recognize-text) Vision APIs; +- [NEW] Implemented support for [Document Text Recognition](https://firebase.google.com/docs/ml/recognize-text) Vision APIs; +- [NEW] Implemented support for [Image Labeling](https://firebase.google.com/docs/ml/label-images) Vision APIs; +- [NEW] Implemented support for [Landmark Recognition](https://firebase.google.com/docs/ml/recognize-landmarks) Vision APIs; --- diff --git a/docs/remote-config/usage/index.md b/docs/remote-config/usage/index.md index fbc993a61f0..420960d285b 100644 --- a/docs/remote-config/usage/index.md +++ b/docs/remote-config/usage/index.md @@ -3,7 +3,7 @@ title: Remote Config description: Installation and getting started with Remote Config. icon: //static.invertase.io/assets/firebase/remote-config.svg next: /perf/usage -previous: /ml-vision/face-detection +previous: /ml/image-labeling --- # Installation @@ -85,8 +85,10 @@ remoteConfig() .then(fetchedRemotely => { if (fetchedRemotely) { console.log('Configs were retrieved from the backend and activated.'); - } else { - console.log('No configs were fetched from the backend, and the local configs were already activated'); + } else { + console.log( + 'No configs were fetched from the backend, and the local configs were already activated', + ); } }); ``` @@ -121,11 +123,11 @@ The API also provides a `getAll` method to read all parameters at once rather th ```js const parameters = remoteConfig().getAll(); -Object.entries(parameters).forEach(($) => { +Object.entries(parameters).forEach($ => { const [key, entry] = $; - console.log('Key: ', key); - console.log('Source: ', entry.getSource()); - console.log('Value: ', entry.asString()); + console.log('Key: ', key); + console.log('Source: ', entry.getSource()); + console.log('Value: ', entry.asString()); }); ``` diff --git a/docs/sidebar.yaml b/docs/sidebar.yaml index dbb20064fca..7f33964a1e8 100644 --- a/docs/sidebar.yaml +++ b/docs/sidebar.yaml @@ -103,23 +103,15 @@ - - - Usage - '/in-app-messaging/usage' - '//static.invertase.io/assets/firebase/in-app-messaging.svg' -- - ML Kit Natural Language +- - ML - - - Usage - - '/ml-natural-language/usage' - - '//static.invertase.io/assets/firebase/ml-kit.svg' -- - ML Kit Vision - - - - Usage - - '/ml-vision/usage' + - '/ml/usage' - - Text Recognition - - '/ml-vision/text-recognition' + - '/ml/text-recognition' - - Landmark Recognition - - '/ml-vision/landmark-recognition' - - - Barcode Scanning - - '/ml-vision/barcode-scanning' + - '/ml/landmark-recognition' - - Image Labeling - - '/ml-vision/image-labeling' - - - Face Detection - - '/ml-vision/face-detection' + - '/ml/image-labeling' - '//static.invertase.io/assets/firebase/ml-kit.svg' - - Remote Config - - - Usage diff --git a/packages/app/android/build.gradle b/packages/app/android/build.gradle index dc1e5cadc1a..04a224f8dcc 100644 --- a/packages/app/android/build.gradle +++ b/packages/app/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:4.0.1") + classpath("com.android.tools.build:gradle:4.1.0") } } } diff --git a/packages/app/android/src/reactnative/java/io/invertase/firebase/utils/ReactNativeFirebaseUtilsModule.java b/packages/app/android/src/reactnative/java/io/invertase/firebase/utils/ReactNativeFirebaseUtilsModule.java index 83f13be50a7..cf6e909b90e 100644 --- a/packages/app/android/src/reactnative/java/io/invertase/firebase/utils/ReactNativeFirebaseUtilsModule.java +++ b/packages/app/android/src/reactnative/java/io/invertase/firebase/utils/ReactNativeFirebaseUtilsModule.java @@ -161,8 +161,7 @@ public Map getConstants() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - File folder = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS); - constants.put(KEY_DOCUMENT_DIRECTORY, folder.getAbsolutePath()); + constants.put(KEY_DOCUMENT_DIRECTORY, context.getExternalFilesDir(null).getAbsolutePath()); } else { constants.put(KEY_DOCUMENT_DIRECTORY, context.getFilesDir().getAbsolutePath()); } diff --git a/packages/app/lib/internal/constants.js b/packages/app/lib/internal/constants.js index 2db91325ec4..3badd9d796d 100644 --- a/packages/app/lib/internal/constants.js +++ b/packages/app/lib/internal/constants.js @@ -35,7 +35,7 @@ export const KNOWN_NAMESPACES = [ 'dynamicLinks', 'messaging', 'naturalLanguage', - 'vision', + 'ml', 'notifications', 'perf', 'utils', diff --git a/packages/app/package.json b/packages/app/package.json index e689a0e0baa..6f94d571abf 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -62,15 +62,14 @@ }, "sdkVersions": { "ios": { - "firebase": "~> 6.34.0" + "firebase": "~> 7.0.0" }, "android": { "minSdk": 16, - "targetSdk": 29, - "compileSdk": 29, - "buildTools": "29.0.3", - "firebase": "25.12.0", - "iid": "20.3.0", + "targetSdk": 30, + "compileSdk": 30, + "buildTools": "30.0.2", + "firebase": "26.0.0", "playServicesAuth": "18.1.0" } } diff --git a/packages/ml-natural-language/CHANGELOG.md b/packages/ml-natural-language/CHANGELOG.md deleted file mode 100644 index ffc9612fe13..00000000000 --- a/packages/ml-natural-language/CHANGELOG.md +++ /dev/null @@ -1,140 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -## [7.4.11](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/ml-natural-language@7.4.10...@react-native-firebase/ml-natural-language@7.4.11) (2020-11-10) - -**Note:** Version bump only for package @react-native-firebase/ml-natural-language - -## [7.4.10](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/ml-natural-language@7.4.9...@react-native-firebase/ml-natural-language@7.4.10) (2020-10-30) - -**Note:** Version bump only for package @react-native-firebase/ml-natural-language - -## [7.4.9](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/ml-natural-language@7.4.8...@react-native-firebase/ml-natural-language@7.4.9) (2020-10-16) - -**Note:** Version bump only for package @react-native-firebase/ml-natural-language - -## [7.4.8](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/ml-natural-language@7.4.7...@react-native-firebase/ml-natural-language@7.4.8) (2020-09-30) - -**Note:** Version bump only for package @react-native-firebase/ml-natural-language - -## [7.4.7](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/ml-natural-language@7.4.6...@react-native-firebase/ml-natural-language@7.4.7) (2020-09-30) - -### Bug Fixes - -- **types:** enable TypeScript libCheck & resolve type conflicts ([#4306](https://github.com/invertase/react-native-firebase/issues/4306)) ([aa8ee8b](https://github.com/invertase/react-native-firebase/commit/aa8ee8b7e83443d2c1664993800e15faf4b59b0e)) - -## [7.4.6](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/ml-natural-language@7.4.5...@react-native-firebase/ml-natural-language@7.4.6) (2020-09-30) - -**Note:** Version bump only for package @react-native-firebase/ml-natural-language - -## [7.4.5](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/ml-natural-language@7.4.4...@react-native-firebase/ml-natural-language@7.4.5) (2020-09-17) - -**Note:** Version bump only for package @react-native-firebase/ml-natural-language - -## [7.4.4](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/ml-natural-language@7.4.3...@react-native-firebase/ml-natural-language@7.4.4) (2020-09-17) - -### Bug Fixes - -- **ios, podspec:** depend on React-Core instead of React ([#4275](https://github.com/invertase/react-native-firebase/issues/4275)) ([fd1a2be](https://github.com/invertase/react-native-firebase/commit/fd1a2be6b6ab1dec89e5dce1fc237435c3e1d510)) - -## [7.4.3](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/ml-natural-language@7.4.2...@react-native-firebase/ml-natural-language@7.4.3) (2020-09-11) - -**Note:** Version bump only for package @react-native-firebase/ml-natural-language - -## [7.4.2](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/ml-natural-language@7.4.1...@react-native-firebase/ml-natural-language@7.4.2) (2020-08-28) - -**Note:** Version bump only for package @react-native-firebase/ml-natural-language - -## [7.4.1](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/ml-natural-language@7.4.0...@react-native-firebase/ml-natural-language@7.4.1) (2020-08-26) - -**Note:** Version bump only for package @react-native-firebase/ml-natural-language - -# [7.4.0](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/ml-natural-language@7.3.2...@react-native-firebase/ml-natural-language@7.4.0) (2020-08-26) - -### Features - -- bump firebase sdk versions, add GoogleApi dep, use Android API29 ([#4122](https://github.com/invertase/react-native-firebase/issues/4122)) ([728f418](https://github.com/invertase/react-native-firebase/commit/728f41863832d21230c6eb1f55385284fef03c09)) - -## [7.3.2](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/ml-natural-language@7.3.1...@react-native-firebase/ml-natural-language@7.3.2) (2020-08-15) - -**Note:** Version bump only for package @react-native-firebase/ml-natural-language - -## [7.3.1](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/ml-natural-language@7.3.0...@react-native-firebase/ml-natural-language@7.3.1) (2020-08-03) - -**Note:** Version bump only for package @react-native-firebase/ml-natural-language - -# [7.3.0](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/ml-natural-language@7.2.2...@react-native-firebase/ml-natural-language@7.3.0) (2020-08-03) - -### Features - -- use latest android & ios Firebase SDKs version ([#3956](https://github.com/invertase/react-native-firebase/issues/3956)) ([e7b4bb3](https://github.com/invertase/react-native-firebase/commit/e7b4bb31b05985c044b1f01625a43e364bb653ef)) - -## [7.2.2](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/ml-natural-language@7.2.1...@react-native-firebase/ml-natural-language@7.2.2) (2020-07-09) - -**Note:** Version bump only for package @react-native-firebase/ml-natural-language - -## [7.2.1](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/ml-natural-language@7.2.0...@react-native-firebase/ml-natural-language@7.2.1) (2020-07-07) - -**Note:** Version bump only for package @react-native-firebase/ml-natural-language - -# [7.2.0](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/ml-natural-language@7.1.8...@react-native-firebase/ml-natural-language@7.2.0) (2020-07-07) - -### Features - -- **android,ios:** upgrade native SDK versions ([#3881](https://github.com/invertase/react-native-firebase/issues/3881)) ([6cb68a8](https://github.com/invertase/react-native-firebase/commit/6cb68a8ea808392fac3a28bdb1a76049c7b52e86)) - -## [7.1.8](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/ml-natural-language@7.1.7...@react-native-firebase/ml-natural-language@7.1.8) (2020-07-05) - -**Note:** Version bump only for package @react-native-firebase/ml-natural-language - -## [7.1.7](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/ml-natural-language@7.1.6...@react-native-firebase/ml-natural-language@7.1.7) (2020-06-30) - -**Note:** Version bump only for package @react-native-firebase/ml-natural-language - -## [7.1.6](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/ml-natural-language@7.1.5...@react-native-firebase/ml-natural-language@7.1.6) (2020-06-26) - -**Note:** Version bump only for package @react-native-firebase/ml-natural-language - -## [7.1.5](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/ml-natural-language@7.1.4...@react-native-firebase/ml-natural-language@7.1.5) (2020-06-22) - -**Note:** Version bump only for package @react-native-firebase/ml-natural-language - -## [7.1.4](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/ml-natural-language@7.1.3...@react-native-firebase/ml-natural-language@7.1.4) (2020-06-10) - -**Note:** Version bump only for package @react-native-firebase/ml-natural-language - -## [7.1.3](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/ml-natural-language@7.1.2...@react-native-firebase/ml-natural-language@7.1.3) (2020-06-03) - -**Note:** Version bump only for package @react-native-firebase/ml-natural-language - -## [7.1.2](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/ml-natural-language@7.1.1...@react-native-firebase/ml-natural-language@7.1.2) (2020-05-29) - -**Note:** Version bump only for package @react-native-firebase/ml-natural-language - -## [7.1.1](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/ml-natural-language@7.1.0...@react-native-firebase/ml-natural-language@7.1.1) (2020-05-29) - -**Note:** Version bump only for package @react-native-firebase/ml-natural-language - -# [7.1.0](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/ml-natural-language@7.0.1...@react-native-firebase/ml-natural-language@7.1.0) (2020-05-22) - -### Features - -- update native Firebase SDK versions ([#3663](https://github.com/invertase/react-native-firebase/issues/3663)) ([4db9dbc](https://github.com/invertase/react-native-firebase/commit/4db9dbc3ec20bf96de0efad15000f00b41e4a799)) - -## [7.0.1](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/ml-natural-language@7.0.0...@react-native-firebase/ml-natural-language@7.0.1) (2020-05-13) - -**Note:** Version bump only for package @react-native-firebase/ml-natural-language - -## [7.0.0](https://github.com/invertase/react-native-firebase/compare/@react-native-firebase/ml-natural-language@7.0.0...@react-native-firebase/ml-natural-language@7.0.0) (2020-05-13) - -- feat!: all packages should depend on core (#3613) ([252a423](https://github.com/invertase/react-native-firebase/commit/252a4239e98a0f2a55c4afcd2d82e4d5f97e65e9)), closes [#3613](https://github.com/invertase/react-native-firebase/issues/3613) - -### Features - -- **ios:** podspecs now utilize CoreOnly instead of Core ([#3575](https://github.com/invertase/react-native-firebase/issues/3575)) ([35285f1](https://github.com/invertase/react-native-firebase/commit/35285f1655b16d05e6630fc556f95cccfb707ee4)) - -### BREAKING CHANGES - -- breaking change to mark new internal versioning requirements. diff --git a/packages/ml-natural-language/README.md b/packages/ml-natural-language/README.md deleted file mode 100644 index eb42e7da451..00000000000 --- a/packages/ml-natural-language/README.md +++ /dev/null @@ -1,31 +0,0 @@ -

- -
- -

React Native Firebase - ML Kit Natural Language

-

- ---- - -# DEPRECATED - -This package is deprecated and should no longer be used. - -Google has split mobile machine learning functionality into two pieces: - -1. "On-Device" inferences - this will be handled via the standalone ["Google ML Kit"](https://developers.google.com/ml-kit) libraries, and the related [`react-native-mlkit`](https://github.com/invertase/react-native-mlkit) package. This includes any APIs where the device uses a local model to make inferences - -1. "Cloud" inferences - these will continue in Firebase, but are now in the ["Firebase ML"](https://firebase.google.com/docs/ml) library, and will be available from the new consolidated `@react-native-firebase/ml` package - -More information on the transition is available here: https://firebase.google.com/docs/ml#cloud_vs_on-device - ---- - -

- -

- Built and maintained with 💛 by Invertase. -

-

- ---- diff --git a/packages/ml-natural-language/RNFBMLNaturalLanguage.podspec b/packages/ml-natural-language/RNFBMLNaturalLanguage.podspec deleted file mode 100644 index 761e4233690..00000000000 --- a/packages/ml-natural-language/RNFBMLNaturalLanguage.podspec +++ /dev/null @@ -1,60 +0,0 @@ -require 'json' -require '../app/firebase_json' -package = JSON.parse(File.read(File.join(__dir__, 'package.json'))) -appPackage = JSON.parse(File.read(File.join('..', 'app', 'package.json'))) - -coreVersionDetected = appPackage['version'] -coreVersionRequired = package['peerDependencies'][appPackage['name']] -firebase_sdk_version = appPackage['sdkVersions']['ios']['firebase'] -if coreVersionDetected != coreVersionRequired - Pod::UI.warn "NPM package '#{package['name']}' depends on '#{appPackage['name']}' v#{coreVersionRequired} but found v#{coreVersionDetected}, this might cause build issues or runtime crashes." -end - -Pod::Spec.new do |s| - s.name = "RNFBMLNaturalLanguage" - s.version = package["version"] - s.description = package["description"] - s.summary = <<-DESC - A well tested feature rich Firebase implementation for React Native, supporting iOS & Android. - DESC - s.homepage = "http://invertase.io/oss/react-native-firebase" - s.license = package['license'] - s.authors = "Invertase Limited" - s.source = { :git => "https://github.com/invertase/react-native-firebase.git", :tag => "v#{s.version}" } - s.social_media_url = 'http://twitter.com/invertaseio' - s.ios.deployment_target = "9.0" - s.source_files = 'ios/**/*.{h,m}' - - # React Native dependencies - s.dependency 'React-Core' - s.dependency 'RNFBApp' - - if defined?($FirebaseSDKVersion) - Pod::UI.puts "#{s.name}: Using user specified Firebase SDK version '#{$FirebaseSDKVersion}'" - firebase_sdk_version = $FirebaseSDKVersion - end - - # Firebase dependencies - s.dependency 'Firebase/MLNaturalLanguage', firebase_sdk_version - - if FirebaseJSON::Config.get_value_or_default('ml_natural_language_language_id_model', false) - s.dependency 'Firebase/MLNLLanguageID', firebase_sdk_version - end - - # ignore until after v6 release, add support in a feature release - # if FirebaseJSON::Config.get_value_or_default('ml_natural_language_translate_model', false) - # s.dependency 'Firebase/MLNLTranslate', firebase_sdk_version - # end - - if FirebaseJSON::Config.get_value_or_default('ml_natural_language_smart_reply_model', false) - s.dependency 'Firebase/MLCommon', firebase_sdk_version - s.dependency 'Firebase/MLNLSmartReply', firebase_sdk_version - end - - if defined?($RNFirebaseAsStaticFramework) - Pod::UI.puts "#{s.name}: Using overridden static_framework value of '#{$RNFirebaseAsStaticFramework}'" - s.static_framework = $RNFirebaseAsStaticFramework - else - s.static_framework = false - end -end diff --git a/packages/ml-natural-language/android/build.gradle b/packages/ml-natural-language/android/build.gradle deleted file mode 100644 index 4d50f2f91a0..00000000000 --- a/packages/ml-natural-language/android/build.gradle +++ /dev/null @@ -1,105 +0,0 @@ -import io.invertase.gradle.common.PackageJson - -buildscript { - // The Android Gradle plugin is only required when opening the android folder stand-alone. - // This avoids unnecessary downloads and potential conflicts when the library is included as a - // module dependency in an application project. - if (project == rootProject) { - repositories { - google() - jcenter() - } - - dependencies { - classpath("com.android.tools.build:gradle:4.0.1") - } - } -} - -plugins { - id "io.invertase.gradle.build" version "1.4" -} - -def appProject -if (findProject(':@react-native-firebase_app')) { - appProject = project(':@react-native-firebase_app') -} else if (findProject(':react-native-firebase_app')) { - appProject = project(':react-native-firebase_app') -} else { - throw new GradleException('Could not find the react-native-firebase/app package, have you installed it?') -} -def packageJson = PackageJson.getForProject(project) -def appPackageJson = PackageJson.getForProject(appProject) -def firebaseBomVersion = appPackageJson['sdkVersions']['android']['firebase'] -def jsonMinSdk = appPackageJson['sdkVersions']['android']['minSdk'] -def jsonTargetSdk = appPackageJson['sdkVersions']['android']['targetSdk'] -def jsonCompileSdk = appPackageJson['sdkVersions']['android']['compileSdk'] -def jsonBuildTools = appPackageJson['sdkVersions']['android']['buildTools'] -def coreVersionDetected = appPackageJson['version'] -def coreVersionRequired = packageJson['peerDependencies'][appPackageJson['name']] -// Only log after build completed so log warning appears at the end -if (coreVersionDetected != coreVersionRequired) { - gradle.buildFinished { - project.logger.warn("ReactNativeFirebase WARNING: NPM package '${packageJson['name']}' depends on '${appPackageJson['name']}' v${coreVersionRequired} but found v${coreVersionDetected}, this might cause build issues or runtime crashes.") - } -} - -project.ext { - set('react-native', [ - versions: [ - android : [ - minSdk : jsonMinSdk, - targetSdk : jsonTargetSdk, - compileSdk: jsonCompileSdk, - // optional as gradle.buildTools comes with one by default - // overriding here though to match the version RN uses - buildTools: jsonBuildTools - ], - - firebase: [ - bom: firebaseBomVersion, - ], - ], - ]) -} - -android { - defaultConfig { - multiDexEnabled true - } - aaptOptions { - noCompress "tflite" - } - lintOptions { - disable 'GradleCompatible' - abortOnError false - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - sourceSets { - main { - java.srcDirs = ['src/main/java', 'src/reactnative/java'] - } - } -} - -repositories { - google() - jcenter() -} - -dependencies { - api appProject - implementation platform("com.google.firebase:firebase-bom:${ReactNative.ext.getVersion("firebase", "bom")}") - implementation "com.google.firebase:firebase-ml-natural-language" -} - -apply from: file("./ml-models.gradle") - -ReactNative.shared.applyPackageVersion() -ReactNative.shared.applyDefaultExcludes() -ReactNative.module.applyAndroidVersions() -ReactNative.module.applyReactNativeDependency("api") diff --git a/packages/ml-natural-language/android/ml-models.gradle b/packages/ml-natural-language/android/ml-models.gradle deleted file mode 100644 index f4a3786ccb6..00000000000 --- a/packages/ml-natural-language/android/ml-models.gradle +++ /dev/null @@ -1,23 +0,0 @@ -apply from: file("./../../app/android/firebase-json.gradle") - -def mlModels = [ - // TODO not available on iOS until SDK 6.0.0 - // 'ml_natural_language_translate_model', - 'ml_natural_language_language_id_model', - 'ml_natural_language_smart_reply_model', -] - -dependencies { - if (rootProject.ext && rootProject.ext.firebaseJson) { - mlModels.each { modelFlag -> - if (rootProject.ext.firebaseJson.isFlagEnabled(modelFlag) == true) { - rootProject.logger.info ":${project.name} model enabled: '${modelFlag}'" - implementation "com.google.firebase:firebase-${modelFlag.replaceAll("_", "-")}" - } else { - rootProject.logger.warn ":${project.name} model disabled: '${modelFlag}'" - } - } - } else { - rootProject.logger.warn ":${project.name} skipping optional models as no firebaseJson extension found, you may be missing a firebase.json file in the root of your React Native project, or you've not installed the @react-native-firebase/app package and included it in your app build." - } -} diff --git a/packages/ml-natural-language/android/settings.gradle b/packages/ml-natural-language/android/settings.gradle deleted file mode 100644 index 9c9c7705f1d..00000000000 --- a/packages/ml-natural-language/android/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = '@react-native-firebase_ml-natural-language' diff --git a/packages/ml-natural-language/android/src/main/AndroidManifest.xml b/packages/ml-natural-language/android/src/main/AndroidManifest.xml deleted file mode 100644 index cc9b0e0efef..00000000000 --- a/packages/ml-natural-language/android/src/main/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/packages/ml-natural-language/android/src/main/java/io/invertase/firebase/ml/naturallanguage/UniversalFirebaseMLNaturalLanguageCommon.java b/packages/ml-natural-language/android/src/main/java/io/invertase/firebase/ml/naturallanguage/UniversalFirebaseMLNaturalLanguageCommon.java deleted file mode 100644 index 60d7c326bb0..00000000000 --- a/packages/ml-natural-language/android/src/main/java/io/invertase/firebase/ml/naturallanguage/UniversalFirebaseMLNaturalLanguageCommon.java +++ /dev/null @@ -1,96 +0,0 @@ -package io.invertase.firebase.ml.naturallanguage; - -import com.google.firebase.ml.common.FirebaseMLException; - -import javax.annotation.Nullable; - -public class UniversalFirebaseMLNaturalLanguageCommon { - - static String[] getErrorCodeAndMessageFromException(@Nullable Exception possibleMLException) { - String code = "unknown"; - String message = "An unknown error has occurred."; - - if (possibleMLException != null) { - message = possibleMLException.getMessage(); - if (possibleMLException instanceof FirebaseMLException) { - FirebaseMLException mlException = (FirebaseMLException) possibleMLException; - switch (mlException.getCode()) { - case FirebaseMLException.ABORTED: - code = "aborted"; - message = "The operation was aborted, typically due to a concurrency issue like transaction aborts, etc."; - break; - case FirebaseMLException.ALREADY_EXISTS: - code = "already-exists"; - message = "Some resource that we attempted to create already exists."; - break; - case FirebaseMLException.CANCELLED: - code = "cancelled"; - message = "The operation was cancelled (typically by the caller)."; - break; - case FirebaseMLException.DATA_LOSS: - code = "data-loss"; - message = "Unrecoverable data loss or corruption."; - break; - case FirebaseMLException.DEADLINE_EXCEEDED: - code = "deadline-exceeded"; - message = "Deadline expired before operation could complete."; - break; - case FirebaseMLException.FAILED_PRECONDITION: - code = "failed-precondition"; - message = "Operation was rejected because the system is not in a state required for the operation's execution."; - break; - case FirebaseMLException.INTERNAL: - code = "internal"; - message = "Internal errors."; - break; - case FirebaseMLException.INVALID_ARGUMENT: - code = "invalid-argument"; - message = "Client specified an invalid argument."; - break; - case FirebaseMLException.MODEL_HASH_MISMATCH: - code = "model-hash-mismatch"; - message = "The downloaded model's hash doesn't match the expected value."; - break; - case FirebaseMLException.MODEL_INCOMPATIBLE_WITH_TFLITE: - code = "model-incompatible-with-tflite"; - message = "The downloaded model isn't compatible with the TFLite runtime."; - break; - case FirebaseMLException.NOT_ENOUGH_SPACE: - code = "not-enough-space"; - message = "There is not enough space left on the device."; - break; - case FirebaseMLException.NOT_FOUND: - code = "not-found"; - message = "Some requested resource was not found."; - break; - case FirebaseMLException.OUT_OF_RANGE: - code = "out-of-range"; - message = "Operation was attempted past the valid range."; - break; - case FirebaseMLException.PERMISSION_DENIED: - code = "permission-denied"; - message = "The caller does not have permission to execute the specified operation."; - break; - case FirebaseMLException.RESOURCE_EXHAUSTED: - code = "resource-exhausted"; - message = "Some resource has been exhausted, perhaps a per-user quota, or perhaps the entire file system is out of space."; - break; - case FirebaseMLException.UNAUTHENTICATED: - code = "unauthenticated"; - message = "The request does not have valid authentication credentials for the operation."; - break; - case FirebaseMLException.UNAVAILABLE: - code = "unavailable"; - message = "The service is currently unavailable."; - break; - case FirebaseMLException.UNIMPLEMENTED: - code = "unimplemented"; - message = "Operation is not implemented or not supported/enabled."; - break; - } - } - } - - return new String[]{code, message, possibleMLException != null ? possibleMLException.getMessage() : ""}; - } -} diff --git a/packages/ml-natural-language/android/src/main/java/io/invertase/firebase/ml/naturallanguage/UniversalFirebaseMLNaturalLanguageIdModule.java b/packages/ml-natural-language/android/src/main/java/io/invertase/firebase/ml/naturallanguage/UniversalFirebaseMLNaturalLanguageIdModule.java deleted file mode 100644 index f87b72236b6..00000000000 --- a/packages/ml-natural-language/android/src/main/java/io/invertase/firebase/ml/naturallanguage/UniversalFirebaseMLNaturalLanguageIdModule.java +++ /dev/null @@ -1,126 +0,0 @@ -package io.invertase.firebase.ml.naturallanguage; - -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -import android.content.Context; -import android.os.Bundle; - -import com.google.android.gms.tasks.Task; -import com.google.android.gms.tasks.Tasks; -import com.google.firebase.FirebaseApp; -import com.google.firebase.ml.naturallanguage.FirebaseNaturalLanguage; -import com.google.firebase.ml.naturallanguage.languageid.FirebaseLanguageIdentification; -import com.google.firebase.ml.naturallanguage.languageid.FirebaseLanguageIdentificationOptions; -import com.google.firebase.ml.naturallanguage.languageid.IdentifiedLanguage; -import com.google.firebase.ml.naturallanguage.translate.FirebaseTranslateLanguage; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import io.invertase.firebase.common.UniversalFirebaseModule; - -@SuppressWarnings("WeakerAccess") -class UniversalFirebaseMLNaturalLanguageIdModule extends UniversalFirebaseModule { - - UniversalFirebaseMLNaturalLanguageIdModule(Context context, String serviceName) { - super(context, serviceName); - } - - /** - * @url https://firebase.google.com/docs/reference/android/com/google/firebase/ml/naturallanguage/languageid/FirebaseLanguageIdentification.html#identifyLanguage(java.lang.String) - */ - public Task identifyLanguage( - String appName, - String text, - Bundle identificationOptionsBundle - ) { - return Tasks.call(getExecutor(), () -> { - FirebaseApp firebaseApp = FirebaseApp.getInstance(appName); - FirebaseNaturalLanguage naturalLanguage = FirebaseNaturalLanguage.getInstance(firebaseApp); - - FirebaseLanguageIdentificationOptions identificationOptions = getOptions( - identificationOptionsBundle - ); - - FirebaseLanguageIdentification languageIdentification = naturalLanguage.getLanguageIdentification( - identificationOptions); - - return Tasks.await(languageIdentification.identifyLanguage(text)); - }); - } - - /** - * @url https://firebase.google.com/docs/reference/android/com/google/firebase/ml/naturallanguage/languageid/FirebaseLanguageIdentification.html#identifyPossibleLanguages(java.lang.String) - */ - public Task> identifyPossibleLanguages( - String appName, - String text, - Bundle identificationOptionsBundle - ) { - return Tasks.call(getExecutor(), () -> { - FirebaseApp firebaseApp = FirebaseApp.getInstance(appName); - FirebaseNaturalLanguage naturalLanguage = FirebaseNaturalLanguage.getInstance(firebaseApp); - FirebaseLanguageIdentificationOptions identificationOptions = getOptions( - identificationOptionsBundle - ); - FirebaseLanguageIdentification languageIdentification = naturalLanguage.getLanguageIdentification( - identificationOptions); - - List languagesRaw = Tasks.await(languageIdentification.identifyPossibleLanguages( - text)); - - List formattedLanguages = new ArrayList<>(languagesRaw.size()); - - - for (IdentifiedLanguage identifiedLanguage : languagesRaw) { - Bundle formattedLanguage = new Bundle(2); - formattedLanguage.putString("language", identifiedLanguage.getLanguageCode()); - formattedLanguage.putFloat("confidence", identifiedLanguage.getConfidence()); - formattedLanguages.add(formattedLanguage); - } - - return formattedLanguages; - }); - - } - - /** - * @url https://firebase.google.com/docs/reference/android/com/google/firebase/ml/naturallanguage/languageid/FirebaseLanguageIdentificationOptions.html - */ - private FirebaseLanguageIdentificationOptions getOptions( - Bundle identificationOptionsBundle - ) { - boolean multipleLanguages = identificationOptionsBundle.containsKey("multipleLanguages"); - FirebaseLanguageIdentificationOptions.Builder optionsBuilder = new FirebaseLanguageIdentificationOptions.Builder(); - - if (identificationOptionsBundle.containsKey("confidenceThreshold")) { - optionsBuilder.setConfidenceThreshold((float) identificationOptionsBundle.getDouble( - "confidenceThreshold")); - } else { - if (!multipleLanguages) { - optionsBuilder.setConfidenceThreshold(FirebaseLanguageIdentification.DEFAULT_IDENTIFY_LANGUAGE_CONFIDENCE_THRESHOLD); - } else { - optionsBuilder.setConfidenceThreshold(FirebaseLanguageIdentification.DEFAULT_IDENTIFY_POSSIBLE_LANGUAGES_CONFIDENCE_THRESHOLD); - } - } - - return optionsBuilder.build(); - } -} diff --git a/packages/ml-natural-language/android/src/main/java/io/invertase/firebase/ml/naturallanguage/UniversalFirebaseMLNaturalLanguageSmartReplyModule.java b/packages/ml-natural-language/android/src/main/java/io/invertase/firebase/ml/naturallanguage/UniversalFirebaseMLNaturalLanguageSmartReplyModule.java deleted file mode 100644 index ff2ecb3daee..00000000000 --- a/packages/ml-natural-language/android/src/main/java/io/invertase/firebase/ml/naturallanguage/UniversalFirebaseMLNaturalLanguageSmartReplyModule.java +++ /dev/null @@ -1,108 +0,0 @@ -package io.invertase.firebase.ml.naturallanguage; - -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -import android.content.Context; -import android.os.Bundle; -import com.google.android.gms.tasks.Task; -import com.google.android.gms.tasks.Tasks; -import com.google.firebase.FirebaseApp; -import com.google.firebase.ml.naturallanguage.FirebaseNaturalLanguage; -import com.google.firebase.ml.naturallanguage.smartreply.FirebaseTextMessage; -import com.google.firebase.ml.naturallanguage.smartreply.SmartReplySuggestion; -import com.google.firebase.ml.naturallanguage.smartreply.SmartReplySuggestionResult; -import io.invertase.firebase.common.UniversalFirebaseModule; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -@SuppressWarnings({"WeakerAccess", "UnusedReturnValue"}) -class UniversalFirebaseMLNaturalLanguageSmartReplyModule extends UniversalFirebaseModule { - UniversalFirebaseMLNaturalLanguageSmartReplyModule(Context context, String serviceName) { - super(context, serviceName); - } - - @Override - public void onTearDown() { - super.onTearDown(); - } - - @SuppressWarnings("unchecked") - private List buildFirebaseTextMessagesList(List messages) { - List firebaseTextMessages = new ArrayList<>(messages.size()); - - for (Object message : messages) { - Map messageMap = (Map) message; - - Boolean isLocalUser = (Boolean) messageMap.get("isLocalUser"); - long timestamp = (long) ((double) messageMap.get("timestamp")); - String text = (String) messageMap.get("text"); - - if (isLocalUser) { - firebaseTextMessages.add( - FirebaseTextMessage.createForLocalUser( - text, - timestamp - ) - ); - } else { - firebaseTextMessages.add( - FirebaseTextMessage.createForRemoteUser( - text, - timestamp, - (String) messageMap.get("userId") - ) - ); - } - } - - return firebaseTextMessages; - } - - /** - * @url https://firebase.google.com/docs/reference/android/com/google/firebase/ml/naturallanguage/smartreply/FirebaseSmartReply.html#public-tasksmartreplysuggestionresultsuggestreplieslistfirebasetextmessage-textmessages - */ - public Task> suggestReplies(String appName, List messages) { - return Tasks.call(getExecutor(), () -> { - List firebaseTextMessages = buildFirebaseTextMessagesList(messages); - FirebaseNaturalLanguage instance = FirebaseNaturalLanguage.getInstance(FirebaseApp.getInstance(appName)); - - SmartReplySuggestionResult suggestionResult = Tasks.await( - instance.getSmartReply().suggestReplies(firebaseTextMessages) - ); - - if (suggestionResult == null) return new ArrayList<>(0); - - List suggestedRepliesListRaw = suggestionResult.getSuggestions(); - List suggestedRepliesListFormatted = new ArrayList<>( - suggestedRepliesListRaw.size()); - - - for (SmartReplySuggestion suggestedReplyRaw : suggestedRepliesListRaw) { - Bundle suggestReplyFormatted = new Bundle(2); - suggestReplyFormatted.putString("text", suggestedReplyRaw.getText()); - // TODO no longer exists - undocumented breaking change - // suggestReplyFormatted.putFloat("confidence", suggestedReplyRaw.getConfidence()); - suggestedRepliesListFormatted.add(suggestReplyFormatted); - } - - return suggestedRepliesListFormatted; - }); - } -} diff --git a/packages/ml-natural-language/android/src/main/java/io/invertase/firebase/ml/naturallanguage/UniversalFirebaseMLNaturalLanguageTranslateModule.java b/packages/ml-natural-language/android/src/main/java/io/invertase/firebase/ml/naturallanguage/UniversalFirebaseMLNaturalLanguageTranslateModule.java deleted file mode 100644 index 5377067c3ec..00000000000 --- a/packages/ml-natural-language/android/src/main/java/io/invertase/firebase/ml/naturallanguage/UniversalFirebaseMLNaturalLanguageTranslateModule.java +++ /dev/null @@ -1,158 +0,0 @@ -package io.invertase.firebase.ml.naturallanguage; - -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -import android.content.Context; -import io.invertase.firebase.common.UniversalFirebaseModule; - -@SuppressWarnings("WeakerAccess") -class UniversalFirebaseMLNaturalLanguageTranslateModule extends UniversalFirebaseModule { - UniversalFirebaseMLNaturalLanguageTranslateModule(Context context, String serviceName) { - super(context, serviceName); - } - - // TODO not available on iOS until SDK 6.0.0 -// /** -// * @url No reference documentation yet... -// */ -// public Task translate(String appName, String text, Bundle translationOptionsMap) { -// return Tasks.call(getExecutor(), () -> { -// FirebaseApp firebaseApp = FirebaseApp.getInstance(appName); -// FirebaseNaturalLanguage naturalLanguage = FirebaseNaturalLanguage.getInstance(firebaseApp); -// FirebaseTranslatorOptions translatorOptions = getOptions(translationOptionsMap); -// FirebaseTranslator translator = naturalLanguage.getTranslator(translatorOptions); -// return Tasks.await(translator.translate(text)); -// }); -// } -// -// /** -// * @url No reference documentation yet... -// */ -// public Task>> modelManagerGetAvailableModels(String appName) { -// return Tasks.call(getExecutor(), () -> { -// FirebaseApp firebaseApp = FirebaseApp.getInstance(appName); -// FirebaseTranslateModelManager translateModelManager = FirebaseTranslateModelManager.getInstance(); -// Set modelsRaw = Tasks.await(translateModelManager.getAvailableModels( -// firebaseApp)); -// -// List> modelsArray = new ArrayList<>(modelsRaw.size()); -// for (FirebaseTranslateRemoteModel modelRaw : modelsRaw) { -// Map modelMap = new HashMap<>(); -// modelMap.put("language", modelRaw.getLanguage()); -// modelMap.put("languageCode", modelRaw.getLanguageCode()); -// modelMap.put("backendModelName", modelRaw.getModelNameForBackend()); -// modelMap.put("persistUniqueModelName", modelRaw.getUniqueModelNameForPersist()); -// modelsArray.add(modelMap); -// } -// -// return modelsArray; -// }); -// } -// -// /** -// * @url No reference documentation yet... -// */ -// public Task modelManagerDeleteDownloadedModel(String appName, int language) { -// return Tasks.call(getExecutor(), () -> { -// FirebaseApp firebaseApp = FirebaseApp.getInstance(appName); -// FirebaseTranslateModelManager translateModelManager = FirebaseTranslateModelManager.getInstance(); -// FirebaseTranslateRemoteModel model = new FirebaseTranslateRemoteModel.Builder(language) -// .setFirebaseApp(firebaseApp) -// .build(); -// Tasks.await(translateModelManager.deleteDownloadedModel(model)); -// return null; -// }); -// } -// -// /** -// * @url No reference documentation yet... -// */ -// public Task modelManagerDownloadRemoteModelIfNeeded( -// String appName, -// int language, -// Bundle downloadConditionsBundle -// ) { -// return Tasks.call(getExecutor(), () -> { -// FirebaseApp firebaseApp = FirebaseApp.getInstance(appName); -// FirebaseTranslateModelManager translateModelManager = FirebaseTranslateModelManager.getInstance(); -// FirebaseModelDownloadConditions downloadConditions = getDownloadConditions( -// downloadConditionsBundle); -// FirebaseTranslateRemoteModel model = new FirebaseTranslateRemoteModel.Builder(language) -// .setDownloadConditions(downloadConditions) -// .setFirebaseApp(firebaseApp) -// .build(); -// Tasks.await(translateModelManager.downloadRemoteModelIfNeeded(model)); -// return null; -// }); -// } -// -// private FirebaseModelDownloadConditions getDownloadConditions(Bundle downloadConditionsBundle) { -// FirebaseModelDownloadConditions.Builder conditionsBuilder = new FirebaseModelDownloadConditions.Builder(); -// -// if (downloadConditionsBundle.containsKey("requireCharging") && downloadConditionsBundle.getBoolean( -// "requireCharging")) { -// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { -// conditionsBuilder.requireCharging(); -// } -// } -// -// if (downloadConditionsBundle.containsKey("requireDeviceIdle") && downloadConditionsBundle.getBoolean( -// "requireDeviceIdle")) { -// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { -// conditionsBuilder.requireDeviceIdle(); -// } -// } -// -// if (downloadConditionsBundle.containsKey("requireWifi") && downloadConditionsBundle.getBoolean( -// "requireWifi")) { -// conditionsBuilder.requireWifi(); -// } -// -// return conditionsBuilder.build(); -// } -// -// private FirebaseTranslatorOptions getOptions(Bundle translationOptionsBundle) { -// FirebaseTranslatorOptions.Builder optionsBuilder = new FirebaseTranslatorOptions.Builder(); -// -// if (translationOptionsBundle.containsKey("sourceLanguage")) { -// optionsBuilder.setSourceLanguage((int) ((double) translationOptionsBundle.get("sourceLanguage"))); -// } else { -// optionsBuilder.setSourceLanguage(FirebaseTranslateLanguage.EN); -// } -// -// if (translationOptionsBundle.containsKey("targetLanguage")) { -// optionsBuilder.setTargetLanguage((int) ((double) translationOptionsBundle.get("targetLanguage"))); -// } else { -// optionsBuilder.setTargetLanguage(FirebaseTranslateLanguage.EN); -// } -// -// return optionsBuilder.build(); -// } -// -// @Override -// public Map getConstants() { -// Map constantsMap = new HashMap<>(); -// Map languagesMap = new HashMap<>(); -// Set languages = FirebaseTranslateLanguage.getAllLanguages(); -// for (Integer language : languages) { -// languagesMap.put(FirebaseTranslateLanguage.languageCodeForLanguage(language), language); -// } -// constantsMap.put("TRANSLATE_LANGUAGES", languagesMap); -// return constantsMap; -// } -} diff --git a/packages/ml-natural-language/android/src/reactnative/AndroidManifest.xml b/packages/ml-natural-language/android/src/reactnative/AndroidManifest.xml deleted file mode 100644 index cc9b0e0efef..00000000000 --- a/packages/ml-natural-language/android/src/reactnative/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/packages/ml-natural-language/android/src/reactnative/java/io/invertase/firebase/ml/naturallanguage/RNFirebaseMLNaturalLanguageIdModule.java b/packages/ml-natural-language/android/src/reactnative/java/io/invertase/firebase/ml/naturallanguage/RNFirebaseMLNaturalLanguageIdModule.java deleted file mode 100644 index 0fdc2d31a7c..00000000000 --- a/packages/ml-natural-language/android/src/reactnative/java/io/invertase/firebase/ml/naturallanguage/RNFirebaseMLNaturalLanguageIdModule.java +++ /dev/null @@ -1,94 +0,0 @@ -package io.invertase.firebase.ml.naturallanguage; - -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -import com.facebook.react.bridge.Arguments; -import com.facebook.react.bridge.Promise; -import com.facebook.react.bridge.ReactApplicationContext; -import com.facebook.react.bridge.ReactMethod; -import com.facebook.react.bridge.ReadableMap; - -import java.util.Objects; - -import io.invertase.firebase.common.ReactNativeFirebaseModule; - -class RNFirebaseMLNaturalLanguageIdModule extends ReactNativeFirebaseModule { - private static final String SERVICE_NAME = "MLNaturalLanguageId"; - private final UniversalFirebaseMLNaturalLanguageIdModule module; - - RNFirebaseMLNaturalLanguageIdModule(ReactApplicationContext reactContext) { - super(reactContext, SERVICE_NAME); - this.module = new UniversalFirebaseMLNaturalLanguageIdModule(reactContext, SERVICE_NAME); - } - - /** - * @url https://firebase.google.com/docs/reference/android/com/google/firebase/ml/naturallanguage/languageid/FirebaseLanguageIdentification.html#identifyLanguage(java.lang.String) - */ - @ReactMethod - public void identifyLanguage( - String appName, - String text, - ReadableMap identificationOptionsMap, - Promise promise - ) { - module - .identifyLanguage(appName, text, Arguments.toBundle(identificationOptionsMap)) - .addOnCompleteListener(task -> { - if (task.isSuccessful()) { - promise.resolve(task.getResult()); - } else { - String[] errorCodeAndMessage = UniversalFirebaseMLNaturalLanguageCommon.getErrorCodeAndMessageFromException( - task.getException()); - rejectPromiseWithCodeAndMessage( - promise, - errorCodeAndMessage[0], - errorCodeAndMessage[1], - errorCodeAndMessage[2] - ); - } - }); - } - - /** - * @url https://firebase.google.com/docs/reference/android/com/google/firebase/ml/naturallanguage/languageid/FirebaseLanguageIdentification.html#identifyPossibleLanguages(java.lang.String) - */ - @ReactMethod - public void identifyPossibleLanguages( - String appName, - String text, - ReadableMap identificationOptionsMap, - Promise promise - ) { - module - .identifyPossibleLanguages(appName, text, Arguments.toBundle(identificationOptionsMap)) - .addOnCompleteListener(task -> { - if (task.isSuccessful()) { - promise.resolve(Arguments.fromList(Objects.requireNonNull(task.getResult()))); - } else { - String[] errorCodeAndMessage = UniversalFirebaseMLNaturalLanguageCommon.getErrorCodeAndMessageFromException( - task.getException()); - rejectPromiseWithCodeAndMessage( - promise, - errorCodeAndMessage[0], - errorCodeAndMessage[1], - errorCodeAndMessage[2] - ); - } - }); - } -} diff --git a/packages/ml-natural-language/android/src/reactnative/java/io/invertase/firebase/ml/naturallanguage/RNFirebaseMLNaturalLanguageSmartReplyModule.java b/packages/ml-natural-language/android/src/reactnative/java/io/invertase/firebase/ml/naturallanguage/RNFirebaseMLNaturalLanguageSmartReplyModule.java deleted file mode 100644 index 0b3405ce742..00000000000 --- a/packages/ml-natural-language/android/src/reactnative/java/io/invertase/firebase/ml/naturallanguage/RNFirebaseMLNaturalLanguageSmartReplyModule.java +++ /dev/null @@ -1,65 +0,0 @@ -package io.invertase.firebase.ml.naturallanguage; - -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -import com.facebook.react.bridge.*; -import io.invertase.firebase.common.ReactNativeFirebaseModule; - -import java.util.Objects; - -class RNFirebaseMLNaturalLanguageSmartReplyModule extends ReactNativeFirebaseModule { - private static final String SERVICE_NAME = "MLNaturalLanguageSmartReply"; - private final UniversalFirebaseMLNaturalLanguageSmartReplyModule module; - - RNFirebaseMLNaturalLanguageSmartReplyModule(ReactApplicationContext reactContext) { - super(reactContext, SERVICE_NAME); - this.module = new UniversalFirebaseMLNaturalLanguageSmartReplyModule( - reactContext, - SERVICE_NAME - ); - } - - @Override - public void onCatalystInstanceDestroy() { - super.onCatalystInstanceDestroy(); - module.onTearDown(); - } - - /** - * @url https://firebase.google.com/docs/reference/android/com/google/firebase/ml/naturallanguage/smartreply/FirebaseSmartReply.html#public-tasksmartreplysuggestionresultsuggestreplieslistfirebasetextmessage-textmessages - */ - @ReactMethod - public void suggestReplies(String appName, ReadableArray messages, Promise promise) { - module - .suggestReplies(appName, messages.toArrayList()) - .addOnCompleteListener(getExecutor(), task -> { - if (task.isSuccessful()) { - promise.resolve(Arguments.fromList(Objects.requireNonNull(task.getResult()))); - } else { - String[] errorCodeAndMessage = UniversalFirebaseMLNaturalLanguageCommon.getErrorCodeAndMessageFromException( - task.getException()); - rejectPromiseWithCodeAndMessage( - promise, - errorCodeAndMessage[0], - errorCodeAndMessage[1], - errorCodeAndMessage[2] - ); - } - }); - } -} diff --git a/packages/ml-natural-language/android/src/reactnative/java/io/invertase/firebase/ml/naturallanguage/RNFirebaseMLNaturalLanguageTranslateModule.java b/packages/ml-natural-language/android/src/reactnative/java/io/invertase/firebase/ml/naturallanguage/RNFirebaseMLNaturalLanguageTranslateModule.java deleted file mode 100644 index b81b861a47d..00000000000 --- a/packages/ml-natural-language/android/src/reactnative/java/io/invertase/firebase/ml/naturallanguage/RNFirebaseMLNaturalLanguageTranslateModule.java +++ /dev/null @@ -1,137 +0,0 @@ -package io.invertase.firebase.ml.naturallanguage; - -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -import com.facebook.react.bridge.ReactApplicationContext; -import io.invertase.firebase.common.ReactNativeFirebaseModule; - -class RNFirebaseMLNaturalLanguageTranslateModule extends ReactNativeFirebaseModule { - private static final String SERVICE_NAME = "MLNaturalLanguageTranslate"; - private final UniversalFirebaseMLNaturalLanguageTranslateModule module; - - RNFirebaseMLNaturalLanguageTranslateModule(ReactApplicationContext reactContext) { - super(reactContext, SERVICE_NAME); - this.module = new UniversalFirebaseMLNaturalLanguageTranslateModule(reactContext, SERVICE_NAME); - } - -// TODO not available on iOS until SDK 6.0.0 - -// /** -// * @url No reference documentation yet... -// */ -// @ReactMethod -// public void translate( -// String appName, -// String text, -// ReadableMap translationOptionsMap, -// Promise promise -// ) { -// module -// .translate(appName, text, Arguments.toBundle(translationOptionsMap)) -// .addOnCompleteListener(task -> { -// if (task.isSuccessful()) { -// promise.resolve(task.getResult()); -// } else { -// String[] errorCodeAndMessage = UniversalFirebaseMLNaturalLanguageCommon.getErrorCodeAndMessageFromException( -// task.getException()); -// rejectPromiseWithCodeAndMessage( -// promise, -// errorCodeAndMessage[0], -// errorCodeAndMessage[1], -// errorCodeAndMessage[2] -// ); -// } -// }); -// } -// -// /** -// * @url No reference documentation yet... -// */ -// @ReactMethod -// public void modelManagerGetAvailableModels(String appName, Promise promise) { -// module.modelManagerGetAvailableModels(appName).addOnCompleteListener(task -> { -// if (task.isSuccessful()) { -// promise.resolve(Arguments.fromList(Objects.requireNonNull(task.getResult()))); -// } else { -// String[] errorCodeAndMessage = UniversalFirebaseMLNaturalLanguageCommon.getErrorCodeAndMessageFromException( -// task.getException()); -// rejectPromiseWithCodeAndMessage( -// promise, -// errorCodeAndMessage[0], -// errorCodeAndMessage[1], -// errorCodeAndMessage[2] -// ); -// } -// }); -// } -// -// /** -// * @url No reference documentation yet... -// */ -// @ReactMethod -// public void modelManagerDeleteDownloadedModel(String appName, int language, Promise promise) { -// module.modelManagerDeleteDownloadedModel(appName, language).addOnCompleteListener(task -> { -// if (task.isSuccessful()) { -// promise.resolve(task.getResult()); -// } else { -// String[] errorCodeAndMessage = UniversalFirebaseMLNaturalLanguageCommon.getErrorCodeAndMessageFromException( -// task.getException()); -// rejectPromiseWithCodeAndMessage( -// promise, -// errorCodeAndMessage[0], -// errorCodeAndMessage[1], -// errorCodeAndMessage[2] -// ); -// } -// }); -// } -// -// /** -// * @url No reference documentation yet... -// */ -// @ReactMethod -// public void modelManagerDownloadRemoteModelIfNeeded( -// String appName, -// int language, -// ReadableMap downloadConditionsMap, -// Promise promise -// ) { -// module -// .modelManagerDownloadRemoteModelIfNeeded(appName, language, Arguments.toBundle(downloadConditionsMap)) -// .addOnCompleteListener(task -> { -// if (task.isSuccessful()) { -// promise.resolve(task.getResult()); -// } else { -// String[] errorCodeAndMessage = UniversalFirebaseMLNaturalLanguageCommon.getErrorCodeAndMessageFromException( -// task.getException()); -// rejectPromiseWithCodeAndMessage( -// promise, -// errorCodeAndMessage[0], -// errorCodeAndMessage[1], -// errorCodeAndMessage[2] -// ); -// } -// }); -// } -// -// -// @Override -// public Map getConstants() { -// return module.getConstants(); -// } -} diff --git a/packages/ml-natural-language/e2e/languageId.e2e.js b/packages/ml-natural-language/e2e/languageId.e2e.js deleted file mode 100644 index ae7c8002aa4..00000000000 --- a/packages/ml-natural-language/e2e/languageId.e2e.js +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -describe('naturalLanguage() -> Language ID', () => { - describe('identifyLanguage()', () => { - it('returns a string of the identified language', async () => { - const languageDe = await firebase.naturalLanguage().identifyLanguage('Hallo welt'); - const languageEn = await firebase.naturalLanguage().identifyLanguage('Hello world'); - const languageFr = await firebase.naturalLanguage().identifyLanguage('Bonjour le monde'); - should.equal(languageDe, 'de'); - should.equal(languageEn, 'en'); - should.equal(languageFr, 'fr'); - }); - - it('accepts a `confidenceThreshold` option', async () => { - const languageDeDefault = await firebase.naturalLanguage().identifyLanguage('Hallo'); - const languageDeLowConfidence = await firebase.naturalLanguage().identifyLanguage('Hallo', { - confidenceThreshold: 0.2, - }); - should.equal(languageDeDefault, 'und'); - should.equal(languageDeLowConfidence, 'de'); - }); - - it('throws an error if text is not a string', async () => { - try { - firebase.naturalLanguage().identifyLanguage(false); - return Promise.reject(new Error('Did not throw')); - } catch (e) { - e.message.should.containEql('must be a string value'); - return Promise.resolve(); - } - }); - - it('throws an error if options is not an object', async () => { - try { - firebase.naturalLanguage().identifyLanguage('hello', false); - return Promise.reject(new Error('Did not throw')); - } catch (e) { - e.message.should.containEql('must be an object'); - return Promise.resolve(); - } - }); - - it('throws an error if options.confidenceThreshold is not a float value', async () => { - try { - firebase.naturalLanguage().identifyLanguage('hello', { confidenceThreshold: 'boop' }); - return Promise.reject(new Error('Did not throw')); - } catch (e) { - e.message.should.containEql('must be a float value between 0 and 1'); - return Promise.resolve(); - } - }); - - it('throws an error if options.confidenceThreshold is greater than 1', async () => { - try { - firebase.naturalLanguage().identifyLanguage('hello', { confidenceThreshold: 1.2 }); - return Promise.reject(new Error('Did not throw')); - } catch (e) { - e.message.should.containEql('must be a float value between 0 and 1'); - return Promise.resolve(); - } - }); - - it('throws an error if options.confidenceThreshold is less than 0', async () => { - try { - firebase.naturalLanguage().identifyLanguage('hello', { confidenceThreshold: -1.2 }); - return Promise.reject(new Error('Did not throw')); - } catch (e) { - e.message.should.containEql('must be a float value between 0 and 1'); - return Promise.resolve(); - } - }); - }); - - describe('identifyPossibleLanguages()', () => { - it('returns an array of the identified languages and their confidence', async () => { - const languages = await firebase.naturalLanguage().identifyPossibleLanguages('hello'); - languages.should.be.an.Array(); - languages.length.should.be.greaterThan(3); - languages[0].language.should.equal('en'); - languages[0].confidence.should.be.a.Number(); - languages[0].confidence.should.be.greaterThan(0.7); - }); - - it('accepts a `confidenceThreshold` option', async () => { - const languages = await firebase.naturalLanguage().identifyPossibleLanguages('hello', { - confidenceThreshold: 0.7, - }); - languages.should.be.an.Array(); - languages.length.should.equal(1); - languages[0].language.should.equal('en'); - languages[0].confidence.should.be.a.Number(); - languages[0].confidence.should.be.greaterThan(0.7); - }); - // arg validation not required, uses same validator as identifyLanguage - }); -}); diff --git a/packages/ml-natural-language/e2e/mlKitLanguage.e2e.js b/packages/ml-natural-language/e2e/mlKitLanguage.e2e.js deleted file mode 100644 index 7a10484e3ab..00000000000 --- a/packages/ml-natural-language/e2e/mlKitLanguage.e2e.js +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -describe('naturalLanguage()', () => { - describe('namespace', () => { - it('accessible from firebase.app()', () => { - const app = firebase.app(); - should.exist(app.naturalLanguage); - app.naturalLanguage().app.should.equal(app); - }); - - it('supports multiple apps', async () => { - firebase.naturalLanguage().app.name.should.equal('[DEFAULT]'); - firebase - .naturalLanguage(firebase.app('secondaryFromNative')) - .app.name.should.equal('secondaryFromNative'); - - firebase - .app('secondaryFromNative') - .naturalLanguage() - .app.name.should.equal('secondaryFromNative'); - }); - - it('throws an error if language id native module does not exist', async () => { - const method = firebase.naturalLanguage().native.identifyLanguage; - firebase.naturalLanguage()._nativeModule = Object.assign( - {}, - firebase.naturalLanguage()._nativeModule, - ); - delete firebase.naturalLanguage()._nativeModule.identifyLanguage; - try { - firebase.naturalLanguage().identifyLanguage(); - return Promise.reject(new Error('Did not throw')); - } catch (e) { - e.message.should.containEql( - "You attempted to use an optional API that's not enabled natively", - ); - e.message.should.containEql('Language Identification'); - firebase.naturalLanguage()._nativeModule.identifyLanguage = method; - Object.freeze(firebase.naturalLanguage()._nativeModule); - return Promise.resolve(); - } - }); - - xit('throws an error if smart replies native module does not exist', async () => { - const method = firebase.naturalLanguage().native.getSuggestedReplies; - firebase.naturalLanguage()._nativeModule = Object.assign( - {}, - firebase.naturalLanguage()._nativeModule, - ); - delete firebase.naturalLanguage()._nativeModule.getSuggestedReplies; - try { - firebase.naturalLanguage().newSmartReplyConversation(); - return Promise.reject(new Error('Did not throw')); - } catch (e) { - e.message.should.containEql( - "You attempted to use an optional API that's not enabled natively", - ); - e.message.should.containEql('Smart Replies'); - firebase.naturalLanguage()._nativeModule.getSuggestedReplies = method; - Object.freeze(firebase.naturalLanguage()._nativeModule); - return Promise.resolve(); - } - }); - }); -}); diff --git a/packages/ml-natural-language/e2e/smartReply.e2e.js b/packages/ml-natural-language/e2e/smartReply.e2e.js deleted file mode 100644 index 061d8b64748..00000000000 --- a/packages/ml-natural-language/e2e/smartReply.e2e.js +++ /dev/null @@ -1,197 +0,0 @@ -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -describe('naturalLanguage() -> Smart Replies', () => { - describe('suggestReplies()', () => { - it('throws if messages is not an array', () => { - try { - firebase.naturalLanguage().suggestReplies({}); - return Promise.reject(new Error('Did not throw')); - } catch (e) { - e.message.should.containEql("'messages' must be an array value"); - return Promise.resolve(); - } - }); - - it('resolves an empty array if empty array if provided', async () => { - const replies = await firebase.naturalLanguage().suggestReplies([]); - replies.should.be.Array(); - replies.length.should.eql(0); - }); - - it('returns suggested replies', async () => { - const replies = await firebase.naturalLanguage().suggestReplies([ - { text: 'We should catchup some time!' }, - { text: 'I know right, it has been a while..', userId: 'invertase', isLocalUser: false }, - { text: 'Lets meet up!' }, - { - text: 'Definitely, how about we go for lunch this week?', - userId: 'invertase', - isLocalUser: false, - }, - ]); - - replies.should.be.Array(); - replies.length.should.equal(3); - - replies.forEach($ => { - $.text.should.be.String(); - $.text.length.should.be.greaterThan(0); - }); - - const replies2 = await firebase - .naturalLanguage() - .suggestReplies([ - { text: replies[0].text }, - { text: 'Great, does Friday work for you?', userId: 'invertase', isLocalUser: false }, - ]); - - replies2[0].text.should.be.String(); - replies2[0].text.length.should.be.greaterThan(0); - }); - - describe('TextMessage', () => { - it('throws if message is not an object', () => { - try { - firebase.naturalLanguage().suggestReplies([123]); - return Promise.reject(new Error('Did not throw')); - } catch (e) { - e.message.should.containEql("'textMessage' expected an object value"); - return Promise.resolve(); - } - }); - - describe('.text', () => { - it('throws if text option not provided', () => { - try { - firebase.naturalLanguage().suggestReplies([{}]); - return Promise.reject(new Error('Did not throw')); - } catch (e) { - e.message.should.containEql("'textMessage.text' expected a string value"); - return Promise.resolve(); - } - }); - - it('throws if text option is not a string', () => { - try { - firebase.naturalLanguage().suggestReplies([{ text: 123 }]); - return Promise.reject(new Error('Did not throw')); - } catch (e) { - e.message.should.containEql("'textMessage.text' expected a string value"); - return Promise.resolve(); - } - }); - - it('throws if text length is zero', () => { - try { - firebase.naturalLanguage().suggestReplies([{ text: '' }]); - return Promise.reject(new Error('Did not throw')); - } catch (e) { - e.message.should.containEql("'textMessage.text' expected string value to not be empty"); - return Promise.resolve(); - } - }); - }); - - describe('.userId', () => { - it('throws if local user true and id provided', () => { - try { - firebase.naturalLanguage().suggestReplies([{ text: 'foo', userId: 'bar' }]); - return Promise.reject(new Error('Did not throw')); - } catch (e) { - e.message.should.containEql( - "'textMessage.userId' expected 'textMessage.isLocalUser' to be false when setting a user ID", - ); - return Promise.resolve(); - } - }); - - it('throws if text userId not provided', () => { - try { - firebase.naturalLanguage().suggestReplies([{ text: 'foo', isLocalUser: false }]); - return Promise.reject(new Error('Did not throw')); - } catch (e) { - e.message.should.containEql("'textMessage.userId' expected a string value"); - return Promise.resolve(); - } - }); - - it('throws if userId option is not a string', () => { - try { - firebase - .naturalLanguage() - .suggestReplies([{ text: 'foo', isLocalUser: false, userId: 123 }]); - return Promise.reject(new Error('Did not throw')); - } catch (e) { - e.message.should.containEql("'textMessage.userId' expected a string value"); - return Promise.resolve(); - } - }); - - it('throws if userId length is zero', () => { - try { - firebase - .naturalLanguage() - .suggestReplies([{ text: 'foo', isLocalUser: false, userId: '' }]); - return Promise.reject(new Error('Did not throw')); - } catch (e) { - e.message.should.containEql( - "'textMessage.userId' expected string value to not be empty", - ); - return Promise.resolve(); - } - }); - - it('sets a user id', () => { - firebase - .naturalLanguage() - .suggestReplies([{ text: 'foo', isLocalUser: false, userId: 'bar' }]); - }); - }); - - describe('.timestamp', () => { - it('throws if timestamp is not a number', () => { - try { - firebase.naturalLanguage().suggestReplies([{ text: 'foo', timestamp: 'baz' }]); - return Promise.reject(new Error('Did not throw')); - } catch (e) { - e.message.should.containEql("'textMessage.timestamp' expected number value"); - return Promise.resolve(); - } - }); - - it('sets a timestamp', () => { - firebase.naturalLanguage().suggestReplies([{ text: 'foo', timestamp: Date.now() + 123 }]); - }); - }); - - describe('.isLocalUser', () => { - it('throws if isLocalUser is not a boolean', () => { - try { - firebase - .naturalLanguage() - .suggestReplies([{ text: 'foo', userId: 'bar', isLocalUser: 'baz' }]); - return Promise.reject(new Error('Did not throw')); - } catch (e) { - e.message.should.containEql("'textMessage.isLocalUser' expected boolean value"); - return Promise.resolve(); - } - }); - }); - }); - }); -}); diff --git a/packages/ml-natural-language/e2e/translate.e2e.js b/packages/ml-natural-language/e2e/translate.e2e.js deleted file mode 100644 index 71b19bf61f1..00000000000 --- a/packages/ml-natural-language/e2e/translate.e2e.js +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -// TODO not available on iOS until SDK 6.0.0 -// xdescribe('naturalLanguage() -> Translate', () => { -// before(async () => { -// await firebase.naturalLanguage().translateModelManager.downloadRemoteModelIfNeeded('de'); -// }); -// -// describe('translate()', () => { -// it('translates test from the specified sourceLanguage to targetLanguage', async () => { -// const translatedText = await firebase -// .naturalLanguage() -// .translate('Hello world', { sourceLanguage: 'en', targetLanguage: 'de' }); -// translatedText.should.equal('Hallo Welt'); -// }); -// }); -// -// describe('translateModelManager()', () => { -// it('returns a new instance of TranslateModelManager', async () => { -// const { translateModelManager } = firebase.naturalLanguage(); -// translateModelManager.should.be.instanceOf( -// jet.require('packages/ml-natural-language/lib/TranslateModelManager'), -// ); -// }); -// }); -// -// describe('TranslateModelManager', () => { -// describe('downloadRemoteModelIfNeeded()', () => { -// it('downloads the specified language model', async () => { -// const { translateModelManager } = firebase.naturalLanguage(); -// await translateModelManager.downloadRemoteModelIfNeeded('de'); -// }); -// }); -// }); -// }); diff --git a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RCTConvert+FIRLanguageIdentificationOptions.h b/packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RCTConvert+FIRLanguageIdentificationOptions.h deleted file mode 100644 index b6b6eb1a56a..00000000000 --- a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RCTConvert+FIRLanguageIdentificationOptions.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#import -#import - -@interface RCTConvert (FIRLanguageIdentificationOptions) -#if __has_include() - -+ (FIRLanguageIdentificationOptions *)firLanguageIdOptionsFromDict:(NSDictionary *)options; - -#endif -@end diff --git a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RCTConvert+FIRLanguageIdentificationOptions.m b/packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RCTConvert+FIRLanguageIdentificationOptions.m deleted file mode 100644 index 04bab8bdcbf..00000000000 --- a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RCTConvert+FIRLanguageIdentificationOptions.m +++ /dev/null @@ -1,38 +0,0 @@ -/** - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#import "RCTConvert+FIRLanguageIdentificationOptions.h" - -@implementation RCTConvert (FIRApp) -#if __has_include() - -+ (FIRLanguageIdentificationOptions *)firLanguageIdOptionsFromDict:(NSDictionary *)options { - if (options[@"confidenceThreshold"] == nil) { - if (options[@"multipleLanguages"] != nil) { - return [[FIRLanguageIdentificationOptions alloc] initWithConfidenceThreshold:FIRDefaultIdentifyPossibleLanguagesConfidenceThreshold]; - } else { - return [[FIRLanguageIdentificationOptions alloc] initWithConfidenceThreshold:FIRDefaultIdentifyLanguageConfidenceThreshold]; - } - } - - float confidenceThreshold = [options[@"confidenceThreshold"] floatValue]; - return [[FIRLanguageIdentificationOptions alloc] initWithConfidenceThreshold:confidenceThreshold]; -} - -RCT_CUSTOM_CONVERTER(FIRLanguageIdentificationOptions *, FIRLanguageIdentificationOptions, [self firLanguageIdOptionsFromDict:[self NSDictionary:json]]); -#endif -@end diff --git a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RCTConvert+FIRTextMessageArray.h b/packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RCTConvert+FIRTextMessageArray.h deleted file mode 100644 index 406e0c24b47..00000000000 --- a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RCTConvert+FIRTextMessageArray.h +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#import - -#import - -@interface RCTConvert (FIRTextMessageArray) -#if __has_include() -+ (FIRTextMessage *)FIRTextMessage:(id)json; -#endif -@end diff --git a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RCTConvert+FIRTextMessageArray.m b/packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RCTConvert+FIRTextMessageArray.m deleted file mode 100644 index 3641b77004e..00000000000 --- a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RCTConvert+FIRTextMessageArray.m +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#import "RCTConvert+FIRTextMessageArray.h" - -@implementation RCTConvert (FIRTextMessageArray) -#if __has_include() -+ (FIRTextMessage *)FIRTextMessage:(id)json { - NSDictionary *messageDict = [self NSDictionary:json]; - FIRTextMessage *firTextMessage = [ - [FIRTextMessage alloc] - initWithText:messageDict[@"text"] - timestamp:[[messageDict valueForKey:@"timestamp"] doubleValue] - userID:messageDict[@"userId"] ? messageDict[@"userId"] : @"" - isLocalUser:messageDict[@"isLocalUser"] ? YES : NO - ]; - return firTextMessage; -} - -RCT_ARRAY_CONVERTER(FIRTextMessage) -#endif -@end diff --git a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RNFBMLNaturalLanguageIdModule.m b/packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RNFBMLNaturalLanguageIdModule.m deleted file mode 100644 index 5c129d16a86..00000000000 --- a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RNFBMLNaturalLanguageIdModule.m +++ /dev/null @@ -1,95 +0,0 @@ -/** - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#import "RNFBMLNaturalLanguageIdModule.h" -#if __has_include() - -#import -#import "RNFBSharedUtils.h" - - -#define DEPENDENCY_EXISTS=1 -#endif - - -@implementation RNFBMLNaturalLanguageIdModule -#pragma mark - -#pragma mark Module Setup - -RCT_EXPORT_MODULE(); - -#pragma mark - -#pragma mark Firebase Mlkit Language Id Methods - -#ifdef DEPENDENCY_EXISTS - -RCT_EXPORT_METHOD(identifyLanguage: - (FIRApp *) firebaseApp - : (NSString *)text - : (FIRLanguageIdentificationOptions *)identificationOptions - : (RCTPromiseResolveBlock)resolve - : (RCTPromiseRejectBlock)reject -) { - FIRNaturalLanguage *nL = [FIRNaturalLanguage naturalLanguageForApp:firebaseApp]; - FIRLanguageIdentification *languageId = [nL languageIdentificationWithOptions:identificationOptions]; - FIRIdentifyLanguageCallback completion = ^(NSString *_Nullable languageCode, NSError *_Nullable error) { - if (error != nil) { - [self promiseRejectMLKitException:reject error:error]; - } else { - resolve(languageCode); - } - }; - [languageId identifyLanguageForText:text completion:completion]; -} - -RCT_EXPORT_METHOD(identifyPossibleLanguages: - (FIRApp *) firebaseApp - : (NSString *)text - : (FIRLanguageIdentificationOptions *)identificationOptions - : (RCTPromiseResolveBlock)resolve - : (RCTPromiseRejectBlock)reject -) { - FIRNaturalLanguage *nL = [FIRNaturalLanguage naturalLanguageForApp:firebaseApp]; - FIRLanguageIdentification *languageId = [nL languageIdentificationWithOptions:identificationOptions]; - FIRIdentifyPossibleLanguagesCallback completion = ^(NSArray *identifiedLanguages, NSError *error) { - if (error != nil) { - [self promiseRejectMLKitException:reject error:error]; - } else { - NSMutableArray *languages = [[NSMutableArray alloc] initWithCapacity:identifiedLanguages.count]; - for (FIRIdentifiedLanguage *identifiedLanguage in identifiedLanguages) { - [languages addObject:@{ - @"language": identifiedLanguage.languageCode, - @"confidence": @(identifiedLanguage.confidence) - }]; - } - resolve(languages); - } - }; - [languageId identifyPossibleLanguagesForText:text completion:completion]; -} - -- (void)promiseRejectMLKitException:(RCTPromiseRejectBlock)reject error:(NSError *)error { - // TODO no way to distinguish between the error codes like Android supports - [RNFBSharedUtils rejectPromiseWithUserInfo:reject userInfo:(NSMutableDictionary *) @{ - @"code": @"unknown", - @"message": [error localizedDescription], - }]; -} - -#endif - -@end diff --git a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RNFBMLNaturalLanguageSmartReplyModule.h b/packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RNFBMLNaturalLanguageSmartReplyModule.h deleted file mode 100644 index b6a0510774e..00000000000 --- a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RNFBMLNaturalLanguageSmartReplyModule.h +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#import - -#import - -@interface RNFBMLNaturalLanguageSmartReplyModule : NSObject - -@end diff --git a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RNFBMLNaturalLanguageSmartReplyModule.m b/packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RNFBMLNaturalLanguageSmartReplyModule.m deleted file mode 100644 index 9fb79b90bf9..00000000000 --- a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RNFBMLNaturalLanguageSmartReplyModule.m +++ /dev/null @@ -1,81 +0,0 @@ -/** - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#import "RNFBMLNaturalLanguageSmartReplyModule.h" - -#if __has_include() -#import -#import "RNFBSharedUtils.h" -#define DEPENDENCY_EXISTS=1 -#endif - -@implementation RNFBMLNaturalLanguageSmartReplyModule -#pragma mark - -#pragma mark Module Setup - -RCT_EXPORT_MODULE(); - -#pragma mark - -#pragma mark Firebase Mlkit Smart Reply Methods - -#ifdef DEPENDENCY_EXISTS -RCT_EXPORT_METHOD(suggestReplies: - (FIRApp *) firebaseApp - : (NSArray *)messages - : (RCTPromiseResolveBlock)resolve - : (RCTPromiseRejectBlock)reject -) { - FIRNaturalLanguage *naturalLanguage = [FIRNaturalLanguage naturalLanguage]; - FIRSmartReply *smartReply = [naturalLanguage smartReply]; - - FIRSmartReplyCallback completion = ^( - FIRSmartReplySuggestionResult *_Nullable result, - NSError *_Nullable error - ) { - if (error != nil) { - [self promiseRejectMLKitException:reject error:error]; - return; - } - - if (result.status == FIRSmartReplyResultStatusSuccess) { - NSMutableArray *smartReplies = [[NSMutableArray alloc] initWithCapacity:result.suggestions.count]; - - for (FIRSmartReplySuggestion *suggestion in result.suggestions) { - NSMutableDictionary *smartReplyDict = [NSMutableDictionary dictionary]; - smartReplyDict[@"text"] = suggestion.text; - [smartReplies addObject:smartReplyDict]; - } - - resolve(smartReplies); - } else { - resolve(@[]); - } - }; - - [smartReply suggestRepliesForMessages:messages completion:completion]; -} - -- (void)promiseRejectMLKitException:(RCTPromiseRejectBlock)reject error:(NSError *)error { - // TODO no way to distinguish between the error codes like Android supports - [RNFBSharedUtils rejectPromiseWithUserInfo:reject userInfo:(NSMutableDictionary *) @{ - @"code": @"unknown", - @"message": [error localizedDescription], - }]; -} -#endif - -@end diff --git a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RNFBMLNaturalLanguageTranslateModule.h b/packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RNFBMLNaturalLanguageTranslateModule.h deleted file mode 100644 index d17b0c0dcbe..00000000000 --- a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RNFBMLNaturalLanguageTranslateModule.h +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -// TODO not supported until SDK 6.0.0 -// -//#import -//#import -// -//@interface RNFBMLNaturalLanguageTranslateModule : NSObject -//@end diff --git a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RNFBMLNaturalLanguageTranslateModule.m b/packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RNFBMLNaturalLanguageTranslateModule.m deleted file mode 100644 index 840d5c22cb2..00000000000 --- a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RNFBMLNaturalLanguageTranslateModule.m +++ /dev/null @@ -1,37 +0,0 @@ -/** - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -// TODO not supported until SDK 6.0.0 -// -// -//#import -//#import "RNFBMLNaturalLanguageTranslateModule.h" -// -// -//@implementation RNFBMLNaturalLanguageTranslateModule -//#pragma mark - -//#pragma mark Module Setup -// -//RCT_EXPORT_MODULE(); -// -//- (dispatch_queue_t)methodQueue { -// return dispatch_get_main_queue(); -//} -// -//#pragma mark - -//#pragma mark Firebase Mlkit Translate Methods -//@end diff --git a/packages/ml-natural-language/lib/TranslateModelManager.js b/packages/ml-natural-language/lib/TranslateModelManager.js deleted file mode 100644 index cd3f731ceb0..00000000000 --- a/packages/ml-natural-language/lib/TranslateModelManager.js +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -// TODO not available on iOS until SDK 6.0.0 -// export default class TranslateModelManager { -// constructor(ml) { -// this.ml = ml; -// } -// -// downloadRemoteModelIfNeeded(language, downloadConditions = {}) { -// // TODO(salakar) arg validation + tests -// // downloadConditions: -// // requireCharging -// // requireDeviceIdle -// // requireDeviceIdle -// const languageId = this.ml.native.TRANSLATE_LANGUAGES[language]; -// return this.ml.native.modelManagerDownloadRemoteModelIfNeeded(languageId, downloadConditions); -// } -// -// // TODO no ios support until SDK v6.0.0 -// deleteDownloadedModel(language) { -// return this.ml.native.modelManagerDeleteDownloadedModel(language); -// } -// -// getAvailableModels() { -// return this.ml.native.modelManagerGetAvailableModels(); -// } -// } diff --git a/packages/ml-natural-language/lib/index.d.ts b/packages/ml-natural-language/lib/index.d.ts deleted file mode 100644 index ef4e4e12e67..00000000000 --- a/packages/ml-natural-language/lib/index.d.ts +++ /dev/null @@ -1,271 +0,0 @@ -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -import { ReactNativeFirebase } from '@react-native-firebase/app'; - -/** - * Firebase ML Kit package for React Native. - * - * #### Example 1 - * - * Access the firebase export from the `naturalLanguage` package: - * - * ```js - * import { firebase } from '@react-native-firebase/ml-natural-language'; - * - * // firebase.naturalLanguage().X - * ``` - * - * #### Example 2 - * - * Using the default export from the `naturalLanguage` package: - * - * ```js - * import naturalLanguage from '@react-native-firebase/ml-natural-language'; - * - * // naturalLanguage().X - * ``` - * - * #### Example 3 - * - * Using the default export from the `app` package: - * - * ```js - * import firebase from '@react-native-firebase/app'; - * import '@react-native-firebase/ml-natural-language'; - * - * // firebase.naturalLanguage().X - * ``` - * - * @firebase ml-natural-language - */ -export namespace FirebaseLanguageTypes { - import FirebaseModule = ReactNativeFirebase.FirebaseModule; - - // eslint-disable-next-line @typescript-eslint/no-empty-interface - export interface Statics {} - - /** - * An interface representing the language identification options to be used with the - * `identifyLanguage` and `identifyPossibleLanguages` methods. - */ - export interface LanguageIdentificationOptions { - /** - * The confidence threshold for language identification. The identified languages will have a - * confidence higher or equal to the confidence threshold. The value should be between 0 and 1, e.g. 0.5. - * - * If no value is set, a default value is used instead. - * - */ - confidenceThreshold?: number; - } - - /** - * An identified language for the given input text. Returned as an Array of IdentifiedLanguage from - * `identifyPossibleLanguages`. - */ - export interface IdentifiedLanguage { - /** - * The [BCP-47 language code](https://en.wikipedia.org/wiki/IETF_language_tag) for the language, e.g. 'en'. - */ - language: string; - - /** - * The confidence score of the language. A float value between 0 and 1. - */ - confidence: number; - } - - /** - * An interface representing a suggested reply, an array of these are returned from `suggestReplies`. - * - * #### Example - * - * ```js - * const replies = await firebase.naturalLanguage().suggestReplies([ - * { text: "Hey, long time no speak!", }, - * { text: 'I know right, it has been a while..', userId: 'xxxx', isLocalUser: false }, - * { text: 'We should catchup some time!', }, - * { text: 'Definitely, how about we go for lunch this week?', userId: 'xxxx', isLocalUser: false }, - * ]); - * - * replies.forEach(reply => { - * console.log(reply.text); - * }); - * - * ``` - * - */ - export interface SuggestedReply { - /** - * The smart reply text. - */ - text: string; - } - - /** - * The Firebase ML Kit service interface. - * - * > This module is available for the default app only. - * - * #### Example - * - * Get the ML Kit service for the default app: - * - * ```js - * const defaultAppMLKit = firebase.naturalLanguage(); - * ``` - */ - export class Module extends FirebaseModule { - /** - * Identifies the main language for the given text. - * - * Returns a promise that resolves with a [BCP-47 language code](https://en.wikipedia.org/wiki/IETF_language_tag) of the detected language. - * - * If the language was undetected or unknown the code returned is `und`. - * - * #### Example - * - * ```js - * const language = await firebase.naturalLanguage().identifyLanguage('Hello there. General Kenobi.'); - * console.warn(language); // en - * - * const unknownLanguage = await firebase.naturalLanguage().identifyLanguage('foo bar baz', { confidenceThreshold: 0.9 }); - * console.warn(language); // und - * ``` - * - * @param text The input text to use for identifying the language. Inputs longer than 200 characters are truncated to 200 characters, as longer input does not improve the detection accuracy. - * @param options See `LanguageIdentificationOptions`. - */ - identifyLanguage(text: string, options?: LanguageIdentificationOptions): Promise; - - /** - * Identifies possible languages for the given text. - * - * #### Example - * - * ```js - * const identifiedLanguages = firebase.naturalLanguage().identifyPossibleLanguages('hello world'); - * console.warn(identifiedLanguages[0].language); // en - * ``` - * - * @param text The input text to use for identifying the language. Inputs longer than 200 characters are truncated to 200 characters, as longer input does not improve the detection accuracy. - * @param options See `LanguageIdentificationOptions`. - */ - identifyPossibleLanguages( - text: string, - options?: LanguageIdentificationOptions, - ): Promise; - - /** - * Returns suggested replies for a conversation. - * - * #### Example - * - * ```js - * const replies = await firebase.naturalLanguage().suggestReplies([ - * { text: "Hey, long time no speak!", }, - * { text: 'I know right, it has been a while..', userId: 'xxxx', isLocalUser: false }, - * { text: 'We should catchup some time!', }, - * { text: 'Definitely, how about we go for lunch this week?', userId: 'xxxx', isLocalUser: false }, - * ]); - * ``` - * - * @param messages An array of `TextMessage` interfaces. - */ - suggestReplies(messages: TextMessage[]): Promise; - } - - /** - * A `TextMessage` interface provided to `suggestReplies()`. - */ - export interface TextMessage { - /** - * The message text. - * - * This is required and must not be an empty string. - */ - text: string; - - /** - * Whether the message is a local user. If false, a `userId` must be provided for the message. - * - * Defaults to true. - */ - isLocalUser?: boolean; - - /** - * A user ID of a remote user. - * - * Used to help better identify users to provide more accurate replies. - */ - userId?: string; - - /** - * The timestamp of the message in milliseconds. - * - * Defaults to now (`Date.now()`). - */ - timestamp?: number; - } -} - -declare const defaultExport: ReactNativeFirebase.FirebaseModuleWithStaticsAndApp< - FirebaseLanguageTypes.Module, - FirebaseLanguageTypes.Statics ->; - -export const firebase: ReactNativeFirebase.Module & { - naturalLanguage: typeof defaultExport; - app( - name?: string, - ): ReactNativeFirebase.FirebaseApp & { naturalLanguage(): FirebaseLanguageTypes.Module }; -}; - -export default defaultExport; - -/** - * Attach namespace to `firebase.` and `FirebaseApp.`. - */ -declare module '@react-native-firebase/app' { - namespace ReactNativeFirebase { - import FirebaseModuleWithStaticsAndApp = ReactNativeFirebase.FirebaseModuleWithStaticsAndApp; - - interface Module { - naturalLanguage: FirebaseModuleWithStaticsAndApp< - FirebaseLanguageTypes.Module, - FirebaseLanguageTypes.Statics - >; - } - - interface FirebaseApp { - naturalLanguage(): FirebaseLanguageTypes.Module; - } - - interface FirebaseJsonConfig { - /** - * If `true`, the Language ID Model will be installed onto the device. - */ - ml_natural_language_language_id_model: boolean; - - /** - * If `true`, the Smart Reply Model will be installed onto the device. - */ - ml_natural_language_smart_reply_model: boolean; - } - } -} diff --git a/packages/ml-natural-language/lib/index.js b/packages/ml-natural-language/lib/index.js deleted file mode 100644 index f619d4e8064..00000000000 --- a/packages/ml-natural-language/lib/index.js +++ /dev/null @@ -1,161 +0,0 @@ -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -import { - isArray, - isNumber, - isObject, - isString, - isUndefined, - validateOptionalNativeDependencyExists, -} from '@react-native-firebase/app/lib/common'; -import { - createModuleNamespace, - FirebaseModule, - getFirebaseRoot, -} from '@react-native-firebase/app/lib/internal'; -import validateTextMessage from './validateTextMessage'; -import version from './version'; - -// TODO not available on iOS until SDK 6.0.0 -// import TranslateModelManager from './TranslateModelManager'; - -const statics = {}; -const namespace = 'naturalLanguage'; -const nativeModuleName = [ - 'RNFBMLNaturalLanguageIdModule', - 'RNFBMLNaturalLanguageTranslateModule', - 'RNFBMLNaturalLanguageSmartReplyModule', -]; - -function validateIdentifyLanguageArgs(text, options, methodName) { - if (!isString(text)) { - throw new Error( - `firebase.naturalLanguage().${methodName}(*, _) 'text' must be a string value.`, - ); - } - - if (!isObject(options)) { - throw new Error( - `firebase.naturalLanguage().${methodName}(_, *) 'options' must be an object or undefined.`, - ); - } - - if ( - !isUndefined(options.confidenceThreshold) && - (!isNumber(options.confidenceThreshold) || - options.confidenceThreshold < 0 || - options.confidenceThreshold > 1) - ) { - throw new Error( - `firebase.naturalLanguage().${methodName}(_, *) 'options.confidenceThreshold' must be a float value between 0 and 1.`, - ); - } -} - -class FirebaseMlKitLanguageModule extends FirebaseModule { - identifyLanguage(text, options = {}) { - validateOptionalNativeDependencyExists( - 'ml_natural_language_language_id_model', - 'ML Kit Language Identification', - !!this.native.identifyLanguage, - ); - validateIdentifyLanguageArgs(text, options, 'identifyLanguage'); - return this.native.identifyLanguage(text.slice(0, 200), options); - } - - identifyPossibleLanguages(text, options = {}) { - validateOptionalNativeDependencyExists( - 'ml_natural_language_language_id_model', - 'ML Kit Language Identification', - !!this.native.identifyPossibleLanguages, - ); - validateIdentifyLanguageArgs(text, options, 'identifyPossibleLanguages'); - return this.native.identifyPossibleLanguages( - text.slice(0, 200), - Object.assign({}, options, { multipleLanguages: true }), - ); - } - - suggestReplies(messages) { - if (!isArray(messages)) { - throw new Error( - "firebase.naturalLanguage().suggestReplies(*) 'messages' must be an array value.", - ); - } - - if (messages.length === 0) { - return Promise.resolve([]); - } - - const validated = []; - - for (let i = 0; i < messages.length; i++) { - try { - validated.push(validateTextMessage(messages[i])); - } catch (e) { - throw new Error( - `firebase.naturalLanguage().suggestReplies(*) 'messages' object at index ${i} threw an error. ${e.message}.`, - ); - } - } - - return this.native.suggestReplies(validated); - } -} - -// import { SDK_VERSION } from '@react-native-firebase/mlkit'; -export const SDK_VERSION = version; - -// import naturalLanguage from '@react-native-firebase/mlkit'; -// naturalLanguage().X(...); -export default createModuleNamespace({ - statics, - version, - namespace, - nativeModuleName, - nativeEvents: false, - hasMultiAppSupport: true, - hasCustomUrlOrRegionSupport: false, - ModuleClass: FirebaseMlKitLanguageModule, -}); - -// import naturalLanguage, { firebase } from '@react-native-firebase/mlkit'; -// naturalLanguage().X(...); -// firebase.naturalLanguage().X(...); -export const firebase = getFirebaseRoot(); - -// TODO not available on Firebase iOS until SDK 6.0.0, add in RNFB >6.1 -// -------------------------- -// LANGUAGE_TRANSLATE -// -------------------------- -// translate(text, translationOptions) { -// const _translationOptions = {}; -// -// // retrieve the language id integers -// const { sourceLanguage, targetLanguage } = translationOptions; -// _translationOptions.sourceLanguage = this.native.TRANSLATE_LANGUAGES[sourceLanguage]; -// _translationOptions.targetLanguage = this.native.TRANSLATE_LANGUAGES[targetLanguage]; -// // translationOptions required: -// // sourceLanguage -// // targetLanguage -// return this.native.translate(text, _translationOptions); -// } -// -// get translateModelManager() { -// return new TranslateModelManager(this); -// } diff --git a/packages/ml-natural-language/lib/validateTextMessage.js b/packages/ml-natural-language/lib/validateTextMessage.js deleted file mode 100644 index 9b39f474628..00000000000 --- a/packages/ml-natural-language/lib/validateTextMessage.js +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -import { - hasOwnProperty, - isBoolean, - isNumber, - isObject, - isString, -} from '@react-native-firebase/app/lib/common'; - -export default function validateTextMessage(textMessage) { - if (!isObject(textMessage)) { - throw new Error("'textMessage' expected an object value"); - } - - const out = { - timestamp: Date.now(), - isLocalUser: true, - }; - - if (!isString(textMessage.text)) { - throw new Error("'textMessage.text' expected a string value"); - } - - if (textMessage.text.length === 0) { - throw new Error("'textMessage.text' expected string value to not be empty"); - } - - out.text = textMessage.text; - - if (hasOwnProperty(textMessage, 'timestamp')) { - if (!isNumber(textMessage.timestamp)) { - throw new Error("'textMessage.timestamp' expected number value (milliseconds)"); - } - - out.timestamp = textMessage.timestamp; - } - - if (hasOwnProperty(textMessage, 'isLocalUser')) { - if (!isBoolean(textMessage.isLocalUser)) { - throw new Error("'textMessage.isLocalUser' expected boolean value"); - } - - out.isLocalUser = textMessage.isLocalUser; - } - - if (out.isLocalUser && hasOwnProperty(textMessage, 'userId')) { - throw new Error( - "'textMessage.userId' expected 'textMessage.isLocalUser' to be false when setting a user ID.", - ); - } else if (!out.isLocalUser && !hasOwnProperty(textMessage, 'userId')) { - throw new Error("'textMessage.userId' expected a string value"); - } else if (!out.isLocalUser && hasOwnProperty(textMessage, 'userId')) { - if (!isString(textMessage.userId)) { - throw new Error("'textMessage.userId' expected a string value"); - } - - if (textMessage.userId.length === 0) { - throw new Error("'textMessage.userId' expected string value to not be empty"); - } - - out.userId = textMessage.userId; - } - - return out; -} diff --git a/packages/ml-natural-language/package.json b/packages/ml-natural-language/package.json deleted file mode 100644 index a49342b0137..00000000000 --- a/packages/ml-natural-language/package.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "name": "@react-native-firebase/ml-natural-language", - "version": "7.4.11", - "author": "Invertase (http://invertase.io)", - "description": "React Native Firebase - Firebase ML Kit brings the power of machine learning to your React Native application, supporting both Android & iOS.", - "main": "lib/index.js", - "types": "lib/index.d.ts", - "scripts": { - "build": "genversion --semi lib/version.js", - "build:clean": "rimraf android/build && rimraf ios/build", - "prepare": "yarn run build" - }, - "repository": { - "type": "git", - "url": "https://github.com/invertase/react-native-firebase/tree/master/packages/ml-natural-language" - }, - "license": "Apache-2.0", - "keywords": [ - "react", - "react-native", - "firebase", - "mlkit", - "identify language", - "smart replies", - "machine learning", - "barcode", - "label", - "natural language", - "nlp", - "vision" - ], - "peerDependencies": { - "@react-native-firebase/app": "8.4.7" - }, - "publishConfig": { - "access": "public" - } -} diff --git a/packages/ml-natural-language/type-test.ts b/packages/ml-natural-language/type-test.ts deleted file mode 100644 index bee7bb9abcf..00000000000 --- a/packages/ml-natural-language/type-test.ts +++ /dev/null @@ -1,53 +0,0 @@ -import firebase from '@react-native-firebase/app'; -import * as language from '@react-native-firebase/ml-natural-language'; - -console.log(language.default().app); - -// checks module exists at root -console.log(firebase.naturalLanguage().app.name); - -// checks module exists at app level -console.log(firebase.app().naturalLanguage().app.name); - -// checks statics exist -console.log(firebase.naturalLanguage.SDK_VERSION); - -// checks statics exist on defaultExport -console.log(firebase.SDK_VERSION); - -// checks root exists -console.log(firebase.SDK_VERSION); - -// checks firebase named export exists on module -console.log(language.firebase.SDK_VERSION); - -// checks multi-app support exists -console.log(firebase.naturalLanguage(firebase.app()).app.name); - -firebase - .naturalLanguage() - .identifyLanguage('foo', { - confidenceThreshold: 0.3, - }) - .then(str => str.replace); - -firebase - .naturalLanguage() - .identifyPossibleLanguages('foo', { - confidenceThreshold: 0.3, - }) - .then(languages => languages.forEach($ => $.confidence)); - -firebase - .naturalLanguage() - .suggestReplies([ - { - text: 'foo', - isLocalUser: true, - userId: '123', - timestamp: 123, - }, - ]) - .then(replies => { - replies.forEach($ => $.text); - }); diff --git a/packages/ml-vision/.npmignore b/packages/ml-vision/.npmignore deleted file mode 100644 index 29e5aa19bbf..00000000000 --- a/packages/ml-vision/.npmignore +++ /dev/null @@ -1,66 +0,0 @@ -# Built application files -android/*/build/ - -# Crashlytics configuations -android/com_crashlytics_export_strings.xml - -# Local configuration file (sdk path, etc) -android/local.properties - -# Gradle generated files -android/.gradle/ - -# Signing files -android/.signing/ - -# User-specific configurations -android/.idea/gradle.xml -android/.idea/libraries/ -android/.idea/workspace.xml -android/.idea/tasks.xml -android/.idea/.name -android/.idea/compiler.xml -android/.idea/copyright/profiles_settings.xml -android/.idea/encodings.xml -android/.idea/misc.xml -android/.idea/modules.xml -android/.idea/scopes/scope_settings.xml -android/.idea/vcs.xml -android/*.iml - -# Xcode -*.pbxuser -*.mode1v3 -*.mode2v3 -*.perspectivev3 -*.xcuserstate -ios/Pods -ios/build -*project.xcworkspace* -*xcuserdata* - -# OS-specific files -.DS_Store -.DS_Store? -._* -.Spotlight-V100 -.Trashes -ehthumbs.db -Thumbs.dbandroid/gradle -android/gradlew -android/build -android/gradlew.bat -android/gradle/ - -.idea -coverage -yarn.lock -e2e/ -.github -.vscode -.nyc_output -android/.settings -*.coverage.json -.circleci -.eslintignore -type-test.ts diff --git a/packages/ml-vision/LICENSE b/packages/ml-vision/LICENSE deleted file mode 100644 index ef3ed44f066..00000000000 --- a/packages/ml-vision/LICENSE +++ /dev/null @@ -1,32 +0,0 @@ -Apache-2.0 License ------------------- - -Copyright (c) 2016-present Invertase Limited & Contributors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this library except in compliance with the License. - -You may obtain a copy of the Apache-2.0 License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - - -Creative Commons Attribution 3.0 License ----------------------------------------- - -Copyright (c) 2016-present Invertase Limited & Contributors - -Documentation and other instructional materials provided for this project -(including on a separate documentation repository or it's documentation website) are -licensed under the Creative Commons Attribution 3.0 License. Code samples/blocks -contained therein are licensed under the Apache License, Version 2.0 (the "License"), as above. - -You may obtain a copy of the Creative Commons Attribution 3.0 License at - - https://creativecommons.org/licenses/by/3.0/ diff --git a/packages/ml-vision/README.md b/packages/ml-vision/README.md deleted file mode 100644 index de5fcec63ef..00000000000 --- a/packages/ml-vision/README.md +++ /dev/null @@ -1,31 +0,0 @@ -

- -
- -

React Native Firebase - ML Kit Vision

-

- ---- - -# DEPRECATED - -This package is deprecated and should no longer be used. - -Google has split mobile machine learning functionality into two pieces: - -1. "On-Device" inferences - this will be handled via the standalone ["Google ML Kit"](https://developers.google.com/ml-kit) libraries, and the related [`react-native-mlkit`](https://github.com/invertase/react-native-mlkit) package. This includes any APIs where the device uses a local model to make inferences - -1. "Cloud" inferences - these will continue in Firebase, but are now in the ["Firebase ML"](https://firebase.google.com/docs/ml) library, and will be available from the new consolidated `@react-native-firebase/ml` package - -More information on the transition is available here: https://firebase.google.com/docs/ml#cloud_vs_on-device - ---- - -

- -

- Built and maintained with 💛 by Invertase. -

-

- ---- diff --git a/packages/ml-vision/android/.editorconfig b/packages/ml-vision/android/.editorconfig deleted file mode 100644 index 670398e9904..00000000000 --- a/packages/ml-vision/android/.editorconfig +++ /dev/null @@ -1,10 +0,0 @@ -# editorconfig -root = true - -[*] -indent_style = space -indent_size = 2 -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true diff --git a/packages/ml-vision/android/lint.xml b/packages/ml-vision/android/lint.xml deleted file mode 100644 index c3dd72aca07..00000000000 --- a/packages/ml-vision/android/lint.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/packages/ml-vision/android/ml-models.gradle b/packages/ml-vision/android/ml-models.gradle deleted file mode 100644 index af7ec7e37f6..00000000000 --- a/packages/ml-vision/android/ml-models.gradle +++ /dev/null @@ -1,49 +0,0 @@ -apply from: file("./../../app/android/firebase-json.gradle") - -def mlModels = [ - 'ml_vision_face_model', - 'ml_vision_image_label_model', - // 'ml_vision_object_detection_model', // object tracking -> TODO 6.1 -] - -dependencies { - if (rootProject.ext && rootProject.ext.firebaseJson) { - mlModels.each { modelFlag -> - if (rootProject.ext.firebaseJson.isFlagEnabled(modelFlag) == true) { - rootProject.logger.info ":${project.name} model enabled: '${modelFlag}'" - implementation "com.google.firebase:firebase-${modelFlag.replaceAll("_", "-")}" - } else { - rootProject.logger.warn ":${project.name} model disabled: '${modelFlag}'" - } - } - } else { - rootProject.logger.warn ":${project.name} skipping optional models as no firebaseJson extension found, you may be missing a firebase.json file in the root of your React Native project, or you've not installed the @react-native-firebase/app package and included it in your app build." - } -} - -def manifestModels = [ - 'ml_vision_ocr_model', - 'ml_vision_face_model', - 'ml_vision_barcode_model', - 'ml_vision_label_model', - // 'ml_vision_ica_model', // object tracking -> TODO 6.1 -] - -def manifestModelsString = "" - -manifestModels.each { modelFlag -> - if (rootProject.ext && rootProject.ext.firebaseJson && rootProject.ext.firebaseJson.isFlagEnabled(modelFlag) == true) { - def modelIdentifier = modelFlag.replace("ml_vision_", "").replace("_model", "") - if (manifestModelsString.length() > 0) { - manifestModelsString += "," + modelIdentifier - } else { - manifestModelsString += modelIdentifier - } - } -} - -android { - defaultConfig { - manifestPlaceholders = [visionModels: manifestModelsString] - } -} diff --git a/packages/ml-vision/android/settings.gradle b/packages/ml-vision/android/settings.gradle deleted file mode 100644 index 2c89304799d..00000000000 --- a/packages/ml-vision/android/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = '@react-native-firebase_ml-vision' diff --git a/packages/ml-vision/android/src/main/AndroidManifest.xml b/packages/ml-vision/android/src/main/AndroidManifest.xml deleted file mode 100644 index ed3a069d689..00000000000 --- a/packages/ml-vision/android/src/main/AndroidManifest.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionBarcodeDetectorModule.java b/packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionBarcodeDetectorModule.java deleted file mode 100644 index 602fa6f4566..00000000000 --- a/packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionBarcodeDetectorModule.java +++ /dev/null @@ -1,282 +0,0 @@ -package io.invertase.firebase.ml.vision; - -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - - -import android.content.Context; -import android.os.Bundle; -import com.google.android.gms.tasks.Task; -import com.google.android.gms.tasks.Tasks; -import com.google.firebase.FirebaseApp; -import com.google.firebase.ml.vision.FirebaseVision; -import com.google.firebase.ml.vision.barcode.FirebaseVisionBarcode; -import com.google.firebase.ml.vision.barcode.FirebaseVisionBarcodeDetector; -import com.google.firebase.ml.vision.barcode.FirebaseVisionBarcodeDetectorOptions; -import com.google.firebase.ml.vision.common.FirebaseVisionImage; -import io.invertase.firebase.common.SharedUtils; -import io.invertase.firebase.common.UniversalFirebaseModule; - -import java.util.*; - -import static io.invertase.firebase.ml.vision.UniversalFirebaseMLVisionCommon.*; - -@SuppressWarnings("ConstantConditions") -class UniversalFirebaseMLVisionBarcodeDetectorModule extends UniversalFirebaseModule { - - UniversalFirebaseMLVisionBarcodeDetectorModule(Context context, String serviceName) { - super(context, serviceName); - } - - Task>> barcodeDetectorProcessImage(String appName, String stringUri, Bundle barcodeDetectorOptions) { - return Tasks.call(getExecutor(), () -> { - FirebaseApp firebaseApp = FirebaseApp.getInstance(appName); - FirebaseVisionBarcodeDetectorOptions options = getBarcodeDetectorOptions(barcodeDetectorOptions); - - FirebaseVisionBarcodeDetector visionBarcodeDetector = FirebaseVision.getInstance(firebaseApp) - .getVisionBarcodeDetector(options); - - FirebaseVisionImage image = FirebaseVisionImage.fromFilePath( - getContext(), - SharedUtils.getUri(stringUri) - ); - - List detectedBarcodesRaw = Tasks.await(visionBarcodeDetector.detectInImage(image)); - - return getBarcodesList(detectedBarcodesRaw); - }); - } - - private List> getBarcodesList(List detectedBarcodesRaw) { - List> detectedBarcodesFormatted = new ArrayList<>(detectedBarcodesRaw.size()); - - for (FirebaseVisionBarcode barcode : detectedBarcodesRaw) { - Map barcodeMap = new HashMap<>(); - barcodeMap.put(KEY_BOUNDING_BOX, SharedUtils.rectToIntArray(barcode.getBoundingBox())); - barcodeMap.put(KEY_CORNER_POINTS, SharedUtils.pointsToIntsList(barcode.getCornerPoints())); - barcodeMap.put(KEY_FORMAT, barcode.getFormat()); - barcodeMap.put(KEY_VALUE_TYPE, barcode.getValueType()); - barcodeMap.put(KEY_DISPLAY_VALUE, barcode.getDisplayValue()); - barcodeMap.put(KEY_RAW_VALUE, barcode.getRawValue()); - - // `calendarEvent` - addCalendarEventFromBarcodeToMap(barcode, barcodeMap); - - // `contactInfo` - addContactInfoFromBarcodeToMap(barcode, barcodeMap); - - // driverLicense - addDriverLicenseFromBarcodeToMap(barcode, barcodeMap); - - // email - addEmailFromBarcodeToMap(barcode, barcodeMap); - - // geoPoint - addGeoPointFromBarcodeToMap(barcode, barcodeMap); - - // phone - addPhoneFromBarcodeToMap(barcode, barcodeMap); - - // sms - addSmsFromBarcodeToMap(barcode, barcodeMap); - - // url - addUrlFromBarcodeToMap(barcode, barcodeMap); - - // wifi - addWifiFromBarcodeToMap(barcode, barcodeMap); - - detectedBarcodesFormatted.add(barcodeMap); - } - - return detectedBarcodesFormatted; - } - - private void addDriverLicenseFromBarcodeToMap(FirebaseVisionBarcode barcode, Map barcodeMap) { - if (barcode.getDriverLicense() == null) return; - Map driverLicenseMap = new HashMap<>(); - FirebaseVisionBarcode.DriverLicense driverLicense = barcode.getDriverLicense(); - driverLicenseMap.put("addressCity", driverLicense.getAddressCity()); - driverLicenseMap.put("addressState", driverLicense.getAddressState()); - driverLicenseMap.put("addressStreet", driverLicense.getAddressStreet()); - driverLicenseMap.put("addressZip", driverLicense.getAddressZip()); - driverLicenseMap.put("birthDate", driverLicense.getBirthDate()); - driverLicenseMap.put("documentType", driverLicense.getDocumentType()); - driverLicenseMap.put("expiryDate", driverLicense.getExpiryDate()); - driverLicenseMap.put("firstName", driverLicense.getFirstName()); - driverLicenseMap.put("gender", driverLicense.getGender()); - driverLicenseMap.put("issueDate", driverLicense.getIssueDate()); - driverLicenseMap.put("issuingCountry", driverLicense.getIssuingCountry()); - driverLicenseMap.put("lastName", driverLicense.getLastName()); - driverLicenseMap.put("licenseNumber", driverLicense.getLicenseNumber()); - driverLicenseMap.put("middleName", driverLicense.getMiddleName()); - barcodeMap.put("driverLicense", driverLicenseMap); - } - - private void addGeoPointFromBarcodeToMap(FirebaseVisionBarcode barcode, Map barcodeMap) { - if (barcode.getGeoPoint() == null) return; - List latLng = new ArrayList<>(2); - FirebaseVisionBarcode.GeoPoint geoPoint = barcode.getGeoPoint(); - latLng.add(geoPoint.getLat()); - latLng.add(geoPoint.getLng()); - barcodeMap.put(KEY_GEO_POINT, latLng); - } - - private void addSmsFromBarcodeToMap(FirebaseVisionBarcode barcode, Map barcodeMap) { - if (barcode.getSms() == null) return; - Map smsMap = new HashMap<>(); - FirebaseVisionBarcode.Sms sms = barcode.getSms(); - smsMap.put("message", sms.getMessage()); - smsMap.put("phoneNumber", sms.getPhoneNumber()); - barcodeMap.put(KEY_SMS, smsMap); - } - - private void addUrlFromBarcodeToMap(FirebaseVisionBarcode barcode, Map barcodeMap) { - if (barcode.getUrl() == null) return; - Map urlMap = new HashMap<>(); - FirebaseVisionBarcode.UrlBookmark url = barcode.getUrl(); - urlMap.put("title", url.getTitle()); - urlMap.put("url", url.getUrl()); - barcodeMap.put(KEY_URL, urlMap); - } - - private void addWifiFromBarcodeToMap(FirebaseVisionBarcode barcode, Map barcodeMap) { - if (barcode.getWifi() == null) return; - Map wifiMap = new HashMap<>(); - FirebaseVisionBarcode.WiFi wiFi = barcode.getWifi(); - wifiMap.put("encryptionType", wiFi.getEncryptionType()); - wifiMap.put("password", wiFi.getPassword()); - wifiMap.put("ssid", wiFi.getSsid()); - barcodeMap.put(KEY_WIFI, wifiMap); - } - - private void addEmailFromBarcodeToMap(FirebaseVisionBarcode barcode, Map barcodeMap) { - if (barcode.getEmail() == null) return; - barcodeMap.put(KEY_EMAIL, getEmailMap(barcode.getEmail())); - } - - private void addPhoneFromBarcodeToMap(FirebaseVisionBarcode barcode, Map barcodeMap) { - if (barcode.getPhone() == null) return; - barcodeMap.put(KEY_PHONE, getPhoneMap(barcode.getPhone())); - } - - private void addCalendarEventFromBarcodeToMap(FirebaseVisionBarcode barcode, Map barcodeMap) { - if (barcode.getCalendarEvent() == null) return; - Map calendarEventMap = new HashMap<>(); - FirebaseVisionBarcode.CalendarEvent calendarEvent = barcode.getCalendarEvent(); - calendarEventMap.put("description", calendarEvent.getDescription()); - calendarEventMap.put("end", calendarEvent.getEnd().getRawValue()); - calendarEventMap.put("location", calendarEvent.getLocation()); - calendarEventMap.put("organizer", calendarEvent.getOrganizer()); - calendarEventMap.put("start", calendarEvent.getStart().getRawValue()); - calendarEventMap.put("status", calendarEvent.getStatus()); - calendarEventMap.put("summary", calendarEvent.getSummary()); - barcodeMap.put(KEY_CALENDAR_EVENT, calendarEventMap); - } - - private void addContactInfoFromBarcodeToMap(FirebaseVisionBarcode barcode, Map barcodeMap) { - if (barcode.getContactInfo() == null) return; - FirebaseVisionBarcode.ContactInfo contactInfo = barcode.getContactInfo(); - Map contactInfoMap = new HashMap<>(); - - contactInfoMap.put("title", contactInfo.getTitle()); - contactInfoMap.put("organization", contactInfo.getOrganization()); - if (contactInfo.getUrls() == null) { - contactInfoMap.put("urls", new String[]{}); - } else { - contactInfoMap.put("urls", contactInfo.getUrls()); - } - - // phones - List phonesListRaw = contactInfo.getPhones(); - List> phonesListFormatted = new ArrayList<>(phonesListRaw.size()); - for (FirebaseVisionBarcode.Phone phone : phonesListRaw) { - phonesListFormatted.add(getPhoneMap(phone)); - } - contactInfoMap.put("phones", phonesListFormatted); - - // emails - List emailsListRaw = contactInfo.getEmails(); - List> emailsListFormatted = new ArrayList<>(emailsListRaw.size()); - for (FirebaseVisionBarcode.Email email : emailsListRaw) { - emailsListFormatted.add(getEmailMap(email)); - } - contactInfoMap.put("emails", emailsListFormatted); - - // person name - contactInfoMap.put("name", getPersonNameMap(contactInfo.getName())); - - // addresses - List addressListRaw = contactInfo.getAddresses(); - List> addressListFormatted = new ArrayList<>(addressListRaw.size()); - for (FirebaseVisionBarcode.Address email : addressListRaw) { - addressListFormatted.add(getAddressMap(email)); - } - contactInfoMap.put("addresses", addressListFormatted); - - barcodeMap.put(KEY_CONTACT_INFO, contactInfoMap); - } - - private Map getAddressMap(FirebaseVisionBarcode.Address address) { - Map addressMap = new HashMap<>(); - addressMap.put("lines", address.getAddressLines()); - addressMap.put("type", address.getType()); - return addressMap; - } - - private Map getPersonNameMap(FirebaseVisionBarcode.PersonName personName) { - Map personNameMap = new HashMap<>(7); - personNameMap.put("first", personName.getFirst()); - personNameMap.put("formatted", personName.getFormattedName()); - personNameMap.put("last", personName.getLast()); - personNameMap.put("middle", personName.getMiddle()); - personNameMap.put("prefix", personName.getPrefix()); - personNameMap.put("pronunciation", personName.getPronunciation()); - personNameMap.put("suffix", personName.getSuffix()); - return personNameMap; - } - - private Map getEmailMap(FirebaseVisionBarcode.Email email) { - Map emailMap = new HashMap<>(3); - emailMap.put("address", email.getAddress()); - emailMap.put("body", email.getBody()); - emailMap.put("subject", email.getSubject()); - return emailMap; - } - - private Map getPhoneMap(FirebaseVisionBarcode.Phone phone) { - Map phoneMap = new HashMap<>(); - phoneMap.put("number", phone.getNumber()); - phoneMap.put("type", phone.getType()); - return phoneMap; - } - - private FirebaseVisionBarcodeDetectorOptions getBarcodeDetectorOptions(Bundle barcodeDetectorOptionsBundle) { - FirebaseVisionBarcodeDetectorOptions.Builder builder = new FirebaseVisionBarcodeDetectorOptions.Builder(); - - int[] formats = barcodeDetectorOptionsBundle.getIntArray("barcodeFormats"); - if (formats == null) return builder.build(); - - if (formats.length == 1) { - builder.setBarcodeFormats(formats[0]); - } else if (formats.length > 1) { - builder.setBarcodeFormats(formats[0], Arrays.copyOfRange(formats, 1, formats.length)); - } - - return builder.build(); - } -} diff --git a/packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionFaceDetectorModule.java b/packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionFaceDetectorModule.java deleted file mode 100644 index 72d6768b56f..00000000000 --- a/packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionFaceDetectorModule.java +++ /dev/null @@ -1,275 +0,0 @@ -package io.invertase.firebase.ml.vision; - -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - - -import android.content.Context; -import android.os.Bundle; -import com.google.android.gms.tasks.Task; -import com.google.android.gms.tasks.Tasks; -import com.google.firebase.FirebaseApp; -import com.google.firebase.ml.vision.FirebaseVision; -import com.google.firebase.ml.vision.common.FirebaseVisionImage; -import com.google.firebase.ml.vision.common.FirebaseVisionPoint; -import com.google.firebase.ml.vision.face.*; -import io.invertase.firebase.common.SharedUtils; -import io.invertase.firebase.common.UniversalFirebaseModule; - -import java.util.*; - -import static io.invertase.firebase.ml.vision.UniversalFirebaseMLVisionCommon.*; - -class UniversalFirebaseMLVisionFaceDetectorModule extends UniversalFirebaseModule { - UniversalFirebaseMLVisionFaceDetectorModule(Context context, String serviceName) { - super(context, serviceName); - } - - Task>> faceDetectorProcessImage( - String appName, - String stringUri, - Bundle faceDetectorOptionsBundle - ) { - return Tasks.call(getExecutor(), () -> { - FirebaseApp firebaseApp = FirebaseApp.getInstance(appName); - FirebaseVisionFaceDetectorOptions options = getFaceDetectorOptions(faceDetectorOptionsBundle); - FirebaseVisionFaceDetector visionFaceDetector = FirebaseVision.getInstance(firebaseApp) - .getVisionFaceDetector(options); - FirebaseVisionImage image = FirebaseVisionImage.fromFilePath( - getContext(), - SharedUtils.getUri(stringUri) - ); - - List visionFacesRaw = Tasks.await(visionFaceDetector.detectInImage(image)); - List> visionFacesFormatted = new ArrayList<>(visionFacesRaw.size()); - - for (FirebaseVisionFace visionFaceRaw : visionFacesRaw) { - Map visionFaceFormatted = new HashMap<>(); - - visionFaceFormatted.put( - KEY_BOUNDING_BOX, - SharedUtils.rectToIntArray(visionFaceRaw.getBoundingBox()) - ); - visionFaceFormatted.put(KEY_HEAD_EULER_ANGLE_Y, visionFaceRaw.getHeadEulerAngleY()); - visionFaceFormatted.put(KEY_HEAD_EULER_ANGLE_Z, visionFaceRaw.getHeadEulerAngleZ()); - visionFaceFormatted.put( - KEY_LEFT_EYE_OPEN_PROBABILITY, - visionFaceRaw.getLeftEyeOpenProbability() - ); - visionFaceFormatted.put( - KEY_RIGHT_EYE_OPEN_PROBABILITY, - visionFaceRaw.getRightEyeOpenProbability() - ); - - visionFaceFormatted.put(KEY_SMILING_PROBABILITY, visionFaceRaw.getSmilingProbability()); - visionFaceFormatted.put(KEY_TRACKING_ID, visionFaceRaw.getTrackingId()); - - List> faceContoursFormatted; - - if (options.getContourMode() == FirebaseVisionFaceDetectorOptions.NO_CONTOURS) { - faceContoursFormatted = new ArrayList<>(0); - } else { - faceContoursFormatted = new ArrayList<>(14); - faceContoursFormatted.add(getContourMap(visionFaceRaw.getContour(FirebaseVisionFaceContour.ALL_POINTS))); - faceContoursFormatted.add(getContourMap(visionFaceRaw.getContour(FirebaseVisionFaceContour.FACE))); - faceContoursFormatted.add(getContourMap(visionFaceRaw.getContour(FirebaseVisionFaceContour.LEFT_EYEBROW_TOP))); - faceContoursFormatted.add(getContourMap(visionFaceRaw.getContour(FirebaseVisionFaceContour.LEFT_EYEBROW_BOTTOM))); - faceContoursFormatted.add(getContourMap(visionFaceRaw.getContour(FirebaseVisionFaceContour.RIGHT_EYEBROW_TOP))); - faceContoursFormatted.add(getContourMap(visionFaceRaw.getContour(FirebaseVisionFaceContour.RIGHT_EYEBROW_BOTTOM))); - faceContoursFormatted.add(getContourMap(visionFaceRaw.getContour(FirebaseVisionFaceContour.LEFT_EYE))); - faceContoursFormatted.add(getContourMap(visionFaceRaw.getContour(FirebaseVisionFaceContour.RIGHT_EYE))); - faceContoursFormatted.add(getContourMap(visionFaceRaw.getContour(FirebaseVisionFaceContour.UPPER_LIP_TOP))); - faceContoursFormatted.add(getContourMap(visionFaceRaw.getContour(FirebaseVisionFaceContour.UPPER_LIP_BOTTOM))); - faceContoursFormatted.add(getContourMap(visionFaceRaw.getContour(FirebaseVisionFaceContour.LOWER_LIP_TOP))); - faceContoursFormatted.add(getContourMap(visionFaceRaw.getContour(FirebaseVisionFaceContour.LOWER_LIP_BOTTOM))); - faceContoursFormatted.add(getContourMap(visionFaceRaw.getContour(FirebaseVisionFaceContour.NOSE_BRIDGE))); - faceContoursFormatted.add(getContourMap(visionFaceRaw.getContour(FirebaseVisionFaceContour.NOSE_BOTTOM))); - } - - visionFaceFormatted.put(KEY_FACE_CONTOURS, faceContoursFormatted); - - List> faceLandmarksFormatted = new ArrayList<>(14); - if (visionFaceRaw.getLandmark(FirebaseVisionFaceLandmark.MOUTH_BOTTOM) != null) { - faceLandmarksFormatted.add(getLandmarkMap( - Objects.requireNonNull(visionFaceRaw.getLandmark(FirebaseVisionFaceLandmark.MOUTH_BOTTOM))) - ); - } - - if (visionFaceRaw.getLandmark(FirebaseVisionFaceLandmark.MOUTH_RIGHT) != null) { - faceLandmarksFormatted.add(getLandmarkMap( - Objects.requireNonNull(visionFaceRaw.getLandmark(FirebaseVisionFaceLandmark.MOUTH_RIGHT))) - ); - } - - if (visionFaceRaw.getLandmark(FirebaseVisionFaceLandmark.MOUTH_LEFT) != null) { - faceLandmarksFormatted.add(getLandmarkMap( - Objects.requireNonNull(visionFaceRaw.getLandmark(FirebaseVisionFaceLandmark.MOUTH_LEFT))) - ); - } - - if (visionFaceRaw.getLandmark(FirebaseVisionFaceLandmark.RIGHT_EYE) != null) { - faceLandmarksFormatted.add(getLandmarkMap( - Objects.requireNonNull(visionFaceRaw.getLandmark(FirebaseVisionFaceLandmark.RIGHT_EYE))) - ); - } - - if (visionFaceRaw.getLandmark(FirebaseVisionFaceLandmark.LEFT_EYE) != null) { - faceLandmarksFormatted.add(getLandmarkMap( - Objects.requireNonNull(visionFaceRaw.getLandmark(FirebaseVisionFaceLandmark.LEFT_EYE))) - ); - } - - if (visionFaceRaw.getLandmark(FirebaseVisionFaceLandmark.RIGHT_EAR) != null) { - faceLandmarksFormatted.add(getLandmarkMap( - Objects.requireNonNull(visionFaceRaw.getLandmark(FirebaseVisionFaceLandmark.RIGHT_EAR))) - ); - } - - if (visionFaceRaw.getLandmark(FirebaseVisionFaceLandmark.LEFT_EAR) != null) { - faceLandmarksFormatted.add(getLandmarkMap( - Objects.requireNonNull(visionFaceRaw.getLandmark(FirebaseVisionFaceLandmark.LEFT_EAR))) - ); - } - - if (visionFaceRaw.getLandmark(FirebaseVisionFaceLandmark.RIGHT_CHEEK) != null) { - faceLandmarksFormatted.add(getLandmarkMap( - Objects.requireNonNull(visionFaceRaw.getLandmark(FirebaseVisionFaceLandmark.RIGHT_CHEEK))) - ); - } - - if (visionFaceRaw.getLandmark(FirebaseVisionFaceLandmark.LEFT_CHEEK) != null) { - faceLandmarksFormatted.add(getLandmarkMap( - Objects.requireNonNull(visionFaceRaw.getLandmark(FirebaseVisionFaceLandmark.LEFT_CHEEK))) - ); - } - - if (visionFaceRaw.getLandmark(FirebaseVisionFaceLandmark.NOSE_BASE) != null) { - faceLandmarksFormatted.add(getLandmarkMap( - Objects.requireNonNull(visionFaceRaw.getLandmark(FirebaseVisionFaceLandmark.NOSE_BASE))) - ); - } - - visionFaceFormatted.put(KEY_LANDMARKS, faceLandmarksFormatted); - visionFacesFormatted.add(visionFaceFormatted); - } - - return visionFacesFormatted; - }); - } - - private Map getLandmarkMap(FirebaseVisionFaceLandmark visionFaceLandmark) { - Map visionFaceLandmarkMap = new HashMap<>(); - visionFaceLandmarkMap.put(KEY_TYPE, visionFaceLandmark.getLandmarkType()); - visionFaceLandmarkMap.put(KEY_POSITION, getVisionPointMap(visionFaceLandmark.getPosition())); - return visionFaceLandmarkMap; - } - - private float[] getVisionPointMap(FirebaseVisionPoint visionPoint) { - return new float[]{visionPoint.getX(), visionPoint.getY()}; - } - - private Map getContourMap(FirebaseVisionFaceContour visionFaceContour) { - Map visionFaceContourMap = new HashMap<>(); - - List pointsListRaw = visionFaceContour.getPoints(); - List pointsListFormatted = new ArrayList<>(pointsListRaw.size()); - for (FirebaseVisionPoint pointRaw : pointsListRaw) { - pointsListFormatted.add(getVisionPointMap(pointRaw)); - } - - visionFaceContourMap.put(KEY_TYPE, visionFaceContour.getFaceContourType()); - visionFaceContourMap.put(KEY_POINTS, pointsListFormatted); - - return visionFaceContourMap; - } - - - private FirebaseVisionFaceDetectorOptions getFaceDetectorOptions(Bundle faceDetectorOptionsBundle) { - FirebaseVisionFaceDetectorOptions.Builder builder = new FirebaseVisionFaceDetectorOptions.Builder(); - - if (faceDetectorOptionsBundle.getBoolean(KEY_ENABLE_TRACKING)) { - builder.enableTracking(); - } - - if (faceDetectorOptionsBundle.containsKey(KEY_CLASSIFICATION_MODE)) { - int classificationMode = (int) faceDetectorOptionsBundle.getDouble(KEY_CLASSIFICATION_MODE); - switch (classificationMode) { - case FirebaseVisionFaceDetectorOptions.NO_CLASSIFICATIONS: - builder.setClassificationMode(FirebaseVisionFaceDetectorOptions.NO_CLASSIFICATIONS); - break; - case FirebaseVisionFaceDetectorOptions.ALL_CLASSIFICATIONS: - builder.setClassificationMode(FirebaseVisionFaceDetectorOptions.ALL_CLASSIFICATIONS); - break; - default: - throw new IllegalArgumentException( - "Invalid 'classificationMode' Face Detector option, must be either 1 or 2."); - } - } - - if (faceDetectorOptionsBundle.containsKey(KEY_CONTOUR_MODE)) { - int contourMode = (int) faceDetectorOptionsBundle.getDouble(KEY_CONTOUR_MODE); - switch (contourMode) { - case FirebaseVisionFaceDetectorOptions.NO_CONTOURS: - builder.setContourMode(FirebaseVisionFaceDetectorOptions.NO_CONTOURS); - break; - case FirebaseVisionFaceDetectorOptions.ALL_CONTOURS: - builder.setContourMode(FirebaseVisionFaceDetectorOptions.ALL_CONTOURS); - break; - default: - throw new IllegalArgumentException( - "Invalid 'contourMode' Face Detector option, must be either 1 or 2."); - } - } - - if (faceDetectorOptionsBundle.containsKey(KEY_LANDMARK_MODE)) { - int landmarkMode = (int) faceDetectorOptionsBundle.getDouble(KEY_LANDMARK_MODE); - switch (landmarkMode) { - case FirebaseVisionFaceDetectorOptions.NO_LANDMARKS: - builder.setLandmarkMode(FirebaseVisionFaceDetectorOptions.NO_LANDMARKS); - break; - case FirebaseVisionFaceDetectorOptions.ALL_LANDMARKS: - builder.setLandmarkMode(FirebaseVisionFaceDetectorOptions.ALL_LANDMARKS); - break; - default: - throw new IllegalArgumentException( - "Invalid 'landmarkMode' Face Detector option, must be either 1 or 2."); - } - } - - if (faceDetectorOptionsBundle.containsKey(KEY_MIN_FACE_SIZE)) { - float minFaceSize = (float) faceDetectorOptionsBundle.getDouble(KEY_MIN_FACE_SIZE); - builder.setMinFaceSize(minFaceSize); - } - - if (faceDetectorOptionsBundle.containsKey(KEY_PERFORMANCE_MODE)) { - int performanceMode = (int) faceDetectorOptionsBundle.getDouble(KEY_PERFORMANCE_MODE); - switch (performanceMode) { - case FirebaseVisionFaceDetectorOptions.FAST: - builder.setPerformanceMode(FirebaseVisionFaceDetectorOptions.FAST); - break; - case FirebaseVisionFaceDetectorOptions.ACCURATE: - builder.setPerformanceMode(FirebaseVisionFaceDetectorOptions.ACCURATE); - break; - default: - throw new IllegalArgumentException( - "Invalid 'performanceMode' Face Detector option, must be either 1 or 2."); - } - } - - return builder.build(); - } -} diff --git a/packages/ml-vision/android/src/reactnative/AndroidManifest.xml b/packages/ml-vision/android/src/reactnative/AndroidManifest.xml deleted file mode 100644 index 35065179e96..00000000000 --- a/packages/ml-vision/android/src/reactnative/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionImageLabelerModule.java b/packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionImageLabelerModule.java deleted file mode 100644 index 04d7a3922ba..00000000000 --- a/packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionImageLabelerModule.java +++ /dev/null @@ -1,73 +0,0 @@ -package io.invertase.firebase.ml.vision; - -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -import com.facebook.react.bridge.*; -import io.invertase.firebase.common.ReactNativeFirebaseModule; - -public class RNFirebaseMLVisionImageLabelerModule extends ReactNativeFirebaseModule { - private static final String SERVICE_NAME = "MLVisionImageLabeler"; - private final UniversalFirebaseMLVisionImageLabelerModule module; - - RNFirebaseMLVisionImageLabelerModule(ReactApplicationContext reactContext) { - super(reactContext, SERVICE_NAME); - this.module = new UniversalFirebaseMLVisionImageLabelerModule(reactContext, SERVICE_NAME); - } - - @ReactMethod - public void imageLabelerProcessImage(String appName, String stringUri, ReadableMap imageLabelerOptions, Promise promise) { - this.module.imageLabelerProcessImage(appName, stringUri, Arguments.toBundle(imageLabelerOptions)) - .addOnCompleteListener(task -> { - if (task.isSuccessful()) { - promise.resolve( - Arguments.makeNativeArray(task.getResult()) - ); - } else { - String[] errorCodeAndMessage = UniversalFirebaseMLVisionCommon.getErrorCodeAndMessageFromException( - task.getException()); - rejectPromiseWithCodeAndMessage( - promise, - errorCodeAndMessage[0], - errorCodeAndMessage[1], - errorCodeAndMessage[2] - ); - } - }); - } - - @ReactMethod - public void cloudImageLabelerProcessImage(String appName, String stringUri, ReadableMap cloudImageLabelerOptions, Promise promise) { - this.module.cloudImageLabelerProcessImage(appName, stringUri, Arguments.toBundle(cloudImageLabelerOptions)) - .addOnCompleteListener(task -> { - if (task.isSuccessful()) { - promise.resolve( - Arguments.makeNativeArray(task.getResult()) - ); - } else { - String[] errorCodeAndMessage = UniversalFirebaseMLVisionCommon.getErrorCodeAndMessageFromException( - task.getException()); - rejectPromiseWithCodeAndMessage( - promise, - errorCodeAndMessage[0], - errorCodeAndMessage[1], - errorCodeAndMessage[2] - ); - } - }); - } -} diff --git a/packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionTextRecognizerModule.java b/packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionTextRecognizerModule.java deleted file mode 100644 index bd481451656..00000000000 --- a/packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionTextRecognizerModule.java +++ /dev/null @@ -1,78 +0,0 @@ -package io.invertase.firebase.ml.vision; - -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -import com.facebook.react.bridge.*; -import io.invertase.firebase.common.ReactNativeFirebaseModule; - -public class RNFirebaseMLVisionTextRecognizerModule extends ReactNativeFirebaseModule { - private static final String SERVICE_NAME = "MLVisionTextRecognizer"; - private final UniversalFirebaseMLVisionTextRecognizerModule module; - - RNFirebaseMLVisionTextRecognizerModule(ReactApplicationContext reactContext) { - super(reactContext, SERVICE_NAME); - this.module = new UniversalFirebaseMLVisionTextRecognizerModule(reactContext, SERVICE_NAME); - } - - @ReactMethod - public void textRecognizerProcessImage( - String appName, - String stringUri, - Promise promise - ) { - module.textRecognizerProcessImage(appName, stringUri) - .addOnCompleteListener(getExecutor(), task -> { - if (task.isSuccessful()) { - promise.resolve(Arguments.makeNativeMap(task.getResult())); - } else { - String[] errorCodeAndMessage = UniversalFirebaseMLVisionCommon.getErrorCodeAndMessageFromException( - task.getException()); - rejectPromiseWithCodeAndMessage( - promise, - errorCodeAndMessage[0], - errorCodeAndMessage[1], - errorCodeAndMessage[2] - ); - } - }); - } - - @ReactMethod - public void cloudTextRecognizerProcessImage( - String appName, - String stringUri, - ReadableMap cloudTextRecognizerOptions, - Promise promise - ) { - module.cloudTextRecognizerProcessImage(appName, stringUri, Arguments.toBundle(cloudTextRecognizerOptions)) - .addOnCompleteListener(getExecutor(), task -> { - if (task.isSuccessful()) { - promise.resolve(Arguments.makeNativeMap(task.getResult())); - } else { - String[] errorCodeAndMessage = UniversalFirebaseMLVisionCommon.getErrorCodeAndMessageFromException( - task.getException()); - rejectPromiseWithCodeAndMessage( - promise, - errorCodeAndMessage[0], - errorCodeAndMessage[1], - errorCodeAndMessage[2] - ); - } - }); - } -} diff --git a/packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/ReactNativeFirebaseMLVisionPackage.java b/packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/ReactNativeFirebaseMLVisionPackage.java deleted file mode 100644 index 212722a828c..00000000000 --- a/packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/ReactNativeFirebaseMLVisionPackage.java +++ /dev/null @@ -1,62 +0,0 @@ -package io.invertase.firebase.ml.vision; - -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -import com.facebook.react.ReactPackage; -import com.facebook.react.bridge.NativeModule; -import com.facebook.react.bridge.ReactApplicationContext; -import com.facebook.react.uimanager.ViewManager; -import io.invertase.firebase.common.ReactNativeFirebaseJSON; - -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -@SuppressWarnings("unused") -public class ReactNativeFirebaseMLVisionPackage implements ReactPackage { - @Nonnull - @Override - public List createNativeModules(@Nonnull ReactApplicationContext reactContext) { - List modules = new ArrayList<>(); - modules.add(new RNFirebaseMLVisionBarcodeDetectorModule(reactContext)); - modules.add(new RNFirebaseMLVisionTextRecognizerModule(reactContext)); - modules.add(new RNFirebaseMLVisionLandmarkRecognizerModule(reactContext)); - modules.add(new RNFirebaseMLVisionDocumentTextRecognizerModule(reactContext)); - - if (ReactNativeFirebaseJSON - .getSharedInstance() - .getBooleanValue("ml_vision_face_model", false)) { - modules.add(new RNFirebaseMLVisionFaceDetectorModule(reactContext)); - } - - if (ReactNativeFirebaseJSON - .getSharedInstance() - .getBooleanValue("ml_vision_image_label_model", false)) { - modules.add(new RNFirebaseMLVisionImageLabelerModule(reactContext)); - } - - return modules; - } - - @Nonnull - @Override - public List createViewManagers(@Nonnull ReactApplicationContext reactContext) { - return Collections.emptyList(); - } -} diff --git a/packages/ml-vision/e2e/barcode.e2e.js b/packages/ml-vision/e2e/barcode.e2e.js deleted file mode 100644 index eb471ce4271..00000000000 --- a/packages/ml-vision/e2e/barcode.e2e.js +++ /dev/null @@ -1,121 +0,0 @@ -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -let testImageFile; - -function barcodeValidate(barcode) { - barcode.should.be.Object(); - - barcode.boundingBox.should.be.Array(); - barcode.boundingBox.length.should.eql(4); - barcode.boundingBox.forEach($ => $.should.be.Number()); - - barcode.cornerPoints.should.be.Array(); - barcode.cornerPoints.length.should.eql(4); - barcode.cornerPoints.forEach($ => { - $.should.be.Array(); - $.length.should.eql(2); - $.forEach(_ => _.should.be.Number()); - }); - - barcode.format.should.be.Number(); - barcode.valueType.should.be.Number(); - - barcode.displayValue.should.be.String(); - barcode.rawValue.should.be.String(); -} - -describe('mlkit.vision.barcode', () => { - before(async () => { - testImageFile = `${firebase.utils.FilePath.DOCUMENT_DIRECTORY}/barcode.png`; - await firebase - .storage() - .ref('vision/barcode.png') - .writeToFile(testImageFile); - }); - - describe('barcodeDetectorProcessImage()', () => { - it('should throw if image path is not a string', () => { - try { - firebase.vision().barcodeDetectorProcessImage(123); - return Promise.reject(new Error('Did not throw an Error.')); - } catch (error) { - error.message.should.containEql("'localImageFilePath' expected a string local file path"); - return Promise.resolve(); - } - }); - - it('should return a valid response', async () => { - const res = await firebase.vision().barcodeDetectorProcessImage(testImageFile); - - res.should.be.Array(); - res.length.should.be.greaterThan(0); - res.forEach($ => barcodeValidate($)); - }); - }); - - describe('VisionBarcodeDetectorOptions', () => { - it('throws if not an object', async () => { - try { - await firebase.vision().barcodeDetectorProcessImage(testImageFile, '123'); - return Promise.reject(new Error('Did not throw an Error.')); - } catch (error) { - error.message.should.containEql("'barcodeDetectorOptions' expected an object value"); - return Promise.resolve(); - } - }); - - describe('barcodeFormats', () => { - it('should throw if not an array', async () => { - try { - await firebase.vision().barcodeDetectorProcessImage(testImageFile, { - barcodeFormats: 'foo', - }); - return Promise.reject(new Error('Did not throw an Error.')); - } catch (error) { - error.message.should.containEql( - "'barcodeDetectorOptions.barcodeFormats' must be an array of VisionBarcodeFormat types", - ); - return Promise.resolve(); - } - }); - - it('should throw if array item is invalid type', async () => { - try { - await firebase.vision().barcodeDetectorProcessImage(testImageFile, { - barcodeFormats: [firebase.vision.VisionBarcodeFormat.AZTEC, 'foobar'], - }); - return Promise.reject(new Error('Did not throw an Error.')); - } catch (error) { - error.message.should.containEql( - "'barcodeDetectorOptions.barcodeFormats' type at index 1 is invalid", - ); - return Promise.resolve(); - } - }); - - it('sets formats', async () => { - await firebase.vision().barcodeDetectorProcessImage(testImageFile, { - barcodeFormats: [ - firebase.vision.VisionBarcodeFormat.AZTEC, - firebase.vision.VisionBarcodeFormat.DATA_MATRIX, - ], - }); - }); - }); - }); -}); diff --git a/packages/ml-vision/e2e/face.e2e.js b/packages/ml-vision/e2e/face.e2e.js deleted file mode 100644 index 5727021246d..00000000000 --- a/packages/ml-vision/e2e/face.e2e.js +++ /dev/null @@ -1,272 +0,0 @@ -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -let testImageFile; - -describe('mlkit.vision.face', () => { - before(async () => { - testImageFile = `${firebase.utils.FilePath.DOCUMENT_DIRECTORY}/faces.jpg`; - await firebase - .storage() - .ref('vision/faces.jpg') - .writeToFile(testImageFile); - }); - - describe('faceDetectorProcessImage()', () => { - it('should throw if image path is not a string', () => { - try { - firebase.vision().faceDetectorProcessImage(123); - return Promise.reject(new Error('Did not throw an Error.')); - } catch (error) { - error.message.should.containEql("'localImageFilePath' expected a string local file path"); - return Promise.resolve(); - } - }); - - it('returns basic face object with no options enabled', async () => { - const res = await firebase.vision().faceDetectorProcessImage(testImageFile); - - res.should.be.Array(); - res.length.should.be.greaterThan(0); - - res.forEach(i => { - // Currently disabled - i.trackingId.should.eql(-1); - - i.rightEyeOpenProbability.should.eql(-1); - i.leftEyeOpenProbability.should.eql(-1); - i.smilingProbability.should.eql(-1); - - i.landmarks.length.should.eql(0); - i.faceContours.length.should.eql(0); - - i.boundingBox.length.should.eql(4); - - i.headEulerAngleZ.should.be.Number(); - i.headEulerAngleY.should.be.Number(); - }); - }); - - it('returns classifications if enabled', async () => { - const res = await firebase.vision().faceDetectorProcessImage(testImageFile, { - classificationMode: 2, - }); - - res.should.be.Array(); - res.length.should.be.greaterThan(0); - - res.forEach(i => { - i.rightEyeOpenProbability.should.greaterThan(-1); - i.leftEyeOpenProbability.should.greaterThan(-1); - i.smilingProbability.should.greaterThan(-1); - }); - }); - - it('returns landmarks if enabled', async () => { - const res = await firebase.vision().faceDetectorProcessImage(testImageFile, { - landmarkMode: 2, - }); - res.should.be.Array(); - res.length.should.be.greaterThan(0); - - res.forEach(i => { - i.landmarks.length.should.be.greaterThan(0); - - i.landmarks.forEach(l => { - l.type.should.be.Number(); - l.type.should.be.greaterThan(-1); - l.position.length.should.be.eql(2); - l.position.forEach(p => p.should.be.Number()); - }); - }); - }); - - it('returns contours if enabled', async () => { - const res = await firebase.vision().faceDetectorProcessImage(testImageFile, { - contourMode: 2, - }); - res.should.be.Array(); - res.length.should.be.greaterThan(0); - - res.forEach(i => { - i.faceContours.length.should.be.greaterThan(0); - - i.faceContours.forEach(l => { - l.type.should.be.Number(); - l.type.should.be.greaterThan(-1); - l.points.length.should.be.greaterThan(1); - l.points.forEach(p => { - p.should.be.Array(); - p.length.should.be.eql(2); - }); - }); - }); - }); - }); - - describe('VisionFaceDetectorOptions', () => { - it('throws if not an object', async () => { - try { - await firebase.vision().faceDetectorProcessImage(testImageFile, '123'); - return Promise.reject(new Error('Did not throw an Error.')); - } catch (error) { - error.message.should.containEql("'faceDetectorOptions' expected an object value"); - return Promise.resolve(); - } - }); - - describe('classificationMode', () => { - it('throws if mode is incorrect', async () => { - try { - await firebase.vision().faceDetectorProcessImage(testImageFile, { - classificationMode: 'foo', - }); - return Promise.reject(new Error('Did not throw an Error.')); - } catch (error) { - error.message.should.containEql( - "'faceDetectorOptions.classificationMode' invalid classification mode", - ); - return Promise.resolve(); - } - }); - - it('sets classificationMode', async () => { - await firebase.vision().faceDetectorProcessImage(testImageFile, { - classificationMode: - firebase.vision.VisionFaceDetectorClassificationMode.NO_CLASSIFICATIONS, - }); - - await firebase.vision().faceDetectorProcessImage(testImageFile, { - classificationMode: - firebase.vision.VisionFaceDetectorClassificationMode.ALL_CLASSIFICATIONS, - }); - }); - }); - - describe('contourMode', () => { - it('throws if mode is incorrect', async () => { - try { - await firebase.vision().faceDetectorProcessImage(testImageFile, { - contourMode: 'foo', - }); - return Promise.reject(new Error('Did not throw an Error.')); - } catch (error) { - error.message.should.containEql("'faceDetectorOptions.contourMode' invalid contour mode"); - return Promise.resolve(); - } - }); - - it('sets contourMode', async () => { - await firebase.vision().faceDetectorProcessImage(testImageFile, { - contourMode: firebase.vision.VisionFaceDetectorContourMode.NO_CONTOURS, - }); - - await firebase.vision().faceDetectorProcessImage(testImageFile, { - contourMode: firebase.vision.VisionFaceDetectorContourMode.ALL_CONTOURS, - }); - }); - }); - - describe('performanceMode', () => { - it('throws if mode is incorrect', async () => { - try { - await firebase.vision().faceDetectorProcessImage(testImageFile, { - performanceMode: 'foo', - }); - return Promise.reject(new Error('Did not throw an Error.')); - } catch (error) { - error.message.should.containEql( - "'faceDetectorOptions.performanceMode' invalid performance mode", - ); - return Promise.resolve(); - } - }); - - it('sets performanceMode', async () => { - await firebase.vision().faceDetectorProcessImage(testImageFile, { - performanceMode: firebase.vision.VisionFaceDetectorPerformanceMode.FAST, - }); - - await firebase.vision().faceDetectorProcessImage(testImageFile, { - performanceMode: firebase.vision.VisionFaceDetectorPerformanceMode.ACCURATE, - }); - }); - }); - - describe('landmarkMode', () => { - it('throws if mode is incorrect', async () => { - try { - await firebase.vision().faceDetectorProcessImage(testImageFile, { - landmarkMode: 'foo', - }); - return Promise.reject(new Error('Did not throw an Error.')); - } catch (error) { - error.message.should.containEql( - "'faceDetectorOptions.landmarkMode' invalid landmark mode", - ); - return Promise.resolve(); - } - }); - - it('sets landmarkMode', async () => { - await firebase.vision().faceDetectorProcessImage(testImageFile, { - landmarkMode: firebase.vision.VisionFaceDetectorLandmarkMode.NO_LANDMARKS, - }); - - await firebase.vision().faceDetectorProcessImage(testImageFile, { - landmarkMode: firebase.vision.VisionFaceDetectorLandmarkMode.ALL_LANDMARKS, - }); - }); - }); - - describe('minFaceSize', () => { - it('throws if size is not a number', async () => { - try { - await firebase.vision().faceDetectorProcessImage(testImageFile, { - minFaceSize: '0.1', - }); - return Promise.reject(new Error('Did not throw an Error.')); - } catch (error) { - error.message.should.containEql( - "'faceDetectorOptions.minFaceSize' expected a number value between 0 & 1", - ); - return Promise.resolve(); - } - }); - - it('throws if size is not valid', async () => { - try { - await firebase.vision().faceDetectorProcessImage(testImageFile, { - minFaceSize: -1, - }); - return Promise.reject(new Error('Did not throw an Error.')); - } catch (error) { - error.message.should.containEql( - "'faceDetectorOptions.minFaceSize' expected value to be between 0 & 1", - ); - return Promise.resolve(); - } - }); - - it('sets minFaceSize', async () => { - await firebase.vision().faceDetectorProcessImage(testImageFile, { - minFaceSize: 0.3, - }); - }); - }); - }); -}); diff --git a/packages/ml-vision/ios/RNFBMLVision.xcodeproj/project.pbxproj b/packages/ml-vision/ios/RNFBMLVision.xcodeproj/project.pbxproj deleted file mode 100644 index 90c5b755119..00000000000 --- a/packages/ml-vision/ios/RNFBMLVision.xcodeproj/project.pbxproj +++ /dev/null @@ -1,384 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 48; - objects = { - -/* Begin PBXBuildFile section */ - 8B06D3F322F84F7200A5B542 /* RNFBMLVisionLandmarkRecognizerModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B06D3F222F84F7200A5B542 /* RNFBMLVisionLandmarkRecognizerModule.m */; }; - 8B06D3FC22F863AE00A5B542 /* RNFBMLVisionCommon.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B06D3FB22F863AE00A5B542 /* RNFBMLVisionCommon.m */; }; - 8B06D40022F8748C00A5B542 /* RNFBMLVisionFaceDetectorModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B06D3FF22F8748C00A5B542 /* RNFBMLVisionFaceDetectorModule.m */; }; - 8B06D40622F97B4900A5B542 /* RNFBMLVisionDocumentTextRecognizerModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B06D40522F97B4900A5B542 /* RNFBMLVisionDocumentTextRecognizerModule.m */; }; - 8B06D40A22F989EF00A5B542 /* RNFBMLVisionTextRecognizerModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B06D40922F989EF00A5B542 /* RNFBMLVisionTextRecognizerModule.m */; }; - 8B06D40E22F99DF900A5B542 /* RNFBMLVisionImageLabelerModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B06D40D22F99DF900A5B542 /* RNFBMLVisionImageLabelerModule.m */; }; - 8B06D41222F9A15A00A5B542 /* RNFBMLVisionBarcodeDetectorModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B06D41122F9A15A00A5B542 /* RNFBMLVisionBarcodeDetectorModule.m */; }; -/* End PBXBuildFile section */ - -/* Begin PBXCopyFilesBuildPhase section */ - 2744B98021F45429004F8E3F /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 16; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 2744B98221F45429004F8E3F /* libRNFBMLVision.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNFBMLVision.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 8B06D3F122F84F6500A5B542 /* RNFBMLVisionLandmarkRecognizerModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFBMLVisionLandmarkRecognizerModule.h; sourceTree = ""; }; - 8B06D3F222F84F7200A5B542 /* RNFBMLVisionLandmarkRecognizerModule.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNFBMLVisionLandmarkRecognizerModule.m; sourceTree = ""; }; - 8B06D3FA22F863A400A5B542 /* RNFBMLVisionCommon.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFBMLVisionCommon.h; sourceTree = ""; }; - 8B06D3FB22F863AE00A5B542 /* RNFBMLVisionCommon.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNFBMLVisionCommon.m; sourceTree = ""; }; - 8B06D3FE22F8747F00A5B542 /* RNFBMLVisionFaceDetectorModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFBMLVisionFaceDetectorModule.h; sourceTree = ""; }; - 8B06D3FF22F8748C00A5B542 /* RNFBMLVisionFaceDetectorModule.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNFBMLVisionFaceDetectorModule.m; sourceTree = ""; }; - 8B06D40422F97B3600A5B542 /* RNFBMLVisionDocumentTextRecognizerModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFBMLVisionDocumentTextRecognizerModule.h; sourceTree = ""; }; - 8B06D40522F97B4900A5B542 /* RNFBMLVisionDocumentTextRecognizerModule.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNFBMLVisionDocumentTextRecognizerModule.m; sourceTree = ""; }; - 8B06D40822F989E400A5B542 /* RNFBMLVisionTextRecognizerModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFBMLVisionTextRecognizerModule.h; sourceTree = ""; }; - 8B06D40922F989EF00A5B542 /* RNFBMLVisionTextRecognizerModule.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNFBMLVisionTextRecognizerModule.m; sourceTree = ""; }; - 8B06D40C22F99DEF00A5B542 /* RNFBMLVisionImageLabelerModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFBMLVisionImageLabelerModule.h; sourceTree = ""; }; - 8B06D40D22F99DF900A5B542 /* RNFBMLVisionImageLabelerModule.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNFBMLVisionImageLabelerModule.m; sourceTree = ""; }; - 8B06D41022F9A14B00A5B542 /* RNFBMLVisionBarcodeDetectorModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFBMLVisionBarcodeDetectorModule.h; sourceTree = ""; }; - 8B06D41122F9A15A00A5B542 /* RNFBMLVisionBarcodeDetectorModule.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNFBMLVisionBarcodeDetectorModule.m; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 2744B97F21F45429004F8E3F /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 2744B97521F452B8004F8E3F /* Products */ = { - isa = PBXGroup; - children = ( - 2744B98221F45429004F8E3F /* libRNFBMLVision.a */, - ); - name = Products; - sourceTree = ""; - }; - 2744B98321F45429004F8E3F /* RNFBMLVision */ = { - isa = PBXGroup; - children = ( - 8B06D3F122F84F6500A5B542 /* RNFBMLVisionLandmarkRecognizerModule.h */, - 8B06D3F222F84F7200A5B542 /* RNFBMLVisionLandmarkRecognizerModule.m */, - 8B06D3FA22F863A400A5B542 /* RNFBMLVisionCommon.h */, - 8B06D3FB22F863AE00A5B542 /* RNFBMLVisionCommon.m */, - 8B06D3FE22F8747F00A5B542 /* RNFBMLVisionFaceDetectorModule.h */, - 8B06D3FF22F8748C00A5B542 /* RNFBMLVisionFaceDetectorModule.m */, - 8B06D40422F97B3600A5B542 /* RNFBMLVisionDocumentTextRecognizerModule.h */, - 8B06D40522F97B4900A5B542 /* RNFBMLVisionDocumentTextRecognizerModule.m */, - 8B06D40822F989E400A5B542 /* RNFBMLVisionTextRecognizerModule.h */, - 8B06D40922F989EF00A5B542 /* RNFBMLVisionTextRecognizerModule.m */, - 8B06D40C22F99DEF00A5B542 /* RNFBMLVisionImageLabelerModule.h */, - 8B06D40D22F99DF900A5B542 /* RNFBMLVisionImageLabelerModule.m */, - 8B06D41022F9A14B00A5B542 /* RNFBMLVisionBarcodeDetectorModule.h */, - 8B06D41122F9A15A00A5B542 /* RNFBMLVisionBarcodeDetectorModule.m */, - ); - path = RNFBMLVision; - sourceTree = ""; - }; - 3323F52AAFE26B7384BE4DE3 = { - isa = PBXGroup; - children = ( - 2744B98321F45429004F8E3F /* RNFBMLVision */, - 2744B97521F452B8004F8E3F /* Products */, - ); - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 2744B98121F45429004F8E3F /* RNFBMLVision */ = { - isa = PBXNativeTarget; - buildConfigurationList = 2744B98821F45429004F8E3F /* Build configuration list for PBXNativeTarget "RNFBMLVision" */; - buildPhases = ( - 2744B97E21F45429004F8E3F /* Sources */, - 2744B97F21F45429004F8E3F /* Frameworks */, - 2744B98021F45429004F8E3F /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = RNFBMLVision; - productName = RNFBMLVision; - productReference = 2744B98221F45429004F8E3F /* libRNFBMLVision.a */; - productType = "com.apple.product-type.library.static"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 3323F95273A95DB34F55C6D7 /* Project object */ = { - isa = PBXProject; - attributes = { - CLASSPREFIX = RNFBMLVision; - LastUpgradeCheck = 1010; - ORGANIZATIONNAME = Invertase; - TargetAttributes = { - 2744B98121F45429004F8E3F = { - CreatedOnToolsVersion = 10.1; - ProvisioningStyle = Automatic; - }; - }; - }; - buildConfigurationList = 3323F1C5716BA966BBBB95A4 /* Build configuration list for PBXProject "RNFBMLVision" */; - compatibilityVersion = "Xcode 8.0"; - developmentRegion = English; - hasScannedForEncodings = 0; - knownRegions = ( - English, - en, - ); - mainGroup = 3323F52AAFE26B7384BE4DE3; - productRefGroup = 2744B97521F452B8004F8E3F /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 2744B98121F45429004F8E3F /* RNFBMLVision */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXSourcesBuildPhase section */ - 2744B97E21F45429004F8E3F /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 8B06D40E22F99DF900A5B542 /* RNFBMLVisionImageLabelerModule.m in Sources */, - 8B06D40622F97B4900A5B542 /* RNFBMLVisionDocumentTextRecognizerModule.m in Sources */, - 8B06D40A22F989EF00A5B542 /* RNFBMLVisionTextRecognizerModule.m in Sources */, - 8B06D3F322F84F7200A5B542 /* RNFBMLVisionLandmarkRecognizerModule.m in Sources */, - 8B06D3FC22F863AE00A5B542 /* RNFBMLVisionCommon.m in Sources */, - 8B06D40022F8748C00A5B542 /* RNFBMLVisionFaceDetectorModule.m in Sources */, - 8B06D41222F9A15A00A5B542 /* RNFBMLVisionBarcodeDetectorModule.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - 2744B98921F45429004F8E3F /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - OTHER_LDFLAGS = "-ObjC"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 2744B98A21F45429004F8E3F /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - OTHER_LDFLAGS = "-ObjC"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - 3323F77D701E1896E6D239CF /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "${BUILT_PRODUCTS_DIR}/**", - "${SRCROOT}/../../../ios/Firebase/**", - "$(FIREBASE_SEARCH_PATH)/Firebase/**", - "$(SRCROOT)/../../../ios/Pods/FirebaseMlkitLanguage/Frameworks", - "$(SRCROOT)/../../../tests/ios/Pods/FirebaseMlkitLanguage/Frameworks", - ); - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(REACT_SEARCH_PATH)/React/**", - "$(SRCROOT)/../../react-native/React/**", - "$(SRCROOT)/../../react-native-firebase/ios/**", - "$(FIREBASE_SEARCH_PATH)/Firebase/**", - "${SRCROOT}/../../../ios/Firebase/**", - "${SRCROOT}/../../../ios/Pods/Headers/Public/**", - "${SRCROOT}/../../../tests/ios/Pods/Headers/Public/**", - "$(SRCROOT)/../../../node_modules/react-native/React/**", - "$(SRCROOT)/../../../node_modules/react-native-firebase/ios/**", - "$(SRCROOT)/../../../packages/app/ios/**", - ); - IPHONEOS_DEPLOYMENT_TARGET = 10.0; - LIBRARY_SEARCH_PATHS = "$(inherited)"; - MACH_O_TYPE = staticlib; - OTHER_LDFLAGS = "$(inherited)"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - }; - name = Release; - }; - 3323F7E33E1559A2B9826720 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "${BUILT_PRODUCTS_DIR}/**", - "${SRCROOT}/../../../ios/Firebase/**", - "$(FIREBASE_SEARCH_PATH)/Firebase/**", - "$(SRCROOT)/../../../ios/Pods/FirebaseMlkitLanguage/Frameworks", - ); - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(REACT_SEARCH_PATH)/React/**", - "$(SRCROOT)/../../react-native/React/**", - "$(SRCROOT)/../../react-native-firebase/ios/**", - "$(FIREBASE_SEARCH_PATH)/Firebase/**", - "${SRCROOT}/../../../ios/Firebase/**", - "${SRCROOT}/../../../ios/Pods/Headers/Public/**", - "${SRCROOT}/../../../tests/ios/Pods/Headers/Public/**", - "$(SRCROOT)/../../../node_modules/react-native/React/**", - "$(SRCROOT)/../../../node_modules/react-native-firebase/ios/**", - "$(SRCROOT)/../../../packages/app/ios/**", - ); - IPHONEOS_DEPLOYMENT_TARGET = 10.0; - LIBRARY_SEARCH_PATHS = "$(inherited)"; - MACH_O_TYPE = staticlib; - ONLY_ACTIVE_ARCH = YES; - OTHER_LDFLAGS = "$(inherited)"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - }; - name = Debug; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 2744B98821F45429004F8E3F /* Build configuration list for PBXNativeTarget "RNFBMLVision" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 2744B98921F45429004F8E3F /* Debug */, - 2744B98A21F45429004F8E3F /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 3323F1C5716BA966BBBB95A4 /* Build configuration list for PBXProject "RNFBMLVision" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 3323F7E33E1559A2B9826720 /* Debug */, - 3323F77D701E1896E6D239CF /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 3323F95273A95DB34F55C6D7 /* Project object */; -} diff --git a/packages/ml-vision/ios/RNFBMLVision.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/packages/ml-vision/ios/RNFBMLVision.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 919434a6254..00000000000 --- a/packages/ml-vision/ios/RNFBMLVision.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/packages/ml-vision/ios/RNFBMLVision.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/ml-vision/ios/RNFBMLVision.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d981003d6..00000000000 --- a/packages/ml-vision/ios/RNFBMLVision.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/packages/ml-vision/ios/RNFBMLVision.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/packages/ml-vision/ios/RNFBMLVision.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings deleted file mode 100644 index 0c67376ebac..00000000000 --- a/packages/ml-vision/ios/RNFBMLVision.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/packages/ml-vision/ios/RNFBMLVision.xcodeproj/xcshareddata/IDETemplateMacros.plist b/packages/ml-vision/ios/RNFBMLVision.xcodeproj/xcshareddata/IDETemplateMacros.plist deleted file mode 100644 index 63f0a6e5dd8..00000000000 --- a/packages/ml-vision/ios/RNFBMLVision.xcodeproj/xcshareddata/IDETemplateMacros.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - FILEHEADER - -/** - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - - diff --git a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionBarcodeDetectorModule.h b/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionBarcodeDetectorModule.h deleted file mode 100644 index 7e40c1b65e7..00000000000 --- a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionBarcodeDetectorModule.h +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#import -#import -#import - -@interface RNFBMLVisionBarcodeDetectorModule : NSObject - -@end \ No newline at end of file diff --git a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionBarcodeDetectorModule.m b/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionBarcodeDetectorModule.m deleted file mode 100644 index 23e0a0b16ec..00000000000 --- a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionBarcodeDetectorModule.m +++ /dev/null @@ -1,257 +0,0 @@ -/** - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#import -#import -#import "RNFBMLVisionBarcodeDetectorModule.h" -#import "RNFBMLVisionCommon.h" - -@implementation RNFBMLVisionBarcodeDetectorModule -#pragma mark - -#pragma mark Module Setup - -RCT_EXPORT_MODULE(); - -#pragma mark - -#pragma mark Firebase ML Kit Vision Methods - -RCT_EXPORT_METHOD(barcodeDetectorProcessImage: - (FIRApp *) firebaseApp - : (NSString *)filePath - : (NSDictionary *)barcodeDetectorOptions - : (RCTPromiseResolveBlock)resolve - : (RCTPromiseRejectBlock)reject -) { - [RNFBMLVisionCommon UIImageForFilePath:filePath completion:^(NSArray *errorCodeMessageArray, UIImage *image) { - if (errorCodeMessageArray != nil) { - [RNFBSharedUtils rejectPromiseWithUserInfo:reject userInfo:(NSMutableDictionary *) @{ - @"code": errorCodeMessageArray[0], - @"message": errorCodeMessageArray[1], - }]; - return; - } - - FIRVisionImage *visionImage = [[FIRVisionImage alloc] initWithImage:image]; - FIRVision *vision = [FIRVision visionForApp:firebaseApp]; - - FIRVisionBarcodeFormat barcodeFormat = nil; - - if (barcodeDetectorOptions[@"barcodeFormats"]) { - NSArray *formats = barcodeDetectorOptions[@"barcodeFormats"]; - for (id format in formats) { - if (barcodeFormat == nil) { - barcodeFormat = [format integerValue]; - } else { - barcodeFormat |= [format integerValue]; - } - } - } else { - barcodeFormat = FIRVisionBarcodeFormatAll; - } - - FIRVisionBarcodeDetectorOptions *options = [[FIRVisionBarcodeDetectorOptions alloc] initWithFormats:barcodeFormat]; - - FIRVisionBarcodeDetector *barcodeDetector = [vision barcodeDetectorWithOptions:options]; - [barcodeDetector detectInImage:visionImage completion:^(NSArray *barcodes, NSError *error) { - if (error != nil) { - [RNFBSharedUtils rejectPromiseWithUserInfo:reject userInfo:(NSMutableDictionary *) @{ - @"code": @"unknown", - @"message": [error localizedDescription], - }]; - return; - } - - if (barcodes == nil) { - resolve(@[]); - return; - } - - resolve([self getBarcodesList:barcodes]); - }]; - }]; -} - -- (NSArray *)getBarcodesList:(NSArray *)barcodes { - NSMutableArray *barcodeListFormatted = [[NSMutableArray alloc] init]; - - for (FIRVisionBarcode *barcode in barcodes) { - NSMutableDictionary *formattedBarcode = [[NSMutableDictionary alloc] init]; - - formattedBarcode[@"boundingBox"] = [RNFBMLVisionCommon rectToIntArray:barcode.frame]; - formattedBarcode[@"cornerPoints"] = [RNFBMLVisionCommon visionPointsToArray:barcode.cornerPoints]; - formattedBarcode[@"format"] = @(barcode.format); - formattedBarcode[@"valueType"] = @(barcode.valueType); - formattedBarcode[@"displayValue"] = barcode.displayValue; - formattedBarcode[@"rawValue"] = barcode.rawValue; - - if (barcode.email != nil) formattedBarcode[@"email"] = [self getEmailMap:barcode.email]; - if (barcode.phone != nil) formattedBarcode[@"phone"] = [self getPhoneMap:barcode.phone]; - if (barcode.sms != nil) formattedBarcode[@"sms"] = [self getSMSMap:barcode.sms]; - if (barcode.URL != nil) formattedBarcode[@"url"] = [self getURLMap:barcode.URL]; - if (barcode.wifi != nil) formattedBarcode[@"wifi"] = [self getWiFiMap:barcode.wifi]; - if (barcode.geoPoint != nil) formattedBarcode[@"geoPoint"] = [self getGeoPointList:barcode.geoPoint]; - if (barcode.contactInfo != nil) formattedBarcode[@"contactInfo"] = [self getContactInfoMap:barcode.contactInfo]; - if (barcode.calendarEvent != nil) formattedBarcode[@"calendarEvent"] = [self getCalendarEventMap:barcode.calendarEvent]; - if (barcode.driverLicense != nil) formattedBarcode[@"driverLicense"] = [self getDriverLicenseMap:barcode.driverLicense]; - - [barcodeListFormatted addObject:formattedBarcode]; - } - - return barcodeListFormatted; -} - -- (NSDictionary *)getEmailMap:(FIRVisionBarcodeEmail *)email { - return @{ - @"address": email.address ?: (id) [NSNull null], - @"body": email.body ?: (id) [NSNull null], - @"subject": email.subject ?: (id) [NSNull null], - }; -} - -- (NSDictionary *)getPhoneMap:(FIRVisionBarcodePhone *)phone { - return @{ - @"number": phone.number ?: (id) [NSNull null], - @"type": @(phone.type), - }; -} - -- (NSDictionary *)getSMSMap:(FIRVisionBarcodeSMS *)sms { - return @{ - @"message": sms.message ?: (id) [NSNull null], - @"phoneNumber": sms.phoneNumber ?: (id) [NSNull null], - }; -} - -- (NSDictionary *)getURLMap:(FIRVisionBarcodeURLBookmark *)url { - return @{ - @"title": url.title ?: (id) [NSNull null], - @"url": url.url ?: (id) [NSNull null], - }; -} - -- (NSDictionary *)getWiFiMap:(FIRVisionBarcodeWiFi *)wifi { - return @{ - @"encryptionType": @(wifi.type), - @"password": wifi.password ?: (id) [NSNull null], - @"ssid": wifi.ssid ?: (id) [NSNull null], - }; -} - -- (NSArray *)getGeoPointList:(FIRVisionBarcodeGeoPoint *)geoPoint { - return @[@(geoPoint.latitude), @(geoPoint.longitude)]; -} - -- (NSDictionary *)getPersonNameMap:(FIRVisionBarcodePersonName *)name { - return @{ - @"first": name.first ?: (id) [NSNull null], - @"formatted": name.formattedName ?: (id) [NSNull null], - @"last": name.last ?: (id) [NSNull null], - @"middle": name.middle ?: (id) [NSNull null], - @"prefix": name.prefix ?: (id) [NSNull null], - @"pronunciation": name.pronounciation ?: (id) [NSNull null], - @"suffix": name.suffix ?: (id) [NSNull null], - }; -} - -- (NSDictionary *)getAddressMap:(FIRVisionBarcodeAddress *)address { - return @{ - @"lines": address.addressLines ?: @[], - @"type": @(address.type), - }; -} - -- (NSDictionary *)getContactInfoMap:(FIRVisionBarcodeContactInfo *)contactInfo { - NSMutableDictionary *contactInfoFormatted = [@{ - @"title": contactInfo.jobTitle ?: (id) [NSNull null], - @"organisation": contactInfo.organization ?: (id) [NSNull null], - } mutableCopy]; - - // Name - if (contactInfo.name != nil) { - contactInfoFormatted[@"name"] = [self getPersonNameMap:contactInfo.name]; - } - - // URLs - NSMutableArray *urls = [@[] mutableCopy]; - if (contactInfo.urls != nil) { - for (NSString *url in contactInfo.urls) { - [urls addObject:url]; - } - } - contactInfoFormatted[@"urls"] = urls; - - // Phones - NSMutableArray *phones = [@[] mutableCopy]; - if (contactInfo.phones != nil) { - for (FIRVisionBarcodePhone *phone in contactInfo.phones) { - [phones addObject:[self getPhoneMap:phone]]; - } - } - contactInfoFormatted[@"phones"] = phones; - - // Emails - NSMutableArray *emails = [@[] mutableCopy]; - if (contactInfo.emails != nil) { - for (FIRVisionBarcodeEmail *email in contactInfo.emails) { - [emails addObject:[self getEmailMap:email]]; - } - } - contactInfoFormatted[@"emails"] = phones; - - // Addresses - NSMutableArray *addresses = [@[] mutableCopy]; - if (contactInfo.addresses != nil) { - for (FIRVisionBarcodeAddress *address in contactInfo.addresses) { - [emails addObject:[self getAddressMap:address]]; - } - } - contactInfoFormatted[@"addresses"] = addresses; - - return contactInfoFormatted; -} - -- (NSDictionary *)getCalendarEventMap:(FIRVisionBarcodeCalendarEvent *)event { - return @{ - @"description": event.description ?: (id) [NSNull null], - @"end": event.end ? [RNFBSharedUtils getISO8601String:event.end] : (id) [NSNull null], - @"location": event.location ?: (id) [NSNull null], - @"organizer": event.organizer ?: (id) [NSNull null], - @"start": event.start ? [RNFBSharedUtils getISO8601String:event.start] : (id) [NSNull null], - @"status": event.status ?: (id) [NSNull null], - @"summary": event.summary ?: (id) [NSNull null], - }; -} - -- (NSDictionary *)getDriverLicenseMap:(FIRVisionBarcodeDriverLicense *)license { - return @{ - @"addressCity": license.addressCity ?: (id) [NSNull null], - @"addressState": license.addressState ?: (id) [NSNull null], - @"addressZip": license.addressZip ?: (id) [NSNull null], - @"birthDate": license.birthDate ?: (id) [NSNull null], - @"documentType": license.documentType ?: (id) [NSNull null], - @"expiryDate": license.expiryDate ?: (id) [NSNull null], - @"firstName": license.firstName ?: (id) [NSNull null], - @"gender": license.gender ?: (id) [NSNull null], - @"issueDate": license.issuingDate ?: (id) [NSNull null], - @"issuingCountry": license.issuingCountry ?: (id) [NSNull null], - @"lastName": license.lastName ?: (id) [NSNull null], - @"licenseNumber": license.licenseNumber ?: (id) [NSNull null], - @"middleName": license.middleName ?: (id) [NSNull null], - }; -} - -@end diff --git a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionCommon.m b/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionCommon.m deleted file mode 100644 index 82fe1da2124..00000000000 --- a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionCommon.m +++ /dev/null @@ -1,175 +0,0 @@ -/** - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - - -#import -#import -#import "RNFBMLVisionCommon.h" - -@implementation RNFBMLVisionCommon - -+ (NSArray *)rectToIntArray:(CGRect)rect { - CGSize size = rect.size; - CGPoint point = rect.origin; - return @[@(point.x), @(point.y), @(point.x + size.width), @(point.y + size.height)]; -} - -+ (NSDictionary *)contourToDict:(FIRVisionFaceContour *)visionFaceContour { - NSMutableDictionary *visionFaceContourDict = [[NSMutableDictionary alloc] init]; - - if (visionFaceContour == nil) { - return visionFaceContourDict; - } - - NSMutableArray *pointsFormatted = [[NSMutableArray alloc] init]; - for (FIRVisionPoint *point in visionFaceContour.points) { - [pointsFormatted addObject:[self arrayForFIRVisionPoint:point]]; - } - - visionFaceContourDict[@"type"] = [self contourTypeToInt:visionFaceContour.type]; - visionFaceContourDict[@"points"] = pointsFormatted; - - return visionFaceContourDict; -} - -+ (NSNumber *)contourTypeToInt:(NSString *)faceContourType { - if ([@"All" isEqualToString:faceContourType]) { - return @1; - } - if ([@"Face" isEqualToString:faceContourType]) { - return @2; - } - if ([@"LeftEyebrowTop" isEqualToString:faceContourType]) { - return @3; - } - if ([@"LeftEyebrowBottom" isEqualToString:faceContourType]) { - return @4; - } - if ([@"RightEyebrowTop" isEqualToString:faceContourType]) { - return @5; - } - if ([@"RightEyebrowBottom" isEqualToString:faceContourType]) { - return @6; - } - if ([@"LeftEye" isEqualToString:faceContourType]) { - return @7; - } - if ([@"RightEye" isEqualToString:faceContourType]) { - return @8; - } - if ([@"UpperLipTop" isEqualToString:faceContourType]) { - return @9; - } - if ([@"UpperLipBottom" isEqualToString:faceContourType]) { - return @10; - } - if ([@"LowerLipTop" isEqualToString:faceContourType]) { - return @11; - } - if ([@"LowerLipBottom" isEqualToString:faceContourType]) { - return @12; - } - if ([@"NoseBridge" isEqualToString:faceContourType]) { - return @13; - } - if ([@"NoseBottom" isEqualToString:faceContourType]) { - return @14; - } - return @-1; -} - -+ (NSDictionary *)landmarkToDict:(FIRVisionFaceLandmark *)visionFaceLandmark { - NSMutableDictionary *visionFaceLandmarkDict = [[NSMutableDictionary alloc] init]; - - if (visionFaceLandmark == nil) { - return visionFaceLandmarkDict; - } - - visionFaceLandmarkDict[@"type"] = [self landmarkTypeToInt:visionFaceLandmark.type]; - visionFaceLandmarkDict[@"position"] = [self arrayForFIRVisionPoint:visionFaceLandmark.position]; - return visionFaceLandmarkDict; -} - -+ (NSNumber *)landmarkTypeToInt:(NSString *)faceLandmarkType { - if ([@"MouthBottom" isEqualToString:faceLandmarkType]) { - return @0; - } - if ([@"MouthRight" isEqualToString:faceLandmarkType]) { - return @11; - } - if ([@"MouthLeft" isEqualToString:faceLandmarkType]) { - return @5; - } - if ([@"LeftEar" isEqualToString:faceLandmarkType]) { - return @3; - } - if ([@"RightEar" isEqualToString:faceLandmarkType]) { - return @9; - } - if ([@"LeftEye" isEqualToString:faceLandmarkType]) { - return @4; - } - if ([@"RightEye" isEqualToString:faceLandmarkType]) { - return @10; - } - if ([@"LeftCheek" isEqualToString:faceLandmarkType]) { - return @1; - } - if ([@"RightCheek" isEqualToString:faceLandmarkType]) { - return @7; - } - if ([@"NoseBase" isEqualToString:faceLandmarkType]) { - return @6; - } - return @-1; -} - -+ (NSArray *)visionPointsToArray:(NSArray *_Nullable)points { - if (points == nil) { - return @[]; - } - - NSMutableArray *pointsArray = [[NSMutableArray alloc] init]; - for (NSValue *point in points) { - [pointsArray addObject:[self arrayForCGPoint:point.CGPointValue]]; - } - - return pointsArray; -} - -+ (NSArray *)arrayForCGPoint:(CGPoint)point { - return @[@(point.x), @(point.y)]; -} - -+ (NSArray *)arrayForFIRVisionPoint:(FIRVisionPoint *)point { - return @[point.x, point.y]; -} - -+ (void)UIImageForFilePath:(NSString *)localFilePath completion:(void (^)( - NSArray *errorCodeMessageArray, - UIImage *image -))completion { - if (![[NSFileManager defaultManager] fileExistsAtPath:localFilePath]) { - completion(@[@"file-not-found", @"The local file specified does not exist on the device."], nil); - } else { - dispatch_async(dispatch_get_main_queue(), ^{ - completion(nil, [RCTConvert UIImage:localFilePath]); - }); - } -} - -@end diff --git a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionDocumentTextRecognizerModule.h b/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionDocumentTextRecognizerModule.h deleted file mode 100644 index 1a4c094bfd3..00000000000 --- a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionDocumentTextRecognizerModule.h +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#import -#import -#import - -@interface RNFBMLVisionDocumentTextRecognizerModule : NSObject - -@end \ No newline at end of file diff --git a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionFaceDetectorModule.m b/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionFaceDetectorModule.m deleted file mode 100644 index 891c3d334eb..00000000000 --- a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionFaceDetectorModule.m +++ /dev/null @@ -1,149 +0,0 @@ -/** - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#import -#import -#import "RNFBMLVisionFaceDetectorModule.h" -#import "RNFBMLVisionCommon.h" - -@implementation RNFBMLVisionFaceDetectorModule -#pragma mark - -#pragma mark Module Setup - -RCT_EXPORT_MODULE(); - -#pragma mark - -#pragma mark Firebase ML Kit Vision Methods - -RCT_EXPORT_METHOD(faceDetectorProcessImage: - (FIRApp *) firebaseApp - : (NSString *)filePath - : (NSDictionary *)faceDetectorOptions - : (RCTPromiseResolveBlock)resolve - : (RCTPromiseRejectBlock)reject -) { - [RNFBMLVisionCommon UIImageForFilePath:filePath completion:^(NSArray *errorCodeMessageArray, UIImage *image) { - if (errorCodeMessageArray != nil) { - [RNFBSharedUtils rejectPromiseWithUserInfo:reject userInfo:(NSMutableDictionary *) @{ - @"code": errorCodeMessageArray[0], - @"message": errorCodeMessageArray[1], - }]; - return; - } - - FIRVisionImage *visionImage = [[FIRVisionImage alloc] initWithImage:image]; - FIRVision *vision = [FIRVision visionForApp:firebaseApp]; - - FIRVisionFaceDetectorOptions *options = [[FIRVisionFaceDetectorOptions alloc] init]; - - NSInteger *classificationMode = [faceDetectorOptions[@"classificationMode"] integerValue]; - if (classificationMode == 1) { - options.classificationMode = FIRVisionFaceDetectorClassificationModeNone; - } else if (classificationMode == 2) { - options.classificationMode = FIRVisionFaceDetectorClassificationModeAll; - } - - NSInteger *contourMode = [faceDetectorOptions[@"contourMode"] integerValue]; - if (contourMode == 1) { - options.contourMode = FIRVisionFaceDetectorContourModeNone; - } else if (contourMode == 2) { - options.contourMode = FIRVisionFaceDetectorContourModeAll; - } - - NSInteger *landmarkMode = [faceDetectorOptions[@"landmarkMode"] integerValue]; - if (landmarkMode == 1) { - options.landmarkMode = FIRVisionFaceDetectorLandmarkModeNone; - } else if (landmarkMode == 2) { - options.landmarkMode = FIRVisionFaceDetectorLandmarkModeAll; - } - - NSInteger *performanceMode = [faceDetectorOptions[@"performanceMode"] integerValue]; - if (performanceMode == 1) { - options.performanceMode = FIRVisionFaceDetectorPerformanceModeFast; - } else if (performanceMode == 2) { - options.performanceMode = FIRVisionFaceDetectorPerformanceModeAccurate; - } - - options.minFaceSize = [faceDetectorOptions[@"minFaceSize"] doubleValue]; - - FIRVisionFaceDetector *faceDetector = [vision faceDetectorWithOptions:options]; - [faceDetector processImage:visionImage completion:^(NSArray *faces, NSError *error) { - if (error != nil) { - [RNFBSharedUtils rejectPromiseWithUserInfo:reject userInfo:(NSMutableDictionary *) @{ - @"code": @"unknown", - @"message": [error localizedDescription], - }]; - return; - } - - NSMutableArray *facesFormatted = [[NSMutableArray alloc] init]; - - for (FIRVisionFace *face in faces) { - NSMutableDictionary *visionFace = [[NSMutableDictionary alloc] init]; - - visionFace[@"boundingBox"] = [RNFBMLVisionCommon rectToIntArray:face.frame]; - - visionFace[@"headEulerAngleY"] = face.hasHeadEulerAngleY ? @(face.headEulerAngleY) : @(-1); - visionFace[@"headEulerAngleZ"] = face.hasHeadEulerAngleZ ? @(face.headEulerAngleZ) : @(-1); - visionFace[@"leftEyeOpenProbability"] = face.hasLeftEyeOpenProbability ? @(face.leftEyeOpenProbability) : @(-1); - visionFace[@"rightEyeOpenProbability"] = face.hasRightEyeOpenProbability ? @(face.rightEyeOpenProbability) : @(-1); - visionFace[@"smilingProbability"] = face.hasSmilingProbability ? @(face.smilingProbability) : @(-1); - visionFace[@"trackingId"] = face.hasTrackingID ? @(face.trackingID) : @(-1); - - // Contours - NSMutableArray *faceContours = [[NSMutableArray alloc] init]; - if (contourMode == (NSInteger *) 2) { - [faceContours addObject:[RNFBMLVisionCommon contourToDict:[face contourOfType:FIRFaceContourTypeAll]]]; - [faceContours addObject:[RNFBMLVisionCommon contourToDict:[face contourOfType:FIRFaceContourTypeFace]]]; - [faceContours addObject:[RNFBMLVisionCommon contourToDict:[face contourOfType:FIRFaceContourTypeLeftEyebrowTop]]]; - [faceContours addObject:[RNFBMLVisionCommon contourToDict:[face contourOfType:FIRFaceContourTypeLeftEyebrowBottom]]]; - [faceContours addObject:[RNFBMLVisionCommon contourToDict:[face contourOfType:FIRFaceContourTypeRightEyebrowTop]]]; - [faceContours addObject:[RNFBMLVisionCommon contourToDict:[face contourOfType:FIRFaceContourTypeRightEyebrowBottom]]]; - [faceContours addObject:[RNFBMLVisionCommon contourToDict:[face contourOfType:FIRFaceContourTypeLeftEye]]]; - [faceContours addObject:[RNFBMLVisionCommon contourToDict:[face contourOfType:FIRFaceContourTypeRightEye]]]; - [faceContours addObject:[RNFBMLVisionCommon contourToDict:[face contourOfType:FIRFaceContourTypeUpperLipTop]]]; - [faceContours addObject:[RNFBMLVisionCommon contourToDict:[face contourOfType:FIRFaceContourTypeUpperLipBottom]]]; - [faceContours addObject:[RNFBMLVisionCommon contourToDict:[face contourOfType:FIRFaceContourTypeLowerLipTop]]]; - [faceContours addObject:[RNFBMLVisionCommon contourToDict:[face contourOfType:FIRFaceContourTypeLowerLipBottom]]]; - [faceContours addObject:[RNFBMLVisionCommon contourToDict:[face contourOfType:FIRFaceContourTypeNoseBridge]]]; - [faceContours addObject:[RNFBMLVisionCommon contourToDict:[face contourOfType:FIRFaceContourTypeNoseBottom]]]; - } - visionFace[@"faceContours"] = faceContours; - - // Face Landmarks - NSMutableArray *faceLandmarks = [[NSMutableArray alloc] init]; - if (landmarkMode == (NSInteger *) 2) { - [faceLandmarks addObject:[RNFBMLVisionCommon landmarkToDict:[face landmarkOfType:FIRFaceLandmarkTypeMouthBottom]]]; - [faceLandmarks addObject:[RNFBMLVisionCommon landmarkToDict:[face landmarkOfType:FIRFaceLandmarkTypeMouthRight]]]; - [faceLandmarks addObject:[RNFBMLVisionCommon landmarkToDict:[face landmarkOfType:FIRFaceLandmarkTypeMouthLeft]]]; - [faceLandmarks addObject:[RNFBMLVisionCommon landmarkToDict:[face landmarkOfType:FIRFaceLandmarkTypeRightEye]]]; - [faceLandmarks addObject:[RNFBMLVisionCommon landmarkToDict:[face landmarkOfType:FIRFaceLandmarkTypeLeftEye]]]; - [faceLandmarks addObject:[RNFBMLVisionCommon landmarkToDict:[face landmarkOfType:FIRFaceLandmarkTypeRightCheek]]]; - [faceLandmarks addObject:[RNFBMLVisionCommon landmarkToDict:[face landmarkOfType:FIRFaceLandmarkTypeLeftCheek]]]; - [faceLandmarks addObject:[RNFBMLVisionCommon landmarkToDict:[face landmarkOfType:FIRFaceLandmarkTypeNoseBase]]]; - } - visionFace[@"landmarks"] = faceLandmarks; - - [facesFormatted addObject:visionFace]; - } - - resolve(facesFormatted); - }]; - }]; -} - -@end diff --git a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionTextRecognizerModule.h b/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionTextRecognizerModule.h deleted file mode 100644 index 29a772cf6fc..00000000000 --- a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionTextRecognizerModule.h +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#import -#import -#import - -@interface RNFBMLVisionTextRecognizerModule : NSObject - -@end \ No newline at end of file diff --git a/packages/ml-vision/lib/BarcodeDetectorTypes.d.ts b/packages/ml-vision/lib/BarcodeDetectorTypes.d.ts deleted file mode 100644 index 8e0cce321f4..00000000000 --- a/packages/ml-vision/lib/BarcodeDetectorTypes.d.ts +++ /dev/null @@ -1,1029 +0,0 @@ -import { FirebaseVisionTypes } from '.'; - -/** - * Firebase ML Kit package for React Native. - * - * #### Example 1 - * - * Access the firebase export from the `ml-vision` package: - * - * ```js - * import { firebase } from '@react-native-firebase/ml-vision'; - * - * // firebase.vision().X - * ``` - * - * #### Example 2 - * - * Using the default export from the `ml-vision` package: - * - * ```js - * import vision from '@react-native-firebase/ml-vision'; - * - * // vision().X - * ``` - * - * #### Example 3 - * - * Using the default export from the `app` package: - * - * ```js - * import firebase from '@react-native-firebase/app'; - * import '@react-native-firebase/ml-vision'; - * - * // firebase.vision().X - * ``` - * - * @firebase ml-vision - */ -export namespace MLKitVision { - /** - * A representation of a barcode detected in an image. - * - * #### Example - * - * ```js - * const [barcode, ...otherBarcodes] = await firebase.vision().barcodeDetectorProcessImage(filePath); - * console.log(barcode); - * ``` - */ - export interface VisionBarcode { - /** - * Returns the bounding rectangle of the detected barcode. - */ - boundingBox: FirebaseVisionTypes.VisionRectangle; - - /** - * Gets the four corner points in clockwise direction starting with top-left. Due to the possible perspective distortions, this is not necessarily a rectangle. Parts of the region could be outside of the image. - */ - cornerPoints: FirebaseVisionTypes.VisionPoint[]; - - /** - * Returns the barcode format, for example `VisionBarcodeFormat.QR_CODE` - * - * Use with `VisionBarcodeFormat` to switch based on format if needed. - */ - format: number; - - /** - * Returns type of the barcode value, for example `VisionBarcodeValueType.EMAIL`. - * - * If the value structure cannot be parsed, `VisionBarcodeValueType.TEXT` will be returned. - * If the recognized structure type is not defined in the current version of the native Firebase SDKs, `VisionBarcodeValueType.UNKNOWN` will be returned. - * - * Note that the built-in parsers only recognize a few popular value structures. For your specific use case, you might want to directly consume `rawValue` and implement your own parsing logic. - */ - valueType: number; - - /** - * Returns barcode value in a user-friendly format. - * - * May omit some of the information encoded in the barcode. For example, if `'rawValue returns `MEBKM:TITLE:Invertase;URL://invertase.io;;'`, the display_value might be `'//invertase.io'`. - * - * If `valueType` === `VisionBarcodeValueType.TEXT`, this field will be identical to `rawValue`. - * - * This value can also be multiline, for example, when line breaks are encoded into the original `TEXT` barcode value. - * - * Returns `null` if nothing found. - */ - displayValue: string | null; - - /** - * Returns barcode value as it was encoded in the barcode. - * - * Structured values are not parsed. - * - * Returns `null` if nothing found. - */ - rawValue: string | null; - - /** - * Gets parsed calendar event (set if `valueType` is `VisionBarcodeValueType.CALENDAR_EVENT`). - * - * #### Example - * - * ```js - * import vision, { VisionBarcodeValueType } from '@react-native-firebase/ml-vision'; - * - * const [barcode, ...otherBarcodes] = await vision().barcodeDetectorProcessImage(filePath); - * - * if (barcode && barcode.valueType === VisionBarcodeValueType.CALENDAR_EVENT) { - * console.log(barcode.calendarEvent); - * } - * ``` - */ - calendarEvent?: VisionBarcodeCalendarEvent; - - /** - * Gets parsed contact details (set if `valueType` is `VisionBarcodeValueType.CONTACT_INFO`). - * - * #### Example - * - * ```js - * import vision, { VisionBarcodeValueType } from '@react-native-firebase/ml-vision'; - * - * const [barcode, ...otherBarcodes] = await vision().barcodeDetectorProcessImage(filePath); - * - * if (barcode && barcode.valueType === VisionBarcodeValueType.CONTACT_INFO) { - * console.log(barcode.contactInfo); - * } - * ``` - */ - contactInfo?: VisionBarcodeContactInfo; - - /** - * Gets parsed drivers license details (set if `valueType` is `VisionBarcodeValueType.DRIVER_LICENSE`). - * - * #### Example - * - * ```js - * import vision, { VisionBarcodeValueType } from '@react-native-firebase/ml-vision'; - * - * const [barcode, ...otherBarcodes] = await vision().barcodeDetectorProcessImage(filePath); - * - * if (barcode && barcode.valueType === VisionBarcodeValueType.DRIVER_LICENSE) { - * console.log(barcode.driverLicense); - * } - * ``` - */ - driverLicense?: VisionBarcodeDriverLicense; - - /** - * Gets parsed email details (set if `valueType` is `VisionBarcodeValueType.EMAIL`). - * - * #### Example - * - * ```js - * import vision, { VisionBarcodeValueType } from '@react-native-firebase/ml-vision'; - * - * const [barcode, ...otherBarcodes] = await vision().barcodeDetectorProcessImage(filePath); - * - * if (barcode && barcode.valueType === VisionBarcodeValueType.EMAIL) { - * console.log(barcode.email); - * } - * ``` - */ - email?: VisionBarcodeEmail; - - /** - * Gets parsed Geo Point details (set if `valueType` is `VisionBarcodeValueType.GEO`). - * - * #### Example - * - * ```js - * import vision, { VisionBarcodeValueType } from '@react-native-firebase/ml-vision'; - * - * const [barcode, ...otherBarcodes] = await vision().barcodeDetectorProcessImage(filePath); - * - * if (barcode && barcode.valueType === VisionBarcodeValueType.GEO) { - * console.log(barcode.geoPoint); - * } - * ``` - */ - geoPoint?: FirebaseVisionTypes.VisionGeoPoint; - - /** - * Gets parsed phone details (set if `valueType` is `VisionBarcodeValueType.PHONE`). - * - * #### Example - * - * ```js - * import vision, { VisionBarcodeValueType } from '@react-native-firebase/ml-vision'; - * - * const [barcode, ...otherBarcodes] = await vision().barcodeDetectorProcessImage(filePath); - * - * if (barcode && barcode.valueType === VisionBarcodeValueType.PHONE) { - * console.log(barcode.phone); - * } - * ``` - */ - phone?: VisionBarcodePhone; - - /** - * Gets parsed sms details (set if `valueType` is `VisionBarcodeValueType.SMS`). - * - * #### Example - * - * ```js - * import vision, { VisionBarcodeValueType } from '@react-native-firebase/ml-vision'; - * - * const [barcode, ...otherBarcodes] = await vision().barcodeDetectorProcessImage(filePath); - * - * if (barcode && barcode.valueType === VisionBarcodeValueType.SMS) { - * console.log(barcode.sms); - * } - * ``` - */ - sms?: VisionBarcodeSms; - - /** - * Gets parsed url details (set if `valueType` is `VisionBarcodeValueType.URL`). - * - * #### Example - * - * ```js - * import vision, { VisionBarcodeValueType } from '@react-native-firebase/ml-vision'; - * - * const [barcode, ...otherBarcodes] = await vision().barcodeDetectorProcessImage(filePath); - * - * if (barcode && barcode.valueType === VisionBarcodeValueType.URL) { - * console.log(barcode.url); - * } - * ``` - */ - url?: VisionBarcodeUrl; - - /** - * Gets parsed wifi details (set if `valueType` is `VisionBarcodeValueType.WIFI`). - * - * #### Example - * - * ```js - * import vision, { VisionBarcodeValueType } from '@react-native-firebase/ml-vision'; - * - * const [barcode, ...otherBarcodes] = await vision().barcodeDetectorProcessImage(filePath); - * - * if (barcode && barcode.valueType === VisionBarcodeValueType.WIFI) { - * console.log(barcode.wifi); - * } - * ``` - */ - wifi?: VisionBarcodeWifi; - } - - /** - * Wifi network parameters from a 'WIFI:' or similar QRCode type. - * - * #### Example - * - * ```js - * import vision, { VisionBarcodeValueType } from '@react-native-firebase/ml-vision'; - * - * const [barcode, ...otherBarcodes] = await vision().barcodeDetectorProcessImage(filePath); - * - * if (barcode && barcode.valueType === VisionBarcodeValueType.WIFI) { - * console.log(barcode.wifi); - * } - * ``` - */ - export interface VisionBarcodeWifi { - /** - * The encryption type of the WIFI. e.g. `VisionBarcodeWifiEncryptionType.WPA` - * - * See all types at `VisionBarcodeWifiEncryptionType`. - */ - encryptionType: number; - - /** - * The password for this WIFI. - * - * Returns `null` if nothing found. - */ - password: string | null; - - /** - * The SSID for this WIFI. - * - * Returns `null` if nothing found. - */ - ssid: string | null; - } - - /** - * A URL and title from a 'MEBKM:' or similar QRCode type. - * - * #### Example - * - * ```js - * import vision, { VisionBarcodeValueType } from '@react-native-firebase/ml-vision'; - * - * const [barcode, ...otherBarcodes] = await vision().barcodeDetectorProcessImage(filePath); - * - * if (barcode && barcode.valueType === VisionBarcodeValueType.URL) { - * console.log(barcode.url); - * } - * ``` - */ - export interface VisionBarcodeUrl { - /** - * The title for this url. - * - * Returns `null` if nothing found. - */ - title: string | null; - - /** - * The URL. - * - * Returns `null` if nothing found. - */ - url: string | null; - } - - /** - * An sms message from an 'SMS:' or similar QRCode type. - * - * #### Example - * - * ```js - * import vision, { VisionBarcodeValueType } from '@react-native-firebase/ml-vision'; - * - * const [barcode, ...otherBarcodes] = await vision().barcodeDetectorProcessImage(filePath); - * - * if (barcode && barcode.valueType === VisionBarcodeValueType.SMS) { - * console.log(barcode.sms); - * } - * ``` - */ - export interface VisionBarcodeSms { - /** - * The message text for this SMS. - * - * Returns `null` if nothing found. - */ - message: string | null; - - /** - * The phone number for this SMS. - * - * Returns `null` if nothing found. - */ - phoneNumber: string | number; - } - - /** - * A driver license or ID card. - * - * #### Example - * - * ```js - * import vision, { VisionBarcodeValueType } from '@react-native-firebase/ml-vision'; - * - * const [barcode, ...otherBarcodes] = await vision().barcodeDetectorProcessImage(filePath); - * - * if (barcode && barcode.valueType === VisionBarcodeValueType.DRIVER_LICENSE) { - * console.log(barcode.driverLicense); - * } - * ``` - */ - export interface VisionBarcodeDriverLicense { - /** - * Gets city of holder's address. - * - * Returns `null` if nothing found. - */ - addressCity: string | null; - - /** - * Gets state of holder's address. - * - * Returns `null` if nothing found. - */ - addressState: string | null; - - /** - * The holder's street address. - * - * Returns `null` if nothing found. - */ - addressStreet: string | null; - - /** - * The zip code of holder's address. - * - * Returns `null` if nothing found. - */ - addressZip: string | null; - - /** - * The birth date of the holder. - * - * Returns `null` if nothing found. - */ - birthDate: string | null; - - /** - * The "DL" for driver licenses, "ID" for ID cards. - * - * Returns `null` if nothing found. - */ - documentType: string | null; - - /** - * The expiry date of the license. - * - * Returns `null` if nothing found. - */ - expiryDate: string | null; - - /** - * The holder's first name. - * - * Returns `null` if nothing found. - */ - firstName: string | null; - - /** - * The holder's gender. - * - * Returns `null` if nothing found. - */ - gender: string | null; - - /** - * The issue date of the license. - * - * Returns `null` if nothing found. - */ - issueDate: string | null; - - /** - * The country in which DL/ID was issued. - * - * Returns `null` if nothing found. - */ - issuingCountry: string | null; - - /** - * The holder's last name. - * - * Returns `null` if nothing found. - */ - lastName: string | null; - - /** - * The driver license ID number. - * - * Returns `null` if nothing found. - */ - licenseNumber: string | null; - - /** - * The holder's middle name. - * - * Returns `null` if nothing found. - */ - middleName: string | null; - } - - /** - * A calendar event extracted from QRCode. - * - * ```js - * import vision, { VisionBarcodeValueType } from '@react-native-firebase/ml-vision'; - * - * const [barcode, ...otherBarcodes] = await vision().barcodeDetectorProcessImage(filePath); - * - * if (barcode && barcode.valueType === VisionBarcodeValueType.CALENDAR_EVENT) { - * console.log(barcode.calendarEvent); - * } - * ``` - */ - export interface VisionBarcodeCalendarEvent { - /** - * The description of the calendar event. - * - * Returns `null` if nothing found. - */ - description: string | null; - - /** - * The end date time of the calendar event. - * - * Returns `null` if nothing found. - */ - end: string | null; - - /** - * The location of the calendar event. - * - * Returns `null` if nothing found. - */ - location: string | null; - - /** - * The organizer of the calendar event. - * - * Returns `null` if nothing found. - */ - organizer: string | null; - - /** - * The start date time of the calendar event. - * - * Returns `null` if nothing found. - */ - start: string | null; - - /** - * The status of the calendar event. - * - * Returns `null` if nothing found. - */ - status: string | null; - - /** - * The summary of the calendar event. - * - * Returns `null` if nothing found. - */ - summary: string | null; - } - - /** - * A persons or organization's business card. For example a VCARD. - * - * #### Example - * - * ```js - * import vision, { VisionBarcodeValueType } from '@react-native-firebase/ml-vision'; - * - * const [barcode, ...otherBarcodes] = await vision().barcodeDetectorProcessImage(filePath); - * - * if (barcode && barcode.valueType === VisionBarcodeValueType.CONTACT_INFO) { - * console.log(barcode.contactInfo); - * } - * ``` - */ - export interface VisionBarcodeContactInfo { - /** - * Get an array of detected urls for the contact. - * - * Returns an empty array if nothing found; - */ - urls: string[]; - - /** - * Gets the contact persons title. E.g. `Dr` - * - * Returns `null` if no title detected. - */ - title: string | null; - - /** - * Gets the contact persons organization. - * - * Returns `null` if no organization detected. - */ - organization: string | null; - - /** - * Gets the contact persons phones. - * - * Returns an empty array if nothing found. - */ - phones: VisionBarcodePhone[]; - - /** - * Gets the contact persons emails. - * - * Returns an empty array if nothing found. - */ - emails: VisionBarcodeEmail[]; - - /** - * Gets the contact persons name. - */ - name: VisionBarcodePersonName; - - /** - * Gets an array of the contact persons addresses. - * - * Returns an empty array if nothing found. - */ - addresses: VisionBarcodeAddress[]; - } - - /** - * A contacts address. - */ - export interface VisionBarcodeAddress { - /** - * An array of address line strings of the formatted address. - */ - lines: string[]; - - /** - * The address type, e.g. `VisionBarcodeAddressType.WORK`. - */ - type: number; - } - - /** - * A persons name, both formatted version and their individual name components. - */ - export interface VisionBarcodePersonName { - /** - * The persons first name. - * - * Returns `null` if not found. - */ - first: string | null; - - /** - * A properly formatted name. - * - * Returns `null` if no name components found. - */ - formatted: string | null; - - /** - * The persons last name. - * - * Returns `null` if not found. - */ - last: string | null; - - /** - * The persons middle name. - * - * Returns `null` if not found. - */ - middle: string | null; - - /** - * The prefix of the name. - * - * Returns `null` if not found. - */ - prefix: string | null; - - /** - * Designates a text string to be set as the kana name in the phonebook. - */ - pronunciation: string | null; - - /** - * The suffix of the persons name. - * - * Returns `null` if not found. - */ - suffix: string | null; - } - - /** - * An email message from a 'MAILTO:' or similar QRCode type, or from a ContactInfo/VCARD. - * - * #### Example - * - * ```js - * import vision, { VisionBarcodeValueType } from '@react-native-firebase/ml-vision'; - * - * const [barcode, ...otherBarcodes] = await vision().barcodeDetectorProcessImage(filePath); - * - * if (barcode && barcode.valueType === VisionBarcodeValueType.EMAIL) { - * console.log(barcode.email); - * } else if (barcode && barcode.valueType === VisionBarcodeValueType.CONTACT_INFO) { - * console.log(barcode.contactInfo.emails[0]); - * } - * ``` - */ - export interface VisionBarcodeEmail { - /** - * The email address. - * - * Returns `null` if non detected for this `type`. - */ - address: string | null; - - /** - * The email body content. - * - * Returns `null` if no body detected. - */ - body: string | null; - - /** - * The email subject. - * - * Returns `null` if no subject was detected. - */ - subject: string | null; - } - - /** - * A phone number and it's detected type, e.g. `VisionBarcodePhoneType.MOBILE` - * - * #### Example - * - * ```js - * import vision, { VisionBarcodeValueType } from '@react-native-firebase/ml-vision'; - * - * const [barcode, ...otherBarcodes] = await vision().barcodeDetectorProcessImage(filePath); - * - * if (barcode && barcode.valueType === VisionBarcodeValueType.PHONE) { - * console.log(barcode.phone); - * } else if (barcode && barcode.valueType === VisionBarcodeValueType.CONTACT_INFO) { - * console.log(barcode.contactInfo.phones[0]); - * } - * ``` - */ - export interface VisionBarcodePhone { - /** - * The detected phone number. - * - * Returns `null` if no number detected for this type. - */ - number: string | null; - - /** - * Gets type of the phone number, e.g. `VisionBarcodePhoneType.MOBILE`. - * - * See also `VisionBarcodePhoneType`. - */ - type: number; - } - - /** - * Custom options for barcode detection. - * - * #### Example - * - * ```js - * import vision, { VisionBarcodeFormat, VisionBarcodeValueType } from '@react-native-firebase/ml-vision'; - * - * const [barcode, ...otherBarcodes] = await vision().barcodeDetectorProcessImage(filePath, { - * barcodeFormats: [VisionBarcodeFormat.QR_CODE] - * }); - * - * if (barcode && barcode.valueType === VisionBarcodeValueType.CONTACT_INFO) { - * console.log(barcode.contactInfo); - * } - * ``` - */ - export interface VisionBarcodeDetectorOptions { - /** - * Set the barcode formats to detect. - * - * Defaults to `VisionBarcodeFormat.ALL_FORMATS`; - * - * @param formats Array of `VisionBarcodeFormat` types. - */ - barcodeFormats?: VisionBarcodeFormat[]; - } - - /** - * Barcode format constants - enumeration of supported barcode formats. - * - * Can be used to specify the known type of a barcode before processing; via `VisionBarcodeDetectorOptions.setBarcodeFormats()` - */ - export enum VisionBarcodeFormat { - /** - * Barcode format constant representing the union of all supported formats. - */ - ALL_FORMATS = 0, - - /** - * Barcode format constant for AZTEC. - */ - AZTEC = 4096, - - /** - * Barcode format constant for Codabar. - */ - CODABAR = 8, - - /** - * Barcode format constant for Code 128. - */ - CODE_128 = 1, - - /** - * Barcode format constant for Code 39. - */ - CODE_39 = 2, - - /** - * Barcode format constant for Code 93. - */ - CODE_93 = 4, - - /** - * Barcode format constant for Data Matrix. - */ - DATA_MATRIX = 16, - - /** - * Barcode format constant for EAN-13. - */ - EAN_13 = 32, - - /** - * Barcode format constant for EAN-8. - */ - EAN_8 = 64, - - /** - * Barcode format constant for ITF (Interleaved Two-of-Five). - */ - ITF = 128, - - /** - * Barcode format constant for PDF-417. - */ - PDF417 = 2048, - - /** - * Barcode format constant for QR Code. - */ - QR_CODE = 256, - - /** - * Barcode format unknown to the current SDK, but understood by Google Play services. - */ - UNKNOWN = -1, - - /** - * Barcode format constant for UPC-A. - */ - UPC_A = 512, - - /** - * Barcode format constant for UPC-E. - */ - UPC_E = 1024, - } - - /** - * Barcode value type constants - enumeration of supported barcode content value types. - * - * Can be used with `VisionBarcode.valueType` to determine the barcode content type of a detected barcode. - * - * #### Example - * - * ```js - * import vision, { VisionBarcodeValueType } from '@react-native-firebase/ml-vision'; - * - * const [barcode, ...otherBarcodes] = await vision().barcodeDetectorProcessImage(filePath); - * - * // check for a calendar event barcode value type - * if (barcode && barcode.valueType === VisionBarcodeValueType.CALENDAR_EVENT) { - * console.log(barcode.calendarEvent); - * } - * ``` - */ - export enum VisionBarcodeValueType { - /** - * Barcode value type constant for calendar events. - */ - CALENDAR_EVENT = 11, - - /** - * Barcode value type constant for contact information. - */ - CONTACT_INFO = 1, - - /** - * Barcode value type constant for driver's license data. - */ - DRIVER_LICENSE = 12, - - /** - * Barcode value type constant for email message details. - */ - EMAIL = 2, - - /** - * Barcode value type constant for geographic coordinates. - */ - GEO = 10, - - /** - * Barcode value type constant for ISBNs. - */ - ISBN = 3, - - /** - * Barcode value type constant for phone numbers. - */ - PHONE = 4, - - /** - * Barcode value type constant for product codes. - */ - PRODUCT = 5, - - /** - * Barcode value type constant for SMS details. - */ - SMS = 6, - - /** - * Barcode value type constant for plain text. - */ - TEXT = 7, - - /** - * Barcode value type unknown, which indicates the current version of SDK cannot recognize the structure of the barcode. - */ - UNKNOWN = 0, - - /** - * Barcode value type constant for URLs/bookmarks. - */ - URL = 8, - - /** - * Barcode value type constant for WiFi access point details. - */ - WIFI = 9, - } - - /** - * The type of a address detected in a barcode. - * - * Use with `VisionBarcodeAddress.type`. - */ - export enum VisionBarcodeAddressType { - /** - * Unknown type - */ - UNKNOWN = 0, - - /** - * Address is specified as a WORK address. - */ - WORK = 1, - - /** - * Address is specified as a HOME address. - */ - HOME = 2, - } - - /** - * The type of an email detected in a barcode. - * - * Use with `VisionBarcodeEmail.type`. - */ - export enum VisionBarcodeEmailType { - /** - * Unknown type - */ - UNKNOWN = 0, - - /** - * Email address is specified as a WORK email. - */ - WORK = 1, - - /** - * Email address is specified as a HOME / personal email. - */ - HOME = 2, - } - - /** - * The type of a phone number detected in a barcode. - * - * Use with `VisionBarcodePhone.type`. - */ - export enum VisionBarcodePhoneType { - /** - * Fax machine. - */ - FAX = 3, - - /** - * Home phone. - */ - HOME = 2, - - /** - * Mobile Phone. - */ - MOBILE = 4, - - /** - * Unknown type. - */ - UNKNOWN = 0, - - /** - * Work phone. - */ - WORK = 1, - } - - /** - * The type of wifi encryption used for a `VisionBarcodeWifi` instance. - * - * Use with `VisionBarcodeWifi.encryptionType`. - */ - export enum VisionBarcodeWifiEncryptionType { - /** - * Wifi has no encryption and is open. - */ - OPEN = 1, - - /** - * Wifi uses WPA encryption. This includes WPA2. - */ - WPA = 2, - - /** - * Wifi uses WEP encryption. - */ - WEP = 3, - } -} diff --git a/packages/ml-vision/lib/VisionBarcodeAddressType.js b/packages/ml-vision/lib/VisionBarcodeAddressType.js deleted file mode 100644 index 5d4971f5aaa..00000000000 --- a/packages/ml-vision/lib/VisionBarcodeAddressType.js +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -export default { - UNKNOWN: 0, - WORK: 1, - HOME: 2, -}; diff --git a/packages/ml-vision/lib/VisionBarcodeEmailType.js b/packages/ml-vision/lib/VisionBarcodeEmailType.js deleted file mode 100644 index 5d4971f5aaa..00000000000 --- a/packages/ml-vision/lib/VisionBarcodeEmailType.js +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -export default { - UNKNOWN: 0, - WORK: 1, - HOME: 2, -}; diff --git a/packages/ml-vision/lib/VisionBarcodeFormat.js b/packages/ml-vision/lib/VisionBarcodeFormat.js deleted file mode 100644 index 70a08872520..00000000000 --- a/packages/ml-vision/lib/VisionBarcodeFormat.js +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -export default { - /** - * Barcode format constant representing the union of all supported formats. - */ - ALL_FORMATS: 0, - /** - * Barcode format constant for AZTEC. - */ - AZTEC: 4096, - /** - * Barcode format constant for Codabar. - */ - CODABAR: 8, - /** - * Barcode format constant for Code 128. - */ - CODE_128: 1, - /** - * Barcode format constant for Code 39. - */ - CODE_39: 2, - /** - * Barcode format constant for Code 93. - */ - CODE_93: 4, - /** - * Barcode format constant for Data Matrix. - */ - DATA_MATRIX: 16, - /** - * Barcode format constant for EAN-13. - */ - EAN_13: 32, - /** - * Barcode format constant for EAN-8. - */ - EAN_8: 64, - /** - * Barcode format constant for ITF (Interleaved Two-of-Five). - */ - ITF: 128, - /** - * Barcode format constant for PDF-417. - */ - PDF417: 2048, - /** - * Barcode format constant for QR Code. - */ - QR_CODE: 256, - /** - * Barcode format unknown to the current SDK, but understood by Google Play services. - */ - UNKNOWN: -1, - /** - * Barcode format constant for UPC-A. - */ - UPC_A: 512, - /** - * Barcode format constant for UPC-E. - */ - UPC_E: 1024, -}; diff --git a/packages/ml-vision/lib/VisionBarcodePhoneType.js b/packages/ml-vision/lib/VisionBarcodePhoneType.js deleted file mode 100644 index d63a55afc8b..00000000000 --- a/packages/ml-vision/lib/VisionBarcodePhoneType.js +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -export default { - FAX: 3, - HOME: 2, - MOBILE: 4, - UNKNOWN: 0, - WORK: 1, -}; diff --git a/packages/ml-vision/lib/VisionBarcodeValueType.js b/packages/ml-vision/lib/VisionBarcodeValueType.js deleted file mode 100644 index 4b81f202f80..00000000000 --- a/packages/ml-vision/lib/VisionBarcodeValueType.js +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -export default { - /** - * Barcode value type constant for calendar events. - */ - CALENDAR_EVENT: 11, - - /** - * Barcode value type constant for contact information. - */ - CONTACT_INFO: 1, - - /** - * Barcode value type constant for driver's license data. - */ - DRIVER_LICENSE: 12, - - /** - * Barcode value type constant for email message details. - */ - EMAIL: 2, - - /** - * Barcode value type constant for geographic coordinates. - */ - GEO: 10, - - /** - * Barcode value type constant for ISBNs. - */ - ISBN: 3, - - /** - * Barcode value type constant for phone numbers. - */ - PHONE: 4, - - /** - * Barcode value type constant for product codes. - */ - PRODUCT: 5, - - /** - * Barcode value type constant for SMS details. - */ - SMS: 6, - - /** - * Barcode value type constant for plain text. - */ - TEXT: 7, - - /** - * Barcode value type unknown, which indicates the current version of SDK cannot recognize the structure of the barcode. - */ - UNKNOWN: 0, - - /** - * Barcode value type constant for URLs/bookmarks. - */ - URL: 8, - - /** - * Barcode value type constant for WiFi access point details. - */ - WIFI: 9, -}; diff --git a/packages/ml-vision/lib/VisionBarcodeWifiEncryptionType.js b/packages/ml-vision/lib/VisionBarcodeWifiEncryptionType.js deleted file mode 100644 index a2312fa078f..00000000000 --- a/packages/ml-vision/lib/VisionBarcodeWifiEncryptionType.js +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -export default { - OPEN: 1, - WPA: 2, - WEP: 3, -}; diff --git a/packages/ml-vision/lib/VisionFaceContourType.js b/packages/ml-vision/lib/VisionFaceContourType.js deleted file mode 100644 index cdab469370d..00000000000 --- a/packages/ml-vision/lib/VisionFaceContourType.js +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -export default { - ALL_POINTS: 1, - FACE: 2, - LEFT_EYE: 7, - LEFT_EYEBROW_BOTTOM: 4, - LEFT_EYEBROW_TOP: 3, - LOWER_LIP_BOTTOM: 12, - LOWER_LIP_TOP: 11, - NOSE_BOTTOM: 14, - NOSE_BRIDGE: 13, - RIGHT_EYE: 8, - RIGHT_EYEBROW_BOTTOM: 6, - RIGHT_EYEBROW_TOP: 5, - UPPER_LIP_BOTTOM: 10, - UPPER_LIP_TOP: 9, -}; diff --git a/packages/ml-vision/lib/VisionFaceDetectorClassificationMode.js b/packages/ml-vision/lib/VisionFaceDetectorClassificationMode.js deleted file mode 100644 index c4770ed9528..00000000000 --- a/packages/ml-vision/lib/VisionFaceDetectorClassificationMode.js +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -export default { - NO_CLASSIFICATIONS: 1, - ALL_CLASSIFICATIONS: 2, -}; diff --git a/packages/ml-vision/lib/VisionFaceDetectorContourMode.js b/packages/ml-vision/lib/VisionFaceDetectorContourMode.js deleted file mode 100644 index 6f2ac438bfe..00000000000 --- a/packages/ml-vision/lib/VisionFaceDetectorContourMode.js +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -export default { - NO_CONTOURS: 1, - ALL_CONTOURS: 2, -}; diff --git a/packages/ml-vision/lib/VisionFaceDetectorLandmarkMode.js b/packages/ml-vision/lib/VisionFaceDetectorLandmarkMode.js deleted file mode 100644 index 0bdc0bf212c..00000000000 --- a/packages/ml-vision/lib/VisionFaceDetectorLandmarkMode.js +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -export default { - NO_LANDMARKS: 1, - ALL_LANDMARKS: 2, -}; diff --git a/packages/ml-vision/lib/VisionFaceDetectorPerformanceMode.js b/packages/ml-vision/lib/VisionFaceDetectorPerformanceMode.js deleted file mode 100644 index 0d2a1aa6ac0..00000000000 --- a/packages/ml-vision/lib/VisionFaceDetectorPerformanceMode.js +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -export default { - FAST: 1, - ACCURATE: 2, -}; diff --git a/packages/ml-vision/lib/VisionFaceLandmarkType.js b/packages/ml-vision/lib/VisionFaceLandmarkType.js deleted file mode 100644 index b4b13dbc81f..00000000000 --- a/packages/ml-vision/lib/VisionFaceLandmarkType.js +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -export default { - LEFT_CHEEK: 1, - LEFT_EAR: 3, - LEFT_EYE: 4, - MOUTH_BOTTOM: 0, - MOUTH_LEFT: 5, - MOUTH_RIGHT: 11, - NOSE_BASE: 6, - RIGHT_CHEEK: 7, - RIGHT_EAR: 9, - RIGHT_EYE: 10, -}; diff --git a/packages/ml-vision/lib/VisionPoint.js b/packages/ml-vision/lib/VisionPoint.js deleted file mode 100644 index 1e55ef745e0..00000000000 --- a/packages/ml-vision/lib/VisionPoint.js +++ /dev/null @@ -1,83 +0,0 @@ -// TODO introduce in a later release if required -// /* eslint-disable no-bitwise */ -// -// /* -// * Copyright (c) 2016-present Invertase Limited & Contributors -// * -// * Licensed under the Apache License, Version 2.0 (the "License"); -// * you may not use this library except in compliance with the License. -// * You may obtain a copy of the License at -// * -// * http://www.apache.org/licenses/LICENSE-2.0 -// * -// * Unless required by applicable law or agreed to in writing, software -// * distributed under the License is distributed on an "AS IS" BASIS, -// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// * See the License for the specific language governing permissions and -// * limitations under the License. -// * -// */ -// -// export default class VisionPoint { -// constructor(x, y) { -// this._x = x || 0; -// this._y = y || 0; -// } -// -// /** -// * Set the point's x and y coordinates -// * -// * @param x -// * @param y -// */ -// set(x, y) { -// // todo arg validate number for all args -// this._x = x; -// this._y = y; -// } -// -// /** -// * Copy the coordinates from the source point into this point. -// * -// * @param otherPoint VisionPoint -// */ -// setFromPoint(otherPoint) { -// // todo arg instance of VisionPoint check -// this.set(otherPoint.x, otherPoint.y); -// } -// -// get x() { -// return this._x; -// } -// -// get y() { -// return this._y; -// } -// -// /** -// * Returns true if this VisionPoint has the same coordinates as the specified VisionPoint. -// * -// * @param otherPoint -// * @returns {boolean} -// */ -// isEqual(otherPoint) { -// // todo arg instance of VisionPoint check -// return this.toString() === otherPoint.toString(); -// } -// -// /** -// * Returns this point as an array of [x, y] -// * @returns {*[]} -// */ -// toArray() { -// return [this.x, this.y]; -// } -// -// /** -// * Returns this point as an string, e.g VisionPoint[x, y] -// * @returns {string} -// */ -// toString() { -// return `Point[${this.x}, ${this.y}]`; -// } -// } diff --git a/packages/ml-vision/lib/VisionRectangle.js b/packages/ml-vision/lib/VisionRectangle.js deleted file mode 100644 index 8e781805bbb..00000000000 --- a/packages/ml-vision/lib/VisionRectangle.js +++ /dev/null @@ -1,206 +0,0 @@ -// TODO introduce in a later release if required -// /* eslint-disable no-bitwise */ -// -// /* -// * Copyright (c) 2016-present Invertase Limited & Contributors -// * -// * Licensed under the Apache License, Version 2.0 (the "License"); -// * you may not use this library except in compliance with the License. -// * You may obtain a copy of the License at -// * -// * http://www.apache.org/licenses/LICENSE-2.0 -// * -// * Unless required by applicable law or agreed to in writing, software -// * distributed under the License is distributed on an "AS IS" BASIS, -// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// * See the License for the specific language governing permissions and -// * limitations under the License. -// * -// */ -// -// export default class VisionRectangle { -// /** -// * -// * @param left -// * @param top -// * @param right -// * @param bottom -// */ -// constructor(left, top, right, bottom) { -// this._left = left || 0; -// this._top = top || 0; -// this._right = right || 0; -// this._bottom = bottom || 0; -// } -// -// /** -// * Set the rectangle's coordinates to the specified values. -// * -// * @param left -// * @param top -// * @param right -// * @param bottom -// */ -// set(left, top, right, bottom) { -// // todo arg validate number for all args -// // todo arg validate left <= right -// // todo arg validate top <= bottom -// this._left = left; -// this._top = top; -// this._right = right; -// this._bottom = bottom; -// } -// -// /** -// * Copy the coordinates from the source rectangle into this rectangle. -// * -// * @param otherRect VisionRectangle -// */ -// setFromRectangle(otherRect) { -// // todo arg instance of VisionRectangle check -// this.set(otherRect.left, otherRect.top, otherRect.right, otherRect.bottom); -// } -// -// get top() { -// return this._top; -// } -// -// get left() { -// return this._left; -// } -// -// get bottom() { -// return this._bottom; -// } -// -// get right() { -// return this._right; -// } -// -// get width() { -// return this._right - this._left; -// } -// -// get height() { -// return this._bottom - this._top; -// } -// -// /** -// * Returns whether the first rectangle contains the second rectangle. -// * @param otherRect VisionRectangle -// * @returns {boolean} -// */ -// containsRectangle(otherRect) { -// // todo arg instance of VisionRectangle check -// return ( -// !this.isEmpty() && -// this.left <= otherRect.left && -// this.top <= otherRect.top && -// this.right >= otherRect.right && -// this.bottom >= otherRect.bottom -// ); -// } -// -// /** -// * Returns whether a rectangle contains a specified point. -// * -// * @param x -// * @param y -// * @returns {boolean} -// */ -// containsPoint(x, y) { -// return !this.isEmpty() && x >= this.left && x < this.right && y >= this.top && y < this.bottom; -// } -// -// /** -// * Returns whether two rectangles intersect. -// * -// * @param otherRect VisionRectangle -// * @returns {boolean} -// */ -// intersectsRectangle(otherRect) { -// // todo arg instance of VisionRectangle check -// return ( -// this.left < otherRect.right && -// otherRect.left < this.right && -// this.top < otherRect.bottom && -// otherRect.top < this.bottom -// ); -// } -// -// /** -// * If the rectangle specified intersects this -// * rectangle, return true and set this rectangle to that intersection, -// * otherwise return false and do not change this rectangle. No check is -// * performed to see if either rectangle is empty. Note: To just test for -// * intersection, use {@link #intersectsRectangle(otherRect: VisionRectangle)}. -// * -// * @param otherRect -// * @returns {boolean} -// */ -// intersectRectangle(otherRect) { -// // todo arg instance of VisionRectangle check -// if ( -// this.left < otherRect.right && -// otherRect.left < this.right && -// this.top < otherRect.bottom && -// otherRect.top < this.bottom -// ) { -// if (this.left < otherRect.left) this._left = otherRect.left; -// if (this.top < otherRect.top) this._top = otherRect.top; -// if (this.right > otherRect.right) this._right = otherRect.right; -// if (this.bottom > otherRect.bottom) this._bottom = otherRect.bottom; -// return true; -// } -// return false; -// } -// -// /** -// * Returns the horizontal center of the rectangle. -// */ -// centerX() { -// return (this.left + this.right) >> 1; -// } -// -// /** -// * Returns the vertical center of the rectangle. -// */ -// centerY() { -// return (this.top + this.bottom) >> 1; -// } -// -// /** -// * Returns whether a rectangle has zero width or height -// * @returns {boolean} -// */ -// isEmpty() { -// return this.left >= this.right || this.top >= this.bottom; -// } -// -// /** -// * Returns true if this VisionRectangle has the same bounding box as the specified VisionRectangle. -// * -// * @param otherRect -// * @returns {boolean} -// */ -// isEqual(otherRect) { -// // todo arg instance of VisionPoint check -// return this.toString() === otherRect.toString(); -// } -// -// /** -// * Returns this rectangle as an array of [left, top, right, bottom] -// * @returns {*[]} -// */ -// toArray() { -// return [this.left, this.top, this.right, this.bottom]; -// } -// -// /** -// * Returns this rectangle as an string, e.g VisionRectangle[left, top, right, bottom] -// * @returns {string} -// */ -// toString() { -// return `Rectangle[${this.left}, ${this.top}, ${this.right}, ${this.bottom}]`; -// } -// } diff --git a/packages/ml-vision/lib/index.d.ts b/packages/ml-vision/lib/index.d.ts deleted file mode 100644 index dd18c285783..00000000000 --- a/packages/ml-vision/lib/index.d.ts +++ /dev/null @@ -1,1236 +0,0 @@ -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -import { ReactNativeFirebase } from '@react-native-firebase/app'; -import { MLKitVision } from './BarcodeDetectorTypes'; -/** - * Firebase ML Kit package for React Native. - * - * #### Example 1 - * - * Access the firebase export from the `ml-vision` package: - * - * ```js - * import { firebase } from '@react-native-firebase/ml-vision'; - * - * // firebase.vision().X - * ``` - * - * #### Example 2 - * - * Using the default export from the `ml-vision` package: - * - * ```js - * import vision from '@react-native-firebase/ml-vision'; - * - * // vision().X - * ``` - * - * #### Example 3 - * - * Using the default export from the `app` package: - * - * ```js - * import firebase from '@react-native-firebase/app'; - * import '@react-native-firebase/ml-vision'; - * - * // firebase.vision().X - * ``` - * - * @firebase ml-vision - */ -export namespace FirebaseVisionTypes { - import FirebaseModule = ReactNativeFirebase.FirebaseModule; - - export interface Statics { - VisionCloudTextRecognizerModelType: typeof VisionCloudTextRecognizerModelType; - VisionFaceDetectorClassificationMode: typeof VisionFaceDetectorClassificationMode; - VisionFaceDetectorContourMode: typeof VisionFaceDetectorContourMode; - VisionFaceDetectorLandmarkMode: typeof VisionFaceDetectorLandmarkMode; - VisionFaceDetectorPerformanceMode: typeof VisionFaceDetectorPerformanceMode; - VisionFaceLandmarkType: typeof VisionFaceLandmarkType; - VisionFaceContourType: typeof VisionFaceContourType; - VisionCloudLandmarkRecognizerModelType: typeof VisionCloudLandmarkRecognizerModelType; - VisionDocumentTextRecognizedBreakType: typeof VisionDocumentTextRecognizedBreakType; - VisionBarcodeFormat: typeof MLKitVision.VisionBarcodeFormat; - VisionBarcodeValueType: typeof MLKitVision.VisionBarcodeValueType; - VisionBarcodeAddressType: typeof MLKitVision.VisionBarcodeAddressType; - VisionBarcodeEmailType: typeof MLKitVision.VisionBarcodeEmailType; - VisionBarcodePhoneType: typeof MLKitVision.VisionBarcodePhoneType; - VisionBarcodeWifiEncryptionType: typeof MLKitVision.VisionBarcodeWifiEncryptionType; - } - - /** - * Options for vision face detector. - */ - export interface VisionFaceDetectorOptions { - /** - * Indicates whether to run additional classifiers for characterizing attributes such as "smiling" and "eyes open". - * - * Defaults to `VisionFaceDetectorClassificationMode.NO_CLASSIFICATIONS`. - * - * #### Example - * - * ```js - * const faces = await firebase.vision().faceDetectorProcessImage(filePath, { - * classificationMode: VisionFaceDetectorClassificationMode.ALL_CLASSIFICATIONS, - * }); - * ``` - */ - classificationMode?: - | VisionFaceDetectorClassificationMode.NO_CLASSIFICATIONS - | VisionFaceDetectorClassificationMode.ALL_CLASSIFICATIONS; - - /** - * Sets whether to detect no contours or all contours. Processing time increases as the number of contours to search - * for increases, so detecting all contours will increase the overall detection time. Note that it would return up - * to 5 faces contours. - * - * Defaults to `VisionFaceDetectorContourMode.NO_CONTOURS`. - * - * #### Example - * - * ```js - * const faces = await firebase.vision().faceDetectorProcessImage(filePath, { - * contourMode: VisionFaceDetectorContourMode.ALL_CONTOURS, - * }); - * ``` - */ - contourMode?: - | VisionFaceDetectorContourMode.NO_CONTOURS - | VisionFaceDetectorContourMode.ALL_CONTOURS; - - /** - * Sets whether to detect no landmarks or all landmarks. Processing time increases as the number of landmarks to - * search for increases, so detecting all landmarks will increase the overall detection time. Detecting landmarks - * can improve pose estimation. - * - * Defaults to `VisionFaceDetectorLandmarkMode.NO_LANDMARKS`. - * - * #### Example - * - * ```js - * const faces = await firebase.vision().faceDetectorProcessImage(filePath, { - * landmarkMode: VisionFaceDetectorLandmarkMode.ALL_LANDMARKS, - * }); - * ``` - */ - landmarkMode?: - | VisionFaceDetectorLandmarkMode.NO_LANDMARKS - | VisionFaceDetectorLandmarkMode.ALL_LANDMARKS; - - /** - * Sets the smallest desired face size, expressed as a proportion of the width of the head to the image width. For - * example, if a value of 0.1 is specified then the smallest face to search for is roughly 10% of the width of the - * image being searched. - * - * Setting the min face size is a performance vs. accuracy trade-off: setting the face size smaller will enable the - * detector to find smaller faces but detection will take longer; setting the face size larger will exclude smaller - * faces but will run faster. - * - * This is not a hard limit on face size; the detector may find faces slightly smaller than specified. - * - * Defaults to 0.1. - * - * #### Example - * - * ```js - * const faces = await firebase.vision().faceDetectorProcessImage(filePath, { - * minFaceSize: 0.5, - * }); - * ``` - */ - minFaceSize?: number; - - /** - * Extended option for controlling additional accuracy / speed trade-offs in performing face detection. In general, - * choosing the more accurate mode will generally result in longer runtime, whereas choosing the faster mode will - * generally result in detecting fewer faces. - * - * Defaults to `VisionFaceDetectorPerformanceMode.FAST`. - * - * #### Example - * - * ```js - * const faces = await firebase.vision().faceDetectorProcessImage(filePath, { - * performanceMode: VisionFaceDetectorPerformanceMode.ACCURATE, - * }); - * ``` - */ - performanceMode?: - | VisionFaceDetectorPerformanceMode.FAST - | VisionFaceDetectorPerformanceMode.ACCURATE; - } - - /** - * Options for on device image labeler. Confidence threshold could be provided for the label detection. - * - - */ - export interface VisionImageLabelerOptions { - /** - * Sets confidence threshold of detected labels. Only labels detected with confidence higher than this threshold are returned. - * - * For example, if the confidence threshold is set to 0.7, only labels with confidence >= 0.7 would be returned. - * - * Defaults to 0.5. - * - * #### Example - * - * ```js - * const labels = await firebase.vision().imageLabelerProcessImage(filePath, { - * confidenceThreshold: 0.8, - * }); - * ``` - */ - confidenceThreshold?: number; - } - - /** - * Options for cloud image labeler. Confidence threshold could be provided for the label detection. - * - * For example, if the confidence threshold is set to 0.7, only labels with confidence >= 0.7 would be returned. The default threshold is 0.5. - * - * Note: at most 20 labels will be returned for cloud image labeler. - */ - export interface VisionCloudImageLabelerOptions { - /** - * Only allow registered application instances with matching certificate fingerprint to use Cloud Vision API. - * - * > Do not set this for debug build if you use simulators to test. - * - * #### Example - * - * ```js - * await firebase.vision().cloudImageLabelerProcessImage(filePath, { - * enforceCertFingerprintMatch: true, - * }); - * ``` - */ - enforceCertFingerprintMatch?: boolean; - - /** - * Sets confidence threshold in the range of [0.0 - 1.0] of detected labels. Only labels detected with confidence higher than this threshold are returned. - * - * Defaults to 0.5. - * - * #### Example - * - * ```js - * await firebase.vision().cloudImageLabelerProcessImage(filePath, { - * confidenceThreshold: 0.8, - * }); - * ``` - */ - confidenceThreshold?: number; - - /** - * API key to use for Cloud Vision API. If not set, the default API key from `firebase.app()` will be used. - * - * #### Example - * - * ```js - * await firebase.vision().cloudImageLabelerProcessImage(filePath, { - * apiKeyOverride: 'xyz123', - * }); - * ``` - * - * @ios - */ - apiKeyOverride?: string; - } - - /** - * Detector for finding popular natural and man-made structures within an image. - */ - export interface VisionCloudLandmarkRecognizerOptions { - /** - * Only allow registered application instances with matching certificate fingerprint to use Cloud Vision API. - * - * > Do not set this for debug build if you use simulators to test. - */ - enforceCertFingerprintMatch?: boolean; - - /** - * Sets the maximum number of results of this type. - * - * Defaults to 10. - */ - maxResults?: number; - - /** - * Sets model type for the detection. - * - * Defaults to `VisionCloudLandmarkRecognizerModelType.STABLE_MODEL`. - */ - modelType?: - | VisionCloudLandmarkRecognizerModelType.STABLE_MODEL - | VisionCloudLandmarkRecognizerModelType.LATEST_MODEL; - - /** - * API key to use for Cloud Vision API. If not set, the default API key from `firebase.app()` will be used. - * - * @ios - */ - apiKeyOverride?: string; - } - - /** - * Model types for cloud landmark recognition. - */ - export enum VisionCloudLandmarkRecognizerModelType { - /** - * Stable model would be used. - */ - STABLE_MODEL = 1, - - /** - * Latest model would be used. - */ - LATEST_MODEL = 2, - } - - /** - * Options for cloud text recognizer. - */ - export interface VisionCloudTextRecognizerOptions { - /** - * Only allow registered application instances with matching certificate fingerprint to use Cloud Vision API. - * - * > Do not set this for debug build if you use simulators to test. - * - * #### Example - * - * ```js - * await firebase.vision().cloudTextRecognizerProcessImage(filePath, { - * enforceCertFingerprintMatch: true, - * }); - * ``` - */ - enforceCertFingerprintMatch?: boolean; - - /** - * Sets model type for cloud text recognition. The two models SPARSE_MODEL and DENSE_MODEL handle different text densities in an image. - * - * See `VisionCloudTextRecognizerModelType` for types. - * - * Defaults to `VisionCloudTextRecognizerModelType.SPARSE_MODEL`. - * - * #### Example - * - * ```js - * import { - * firebase, - * VisionCloudTextRecognizerModelType, - * } from '@react-native-firebase/ml-vision'; - * - * await firebase.vision().cloudTextRecognizerProcessImage(filePath, { - * modelType: VisionCloudTextRecognizerModelType.DENSE_MODEL, - * }); - * ``` - */ - modelType?: - | VisionCloudTextRecognizerModelType.SPARSE_MODEL - | VisionCloudTextRecognizerModelType.DENSE_MODEL; - - /** - * Sets language hints. In most cases, not setting this yields the best results since it enables automatic language - * detection. For languages based on the Latin alphabet, setting language hints is not needed. In rare cases, when - * the language of the text in the image is known, setting a hint will help get better results (although it will be a - * significant hindrance if the hint is wrong). - * - * Each language code must be a BCP-47 identifier. See [Google Cloud OCR Language Support](https://cloud.google.com/vision/docs/languages) for more information. - * - * #### Example - * - * ```js - * await firebase.vision().cloudTextRecognizerProcessImage(filePath, { - * languageHints: ['fr', 'de'], - * }); - * ``` - */ - languageHints?: string[]; - - /** - * API key to use for Cloud Vision API. If not set, the default API key from `firebase.app()` will be used. - * - * #### Example - * - * ```js - * await firebase.vision().cloudTextRecognizerProcessImage(filePath, { - * apiKeyOverride: 'xyz123', - * }); - * ``` - * - * @ios - */ - apiKeyOverride?: string; - } - - /** - * Options for the cloud document text recognizer. - */ - export interface VisionCloudDocumentTextRecognizerOptions { - /** - * Only allow registered application instances with matching certificate fingerprint to use Cloud Vision API. - * - * > Do not set this for debug build if you use simulators to test. - * - * #### Example - * - * ```js - * await firebase.vision().cloudTextRecognizerProcessImage(filePath, { - * enforceCertFingerprintMatch: true, - * }); - * ``` - */ - enforceCertFingerprintMatch?: boolean; - - /** - * Sets language hints. In most cases, not setting this yields the best results since it enables automatic language - * detection. For languages based on the Latin alphabet, setting language hints is not needed. In rare cases, when - * the language of the text in the image is known, setting a hint will help get better results (although it will be a - * significant hindrance if the hint is wrong). - * - * Each language code must be a BCP-47 identifier. See [Google Cloud OCR Language Support](https://cloud.google.com/vision/docs/languages) for more information. - * - * #### Example - * - * ```js - * await firebase.vision().cloudTextRecognizerProcessImage(filePath, { - * languageHints: ['fr', 'de'], - * }); - * ``` - */ - languageHints?: string[]; - - /** - * API key to use for Cloud Vision API. If not set, the default API key from `firebase.app()` will be used. - * - * #### Example - * - * ```js - * await firebase.vision().cloudTextRecognizerProcessImage(filePath, { - * apiKeyOverride: 'xyz123', - * }); - * ``` - * - * @ios - */ - apiKeyOverride?: string; - } - - /** - * The cloud model type used for in VisionCloudTextRecognizerOptions & VisionCloudDocumentTextRecognizerOptions - * - * Defaults to `SPARSE_MODEL` - */ - export enum VisionCloudTextRecognizerModelType { - /** - * Dense model type. It is more suitable for well-formatted dense text. - */ - SPARSE_MODEL = 1, - /** - * Sparse model type. It is more suitable for sparse text. - */ - DENSE_MODEL = 2, - } - - /** - * Indicates whether to run additional classifiers for characterizing attributes such as "smiling" and "eyes open". - */ - export enum VisionFaceDetectorClassificationMode { - /** - * Disables collection of classifier information. - */ - NO_CLASSIFICATIONS = 1, - - /** - * Enables collection of classifier information. - */ - ALL_CLASSIFICATIONS = 2, - } - - /** - * Sets whether to detect contours or not. Processing time increases as the number of contours to search for increases, - * so detecting all contours will increase the overall detection time. - */ - export enum VisionFaceDetectorContourMode { - /** - * Disables collection of contour information. - */ - NO_CONTOURS = 1, - - /** - * Enables collection of contour information. - */ - ALL_CONTOURS = 2, - } - - /** - * Sets whether to detect no landmarks or all landmarks. Processing time increases as the number of landmarks to - * search for increases, so detecting all landmarks will increase the overall detection time. Detecting - * landmarks can improve pose estimation. - */ - export enum VisionFaceDetectorLandmarkMode { - /** - * Disables collection of landmark information. - */ - NO_LANDMARKS = 1, - - /** - * Enables collection of landmark information. - */ - ALL_LANDMARKS = 2, - } - - /** - * Extended option for controlling additional accuracy / speed trade-offs in performing face detection. In general, - * choosing the more accurate mode will generally result in longer runtime, whereas choosing the faster - * mode will generally result in detecting fewer faces. - */ - export enum VisionFaceDetectorPerformanceMode { - /** - * Indicates a preference for speed in extended settings that may make an accuracy vs. speed trade-off. This will - * tend to detect fewer faces and may be less precise in determining values such as position, but will run faster. - */ - FAST = 1, - - /** - * Indicates a preference for accuracy in extended settings that may make an accuracy vs. speed trade-off. - * This will tend to detect more faces and may be more precise in determining values such as position, at the cost - * of speed. - */ - ACCURATE = 2, - } - - /** - * A Rectangle holds four number coordinates relative to the processed image. - * Rectangle are represented as [left, top, right, bottom]. - * - * Used by Vision Text Recognizer, Face Detector & Landmark Recognition APIs. - */ - export type VisionRectangle = [number, number, number, number]; - - /** - * A point holds two number coordinates relative to the processed image. - * Points are represented as [x, y]. - * - * Used by Vision Text Recognizer, Face Detector & Landmark Recognition APIs. - */ - export type VisionPoint = [number, number]; - - /** - * A hierarchical representation of texts recognized in an image. - */ - export interface VisionText { - /** - * Retrieve the recognized text as a string. - */ - text: string; - - /** - * Gets an array `VisionTextBlock`, which is a block of text that can be further decomposed to an array of `VisionTextLine`. - */ - blocks: VisionTextBlock[]; - } - - /** - * Represents a block of text. - */ - export interface VisionDocumentTextBlock extends VisionDocumentTextBase { - /** - * Gets an Array of `VisionDocumentTextParagraph`s that make up this block. - */ - paragraphs: VisionDocumentTextParagraph[]; - } - - /** - * A structural unit of text representing a number of words in certain order. - */ - export interface VisionDocumentTextParagraph extends VisionDocumentTextBase { - /** - * Gets an Array of `VisionDocumentTextWord`s that make up this paragraph. - * - * Returns an empty list if no Word is found. - */ - words: VisionDocumentTextWord[]; - } - - /** - * A single word representation. - */ - export interface VisionDocumentTextWord extends VisionDocumentTextBase { - /** - * Gets an Array of `VisionDocumentTextSymbol`s that make up this word. - * The order of the symbols follows the natural reading order. - */ - symbols: VisionDocumentTextSymbol[]; - } - - /** - * A single symbol representation. - */ - export type VisionDocumentTextSymbol = VisionDocumentTextBase; - - /** - * Enum representing the detected break type. - */ - export enum VisionDocumentTextRecognizedBreakType { - /** - * Line-wrapping break. - */ - EOL_SURE_SPACE = 3, - - /** - * End-line hyphen that is not present in text; does not co-occur with `SPACE`, `LEADER_SPACE`, or `LINE_BREAK`. - */ - HYPHEN = 4, - - /** - * Line break that ends a paragraph. - */ - LINE_BREAK = 5, - - /** - * Regular space. - */ - SPACE = 1, - - /** - * Sure space (very wide). - */ - SURE_SPACE = 2, - - /** - * Unknown break label type. - */ - UNKNOWN = 0, - } - - /** - * A recognized break is the detected start or end of a structural component. - */ - export interface VisionDocumentTextRecognizedBreak { - /** - * Gets detected break type. - */ - breakType: VisionDocumentTextRecognizedBreakType; - - /** - * Returns true if break prepends an element. - */ - isPrefix: boolean; - } - /** - * A shared type that all VisionDocumentText components inherit from - */ - export interface VisionDocumentTextBase { - /** - * Gets the recognized text as a string. Returned in reading order for the language. For Latin, this is top to bottom within a `VisionTextBlock`, and left-to-right within a `VisionTextLine`. - */ - text: string; - - /** - * The confidence of the recognized text. It only return valid result from cloud recognizers. For on-device text recognition, the confidence is always null. - */ - confidence: null | number; - - /** - * Gets a list of recognized languages. (Cloud API only. On-Device returns empty array) - * - * A language is the BCP-47 language code, such as "en-US" or "sr-Latn". - */ - recognizedLanguages: string[]; - - /** - * Returns the bounding rectangle of the detected text. - */ - boundingBox: VisionRectangle; - - /** - * Gets the recognized break - the detected start or end of a structural component. - */ - recognizedBreak: VisionDocumentTextRecognizedBreak; - } - - /** - * A hierarchical representation of document text recognized in an image. - */ - export interface VisionDocumentText { - /** - * Retrieve the recognized text as a string. - */ - text: string; - - /** - * Gets an array `VisionTextBlock`, which is a block of text that can be further decomposed to an array of `VisionDocumentTextParagraph`. - */ - blocks: VisionDocumentTextBlock[]; - } - - /** - * A shared type that all Vision Text components inherit from - */ - export interface VisionTextBase { - /** - * Gets the recognized text as a string. Returned in reading order for the language. For Latin, this is top to bottom within a `VisionTextBlock`, and left-to-right within a `VisionTextLine`. - */ - text: string; - - /** - * The confidence of the recognized text. It only return valid result from cloud recognizers. For on-device text recognition, the confidence is always null. - */ - confidence: null | number; - - /** - * Gets a list of recognized languages. (Cloud API only. On-Device returns empty array) - * - * A language is the BCP-47 language code, such as "en-US" or "sr-Latn". - */ - recognizedLanguages: string[]; - - /** - * Returns the bounding rectangle of the detected text. - */ - boundingBox: VisionRectangle; - - /** - * Gets the four corner points in clockwise direction starting with top-left. Due to the possible perspective distortions, this is not necessarily a rectangle. Parts of the region could be outside of the image. - */ - cornerPoints: VisionPoint[]; - } - - /** - * Represents a block of text (similar to a paragraph). - */ - export interface VisionTextBlock extends VisionTextBase { - /** - * Gets an Array of VisionTextLine's that make up this text block. - */ - lines: VisionTextLine[]; - } - - /** - * Represents a line of text. - */ - export interface VisionTextLine extends VisionTextBase { - /** - * Gets an Array of VisionTextElement's that make up this text block. - * - * An element is roughly equivalent to a space-separated "word" in most Latin languages, or a character in others. For instance, if a word is split between two lines by a hyphen, each part is encoded as a separate Element. - */ - elements: VisionTextElement[]; - } - - /** - * Roughly equivalent to a space-separated "word" in most Latin languages, or a character in others. For instance, if a word is split between two lines by a hyphen, each part is encoded as a separate Element. - */ - export type VisionTextElement = VisionTextBase; - - /** - * Represents an image label return from `imageLabelerProcessImage()` and `cloudImageLabelerProcessImage()`. - */ - export interface VisionImageLabel { - /** - * Returns a detected label from the given image. The label returned here is in English only. - * - * Use `entityId` to retrieve a unique id. - */ - text: string; - - /** - * Returns an opaque entity ID. IDs are available in [Google Knowledge Graph Search API](https://developers.google.com/knowledge-graph/). - */ - entityId: string; - - /** - * Gets overall confidence of the result. - * - * Range between 0 (low confidence) and 1 (high confidence). - */ - confidence: number; - } - - /** - * Represents a face returned from `faceDetectorProcessImage()`. - */ - export interface VisionFace { - /** - * Returns the axis-aligned bounding rectangle of the detected face. - */ - boundingBox: VisionRectangle; - - /** - * Represent a face contour. A contour is a list of points on a detected face, such as the mouth. - * - * When 'left' and 'right' are used, they are relative to the subject in the image. For example, the `LEFT_EYE` - * landmark is the subject's left eye, not the eye that is on the left when viewing the image. - */ - faceContours: VisionFaceContour[]; - - /** - * Returns the rotation of the face about the vertical axis of the image. Positive euler y is when the face turns - * toward the right side of the of the image that is being processed. - */ - headEulerAngleY: number; - - /** - * Returns the rotation of the face about the axis pointing out of the image. Positive euler z is a - * counter-clockwise rotation within the image plane. - */ - headEulerAngleZ: number; - - /** - * Returns an array of `VisionFaceLandmark`. - * - * Returns an empty array if the landmark mode has not been enabled via `setLandmarkMode()`. - */ - landmarks: VisionFaceLandmark[]; - - /** - * Returns a value between 0.0 and 1.0 giving a probability that the face's left eye is open. - * - * Returns -1 if the classification mode has not been enabled via `setClassificationMode()`. - */ - leftEyeOpenProbability: number; - - /** - * Returns a value between 0.0 and 1.0 giving a probability that the face's right eye is open. - * - * Returns -1 if the classification mode has not been enabled via `setClassificationMode()`. - */ - rightEyeOpenProbability: number; - - /** - * Returns a value between 0.0 and 1.0 giving a probability that the face is smiling. - * - * Returns -1 if the classification mode has not been enabled via `setClassificationMode()`. - */ - smilingProbability: number; - } - - /** - * Represent a face landmark. A landmark is a point on a detected face, such as an eye, nose, or mouth. - * - * When 'left' and 'right' are used, they are relative to the subject in the image. For example, the `LEFT_EYE` landmark - * is the subject's left eye, not the eye that is on the left when viewing the image. - */ - export interface VisionFaceLandmark { - /** - * Returns the landmark type. - */ - type: VisionFaceLandmarkType; - - /** - * Gets a 2D point for landmark position, where (0, 0) is the upper-left corner of the image. - */ - position: VisionPoint[]; - } - - /** - * Landmark types for a face. - */ - export enum VisionFaceLandmarkType { - /** - * The midpoint between the subject's left mouth corner and the outer corner of the subject's left eye. - */ - LEFT_CHEEK = 1, - - /** - * The midpoint of the subject's left ear tip and left ear lobe. - */ - LEFT_EAR = 3, - - /** - * The center of the subject's left eye cavity. - */ - LEFT_EYE = 4, - - /** - * The center of the subject's bottom lip. - */ - MOUTH_BOTTOM = 0, - - /** - * The subject's left mouth corner where the lips meet. - */ - MOUTH_LEFT = 5, - - /** - * The subject's right mouth corner where the lips meet. - */ - MOUTH_RIGHT = 11, - - /** - * The midpoint between the subject's nostrils where the nose meets the face. - */ - NOSE_BASE = 6, - - /** - * The midpoint between the subject's right mouth corner and the outer corner of the subject's right eye. - */ - RIGHT_CHEEK = 7, - - /** - * The midpoint of the subject's right ear tip and right ear lobe. - */ - RIGHT_EAR = 9, - - /** - * The center of the subject's right eye cavity. - */ - RIGHT_EYE = 10, - } - - /** - * Represent a face contour. A contour is a list of points on a detected face, such as the mouth. - * When 'left' and 'right' are used, they are relative to the subject in the image. For example, the `LEFT_EYE` landmark - * is the subject's left eye, not the eye that is on the left when viewing the image. - */ - export interface VisionFaceContour { - /** - * Returns the contour type. - */ - type: VisionFaceContourType; - - /** - * Gets a list of 2D points for this face contour, where (0, 0) is the upper-left corner of the image. The point is - * guaranteed to be within the bounds of the image. - */ - points: VisionPoint[]; - } - - /** - * Countour type for a face. - */ - export enum VisionFaceContourType { - /** - * All points of a face contour. - */ - ALL_POINTS = 1, - - /** - * The outline of the subject's face. - */ - FACE = 2, - - /** - * The outline of the subject's left eye cavity. - */ - LEFT_EYE = 7, - - /** - * The bottom outline of the subject's left eyebrow. - */ - LEFT_EYEBROW_BOTTOM = 4, - - /** - * The top outline of the subject's left eyebrow. - */ - LEFT_EYEBROW_TOP = 3, - - /** - * The bottom outline of the subject's lower lip. - */ - LOWER_LIP_BOTTOM = 12, - - /** - * The top outline of the subject's lower lip. - */ - LOWER_LIP_TOP = 11, - - /** - * The outline of the subject's nose bridge. - */ - NOSE_BOTTOM = 14, - - /** - * The outline of the subject's nose bridge. - */ - NOSE_BRIDGE = 13, - - /** - * The outline of the subject's right eye cavity. - */ - RIGHT_EYE = 8, - - /** - * The bottom outline of the subject's right eyebrow. - */ - RIGHT_EYEBROW_BOTTOM = 6, - - /** - * The top outline of the subject's right eyebrow. - */ - RIGHT_EYEBROW_TOP = 5, - - /** - * The bottom outline of the subject's upper lip. - */ - UPPER_LIP_BOTTOM = 10, - - /** - * The top outline of the subject's upper lip. - */ - UPPER_LIP_TOP = 9, - } - - /** - * Represents a detected landmark returned from `cloudLandmarkRecognizerProcessImage()`. - */ - export interface VisionLandmark { - /** - * Gets image region of the detected landmark. Returns null if nothing was detected - */ - boundingBox: VisionRectangle | null; - - /** - * Gets overall confidence of the result. Ranging between 0 & 1. - */ - confidence: number; - - /** - * Gets opaque entity ID. Some IDs may be available in [Google Knowledge Graph Search API](https://developers.google.com/knowledge-graph/). - */ - entityId: string; - - /** - * Gets the detected landmark. - */ - landmark: string; - - /** - * Gets the location information for the detected entity. - * - * Multiple VisionGeoPoint elements can be present because one location may indicate the location of the scene - * in the image, and another location may indicate the location of the place where the image was taken. - * Location information is usually present for landmarks. - */ - locations: VisionGeoPoint[]; - } - - /** - * A representation of a latitude/longitude pair. - * - * This is expressed as an array of numbers representing degrees latitude and degrees longitude, in the form `[lat, lng]`. - */ - export type VisionGeoPoint = [number, number]; - - /** - * The Firebase ML Kit service interface. - * - * > This module is available for the default app only. - * - * #### Example - * - * Get the ML Kit service for the default app: - * - * ```js - * const defaultAppMLKit = firebase.vision(); - * ``` - */ - export class Module extends FirebaseModule { - /** - * Detects faces from a local image file. - * - * @param imageFilePath A local path to an image on the device. - * @param faceDetectorOptions An optional instance of `VisionFaceDetectorOptions`. - */ - faceDetectorProcessImage( - imageFilePath: string, - faceDetectorOptions?: VisionFaceDetectorOptions, - ): Promise; - - /** - * Detect text from a local image file using the on-device model. - * - * @param imageFilePath A local path to an image on the device. - */ - textRecognizerProcessImage(imageFilePath: string): Promise; - - /** - * Detect text from a local image file using the cloud (Firebase) model. - * - * @param imageFilePath A local path to an image on the device. - * @param cloudTextRecognizerOptions An instance of `VisionCloudTextRecognizerOptions`. - */ - cloudTextRecognizerProcessImage( - imageFilePath: string, - cloudTextRecognizerOptions?: VisionCloudTextRecognizerOptions, - ): Promise; - - /** - * Detect text within a document using a local image file from the cloud (Firebase) model. - * - * @param imageFilePath A local path to an image on the device. - * @param cloudDocumentTextRecognizerOptions An instance of `VisionCloudDocumentTextRecognizerOptions`. - */ - cloudDocumentTextRecognizerProcessImage( - imageFilePath: string, - cloudDocumentTextRecognizerOptions?: VisionCloudDocumentTextRecognizerOptions, - ): Promise; - - /** - * Returns an array of landmarks (as `VisionLandmark`) of a given local image file path. Landmark detection - * is done on cloud (Firebase). - * - * @param imageFilePath A local image file path. - * @param cloudLandmarkRecognizerOptions An optional instance of `VisionCloudLandmarkRecognizerOptions`. - */ - cloudLandmarkRecognizerProcessImage( - imageFilePath: string, - cloudLandmarkRecognizerOptions?: VisionCloudLandmarkRecognizerOptions, - ): Promise; - - /** - * Returns an array of labels (as `VisionImageLabel`) of a given local image file path. Label detection is done - * on device, resulting in faster results but less descriptive. - * - * #### Example - * - * ```js - * const labels = await firebase.vision().imageLabelerProcessImage(filePath, { - * confidenceThreshold: 0.8, - * }); - * ``` - * - * @param imageFilePath A local image file path. - * @param imageLabelerOptions An optional instance of `VisionImageLabelerOptions`. - */ - imageLabelerProcessImage( - imageFilePath: string, - imageLabelerOptions?: VisionImageLabelerOptions, - ): Promise; - - /** - * Returns an array of labels (as `VisionImageLabel`) of a given local image file path. Label detection is done - * on cloud (Firebase), resulting in slower results but more descriptive. - * - * #### Example - * - * ```js - * const labels = await firebase.vision().cloudImageLabelerProcessImage(filePath, { - * confidenceThreshold: 0.8, - * }); - * ``` - * - * @param imageFilePath A local image file path. - * @param cloudImageLabelerOptions An optional instance of `VisionCloudImageLabelerOptions`. - */ - cloudImageLabelerProcessImage( - imageFilePath: string, - cloudImageLabelerOptions?: VisionCloudImageLabelerOptions, - ): Promise; - - /** - * Returns an array of barcodes (as `VisionBarcode`) detected for a local image file path. - * - * Barcode detection is done locally on device. - * - * #### Example 1 - * - * ```js - * import vision, { VisionBarcodeValueType } from '@react-native-firebase/ml-vision'; - * - * const [barcode, ...otherBarcodes] = await vision().barcodeDetectorProcessImage(filePath); - * - * if (barcode && barcode.valueType === VisionBarcodeValueType.CONTACT_INFO) { - * console.log(barcode.contactInfo); - * } - * ``` - * - * #### Example 2 - * - * Process image with custom `VisionBarcodeDetectorOptions`. - * - * ```js - * import vision, { VisionBarcodeFormat, VisionBarcodeValueType } from '@react-native-firebase/ml-vision'; - * - * const [barcode, ...otherBarcodes] = await vision().barcodeDetectorProcessImage(filePath, { - * barcodeFormats: [VisionBarcodeFormat.QR_CODE] - * }); - * - * if (barcode && barcode.valueType === VisionBarcodeValueType.CONTACT_INFO) { - * console.log(barcode.contactInfo); - * } - * ``` - * - * @param imageFilePath A local image file path. - * @param barcodeDetectorOptions Optional instance of `VisionBarcodeDetectorOptions`. - */ - barcodeDetectorProcessImage( - imageFilePath: string, - barcodeDetectorOptions?: MLKitVision.VisionBarcodeDetectorOptions, - ): Promise; - } -} - -declare const defaultExport: ReactNativeFirebase.FirebaseModuleWithStaticsAndApp< - FirebaseVisionTypes.Module, - FirebaseVisionTypes.Statics ->; - -export const firebase: ReactNativeFirebase.Module & { - analytics: typeof defaultExport; - app(name?: string): ReactNativeFirebase.FirebaseApp & { vision(): FirebaseVisionTypes.Module }; -}; - -export const VisionBarcodeFormat: FirebaseVisionTypes.Statics['VisionBarcodeFormat']; -export const VisionFaceContourType: FirebaseVisionTypes.Statics['VisionFaceContourType']; -export const VisionFaceLandmarkType: FirebaseVisionTypes.Statics['VisionFaceLandmarkType']; -export const VisionBarcodeValueType: FirebaseVisionTypes.Statics['VisionBarcodeValueType']; -export const VisionBarcodeEmailType: FirebaseVisionTypes.Statics['VisionBarcodeEmailType']; -export const VisionBarcodePhoneType: FirebaseVisionTypes.Statics['VisionBarcodePhoneType']; -export const VisionBarcodeAddressType: FirebaseVisionTypes.Statics['VisionBarcodeAddressType']; -export const VisionFaceDetectorContourMode: FirebaseVisionTypes.Statics['VisionFaceDetectorContourMode']; -export const VisionFaceDetectorLandmarkMode: FirebaseVisionTypes.Statics['VisionFaceDetectorLandmarkMode']; -export const VisionBarcodeWifiEncryptionType: FirebaseVisionTypes.Statics['VisionBarcodeWifiEncryptionType']; -export const VisionFaceDetectorPerformanceMode: FirebaseVisionTypes.Statics['VisionFaceDetectorPerformanceMode']; -export const VisionCloudTextRecognizerModelType: FirebaseVisionTypes.Statics['VisionCloudTextRecognizerModelType']; -export const VisionFaceDetectorClassificationMode: FirebaseVisionTypes.Statics['VisionFaceDetectorClassificationMode']; -export const VisionDocumentTextRecognizedBreakType: FirebaseVisionTypes.Statics['VisionDocumentTextRecognizedBreakType']; -export const VisionCloudLandmarkRecognizerModelType: FirebaseVisionTypes.Statics['VisionCloudLandmarkRecognizerModelType']; - -export default defaultExport; - -/** - * Attach namespace to `firebase.` and `FirebaseApp.`. - */ -declare module '@react-native-firebase/app' { - namespace ReactNativeFirebase { - import FirebaseModuleWithStaticsAndApp = ReactNativeFirebase.FirebaseModuleWithStaticsAndApp; - interface Module { - vision: FirebaseModuleWithStaticsAndApp< - FirebaseVisionTypes.Module, - FirebaseVisionTypes.Statics - >; - } - - interface FirebaseApp { - vision(): FirebaseVisionTypes.Module; - } - - interface FirebaseJsonConfig { - ml_vision_face_model: boolean; - ml_vision_ocr_model: boolean; - ml_vision_barcode_model: boolean; - ml_vision_label_model: boolean; - ml_vision_image_label_model: boolean; - } - } -} diff --git a/packages/ml-vision/lib/index.js b/packages/ml-vision/lib/index.js deleted file mode 100644 index 325db1ebb3b..00000000000 --- a/packages/ml-vision/lib/index.js +++ /dev/null @@ -1,273 +0,0 @@ -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -import { - isString, - toFilePath, - validateOptionalNativeDependencyExists, -} from '@react-native-firebase/app/lib/common'; -import { - createModuleNamespace, - FirebaseModule, - getFirebaseRoot, -} from '@react-native-firebase/app/lib/internal'; -import version from './version'; -import VisionBarcodeAddressType from './VisionBarcodeAddressType'; -import visionBarcodeDetectorOptions from './visionBarcodeDetectorOptions'; -import VisionBarcodeEmailType from './VisionBarcodeEmailType'; -import VisionBarcodeFormat from './VisionBarcodeFormat'; -import VisionBarcodePhoneType from './VisionBarcodePhoneType'; -import VisionBarcodeValueType from './VisionBarcodeValueType'; -import VisionBarcodeWifiEncryptionType from './VisionBarcodeWifiEncryptionType'; -import visionCloudDocumentTextRecognizerOptions from './visionCloudDocumentTextRecognizerOptions'; -import visionCloudImageLabelerOptions from './visionCloudImageLabelerOptions'; -import VisionCloudLandmarkRecognizerModelType from './VisionCloudLandmarkRecognizerModelType'; -import visionCloudLandmarkRecognizerOptions from './visionCloudLandmarkRecognizerOptions'; -import VisionCloudTextRecognizerModelType from './VisionCloudTextRecognizerModelType'; -import visionCloudTextRecognizerOptions from './visionCloudTextRecognizerOptions'; -import VisionDocumentTextRecognizedBreakType from './VisionDocumentTextRecognizedBreakType'; -import VisionFaceContourType from './VisionFaceContourType'; -import VisionFaceDetectorClassificationMode from './VisionFaceDetectorClassificationMode'; -import VisionFaceDetectorContourMode from './VisionFaceDetectorContourMode'; -import VisionFaceDetectorLandmarkMode from './VisionFaceDetectorLandmarkMode'; -import visionFaceDetectorOptions from './visionFaceDetectorOptions'; -import VisionFaceDetectorPerformanceMode from './VisionFaceDetectorPerformanceMode'; -import VisionFaceLandmarkType from './VisionFaceLandmarkType'; -import visionImageLabelerOptions from './visionImageLabelerOptions'; - -const statics = { - VisionCloudTextRecognizerModelType, - VisionFaceDetectorClassificationMode, - VisionFaceDetectorContourMode, - VisionFaceDetectorLandmarkMode, - VisionFaceDetectorPerformanceMode, - VisionFaceLandmarkType, - VisionFaceContourType, - VisionCloudLandmarkRecognizerModelType, - VisionDocumentTextRecognizedBreakType, - VisionBarcodeFormat, - VisionBarcodeValueType, - VisionBarcodeAddressType, - VisionBarcodeEmailType, - VisionBarcodePhoneType, - VisionBarcodeWifiEncryptionType, -}; - -const namespace = 'vision'; -const nativeModuleName = [ - 'RNFBMLVisionFaceDetectorModule', - 'RNFBMLVisionImageLabelerModule', - 'RNFBMLVisionTextRecognizerModule', - 'RNFBMLVisionBarcodeDetectorModule', - 'RNFBMLVisionLandmarkRecognizerModule', - 'RNFBMLVisionDocumentTextRecognizerModule', -]; - -class FirebaseMlKitVisionModule extends FirebaseModule { - faceDetectorProcessImage(localImageFilePath, faceDetectorOptions) { - validateOptionalNativeDependencyExists( - 'ml_vision_face_model', - 'ML Kit Vision Face Detector', - !!this.native.faceDetectorProcessImage, - ); - - if (!isString(localImageFilePath)) { - throw new Error( - "firebase.vision().faceDetectorProcessImage(*) 'localImageFilePath' expected a string local file path.", - ); - } - - let options; - try { - options = visionFaceDetectorOptions(faceDetectorOptions); - } catch (e) { - throw new Error( - `firebase.vision().faceDetectorProcessImage(_, *) 'faceDetectorOptions' ${e.message}.`, - ); - } - - return this.native.faceDetectorProcessImage(toFilePath(localImageFilePath), options); - } - - textRecognizerProcessImage(localImageFilePath) { - if (!isString(localImageFilePath)) { - throw new Error( - "firebase.vision().textRecognizerProcessImage(*) 'localImageFilePath' expected a string local file path.", - ); - } - - return this.native.textRecognizerProcessImage(toFilePath(localImageFilePath)); - } - - cloudTextRecognizerProcessImage(localImageFilePath, cloudTextRecognizerOptions) { - if (!isString(localImageFilePath)) { - throw new Error( - "firebase.vision().cloudTextRecognizerProcessImage(*) 'localImageFilePath' expected a string local file path.", - ); - } - - let options; - try { - options = visionCloudTextRecognizerOptions(cloudTextRecognizerOptions); - } catch (e) { - throw new Error(`firebase.vision().cloudTextRecognizerProcessImage(_, *) ${e.message}`); - } - - return this.native.cloudTextRecognizerProcessImage(toFilePath(localImageFilePath), options); - } - - cloudDocumentTextRecognizerProcessImage(localImageFilePath, cloudDocumentTextRecognizerOptions) { - if (!isString(localImageFilePath)) { - throw new Error( - "firebase.vision().cloudDocumentTextRecognizerProcessImage(*) 'localImageFilePath' expected a string local file path.", - ); - } - - let options; - try { - options = visionCloudDocumentTextRecognizerOptions(cloudDocumentTextRecognizerOptions); - } catch (e) { - throw new Error( - `firebase.vision().cloudDocumentTextRecognizerProcessImage(_, *) ${e.message}.`, - ); - } - - return this.native.cloudDocumentTextRecognizerProcessImage( - toFilePath(localImageFilePath), - options, - ); - } - - cloudLandmarkRecognizerProcessImage(localImageFilePath, cloudLandmarkRecognizerOptions) { - if (!isString(localImageFilePath)) { - throw new Error( - "firebase.vision().cloudLandmarkRecognizerProcessImage(*) 'localImageFilePath' expected a string local file path.", - ); - } - - let options; - try { - options = visionCloudLandmarkRecognizerOptions(cloudLandmarkRecognizerOptions); - } catch (e) { - throw new Error(`firebase.vision().cloudLandmarkRecognizerProcessImage(_, *) ${e.message}.`); - } - - return this.native.cloudLandmarkRecognizerProcessImage(toFilePath(localImageFilePath), options); - } - - imageLabelerProcessImage(localImageFilePath, imageLabelerOptions) { - validateOptionalNativeDependencyExists( - 'ml_vision_image_label_model', - 'ML Kit Vision Image Labeler', - !!this.native.imageLabelerProcessImage, - ); - - if (!isString(localImageFilePath)) { - throw new Error( - "firebase.vision().imageLabelerProcessImage(*) 'localImageFilePath' expected a string local file path.", - ); - } - - let options; - try { - options = visionImageLabelerOptions(imageLabelerOptions); - } catch (e) { - throw new Error(`firebase.vision().imageLabelerProcessImage(_, *) ${e.message}.`); - } - - return this.native.imageLabelerProcessImage(toFilePath(localImageFilePath), options); - } - - cloudImageLabelerProcessImage(localImageFilePath, cloudImageLabelerOptions) { - validateOptionalNativeDependencyExists( - 'ml_vision_image_label_model', - 'ML Kit Vision Image Labeler', - !!this.native.imageLabelerProcessImage, - ); - - if (!isString(localImageFilePath)) { - throw new Error( - "firebase.vision().cloudImageLabelerProcessImage(*) 'localImageFilePath' expected a string local file path.", - ); - } - - let options; - try { - options = visionCloudImageLabelerOptions(cloudImageLabelerOptions); - } catch (e) { - throw new Error(`firebase.vision().cloudImageLabelerProcessImage(_, *) ${e.message}.`); - } - - return this.native.cloudImageLabelerProcessImage(toFilePath(localImageFilePath), options); - } - - barcodeDetectorProcessImage(localImageFilePath, barcodeDetectorOptions) { - if (!isString(localImageFilePath)) { - throw new Error( - "firebase.vision().barcodeDetectorProcessImage(*) 'localImageFilePath' expected a string local file path.", - ); - } - - let options; - try { - options = visionBarcodeDetectorOptions(barcodeDetectorOptions); - } catch (e) { - throw new Error(`firebase.vision().barcodeDetectorProcessImage(_, *) ${e.message}`); - } - - return this.native.barcodeDetectorProcessImage(toFilePath(localImageFilePath), options); - } -} - -// import { SDK_VERSION } from '@react-native-firebase/ml-vision'; -export const SDK_VERSION = version; - -// import vision from '@react-native-firebase/ml-vision'; -// vision().X(...); -export default createModuleNamespace({ - statics, - version, - namespace, - nativeModuleName, - nativeEvents: false, - hasMultiAppSupport: true, - hasCustomUrlOrRegionSupport: false, - ModuleClass: FirebaseMlKitVisionModule, -}); - -// import vision, { firebase } from '@react-native-firebase/ml-vision'; -// vision().X(...); -// firebase.vision().X(...); -export const firebase = getFirebaseRoot(); - -// e.g. -// // import { VisionCloudTextRecognizerModelType } from '@react-native-firebase/ml-vision'; -export { default as VisionBarcodeFormat } from './VisionBarcodeFormat'; -export { default as VisionFaceContourType } from './VisionFaceContourType'; -export { default as VisionFaceLandmarkType } from './VisionFaceLandmarkType'; -export { default as VisionBarcodeValueType } from './VisionBarcodeValueType'; -export { default as VisionBarcodeEmailType } from './VisionBarcodeEmailType'; -export { default as VisionBarcodePhoneType } from './VisionBarcodePhoneType'; -export { default as VisionBarcodeAddressType } from './VisionBarcodeAddressType'; -export { default as VisionFaceDetectorContourMode } from './VisionFaceDetectorContourMode'; -export { default as VisionFaceDetectorLandmarkMode } from './VisionFaceDetectorLandmarkMode'; -export { default as VisionBarcodeWifiEncryptionType } from './VisionBarcodeWifiEncryptionType'; -export { default as VisionFaceDetectorPerformanceMode } from './VisionFaceDetectorPerformanceMode'; -export { default as VisionCloudTextRecognizerModelType } from './VisionCloudTextRecognizerModelType'; -export { default as VisionFaceDetectorClassificationMode } from './VisionFaceDetectorClassificationMode'; -export { default as VisionDocumentTextRecognizedBreakType } from './VisionDocumentTextRecognizedBreakType'; -export { default as VisionCloudLandmarkRecognizerModelType } from './VisionCloudLandmarkRecognizerModelType'; diff --git a/packages/ml-vision/lib/visionBarcodeDetectorOptions.js b/packages/ml-vision/lib/visionBarcodeDetectorOptions.js deleted file mode 100644 index 0321f5fa59e..00000000000 --- a/packages/ml-vision/lib/visionBarcodeDetectorOptions.js +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -import { isArray, isObject, isUndefined } from '@react-native-firebase/app/lib/common'; -import VisionBarcodeFormat from './VisionBarcodeFormat'; - -export default function visionBarcodeDetectorOptions(barcodeDetectorOptions) { - const out = { - barcodeFormats: [VisionBarcodeFormat.ALL_FORMATS], - }; - - if (isUndefined(barcodeDetectorOptions)) { - return out; - } - - if (!isObject(barcodeDetectorOptions)) { - throw new Error("'barcodeDetectorOptions' expected an object value."); - } - - if (barcodeDetectorOptions.barcodeFormats) { - if (!isArray(barcodeDetectorOptions.barcodeFormats)) { - throw new Error( - "'barcodeDetectorOptions.barcodeFormats' must be an array of VisionBarcodeFormat types.", - ); - } - - const validFormats = Object.values(VisionBarcodeFormat); - - for (let i = 0; i < barcodeDetectorOptions.barcodeFormats.length; i++) { - if (!validFormats.includes(barcodeDetectorOptions.barcodeFormats[i])) { - throw new Error( - `'barcodeDetectorOptions.barcodeFormats' type at index ${i} is invalid. Expected a VisionBarcodeFormat type.`, - ); - } - } - - out.barcodeFormats = barcodeDetectorOptions.barcodeFormats; - } - - return out; -} diff --git a/packages/ml-vision/lib/visionFaceDetectorOptions.js b/packages/ml-vision/lib/visionFaceDetectorOptions.js deleted file mode 100644 index 2b5e9ebe8ac..00000000000 --- a/packages/ml-vision/lib/visionFaceDetectorOptions.js +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -import { - hasOwnProperty, - isNumber, - isObject, - isUndefined, -} from '@react-native-firebase/app/lib/common'; -import VisionFaceDetectorClassificationMode from './VisionFaceDetectorClassificationMode'; -import VisionFaceDetectorContourMode from './VisionFaceDetectorContourMode'; -import VisionFaceDetectorLandmarkMode from './VisionFaceDetectorLandmarkMode'; -import VisionFaceDetectorPerformanceMode from './VisionFaceDetectorPerformanceMode'; - -export default function visionFaceDetectorOptions(faceDetectorOptions) { - const out = { - classificationMode: VisionFaceDetectorClassificationMode.NO_CLASSIFICATIONS, - contourMode: VisionFaceDetectorContourMode.NO_CONTOURS, - landmarkMode: VisionFaceDetectorLandmarkMode.NO_LANDMARKS, - minFaceSize: 0.1, - performanceMode: VisionFaceDetectorPerformanceMode.FAST, - }; - - if (isUndefined(faceDetectorOptions)) { - return out; - } - - if (!isObject(faceDetectorOptions)) { - throw new Error("'faceDetectorOptions' expected an object value."); - } - - if (faceDetectorOptions.classificationMode) { - if ( - faceDetectorOptions.classificationMode !== - VisionFaceDetectorClassificationMode.NO_CLASSIFICATIONS && - faceDetectorOptions.classificationMode !== - VisionFaceDetectorClassificationMode.ALL_CLASSIFICATIONS - ) { - throw new Error( - "'faceDetectorOptions.classificationMode' invalid classification mode. Expected VisionFaceDetectorClassificationMode.NO_CLASSIFICATIONS or VisionFaceDetectorClassificationMode.ALL_CLASSIFICATIONS.", - ); - } - - out.classificationMode = faceDetectorOptions.classificationMode; - } - - if (faceDetectorOptions.contourMode) { - if ( - faceDetectorOptions.contourMode !== VisionFaceDetectorContourMode.NO_CONTOURS && - faceDetectorOptions.contourMode !== VisionFaceDetectorContourMode.ALL_CONTOURS - ) { - throw new Error( - "'faceDetectorOptions.contourMode' invalid contour mode. Expected VisionFaceDetectorContourMode.NO_CONTOURS or VisionFaceDetectorContourMode.ALL_CONTOURS.", - ); - } - - out.contourMode = faceDetectorOptions.contourMode; - } - - if (faceDetectorOptions.landmarkMode) { - if ( - faceDetectorOptions.landmarkMode !== VisionFaceDetectorLandmarkMode.NO_LANDMARKS && - faceDetectorOptions.landmarkMode !== VisionFaceDetectorLandmarkMode.ALL_LANDMARKS - ) { - throw new Error( - "'faceDetectorOptions.landmarkMode' invalid landmark mode. Expected VisionFaceDetectorLandmarkMode.NO_LANDMARKS or VisionFaceDetectorLandmarkMode.ALL_LANDMARKS.", - ); - } - - out.landmarkMode = faceDetectorOptions.landmarkMode; - } - - if (hasOwnProperty(faceDetectorOptions, 'minFaceSize')) { - if (!isNumber(faceDetectorOptions.minFaceSize)) { - throw new Error("'faceDetectorOptions.minFaceSize' expected a number value between 0 & 1."); - } - - if (faceDetectorOptions.minFaceSize < 0 || faceDetectorOptions.minFaceSize > 1) { - throw new Error("'faceDetectorOptions.minFaceSize' expected value to be between 0 & 1."); - } - - out.minFaceSize = faceDetectorOptions.minFaceSize; - } - - if (faceDetectorOptions.performanceMode) { - if ( - faceDetectorOptions.performanceMode !== VisionFaceDetectorPerformanceMode.FAST && - faceDetectorOptions.performanceMode !== VisionFaceDetectorPerformanceMode.ACCURATE - ) { - throw new Error( - "'faceDetectorOptions.performanceMode' invalid performance mode. Expected VisionFaceDetectorPerformanceMode.FAST or VisionFaceDetectorPerformanceMode.ACCURATE.", - ); - } - - out.performanceMode = faceDetectorOptions.performanceMode; - } - - return out; -} diff --git a/packages/ml-vision/lib/visionImageLabelerOptions.js b/packages/ml-vision/lib/visionImageLabelerOptions.js deleted file mode 100644 index 27f5104eed9..00000000000 --- a/packages/ml-vision/lib/visionImageLabelerOptions.js +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 2016-present Invertase Limited & Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this library except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -import { - hasOwnProperty, - isNumber, - isObject, - isUndefined, -} from '@react-native-firebase/app/lib/common'; - -export default function visionImageLabelerOptions(imageLabelerOptions) { - const out = { - confidenceThreshold: 0.5, - }; - - if (isUndefined(imageLabelerOptions)) { - return out; - } - - if (!isObject(imageLabelerOptions)) { - throw new Error("'imageLabelerOptions' expected an object value."); - } - - if (hasOwnProperty(imageLabelerOptions, 'confidenceThreshold')) { - if (!isNumber(imageLabelerOptions.confidenceThreshold)) { - throw new Error( - "'imageLabelerOptions.confidenceThreshold' expected a number value between 0 & 1.", - ); - } - - if ( - imageLabelerOptions.confidenceThreshold < 0 || - imageLabelerOptions.confidenceThreshold > 1 - ) { - throw new Error( - "'imageLabelerOptions.confidenceThreshold' expected a number value between 0 & 1.", - ); - } - - out.confidenceThreshold = imageLabelerOptions.confidenceThreshold; - } - - return out; -} diff --git a/packages/ml-vision/type-test.ts b/packages/ml-vision/type-test.ts deleted file mode 100644 index c1c480303a6..00000000000 --- a/packages/ml-vision/type-test.ts +++ /dev/null @@ -1,64 +0,0 @@ -import firebase from '@react-native-firebase/app'; -import * as vision from '@react-native-firebase/ml-vision'; - -console.log(vision.default().app); - -// checks module exists at root -console.log(firebase.vision().app.name); - -// checks module exists at app level -console.log(firebase.app().vision().app.name); - -// checks statics exist -console.log(firebase.vision.SDK_VERSION); - -// checks statics exist on defaultExport -console.log(firebase.SDK_VERSION); - -// checks root exists -console.log(firebase.SDK_VERSION); - -// checks firebase named export exists on module -console.log(vision.firebase.SDK_VERSION); - -// checks multi-app support exists -console.log(firebase.vision(firebase.app()).app.name); - -// checks default export supports app arg -console.log(firebase.vision(firebase.app('foo')).app.name); - -console.log(firebase.vision.VisionBarcodeFormat.ALL_FORMATS); -console.log(vision.VisionBarcodeFormat); - -console.log(firebase.vision.VisionFaceContourType.ALL_POINTS); -console.log(vision.VisionFaceContourType.ALL_POINTS); - -console.log(firebase.vision.VisionFaceLandmarkType.LEFT_CHEEK); -console.log(vision.VisionFaceLandmarkType.LEFT_EAR); - -console.log(firebase.vision.VisionBarcodeValueType.CALENDAR_EVENT); -// console.log(vision.VisionBarcodeValueType.); - -console.log(firebase.vision.VisionFaceDetectorContourMode.ALL_CONTOURS); -console.log(vision.VisionFaceDetectorContourMode.ALL_CONTOURS); - -console.log(firebase.vision.VisionFaceDetectorLandmarkMode.ALL_LANDMARKS); -console.log(vision.VisionFaceDetectorLandmarkMode.ALL_LANDMARKS); - -console.log(firebase.vision.VisionBarcodeWifiEncryptionType.WEP); -// console.log(vision.VisionBarcodeWifiEncryptionType.WEP); - -console.log(firebase.vision.VisionFaceDetectorPerformanceMode.ACCURATE); -console.log(vision.VisionFaceDetectorPerformanceMode.FAST); - -console.log(firebase.vision.VisionCloudTextRecognizerModelType.DENSE_MODEL); -console.log(vision.VisionCloudTextRecognizerModelType.SPARSE_MODEL); - -console.log(firebase.vision.VisionFaceDetectorClassificationMode.ALL_CLASSIFICATIONS); -console.log(vision.VisionFaceDetectorClassificationMode.ALL_CLASSIFICATIONS); - -console.log(firebase.vision.VisionDocumentTextRecognizedBreakType.EOL_SURE_SPACE); -console.log(vision.VisionDocumentTextRecognizedBreakType.HYPHEN); - -console.log(firebase.vision.VisionCloudLandmarkRecognizerModelType.LATEST_MODEL); -console.log(vision.VisionCloudLandmarkRecognizerModelType.STABLE_MODEL); diff --git a/packages/ml-natural-language/.npmignore b/packages/ml/.npmignore similarity index 100% rename from packages/ml-natural-language/.npmignore rename to packages/ml/.npmignore diff --git a/packages/ml-vision/CHANGELOG.md b/packages/ml/CHANGELOG.md similarity index 100% rename from packages/ml-vision/CHANGELOG.md rename to packages/ml/CHANGELOG.md diff --git a/packages/ml-natural-language/LICENSE b/packages/ml/LICENSE similarity index 100% rename from packages/ml-natural-language/LICENSE rename to packages/ml/LICENSE diff --git a/packages/ml/README.md b/packages/ml/README.md new file mode 100644 index 00000000000..a33e17c7c56 --- /dev/null +++ b/packages/ml/README.md @@ -0,0 +1,102 @@ +

+ +
+ +

React Native Firebase - ML

+

+ +

+ Coverage + NPM downloads + NPM version + License + Maintained with Lerna +

+ +

+ Chat on Discord + Follow on Twitter + Follow on Facebook +

+ +--- + +Firebase Machine Learning is a mobile SDK that brings Google's machine learning expertise to Android and iOS apps in a powerful yet easy-to-use package. Whether you're new or experienced in machine learning, you can implement the functionality you need in just a few lines of code. There's no need to have deep knowledge of neural networks or model optimization to get started. On the other hand, if you are an experienced ML developer, Firebase ML provides convenient APIs that help you use your custom TensorFlow Lite models in your mobile apps. + +## Cloud vs. on-device + +Firebase ML has APIs that work either in the in the cloud or on the device. When we describe an ML API as being a cloud API or on-device API, we are describing which machine performs inference: that is, which machine uses the ML model to discover insights about the data you provide it. In Firebase ML, this happens either on Google Cloud, or on your users' mobile devices. + +The text recognition, image labeling, and landmark recognition APIs perform inference in the cloud. These models have more computational power and memory available to them than a comparable on-device model, and as a result, can perform inference with greater accuracy and precision than an on-device model. On the other hand, every request to these APIs requires a network round-trip, which makes them unsuitable for real-time and low-latency applications such as video processing. + +The custom model APIs and AutoML Vision Edge deal with ML models that run on the device. The models used and produced by these features are TensorFlow Lite models, which are optimized to run on mobile devices. The biggest advantage to these models is that they don't require a network connection and can run very quickly—fast enough, for example, to process frames of video in real time. + +Firebase ML provides two key capabilities around on-device custom models: + +- Custom model deployment: Deploy custom models to your users' devices by uploading them to our servers. Your Firebase-enabled app will download the model to the device on demand. This allows you to keep your app's initial install size small, and you can swap the ML model without having to republish your app. + +- AutoML Vision Edge: This service helps you create your own on-device custom image classification models with an easy-to-use web interface. Then, you can seamlessly host the models you create with the service mentioned above. + +## ML Kit: Ready-to-use on-device models + +> On June 3, 2020, Google started offering ML Kit's on-device APIs through a [new standalone SDK](https://developers.google.com/ml-kit). Cloud APIs, AutoML Vision Edge, and custom model deployment will continue to be available through Firebase Machine Learning. + +If you're looking for pre-trained models that run on the device, check out [the new standalone ML Kit](https://developers.google.com/ml-kit). Use the new [react-native-mlkit modules](https://www.npmjs.com/org/react-native-mlkit)) for most on-device use cases: + +- Text recognition +- Image labeling +- Object detection and tracking +- Face detection and contour tracing +- Barcode scanning +- Language identification +- Translation +- Smart Reply + +--- + +This react-native-firebase module currently supports the following Firebase ML APIs: + +| API | Supported | +| -------------------------------------------------------------------------------- | --------- | +| [Text Recognition](https://firebase.google.com/docs/ml/recognize-text) | ✅ | +| [Document Text Recognition](https://firebase.google.com/docs/ml/recognize-text)) | ✅ | +| [Image Labeling](https://firebase.google.com/docs/ml/label-images) | ✅ | +| [Landmark Recognition](https://firebase.google.com/docs/ml/recognize-landmarks) | ✅ | +| [AutoML Vision Edge](https://firebase.google.com/docs/ml/automl-image-labeling) | ❌ | +| [Custom Models](https://firebase.google.com/docs/ml/use-custom-models) | ❌ | + +[> Learn More](https://firebase.google.com/docs/ml) + +## Installation + +Requires `@react-native-firebase/app` to be installed. + +```bash +yarn add @react-native-firebase/ml +``` + +## Documentation + +- [Quick Start](https://rnfirebase.io/ml/usage) +- [Reference](https://rnfirebase.io/reference/ml) + +### Additional Topics + +- [Text Recognition](https://rnfirebase.io/ml/text-recognition) +- [Landmark Recognition](https://rnfirebase.io/ml/landmark-recognition) +- [Image Labeling](https://rnfirebase.io/ml/image-labeling) + +## License + +- See [LICENSE](/LICENSE) + +--- + +

+ +

+ Built and maintained with 💛 by Invertase. +

+

+ +--- diff --git a/packages/ml-vision/RNFBMLVision.podspec b/packages/ml/RNFBML.podspec similarity index 73% rename from packages/ml-vision/RNFBMLVision.podspec rename to packages/ml/RNFBML.podspec index 860c5f391eb..693cb7715d1 100644 --- a/packages/ml-vision/RNFBMLVision.podspec +++ b/packages/ml/RNFBML.podspec @@ -11,7 +11,7 @@ if coreVersionDetected != coreVersionRequired end Pod::Spec.new do |s| - s.name = "RNFBMLVision" + s.name = "RNFBML" s.version = package["version"] s.description = package["description"] s.summary = <<-DESC @@ -36,18 +36,6 @@ Pod::Spec.new do |s| # Firebase dependencies s.dependency 'Firebase/MLVision', firebase_sdk_version - if FirebaseJSON::Config.get_value_or_default('ml_vision_face_model', false) - s.dependency 'Firebase/MLVisionFaceModel', firebase_sdk_version - end - if FirebaseJSON::Config.get_value_or_default('ml_vision_ocr_model', false) - s.dependency 'Firebase/MLVisionTextModel', firebase_sdk_version - end - if FirebaseJSON::Config.get_value_or_default('ml_vision_barcode_model', false) - s.dependency 'Firebase/MLVisionBarcodeModel', firebase_sdk_version - end - if FirebaseJSON::Config.get_value_or_default('ml_vision_image_label_model', false) - s.dependency 'Firebase/MLVisionLabelModel', firebase_sdk_version - end if defined?($RNFirebaseAsStaticFramework) Pod::UI.puts "#{s.name}: Using overridden static_framework value of '#{$RNFirebaseAsStaticFramework}'" diff --git a/packages/ml-natural-language/android/.editorconfig b/packages/ml/android/.editorconfig similarity index 100% rename from packages/ml-natural-language/android/.editorconfig rename to packages/ml/android/.editorconfig diff --git a/packages/ml-vision/android/build.gradle b/packages/ml/android/build.gradle similarity index 91% rename from packages/ml-vision/android/build.gradle rename to packages/ml/android/build.gradle index 99ae046b8ea..2db025b20e2 100644 --- a/packages/ml-vision/android/build.gradle +++ b/packages/ml/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:4.0.1") + classpath("com.android.tools.build:gradle:4.1.0") } } } @@ -92,11 +92,8 @@ dependencies { implementation platform("com.google.firebase:firebase-bom:${ReactNative.ext.getVersion("firebase", "bom")}") implementation "com.google.firebase:firebase-ml-vision" - // This is necessary to fix known dependency issues in the SDK - // https://firebase.google.com/support/release-notes/android#bom_v25-8-0 implementation 'com.google.android.gms:play-services-vision:20.1.1' implementation 'com.google.android.gms:play-services-vision-common:19.1.1' - implementation 'com.google.firebase:firebase-ml-vision-image-label-model:20.0.2' implementation 'com.google.android.gms:play-services-vision-face-contour-internal:16.0.3' implementation 'com.google.android.gms:play-services-vision-image-labeling-internal:16.0.5' implementation 'com.google.android.gms:play-services-vision-image-label:18.0.5' @@ -104,8 +101,6 @@ dependencies { implementation 'com.google.firebase:firebase-ml-model-interpreter:22.0.4' } -apply from: file("./ml-models.gradle") - ReactNative.shared.applyPackageVersion() ReactNative.shared.applyDefaultExcludes() ReactNative.module.applyAndroidVersions() diff --git a/packages/ml-natural-language/android/lint.xml b/packages/ml/android/lint.xml similarity index 100% rename from packages/ml-natural-language/android/lint.xml rename to packages/ml/android/lint.xml diff --git a/packages/ml/android/settings.gradle b/packages/ml/android/settings.gradle new file mode 100644 index 00000000000..21d0e6de756 --- /dev/null +++ b/packages/ml/android/settings.gradle @@ -0,0 +1 @@ +rootProject.name = '@react-native-firebase_ml' diff --git a/packages/ml/android/src/main/AndroidManifest.xml b/packages/ml/android/src/main/AndroidManifest.xml new file mode 100644 index 00000000000..b7e0bbc3790 --- /dev/null +++ b/packages/ml/android/src/main/AndroidManifest.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionCommon.java b/packages/ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLCommon.java similarity index 98% rename from packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionCommon.java rename to packages/ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLCommon.java index f3be9b1690a..dbc2475dbe8 100644 --- a/packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionCommon.java +++ b/packages/ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLCommon.java @@ -1,10 +1,10 @@ -package io.invertase.firebase.ml.vision; +package io.invertase.firebase.ml; import com.google.firebase.ml.common.FirebaseMLException; import javax.annotation.Nullable; -class UniversalFirebaseMLVisionCommon { +class UniversalFirebaseMLCommon { static final String KEY_BOUNDING_BOX = "boundingBox"; static final String KEY_TEXT = "text"; static final String KEY_CONFIDENCE = "confidence"; diff --git a/packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionDocumentTextRecognizerModule.java b/packages/ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLDocumentTextRecognizerModule.java similarity index 96% rename from packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionDocumentTextRecognizerModule.java rename to packages/ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLDocumentTextRecognizerModule.java index 4139664db78..2ff78b56b55 100644 --- a/packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionDocumentTextRecognizerModule.java +++ b/packages/ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLDocumentTextRecognizerModule.java @@ -1,4 +1,4 @@ -package io.invertase.firebase.ml.vision; +package io.invertase.firebase.ml; /* * Copyright (c) 2016-present Invertase Limited & Contributors @@ -35,10 +35,10 @@ import javax.annotation.Nullable; import java.util.*; -import static io.invertase.firebase.ml.vision.UniversalFirebaseMLVisionCommon.*; +import static io.invertase.firebase.ml.UniversalFirebaseMLCommon.*; -class UniversalFirebaseMLVisionDocumentTextRecognizerModule extends UniversalFirebaseModule { - UniversalFirebaseMLVisionDocumentTextRecognizerModule(Context context, String serviceName) { +class UniversalFirebaseMLDocumentTextRecognizerModule extends UniversalFirebaseModule { + UniversalFirebaseMLDocumentTextRecognizerModule(Context context, String serviceName) { super(context, serviceName); } diff --git a/packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionImageLabelerModule.java b/packages/ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLImageLabelerModule.java similarity index 79% rename from packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionImageLabelerModule.java rename to packages/ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLImageLabelerModule.java index 786ba9cc6c9..7d41db3a4f7 100644 --- a/packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionImageLabelerModule.java +++ b/packages/ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLImageLabelerModule.java @@ -1,4 +1,4 @@ -package io.invertase.firebase.ml.vision; +package io.invertase.firebase.ml; /* * Copyright (c) 2016-present Invertase Limited & Contributors @@ -37,30 +37,13 @@ import java.util.List; import java.util.Map; -import static io.invertase.firebase.ml.vision.UniversalFirebaseMLVisionCommon.*; +import static io.invertase.firebase.ml.UniversalFirebaseMLCommon.*; -class UniversalFirebaseMLVisionImageLabelerModule extends UniversalFirebaseModule { - UniversalFirebaseMLVisionImageLabelerModule(Context context, String serviceName) { +class UniversalFirebaseMLImageLabelerModule extends UniversalFirebaseModule { + UniversalFirebaseMLImageLabelerModule(Context context, String serviceName) { super(context, serviceName); } - Task>> imageLabelerProcessImage(String appName, String stringUri, Bundle imageLabelerOptions) { - return Tasks.call(getExecutor(), () -> { - FirebaseApp firebaseApp = FirebaseApp.getInstance(appName); - FirebaseVisionOnDeviceImageLabelerOptions options = getOnDeviceImageLabelerOptions(imageLabelerOptions); - FirebaseVisionImageLabeler visionImageLabeler = FirebaseVision.getInstance(firebaseApp) - .getOnDeviceImageLabeler(options); - FirebaseVisionImage image = FirebaseVisionImage.fromFilePath( - getContext(), - SharedUtils.getUri(stringUri) - ); - - return processLabelerList( - Tasks.await(visionImageLabeler.processImage(image)) - ); - }); - } - Task>> cloudImageLabelerProcessImage(String appName, String stringUri, Bundle cloudImageLabelerOptions) { return Tasks.call(getExecutor(), () -> { FirebaseApp firebaseApp = FirebaseApp.getInstance(appName); diff --git a/packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionLandmarkRecognizerModule.java b/packages/ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLLandmarkRecognizerModule.java similarity index 94% rename from packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionLandmarkRecognizerModule.java rename to packages/ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLLandmarkRecognizerModule.java index 6ec562271b8..20fc33626b8 100644 --- a/packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionLandmarkRecognizerModule.java +++ b/packages/ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLLandmarkRecognizerModule.java @@ -1,4 +1,4 @@ -package io.invertase.firebase.ml.vision; +package io.invertase.firebase.ml; /* * Copyright (c) 2016-present Invertase Limited & Contributors @@ -37,10 +37,10 @@ import java.util.List; import java.util.Map; -import static io.invertase.firebase.ml.vision.UniversalFirebaseMLVisionCommon.*; +import static io.invertase.firebase.ml.UniversalFirebaseMLCommon.*; -class UniversalFirebaseMLVisionLandmarkRecognizerModule extends UniversalFirebaseModule { - UniversalFirebaseMLVisionLandmarkRecognizerModule(Context context, String serviceName) { +class UniversalFirebaseMLLandmarkRecognizerModule extends UniversalFirebaseModule { + UniversalFirebaseMLLandmarkRecognizerModule(Context context, String serviceName) { super(context, serviceName); } diff --git a/packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionTextRecognizerModule.java b/packages/ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLTextRecognizerModule.java similarity index 89% rename from packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionTextRecognizerModule.java rename to packages/ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLTextRecognizerModule.java index de16c5f5508..8a84efe8f41 100644 --- a/packages/ml-vision/android/src/main/java/io/invertase/firebase/ml/vision/UniversalFirebaseMLVisionTextRecognizerModule.java +++ b/packages/ml/android/src/main/java/io/invertase/firebase/ml/UniversalFirebaseMLTextRecognizerModule.java @@ -1,4 +1,4 @@ -package io.invertase.firebase.ml.vision; +package io.invertase.firebase.ml; /* * Copyright (c) 2016-present Invertase Limited & Contributors @@ -34,32 +34,13 @@ import java.util.*; -import static io.invertase.firebase.ml.vision.UniversalFirebaseMLVisionCommon.*; +import static io.invertase.firebase.ml.UniversalFirebaseMLCommon.*; -class UniversalFirebaseMLVisionTextRecognizerModule extends UniversalFirebaseModule { - UniversalFirebaseMLVisionTextRecognizerModule(Context context, String serviceName) { +class UniversalFirebaseMLTextRecognizerModule extends UniversalFirebaseModule { + UniversalFirebaseMLTextRecognizerModule(Context context, String serviceName) { super(context, serviceName); } - Task> textRecognizerProcessImage( - String appName, - String stringUri - ) { - return Tasks.call(getExecutor(), () -> { - FirebaseApp firebaseApp = FirebaseApp.getInstance(appName); - FirebaseVisionTextRecognizer detector = FirebaseVision.getInstance(firebaseApp) - .getOnDeviceTextRecognizer(); - - FirebaseVisionImage image = FirebaseVisionImage.fromFilePath( - getContext(), - SharedUtils.getUri(stringUri) - ); - - FirebaseVisionText result = Tasks.await(detector.processImage(image)); - return getFirebaseVisionTextMap(result); - }); - } - Task> cloudTextRecognizerProcessImage( String appName, String stringUri, diff --git a/packages/ml/android/src/reactnative/AndroidManifest.xml b/packages/ml/android/src/reactnative/AndroidManifest.xml new file mode 100644 index 00000000000..d55b471c2c7 --- /dev/null +++ b/packages/ml/android/src/reactnative/AndroidManifest.xml @@ -0,0 +1,2 @@ + + diff --git a/packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionDocumentTextRecognizerModule.java b/packages/ml/android/src/reactnative/java/io/invertase/firebase/ml/RNFirebaseMLDocumentTextRecognizerModule.java similarity index 71% rename from packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionDocumentTextRecognizerModule.java rename to packages/ml/android/src/reactnative/java/io/invertase/firebase/ml/RNFirebaseMLDocumentTextRecognizerModule.java index b69ee5adbb2..2bbfb583d07 100644 --- a/packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionDocumentTextRecognizerModule.java +++ b/packages/ml/android/src/reactnative/java/io/invertase/firebase/ml/RNFirebaseMLDocumentTextRecognizerModule.java @@ -1,4 +1,4 @@ -package io.invertase.firebase.ml.vision; +package io.invertase.firebase.ml; /* * Copyright (c) 2016-present Invertase Limited & Contributors @@ -20,13 +20,13 @@ import com.facebook.react.bridge.*; import io.invertase.firebase.common.ReactNativeFirebaseModule; -public class RNFirebaseMLVisionDocumentTextRecognizerModule extends ReactNativeFirebaseModule { - private static final String SERVICE_NAME = "MLVisionDocumentTextRecognizer"; - private final UniversalFirebaseMLVisionDocumentTextRecognizerModule module; +public class RNFirebaseMLDocumentTextRecognizerModule extends ReactNativeFirebaseModule { + private static final String SERVICE_NAME = "MLDocumentTextRecognizer"; + private final UniversalFirebaseMLDocumentTextRecognizerModule module; - RNFirebaseMLVisionDocumentTextRecognizerModule(ReactApplicationContext reactContext) { + RNFirebaseMLDocumentTextRecognizerModule(ReactApplicationContext reactContext) { super(reactContext, SERVICE_NAME); - this.module = new UniversalFirebaseMLVisionDocumentTextRecognizerModule(reactContext, SERVICE_NAME); + this.module = new UniversalFirebaseMLDocumentTextRecognizerModule(reactContext, SERVICE_NAME); } @ReactMethod @@ -41,7 +41,7 @@ public void cloudDocumentTextRecognizerProcessImage( if (task.isSuccessful()) { promise.resolve(Arguments.makeNativeMap(task.getResult())); } else { - String[] errorCodeAndMessage = UniversalFirebaseMLVisionCommon.getErrorCodeAndMessageFromException( + String[] errorCodeAndMessage = UniversalFirebaseMLCommon.getErrorCodeAndMessageFromException( task.getException()); rejectPromiseWithCodeAndMessage( promise, diff --git a/packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionBarcodeDetectorModule.java b/packages/ml/android/src/reactnative/java/io/invertase/firebase/ml/RNFirebaseMLImageLabelerModule.java similarity index 54% rename from packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionBarcodeDetectorModule.java rename to packages/ml/android/src/reactnative/java/io/invertase/firebase/ml/RNFirebaseMLImageLabelerModule.java index cacba5626a2..09733e56e72 100644 --- a/packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionBarcodeDetectorModule.java +++ b/packages/ml/android/src/reactnative/java/io/invertase/firebase/ml/RNFirebaseMLImageLabelerModule.java @@ -1,4 +1,4 @@ -package io.invertase.firebase.ml.vision; +package io.invertase.firebase.ml; /* * Copyright (c) 2016-present Invertase Limited & Contributors @@ -20,23 +20,25 @@ import com.facebook.react.bridge.*; import io.invertase.firebase.common.ReactNativeFirebaseModule; -public class RNFirebaseMLVisionBarcodeDetectorModule extends ReactNativeFirebaseModule { - private static final String SERVICE_NAME = "MLVisionBarcodeDetector"; - private final UniversalFirebaseMLVisionBarcodeDetectorModule module; +public class RNFirebaseMLImageLabelerModule extends ReactNativeFirebaseModule { + private static final String SERVICE_NAME = "MLImageLabeler"; + private final UniversalFirebaseMLImageLabelerModule module; - RNFirebaseMLVisionBarcodeDetectorModule(ReactApplicationContext reactContext) { + RNFirebaseMLImageLabelerModule(ReactApplicationContext reactContext) { super(reactContext, SERVICE_NAME); - this.module = new UniversalFirebaseMLVisionBarcodeDetectorModule(reactContext, SERVICE_NAME); + this.module = new UniversalFirebaseMLImageLabelerModule(reactContext, SERVICE_NAME); } @ReactMethod - public void barcodeDetectorProcessImage(String appName, String stringUri, ReadableMap barcodeDetectorOptions, Promise promise) { - module.barcodeDetectorProcessImage(appName, stringUri, Arguments.toBundle(barcodeDetectorOptions)) - .addOnCompleteListener(getExecutor(), task -> { + public void cloudImageLabelerProcessImage(String appName, String stringUri, ReadableMap cloudImageLabelerOptions, Promise promise) { + this.module.cloudImageLabelerProcessImage(appName, stringUri, Arguments.toBundle(cloudImageLabelerOptions)) + .addOnCompleteListener(task -> { if (task.isSuccessful()) { - promise.resolve(Arguments.makeNativeArray(task.getResult())); + promise.resolve( + Arguments.makeNativeArray(task.getResult()) + ); } else { - String[] errorCodeAndMessage = UniversalFirebaseMLVisionCommon.getErrorCodeAndMessageFromException( + String[] errorCodeAndMessage = UniversalFirebaseMLCommon.getErrorCodeAndMessageFromException( task.getException()); rejectPromiseWithCodeAndMessage( promise, @@ -47,5 +49,4 @@ public void barcodeDetectorProcessImage(String appName, String stringUri, Readab } }); } - } diff --git a/packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionLandmarkRecognizerModule.java b/packages/ml/android/src/reactnative/java/io/invertase/firebase/ml/RNFirebaseMLLandmarkRecognizerModule.java similarity index 72% rename from packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionLandmarkRecognizerModule.java rename to packages/ml/android/src/reactnative/java/io/invertase/firebase/ml/RNFirebaseMLLandmarkRecognizerModule.java index 71e731c7db5..37730a87883 100644 --- a/packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionLandmarkRecognizerModule.java +++ b/packages/ml/android/src/reactnative/java/io/invertase/firebase/ml/RNFirebaseMLLandmarkRecognizerModule.java @@ -1,4 +1,4 @@ -package io.invertase.firebase.ml.vision; +package io.invertase.firebase.ml; /* * Copyright (c) 2016-present Invertase Limited & Contributors @@ -20,13 +20,13 @@ import com.facebook.react.bridge.*; import io.invertase.firebase.common.ReactNativeFirebaseModule; -public class RNFirebaseMLVisionLandmarkRecognizerModule extends ReactNativeFirebaseModule { - private static final String SERVICE_NAME = "MLVisionLandmarkRecognizer"; - private UniversalFirebaseMLVisionLandmarkRecognizerModule module; +public class RNFirebaseMLLandmarkRecognizerModule extends ReactNativeFirebaseModule { + private static final String SERVICE_NAME = "MLLandmarkRecognizer"; + private UniversalFirebaseMLLandmarkRecognizerModule module; - RNFirebaseMLVisionLandmarkRecognizerModule(ReactApplicationContext reactContext) { + RNFirebaseMLLandmarkRecognizerModule(ReactApplicationContext reactContext) { super(reactContext, SERVICE_NAME); - this.module = new UniversalFirebaseMLVisionLandmarkRecognizerModule(reactContext, SERVICE_NAME); + this.module = new UniversalFirebaseMLLandmarkRecognizerModule(reactContext, SERVICE_NAME); } @ReactMethod @@ -38,7 +38,7 @@ public void cloudLandmarkRecognizerProcessImage(String appName, String stringUri Arguments.makeNativeArray(task.getResult()) ); } else { - String[] errorCodeAndMessage = UniversalFirebaseMLVisionCommon.getErrorCodeAndMessageFromException( + String[] errorCodeAndMessage = UniversalFirebaseMLCommon.getErrorCodeAndMessageFromException( task.getException()); rejectPromiseWithCodeAndMessage( promise, diff --git a/packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionFaceDetectorModule.java b/packages/ml/android/src/reactnative/java/io/invertase/firebase/ml/RNFirebaseMLTextRecognizerModule.java similarity index 59% rename from packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionFaceDetectorModule.java rename to packages/ml/android/src/reactnative/java/io/invertase/firebase/ml/RNFirebaseMLTextRecognizerModule.java index e2bafafa8d1..11231a32dc3 100644 --- a/packages/ml-vision/android/src/reactnative/java/io/invertase/firebase/ml/vision/RNFirebaseMLVisionFaceDetectorModule.java +++ b/packages/ml/android/src/reactnative/java/io/invertase/firebase/ml/RNFirebaseMLTextRecognizerModule.java @@ -1,4 +1,4 @@ -package io.invertase.firebase.ml.vision; +package io.invertase.firebase.ml; /* * Copyright (c) 2016-present Invertase Limited & Contributors @@ -20,30 +20,28 @@ import com.facebook.react.bridge.*; import io.invertase.firebase.common.ReactNativeFirebaseModule; -public class RNFirebaseMLVisionFaceDetectorModule extends ReactNativeFirebaseModule { - private static final String SERVICE_NAME = "MLVisionFaceDetector"; - private final UniversalFirebaseMLVisionFaceDetectorModule module; +public class RNFirebaseMLTextRecognizerModule extends ReactNativeFirebaseModule { + private static final String SERVICE_NAME = "MLTextRecognizer"; + private final UniversalFirebaseMLTextRecognizerModule module; - RNFirebaseMLVisionFaceDetectorModule(ReactApplicationContext reactContext) { + RNFirebaseMLTextRecognizerModule(ReactApplicationContext reactContext) { super(reactContext, SERVICE_NAME); - this.module = new UniversalFirebaseMLVisionFaceDetectorModule(reactContext, SERVICE_NAME); + this.module = new UniversalFirebaseMLTextRecognizerModule(reactContext, SERVICE_NAME); } @ReactMethod - public void faceDetectorProcessImage( + public void cloudTextRecognizerProcessImage( String appName, String stringUri, - ReadableMap faceDetectorOptionsMap, + ReadableMap cloudTextRecognizerOptions, Promise promise ) { - module.faceDetectorProcessImage(appName, stringUri, Arguments.toBundle(faceDetectorOptionsMap)) + module.cloudTextRecognizerProcessImage(appName, stringUri, Arguments.toBundle(cloudTextRecognizerOptions)) .addOnCompleteListener(getExecutor(), task -> { if (task.isSuccessful()) { - promise.resolve( - Arguments.makeNativeArray(task.getResult()) - ); + promise.resolve(Arguments.makeNativeMap(task.getResult())); } else { - String[] errorCodeAndMessage = UniversalFirebaseMLVisionCommon.getErrorCodeAndMessageFromException( + String[] errorCodeAndMessage = UniversalFirebaseMLCommon.getErrorCodeAndMessageFromException( task.getException()); rejectPromiseWithCodeAndMessage( promise, @@ -54,5 +52,4 @@ public void faceDetectorProcessImage( } }); } - } diff --git a/packages/ml-natural-language/android/src/reactnative/java/io/invertase/firebase/ml/naturallanguage/ReactNativeFirebaseMLNaturalLanguagePackage.java b/packages/ml/android/src/reactnative/java/io/invertase/firebase/ml/ReactNativeFirebaseMLPackage.java similarity index 63% rename from packages/ml-natural-language/android/src/reactnative/java/io/invertase/firebase/ml/naturallanguage/ReactNativeFirebaseMLNaturalLanguagePackage.java rename to packages/ml/android/src/reactnative/java/io/invertase/firebase/ml/ReactNativeFirebaseMLPackage.java index 4b2359d60a5..268b8618c10 100644 --- a/packages/ml-natural-language/android/src/reactnative/java/io/invertase/firebase/ml/naturallanguage/ReactNativeFirebaseMLNaturalLanguagePackage.java +++ b/packages/ml/android/src/reactnative/java/io/invertase/firebase/ml/ReactNativeFirebaseMLPackage.java @@ -1,4 +1,4 @@ -package io.invertase.firebase.ml.naturallanguage; +package io.invertase.firebase.ml; /* * Copyright (c) 2016-present Invertase Limited & Contributors @@ -21,40 +21,23 @@ import com.facebook.react.bridge.NativeModule; import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.uimanager.ViewManager; +import io.invertase.firebase.common.ReactNativeFirebaseJSON; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.annotation.Nonnull; - -import io.invertase.firebase.common.ReactNativeFirebaseJSON; - @SuppressWarnings("unused") -public class ReactNativeFirebaseMLNaturalLanguagePackage implements ReactPackage { +public class ReactNativeFirebaseMLPackage implements ReactPackage { @Nonnull @Override public List createNativeModules(@Nonnull ReactApplicationContext reactContext) { List modules = new ArrayList<>(); - - if (ReactNativeFirebaseJSON - .getSharedInstance() - .getBooleanValue("ml_natural_language_language_id_model", false)) { - modules.add(new RNFirebaseMLNaturalLanguageIdModule(reactContext)); - } - - if (ReactNativeFirebaseJSON - .getSharedInstance() - .getBooleanValue("ml_natural_language_translate_model", false)) { - modules.add(new RNFirebaseMLNaturalLanguageTranslateModule(reactContext)); - } - - if (ReactNativeFirebaseJSON - .getSharedInstance() - .getBooleanValue("ml_natural_language_smart_reply_model", false)) { - modules.add(new RNFirebaseMLNaturalLanguageSmartReplyModule(reactContext)); - } - + modules.add(new RNFirebaseMLTextRecognizerModule(reactContext)); + modules.add(new RNFirebaseMLLandmarkRecognizerModule(reactContext)); + modules.add(new RNFirebaseMLDocumentTextRecognizerModule(reactContext)); + modules.add(new RNFirebaseMLImageLabelerModule(reactContext)); return modules; } diff --git a/packages/ml-vision/e2e/documentText.e2e.js b/packages/ml/e2e/documentText.e2e.js similarity index 83% rename from packages/ml-vision/e2e/documentText.e2e.js rename to packages/ml/e2e/documentText.e2e.js index 4be8f13122f..be1bc4d28d6 100644 --- a/packages/ml-vision/e2e/documentText.e2e.js +++ b/packages/ml/e2e/documentText.e2e.js @@ -42,7 +42,7 @@ function documentTextBaseElementValidate(documentTextBase) { let testImageFile; -describe('mlkit.vision.document.text', () => { +describe('ml.document.text', () => { before(async () => { testImageFile = `${firebase.utils.FilePath.DOCUMENT_DIRECTORY}/text.png`; await firebase @@ -51,10 +51,10 @@ describe('mlkit.vision.document.text', () => { .writeToFile(testImageFile); }); - describe('VisionCloudDocumentTextRecognizerOptions', () => { + describe('MLCloudDocumentTextRecognizerOptions', () => { it('throws if not an object', async () => { try { - await firebase.vision().cloudDocumentTextRecognizerProcessImage(testImageFile, 'foo'); + await firebase.ml().cloudDocumentTextRecognizerProcessImage(testImageFile, 'foo'); return Promise.reject(new Error('Did not throw Error.')); } catch (e) { e.message.should.containEql( @@ -66,7 +66,7 @@ describe('mlkit.vision.document.text', () => { it('throws if enforceCertFingerprintMatch is not a boolean', async () => { try { - await firebase.vision().cloudDocumentTextRecognizerProcessImage(testImageFile, { + await firebase.ml().cloudDocumentTextRecognizerProcessImage(testImageFile, { enforceCertFingerprintMatch: 'true', }); return Promise.reject(new Error('Did not throw Error.')); @@ -79,14 +79,14 @@ describe('mlkit.vision.document.text', () => { }); it('sets enforceCertFingerprintMatch', async () => { - await firebase.vision().cloudDocumentTextRecognizerProcessImage(testImageFile, { + await firebase.ml().cloudDocumentTextRecognizerProcessImage(testImageFile, { enforceCertFingerprintMatch: false, }); }); it('throws if apiKeyOverride is not a string', async () => { try { - await firebase.vision().cloudDocumentTextRecognizerProcessImage(testImageFile, { + await firebase.ml().cloudDocumentTextRecognizerProcessImage(testImageFile, { apiKeyOverride: true, }); return Promise.reject(new Error('Did not throw Error.')); @@ -100,7 +100,7 @@ describe('mlkit.vision.document.text', () => { it('throws if languageHints is not an array', async () => { try { - await firebase.vision().cloudDocumentTextRecognizerProcessImage(testImageFile, { + await firebase.ml().cloudDocumentTextRecognizerProcessImage(testImageFile, { languageHints: 'en', }); return Promise.reject(new Error('Did not throw Error.')); @@ -114,7 +114,7 @@ describe('mlkit.vision.document.text', () => { it('throws if languageHints is empty array', async () => { try { - await firebase.vision().cloudDocumentTextRecognizerProcessImage(testImageFile, { + await firebase.ml().cloudDocumentTextRecognizerProcessImage(testImageFile, { languageHints: [], }); return Promise.reject(new Error('Did not throw Error.')); @@ -128,7 +128,7 @@ describe('mlkit.vision.document.text', () => { it('throws if languageHints contains non-string', async () => { try { - await firebase.vision().cloudDocumentTextRecognizerProcessImage(testImageFile, { + await firebase.ml().cloudDocumentTextRecognizerProcessImage(testImageFile, { languageHints: [123], }); return Promise.reject(new Error('Did not throw Error.')); @@ -141,7 +141,7 @@ describe('mlkit.vision.document.text', () => { }); it('sets hinted languages', async () => { - await firebase.vision().cloudDocumentTextRecognizerProcessImage(testImageFile, { + await firebase.ml().cloudDocumentTextRecognizerProcessImage(testImageFile, { languageHints: ['fr'], }); }); @@ -150,7 +150,7 @@ describe('mlkit.vision.document.text', () => { describe('cloudDocumentTextRecognizerProcessImage()', () => { it('should throw if image path is not a string', () => { try { - firebase.vision().cloudDocumentTextRecognizerProcessImage(123); + firebase.ml().cloudDocumentTextRecognizerProcessImage(123); return Promise.reject(new Error('Did not throw an Error.')); } catch (error) { error.message.should.containEql("'localImageFilePath' expected a string local file path"); @@ -158,8 +158,8 @@ describe('mlkit.vision.document.text', () => { } }); - it('should return a VisionDocumentText representation for an image', async () => { - const res = await firebase.vision().cloudDocumentTextRecognizerProcessImage(testImageFile); + it('should return a MLDocumentText representation for an image', async () => { + const res = await firebase.ml().cloudDocumentTextRecognizerProcessImage(testImageFile); res.text.should.be.a.String(); res.blocks.should.be.an.Array(); diff --git a/packages/ml-vision/e2e/label.e2e.js b/packages/ml/e2e/label.e2e.js similarity index 51% rename from packages/ml-vision/e2e/label.e2e.js rename to packages/ml/e2e/label.e2e.js index d305c41f1ff..7b7c39ccb91 100644 --- a/packages/ml-vision/e2e/label.e2e.js +++ b/packages/ml/e2e/label.e2e.js @@ -17,7 +17,7 @@ let testImageFile; -describe('mlkit.vision.label', () => { +describe('ml.label', () => { before(async () => { testImageFile = `${firebase.utils.FilePath.DOCUMENT_DIRECTORY}/crab.jpg`; await firebase @@ -26,35 +26,10 @@ describe('mlkit.vision.label', () => { .writeToFile(testImageFile); }); - describe('imageLabelerProcessImage()', () => { - it('should throw if image path is not a string', () => { - try { - firebase.vision().imageLabelerProcessImage(123); - return Promise.reject(new Error('Did not throw an Error.')); - } catch (error) { - error.message.should.containEql("'localImageFilePath' expected a string local file path"); - return Promise.resolve(); - } - }); - - it('should return a local label array', async () => { - const res = await firebase.vision().imageLabelerProcessImage(testImageFile); - - res.should.be.Array(); - res.length.should.be.greaterThan(0); - - res.forEach(i => { - i.text.should.be.String(); - i.entityId.should.be.String(); - i.confidence.should.be.Number(); - }); - }); - }); - describe('cloudImageLabelerProcessImage()', () => { it('should throw if image path is not a string', () => { try { - firebase.vision().cloudImageLabelerProcessImage(123); + firebase.ml().cloudImageLabelerProcessImage(123); return Promise.reject(new Error('Did not throw an Error.')); } catch (error) { error.message.should.containEql("'localImageFilePath' expected a string local file path"); @@ -62,65 +37,8 @@ describe('mlkit.vision.label', () => { } }); - it('should return a cloud label array', async () => { - const res = await firebase.vision().cloudImageLabelerProcessImage(testImageFile); - - res.should.be.Array(); - res.length.should.be.greaterThan(0); - - res.forEach(i => { - i.text.should.be.String(); - i.entityId.should.be.String(); - i.confidence.should.be.Number(); - }); - }); - }); - - describe('VisionImageLabelerOptions', () => { - it('throws if not an object', async () => { - try { - await firebase.vision().imageLabelerProcessImage(testImageFile, '123'); - return Promise.reject(new Error('Did not throw an Error.')); - } catch (error) { - error.message.should.containEql("'imageLabelerOptions' expected an object value"); - return Promise.resolve(); - } - }); - - describe('confidenceThreshold', () => { - it('should throw if confidence threshold is not a number', async () => { - try { - await firebase.vision().imageLabelerProcessImage(testImageFile, { - confidenceThreshold: '0.5', - }); - return Promise.reject(new Error('Did not throw an Error.')); - } catch (error) { - error.message.should.containEql( - "'imageLabelerOptions.confidenceThreshold' expected a number value between 0 & 1", - ); - return Promise.resolve(); - } - }); - }); - - it('should throw if confidence threshold is not between 0 & 1', async () => { - try { - await firebase.vision().imageLabelerProcessImage(testImageFile, { - confidenceThreshold: -0.2, - }); - return Promise.reject(new Error('Did not throw an Error.')); - } catch (error) { - error.message.should.containEql( - "'imageLabelerOptions.confidenceThreshold' expected a number value between 0 & 1", - ); - return Promise.resolve(); - } - }); - - it('should accept options and return local labels', async () => { - const res = await firebase.vision().imageLabelerProcessImage(testImageFile, { - confidenceThreshold: 0.8, - }); + xit('should return a cloud label array', async () => { + const res = await firebase.ml().cloudImageLabelerProcessImage(testImageFile); res.should.be.Array(); res.length.should.be.greaterThan(0); @@ -133,10 +51,10 @@ describe('mlkit.vision.label', () => { }); }); - describe('VisionCloudImageLabelerOptions', () => { + describe('MLCloudImageLabelerOptions', () => { it('throws if not an object', async () => { try { - await firebase.vision().cloudImageLabelerProcessImage(testImageFile, '123'); + await firebase.ml().cloudImageLabelerProcessImage(testImageFile, '123'); return Promise.reject(new Error('Did not throw an Error.')); } catch (error) { error.message.should.containEql("'cloudImageLabelerOptions' expected an object value"); @@ -147,7 +65,7 @@ describe('mlkit.vision.label', () => { describe('confidenceThreshold', () => { it('should throw if confidence threshold is not a number', async () => { try { - await firebase.vision().cloudImageLabelerProcessImage(testImageFile, { + await firebase.ml().cloudImageLabelerProcessImage(testImageFile, { confidenceThreshold: '0.2', }); return Promise.reject(new Error('Did not throw an Error.')); @@ -161,7 +79,7 @@ describe('mlkit.vision.label', () => { it('should throw if confidence threshold is not between 0 & 1', async () => { try { - await firebase.vision().cloudImageLabelerProcessImage(testImageFile, { + await firebase.ml().cloudImageLabelerProcessImage(testImageFile, { confidenceThreshold: 1.1, }); return Promise.reject(new Error('Did not throw an Error.')); @@ -173,8 +91,8 @@ describe('mlkit.vision.label', () => { } }); - it('should accept options and return cloud labels', async () => { - const res = await firebase.vision().cloudImageLabelerProcessImage(testImageFile, { + xit('should accept options and return cloud labels', async () => { + const res = await firebase.ml().cloudImageLabelerProcessImage(testImageFile, { confidenceThreshold: 0.8, }); @@ -192,7 +110,7 @@ describe('mlkit.vision.label', () => { describe('enforceCertFingerprintMatch', () => { it('throws if not a boolean', async () => { try { - await firebase.vision().cloudImageLabelerProcessImage(testImageFile, { + await firebase.ml().cloudImageLabelerProcessImage(testImageFile, { enforceCertFingerprintMatch: 'true', }); return Promise.reject(new Error('Did not throw an Error.')); @@ -204,17 +122,17 @@ describe('mlkit.vision.label', () => { } }); - it('sets enforceCertFingerprintMatch', async () => { - await firebase.vision().cloudImageLabelerProcessImage(testImageFile, { + xit('sets enforceCertFingerprintMatch', async () => { + await firebase.ml().cloudImageLabelerProcessImage(testImageFile, { enforceCertFingerprintMatch: false, }); }); }); - describe('apiKeyOverride', () => { + xdescribe('apiKeyOverride', () => { it('throws if apiKeyOverride is not a string', async () => { try { - await firebase.vision().cloudImageLabelerProcessImage(testImageFile, { + await firebase.ml().cloudImageLabelerProcessImage(testImageFile, { apiKeyOverride: true, }); return Promise.reject(new Error('Did not throw Error.')); diff --git a/packages/ml-vision/e2e/landmark.e2e.js b/packages/ml/e2e/landmark.e2e.js similarity index 71% rename from packages/ml-vision/e2e/landmark.e2e.js rename to packages/ml/e2e/landmark.e2e.js index fbe6b94301d..1d053c7f60a 100644 --- a/packages/ml-vision/e2e/landmark.e2e.js +++ b/packages/ml/e2e/landmark.e2e.js @@ -16,7 +16,7 @@ */ let testImageFile; -describe('mlkit.vision.landmark', () => { +describe('ml.landmark', () => { before(async () => { testImageFile = `${firebase.utils.FilePath.DOCUMENT_DIRECTORY}/landmark.jpg`; await firebase @@ -28,7 +28,7 @@ describe('mlkit.vision.landmark', () => { describe('cloudLandmarkRecognizerProcessImage()', () => { it('should throw if image path is not a string', () => { try { - firebase.vision().cloudLandmarkRecognizerProcessImage(123); + firebase.ml().cloudLandmarkRecognizerProcessImage(123); return Promise.reject(new Error('Did not throw an Error.')); } catch (error) { error.message.should.containEql("'localImageFilePath' expected a string local file path"); @@ -36,8 +36,8 @@ describe('mlkit.vision.landmark', () => { } }); - it('should return an array of landmark information', async () => { - const res = await firebase.vision().cloudLandmarkRecognizerProcessImage(testImageFile); + xit('should return an array of landmark information', async () => { + const res = await firebase.ml().cloudLandmarkRecognizerProcessImage(testImageFile); res.should.be.Array(); res.length.should.be.greaterThan(0); @@ -59,10 +59,10 @@ describe('mlkit.vision.landmark', () => { }); }); - describe('VisionCloudLandmarkRecognizerOptions', () => { + describe('MLCloudLandmarkRecognizerOptions', () => { it('throws if not an object', async () => { try { - await firebase.vision().cloudLandmarkRecognizerProcessImage(testImageFile, '123'); + await firebase.ml().cloudLandmarkRecognizerProcessImage(testImageFile, '123'); return Promise.reject(new Error('Did not throw an Error.')); } catch (error) { error.message.should.containEql( @@ -75,7 +75,7 @@ describe('mlkit.vision.landmark', () => { describe('cloudLandmarkRecognizerOptions', () => { it('throws if not a boolean', async () => { try { - await firebase.vision().cloudLandmarkRecognizerProcessImage(testImageFile, { + await firebase.ml().cloudLandmarkRecognizerProcessImage(testImageFile, { enforceCertFingerprintMatch: 'false', }); return Promise.reject(new Error('Did not throw an Error.')); @@ -87,15 +87,15 @@ describe('mlkit.vision.landmark', () => { } }); - it('sets cloudLandmarkRecognizerOptions', async () => { - await firebase.vision().cloudLandmarkRecognizerProcessImage(testImageFile, { + xit('sets cloudLandmarkRecognizerOptions', async () => { + await firebase.ml().cloudLandmarkRecognizerProcessImage(testImageFile, { enforceCertFingerprintMatch: false, }); }); it('throws if apiKeyOverride is not a string', async () => { try { - await firebase.vision().cloudLandmarkRecognizerProcessImage(testImageFile, { + await firebase.ml().cloudLandmarkRecognizerProcessImage(testImageFile, { apiKeyOverride: true, }); return Promise.reject(new Error('Did not throw Error.')); @@ -108,10 +108,10 @@ describe('mlkit.vision.landmark', () => { }); }); // TODO temporarily disable test suite - is flakey on CI - needs investigating - xdescribe('maxResults', () => { + describe('maxResults', () => { it('throws if maxResults is not a number', async () => { try { - await firebase.vision().cloudLandmarkRecognizerProcessImage(testImageFile, { + await firebase.ml().cloudLandmarkRecognizerProcessImage(testImageFile, { maxResults: '2', }); return Promise.reject(new Error('Did not throw an Error.')); @@ -123,8 +123,8 @@ describe('mlkit.vision.landmark', () => { } }); - it('limits the maximum results', async () => { - const res = await firebase.vision().cloudLandmarkRecognizerProcessImage(testImageFile, { + xit('limits the maximum results', async () => { + const res = await firebase.ml().cloudLandmarkRecognizerProcessImage(testImageFile, { maxResults: 3, }); @@ -138,7 +138,7 @@ describe('mlkit.vision.landmark', () => { describe('modelType', () => { it('throws if model is invalid', async () => { try { - await firebase.vision().cloudLandmarkRecognizerProcessImage(testImageFile, { + await firebase.ml().cloudLandmarkRecognizerProcessImage(testImageFile, { modelType: 3, }); return Promise.reject(new Error('Did not throw an Error.')); @@ -150,19 +150,19 @@ describe('mlkit.vision.landmark', () => { } }); - it('sets modelType', async () => { - await firebase.vision().cloudLandmarkRecognizerProcessImage(testImageFile, { - modelType: firebase.vision.VisionCloudLandmarkRecognizerModelType.STABLE_MODEL, + xit('sets modelType', async () => { + await firebase.ml().cloudLandmarkRecognizerProcessImage(testImageFile, { + modelType: firebase.ml.MLCloudLandmarkRecognizerModelType.STABLE_MODEL, }); - await firebase.vision().cloudLandmarkRecognizerProcessImage(testImageFile, { - modelType: firebase.vision.VisionCloudLandmarkRecognizerModelType.LATEST_MODEL, + await firebase.ml().cloudLandmarkRecognizerProcessImage(testImageFile, { + modelType: firebase.ml.MLCloudLandmarkRecognizerModelType.LATEST_MODEL, }); }); - it('uses a latest model', async () => { - const res = await firebase.vision().cloudLandmarkRecognizerProcessImage(testImageFile, { - modelType: firebase.vision.VisionCloudLandmarkRecognizerModelType.LATEST_MODEL, + xit('uses a latest model', async () => { + const res = await firebase.ml().cloudLandmarkRecognizerProcessImage(testImageFile, { + modelType: firebase.ml.MLCloudLandmarkRecognizerModelType.LATEST_MODEL, }); res.should.be.Array(); }); diff --git a/packages/ml-vision/e2e/mlKitVision.e2e.js b/packages/ml/e2e/ml.e2e.js similarity index 75% rename from packages/ml-vision/e2e/mlKitVision.e2e.js rename to packages/ml/e2e/ml.e2e.js index ca938d39356..5f19eee1a6a 100644 --- a/packages/ml-vision/e2e/mlKitVision.e2e.js +++ b/packages/ml/e2e/ml.e2e.js @@ -15,24 +15,22 @@ * */ -describe('vision()', () => { +describe('ml()', () => { describe('namespace', () => { it('accessible from firebase.app()', () => { const app = firebase.app(); - should.exist(app.vision); - app.vision().app.should.equal(app); + should.exist(app.ml); + app.ml().app.should.equal(app); }); it('supports multiple apps', async () => { - firebase.vision().app.name.should.equal('[DEFAULT]'); + firebase.ml().app.name.should.equal('[DEFAULT]'); - firebase - .vision(firebase.app('secondaryFromNative')) - .app.name.should.equal('secondaryFromNative'); + firebase.ml(firebase.app('secondaryFromNative')).app.name.should.equal('secondaryFromNative'); firebase .app('secondaryFromNative') - .vision() + .ml() .app.name.should.equal('secondaryFromNative'); }); }); diff --git a/packages/ml-vision/e2e/text.e2e.js b/packages/ml/e2e/text.e2e.js similarity index 71% rename from packages/ml-vision/e2e/text.e2e.js rename to packages/ml/e2e/text.e2e.js index 13c9da73ffa..73ddd028649 100644 --- a/packages/ml-vision/e2e/text.e2e.js +++ b/packages/ml/e2e/text.e2e.js @@ -69,8 +69,7 @@ function textBaseElementValidate(textBase, cloud = false) { let testImageFile; -// TODO allow android testing once ML model download manager support implemented -ios.describe('mlkit.vision.text', () => { +describe('ml.text', () => { before(async () => { testImageFile = `${firebase.utils.FilePath.DOCUMENT_DIRECTORY}/text.png`; await firebase @@ -79,43 +78,10 @@ ios.describe('mlkit.vision.text', () => { .writeToFile(testImageFile); }); - describe('textRecognizerProcessImage()', () => { - it('should throw if image path is not a string', () => { - try { - firebase.vision().textRecognizerProcessImage(123); - return Promise.reject(new Error('Did not throw an Error.')); - } catch (error) { - error.message.should.containEql("'localImageFilePath' expected a string local file path"); - return Promise.resolve(); - } - }); - - it('should return a VisionText representation for an image', async () => { - const res = await firebase.vision().textRecognizerProcessImage(testImageFile); - res.text.should.be.a.String(); - res.blocks.should.be.an.Array(); - res.blocks.length.should.be.greaterThan(0); - - res.blocks.forEach(textBlock => { - textBaseElementValidate(textBlock); - textBlock.lines.should.be.an.Array(); - textBlock.lines.length.should.be.greaterThan(0); - textBlock.lines.forEach(line => { - textBaseElementValidate(line); - line.elements.should.be.an.Array(); - line.elements.length.should.be.greaterThan(0); - line.elements.forEach(element => { - textBaseElementValidate(element); - }); - }); - }); - }); - }); - - describe('VisionCloudTextRecognizerOptions', () => { + describe('MLCloudTextRecognizerOptions', () => { it('throws if not an object', async () => { try { - await firebase.vision().cloudTextRecognizerProcessImage(testImageFile, '123'); + await firebase.ml().cloudTextRecognizerProcessImage(testImageFile, '123'); return Promise.reject(new Error('Did not throw an Error.')); } catch (error) { error.message.should.containEql("'cloudTextRecognizerOptions' expected an object value"); @@ -126,7 +92,7 @@ ios.describe('mlkit.vision.text', () => { describe('enforceCertFingerprintMatch', () => { it('throws if not a boolean', async () => { try { - await firebase.vision().cloudTextRecognizerProcessImage(testImageFile, { + await firebase.ml().cloudTextRecognizerProcessImage(testImageFile, { enforceCertFingerprintMatch: 'false', }); return Promise.reject(new Error('Did not throw an Error.')); @@ -139,7 +105,7 @@ ios.describe('mlkit.vision.text', () => { }); it('sets a value', async () => { - await firebase.vision().cloudTextRecognizerProcessImage(testImageFile, { + await firebase.ml().cloudTextRecognizerProcessImage(testImageFile, { enforceCertFingerprintMatch: false, }); }); @@ -148,7 +114,7 @@ ios.describe('mlkit.vision.text', () => { describe('apiKeyOverride', () => { it('throws if apiKeyOverride is not a string', async () => { try { - await firebase.vision().cloudTextRecognizerProcessImage(testImageFile, { + await firebase.ml().cloudTextRecognizerProcessImage(testImageFile, { apiKeyOverride: true, }); return Promise.reject(new Error('Did not throw Error.')); @@ -164,7 +130,7 @@ ios.describe('mlkit.vision.text', () => { describe('languageHints', () => { it('throws if not array', async () => { try { - await firebase.vision().cloudTextRecognizerProcessImage(testImageFile, { + await firebase.ml().cloudTextRecognizerProcessImage(testImageFile, { languageHints: 'en', }); return Promise.reject(new Error('Did not throw an Error.')); @@ -178,7 +144,7 @@ ios.describe('mlkit.vision.text', () => { it('throws if empty array', async () => { try { - await firebase.vision().cloudTextRecognizerProcessImage(testImageFile, { + await firebase.ml().cloudTextRecognizerProcessImage(testImageFile, { languageHints: [], }); return Promise.reject(new Error('Did not throw an Error.')); @@ -192,7 +158,7 @@ ios.describe('mlkit.vision.text', () => { it('throws if array contains non-string values', async () => { try { - await firebase.vision().cloudTextRecognizerProcessImage(testImageFile, { + await firebase.ml().cloudTextRecognizerProcessImage(testImageFile, { languageHints: [123], }); return Promise.reject(new Error('Did not throw an Error.')); @@ -205,7 +171,7 @@ ios.describe('mlkit.vision.text', () => { }); it('sets hintedLanguages', async () => { - await firebase.vision().cloudTextRecognizerProcessImage(testImageFile, { + await firebase.ml().cloudTextRecognizerProcessImage(testImageFile, { languageHints: ['fr'], }); }); @@ -214,7 +180,7 @@ ios.describe('mlkit.vision.text', () => { describe('modelType', () => { it('throws if invalid type', async () => { try { - await firebase.vision().cloudTextRecognizerProcessImage(testImageFile, { + await firebase.ml().cloudTextRecognizerProcessImage(testImageFile, { modelType: 7, }); return Promise.reject(new Error('Did not throw an Error.')); @@ -225,12 +191,8 @@ ios.describe('mlkit.vision.text', () => { }); it('sets modelType', async () => { - await firebase.vision().cloudTextRecognizerProcessImage(testImageFile, { - modelType: firebase.vision.VisionCloudTextRecognizerModelType.SPARSE_MODEL, - }); - - await firebase.vision().textRecognizerProcessImage(testImageFile, { - modelType: firebase.vision.VisionCloudTextRecognizerModelType.DENSE_MODEL, + await firebase.ml().cloudTextRecognizerProcessImage(testImageFile, { + modelType: firebase.ml.MLCloudTextRecognizerModelType.SPARSE_MODEL, }); }); }); @@ -239,7 +201,7 @@ ios.describe('mlkit.vision.text', () => { describe('cloudTextRecognizerProcessImage()', () => { it('should throw if image path is not a string', () => { try { - firebase.vision().cloudTextRecognizerProcessImage(123); + firebase.ml().cloudTextRecognizerProcessImage(123); return Promise.reject(new Error('Did not throw an Error.')); } catch (error) { error.message.should.containEql("'localImageFilePath' expected a string local file path"); @@ -248,7 +210,7 @@ ios.describe('mlkit.vision.text', () => { }); it('should return a VisionText representation for an image', async () => { - const res = await firebase.vision().cloudTextRecognizerProcessImage(testImageFile); + const res = await firebase.ml().cloudTextRecognizerProcessImage(testImageFile); res.text.should.be.a.String(); res.blocks.should.be.an.Array(); res.blocks.length.should.be.greaterThan(0); diff --git a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage.xcodeproj/project.pbxproj b/packages/ml/ios/RNFBML.xcodeproj/project.pbxproj similarity index 66% rename from packages/ml-natural-language/ios/RNFBMLNaturalLanguage.xcodeproj/project.pbxproj rename to packages/ml/ios/RNFBML.xcodeproj/project.pbxproj index f99e91f0d00..ab76410fa21 100644 --- a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage.xcodeproj/project.pbxproj +++ b/packages/ml/ios/RNFBML.xcodeproj/project.pbxproj @@ -7,11 +7,11 @@ objects = { /* Begin PBXBuildFile section */ - 27038A8322A16C43001E082B /* RCTConvert+FIRLanguageIdentificationOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 27038A8222A16C43001E082B /* RCTConvert+FIRLanguageIdentificationOptions.m */; }; - 2744B98621F45429004F8E3F /* RNFBMLNaturalLanguageIdModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 2744B98521F45429004F8E3F /* RNFBMLNaturalLanguageIdModule.m */; }; - 27760EA1229ED5D000F5F127 /* RNFBMLNaturalLanguageTranslateModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 27760EA0229ED5D000F5F127 /* RNFBMLNaturalLanguageTranslateModule.m */; }; - 27760EA4229ED74E00F5F127 /* RNFBMLNaturalLanguageSmartReplyModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 27760EA3229ED74E00F5F127 /* RNFBMLNaturalLanguageSmartReplyModule.m */; }; - 27760EA722A0064100F5F127 /* RCTConvert+FIRTextMessageArray.m in Sources */ = {isa = PBXBuildFile; fileRef = 27760EA622A0064100F5F127 /* RCTConvert+FIRTextMessageArray.m */; }; + 8B06D3F322F84F7200A5B542 /* RNFBMLLandmarkRecognizerModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B06D3F222F84F7200A5B542 /* RNFBMLLandmarkRecognizerModule.m */; }; + 8B06D3FC22F863AE00A5B542 /* RNFBMLCommon.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B06D3FB22F863AE00A5B542 /* RNFBMLCommon.m */; }; + 8B06D40622F97B4900A5B542 /* RNFBMLDocumentTextRecognizerModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B06D40522F97B4900A5B542 /* RNFBMLDocumentTextRecognizerModule.m */; }; + 8B06D40A22F989EF00A5B542 /* RNFBMLTextRecognizerModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B06D40922F989EF00A5B542 /* RNFBMLTextRecognizerModule.m */; }; + 8B06D40E22F99DF900A5B542 /* RNFBMLImageLabelerModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B06D40D22F99DF900A5B542 /* RNFBMLImageLabelerModule.m */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -27,17 +27,17 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 27038A8122A16C31001E082B /* RCTConvert+FIRLanguageIdentificationOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RCTConvert+FIRLanguageIdentificationOptions.h"; sourceTree = ""; }; - 27038A8222A16C43001E082B /* RCTConvert+FIRLanguageIdentificationOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "RCTConvert+FIRLanguageIdentificationOptions.m"; sourceTree = ""; }; - 2744B98221F45429004F8E3F /* libRNFBMLNaturalLanguage.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNFBMLNaturalLanguage.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 2744B98421F45429004F8E3F /* RNFBMLNaturalLanguageIdModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RNFBMLNaturalLanguageIdModule.h; path = RNFBMLNaturalLanguage/RNFBMLNaturalLanguageIdModule.h; sourceTree = SOURCE_ROOT; }; - 2744B98521F45429004F8E3F /* RNFBMLNaturalLanguageIdModule.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = RNFBMLNaturalLanguageIdModule.m; path = RNFBMLNaturalLanguage/RNFBMLNaturalLanguageIdModule.m; sourceTree = SOURCE_ROOT; }; - 27760E9F229ED5B400F5F127 /* RNFBMLNaturalLanguageTranslateModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFBMLNaturalLanguageTranslateModule.h; sourceTree = ""; }; - 27760EA0229ED5D000F5F127 /* RNFBMLNaturalLanguageTranslateModule.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNFBMLNaturalLanguageTranslateModule.m; sourceTree = ""; }; - 27760EA2229ED5F600F5F127 /* RNFBMLNaturalLanguageSmartReplyModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFBMLNaturalLanguageSmartReplyModule.h; sourceTree = ""; }; - 27760EA3229ED74E00F5F127 /* RNFBMLNaturalLanguageSmartReplyModule.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNFBMLNaturalLanguageSmartReplyModule.m; sourceTree = ""; }; - 27760EA522A0064100F5F127 /* RCTConvert+FIRTextMessageArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "RCTConvert+FIRTextMessageArray.h"; path = "RNFBMLNaturalLanguage/RCTConvert+FIRTextMessageArray.h"; sourceTree = SOURCE_ROOT; }; - 27760EA622A0064100F5F127 /* RCTConvert+FIRTextMessageArray.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "RCTConvert+FIRTextMessageArray.m"; sourceTree = ""; }; + 2744B98221F45429004F8E3F /* libRNFBML.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNFBML.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 8B06D3F122F84F6500A5B542 /* RNFBMLLandmarkRecognizerModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFBMLLandmarkRecognizerModule.h; sourceTree = ""; }; + 8B06D3F222F84F7200A5B542 /* RNFBMLLandmarkRecognizerModule.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNFBMLLandmarkRecognizerModule.m; sourceTree = ""; }; + 8B06D3FA22F863A400A5B542 /* RNFBMLCommon.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFBMLCommon.h; sourceTree = ""; }; + 8B06D3FB22F863AE00A5B542 /* RNFBMLCommon.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNFBMLCommon.m; sourceTree = ""; }; + 8B06D40422F97B3600A5B542 /* RNFBMLDocumentTextRecognizerModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFBMLDocumentTextRecognizerModule.h; sourceTree = ""; }; + 8B06D40522F97B4900A5B542 /* RNFBMLDocumentTextRecognizerModule.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNFBMLDocumentTextRecognizerModule.m; sourceTree = ""; }; + 8B06D40822F989E400A5B542 /* RNFBMLTextRecognizerModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFBMLTextRecognizerModule.h; sourceTree = ""; }; + 8B06D40922F989EF00A5B542 /* RNFBMLTextRecognizerModule.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNFBMLTextRecognizerModule.m; sourceTree = ""; }; + 8B06D40C22F99DEF00A5B542 /* RNFBMLImageLabelerModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFBMLImageLabelerModule.h; sourceTree = ""; }; + 8B06D40D22F99DF900A5B542 /* RNFBMLImageLabelerModule.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNFBMLImageLabelerModule.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -54,32 +54,32 @@ 2744B97521F452B8004F8E3F /* Products */ = { isa = PBXGroup; children = ( - 2744B98221F45429004F8E3F /* libRNFBMLNaturalLanguage.a */, + 2744B98221F45429004F8E3F /* libRNFBML.a */, ); name = Products; sourceTree = ""; }; - 2744B98321F45429004F8E3F /* RNFBMLNaturalLanguage */ = { + 2744B98321F45429004F8E3F /* RNFBML */ = { isa = PBXGroup; children = ( - 27760EA522A0064100F5F127 /* RCTConvert+FIRTextMessageArray.h */, - 27760EA622A0064100F5F127 /* RCTConvert+FIRTextMessageArray.m */, - 2744B98421F45429004F8E3F /* RNFBMLNaturalLanguageIdModule.h */, - 2744B98521F45429004F8E3F /* RNFBMLNaturalLanguageIdModule.m */, - 27760E9F229ED5B400F5F127 /* RNFBMLNaturalLanguageTranslateModule.h */, - 27760EA0229ED5D000F5F127 /* RNFBMLNaturalLanguageTranslateModule.m */, - 27760EA2229ED5F600F5F127 /* RNFBMLNaturalLanguageSmartReplyModule.h */, - 27760EA3229ED74E00F5F127 /* RNFBMLNaturalLanguageSmartReplyModule.m */, - 27038A8122A16C31001E082B /* RCTConvert+FIRLanguageIdentificationOptions.h */, - 27038A8222A16C43001E082B /* RCTConvert+FIRLanguageIdentificationOptions.m */, + 8B06D3F122F84F6500A5B542 /* RNFBMLLandmarkRecognizerModule.h */, + 8B06D3F222F84F7200A5B542 /* RNFBMLLandmarkRecognizerModule.m */, + 8B06D3FA22F863A400A5B542 /* RNFBMLCommon.h */, + 8B06D3FB22F863AE00A5B542 /* RNFBMLCommon.m */, + 8B06D40422F97B3600A5B542 /* RNFBMLDocumentTextRecognizerModule.h */, + 8B06D40522F97B4900A5B542 /* RNFBMLDocumentTextRecognizerModule.m */, + 8B06D40822F989E400A5B542 /* RNFBMLTextRecognizerModule.h */, + 8B06D40922F989EF00A5B542 /* RNFBMLTextRecognizerModule.m */, + 8B06D40C22F99DEF00A5B542 /* RNFBMLImageLabelerModule.h */, + 8B06D40D22F99DF900A5B542 /* RNFBMLImageLabelerModule.m */, ); - path = RNFBMLNaturalLanguage; + path = RNFBML; sourceTree = ""; }; 3323F52AAFE26B7384BE4DE3 = { isa = PBXGroup; children = ( - 2744B98321F45429004F8E3F /* RNFBMLNaturalLanguage */, + 2744B98321F45429004F8E3F /* RNFBML */, 2744B97521F452B8004F8E3F /* Products */, ); sourceTree = ""; @@ -87,9 +87,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 2744B98121F45429004F8E3F /* RNFBMLNaturalLanguage */ = { + 2744B98121F45429004F8E3F /* RNFBML */ = { isa = PBXNativeTarget; - buildConfigurationList = 2744B98821F45429004F8E3F /* Build configuration list for PBXNativeTarget "RNFBMLNaturalLanguage" */; + buildConfigurationList = 2744B98821F45429004F8E3F /* Build configuration list for PBXNativeTarget "RNFBML" */; buildPhases = ( 2744B97E21F45429004F8E3F /* Sources */, 2744B97F21F45429004F8E3F /* Frameworks */, @@ -99,9 +99,9 @@ ); dependencies = ( ); - name = RNFBMLNaturalLanguage; - productName = RNFBMLNaturalLanguage; - productReference = 2744B98221F45429004F8E3F /* libRNFBMLNaturalLanguage.a */; + name = RNFBML; + productName = RNFBML; + productReference = 2744B98221F45429004F8E3F /* libRNFBML.a */; productType = "com.apple.product-type.library.static"; }; /* End PBXNativeTarget section */ @@ -110,7 +110,7 @@ 3323F95273A95DB34F55C6D7 /* Project object */ = { isa = PBXProject; attributes = { - CLASSPREFIX = RNFBMLNaturalLanguage; + CLASSPREFIX = RNFBML; LastUpgradeCheck = 1010; ORGANIZATIONNAME = Invertase; TargetAttributes = { @@ -120,11 +120,12 @@ }; }; }; - buildConfigurationList = 3323F1C5716BA966BBBB95A4 /* Build configuration list for PBXProject "RNFBMLNaturalLanguage" */; + buildConfigurationList = 3323F1C5716BA966BBBB95A4 /* Build configuration list for PBXProject "RNFBML" */; compatibilityVersion = "Xcode 8.0"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, ); mainGroup = 3323F52AAFE26B7384BE4DE3; @@ -132,7 +133,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 2744B98121F45429004F8E3F /* RNFBMLNaturalLanguage */, + 2744B98121F45429004F8E3F /* RNFBML */, ); }; /* End PBXProject section */ @@ -142,11 +143,11 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 27760EA4229ED74E00F5F127 /* RNFBMLNaturalLanguageSmartReplyModule.m in Sources */, - 2744B98621F45429004F8E3F /* RNFBMLNaturalLanguageIdModule.m in Sources */, - 27038A8322A16C43001E082B /* RCTConvert+FIRLanguageIdentificationOptions.m in Sources */, - 27760EA722A0064100F5F127 /* RCTConvert+FIRTextMessageArray.m in Sources */, - 27760EA1229ED5D000F5F127 /* RNFBMLNaturalLanguageTranslateModule.m in Sources */, + 8B06D40E22F99DF900A5B542 /* RNFBMLImageLabelerModule.m in Sources */, + 8B06D40622F97B4900A5B542 /* RNFBMLDocumentTextRecognizerModule.m in Sources */, + 8B06D40A22F989EF00A5B542 /* RNFBMLTextRecognizerModule.m in Sources */, + 8B06D3F322F84F7200A5B542 /* RNFBMLLandmarkRecognizerModule.m in Sources */, + 8B06D3FC22F863AE00A5B542 /* RNFBMLCommon.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -347,7 +348,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 2744B98821F45429004F8E3F /* Build configuration list for PBXNativeTarget "RNFBMLNaturalLanguage" */ = { + 2744B98821F45429004F8E3F /* Build configuration list for PBXNativeTarget "RNFBML" */ = { isa = XCConfigurationList; buildConfigurations = ( 2744B98921F45429004F8E3F /* Debug */, @@ -356,7 +357,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 3323F1C5716BA966BBBB95A4 /* Build configuration list for PBXProject "RNFBMLNaturalLanguage" */ = { + 3323F1C5716BA966BBBB95A4 /* Build configuration list for PBXProject "RNFBML" */ = { isa = XCConfigurationList; buildConfigurations = ( 3323F7E33E1559A2B9826720 /* Debug */, diff --git a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/packages/ml/ios/RNFBML.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from packages/ml-natural-language/ios/RNFBMLNaturalLanguage.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to packages/ml/ios/RNFBML.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/ml/ios/RNFBML.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from packages/ml-natural-language/ios/RNFBMLNaturalLanguage.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to packages/ml/ios/RNFBML.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/packages/ml/ios/RNFBML.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from packages/ml-natural-language/ios/RNFBMLNaturalLanguage.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to packages/ml/ios/RNFBML.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage.xcodeproj/xcshareddata/IDETemplateMacros.plist b/packages/ml/ios/RNFBML.xcodeproj/xcshareddata/IDETemplateMacros.plist similarity index 100% rename from packages/ml-natural-language/ios/RNFBMLNaturalLanguage.xcodeproj/xcshareddata/IDETemplateMacros.plist rename to packages/ml/ios/RNFBML.xcodeproj/xcshareddata/IDETemplateMacros.plist diff --git a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionCommon.h b/packages/ml/ios/RNFBML/RNFBMLCommon.h similarity index 75% rename from packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionCommon.h rename to packages/ml/ios/RNFBML/RNFBMLCommon.h index e55df485d95..afbe07d173b 100644 --- a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionCommon.h +++ b/packages/ml/ios/RNFBML/RNFBMLCommon.h @@ -15,15 +15,11 @@ * */ -@interface RNFBMLVisionCommon : NSObject +@interface RNFBMLCommon : NSObject + (NSArray *)rectToIntArray:(CGRect)rect; -+ (NSDictionary *)contourToDict:(FIRVisionFaceContour *)visionFaceContour; - -+ (NSDictionary *)landmarkToDict:(FIRVisionFaceLandmark *)visionFaceLandmark; - -+ (NSArray *)visionPointsToArray:(NSArray *_Nullable)points; ++ (NSArray *)pointsToArray:(NSArray *_Nullable)points; + (void)UIImageForFilePath:(NSString *)localFilePath completion:(void (^)( NSArray *errorCodeMessageArray, diff --git a/packages/ml/ios/RNFBML/RNFBMLCommon.m b/packages/ml/ios/RNFBML/RNFBMLCommon.m new file mode 100644 index 00000000000..a24faea9847 --- /dev/null +++ b/packages/ml/ios/RNFBML/RNFBMLCommon.m @@ -0,0 +1,65 @@ +/** + * Copyright (c) 2016-present Invertase Limited & Contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this library except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + + +#import +#import +#import "RNFBMLCommon.h" + +@implementation RNFBMLCommon + ++ (NSArray *)rectToIntArray:(CGRect)rect { + CGSize size = rect.size; + CGPoint point = rect.origin; + return @[@(point.x), @(point.y), @(point.x + size.width), @(point.y + size.height)]; +} + ++ (NSArray *)pointsToArray:(NSArray *_Nullable)points { + if (points == nil) { + return @[]; + } + + NSMutableArray *pointsArray = [[NSMutableArray alloc] init]; + for (NSValue *point in points) { + [pointsArray addObject:[self arrayForCGPoint:point.CGPointValue]]; + } + + return pointsArray; +} + ++ (NSArray *)arrayForCGPoint:(CGPoint)point { + return @[@(point.x), @(point.y)]; +} + ++ (NSArray *)arrayForFIRVisionPoint:(FIRVisionPoint *)point { + return @[point.x, point.y]; +} + ++ (void)UIImageForFilePath:(NSString *)localFilePath completion:(void (^)( + NSArray *errorCodeMessageArray, + UIImage *image +))completion { + if (![[NSFileManager defaultManager] fileExistsAtPath:localFilePath]) { + completion(@[@"file-not-found", @"The local file specified does not exist on the device."], nil); + } else { + dispatch_async(dispatch_get_main_queue(), ^{ + completion(nil, [RCTConvert UIImage:localFilePath]); + }); + } +} + +@end diff --git a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionLandmarkRecognizerModule.h b/packages/ml/ios/RNFBML/RNFBMLDocumentTextRecognizerModule.h similarity index 90% rename from packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionLandmarkRecognizerModule.h rename to packages/ml/ios/RNFBML/RNFBMLDocumentTextRecognizerModule.h index 4298dfe84c1..eb9a79bb87e 100644 --- a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionLandmarkRecognizerModule.h +++ b/packages/ml/ios/RNFBML/RNFBMLDocumentTextRecognizerModule.h @@ -19,6 +19,6 @@ #import #import -@interface RNFBMLVisionLandmarkRecognizerModule : NSObject +@interface RNFBMLDocumentTextRecognizerModule : NSObject @end diff --git a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionDocumentTextRecognizerModule.m b/packages/ml/ios/RNFBML/RNFBMLDocumentTextRecognizerModule.m similarity index 88% rename from packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionDocumentTextRecognizerModule.m rename to packages/ml/ios/RNFBML/RNFBMLDocumentTextRecognizerModule.m index 82f4f7ccf10..23d47587049 100644 --- a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionDocumentTextRecognizerModule.m +++ b/packages/ml/ios/RNFBML/RNFBMLDocumentTextRecognizerModule.m @@ -18,17 +18,17 @@ #import #import -#import "RNFBMLVisionDocumentTextRecognizerModule.h" -#import "RNFBMLVisionCommon.h" +#import "RNFBMLDocumentTextRecognizerModule.h" +#import "RNFBMLCommon.h" -@implementation RNFBMLVisionDocumentTextRecognizerModule +@implementation RNFBMLDocumentTextRecognizerModule #pragma mark - #pragma mark Module Setup RCT_EXPORT_MODULE(); #pragma mark - -#pragma mark Firebase ML Kit Vision Methods +#pragma mark Firebase ML Methods RCT_EXPORT_METHOD(cloudDocumentTextRecognizerProcessImage: (FIRApp *) firebaseApp @@ -37,7 +37,7 @@ @implementation RNFBMLVisionDocumentTextRecognizerModule : (RCTPromiseResolveBlock)resolve : (RCTPromiseRejectBlock)reject ) { - [RNFBMLVisionCommon UIImageForFilePath:filePath completion:^(NSArray *errorCodeMessageArray, UIImage *image) { + [RNFBMLCommon UIImageForFilePath:filePath completion:^(NSArray *errorCodeMessageArray, UIImage *image) { if (errorCodeMessageArray != nil) { [RNFBSharedUtils rejectPromiseWithUserInfo:reject userInfo:(NSMutableDictionary *) @{ @"code": errorCodeMessageArray[0], @@ -79,19 +79,19 @@ @implementation RNFBMLVisionDocumentTextRecognizerModule resolve(@{ @"text": result.text, - @"blocks": [self getVisionDocumentTextBlocksList:result.blocks], + @"blocks": [self getMLDocumentTextBlocksList:result.blocks], }); }]; }]; } -- (NSArray *)getVisionDocumentTextBlocksList:(NSArray *)blocks { +- (NSArray *)getMLDocumentTextBlocksList:(NSArray *)blocks { NSMutableArray *documentTextBlocksFormattedList = [[NSMutableArray alloc] init]; for (FIRVisionDocumentTextBlock *block in blocks) { NSMutableDictionary *documentTextBlockFormatted = [[NSMutableDictionary alloc] init]; - documentTextBlockFormatted[@"boundingBox"] = [RNFBMLVisionCommon rectToIntArray:block.frame]; + documentTextBlockFormatted[@"boundingBox"] = [RNFBMLCommon rectToIntArray:block.frame]; documentTextBlockFormatted[@"text"] = block.text; documentTextBlockFormatted[@"confidence"] = block.confidence; documentTextBlockFormatted[@"recognizedLanguages"] = [self getLanguageCodesList:block.recognizedLanguages]; @@ -130,7 +130,7 @@ - (NSArray *)getParagraphsList:(NSArray *)par for (FIRVisionDocumentTextParagraph *paragraph in paragraphs) { NSMutableDictionary *paragraphFormatted = [[NSMutableDictionary alloc] init]; - paragraphFormatted[@"boundingBox"] = [RNFBMLVisionCommon rectToIntArray:paragraph.frame]; + paragraphFormatted[@"boundingBox"] = [RNFBMLCommon rectToIntArray:paragraph.frame]; paragraphFormatted[@"text"] = paragraph.text; paragraphFormatted[@"confidence"] = paragraph.confidence; paragraphFormatted[@"recognizedLanguages"] = [self getLanguageCodesList:paragraph.recognizedLanguages]; @@ -149,7 +149,7 @@ - (NSArray *)getWordsList:(NSArray *)words { for (FIRVisionDocumentTextWord *word in words) { NSMutableDictionary *wordFormatted = [[NSMutableDictionary alloc] init]; - wordFormatted[@"boundingBox"] = [RNFBMLVisionCommon rectToIntArray:word.frame]; + wordFormatted[@"boundingBox"] = [RNFBMLCommon rectToIntArray:word.frame]; wordFormatted[@"text"] = word.text; wordFormatted[@"confidence"] = word.confidence; wordFormatted[@"recognizedLanguages"] = [self getLanguageCodesList:word.recognizedLanguages]; @@ -168,7 +168,7 @@ - (NSArray *)getSymbolList:(NSArray *)symbols { for (FIRVisionDocumentTextSymbol *symbol in symbols) { NSMutableDictionary *symbolFormatted = [[NSMutableDictionary alloc] init]; - symbolFormatted[@"boundingBox"] = [RNFBMLVisionCommon rectToIntArray:symbol.frame]; + symbolFormatted[@"boundingBox"] = [RNFBMLCommon rectToIntArray:symbol.frame]; symbolFormatted[@"text"] = symbol.text; symbolFormatted[@"confidence"] = symbol.confidence; symbolFormatted[@"recognizedLanguages"] = [self getLanguageCodesList:symbol.recognizedLanguages]; diff --git a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RNFBMLNaturalLanguageIdModule.h b/packages/ml/ios/RNFBML/RNFBMLImageLabelerModule.h similarity index 91% rename from packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RNFBMLNaturalLanguageIdModule.h rename to packages/ml/ios/RNFBML/RNFBMLImageLabelerModule.h index 905bdad5528..6a85d990844 100644 --- a/packages/ml-natural-language/ios/RNFBMLNaturalLanguage/RNFBMLNaturalLanguageIdModule.h +++ b/packages/ml/ios/RNFBML/RNFBMLImageLabelerModule.h @@ -19,5 +19,6 @@ #import #import -@interface RNFBMLNaturalLanguageIdModule : NSObject +@interface RNFBMLImageLabelerModule : NSObject + @end diff --git a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionImageLabelerModule.m b/packages/ml/ios/RNFBML/RNFBMLImageLabelerModule.m similarity index 60% rename from packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionImageLabelerModule.m rename to packages/ml/ios/RNFBML/RNFBMLImageLabelerModule.m index 8d95fba2573..663fc5c36a8 100644 --- a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionImageLabelerModule.m +++ b/packages/ml/ios/RNFBML/RNFBMLImageLabelerModule.m @@ -17,62 +17,17 @@ #import #import -#import "RNFBMLVisionImageLabelerModule.h" -#import "RNFBMLVisionCommon.h" +#import "RNFBMLImageLabelerModule.h" +#import "RNFBMLCommon.h" -@implementation RNFBMLVisionImageLabelerModule +@implementation RNFBMLImageLabelerModule #pragma mark - #pragma mark Module Setup RCT_EXPORT_MODULE(); #pragma mark - -#pragma mark Firebase ML Kit Vision Methods - -RCT_EXPORT_METHOD(imageLabelerProcessImage: - (FIRApp *) firebaseApp - : (NSString *)filePath - : (NSDictionary *)imageLabelerOptions - : (RCTPromiseResolveBlock)resolve - : (RCTPromiseRejectBlock)reject -) { - [RNFBMLVisionCommon UIImageForFilePath:filePath completion:^(NSArray *errorCodeMessageArray, UIImage *image) { - if (errorCodeMessageArray != nil) { - [RNFBSharedUtils rejectPromiseWithUserInfo:reject userInfo:(NSMutableDictionary *) @{ - @"code": errorCodeMessageArray[0], - @"message": errorCodeMessageArray[1], - }]; - return; - } - - FIRVisionImage *visionImage = [[FIRVisionImage alloc] initWithImage:image]; - FIRVision *vision = [FIRVision visionForApp:firebaseApp]; - - FIRVisionOnDeviceImageLabelerOptions *options = [[FIRVisionOnDeviceImageLabelerOptions alloc] init]; - - if (imageLabelerOptions[@"confidenceThreshold"]) { - options.confidenceThreshold = [imageLabelerOptions[@"confidenceThreshold"] floatValue]; - } - - FIRVisionImageLabeler *labeler = [vision onDeviceImageLabelerWithOptions:options]; - [labeler processImage:visionImage completion:^(NSArray *_Nullable labels, NSError *error) { - if (error != nil) { - [RNFBSharedUtils rejectPromiseWithUserInfo:reject userInfo:(NSMutableDictionary *) @{ - @"code": @"unknown", - @"message": [error localizedDescription], - }]; - return; - } - - if (labels == nil) { - resolve(@[]); - return; - } - - resolve([self getLabelList:labels]); - }]; - }]; -} +#pragma mark Firebase ML Methods RCT_EXPORT_METHOD(cloudImageLabelerProcessImage: (FIRApp *) firebaseApp @@ -81,7 +36,7 @@ @implementation RNFBMLVisionImageLabelerModule : (RCTPromiseResolveBlock)resolve : (RCTPromiseRejectBlock)reject ) { - [RNFBMLVisionCommon UIImageForFilePath:filePath completion:^(NSArray *errorCodeMessageArray, UIImage *image) { + [RNFBMLCommon UIImageForFilePath:filePath completion:^(NSArray *errorCodeMessageArray, UIImage *image) { if (errorCodeMessageArray != nil) { [RNFBSharedUtils rejectPromiseWithUserInfo:reject userInfo:(NSMutableDictionary *) @{ @"code": errorCodeMessageArray[0], diff --git a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionFaceDetectorModule.h b/packages/ml/ios/RNFBML/RNFBMLLandmarkRecognizerModule.h similarity index 92% rename from packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionFaceDetectorModule.h rename to packages/ml/ios/RNFBML/RNFBMLLandmarkRecognizerModule.h index b7624d78298..cb84682e9d9 100644 --- a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionFaceDetectorModule.h +++ b/packages/ml/ios/RNFBML/RNFBMLLandmarkRecognizerModule.h @@ -19,6 +19,6 @@ #import #import -@interface RNFBMLVisionFaceDetectorModule : NSObject +@interface RNFBMLLandmarkRecognizerModule : NSObject @end diff --git a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionLandmarkRecognizerModule.m b/packages/ml/ios/RNFBML/RNFBMLLandmarkRecognizerModule.m similarity index 90% rename from packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionLandmarkRecognizerModule.m rename to packages/ml/ios/RNFBML/RNFBMLLandmarkRecognizerModule.m index f086ae9c0ed..e2ea37a8298 100644 --- a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionLandmarkRecognizerModule.m +++ b/packages/ml/ios/RNFBML/RNFBMLLandmarkRecognizerModule.m @@ -17,17 +17,17 @@ #import #import -#import "RNFBMLVisionLandmarkRecognizerModule.h" -#import "RNFBMLVisionCommon.h" +#import "RNFBMLLandmarkRecognizerModule.h" +#import "RNFBMLCommon.h" -@implementation RNFBMLVisionLandmarkRecognizerModule +@implementation RNFBMLLandmarkRecognizerModule #pragma mark - #pragma mark Module Setup RCT_EXPORT_MODULE(); #pragma mark - -#pragma mark Firebase ML Kit Vision Methods +#pragma mark Firebase ML Methods RCT_EXPORT_METHOD(cloudLandmarkRecognizerProcessImage: (FIRApp *) firebaseApp @@ -36,7 +36,7 @@ @implementation RNFBMLVisionLandmarkRecognizerModule : (RCTPromiseResolveBlock)resolve : (RCTPromiseRejectBlock)reject ) { - [RNFBMLVisionCommon UIImageForFilePath:filePath completion:^(NSArray *errorCodeMessageArray, UIImage *image) { + [RNFBMLCommon UIImageForFilePath:filePath completion:^(NSArray *errorCodeMessageArray, UIImage *image) { if (errorCodeMessageArray != nil) { [RNFBSharedUtils rejectPromiseWithUserInfo:reject userInfo:(NSMutableDictionary *) @{ @"code": errorCodeMessageArray[0], @@ -81,7 +81,7 @@ @implementation RNFBMLVisionLandmarkRecognizerModule visionLandmark[@"confidence"] = landmark.confidence; visionLandmark[@"entityId"] = landmark.entityId; visionLandmark[@"landmark"] = landmark.landmark; - visionLandmark[@"boundingBox"] = [RNFBMLVisionCommon rectToIntArray:landmark.frame]; + visionLandmark[@"boundingBox"] = [RNFBMLCommon rectToIntArray:landmark.frame]; NSMutableArray *locations = [[NSMutableArray alloc] init]; for (FIRVisionLatitudeLongitude *location in landmark.locations) { diff --git a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionImageLabelerModule.h b/packages/ml/ios/RNFBML/RNFBMLTextRecognizerModule.h similarity index 90% rename from packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionImageLabelerModule.h rename to packages/ml/ios/RNFBML/RNFBMLTextRecognizerModule.h index b7ed0366b0b..251401cacaf 100644 --- a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionImageLabelerModule.h +++ b/packages/ml/ios/RNFBML/RNFBMLTextRecognizerModule.h @@ -19,6 +19,6 @@ #import #import -@interface RNFBMLVisionImageLabelerModule : NSObject +@interface RNFBMLTextRecognizerModule : NSObject -@end \ No newline at end of file +@end diff --git a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionTextRecognizerModule.m b/packages/ml/ios/RNFBML/RNFBMLTextRecognizerModule.m similarity index 65% rename from packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionTextRecognizerModule.m rename to packages/ml/ios/RNFBML/RNFBMLTextRecognizerModule.m index ae79f74bdbc..53f4cf1938d 100644 --- a/packages/ml-vision/ios/RNFBMLVision/RNFBMLVisionTextRecognizerModule.m +++ b/packages/ml/ios/RNFBML/RNFBMLTextRecognizerModule.m @@ -17,51 +17,17 @@ #import #import -#import "RNFBMLVisionTextRecognizerModule.h" -#import "RNFBMLVisionCommon.h" +#import "RNFBMLTextRecognizerModule.h" +#import "RNFBMLCommon.h" -@implementation RNFBMLVisionTextRecognizerModule +@implementation RNFBMLTextRecognizerModule #pragma mark - #pragma mark Module Setup RCT_EXPORT_MODULE(); #pragma mark - -#pragma mark Firebase ML Kit Vision Methods - -RCT_EXPORT_METHOD(textRecognizerProcessImage: - (FIRApp *) firebaseApp - : (NSString *)filePath - : (RCTPromiseResolveBlock)resolve - : (RCTPromiseRejectBlock)reject -) { - [RNFBMLVisionCommon UIImageForFilePath:filePath completion:^(NSArray *errorCodeMessageArray, UIImage *image) { - if (errorCodeMessageArray != nil) { - [RNFBSharedUtils rejectPromiseWithUserInfo:reject userInfo:(NSMutableDictionary *) @{ - @"code": errorCodeMessageArray[0], - @"message": errorCodeMessageArray[1], - }]; - return; - } - - FIRVisionImage *visionImage = [[FIRVisionImage alloc] initWithImage:image]; - FIRVision *vision = [FIRVision visionForApp:firebaseApp]; - - FIRVisionTextRecognizer *textRecognizer = [vision onDeviceTextRecognizer]; - - [textRecognizer processImage:visionImage completion:^(FIRVisionText *text, NSError *error) { - if (error != nil) { - [RNFBSharedUtils rejectPromiseWithUserInfo:reject userInfo:(NSMutableDictionary *) @{ - @"code": @"unknown", - @"message": [error localizedDescription], - }]; - return; - } - - resolve([self getFirebaseVisionTextMap:text]); - }]; - }]; -} +#pragma mark Firebase ML Methods RCT_EXPORT_METHOD(cloudTextRecognizerProcessImage: (FIRApp *) firebaseApp @@ -70,7 +36,7 @@ @implementation RNFBMLVisionTextRecognizerModule : (RCTPromiseResolveBlock)resolve : (RCTPromiseRejectBlock)reject ) { - [RNFBMLVisionCommon UIImageForFilePath:filePath completion:^(NSArray *errorCodeMessageArray, UIImage *image) { + [RNFBMLCommon UIImageForFilePath:filePath completion:^(NSArray *errorCodeMessageArray, UIImage *image) { if (errorCodeMessageArray != nil) { [RNFBSharedUtils rejectPromiseWithUserInfo:reject userInfo:(NSMutableDictionary *) @{ @"code": errorCodeMessageArray[0], @@ -110,21 +76,21 @@ @implementation RNFBMLVisionTextRecognizerModule return; } - resolve([self getFirebaseVisionTextMap:text]); + resolve([self getFirebaseMLTextMap:text]); }]; }]; } -- (NSDictionary *)getFirebaseVisionTextMap:(FIRVisionText *)text { - NSMutableDictionary *firebaseVisionTextMap = [[NSMutableDictionary alloc] init]; +- (NSDictionary *)getFirebaseMLTextMap:(FIRVisionText *)text { + NSMutableDictionary *firebaseMLTextMap = [[NSMutableDictionary alloc] init]; - firebaseVisionTextMap[@"text"] = text.text; - firebaseVisionTextMap[@"blocks"] = [self getVisionTextBlocksList:text.blocks]; + firebaseMLTextMap[@"text"] = text.text; + firebaseMLTextMap[@"blocks"] = [self getMLTextBlocksList:text.blocks]; - return firebaseVisionTextMap; + return firebaseMLTextMap; } -- (NSArray *)getVisionTextBlocksList:(NSArray *)blocks { +- (NSArray *)getMLTextBlocksList:(NSArray *)blocks { NSMutableArray *blockListFormatted = [[NSMutableArray alloc] init]; for (FIRVisionTextBlock *block in blocks) { @@ -132,9 +98,9 @@ - (NSArray *)getVisionTextBlocksList:(NSArray *)blocks { textBlockFormatted[@"text"] = block.text; textBlockFormatted[@"confidence"] = block.confidence; - textBlockFormatted[@"boundingBox"] = [RNFBMLVisionCommon rectToIntArray:block.frame]; + textBlockFormatted[@"boundingBox"] = [RNFBMLCommon rectToIntArray:block.frame]; textBlockFormatted[@"recognizedLanguages"] = [self getLanguageCodesList:block.recognizedLanguages]; - textBlockFormatted[@"cornerPoints"] = [RNFBMLVisionCommon visionPointsToArray:block.cornerPoints]; + textBlockFormatted[@"cornerPoints"] = [RNFBMLCommon pointsToArray:block.cornerPoints]; textBlockFormatted[@"lines"] = [self getLinesList:block.lines]; [blockListFormatted addObject:textBlockFormatted]; @@ -149,11 +115,11 @@ - (NSArray *)getLinesList:(NSArray *)lines { for (FIRVisionTextLine *line in lines) { NSMutableDictionary *lineFormatted = [[NSMutableDictionary alloc] init]; - lineFormatted[@"boundingBox"] = [RNFBMLVisionCommon rectToIntArray:line.frame]; + lineFormatted[@"boundingBox"] = [RNFBMLCommon rectToIntArray:line.frame]; lineFormatted[@"text"] = line.text; lineFormatted[@"confidence"] = line.confidence; lineFormatted[@"recognizedLanguages"] = [self getLanguageCodesList:line.recognizedLanguages]; - lineFormatted[@"cornerPoints"] = [RNFBMLVisionCommon visionPointsToArray:line.cornerPoints]; + lineFormatted[@"cornerPoints"] = [RNFBMLCommon pointsToArray:line.cornerPoints]; lineFormatted[@"elements"] = [self getElementsList:line.elements]; [lineListFormatted addObject:lineFormatted]; @@ -168,11 +134,11 @@ - (NSArray *)getElementsList:(NSArray *)elements { for (FIRVisionTextElement *element in elements) { NSMutableDictionary *elementFormatted = [[NSMutableDictionary alloc] init]; - elementFormatted[@"boundingBox"] = [RNFBMLVisionCommon rectToIntArray:element.frame]; + elementFormatted[@"boundingBox"] = [RNFBMLCommon rectToIntArray:element.frame]; elementFormatted[@"text"] = element.text; elementFormatted[@"confidence"] = element.confidence; elementFormatted[@"recognizedLanguages"] = [self getLanguageCodesList:element.recognizedLanguages]; - elementFormatted[@"cornerPoints"] = [RNFBMLVisionCommon visionPointsToArray:element.cornerPoints]; + elementFormatted[@"cornerPoints"] = [RNFBMLCommon pointsToArray:element.cornerPoints]; [elementsListFormatted addObject:elementFormatted]; } diff --git a/packages/ml-vision/lib/visionCloudDocumentTextRecognizerOptions.js b/packages/ml/lib/MLCloudDocumentTextRecognizerOptions.js similarity index 95% rename from packages/ml-vision/lib/visionCloudDocumentTextRecognizerOptions.js rename to packages/ml/lib/MLCloudDocumentTextRecognizerOptions.js index 73a1a20ed4a..7263a1e38ac 100644 --- a/packages/ml-vision/lib/visionCloudDocumentTextRecognizerOptions.js +++ b/packages/ml/lib/MLCloudDocumentTextRecognizerOptions.js @@ -24,9 +24,7 @@ import { isUndefined, } from '@react-native-firebase/app/lib/common'; -export default function visionCloudDocumentTextRecognizerOptions( - cloudDocumentTextRecognizerOptions, -) { +export default function MLCloudDocumentTextRecognizerOptions(cloudDocumentTextRecognizerOptions) { const out = { enforceCertFingerprintMatch: false, }; diff --git a/packages/ml-vision/lib/visionCloudImageLabelerOptions.js b/packages/ml/lib/MLCloudImageLabelerOptions.js similarity index 96% rename from packages/ml-vision/lib/visionCloudImageLabelerOptions.js rename to packages/ml/lib/MLCloudImageLabelerOptions.js index 6900225242f..63399684543 100644 --- a/packages/ml-vision/lib/visionCloudImageLabelerOptions.js +++ b/packages/ml/lib/MLCloudImageLabelerOptions.js @@ -24,7 +24,7 @@ import { isUndefined, } from '@react-native-firebase/app/lib/common'; -export default function visionCloudImageLabelerOptions(cloudImageLabelerOptions) { +export default function MLCloudImageLabelerOptions(cloudImageLabelerOptions) { const out = { enforceCertFingerprintMatch: false, confidenceThreshold: 0.5, diff --git a/packages/ml-vision/lib/VisionCloudLandmarkRecognizerModelType.js b/packages/ml/lib/MLCloudLandmarkRecognizerModelType.js similarity index 100% rename from packages/ml-vision/lib/VisionCloudLandmarkRecognizerModelType.js rename to packages/ml/lib/MLCloudLandmarkRecognizerModelType.js diff --git a/packages/ml-vision/lib/visionCloudLandmarkRecognizerOptions.js b/packages/ml/lib/MLCloudLandmarkRecognizerOptions.js similarity index 81% rename from packages/ml-vision/lib/visionCloudLandmarkRecognizerOptions.js rename to packages/ml/lib/MLCloudLandmarkRecognizerOptions.js index 0f44db69dcf..4b1997309c2 100644 --- a/packages/ml-vision/lib/visionCloudLandmarkRecognizerOptions.js +++ b/packages/ml/lib/MLCloudLandmarkRecognizerOptions.js @@ -23,13 +23,13 @@ import { isString, isUndefined, } from '@react-native-firebase/app/lib/common'; -import VisionCloudLandmarkRecognizerModelType from './VisionCloudLandmarkRecognizerModelType'; +import MLCloudLandmarkRecognizerModelType from './MLCloudLandmarkRecognizerModelType'; -export default function visionCloudLandmarkRecognizerOptions(cloudLandmarkRecognizerOptions) { +export default function MLCloudLandmarkRecognizerOptions(cloudLandmarkRecognizerOptions) { const out = { enforceCertFingerprintMatch: false, maxResults: 10, - model: VisionCloudLandmarkRecognizerModelType.STABLE_MODEL, + model: MLCloudLandmarkRecognizerModelType.STABLE_MODEL, }; if (isUndefined(cloudLandmarkRecognizerOptions)) { @@ -69,12 +69,11 @@ export default function visionCloudLandmarkRecognizerOptions(cloudLandmarkRecogn if (cloudLandmarkRecognizerOptions.modelType) { if ( cloudLandmarkRecognizerOptions.modelType !== - VisionCloudLandmarkRecognizerModelType.STABLE_MODEL && - cloudLandmarkRecognizerOptions.modelType !== - VisionCloudLandmarkRecognizerModelType.LATEST_MODEL + MLCloudLandmarkRecognizerModelType.STABLE_MODEL && + cloudLandmarkRecognizerOptions.modelType !== MLCloudLandmarkRecognizerModelType.LATEST_MODEL ) { throw new Error( - "'cloudLandmarkRecognizerOptions.modelType' invalid model. Expected VisionCloudLandmarkRecognizerModelType.STABLE_MODEL or VisionCloudLandmarkRecognizerModelType.LATEST_MODEL.", + "'cloudLandmarkRecognizerOptions.modelType' invalid model. Expected MLCloudLandmarkRecognizerModelType.STABLE_MODEL or MLCloudLandmarkRecognizerModelType.LATEST_MODEL.", ); } diff --git a/packages/ml-vision/lib/VisionCloudTextRecognizerModelType.js b/packages/ml/lib/MLCloudTextRecognizerModelType.js similarity index 100% rename from packages/ml-vision/lib/VisionCloudTextRecognizerModelType.js rename to packages/ml/lib/MLCloudTextRecognizerModelType.js diff --git a/packages/ml-vision/lib/visionCloudTextRecognizerOptions.js b/packages/ml/lib/MLCloudTextRecognizerOptions.js similarity index 85% rename from packages/ml-vision/lib/visionCloudTextRecognizerOptions.js rename to packages/ml/lib/MLCloudTextRecognizerOptions.js index 2d013f0b035..8dcc45eee23 100644 --- a/packages/ml-vision/lib/visionCloudTextRecognizerOptions.js +++ b/packages/ml/lib/MLCloudTextRecognizerOptions.js @@ -23,12 +23,12 @@ import { isString, isUndefined, } from '@react-native-firebase/app/lib/common'; -import VisionCloudTextRecognizerModelType from './VisionCloudTextRecognizerModelType'; +import MLCloudTextRecognizerModelType from './MLCloudTextRecognizerModelType'; -export default function visionCloudTextRecognizerOptions(cloudTextRecognizerOptions) { +export default function MLCloudTextRecognizerOptions(cloudTextRecognizerOptions) { const out = { enforceCertFingerprintMatch: false, - modelType: VisionCloudTextRecognizerModelType.SPARSE_MODEL, + modelType: MLCloudTextRecognizerModelType.SPARSE_MODEL, }; if (isUndefined(cloudTextRecognizerOptions)) { @@ -59,8 +59,8 @@ export default function visionCloudTextRecognizerOptions(cloudTextRecognizerOpti if (cloudTextRecognizerOptions.modelType) { if ( - cloudTextRecognizerOptions.modelType !== VisionCloudTextRecognizerModelType.DENSE_MODEL && - cloudTextRecognizerOptions.modelType !== VisionCloudTextRecognizerModelType.SPARSE_MODEL + cloudTextRecognizerOptions.modelType !== MLCloudTextRecognizerModelType.DENSE_MODEL && + cloudTextRecognizerOptions.modelType !== MLCloudTextRecognizerModelType.SPARSE_MODEL ) { throw new Error( "'cloudTextRecognizerOptions.modelType' invalid model. Expected VisionCloudTextRecognizerModelType.DENSE_MODEL or VisionCloudTextRecognizerModelType.SPARSE_MODEL.", diff --git a/packages/ml-vision/lib/VisionDocumentTextRecognizedBreakType.js b/packages/ml/lib/MLDocumentTextRecognizedBreakType.js similarity index 100% rename from packages/ml-vision/lib/VisionDocumentTextRecognizedBreakType.js rename to packages/ml/lib/MLDocumentTextRecognizedBreakType.js diff --git a/packages/ml/lib/index.d.ts b/packages/ml/lib/index.d.ts new file mode 100644 index 00000000000..9012b33ca67 --- /dev/null +++ b/packages/ml/lib/index.d.ts @@ -0,0 +1,701 @@ +/* + * Copyright (c) 2016-present Invertase Limited & Contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this library except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +import { ReactNativeFirebase } from '@react-native-firebase/app'; +/** + * Firebase ML package for React Native. + * + * #### Example 1 + * + * Access the firebase export from the `ml` package: + * + * ```js + * import { firebase } from '@react-native-firebase/ml'; + * + * // firebase.ml().X + * ``` + * + * #### Example 2 + * + * Using the default export from the `ml` package: + * + * ```js + * import ml from '@react-native-firebase/ml'; + * + * // ml().X + * ``` + * + * #### Example 3 + * + * Using the default export from the `app` package: + * + * ```js + * import firebase from '@react-native-firebase/app'; + * import '@react-native-firebase/ml'; + * + * // firebase.ml().X + * ``` + * + * @firebase ml + */ +export namespace FirebaseMLTypes { + import FirebaseModule = ReactNativeFirebase.FirebaseModule; + + export interface Statics { + MLCloudTextRecognizerModelType: typeof MLCloudTextRecognizerModelType; + MLCloudLandmarkRecognizerModelType: typeof MLCloudLandmarkRecognizerModelType; + MLDocumentTextRecognizedBreakType: typeof MLDocumentTextRecognizedBreakType; + } + + /** + * Options for cloud image labeler. Confidence threshold could be provided for the label detection. + * + * For example, if the confidence threshold is set to 0.7, only labels with confidence >= 0.7 would be returned. The default threshold is 0.5. + * + * Note: at most 20 labels will be returned for cloud image labeler. + */ + export interface MLCloudImageLabelerOptions { + /** + * Only allow registered application instances with matching certificate fingerprint to use ML API. + * + * > Do not set this for debug build if you use simulators to test. + * + * #### Example + * + * ```js + * await firebase.ml().cloudImageLabelerProcessImage(filePath, { + * enforceCertFingerprintMatch: true, + * }); + * ``` + */ + enforceCertFingerprintMatch?: boolean; + + /** + * Sets confidence threshold in the range of [0.0 - 1.0] of detected labels. Only labels detected with confidence higher than this threshold are returned. + * + * Defaults to 0.5. + * + * #### Example + * + * ```js + * await firebase.ml().cloudImageLabelerProcessImage(filePath, { + * confidenceThreshold: 0.8, + * }); + * ``` + */ + confidenceThreshold?: number; + + /** + * API key to use for ML API. If not set, the default API key from `firebase.app()` will be used. + * + * #### Example + * + * ```js + * await firebase.ml().cloudImageLabelerProcessImage(filePath, { + * apiKeyOverride: 'xyz123', + * }); + * ``` + * + * @ios + */ + apiKeyOverride?: string; + } + + /** + * Detector for finding popular natural and man-made structures within an image. + */ + export interface MLCloudLandmarkRecognizerOptions { + /** + * Only allow registered application instances with matching certificate fingerprint to use ML API. + * + * > Do not set this for debug build if you use simulators to test. + */ + enforceCertFingerprintMatch?: boolean; + + /** + * Sets the maximum number of results of this type. + * + * Defaults to 10. + */ + maxResults?: number; + + /** + * Sets model type for the detection. + * + * Defaults to `MLCloudLandmarkRecognizerModelType.STABLE_MODEL`. + */ + modelType?: + | MLCloudLandmarkRecognizerModelType.STABLE_MODEL + | MLCloudLandmarkRecognizerModelType.LATEST_MODEL; + + /** + * API key to use for ML API. If not set, the default API key from `firebase.app()` will be used. + * + * @ios + */ + apiKeyOverride?: string; + } + + /** + * Model types for cloud landmark recognition. + */ + export enum MLCloudLandmarkRecognizerModelType { + /** + * Stable model would be used. + */ + STABLE_MODEL = 1, + + /** + * Latest model would be used. + */ + LATEST_MODEL = 2, + } + + /** + * Options for cloud text recognizer. + */ + export interface MLCloudTextRecognizerOptions { + /** + * Only allow registered application instances with matching certificate fingerprint to use ML API. + * + * > Do not set this for debug build if you use simulators to test. + * + * #### Example + * + * ```js + * await firebase.ml().cloudTextRecognizerProcessImage(filePath, { + * enforceCertFingerprintMatch: true, + * }); + * ``` + */ + enforceCertFingerprintMatch?: boolean; + + /** + * Sets model type for cloud text recognition. The two models SPARSE_MODEL and DENSE_MODEL handle different text densities in an image. + * + * See `MLCloudTextRecognizerModelType` for types. + * + * Defaults to `MLCloudTextRecognizerModelType.SPARSE_MODEL`. + * + * #### Example + * + * ```js + * import { + * firebase, + * MLCloudTextRecognizerModelType, + * } from '@react-native-firebase/ml'; + * + * await firebase.ml().cloudTextRecognizerProcessImage(filePath, { + * modelType: MLCloudTextRecognizerModelType.DENSE_MODEL, + * }); + * ``` + */ + modelType?: + | MLCloudTextRecognizerModelType.SPARSE_MODEL + | MLCloudTextRecognizerModelType.DENSE_MODEL; + + /** + * Sets language hints. In most cases, not setting this yields the best results since it enables automatic language + * detection. For languages based on the Latin alphabet, setting language hints is not needed. In rare cases, when + * the language of the text in the image is known, setting a hint will help get better results (although it will be a + * significant hindrance if the hint is wrong). + * + * Each language code must be a BCP-47 identifier. See [Google Cloud OCR Language Support](https://cloud.google.com/vision/docs/languages) for more information. + * + * #### Example + * + * ```js + * await firebase.ml().cloudTextRecognizerProcessImage(filePath, { + * languageHints: ['fr', 'de'], + * }); + * ``` + */ + languageHints?: string[]; + + /** + * API key to use for Cloud ML API. If not set, the default API key from `firebase.app()` will be used. + * + * #### Example + * + * ```js + * await firebase.ml().cloudTextRecognizerProcessImage(filePath, { + * apiKeyOverride: 'xyz123', + * }); + * ``` + * + * @ios + */ + apiKeyOverride?: string; + } + + /** + * Options for the cloud document text recognizer. + */ + export interface MLCloudDocumentTextRecognizerOptions { + /** + * Only allow registered application instances with matching certificate fingerprint to use ML API. + * + * > Do not set this for debug build if you use simulators to test. + * + * #### Example + * + * ```js + * await firebase.ml().cloudTextRecognizerProcessImage(filePath, { + * enforceCertFingerprintMatch: true, + * }); + * ``` + */ + enforceCertFingerprintMatch?: boolean; + + /** + * Sets language hints. In most cases, not setting this yields the best results since it enables automatic language + * detection. For languages based on the Latin alphabet, setting language hints is not needed. In rare cases, when + * the language of the text in the image is known, setting a hint will help get better results (although it will be a + * significant hindrance if the hint is wrong). + * + * Each language code must be a BCP-47 identifier. See [Google Cloud OCR Language Support](https://cloud.google.com/vision/docs/languages) for more information. + * + * #### Example + * + * ```js + * await firebase.ml().cloudTextRecognizerProcessImage(filePath, { + * languageHints: ['fr', 'de'], + * }); + * ``` + */ + languageHints?: string[]; + + /** + * API key to use for ML API. If not set, the default API key from `firebase.app()` will be used. + * + * #### Example + * + * ```js + * await firebase.ml().cloudTextRecognizerProcessImage(filePath, { + * apiKeyOverride: 'xyz123', + * }); + * ``` + * + * @ios + */ + apiKeyOverride?: string; + } + + /** + * The cloud model type used for in MLCloudTextRecognizerOptions & MLCloudDocumentTextRecognizerOptions + * + * Defaults to `SPARSE_MODEL` + */ + export enum MLCloudTextRecognizerModelType { + /** + * Dense model type. It is more suitable for well-formatted dense text. + */ + SPARSE_MODEL = 1, + /** + * Sparse model type. It is more suitable for sparse text. + */ + DENSE_MODEL = 2, + } + + /** + * A Rectangle holds four number coordinates relative to the processed image. + * Rectangle are represented as [left, top, right, bottom]. + * + * Used by ML Text Recognizer & Landmark Recognition APIs. + */ + export type MLRectangle = [number, number, number, number]; + + /** + * A point holds two number coordinates relative to the processed image. + * Points are represented as [x, y]. + * + * Used by ML Text Recognizer & Landmark Recognition APIs. + */ + export type MLPoint = [number, number]; + + /** + * A hierarchical representation of texts recognized in an image. + */ + export interface MLText { + /** + * Retrieve the recognized text as a string. + */ + text: string; + + /** + * Gets an array `MLTextBlock`, which is a block of text that can be further decomposed to an array of `MLTextLine`. + */ + blocks: MLTextBlock[]; + } + + /** + * Represents a block of text. + */ + export interface MLDocumentTextBlock extends MLDocumentTextBase { + /** + * Gets an Array of `MLDocumentTextParagraph`s that make up this block. + */ + paragraphs: MLDocumentTextParagraph[]; + } + + /** + * A structural unit of text representing a number of words in certain order. + */ + export interface MLDocumentTextParagraph extends MLDocumentTextBase { + /** + * Gets an Array of `MLDocumentTextWord`s that make up this paragraph. + * + * Returns an empty list if no Word is found. + */ + words: MLDocumentTextWord[]; + } + + /** + * A single word representation. + */ + export interface MLDocumentTextWord extends MLDocumentTextBase { + /** + * Gets an Array of `MLDocumentTextSymbol`s that make up this word. + * The order of the symbols follows the natural reading order. + */ + symbols: MLDocumentTextSymbol[]; + } + + /** + * A single symbol representation. + */ + export type MLDocumentTextSymbol = MLDocumentTextBase; + + /** + * Enum representing the detected break type. + */ + export enum MLDocumentTextRecognizedBreakType { + /** + * Line-wrapping break. + */ + EOL_SURE_SPACE = 3, + + /** + * End-line hyphen that is not present in text; does not co-occur with `SPACE`, `LEADER_SPACE`, or `LINE_BREAK`. + */ + HYPHEN = 4, + + /** + * Line break that ends a paragraph. + */ + LINE_BREAK = 5, + + /** + * Regular space. + */ + SPACE = 1, + + /** + * Sure space (very wide). + */ + SURE_SPACE = 2, + + /** + * Unknown break label type. + */ + UNKNOWN = 0, + } + + /** + * A recognized break is the detected start or end of a structural component. + */ + export interface MLDocumentTextRecognizedBreak { + /** + * Gets detected break type. + */ + breakType: MLDocumentTextRecognizedBreakType; + + /** + * Returns true if break prepends an element. + */ + isPrefix: boolean; + } + /** + * A shared type that all MLDocumentText components inherit from + */ + export interface MLDocumentTextBase { + /** + * Gets the recognized text as a string. Returned in reading order for the language. For Latin, this is top to bottom within a `MLTextBlock`, and left-to-right within a `MLTextLine`. + */ + text: string; + + /** + * The confidence of the recognized text. It only return valid result from cloud recognizers. For on-device text recognition, the confidence is always null. + */ + confidence: null | number; + + /** + * Gets a list of recognized languages. (Cloud API only. On-Device returns empty array) + * + * A language is the BCP-47 language code, such as "en-US" or "sr-Latn". + */ + recognizedLanguages: string[]; + + /** + * Returns the bounding rectangle of the detected text. + */ + boundingBox: MLRectangle; + + /** + * Gets the recognized break - the detected start or end of a structural component. + */ + recognizedBreak: MLDocumentTextRecognizedBreak; + } + + /** + * A hierarchical representation of document text recognized in an image. + */ + export interface MLDocumentText { + /** + * Retrieve the recognized text as a string. + */ + text: string; + + /** + * Gets an array `MLTextBlock`, which is a block of text that can be further decomposed to an array of `MLDocumentTextParagraph`. + */ + blocks: MLDocumentTextBlock[]; + } + + /** + * A shared type that all ML Text components inherit from + */ + export interface MLTextBase { + /** + * Gets the recognized text as a string. Returned in reading order for the language. For Latin, this is top to bottom within a `MLTextBlock`, and left-to-right within a `MLTextLine`. + */ + text: string; + + /** + * The confidence of the recognized text. It only return valid result from cloud recognizers. For on-device text recognition, the confidence is always null. + */ + confidence: null | number; + + /** + * Gets a list of recognized languages. (Cloud API only. On-Device returns empty array) + * + * A language is the BCP-47 language code, such as "en-US" or "sr-Latn". + */ + recognizedLanguages: string[]; + + /** + * Returns the bounding rectangle of the detected text. + */ + boundingBox: MLRectangle; + + /** + * Gets the four corner points in clockwise direction starting with top-left. Due to the possible perspective distortions, this is not necessarily a rectangle. Parts of the region could be outside of the image. + */ + cornerPoints: MLPoint[]; + } + + /** + * Represents a block of text (similar to a paragraph). + */ + export interface MLTextBlock extends MLTextBase { + /** + * Gets an Array of MLTextLine's that make up this text block. + */ + lines: MLTextLine[]; + } + + /** + * Represents a line of text. + */ + export interface MLTextLine extends MLTextBase { + /** + * Gets an Array of MLTextElement's that make up this text block. + * + * An element is roughly equivalent to a space-separated "word" in most Latin languages, or a character in others. For instance, if a word is split between two lines by a hyphen, each part is encoded as a separate Element. + */ + elements: MLTextElement[]; + } + + /** + * Roughly equivalent to a space-separated "word" in most Latin languages, or a character in others. For instance, if a word is split between two lines by a hyphen, each part is encoded as a separate Element. + */ + export type MLTextElement = MLTextBase; + + /** + * Represents an image label return from `imageLabelerProcessImage()` and `cloudImageLabelerProcessImage()`. + */ + export interface MLImageLabel { + /** + * Returns a detected label from the given image. The label returned here is in English only. + * + * Use `entityId` to retrieve a unique id. + */ + text: string; + + /** + * Returns an opaque entity ID. IDs are available in [Google Knowledge Graph Search API](https://developers.google.com/knowledge-graph/). + */ + entityId: string; + + /** + * Gets overall confidence of the result. + * + * Range between 0 (low confidence) and 1 (high confidence). + */ + confidence: number; + } + + /** + * Represents a detected landmark returned from `cloudLandmarkRecognizerProcessImage()`. + */ + export interface MLLandmark { + /** + * Gets image region of the detected landmark. Returns null if nothing was detected + */ + boundingBox: MLRectangle | null; + + /** + * Gets overall confidence of the result. Ranging between 0 & 1. + */ + confidence: number; + + /** + * Gets opaque entity ID. Some IDs may be available in [Google Knowledge Graph Search API](https://developers.google.com/knowledge-graph/). + */ + entityId: string; + + /** + * Gets the detected landmark. + */ + landmark: string; + + /** + * Gets the location information for the detected entity. + * + * Multiple MLGeoPoint elements can be present because one location may indicate the location of the scene + * in the image, and another location may indicate the location of the place where the image was taken. + * Location information is usually present for landmarks. + */ + locations: MLGeoPoint[]; + } + + /** + * A representation of a latitude/longitude pair. + * + * This is expressed as an array of numbers representing degrees latitude and degrees longitude, in the form `[lat, lng]`. + */ + export type MLGeoPoint = [number, number]; + + /** + * The Firebase ML service interface. + * + * > This module is available for the default app only. + * + * #### Example + * + * Get the ML service for the default app: + * + * ```js + * const defaultAppML = firebase.ml(); + * ``` + */ + export class Module extends FirebaseModule { + /** + * Detect text from a local image file. + * + * @param imageFilePath A local path to an image on the device. + * @param cloudTextRecognizerOptions An instance of `MLCloudTextRecognizerOptions`. + */ + cloudTextRecognizerProcessImage( + imageFilePath: string, + cloudTextRecognizerOptions?: MLCloudTextRecognizerOptions, + ): Promise; + + /** + * Detect text within a document using a local image file. + * + * @param imageFilePath A local path to an image on the device. + * @param cloudDocumentTextRecognizerOptions An instance of `MLCloudDocumentTextRecognizerOptions`. + */ + cloudDocumentTextRecognizerProcessImage( + imageFilePath: string, + cloudDocumentTextRecognizerOptions?: MLCloudDocumentTextRecognizerOptions, + ): Promise; + + /** + * Returns an array of landmarks (as `MLLandmark`) of a given local image file path + * + * @param imageFilePath A local image file path. + * @param cloudLandmarkRecognizerOptions An optional instance of `MLCloudLandmarkRecognizerOptions`. + */ + cloudLandmarkRecognizerProcessImage( + imageFilePath: string, + cloudLandmarkRecognizerOptions?: MLCloudLandmarkRecognizerOptions, + ): Promise; + + /** + * Returns an array of labels (as `MLImageLabel`) of a given local image file path. + * + * #### Example + * + * ```js + * const labels = await firebase.ml().cloudImageLabelerProcessImage(filePath, { + * confidenceThreshold: 0.8, + * }); + * ``` + * + * @param imageFilePath A local image file path. + * @param cloudImageLabelerOptions An optional instance of `MLCloudImageLabelerOptions`. + */ + cloudImageLabelerProcessImage( + imageFilePath: string, + cloudImageLabelerOptions?: MLCloudImageLabelerOptions, + ): Promise; + } +} + +declare const defaultExport: ReactNativeFirebase.FirebaseModuleWithStaticsAndApp< + FirebaseMLTypes.Module, + FirebaseMLTypes.Statics +>; + +export const firebase: ReactNativeFirebase.Module & { + analytics: typeof defaultExport; + app(name?: string): ReactNativeFirebase.FirebaseApp & { ml(): FirebaseMLTypes.Module }; +}; + +export const MLCloudTextRecognizerModelType: FirebaseMLTypes.Statics['MLCloudTextRecognizerModelType']; +export const MLDocumentTextRecognizedBreakType: FirebaseMLTypes.Statics['MLDocumentTextRecognizedBreakType']; +export const MLCloudLandmarkRecognizerModelType: FirebaseMLTypes.Statics['MLCloudLandmarkRecognizerModelType']; + +export default defaultExport; + +/** + * Attach namespace to `firebase.` and `FirebaseApp.`. + */ +declare module '@react-native-firebase/app' { + namespace ReactNativeFirebase { + import FirebaseModuleWithStaticsAndApp = ReactNativeFirebase.FirebaseModuleWithStaticsAndApp; + interface Module { + ml: FirebaseModuleWithStaticsAndApp; + } + + interface FirebaseApp { + ml(): FirebaseMLTypes.Module; + } + } +} diff --git a/packages/ml/lib/index.js b/packages/ml/lib/index.js new file mode 100644 index 00000000000..79b25a42476 --- /dev/null +++ b/packages/ml/lib/index.js @@ -0,0 +1,145 @@ +/* + * Copyright (c) 2016-present Invertase Limited & Contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this library except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +import { isString, toFilePath } from '@react-native-firebase/app/lib/common'; +import { + createModuleNamespace, + FirebaseModule, + getFirebaseRoot, +} from '@react-native-firebase/app/lib/internal'; +import version from './version'; +import MLCloudDocumentTextRecognizerOptions from './MLCloudDocumentTextRecognizerOptions'; +import MLCloudImageLabelerOptions from './MLCloudImageLabelerOptions'; +import MLCloudLandmarkRecognizerModelType from './MLCloudLandmarkRecognizerModelType'; +import MLCloudLandmarkRecognizerOptions from './MLCloudLandmarkRecognizerOptions'; +import MLCloudTextRecognizerModelType from './MLCloudTextRecognizerModelType'; +import MLCloudTextRecognizerOptions from './MLCloudTextRecognizerOptions'; +import MLDocumentTextRecognizedBreakType from './MLDocumentTextRecognizedBreakType'; + +const statics = { + MLCloudTextRecognizerModelType, + MLCloudLandmarkRecognizerModelType, + MLDocumentTextRecognizedBreakType, +}; + +const namespace = 'ml'; +const nativeModuleName = [ + 'RNFBMLImageLabelerModule', + 'RNFBMLTextRecognizerModule', + 'RNFBMLLandmarkRecognizerModule', + 'RNFBMLDocumentTextRecognizerModule', +]; + +class FirebaseMLModule extends FirebaseModule { + cloudTextRecognizerProcessImage(localImageFilePath, cloudTextRecognizerOptions) { + if (!isString(localImageFilePath)) { + throw new Error( + "firebase.ml().cloudTextRecognizerProcessImage(*) 'localImageFilePath' expected a string local file path.", + ); + } + + let options; + try { + options = MLCloudTextRecognizerOptions(cloudTextRecognizerOptions); + } catch (e) { + throw new Error(`firebase.ml().cloudTextRecognizerProcessImage(_, *) ${e.message}`); + } + + return this.native.cloudTextRecognizerProcessImage(toFilePath(localImageFilePath), options); + } + + cloudDocumentTextRecognizerProcessImage(localImageFilePath, cloudDocumentTextRecognizerOptions) { + if (!isString(localImageFilePath)) { + throw new Error( + "firebase.ml().cloudDocumentTextRecognizerProcessImage(*) 'localImageFilePath' expected a string local file path.", + ); + } + + let options; + try { + options = MLCloudDocumentTextRecognizerOptions(cloudDocumentTextRecognizerOptions); + } catch (e) { + throw new Error(`firebase.ml().cloudDocumentTextRecognizerProcessImage(_, *) ${e.message}.`); + } + + return this.native.cloudDocumentTextRecognizerProcessImage( + toFilePath(localImageFilePath), + options, + ); + } + + cloudLandmarkRecognizerProcessImage(localImageFilePath, cloudLandmarkRecognizerOptions) { + if (!isString(localImageFilePath)) { + throw new Error( + "firebase.ml().cloudLandmarkRecognizerProcessImage(*) 'localImageFilePath' expected a string local file path.", + ); + } + + let options; + try { + options = MLCloudLandmarkRecognizerOptions(cloudLandmarkRecognizerOptions); + } catch (e) { + throw new Error(`firebase.ml().cloudLandmarkRecognizerProcessImage(_, *) ${e.message}.`); + } + + return this.native.cloudLandmarkRecognizerProcessImage(toFilePath(localImageFilePath), options); + } + + cloudImageLabelerProcessImage(localImageFilePath, cloudImageLabelerOptions) { + if (!isString(localImageFilePath)) { + throw new Error( + "firebase.ml().cloudImageLabelerProcessImage(*) 'localImageFilePath' expected a string local file path.", + ); + } + + let options; + try { + options = MLCloudImageLabelerOptions(cloudImageLabelerOptions); + } catch (e) { + throw new Error(`firebase.ml().cloudImageLabelerProcessImage(_, *) ${e.message}.`); + } + + return this.native.cloudImageLabelerProcessImage(toFilePath(localImageFilePath), options); + } +} + +// import { SDK_VERSION } from '@react-native-firebase/ml'; +export const SDK_VERSION = version; + +// import ML from '@react-native-firebase/ml'; +// ml().X(...); +export default createModuleNamespace({ + statics, + version, + namespace, + nativeModuleName, + nativeEvents: false, + hasMultiAppSupport: true, + hasCustomUrlOrRegionSupport: false, + ModuleClass: FirebaseMLModule, +}); + +// import ml, { firebase } from '@react-native-firebase/ml'; +// ml().X(...); +// firebase.ml().X(...); +export const firebase = getFirebaseRoot(); + +// e.g. +// // import { MLCloudTextRecognizerModelType } from '@react-native-firebase/ml'; +export { default as MLCloudTextRecognizerModelType } from './MLCloudTextRecognizerModelType'; +export { default as MLDocumentTextRecognizedBreakType } from './MLDocumentTextRecognizedBreakType'; +export { default as MLCloudLandmarkRecognizerModelType } from './MLCloudLandmarkRecognizerModelType'; diff --git a/packages/ml-vision/package.json b/packages/ml/package.json similarity index 65% rename from packages/ml-vision/package.json rename to packages/ml/package.json index d1d21234d15..4f9111ab461 100644 --- a/packages/ml-vision/package.json +++ b/packages/ml/package.json @@ -1,8 +1,8 @@ { - "name": "@react-native-firebase/ml-vision", + "name": "@react-native-firebase/ml", "version": "7.4.13", "author": "Invertase (http://invertase.io)", - "description": "React Native Firebase - Firebase ML Kit brings the power of machine learning vision to your React Native application, supporting both Android & iOS.", + "description": "React Native Firebase - Firebase ML brings the power of machine learning vision to your React Native application, supporting both Android & iOS.", "main": "lib/index.js", "types": "lib/index.d.ts", "scripts": { @@ -12,24 +12,18 @@ }, "repository": { "type": "git", - "url": "https://github.com/invertase/react-native-firebase/tree/master/packages/ml-vision" + "url": "https://github.com/invertase/react-native-firebase/tree/master/packages/ml" }, "license": "Apache-2.0", "keywords": [ "react", "react-native", "firebase", - "mlkit", + "ml", "machine learning", "text recognition", "landmark recognition", - "image labeler", - "face detector", - "barcode", - "label", - "natural language", - "nlp", - "vision" + "image labeler" ], "peerDependencies": { "@react-native-firebase/app": "8.4.7" diff --git a/packages/ml/type-test.ts b/packages/ml/type-test.ts new file mode 100644 index 00000000000..42313332a82 --- /dev/null +++ b/packages/ml/type-test.ts @@ -0,0 +1,37 @@ +import firebase from '@react-native-firebase/app'; +import * as ml from '@react-native-firebase/ml'; + +console.log(ml.default().app); + +// checks module exists at root +console.log(firebase.ml().app.name); + +// checks module exists at app level +console.log(firebase.app().ml().app.name); + +// checks statics exist +console.log(firebase.ml.SDK_VERSION); + +// checks statics exist on defaultExport +console.log(firebase.SDK_VERSION); + +// checks root exists +console.log(firebase.SDK_VERSION); + +// checks firebase named export exists on module +console.log(ml.firebase.SDK_VERSION); + +// checks multi-app support exists +console.log(firebase.ml(firebase.app()).app.name); + +// checks default export supports app arg +console.log(firebase.ml(firebase.app('foo')).app.name); + +console.log(firebase.ml.MLCloudTextRecognizerModelType.DENSE_MODEL); +console.log(ml.MLCloudTextRecognizerModelType.SPARSE_MODEL); + +console.log(firebase.ml.MLDocumentTextRecognizedBreakType.EOL_SURE_SPACE); +console.log(ml.MLDocumentTextRecognizedBreakType.HYPHEN); + +console.log(firebase.ml.MLCloudLandmarkRecognizerModelType.LATEST_MODEL); +console.log(ml.MLCloudLandmarkRecognizerModelType.STABLE_MODEL); diff --git a/tests/app.js b/tests/app.js index e1c01c1487d..0ddfed57b9e 100644 --- a/tests/app.js +++ b/tests/app.js @@ -29,8 +29,7 @@ import '@react-native-firebase/functions'; import '@react-native-firebase/iid'; import '@react-native-firebase/in-app-messaging'; import '@react-native-firebase/messaging'; -import '@react-native-firebase/ml-natural-language'; -import '@react-native-firebase/ml-vision'; +import '@react-native-firebase/ml'; import '@react-native-firebase/perf'; import '@react-native-firebase/remote-config'; import '@react-native-firebase/storage'; diff --git a/tests/e2e/mocha.opts b/tests/e2e/mocha.opts index f2b52f0b570..277057ef9fd 100644 --- a/tests/e2e/mocha.opts +++ b/tests/e2e/mocha.opts @@ -12,7 +12,8 @@ ../packages/analytics/e2e/*.e2e.js -../packages/auth/e2e/*.e2e.js +# FIXME temporary, API limits make these failure-prone, toggled off during development +#../packages/auth/e2e/*.e2e.js # TODO a lot of these failing on CI - might be an API rate limit change # ../packages/admob/e2e/*.e2e.js @@ -29,10 +30,8 @@ ../packages/remote-config/e2e/*.e2e.js -../packages/ml-natural-language/e2e/*.e2e.js - # TODO - ci crashing Android -# ../packages/ml-vision/e2e/*.e2e.js +../packages/ml/e2e/*.e2e.js ../packages/in-app-messaging/e2e/*.e2e.js diff --git a/tests/firebase.json b/tests/firebase.json index f1df7b7dff1..e5d42e83e10 100644 --- a/tests/firebase.json +++ b/tests/firebase.json @@ -9,23 +9,12 @@ "crashlytics_disable_auto_disabler": false, "crashlytics_auto_collection_enabled": true, - "ml_natural_language_language_id_model" : true, - "ml_natural_language_smart_reply_model" : true, - - "ml_vision_face_model" : true, - "ml_vision_ocr_model" : true, - "ml_vision_barcode_model" : true, - "messaging_auto_init_enabled": true, "messaging_android_headless_task_timeout": 30000, "messaging_android_notification_channel_id": "", "messaging_android_notification_color": "@color/hotpink", "messaging_ios_auto_register_for_remote_messages": true, - "ml_vision_label_model": true, - "ml_vision_image_label_model": true, - - "TODO_ml_natural_language_translate_model" : true, "TODO_analytics_auto_collection_enabled": true, "TODO_perf_auto_collection_enabled": true, "TODO_in_app_messaging_auto_collection_enabled": true, diff --git a/tests/ios/Podfile b/tests/ios/Podfile index 79efea04e61..670f206d7fa 100644 --- a/tests/ios/Podfile +++ b/tests/ios/Podfile @@ -1,12 +1,8 @@ -platform :ios, '9.0' - -# Allow using RNFirebase as static frameworks +platform :ios, '10.0' $RNFirebaseAsStaticFramework = false # Version override testing -$FirebaseSDKVersion = '6.34.0' -# $FabricSDKVersion = '1.6.0' -# $CrashlyticsSDKVersion = '3.1.0' +$FirebaseSDKVersion = '7.0.0' require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' @@ -45,7 +41,7 @@ target 'testing' do pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec' use_native_modules! - #pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :branch => 'master' + pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :branch => 'master' end post_install do |installer| diff --git a/tests/ios/Podfile.lock b/tests/ios/Podfile.lock index 6ed96bba33b..722a2aa11bf 100644 --- a/tests/ios/Podfile.lock +++ b/tests/ios/Podfile.lock @@ -1,224 +1,5 @@ PODS: - - abseil/algorithm (0.20200225.0): - - abseil/algorithm/algorithm (= 0.20200225.0) - - abseil/algorithm/container (= 0.20200225.0) - - abseil/algorithm/algorithm (0.20200225.0): - - abseil/base/config - - abseil/algorithm/container (0.20200225.0): - - abseil/algorithm/algorithm - - abseil/base/core_headers - - abseil/meta/type_traits - - abseil/base (0.20200225.0): - - abseil/base/atomic_hook (= 0.20200225.0) - - abseil/base/base (= 0.20200225.0) - - abseil/base/base_internal (= 0.20200225.0) - - abseil/base/bits (= 0.20200225.0) - - abseil/base/config (= 0.20200225.0) - - abseil/base/core_headers (= 0.20200225.0) - - abseil/base/dynamic_annotations (= 0.20200225.0) - - abseil/base/endian (= 0.20200225.0) - - abseil/base/errno_saver (= 0.20200225.0) - - abseil/base/exponential_biased (= 0.20200225.0) - - abseil/base/log_severity (= 0.20200225.0) - - abseil/base/malloc_internal (= 0.20200225.0) - - abseil/base/periodic_sampler (= 0.20200225.0) - - abseil/base/pretty_function (= 0.20200225.0) - - abseil/base/raw_logging_internal (= 0.20200225.0) - - abseil/base/spinlock_wait (= 0.20200225.0) - - abseil/base/throw_delegate (= 0.20200225.0) - - abseil/base/atomic_hook (0.20200225.0): - - abseil/base/config - - abseil/base/core_headers - - abseil/base/base (0.20200225.0): - - abseil/base/atomic_hook - - abseil/base/base_internal - - abseil/base/config - - abseil/base/core_headers - - abseil/base/dynamic_annotations - - abseil/base/log_severity - - abseil/base/raw_logging_internal - - abseil/base/spinlock_wait - - abseil/meta/type_traits - - abseil/base/base_internal (0.20200225.0): - - abseil/base/config - - abseil/meta/type_traits - - abseil/base/bits (0.20200225.0): - - abseil/base/config - - abseil/base/core_headers - - abseil/base/config (0.20200225.0) - - abseil/base/core_headers (0.20200225.0): - - abseil/base/config - - abseil/base/dynamic_annotations (0.20200225.0) - - abseil/base/endian (0.20200225.0): - - abseil/base/config - - abseil/base/core_headers - - abseil/base/errno_saver (0.20200225.0): - - abseil/base/config - - abseil/base/exponential_biased (0.20200225.0): - - abseil/base/config - - abseil/base/core_headers - - abseil/base/log_severity (0.20200225.0): - - abseil/base/config - - abseil/base/core_headers - - abseil/base/malloc_internal (0.20200225.0): - - abseil/base/base - - abseil/base/base_internal - - abseil/base/config - - abseil/base/core_headers - - abseil/base/dynamic_annotations - - abseil/base/raw_logging_internal - - abseil/base/periodic_sampler (0.20200225.0): - - abseil/base/core_headers - - abseil/base/exponential_biased - - abseil/base/pretty_function (0.20200225.0) - - abseil/base/raw_logging_internal (0.20200225.0): - - abseil/base/atomic_hook - - abseil/base/config - - abseil/base/core_headers - - abseil/base/log_severity - - abseil/base/spinlock_wait (0.20200225.0): - - abseil/base/base_internal - - abseil/base/core_headers - - abseil/base/errno_saver - - abseil/base/throw_delegate (0.20200225.0): - - abseil/base/config - - abseil/base/raw_logging_internal - - abseil/container/compressed_tuple (0.20200225.0): - - abseil/utility/utility - - abseil/container/inlined_vector (0.20200225.0): - - abseil/algorithm/algorithm - - abseil/base/core_headers - - abseil/base/throw_delegate - - abseil/container/inlined_vector_internal - - abseil/memory/memory - - abseil/container/inlined_vector_internal (0.20200225.0): - - abseil/base/core_headers - - abseil/container/compressed_tuple - - abseil/memory/memory - - abseil/meta/type_traits - - abseil/types/span - - abseil/memory (0.20200225.0): - - abseil/memory/memory (= 0.20200225.0) - - abseil/memory/memory (0.20200225.0): - - abseil/base/core_headers - - abseil/meta/type_traits - - abseil/meta (0.20200225.0): - - abseil/meta/type_traits (= 0.20200225.0) - - abseil/meta/type_traits (0.20200225.0): - - abseil/base/config - - abseil/numeric/int128 (0.20200225.0): - - abseil/base/config - - abseil/base/core_headers - - abseil/strings/internal (0.20200225.0): - - abseil/base/config - - abseil/base/core_headers - - abseil/base/endian - - abseil/base/raw_logging_internal - - abseil/meta/type_traits - - abseil/strings/str_format (0.20200225.0): - - abseil/strings/str_format_internal - - abseil/strings/str_format_internal (0.20200225.0): - - abseil/base/config - - abseil/base/core_headers - - abseil/meta/type_traits - - abseil/numeric/int128 - - abseil/strings/strings - - abseil/types/span - - abseil/strings/strings (0.20200225.0): - - abseil/base/base - - abseil/base/bits - - abseil/base/config - - abseil/base/core_headers - - abseil/base/endian - - abseil/base/raw_logging_internal - - abseil/base/throw_delegate - - abseil/memory/memory - - abseil/meta/type_traits - - abseil/numeric/int128 - - abseil/strings/internal - - abseil/time (0.20200225.0): - - abseil/time/internal (= 0.20200225.0) - - abseil/time/time (= 0.20200225.0) - - abseil/time/internal (0.20200225.0): - - abseil/time/internal/cctz (= 0.20200225.0) - - abseil/time/internal/cctz (0.20200225.0): - - abseil/time/internal/cctz/civil_time (= 0.20200225.0) - - abseil/time/internal/cctz/time_zone (= 0.20200225.0) - - abseil/time/internal/cctz/civil_time (0.20200225.0): - - abseil/base/config - - abseil/time/internal/cctz/time_zone (0.20200225.0): - - abseil/base/config - - abseil/time/internal/cctz/civil_time - - abseil/time/time (0.20200225.0): - - abseil/base/base - - abseil/base/core_headers - - abseil/base/raw_logging_internal - - abseil/numeric/int128 - - abseil/strings/strings - - abseil/time/internal/cctz/civil_time - - abseil/time/internal/cctz/time_zone - - abseil/types (0.20200225.0): - - abseil/types/any (= 0.20200225.0) - - abseil/types/bad_any_cast (= 0.20200225.0) - - abseil/types/bad_any_cast_impl (= 0.20200225.0) - - abseil/types/bad_optional_access (= 0.20200225.0) - - abseil/types/bad_variant_access (= 0.20200225.0) - - abseil/types/compare (= 0.20200225.0) - - abseil/types/optional (= 0.20200225.0) - - abseil/types/span (= 0.20200225.0) - - abseil/types/variant (= 0.20200225.0) - - abseil/types/any (0.20200225.0): - - abseil/base/config - - abseil/base/core_headers - - abseil/meta/type_traits - - abseil/types/bad_any_cast - - abseil/utility/utility - - abseil/types/bad_any_cast (0.20200225.0): - - abseil/base/config - - abseil/types/bad_any_cast_impl - - abseil/types/bad_any_cast_impl (0.20200225.0): - - abseil/base/config - - abseil/base/raw_logging_internal - - abseil/types/bad_optional_access (0.20200225.0): - - abseil/base/config - - abseil/base/raw_logging_internal - - abseil/types/bad_variant_access (0.20200225.0): - - abseil/base/config - - abseil/base/raw_logging_internal - - abseil/types/compare (0.20200225.0): - - abseil/base/core_headers - - abseil/meta/type_traits - - abseil/types/optional (0.20200225.0): - - abseil/base/base_internal - - abseil/base/config - - abseil/base/core_headers - - abseil/memory/memory - - abseil/meta/type_traits - - abseil/types/bad_optional_access - - abseil/utility/utility - - abseil/types/span (0.20200225.0): - - abseil/algorithm/algorithm - - abseil/base/core_headers - - abseil/base/throw_delegate - - abseil/meta/type_traits - - abseil/types/variant (0.20200225.0): - - abseil/base/base_internal - - abseil/base/config - - abseil/base/core_headers - - abseil/meta/type_traits - - abseil/types/bad_variant_access - - abseil/utility/utility - - abseil/utility/utility (0.20200225.0): - - abseil/base/base_internal - - abseil/base/config - - abseil/meta/type_traits - boost-for-react-native (1.63.0) - - BoringSSL-GRPC (0.0.7): - - BoringSSL-GRPC/Implementation (= 0.0.7) - - BoringSSL-GRPC/Interface (= 0.0.7) - - BoringSSL-GRPC/Implementation (0.0.7): - - BoringSSL-GRPC/Interface (= 0.0.7) - - BoringSSL-GRPC/Interface (0.0.7) - DoubleConversion (1.1.6) - FBLazyVector (0.62.2) - FBReactNativeSpec (0.62.2): @@ -228,214 +9,154 @@ PODS: - React-Core (= 0.62.2) - React-jsi (= 0.62.2) - ReactCommon/turbomodule/core (= 0.62.2) - - Firebase/AdMob (6.34.0): + - Firebase/AdMob (7.0.0): - Firebase/CoreOnly - - Google-Mobile-Ads-SDK (~> 7.63) - - Firebase/Analytics (6.34.0): + - Google-Mobile-Ads-SDK (~> 7.66) + - Firebase/Analytics (7.0.0): - Firebase/Core - - Firebase/Auth (6.34.0): + - Firebase/Auth (7.0.0): - Firebase/CoreOnly - - FirebaseAuth (~> 6.9.2) - - Firebase/Core (6.34.0): + - FirebaseAuth (~> 7.0.0) + - Firebase/Core (7.0.0): - Firebase/CoreOnly - - FirebaseAnalytics (= 6.9.0) - - Firebase/CoreOnly (6.34.0): - - FirebaseCore (= 6.10.4) - - Firebase/Crashlytics (6.34.0): + - FirebaseAnalytics (= 7.0.0) + - Firebase/CoreOnly (7.0.0): + - FirebaseCore (= 7.0.0) + - Firebase/Crashlytics (7.0.0): - Firebase/CoreOnly - - FirebaseCrashlytics (~> 4.6.2) - - Firebase/Database (6.34.0): + - FirebaseCrashlytics (~> 7.0.0) + - Firebase/Database (7.0.0): - Firebase/CoreOnly - - FirebaseDatabase (~> 6.6.0) - - Firebase/DynamicLinks (6.34.0): + - FirebaseDatabase (~> 7.0.0) + - Firebase/DynamicLinks (7.0.0): - Firebase/CoreOnly - - FirebaseDynamicLinks (~> 4.3.1) - - Firebase/Firestore (6.34.0): + - FirebaseDynamicLinks (~> 7.0.0) + - Firebase/Firestore (7.0.0): - Firebase/CoreOnly - - FirebaseFirestore (~> 1.19.0) - - Firebase/Functions (6.34.0): + - FirebaseFirestore (~> 7.0.0) + - Firebase/Functions (7.0.0): - Firebase/CoreOnly - - FirebaseFunctions (~> 2.9.0) - - Firebase/InAppMessaging (6.34.0): + - FirebaseFunctions (~> 7.0.0) + - Firebase/InAppMessaging (7.0.0): - Firebase/CoreOnly - - FirebaseInAppMessaging (~> 0.24.0) - - Firebase/Messaging (6.34.0): + - FirebaseInAppMessaging (~> 7.0.0-beta) + - Firebase/Messaging (7.0.0): - Firebase/CoreOnly - - FirebaseMessaging (~> 4.7.1) - - Firebase/MLCommon (6.34.0): + - FirebaseMessaging (~> 7.0.0) + - Firebase/MLVision (7.0.0): - Firebase/CoreOnly - - FirebaseMLCommon (~> 0.21.0) - - Firebase/MLNaturalLanguage (6.34.0): + - FirebaseMLVision (~> 7.0.0-beta) + - Firebase/Performance (7.0.0): - Firebase/CoreOnly - - FirebaseMLNaturalLanguage (~> 0.18.0) - - Firebase/MLNLLanguageID (6.34.0): + - FirebasePerformance (~> 7.0.0) + - Firebase/RemoteConfig (7.0.0): - Firebase/CoreOnly - - FirebaseMLNLLanguageID (~> 0.18.0) - - Firebase/MLNLSmartReply (6.34.0): + - FirebaseRemoteConfig (~> 7.0.0) + - Firebase/Storage (7.0.0): - Firebase/CoreOnly - - FirebaseMLNLSmartReply (~> 0.18.0) - - Firebase/MLVision (6.34.0): - - Firebase/CoreOnly - - FirebaseMLVision (~> 0.21.0) - - Firebase/MLVisionBarcodeModel (6.34.0): - - Firebase/CoreOnly - - FirebaseMLVisionBarcodeModel (~> 0.21.0) - - Firebase/MLVisionFaceModel (6.34.0): - - Firebase/CoreOnly - - FirebaseMLVisionFaceModel (~> 0.21.0) - - Firebase/MLVisionLabelModel (6.34.0): - - Firebase/CoreOnly - - FirebaseMLVisionLabelModel (~> 0.21.0) - - Firebase/MLVisionTextModel (6.34.0): - - Firebase/CoreOnly - - FirebaseMLVisionTextModel (~> 0.21.0) - - Firebase/Performance (6.34.0): - - Firebase/CoreOnly - - FirebasePerformance (~> 3.3.1) - - Firebase/RemoteConfig (6.34.0): - - Firebase/CoreOnly - - FirebaseRemoteConfig (~> 4.9.1) - - Firebase/Storage (6.34.0): - - Firebase/CoreOnly - - FirebaseStorage (~> 3.9.1) - - FirebaseABTesting (4.2.0): - - FirebaseCore (~> 6.10) - - FirebaseAnalytics (6.9.0): - - FirebaseCore (~> 6.10) - - FirebaseInstallations (~> 1.7) - - GoogleAppMeasurement (= 6.9.0) - - GoogleUtilities/AppDelegateSwizzler (~> 6.7) - - GoogleUtilities/MethodSwizzler (~> 6.7) - - GoogleUtilities/Network (~> 6.7) - - "GoogleUtilities/NSData+zlib (~> 6.7)" - - nanopb (~> 1.30906.0) - - FirebaseAuth (6.9.2): - - FirebaseCore (~> 6.10) - - GoogleUtilities/AppDelegateSwizzler (~> 6.7) - - GoogleUtilities/Environment (~> 6.7) - - GTMSessionFetcher/Core (~> 1.1) - - FirebaseCore (6.10.4): - - FirebaseCoreDiagnostics (~> 1.6) - - GoogleUtilities/Environment (~> 6.7) - - GoogleUtilities/Logger (~> 6.7) - - FirebaseCoreDiagnostics (1.7.0): - - GoogleDataTransport (~> 7.4) - - GoogleUtilities/Environment (~> 6.7) - - GoogleUtilities/Logger (~> 6.7) - - nanopb (~> 1.30906.0) - - FirebaseCrashlytics (4.6.2): - - FirebaseCore (~> 6.10) - - FirebaseInstallations (~> 1.6) - - GoogleDataTransport (~> 7.2) - - nanopb (~> 1.30906.0) + - FirebaseStorage (~> 7.0.0) + - FirebaseABTesting (7.1.0): + - FirebaseCore (~> 7.0) + - FirebaseAnalytics (7.0.0): + - FirebaseCore (~> 7.0) + - FirebaseInstallations (~> 7.0) + - GoogleAppMeasurement (= 7.0.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.0) + - GoogleUtilities/MethodSwizzler (~> 7.0) + - GoogleUtilities/Network (~> 7.0) + - "GoogleUtilities/NSData+zlib (~> 7.0)" + - nanopb (~> 2.30906.0) + - FirebaseAuth (7.0.0): + - FirebaseCore (~> 7.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.0) + - GoogleUtilities/Environment (~> 7.0) + - GTMSessionFetcher/Core (~> 1.4) + - FirebaseCore (7.0.0): + - FirebaseCoreDiagnostics (~> 7.0) + - GoogleUtilities/Environment (~> 7.0) + - GoogleUtilities/Logger (~> 7.0) + - FirebaseCoreDiagnostics (7.1.0): + - GoogleDataTransport (~> 8.0) + - GoogleUtilities/Environment (~> 7.0) + - GoogleUtilities/Logger (~> 7.0) + - nanopb (~> 2.30906.0) + - FirebaseCrashlytics (7.0.0): + - FirebaseCore (~> 7.0) + - FirebaseInstallations (~> 7.0) + - GoogleDataTransport (~> 8.0) + - nanopb (~> 2.30906.0) - PromisesObjC (~> 1.2) - - FirebaseDatabase (6.6.0): - - FirebaseCore (~> 6.10) - - leveldb-library (~> 1.22) - - FirebaseDynamicLinks (4.3.1): - - FirebaseCore (~> 6.10) - - FirebaseFirestore (1.19.0): - - abseil/algorithm (= 0.20200225.0) - - abseil/base (= 0.20200225.0) - - abseil/memory (= 0.20200225.0) - - abseil/meta (= 0.20200225.0) - - abseil/strings/strings (= 0.20200225.0) - - abseil/time (= 0.20200225.0) - - abseil/types (= 0.20200225.0) - - FirebaseCore (~> 6.10) - - "gRPC-C++ (~> 1.28.0)" + - FirebaseDatabase (7.0.0): + - FirebaseCore (~> 7.0) - leveldb-library (~> 1.22) - - nanopb (~> 1.30906.0) - - FirebaseFunctions (2.9.0): - - FirebaseCore (~> 6.10) - - GTMSessionFetcher/Core (~> 1.1) - - FirebaseInAppMessaging (0.24.0): - - FirebaseABTesting (~> 4.2) - - FirebaseCore (~> 6.10) - - FirebaseInstallations (~> 1.6) - - GoogleUtilities/Environment (~> 6.7) - - nanopb (~> 1.30906.0) - - FirebaseInstallations (1.7.0): - - FirebaseCore (~> 6.10) - - GoogleUtilities/Environment (~> 6.7) - - GoogleUtilities/UserDefaults (~> 6.7) + - FirebaseDynamicLinks (7.0.0): + - FirebaseCore (~> 7.0) + - FirebaseFirestore (7.0.0) + - FirebaseFunctions (7.0.0): + - FirebaseCore (~> 7.0) + - GTMSessionFetcher/Core (~> 1.4) + - FirebaseInAppMessaging (7.0.0-beta): + - FirebaseABTesting (~> 7.0) + - FirebaseCore (~> 7.0) + - FirebaseInstallations (~> 7.0) + - GoogleUtilities/Environment (~> 7.0) + - nanopb (~> 2.30906.0) + - FirebaseInstallations (7.1.0): + - FirebaseCore (~> 7.0) + - GoogleUtilities/Environment (~> 7.0) + - GoogleUtilities/UserDefaults (~> 7.0) - PromisesObjC (~> 1.2) - - FirebaseInstanceID (4.8.0): - - FirebaseCore (~> 6.10) - - FirebaseInstallations (~> 1.6) - - GoogleUtilities/Environment (~> 6.7) - - GoogleUtilities/UserDefaults (~> 6.7) - - FirebaseMessaging (4.7.1): - - FirebaseCore (~> 6.10) - - FirebaseInstanceID (~> 4.7) - - GoogleUtilities/AppDelegateSwizzler (~> 6.7) - - GoogleUtilities/Environment (~> 6.7) - - GoogleUtilities/Reachability (~> 6.7) - - GoogleUtilities/UserDefaults (~> 6.7) - - Protobuf (>= 3.9.2, ~> 3.9) - - FirebaseMLCommon (0.21.0): - - FirebaseCore (~> 6.9) - - FirebaseInstallations (~> 1.5) - - GoogleToolboxForMac/Logger (~> 2.1) - - "GoogleToolboxForMac/NSData+zlib (~> 2.1)" - - "GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1)" - - GoogleUtilities/UserDefaults (~> 6.0) - - GTMSessionFetcher/Core (~> 1.1) - - Protobuf (~> 3.12) - - FirebaseMLNaturalLanguage (0.18.0): - - FirebaseCore (~> 6.9) - - FirebaseMLCommon (~> 0.21) + - FirebaseInstanceID (7.1.0): + - FirebaseCore (~> 7.0) + - FirebaseInstallations (~> 7.0) + - GoogleUtilities/Environment (~> 7.0) + - GoogleUtilities/UserDefaults (~> 7.0) + - FirebaseMessaging (7.0.0): + - FirebaseCore (~> 7.0) + - FirebaseInstanceID (~> 7.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.0) + - GoogleUtilities/Environment (~> 7.0) + - GoogleUtilities/Reachability (~> 7.0) + - GoogleUtilities/UserDefaults (~> 7.0) + - FirebaseMLCommon (7.1.0-beta): + - FirebaseCore (~> 7.0) + - FirebaseInstallations (~> 7.0) - GoogleToolboxForMac/Logger (~> 2.1) - "GoogleToolboxForMac/NSData+zlib (~> 2.1)" - "GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1)" + - GoogleUtilities/UserDefaults (~> 7.0) - GTMSessionFetcher/Core (~> 1.1) - Protobuf (~> 3.12) - - FirebaseMLNLLanguageID (0.18.0): - - FirebaseCore (~> 6.9) - - FirebaseMLNaturalLanguage (~> 0.18) - - FirebaseMLNLSmartReply (0.18.0): - - FirebaseCore (~> 6.9) - - FirebaseMLNaturalLanguage (~> 0.18) - - FirebaseMLNLLanguageID (~> 0.18) - - FirebaseRemoteConfig (~> 4.7) - - FirebaseMLVision (0.21.0): - - FirebaseCore (~> 6.9) - - FirebaseMLCommon (~> 0.21) + - FirebaseMLVision (7.0.0-beta): + - FirebaseCore (~> 7.0) + - FirebaseMLCommon (~> 7.0-beta) - GoogleAPIClientForREST/Core (~> 1.3) - GoogleAPIClientForREST/Vision (~> 1.3) - GoogleToolboxForMac/Logger (~> 2.1) - "GoogleToolboxForMac/NSData+zlib (~> 2.1)" - GTMSessionFetcher/Core (~> 1.1) - Protobuf (~> 3.12) - - FirebaseMLVisionBarcodeModel (0.21.0): - - FirebaseMLVision (~> 0.21) - - FirebaseMLVisionFaceModel (0.21.0): - - FirebaseMLVision (~> 0.21) - - FirebaseMLVisionLabelModel (0.21.0): - - FirebaseMLVision (~> 0.21) - - FirebaseMLVisionTextModel (0.21.0): - - FirebaseMLVision (~> 0.21) - - FirebasePerformance (3.3.1): - - FirebaseCore (~> 6.9) - - FirebaseInstallations (~> 1.5) - - FirebaseRemoteConfig (~> 4.7) - - GoogleDataTransport (~> 7.0) + - FirebasePerformance (7.0.1): + - FirebaseCore (~> 7.0) + - FirebaseInstallations (~> 7.0) + - FirebaseRemoteConfig (~> 7.0) + - GoogleDataTransport (~> 8.0) - GoogleToolboxForMac/Logger (~> 2.1) - "GoogleToolboxForMac/NSData+zlib (~> 2.1)" - - GoogleUtilities/Environment (~> 6.2) - - GoogleUtilities/ISASwizzler (~> 6.2) - - GoogleUtilities/MethodSwizzler (~> 6.2) + - GoogleUtilities/Environment (~> 7.0) + - GoogleUtilities/ISASwizzler (~> 7.0) + - GoogleUtilities/MethodSwizzler (~> 7.0) - GTMSessionFetcher/Core (~> 1.1) - Protobuf (~> 3.12) - - FirebaseRemoteConfig (4.9.1): - - FirebaseABTesting (~> 4.2) - - FirebaseCore (~> 6.10) - - FirebaseInstallations (~> 1.6) - - GoogleUtilities/Environment (~> 6.7) - - "GoogleUtilities/NSData+zlib (~> 6.7)" - - FirebaseStorage (3.9.1): - - FirebaseCore (~> 6.10) - - GTMSessionFetcher/Core (~> 1.1) + - FirebaseRemoteConfig (7.0.0): + - FirebaseABTesting (~> 7.0) + - FirebaseCore (~> 7.0) + - FirebaseInstallations (~> 7.0) + - GoogleUtilities/Environment (~> 7.0) + - "GoogleUtilities/NSData+zlib (~> 7.0)" + - FirebaseStorage (7.0.0): + - FirebaseCore (~> 7.0) + - GTMSessionFetcher/Core (~> 1.4) - Folly (2018.10.22.00): - boost-for-react-native - DoubleConversion @@ -446,92 +167,68 @@ PODS: - DoubleConversion - glog - glog (0.3.5) - - Google-Mobile-Ads-SDK (7.66.0): - - GoogleAppMeasurement (~> 6.0) + - Google-Mobile-Ads-SDK (7.68.0): + - GoogleAppMeasurement (~> 7.0) - GoogleUserMessagingPlatform (~> 1.1) - - GoogleAPIClientForREST/Core (1.4.3): + - GoogleAPIClientForREST/Core (1.5.1): - GTMSessionFetcher (>= 1.1.7) - - GoogleAPIClientForREST/Vision (1.4.3): + - GoogleAPIClientForREST/Vision (1.5.1): - GoogleAPIClientForREST/Core - GTMSessionFetcher (>= 1.1.7) - - GoogleAppMeasurement (6.9.0): - - GoogleUtilities/AppDelegateSwizzler (~> 6.7) - - GoogleUtilities/MethodSwizzler (~> 6.7) - - GoogleUtilities/Network (~> 6.7) - - "GoogleUtilities/NSData+zlib (~> 6.7)" - - nanopb (~> 1.30906.0) - - GoogleDataTransport (7.5.1): - - nanopb (~> 1.30906.0) - - GoogleToolboxForMac/DebugUtils (2.2.2): - - GoogleToolboxForMac/Defines (= 2.2.2) - - GoogleToolboxForMac/Defines (2.2.2) - - GoogleToolboxForMac/Logger (2.2.2): - - GoogleToolboxForMac/Defines (= 2.2.2) - - "GoogleToolboxForMac/NSData+zlib (2.2.2)": - - GoogleToolboxForMac/Defines (= 2.2.2) - - "GoogleToolboxForMac/NSDictionary+URLArguments (2.2.2)": - - GoogleToolboxForMac/DebugUtils (= 2.2.2) - - GoogleToolboxForMac/Defines (= 2.2.2) - - "GoogleToolboxForMac/NSString+URLArguments (= 2.2.2)" - - "GoogleToolboxForMac/NSString+URLArguments (2.2.2)" - - GoogleUserMessagingPlatform (1.2.0) - - GoogleUtilities/AppDelegateSwizzler (6.7.2): + - GoogleAppMeasurement (7.0.0): + - GoogleUtilities/AppDelegateSwizzler (~> 7.0) + - GoogleUtilities/MethodSwizzler (~> 7.0) + - GoogleUtilities/Network (~> 7.0) + - "GoogleUtilities/NSData+zlib (~> 7.0)" + - nanopb (~> 2.30906.0) + - GoogleDataTransport (8.0.1): + - nanopb (~> 2.30906.0) + - GoogleToolboxForMac/DebugUtils (2.3.0): + - GoogleToolboxForMac/Defines (= 2.3.0) + - GoogleToolboxForMac/Defines (2.3.0) + - GoogleToolboxForMac/Logger (2.3.0): + - GoogleToolboxForMac/Defines (= 2.3.0) + - "GoogleToolboxForMac/NSData+zlib (2.3.0)": + - GoogleToolboxForMac/Defines (= 2.3.0) + - "GoogleToolboxForMac/NSDictionary+URLArguments (2.3.0)": + - GoogleToolboxForMac/DebugUtils (= 2.3.0) + - GoogleToolboxForMac/Defines (= 2.3.0) + - "GoogleToolboxForMac/NSString+URLArguments (= 2.3.0)" + - "GoogleToolboxForMac/NSString+URLArguments (2.3.0)" + - GoogleUserMessagingPlatform (1.3.0) + - GoogleUtilities/AppDelegateSwizzler (7.1.0): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (6.7.2): + - GoogleUtilities/Environment (7.1.0): - PromisesObjC (~> 1.2) - - GoogleUtilities/ISASwizzler (6.7.2) - - GoogleUtilities/Logger (6.7.2): + - GoogleUtilities/ISASwizzler (7.1.0) + - GoogleUtilities/Logger (7.1.0): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (6.7.2): + - GoogleUtilities/MethodSwizzler (7.1.0): - GoogleUtilities/Logger - - GoogleUtilities/Network (6.7.2): + - GoogleUtilities/Network (7.1.0): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (6.7.2)" - - GoogleUtilities/Reachability (6.7.2): + - "GoogleUtilities/NSData+zlib (7.1.0)" + - GoogleUtilities/Reachability (7.1.0): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (6.7.2): + - GoogleUtilities/UserDefaults (7.1.0): - GoogleUtilities/Logger - - "gRPC-C++ (1.28.2)": - - "gRPC-C++/Implementation (= 1.28.2)" - - "gRPC-C++/Interface (= 1.28.2)" - - "gRPC-C++/Implementation (1.28.2)": - - abseil/container/inlined_vector (= 0.20200225.0) - - abseil/memory/memory (= 0.20200225.0) - - abseil/strings/str_format (= 0.20200225.0) - - abseil/strings/strings (= 0.20200225.0) - - abseil/types/optional (= 0.20200225.0) - - "gRPC-C++/Interface (= 1.28.2)" - - gRPC-Core (= 1.28.2) - - "gRPC-C++/Interface (1.28.2)" - - gRPC-Core (1.28.2): - - gRPC-Core/Implementation (= 1.28.2) - - gRPC-Core/Interface (= 1.28.2) - - gRPC-Core/Implementation (1.28.2): - - abseil/container/inlined_vector (= 0.20200225.0) - - abseil/memory/memory (= 0.20200225.0) - - abseil/strings/str_format (= 0.20200225.0) - - abseil/strings/strings (= 0.20200225.0) - - abseil/types/optional (= 0.20200225.0) - - BoringSSL-GRPC (= 0.0.7) - - gRPC-Core/Interface (= 1.28.2) - - gRPC-Core/Interface (1.28.2) - - GTMSessionFetcher (1.4.0): - - GTMSessionFetcher/Full (= 1.4.0) - - GTMSessionFetcher/Core (1.4.0) - - GTMSessionFetcher/Full (1.4.0): - - GTMSessionFetcher/Core (= 1.4.0) + - GTMSessionFetcher (1.5.0): + - GTMSessionFetcher/Full (= 1.5.0) + - GTMSessionFetcher/Core (1.5.0) + - GTMSessionFetcher/Full (1.5.0): + - GTMSessionFetcher/Core (= 1.5.0) - Jet (0.6.6-0): - React - leveldb-library (1.22) - - nanopb (1.30906.0): - - nanopb/decode (= 1.30906.0) - - nanopb/encode (= 1.30906.0) - - nanopb/decode (1.30906.0) - - nanopb/encode (1.30906.0) + - nanopb (2.30906.0): + - nanopb/decode (= 2.30906.0) + - nanopb/encode (= 2.30906.0) + - nanopb/decode (2.30906.0) + - nanopb/encode (2.30906.0) - PersonalizedAdConsent (1.0.5) - PromisesObjC (1.2.11) - Protobuf (3.13.0) @@ -757,81 +454,70 @@ PODS: - React-cxxreact (= 0.62.2) - React-jsi (= 0.62.2) - ReactCommon/callinvoker (= 0.62.2) - - RNFBAdMob (7.6.9): - - Firebase/AdMob (= 6.34.0) + - RNFBAdMob (7.6.10): + - Firebase/AdMob (= 7.0.0) - PersonalizedAdConsent (~> 1.0.4) - React-Core - RNFBApp - - RNFBAnalytics (7.6.8): - - Firebase/Analytics (= 6.34.0) + - RNFBAnalytics (7.6.10): + - Firebase/Analytics (= 7.0.0) - React-Core - RNFBApp - - RNFBApp (8.4.6): - - Firebase/CoreOnly (= 6.34.0) + - RNFBApp (8.4.7): + - Firebase/CoreOnly (= 7.0.0) - React-Core - - RNFBAuth (9.3.1): - - Firebase/Auth (= 6.34.0) + - RNFBAuth (9.3.3): + - Firebase/Auth (= 7.0.0) - React-Core - RNFBApp - - RNFBCrashlytics (8.4.11): - - Firebase/Crashlytics (= 6.34.0) + - RNFBCrashlytics (8.5.0): + - Firebase/Crashlytics (= 7.0.0) - React-Core - RNFBApp - - RNFBDatabase (7.5.12): - - Firebase/Database (= 6.34.0) + - RNFBDatabase (7.5.13): + - Firebase/Database (= 7.0.0) - React-Core - RNFBApp - - RNFBDynamicLinks (7.5.10): - - Firebase/DynamicLinks (= 6.34.0) + - RNFBDynamicLinks (7.5.11): + - Firebase/DynamicLinks (= 7.0.0) - GoogleUtilities/AppDelegateSwizzler - React-Core - RNFBApp - - RNFBFirestore (7.8.7): - - Firebase/Firestore (= 6.34.0) + - RNFBFirestore (7.10.0): + - Firebase/Firestore (= 7.0.0) - React-Core - RNFBApp - - RNFBFunctions (7.4.9): - - Firebase/Functions (= 6.34.0) + - RNFBFunctions (7.4.10): + - Firebase/Functions (= 7.0.0) - React-Core - RNFBApp - - RNFBIid (7.4.9): - - Firebase/CoreOnly (= 6.34.0) + - RNFBIid (7.4.10): + - Firebase/CoreOnly (= 7.0.0) - FirebaseInstanceID - React-Core - RNFBApp - - RNFBInAppMessaging (7.5.7): - - Firebase/InAppMessaging (= 6.34.0) + - RNFBInAppMessaging (7.5.8): + - Firebase/InAppMessaging (= 7.0.0) - React-Core - RNFBApp - - RNFBMessaging (7.9.1): - - Firebase/Messaging (= 6.34.0) + - RNFBMessaging (7.9.2): + - Firebase/Messaging (= 7.0.0) - React-Core - RNFBApp - - RNFBMLNaturalLanguage (7.4.9): - - Firebase/MLCommon (= 6.34.0) - - Firebase/MLNaturalLanguage (= 6.34.0) - - Firebase/MLNLLanguageID (= 6.34.0) - - Firebase/MLNLSmartReply (= 6.34.0) + - RNFBML (7.4.13): + - Firebase/MLVision (= 7.0.0) - React-Core - RNFBApp - - RNFBMLVision (7.4.11): - - Firebase/MLVision (= 6.34.0) - - Firebase/MLVisionBarcodeModel (= 6.34.0) - - Firebase/MLVisionFaceModel (= 6.34.0) - - Firebase/MLVisionLabelModel (= 6.34.0) - - Firebase/MLVisionTextModel (= 6.34.0) + - RNFBPerf (7.4.10): + - Firebase/Performance (= 7.0.0) - React-Core - RNFBApp - - RNFBPerf (7.4.9): - - Firebase/Performance (= 6.34.0) + - RNFBRemoteConfig (9.0.12): + - Firebase/RemoteConfig (= 7.0.0) - React-Core - RNFBApp - - RNFBRemoteConfig (9.0.11): - - Firebase/RemoteConfig (= 6.34.0) - - React-Core - - RNFBApp - - RNFBStorage (7.4.10): - - Firebase/Storage (= 6.34.0) + - RNFBStorage (7.4.12): + - Firebase/Storage (= 7.0.0) - React-Core - RNFBApp - Yoga (1.14.0) @@ -840,6 +526,7 @@ DEPENDENCIES: - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`) + - FirebaseFirestore (from `https://github.com/invertase/firestore-ios-sdk-frameworks.git`, branch `master`) - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - Jet (from `../node_modules/jet/ios`) @@ -877,8 +564,7 @@ DEPENDENCIES: - RNFBIid (from `../../packages/iid`) - RNFBInAppMessaging (from `../../packages/in-app-messaging`) - RNFBMessaging (from `../../packages/messaging`) - - RNFBMLNaturalLanguage (from `../../packages/ml-natural-language`) - - RNFBMLVision (from `../../packages/ml-vision`) + - RNFBML (from `../../packages/ml`) - RNFBPerf (from `../../packages/perf`) - RNFBRemoteConfig (from `../../packages/remote-config`) - RNFBStorage (from `../../packages/storage`) @@ -886,9 +572,7 @@ DEPENDENCIES: SPEC REPOS: trunk: - - abseil - boost-for-react-native - - BoringSSL-GRPC - Firebase - FirebaseABTesting - FirebaseAnalytics @@ -898,21 +582,13 @@ SPEC REPOS: - FirebaseCrashlytics - FirebaseDatabase - FirebaseDynamicLinks - - FirebaseFirestore - FirebaseFunctions - FirebaseInAppMessaging - FirebaseInstallations - FirebaseInstanceID - FirebaseMessaging - FirebaseMLCommon - - FirebaseMLNaturalLanguage - - FirebaseMLNLLanguageID - - FirebaseMLNLSmartReply - FirebaseMLVision - - FirebaseMLVisionBarcodeModel - - FirebaseMLVisionFaceModel - - FirebaseMLVisionLabelModel - - FirebaseMLVisionTextModel - FirebasePerformance - FirebaseRemoteConfig - FirebaseStorage @@ -923,8 +599,6 @@ SPEC REPOS: - GoogleToolboxForMac - GoogleUserMessagingPlatform - GoogleUtilities - - "gRPC-C++" - - gRPC-Core - GTMSessionFetcher - leveldb-library - nanopb @@ -939,6 +613,9 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/Libraries/FBLazyVector" FBReactNativeSpec: :path: "../node_modules/react-native/Libraries/FBReactNativeSpec" + FirebaseFirestore: + :branch: master + :git: https://github.com/invertase/firestore-ios-sdk-frameworks.git Folly: :podspec: "../node_modules/react-native/third-party-podspecs/Folly.podspec" glog: @@ -1007,10 +684,8 @@ EXTERNAL SOURCES: :path: "../../packages/in-app-messaging" RNFBMessaging: :path: "../../packages/messaging" - RNFBMLNaturalLanguage: - :path: "../../packages/ml-natural-language" - RNFBMLVision: - :path: "../../packages/ml-vision" + RNFBML: + :path: "../../packages/ml" RNFBPerf: :path: "../../packages/perf" RNFBRemoteConfig: @@ -1020,55 +695,49 @@ EXTERNAL SOURCES: Yoga: :path: "../node_modules/react-native/ReactCommon/yoga" +CHECKOUT OPTIONS: + FirebaseFirestore: + :commit: 3d712e901b44cb4ca509844356040a2cb61ddf5a + :git: https://github.com/invertase/firestore-ios-sdk-frameworks.git + SPEC CHECKSUMS: - abseil: 6c8eb7892aefa08d929b39f9bb108e5367e3228f boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c - BoringSSL-GRPC: 8edf627ee524575e2f8d19d56f068b448eea3879 DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2 FBLazyVector: 4aab18c93cd9546e4bfed752b4084585eca8b245 FBReactNativeSpec: 5465d51ccfeecb7faa12f9ae0024f2044ce4044e - Firebase: c23a36d9e4cdf7877dfcba8dd0c58add66358999 - FirebaseABTesting: 8a9d8df3acc2b43f4a22014ddf9f601bca6af699 - FirebaseAnalytics: 3bb096873ee0d7fa4b6c70f5e9166b6da413cc7f - FirebaseAuth: c92d49ada7948d1a23466e3db17bc4c2039dddc3 - FirebaseCore: d3a978a3cfa3240bf7e4ba7d137fdf5b22b628ec - FirebaseCoreDiagnostics: 770ac5958e1372ce67959ae4b4f31d8e127c3ac1 - FirebaseCrashlytics: 1a747c9cc084a24dc6d9511c991db1cd078154eb - FirebaseDatabase: 13a865a4b85897462b930eb683bda8f52583713f - FirebaseDynamicLinks: 6eac37d86910382eafb6315d952cc44c9e176094 - FirebaseFirestore: 9b2f1b9b9a6f2f0b6fb7484b9e32ab7e39243554 - FirebaseFunctions: 27518fdd14d8b3a849e2443f921cd1b471ab7acd - FirebaseInAppMessaging: 9da48721c6ad1b5bdc2b1108f2d3d561eb2245ca - FirebaseInstallations: 466c7b4d1f58fe16707693091da253726a731ed2 - FirebaseInstanceID: bd3ffc24367f901a43c063b36c640b345a4a5dd1 - FirebaseMessaging: 5eca4ef173de76253352511aafef774caa1cba2a - FirebaseMLCommon: d218d75dd1c6c4e447f731ac22da56b88cb79431 - FirebaseMLNaturalLanguage: 32cccde63dfdf82341d570b3d4b24e746303d4cd - FirebaseMLNLLanguageID: 1adfdf439843d836e8d741c5124b97ebac645334 - FirebaseMLNLSmartReply: 046bdc30bddbfbead3f5cbca97f28a26a316d346 - FirebaseMLVision: 68dd092b4c52a7ac163ec0d4f541d5711fc9fec6 - FirebaseMLVisionBarcodeModel: 394cd61c52dc03558088caf82b0dade8028f57d5 - FirebaseMLVisionFaceModel: a67b2bf9b8407127a0bdb0ba98eb265637d1dc9d - FirebaseMLVisionLabelModel: c6922e607cf4549b14981c80bf0d69eb51a2b547 - FirebaseMLVisionTextModel: e9f3cba0f31022ae9dd3d246aff9849075cacd98 - FirebasePerformance: e325a8ee84a6a3d89c0be049390ed6c1775cce22 - FirebaseRemoteConfig: 35a729305f254fb15a2e541d4b36f3a379da7fdc - FirebaseStorage: 15e0f15ef3c7fec3d1899d68623e47d4447066b4 + Firebase: 50be68416f50eb4eb2ecb0e78acab9a051ef95df + FirebaseABTesting: aaea04ea67858a4a9dce0d22ef645477dff50146 + FirebaseAnalytics: c1166b7990bae464c6436132510bb718c6680f80 + FirebaseAuth: 228dd0faa5b5263eaa8c63518b16faef438289a3 + FirebaseCore: cf3122185fce1cf71cedbbc498ea84d2b3e7cb69 + FirebaseCoreDiagnostics: 872cdb9b749b23346dddd5c1014d1babd2257de3 + FirebaseCrashlytics: bd430b7323e8b49492a93e563e81899d0615f917 + FirebaseDatabase: 2481b48ebfd233ef591095d79d76720ea85cde74 + FirebaseDynamicLinks: 71ed03780db3986e1bd386d6a1be44d09d4cd0ec + FirebaseFirestore: ce5009ceae3e07c96f9cc580d9b521b9ec0af857 + FirebaseFunctions: 571aee227a021debe3e1092aa079f751623e233a + FirebaseInAppMessaging: b4c1ec3ea31d83f762d8087e78ce846159437f39 + FirebaseInstallations: 3de38553e86171b5f81d83cdeef63473d37bfdb0 + FirebaseInstanceID: 61e8d10a4192a582c6239378169d10e504ca8d91 + FirebaseMessaging: ecf9e04716b7ff1f1d92debab4d6f0e6bdb490aa + FirebaseMLCommon: d10d915b2fd1b285f7b80694afa1a65d7fb90f5c + FirebaseMLVision: 39cfe86b963ce9db9216da6630529d3089254b9a + FirebasePerformance: feb172454ef6568c8246d5713b6e65fde9f2e384 + FirebaseRemoteConfig: ff8d3542cbd919c9d3851fd544690b8848fc0402 + FirebaseStorage: ea52bc7a1cb540406ed1e1acfc2bf3946621ed34 Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51 glog: 1f3da668190260b06b429bb211bfbee5cd790c28 - Google-Mobile-Ads-SDK: 7d7074359c040f5add4e0963bf860e14690060d0 - GoogleAPIClientForREST: e2d95a611ac06a90d143c93bfd8597719f8b0938 - GoogleAppMeasurement: a6a3a066369828db64eda428cb2856dc1cdc7c4e - GoogleDataTransport: f56af7caa4ed338dc8e138a5d7c5973e66440833 - GoogleToolboxForMac: 800648f8b3127618c1b59c7f97684427630c5ea3 - GoogleUserMessagingPlatform: c85530d930ba509583aa5a6d50a10aca22cf8502 - GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3 - "gRPC-C++": 13d8ccef97d5c3c441b7e3c529ef28ebee86fad2 - gRPC-Core: 4afa11bfbedf7cdecd04de535a9e046893404ed5 - GTMSessionFetcher: 6f5c8abbab8a9bce4bb3f057e317728ec6182b10 + Google-Mobile-Ads-SDK: 29bbdb182d69ff606cc0301da1590b40be8d2205 + GoogleAPIClientForREST: 4bb409633efcc2e1b3f945afe7e35039b5a61db2 + GoogleAppMeasurement: 7790ef975d1d463c8614cd949a847e612edf087a + GoogleDataTransport: e4085e6762f36a6141738f46b0153473ce57fb18 + GoogleToolboxForMac: 1350d40e86a76f7863928d63bcb0b89c84c521c5 + GoogleUserMessagingPlatform: 1d4b6946710d18cec34742054092e2c2bddae61f + GoogleUtilities: f734da554aade8cc7928a31c2f3311897933a1bd + GTMSessionFetcher: b3503b20a988c4e20cc189aa798fd18220133f52 Jet: 84fd0e2e9d49457fc04bc79b5d8857737a01c507 leveldb-library: 55d93ee664b4007aac644a782d11da33fba316f7 - nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc + nanopb: 1bf24dd71191072e120b83dd02d08f3da0d65e53 PersonalizedAdConsent: dbecabb3467df967c16d9cebc2ef4a8890e4bbd8 PromisesObjC: 8c196f5a328c2cba3e74624585467a557dcb482f Protobuf: 3dac39b34a08151c6d949560efe3f86134a3f748 @@ -1091,25 +760,24 @@ SPEC CHECKSUMS: React-RCTText: fae545b10cfdb3d247c36c56f61a94cfd6dba41d React-RCTVibration: 4356114dbcba4ce66991096e51a66e61eda51256 ReactCommon: ed4e11d27609d571e7eee8b65548efc191116eb3 - RNFBAdMob: 809f648889201406d333bc28a84bbf3294491f00 - RNFBAnalytics: 159651d6eae3c85db38ba5d694d8c6c46fd3883c - RNFBApp: e0fc0113eecc07f440f17639c9b7c59ea90bc583 - RNFBAuth: 16207757fa69ad50ec8ca04964f59cd560979294 - RNFBCrashlytics: c85d01c3fb3a4cc1e762facb9d4ad26b95f7f9dc - RNFBDatabase: 6c01157824702f4fc1cedf9b4b95e9f3154cfbf1 - RNFBDynamicLinks: 067d7419d8daf58b61faa70834b051410d5f6d4b - RNFBFirestore: 64986e129f4980e73b6e510684286d986367bef6 - RNFBFunctions: ae7a279090e902cdf4da7890d64f31a0e4e2a825 - RNFBIid: f40ac75229f8bb86cc6dd0c71b450e7df693f8f3 - RNFBInAppMessaging: dda5e571edd579042fa1d68a685012daa871a3f6 - RNFBMessaging: 1d2a6a249cf6b93bed1721befc42650c45615112 - RNFBMLNaturalLanguage: 3662457b2e95b857bb9289d250b0a10bc10aca84 - RNFBMLVision: c2547c24b59298ebe4b90a2025600d60a6929930 - RNFBPerf: 0c08e45726f7a19487b79cef3d12ee7e917c8b7a - RNFBRemoteConfig: 85df9235f46c20e293257b6e481412ac585e2966 - RNFBStorage: 72404d4977261c0d7060e87c3d0cf7f7e060c6a3 + RNFBAdMob: 9fde71cdebb34b76c3563058b262838f3865f037 + RNFBAnalytics: 20e6ac03857cab32df4511c41dbcac003cb1068a + RNFBApp: 28ebef9ae3051c4715c1e2397a5e9614f2ca8ffb + RNFBAuth: ce4d1e530ad01f460fa0a33e2dc7f95b41d0fc85 + RNFBCrashlytics: 9fb5e40ec1f07d04b4be21452d1caf5ed94ca3cc + RNFBDatabase: f0d3d475f1c13c4d166ec946db4e3416dcd40422 + RNFBDynamicLinks: 139d1cdf94467cb032050e32b95e9a2839f96f47 + RNFBFirestore: c011591967b4dc15dd881a51500f5547f98939e7 + RNFBFunctions: 442d72e42892dc6f6aa440080e10c46fdc488354 + RNFBIid: de74265f2b4becca364dadbdfae969db26ba0889 + RNFBInAppMessaging: 45729ef53490ebf9f82aea6829212ebcd9b61888 + RNFBMessaging: 15c6fc8a5d000fe6f6d171c8b7513acf88261f08 + RNFBML: 40bf23115d6a7b2648ffde19788cca83691d51a4 + RNFBPerf: c10267695cbc2012167b063a3c86a436d296b5b6 + RNFBRemoteConfig: 6615b43b44dff4e5b70378ad2d28fb35387ecd48 + RNFBStorage: 85c103535ef5aef331c7e99d8e9953189c8e3bba Yoga: 3ebccbdd559724312790e7742142d062476b698e -PODFILE CHECKSUM: 2b670e97319c5057f900292e8500c4c38d83aa3c +PODFILE CHECKSUM: 422b670abe2e89213edbefb2e24475c616f0b76e COCOAPODS: 1.10.0 diff --git a/tests/ios/testing.xcodeproj/project.pbxproj b/tests/ios/testing.xcodeproj/project.pbxproj index 94031f75225..dedcd9a23dd 100644 --- a/tests/ios/testing.xcodeproj/project.pbxproj +++ b/tests/ios/testing.xcodeproj/project.pbxproj @@ -324,6 +324,10 @@ buildActionMask = 2147483647; files = ( ); + inputPaths = ( + "${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Resources/DWARF/${TARGET_NAME}", + "$(SRCROOT)/$(BUILT_PRODUCTS_DIR)/$(INFOPLIST_PATH)", + ); name = "[CP-User] [RNFB] Crashlytics Configuration"; runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; diff --git a/tests/package.json b/tests/package.json index 1bd5b15ca31..657f2187678 100644 --- a/tests/package.json +++ b/tests/package.json @@ -20,8 +20,7 @@ "@react-native-firebase/iid": "7.4.10", "@react-native-firebase/in-app-messaging": "7.5.8", "@react-native-firebase/messaging": "7.9.2", - "@react-native-firebase/ml-natural-language": "7.4.11", - "@react-native-firebase/ml-vision": "7.4.13", + "@react-native-firebase/ml": "7.4.13", "@react-native-firebase/perf": "7.4.10", "@react-native-firebase/remote-config": "9.0.12", "@react-native-firebase/storage": "7.4.12", diff --git a/website/scripts/source-reference.js b/website/scripts/source-reference.js index 8a326aa7a14..41125b76256 100644 --- a/website/scripts/source-reference.js +++ b/website/scripts/source-reference.js @@ -163,18 +163,16 @@ function moduleNameToFullName(name) { return 'Instance ID'; case 'in-app-messaging': return 'In-App Messaging'; - case 'ml-natural-language': - return 'ML Kit Natural Language'; case 'messaging': return 'Cloud Messaging'; - case 'perf': + case 'ml': + return 'ML'; + case 'perf': return 'Performance Monitoring'; case 'remote-config': return 'Remote Config'; case 'storage': return 'Storage'; - case 'ml-vision': - return 'ML Kit Vision'; case 'app': return 'Core/App'; default: diff --git a/website/src/templates/utils.ts b/website/src/templates/utils.ts index 67d140d146d..095770405ac 100644 --- a/website/src/templates/utils.ts +++ b/website/src/templates/utils.ts @@ -45,11 +45,7 @@ function iconForModule(module: string): string { return '//static.invertase.io/assets/firebase/dynamic-links.svg'; case 'in-app-messaging': return '//static.invertase.io/assets/firebase/in-app-messaging.svg'; - case 'ml-natural-language': - return '//static.invertase.io/assets/firebase/ml-kit.svg'; - case 'ml-language': - return '//static.invertase.io/assets/firebase/ml-kit.svg'; - case 'ml-vision': + case 'ml': return '//static.invertase.io/assets/firebase/ml-kit.svg'; case 'remote-config': return '//static.invertase.io/assets/firebase/remote-config.svg'; From 79c1f801965f74f9fc0233c96f05db103e9f8e84 Mon Sep 17 00:00:00 2001 From: Mike Hardy Date: Mon, 9 Nov 2020 11:42:52 -0500 Subject: [PATCH 16/16] fix(tests, emulator): centralize startup, correct CWD --- .../scripts/start-firestore-emulator.sh | 18 +++++++++++------- .github/workflows/tests_e2e.yml | 4 ++-- package.json | 3 ++- packages/app/e2e/config.e2e.js | 11 +++++------ 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/.github/workflows/scripts/start-firestore-emulator.sh b/.github/workflows/scripts/start-firestore-emulator.sh index bb487fb0150..a6b8959e6ad 100644 --- a/.github/workflows/scripts/start-firestore-emulator.sh +++ b/.github/workflows/scripts/start-firestore-emulator.sh @@ -4,11 +4,15 @@ if ! [ -x "$(command -v firebase)" ]; then exit 1 fi -firebase emulators:start --only firestore & +EMU_START_COMMAND="firebase emulators:start --only firestore" -until curl --output /dev/null --silent --fail http://localhost:8080; do - echo "Waiting for Firestore emulator to come online..." - sleep 2 -done - -echo "Firestore emulator is online!" \ No newline at end of file +if [ "$1" == "--no-daemon" ]; then + $EMU_START_COMMAND +else + $EMU_START_COMMAND & + until curl --output /dev/null --silent --fail http://localhost:8080; do + echo "Waiting for Firestore emulator to come online..." + sleep 2 + done + echo "Firestore emulator is online!" +fi \ No newline at end of file diff --git a/.github/workflows/tests_e2e.yml b/.github/workflows/tests_e2e.yml index 7042a059655..b0d2c2134f8 100644 --- a/.github/workflows/tests_e2e.yml +++ b/.github/workflows/tests_e2e.yml @@ -51,7 +51,7 @@ jobs: command: npm i -g firebase-tools - name: Start Firestore Emulator - run: cd ./.github/workflows/scripts && sh ./start-firestore-emulator.sh + run: yarn tests:emulator:start-ci - name: Get yarn cache directory path id: yarn-cache-dir-path @@ -225,7 +225,7 @@ jobs: command: npm i -g firebase-tools - name: Start Firestore Emulator - run: cd ./.github/workflows/scripts && sh ./start-firestore-emulator.sh + run: yarn tests:emulator:start-ci - name: Get Xcode version id: xcode-version diff --git a/package.json b/package.json index 65ca9f20d87..4d928ed5533 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,8 @@ "tests:packager:chrome": "cd tests && node_modules/.bin/react-native start --reset-cache", "tests:packager:jet": "cd tests && cross-env REACT_DEBUGGER=\"echo nope\" node_modules/.bin/react-native start --no-interactive", "tests:packager:jet-reset-cache": "cd tests && cross-env REACT_DEBUGGER=\"echo nope\" node_modules/.bin/react-native start --reset-cache --no-interactive", - "tests:emulator:start": "./tests/node_modules/.bin/firebase emulators:start --only firestore", + "tests:emulator:start": "cd ./.github/workflows/scripts && sh ./start-firestore-emulator.sh --no-daemon", + "tests:emulator:start-ci": "cd ./.github/workflows/scripts && sh ./start-firestore-emulator.sh", "tests:android:build": "cd tests && ./node_modules/.bin/detox build --configuration android.emu.debug", "tests:android:build-release": "cd tests && ./node_modules/.bin/detox build --configuration android.emu.release", "tests:android:test": "cd tests && ./node_modules/.bin/detox test --configuration android.emu.debug", diff --git a/packages/app/e2e/config.e2e.js b/packages/app/e2e/config.e2e.js index 19cf02348bd..fd62a9f708f 100644 --- a/packages/app/e2e/config.e2e.js +++ b/packages/app/e2e/config.e2e.js @@ -40,12 +40,11 @@ describe('config', () => { }); // NOTE: "preferencesClearAll" clears Firestore settings. Set DB as emulator again. - // FIXME if we use the emulator, then we never throw errors because firestore rules are permissive, that causes test failure - // after(async () => { - // await firebase - // .firestore() - // .settings({ host: 'localhost:8080', ssl: false, persistence: true }); - // }); + after(async () => { + await firebase + .firestore() + .settings({ host: 'localhost:8080', ssl: false, persistence: true }); + }); it('should set bool values', async () => { const prefsBefore = await NativeModules.RNFBAppModule.preferencesGetAll();