Merge pull request #1844 from kaloudis/remove-skia

deps: remove `react-native-skia`
ZeusLN · Nov 14, 2023 · ecc9106 · ecc9106
2 parents ebdd220 + 6e3753e
commit ecc9106
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 240 deletions.
diff --git a/components/BlurGradient.tsx b/components/BlurGradient.tsx
diff --git a/components/Glassmorphism.tsx b/components/Glassmorphism.tsx
diff --git a/components/Splash.tsx b/components/Splash.tsx
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -348,10 +348,6 @@ PODS:
     - React-Core
   - react-native-safe-area-context (0.6.4):
     - React
-  - react-native-skia (0.1.213):
-    - React
-    - React-callinvoker
-    - React-Core
   - react-native-tor (0.1.8):
     - React
   - react-native-udp (4.1.7):
@@ -568,7 +564,6 @@ DEPENDENCIES:
   - react-native-randombytes (from `../node_modules/react-native-randombytes`)
   - react-native-restart (from `../node_modules/react-native-restart`)
   - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
-  - "react-native-skia (from `../node_modules/@shopify/react-native-skia`)"
   - react-native-tor (from `../node_modules/react-native-tor`)
   - react-native-udp (from `../node_modules/react-native-udp`)
   - React-NativeModulesApple (from `../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`)
@@ -689,8 +684,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-restart"
   react-native-safe-area-context:
     :path: "../node_modules/react-native-safe-area-context"
-  react-native-skia:
-    :path: "../node_modules/@shopify/react-native-skia"
   react-native-tor:
     :path: "../node_modules/react-native-tor"
   react-native-udp:
@@ -803,7 +796,6 @@ SPEC CHECKSUMS:
   react-native-randombytes: 3638d24759d67c68f6ccba60c52a7a8a8faa6a23
   react-native-restart: 7595693413fe3ca15893702f2c8306c62a708162
   react-native-safe-area-context: 52342d2d80ea8faadd0ffa76d83b6051f20c5329
-  react-native-skia: 4327dd69d3272313b91ea753a2d6dd5d9bebba42
   react-native-tor: 3b14e9160b2eb7fa3f310921b2dee71a5171e5b7
   react-native-udp: df79c3cb72c4e71240cd3ce4687bfb8a137140d5
   React-NativeModulesApple: 797bc6078d566eef3fb3f74127e6e1d2e945a15f

diff --git a/ios/zeus.xcodeproj/project.pbxproj b/ios/zeus.xcodeproj/project.pbxproj
@@ -2128,6 +2128,7 @@
 					"-ld_classic",
 					"-Wl",
 					"-ld_classic",
+					"-Wl -ld_classic ",
 				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
@@ -2201,6 +2202,7 @@
 					"-ld_classic",
 					"-Wl",
 					"-ld_classic",
+					"-Wl -ld_classic ",
 				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;

diff --git a/package.json b/package.json
@@ -38,7 +38,6 @@
     "@react-navigation/bottom-tabs": "5.11.11",
     "@react-navigation/native": "6.0.16",
     "@remobile/react-native-qrcode-local-image": "github:BlueWallet/react-native-qrcode-local-image#31b0113",
-    "@shopify/react-native-skia": "^0.1.213",
     "@tradle/react-native-http": "2.0.1",
     "@types/dateformat": "5.0.0",
     "@types/react-native-snap-carousel": "3.8.5",

diff --git a/views/IntroSplash.tsx b/views/IntroSplash.tsx
@@ -2,6 +2,7 @@ import * as React from 'react';
 import {
     BackHandler,
     Dimensions,
+    ImageBackground,
     NativeEventSubscription,
     View,
     SafeAreaView,
@@ -23,8 +24,6 @@ import { createLndWallet } from '../utils/LndMobileUtils';
 import { localeString } from '../utils/LocaleUtils';
 import { themeColor } from '../utils/ThemeUtils';
 
-import SplashView from '../components/Splash';
-
 import TresArrows from '../assets/images/SVG/TresArrows.svg';
 
 interface IntroSplashProps {
@@ -143,7 +142,14 @@ export default class IntroSplash extends React.Component<
                         flex: 1
                     }}
                 >
-                    <SplashView>
+                    <ImageBackground
+                        source={require('../assets/images/hyper.jpg')}
+                        resizeMode="cover"
+                        style={{
+                            flex: 1,
+                            justifyContent: 'center'
+                        }}
+                    >
                         <View style={{ flex: 1, flexDirection: 'column' }}>
                             <View
                                 style={{
@@ -296,7 +302,7 @@ export default class IntroSplash extends React.Component<
                                 />
                             </View>
                         </View>
-                    </SplashView>
+                    </ImageBackground>
                 </SafeAreaView>
             </Screen>
         );

diff --git a/yarn.lock b/yarn.lock
@@ -2112,14 +2112,6 @@
     "@noble/hashes" "~1.3.0"
     "@scure/base" "~1.1.0"
 
-"@shopify/react-native-skia@^0.1.213":
-  version "0.1.213"
-  resolved "https://registry.yarnpkg.com/@shopify/react-native-skia/-/react-native-skia-0.1.213.tgz#ed308e1e949f827c0b92df8d7eddfc561bf9a528"
-  integrity sha512-JaJfVccTYHeVPrhW+GrLHrwwi49m+nsrfNlJs+jauKD1qgBjGD7gWaJlTHdj/yDpse/5nDj4FiceVe8RccHYVQ==
-  dependencies:
-    canvaskit-wasm "0.38.2"
-    react-reconciler "^0.27.0"
-
 "@sideway/address@^4.1.3":
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.4.tgz#03dccebc6ea47fdc226f7d3d1ad512955d4783f0"
@@ -3628,11 +3620,6 @@ caniuse-lite@^1.0.30001539:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001541.tgz#b1aef0fadd87fb72db4dcb55d220eae17b81cdb1"
   integrity sha512-bLOsqxDgTqUBkzxbNlSBt8annkDpQB9NdzdTbO2ooJ+eC/IQcvDspDc058g84ejCelF7vHUx57KIOjEecOHXaw==
 
-canvaskit-wasm@0.38.2:
-  version "0.38.2"
-  resolved "https://registry.yarnpkg.com/canvaskit-wasm/-/canvaskit-wasm-0.38.2.tgz#b6c2be236670fd0f18977b9026652b2c0e201fee"
-  integrity sha512-ieRb6DO4yL91qUfyRgmyhp2Hi1KmQ9lIMfKacxHVlfp/CpKCkzgAxRGUbCsJFzwLKjs9fufGrIyvnzEYRwm1XQ==
-
 catharsis@^0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/catharsis/-/catharsis-0.9.0.tgz#40382a168be0e6da308c277d3a2b3eb40c7d2121"
@@ -8393,14 +8380,6 @@ react-navigation@4.4.4:
     "@react-navigation/core" "^3.7.9"
     "@react-navigation/native" "^3.8.4"
 
-react-reconciler@^0.27.0:
-  version "0.27.0"
-  resolved "https://registry.yarnpkg.com/react-reconciler/-/react-reconciler-0.27.0.tgz#360124fdf2d76447c7491ee5f0e04503ed9acf5b"
-  integrity sha512-HmMDKciQjYmBRGuuhIaKA1ba/7a+UsM5FzOZsMO2JYHt9Jh8reCb7j1eDC95NOyUlKM9KRyvdx0flBuDvYSBoA==
-  dependencies:
-    loose-envify "^1.1.0"
-    scheduler "^0.21.0"
-
 react-refresh@^0.4.0:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.4.3.tgz#966f1750c191672e76e16c2efa569150cc73ab53"
@@ -8743,13 +8722,6 @@ scheduler@0.24.0-canary-efb381bbf-20230505:
   dependencies:
     loose-envify "^1.1.0"
 
-scheduler@^0.21.0:
-  version "0.21.0"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.21.0.tgz#6fd2532ff5a6d877b6edb12f00d8ab7e8f308820"
-  integrity sha512-1r87x5fz9MXqswA2ERLo0EbOAU74DpIUO090gIasYTqlVoJeMcl+Z1Rg7WHz+qtPujhS/hGIt9kxZOYBV3faRQ==
-  dependencies:
-    loose-envify "^1.1.0"
-
 scheduler@^0.23.0:
   version "0.23.0"
   resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.0.tgz#ba8041afc3d30eb206a487b6b384002e4e61fdfe"