Merge branch 'dev'

uiwjs · Apr 18, 2023 · eaa284d · eaa284d
2 parents 1d01287 + 1e77259
commit eaa284d
Show file tree

Hide file tree

Showing 219 changed files with 7,813 additions and 3,934 deletions.
diff --git a/.github/workflows/build_ios_app.yml b/.github/workflows/build_ios_app.yml
@@ -9,10 +9,10 @@ jobs:
   build:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 16
 
       - run: yarn install
       - run: npm run build

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,11 +12,10 @@ jobs:
   build-deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: 16
-          registry-url: 'https://registry.npmjs.org'
 
       - run: yarn install
       - run: npm run build
@@ -70,6 +69,13 @@ jobs:
         env:
           NODE_AUTH_TOKEN: '${{ secrets.NPM_TOKEN }}'
 
+       - name: 📦 @uiw/react-native-image-picker publish to NPM
+        run: npm publish
+        working-directory: packages/react-native-image-picker
+        continue-on-error: true
+        env:
+          NODE_AUTH_TOKEN: '${{ secrets.NPM_TOKEN }}'
+
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3
         with:

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -8,12 +8,12 @@ env:
 
 jobs:
   build-deploy:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 16
 
       - run: yarn install
       - run: npm run build

diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 
 doc
 lib
+lib2
 esm
 
 ### Node ###

diff --git a/example/base/ios/Podfile b/example/base/ios/Podfile
@@ -31,7 +31,14 @@ target 'AwesomeProject' do
   use_flipper!()
 
   post_install do |installer|
-    react_native_post_install(installer)
+    installer.pods_project.targets.each do |target|
+      target.build_configurations.each do |config|
+        config.build_settings['SWIFT_VERSION'] = '5.0'
+        if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] < '12.4'
+          config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.4'
+        end
+      end
+    end
     __apply_Xcode_12_5_M1_post_install_workaround(installer)
   end
 end
diff --git a/example/base/metro.config.js b/example/base/metro.config.js
@@ -10,6 +10,7 @@ module.exports = {
   resolver: {
     extraNodeModules: {
       '@uiw/react-native': path.resolve(`${__dirname}/lib/`),
+      '@uiw/react-native-image-picker': path.resolve(`${__dirname}/lib2/`),
       // '@uiw/react-native': path.resolve(`${__dirname}/../../packages/core/`),
       // 'react-native-svg': path.resolve(
       //   `${__dirname}/../../node_modules/react-native-svg/`,

diff --git a/example/base/package.json b/example/base/package.json
@@ -10,10 +10,16 @@
     "lint": "eslint ."
   },
   "dependencies": {
-    "@uiw/react-native": "3.2.3",
     "react": "18.0.0",
     "react-native": "0.69.7",
-    "react-native-svg": "12.1.1"
+    "@uiw/react-native": "3.2.3",
+    "@uiw/react-native-image-picker": "3.2.3",
+    "react-native-svg": "13.0.0",
+    "react-native-gesture-handler": "2.8.0",
+    "react-native-root-siblings": "4.1.1",
+    "react-native-image-picker": "^5.3.1",
+    "react-native-image-viewing": "~0.2.2",
+    "@react-native-camera-roll/camera-roll": "5.3.1"
   },
   "devDependencies": {
     "@babel/core": "~7.20.7",

diff --git a/example/examples/android/app/src/main/AndroidManifest.xml b/example/examples/android/app/src/main/AndroidManifest.xml
@@ -2,14 +2,20 @@
   package="com.examples">
 
     <uses-permission android:name="android.permission.INTERNET" />
-
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <application
       android:name=".MainApplication"
       android:label="@string/app_name"
       android:icon="@mipmap/ic_launcher"
       android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
-      android:theme="@style/AppTheme">
+      android:theme="@style/AppTheme"
+      android:requestLegacyExternalStorage="true"
+      android:usesCleartextTraffic="true"
+    >
       <activity
         android:name=".MainActivity"
         android:label="@string/app_name"

diff --git a/example/examples/ios/Podfile b/example/examples/ios/Podfile
@@ -31,7 +31,14 @@ target 'examples' do
   use_flipper!()
 
   post_install do |installer|
-    react_native_post_install(installer)
+    installer.pods_project.targets.each do |target|
+      target.build_configurations.each do |config|
+        config.build_settings['SWIFT_VERSION'] = '5.0'
+        if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] < '12.4'
+          config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.4'
+        end
+      end
+    end
     __apply_Xcode_12_5_M1_post_install_workaround(installer)
   end
 end
diff --git a/example/examples/ios/Podfile.lock b/example/examples/ios/Podfile.lock
@@ -284,6 +284,10 @@ PODS:
   - React-jsinspector (0.69.7)
   - React-logger (0.69.7):
     - glog
+  - react-native-cameraroll (5.3.1):
+    - React-Core
+  - react-native-image-picker (5.3.1):
+    - React-Core
   - react-native-safe-area-context (4.3.4):
     - RCT-Folly
     - RCTRequired
@@ -413,6 +417,8 @@ DEPENDENCIES:
   - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
   - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
   - React-logger (from `../node_modules/react-native/ReactCommon/logger`)
+  - "react-native-cameraroll (from `../node_modules/@react-native-camera-roll/camera-roll`)"
+  - react-native-image-picker (from `../node_modules/react-native-image-picker`)
   - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
   - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`)
   - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
@@ -489,6 +495,10 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/jsinspector"
   React-logger:
     :path: "../node_modules/react-native/ReactCommon/logger"
+  react-native-cameraroll:
+    :path: "../node_modules/@react-native-camera-roll/camera-roll"
+  react-native-image-picker:
+    :path: "../node_modules/react-native-image-picker"
   react-native-safe-area-context:
     :path: "../node_modules/react-native-safe-area-context"
   React-perflogger:
@@ -559,6 +569,8 @@ SPEC CHECKSUMS:
   React-jsiexecutor: a73bec0218ba959fc92f811b581ad6c2270c6b6f
   React-jsinspector: 8134ee22182b8dd98dc0973db6266c398103ce6c
   React-logger: 1e7ac909607ee65fd5c4d8bea8c6e644f66b8843
+  react-native-cameraroll: f3050460fe1708378698c16686bfaa5f34099be2
+  react-native-image-picker: ec9b713e248760bfa0f879f0715391de4651a7cb
   react-native-safe-area-context: dfe5aa13bee37a0c7e8059d14f72ffc076d120e9
   React-perflogger: 8e832d4e21fdfa613033c76d58d7e617341e804b
   React-RCTActionSheet: 9ca778182a9523991bff6381045885b6e808bb73
@@ -580,6 +592,6 @@ SPEC CHECKSUMS:
   Yoga: 0b84a956f7393ef1f37f3bb213c516184e4a689d
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
-PODFILE CHECKSUM: 36745b97236db17730b2d687b78fe071003a4a52
+PODFILE CHECKSUM: d4d2826c3f25f928be9b489778a443d49118b6c5
 
 COCOAPODS: 1.11.3
diff --git a/example/examples/ios/examples/Info.plist b/example/examples/ios/examples/Info.plist
@@ -35,6 +35,10 @@
 			</dict>
 		</dict>
 	</dict>
+	<key>NSCameraUsageDescription</key>
+	<string>This app requires access to the camera.</string>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+	<string>This app requires access to the photo.</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string></string>
 	<key>UILaunchStoryboardName</key>

diff --git a/example/examples/metro.config.js b/example/examples/metro.config.js
@@ -10,6 +10,7 @@ module.exports = {
   resolver: {
     extraNodeModules: {
       '@uiw/react-native': path.resolve(`${__dirname}/lib/`),
+      '@uiw/react-native-image-picker': path.resolve(`${__dirname}/lib2/`),
       // '@uiw/react-native': path.resolve(`${__dirname}/../../packages/core/`),
       // 'react-native-svg': path.resolve(
       //   `${__dirname}/../../node_modules/react-native-svg/`,

diff --git a/example/examples/package.json b/example/examples/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "android": "react-native run-android",
-    "ios": "react-native run-ios",
+    "ios": "react-native run-ios --simulator 'iPhone 14'",
     "start": "react-native start --reset-cache",
     "test": "jest",
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx"
@@ -19,7 +19,11 @@
     "react-native-gesture-handler": "~2.5.0",
     "react-native-safe-area-context": "~4.3.1",
     "react-native-screens": "~3.15.0",
-    "react-native-svg": "12.1.1"
+    "react-native-svg": "13.0.0",
+    "react-native-image-picker": "^5.3.1",
+    "react-native-image-viewing": "~0.2.2",
+    "@uiw/react-native-image-picker": "3.2.3",
+    "@react-native-camera-roll/camera-roll": "5.3.1"
   },
   "devDependencies": {
     "@babel/core": "~7.20.7",

diff --git a/example/examples/src/App.tsx b/example/examples/src/App.tsx
@@ -1,9 +1,10 @@
 import React from 'react';
-import {NavigationContainer} from '@react-navigation/native';
+import {useColorScheme} from 'react-native';
+import {NavigationContainer, DefaultTheme, DarkTheme} from '@react-navigation/native';
 import {createStackNavigator} from '@react-navigation/stack';
 import {SafeAreaView, StatusBar, StyleSheet} from 'react-native';
 import {RootSiblingParent} from 'react-native-root-siblings';
-
+import {ThemeProvider, theme} from '@uiw/react-native';
 import {stackPageData} from './routes';
 
 const Stack = createStackNavigator();
@@ -15,35 +16,38 @@ const styles = StyleSheet.create({
 });
 
 const App = () => {
+  const colorScheme = useColorScheme();
   return (
     <RootSiblingParent>
       <SafeAreaView style={styles.block}>
         <StatusBar barStyle="dark-content" />
-        <NavigationContainer>
-          <Stack.Navigator initialRouteName="Home">
-            <Stack.Screen
-              name="Home"
-              component={require('./Home').default}
-              options={{
-                headerTitle: 'Home',
-                // header: () => null,
-              }}
-            />
-            {stackPageData.map((props: any, index: number) => {
-              return (
-                <Stack.Screen
-                  key={index}
-                  {...props}
-                  // name="Home"
-                  // options={{
-                  //   header: () => null
-                  // }}
-                  // component={Home}
-                />
-              );
-            })}
-          </Stack.Navigator>
-        </NavigationContainer>
+        <ThemeProvider theme={colorScheme === 'light' ? {...theme.lightTheme} : {...theme.darkTheme}}>
+          <NavigationContainer theme={colorScheme === 'dark' ? DarkTheme : DefaultTheme}>
+            <Stack.Navigator initialRouteName="Home">
+              <Stack.Screen
+                name="Home"
+                component={require('./Home').default}
+                options={{
+                  headerTitle: 'Home',
+                  // header: () => null,
+                }}
+              />
+              {stackPageData.map((props: any, index: number) => {
+                return (
+                  <Stack.Screen
+                    key={index}
+                    {...props}
+                    // name="Home"
+                    // options={{
+                    //   header: () => null
+                    // }}
+                    // component={Home}
+                  />
+                );
+              })}
+            </Stack.Navigator>
+          </NavigationContainer>
+        </ThemeProvider>
       </SafeAreaView>
     </RootSiblingParent>
   );