Skip to content

Commit d2462b4

Browse files
feruzmferuzm
authored
Merge pull request #2985 from ecency/nt/package-updates
Nt/package updates
2 parents 0ed5ed7 + d7ba5a2 commit d2462b4

File tree

5 files changed

+18
-43
lines changed

5 files changed

+18
-43
lines changed

‎ios/Podfile.lock

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ PODS:
22
- boost (1.84.0)
33
- BugsnagReactNative (8.2.0):
44
- React-Core
5-
- BVLinearGradient (2.8.3):
6-
- React-Core
75
- CocoaAsyncSocket (7.6.5)
86
- DoubleConversion (1.1.6)
97
- EXConstants (17.0.5):
@@ -26,6 +24,8 @@ PODS:
2624
- SDWebImageSVGCoder (~> 1.7.0)
2725
- ExpoKeepAwake (14.0.2):
2826
- ExpoModulesCore
27+
- ExpoLinearGradient (14.0.2):
28+
- ExpoModulesCore
2929
- ExpoLocalAuthentication (15.0.2):
3030
- ExpoModulesCore
3131
- ExpoModulesCore (2.2.1):
@@ -1849,8 +1849,6 @@ PODS:
18491849
- React-Core
18501850
- RNCClipboard (1.16.1):
18511851
- React-Core
1852-
- RNCPushNotificationIOS (1.11.0):
1853-
- React-Core
18541852
- RNDeviceInfo (14.0.4):
18551853
- React-Core
18561854
- RNFBAnalytics (21.11.0):
@@ -2087,7 +2085,6 @@ PODS:
20872085
DEPENDENCIES:
20882086
- boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`)
20892087
- "BugsnagReactNative (from `../node_modules/@bugsnag/react-native`)"
2090-
- BVLinearGradient (from `../node_modules/react-native-linear-gradient`)
20912088
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
20922089
- EXConstants (from `../node_modules/expo-constants/ios`)
20932090
- Expo (from `../node_modules/expo`)
@@ -2097,6 +2094,7 @@ DEPENDENCIES:
20972094
- ExpoFont (from `../node_modules/expo-font/ios`)
20982095
- ExpoImage (from `../node_modules/expo-image/ios`)
20992096
- ExpoKeepAwake (from `../node_modules/expo-keep-awake/ios`)
2097+
- ExpoLinearGradient (from `../node_modules/expo-linear-gradient/ios`)
21002098
- ExpoLocalAuthentication (from `../node_modules/expo-local-authentication/ios`)
21012099
- ExpoModulesCore (from `../node_modules/expo-modules-core`)
21022100
- fast_float (from `../node_modules/react-native/third-party-podspecs/fast_float.podspec`)
@@ -2190,7 +2188,6 @@ DEPENDENCIES:
21902188
- RNBootSplash (from `../node_modules/react-native-bootsplash`)
21912189
- "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
21922190
- "RNCClipboard (from `../node_modules/@react-native-clipboard/clipboard`)"
2193-
- "RNCPushNotificationIOS (from `../node_modules/@react-native-community/push-notification-ios`)"
21942191
- RNDeviceInfo (from `../node_modules/react-native-device-info`)
21952192
- "RNFBAnalytics (from `../node_modules/@react-native-firebase/analytics`)"
21962193
- "RNFBApp (from `../node_modules/@react-native-firebase/app`)"
@@ -2241,8 +2238,6 @@ EXTERNAL SOURCES:
22412238
:podspec: "../node_modules/react-native/third-party-podspecs/boost.podspec"
22422239
BugsnagReactNative:
22432240
:path: "../node_modules/@bugsnag/react-native"
2244-
BVLinearGradient:
2245-
:path: "../node_modules/react-native-linear-gradient"
22462241
DoubleConversion:
22472242
:podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
22482243
EXConstants:
@@ -2261,6 +2256,8 @@ EXTERNAL SOURCES:
22612256
:path: "../node_modules/expo-image/ios"
22622257
ExpoKeepAwake:
22632258
:path: "../node_modules/expo-keep-awake/ios"
2259+
ExpoLinearGradient:
2260+
:path: "../node_modules/expo-linear-gradient/ios"
22642261
ExpoLocalAuthentication:
22652262
:path: "../node_modules/expo-local-authentication/ios"
22662263
ExpoModulesCore:
@@ -2440,8 +2437,6 @@ EXTERNAL SOURCES:
24402437
:path: "../node_modules/@react-native-async-storage/async-storage"
24412438
RNCClipboard:
24422439
:path: "../node_modules/@react-native-clipboard/clipboard"
2443-
RNCPushNotificationIOS:
2444-
:path: "../node_modules/@react-native-community/push-notification-ios"
24452440
RNDeviceInfo:
24462441
:path: "../node_modules/react-native-device-info"
24472442
RNFBAnalytics:
@@ -2484,7 +2479,6 @@ EXTERNAL SOURCES:
24842479
SPEC CHECKSUMS:
24852480
boost: 7e761d76ca2ce687f7cc98e698152abd03a18f90
24862481
BugsnagReactNative: 3e53a711e96ca1097bff567fb66213778905e3ca
2487-
BVLinearGradient: cb006ba232a1f3e4f341bb62c42d1098c284da70
24882482
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
24892483
DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
24902484
EXConstants: e25c3f3ef5d1cf7a6ef911ebf7a3ab94d8d06d82
@@ -2495,6 +2489,7 @@ SPEC CHECKSUMS:
24952489
ExpoFont: 38656978c2a4022fb7e0c43e4968d66340f5e2f3
24962490
ExpoImage: 5d5e8b6dac825198fa38295b7da8d405657d0a2f
24972491
ExpoKeepAwake: 62ff49bbc3bff90d8ee28329190f9ba371bf88e7
2492+
ExpoLinearGradient: 35ebd83b16f80b3add053a2fd68cc328ed927f60
24982493
ExpoLocalAuthentication: eb2be9c7bcdc68e9434d4be4bb5aa5cf7943e816
24992494
ExpoModulesCore: a0f7d0e12807ce3e6ef87840c60bd8f1ef172267
25002495
fast_float: 06eeec4fe712a76acc9376682e4808b05ce978b6
@@ -2600,7 +2595,6 @@ SPEC CHECKSUMS:
26002595
RNBootSplash: 2a9d2de139a6f8a84a0f1728ac40f3e7b167e15a
26012596
RNCAsyncStorage: af7b591318005069c3795076addc83a4dd5c0a2e
26022597
RNCClipboard: ee059e6006b137e369caed5eb852b4aad9f5d886
2603-
RNCPushNotificationIOS: 6c4ca3388c7434e4a662b92e4dfeeee858e6f440
26042598
RNDeviceInfo: d863506092aef7e7af3a1c350c913d867d795047
26052599
RNFBAnalytics: 1dfa1e8dd307e0d75b8fce82e308fd791a6d8163
26062600
RNFBApp: b5626640e0f4b4fe5be4f44375df703c0d62ee4b

‎package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
"@react-native-camera-roll/camera-roll": "^7.9.0",
4747
"@react-native-clipboard/clipboard": "^1.16.1",
4848
"@react-native-community/netinfo": "^11.4.1",
49-
"@react-native-community/push-notification-ios": "^1.11.0",
5049
"@react-native-firebase/analytics": "^21.11.0",
5150
"@react-native-firebase/app": "^21.11.0",
5251
"@react-native-firebase/dynamic-links": "^21.11.0",
@@ -81,6 +80,7 @@
8180
"expo": "^52.0.33",
8281
"expo-crypto": "~14.0.2",
8382
"expo-image": "~2.0.5",
83+
"expo-linear-gradient": "~14.0.2",
8484
"expo-local-authentication": "~15.0.2",
8585
"hive-auth-wrapper": "https://github.com/noumantahir/hive-auth-wrapper.git",
8686
"hive-uri": "^0.2.5",
@@ -123,7 +123,6 @@
123123
"react-native-image-viewing": "^0.2.2",
124124
"react-native-keyboard-aware-scroll-view": "^0.9.5",
125125
"react-native-level-fs": "^3.0.0",
126-
"react-native-linear-gradient": "^2.8.3",
127126
"react-native-media-controls": "^2.3.0",
128127
"react-native-modal-dropdown": "^1.0.2",
129128
"react-native-modal-popover": "^2.1.3",

‎src/components/header/view/headerView.tsx

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React, { useState } from 'react';
22
import { View, Text, TouchableOpacity } from 'react-native';
3-
import LinearGradient from 'react-native-linear-gradient';
3+
import { LinearGradient } from 'expo-linear-gradient';
4+
45
import { useIntl } from 'react-intl';
56

67
// Components
@@ -36,13 +37,7 @@ const HeaderView = ({
3637

3738
const [isSearchModalOpen, setIsSearchModalOpen] = useState(false);
3839
const intl = useIntl();
39-
let gradientColor;
40-
41-
if (isReverse) {
42-
gradientColor = isDarkTheme ? ['#43638e', '#081c36'] : ['#357ce6', '#2d5aa0'];
43-
} else {
44-
gradientColor = isDarkTheme ? ['#081c36', '#43638e'] : ['#2d5aa0', '#357ce6'];
45-
}
40+
const gradientColor = isDarkTheme ? ['#081c36', '#43638e'] : ['#2d5aa0', '#357ce6'];
4641

4742
const _onPressSearchButton = () => {
4843
navigation.navigate(ROUTES.SCREENS.SEARCH_RESULT);
@@ -53,7 +48,7 @@ const HeaderView = ({
5348
<LinearGradient
5449
start={{ x: 0, y: 0 }}
5550
end={{ x: 1, y: 0 }}
56-
colors={gradientColor}
51+
colors={isReverse ? gradientColor.reverse() : gradientColor}
5752
style={[
5853
styles.avatarButtonWrapper,
5954
isReverse ? styles.avatarButtonWrapperReverse : styles.avatarDefault,

‎src/components/sideMenu/view/sideMenuView.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import React, { useEffect, useState } from 'react';
22
import { View, Text, ImageBackground, FlatList, TouchableOpacity } from 'react-native';
33
import { injectIntl, useIntl } from 'react-intl';
4-
import LinearGradient from 'react-native-linear-gradient';
54
import VersionNumber from 'react-native-version-number';
65
import { isEmpty } from 'lodash';
76
import { useDispatch } from 'react-redux';
@@ -167,12 +166,7 @@ const SideMenuView = ({
167166

168167
const _renderHeader = () => {
169168
return (
170-
<LinearGradient
171-
start={{ x: 0, y: 0 }}
172-
end={{ x: 1, y: 0 }}
173-
colors={['#357ce6', '#2d5aa0']}
174-
style={styles.headerView}
175-
>
169+
<View style={styles.headerView}>
176170
<ImageBackground source={SIDE_MENU_BACKGROUND} style={styles.imageBackground}>
177171
{isLoggedIn && (
178172
<View style={{ ...styles.headerContentWrapper, marginTop: insets.top }}>
@@ -211,7 +205,7 @@ const SideMenuView = ({
211205
</View>
212206
)}
213207
</ImageBackground>
214-
</LinearGradient>
208+
</View>
215209
);
216210
};
217211

‎yarn.lock

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2887,13 +2887,6 @@
28872887
resolved "https://registry.yarnpkg.com/@react-native-community/netinfo/-/netinfo-11.4.1.tgz#a3c247aceab35f75dd0aa4bfa85d2be5a4508688"
28882888
integrity sha512-B0BYAkghz3Q2V09BF88RA601XursIEA111tnc2JOaN7axJWmNefmfjZqw/KdSxKZp7CZUuPpjBmz/WCR9uaHYg==
28892889

2890-
"@react-native-community/push-notification-ios@^1.11.0":
2891-
version "1.11.0"
2892-
resolved "https://registry.yarnpkg.com/@react-native-community/push-notification-ios/-/push-notification-ios-1.11.0.tgz#d8ec4acfb52260cb779ed0379b9e197db7841b83"
2893-
integrity sha512-nfkUs8P2FeydOCR4r7BNmtGxAxI22YuGP6RmqWt6c8EEMUpqvIhNKWkRSFF3pHjkgJk2tpRb9wQhbezsqTyBvA==
2894-
dependencies:
2895-
invariant "^2.2.4"
2896-
28972890
"@react-native-firebase/analytics@^21.11.0":
28982891
version "21.11.0"
28992892
resolved "https://registry.yarnpkg.com/@react-native-firebase/analytics/-/analytics-21.11.0.tgz#0b70c8b1f5914a5e48036794e4429893cc45fd62"
@@ -6805,6 +6798,11 @@ expo-keep-awake@~14.0.2:
68056798
resolved "https://registry.yarnpkg.com/expo-keep-awake/-/expo-keep-awake-14.0.2.tgz#124a729df43c87994631f51d5b1b5093d58e6c80"
68066799
integrity sha512-71XAMnoWjKZrN8J7Q3+u0l9Ytp4OfhNAYz8BCWF1/9aFUw09J3I7Z5DuI3MUsVMa/KWi+XhG+eDUFP8cVA19Uw==
68076800

6801+
expo-linear-gradient@~14.0.2:
6802+
version "14.0.2"
6803+
resolved "https://registry.yarnpkg.com/expo-linear-gradient/-/expo-linear-gradient-14.0.2.tgz#51fb266d1c7a38349077d243e383cc3d69d4356b"
6804+
integrity sha512-nvac1sPUfFFJ4mY25UkvubpUV/olrBH+uQw5k+beqSvQaVQiUfFtYzfRr+6HhYBNb4AEsOtpsCRkpDww3M2iGQ==
6805+
68086806
expo-local-authentication@~15.0.2:
68096807
version "15.0.2"
68106808
resolved "https://registry.yarnpkg.com/expo-local-authentication/-/expo-local-authentication-15.0.2.tgz#c45460046d9d040370a2a9e18df399abb3df4913"
@@ -11524,11 +11522,6 @@ react-native-level-fs@^3.0.0:
1152411522
level-filesystem "^1.0.1"
1152511523
levelup "^0.18.2"
1152611524

11527-
react-native-linear-gradient@^2.8.3:
11528-
version "2.8.3"
11529-
resolved "https://registry.yarnpkg.com/react-native-linear-gradient/-/react-native-linear-gradient-2.8.3.tgz#9a116649f86d74747304ee13db325e20b21e564f"
11530-
integrity sha512-KflAXZcEg54PXkLyflaSZQ3PJp4uC4whM7nT/Uot9m0e/qxFV3p6uor1983D1YOBJbJN7rrWdqIjq0T42jOJyA==
11531-
1153211525
react-native-media-controls@^2.3.0:
1153311526
version "2.3.0"
1153411527
resolved "https://registry.yarnpkg.com/react-native-media-controls/-/react-native-media-controls-2.3.0.tgz#c36e876a14d12982b7c6fb759201ff439117cbd0"

0 commit comments

Comments
 (0)