From 137df5b3cd647d22178132823a5697f170c5df65 Mon Sep 17 00:00:00 2001 From: ElenaDiachenko Date: Wed, 13 Mar 2024 10:03:14 +0200 Subject: [PATCH 1/6] add PhotoEditor for android --- .../app-harness/appConfigs/base/renative.json | 3 +- packages/app-harness/package.json | 6 ++- packages/app-harness/renative.json | 18 +++++-- packages/app-harness/src/app/index.tsx | 18 +++++++ .../components/PhotoEditor/index.mobile.tsx | 37 +++++++++++++ .../src/components/PhotoEditor/index.tsx | 13 +++++ .../templates/platforms/android/build.gradle | 11 ++++ yarn.lock | 52 +++++++++++++++++-- 8 files changed, 145 insertions(+), 13 deletions(-) create mode 100644 packages/app-harness/src/components/PhotoEditor/index.mobile.tsx create mode 100644 packages/app-harness/src/components/PhotoEditor/index.tsx diff --git a/packages/app-harness/appConfigs/base/renative.json b/packages/app-harness/appConfigs/base/renative.json index e4f34ea3c6..368945c054 100644 --- a/packages/app-harness/appConfigs/base/renative.json +++ b/packages/app-harness/appConfigs/base/renative.json @@ -31,8 +31,7 @@ "{{resolvePackage(react-native-vector-icons)}}/Fonts" ], "excludedPlugins": [ - "@react-native-firebase/app", - "react-native-photo-editor" + "@react-native-firebase/app" ] }, "platforms": { diff --git a/packages/app-harness/package.json b/packages/app-harness/package.json index cc730db425..0161660568 100644 --- a/packages/app-harness/package.json +++ b/packages/app-harness/package.json @@ -53,10 +53,12 @@ "react-native-gesture-handler": "2.14.1", "react-native-orientation-locker": "1.5.0", "react-native-permissions": "4.1.4", - "react-native-photo-editor": "1.0.13", + "react-native-photo-editor": "https://github.com/AppGyver/react-native-photo-editor", "react-native-splash-screen": "3.3.0", "react-native-tvos": "0.73.1-3", - "react-native-web": "0.19.9" + "react-native-web": "0.19.9", + "react-native-fs": "2.20.0", + "rn-fetch-blob": "0.12.0" }, "devDependencies": { "@flexn/assets-renative-outline": "0.3.3", diff --git a/packages/app-harness/renative.json b/packages/app-harness/renative.json index 57f4113220..0df05f82ba 100644 --- a/packages/app-harness/renative.json +++ b/packages/app-harness/renative.json @@ -129,13 +129,15 @@ "package": "ui.photoeditor.RNPhotoEditorPackage" }, "ios": { - "podName": "iOSPhotoEditor", - "git": "https://github.com/prscX/photo-editor", - "commit": "4924e9ec984d25d03644e58aa148282642171de9", - "buildType": "dynamic" + "templateXcode": { + "Podfile": { + "post_install": [] + } + }, + "podName": "RNPhotoEditor" }, "pluginDependencies": null, - "version": "1.0.13" + "version": "https://github.com/AppGyver/react-native-photo-editor" }, "react-native-permissions": { "ios": { @@ -214,6 +216,12 @@ }, "NSContactsUsageDescription": { "desc": "Contacts usage description" + }, + "NSPhotoLibraryAddUsageDescription": { + "desc": "Application needs permission to write photos..." + }, + "NSPhotoLibraryUsageDescription": { + "desc": "iOS 10 needs permission to write photos..." } } } diff --git a/packages/app-harness/src/app/index.tsx b/packages/app-harness/src/app/index.tsx index 7656e294cf..fd04198091 100644 --- a/packages/app-harness/src/app/index.tsx +++ b/packages/app-harness/src/app/index.tsx @@ -13,6 +13,7 @@ import { TestCase } from '../components/TestCase'; import config from '../../package.json'; import { LoggerProvider, useLoggerContext } from '../context'; import { NotificationCallback } from '../components/types'; +import { PhotoEditorButton } from '../components/PhotoEditor'; const App = () => ( @@ -104,6 +105,23 @@ const AppContent = () => {