mirror of
https://github.com/BlueWallet/BlueWallet.git
synced 2025-03-26 08:55:56 +01:00
FIX: Wrong android effect transition #1914
This commit is contained in:
marcosrdz
Overtorment
parent
d452e87ee7
commit
522eeecaad
4 changed files with 43 additions and 35 deletions
|
|
@ -79,7 +79,11 @@ const defaultScreenOptions =
|
|||
...TransitionPresets.ModalPresentationIOS,
|
||||
gestureResponseDistance: { vertical: Dimensions.get('window').height, horizontal: 50 },
|
||||
})
|
||||
: undefined;
|
||||
: {
|
||||
gestureEnabled: true,
|
||||
cardOverlayEnabled: true,
|
||||
...TransitionPresets.ScaleFromCenterAndroid,
|
||||
};
|
||||
const defaultStackScreenOptions =
|
||||
Platform.OS === 'ios'
|
||||
? {
|
||||
|
|
@ -88,11 +92,15 @@ const defaultStackScreenOptions =
|
|||
cardStyle: { backgroundColor: '#FFFFFF' },
|
||||
headerStatusBarHeight: 10,
|
||||
}
|
||||
: undefined;
|
||||
: {
|
||||
gestureEnabled: true,
|
||||
cardOverlayEnabled: true,
|
||||
...TransitionPresets.ScaleFromCenterAndroid,
|
||||
};
|
||||
|
||||
const WalletsStack = createStackNavigator();
|
||||
const WalletsRoot = () => (
|
||||
<WalletsStack.Navigator>
|
||||
<WalletsStack.Navigator screenOptions={defaultScreenOptions}>
|
||||
<WalletsStack.Screen name="WalletsList" component={WalletsList} options={WalletsList.navigationOptions} />
|
||||
<WalletsStack.Screen name="WalletTransactions" component={WalletTransactions} options={WalletTransactions.navigationOptions} />
|
||||
<WalletsStack.Screen name="WalletDetails" component={WalletDetails} options={WalletDetails.navigationOptions} />
|
||||
|
|
@ -315,7 +323,7 @@ const Navigation = () => (
|
|||
name="ScanQRCodeRoot"
|
||||
component={ScanQRCodeRoot}
|
||||
options={{
|
||||
...TransitionPresets.ModalTransition,
|
||||
...(Platform.OS === 'ios' ? TransitionPresets.ModalTransition : TransitionPresets.ScaleFromCenterAndroid),
|
||||
headerShown: false,
|
||||
}}
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -371,11 +371,11 @@ PODS:
|
|||
- React
|
||||
- RNReanimated (1.13.0):
|
||||
- React
|
||||
- RNScreens (2.10.1):
|
||||
- RNScreens (2.11.0):
|
||||
- React
|
||||
- RNSecureKeyStore (1.0.0):
|
||||
- React
|
||||
- RNSentry (1.7.1):
|
||||
- RNSentry (1.7.2):
|
||||
- React
|
||||
- Sentry (~> 5.2.0)
|
||||
- RNShare (3.7.0):
|
||||
|
|
@ -710,9 +710,9 @@ SPEC CHECKSUMS:
|
|||
RNRate: 2b31dad120cd1b78e33c6034808561c386a3dddf
|
||||
RNReactNativeHapticFeedback: 22c5ecf474428766c6b148f96f2ff6155cd7225e
|
||||
RNReanimated: 89f5e0a04d1dd52fbf27e7e7030d8f80a646a3fc
|
||||
RNScreens: b748efec66e095134c7166ca333b628cd7e6f3e2
|
||||
RNScreens: 0e91da98ab26d5d04c7b59a9b6bd694124caf88c
|
||||
RNSecureKeyStore: f1ad870e53806453039f650720d2845c678d89c8
|
||||
RNSentry: 2bae4ffee2e66376ef42cb845a494c3bde17bc56
|
||||
RNSentry: 2d4a0e18c6dfe93b647c360e0d15c9391d24e9d1
|
||||
RNShare: a1d5064df7a0ebe778d001869b3f0a124bf0a491
|
||||
RNSVG: ce9d996113475209013317e48b05c21ee988d42e
|
||||
RNVectorIcons: 0bb4def82230be1333ddaeee9fcba45f0b288ed4
|
||||
|
|
|
|||
46
package-lock.json
generated
46
package-lock.json
generated
|
|
@ -4586,11 +4586,11 @@
|
|||
"integrity": "sha512-8IeHfDwJ9/CTUwFs6x90VlobV3BfuPgNLjTgC6dRZovfCWigaZwVNIFFJnHBakK3pW2xErAPwhdvNR4JeNoYbw=="
|
||||
},
|
||||
"@react-navigation/core": {
|
||||
"version": "5.12.3",
|
||||
"resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-5.12.3.tgz",
|
||||
"integrity": "sha512-aEOTAw4FRRNsNu6F9ibLk3SVSs4Res8BI832NEZN6qUto5ZgtuYnQHWeWV2cZ43Nc9KvUyQC/vXvO2RScwgFwA==",
|
||||
"version": "5.12.4",
|
||||
"resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-5.12.4.tgz",
|
||||
"integrity": "sha512-vhaVIJGfSgln4dIoO4R2HeX9p3Vc7OJLa0/JpKHpXn/DZgNVn+RP7ktk1CRZ16ikUJ0k8CxzuvRxeRIg7EhA7w==",
|
||||
"requires": {
|
||||
"@react-navigation/routers": "^5.4.11",
|
||||
"@react-navigation/routers": "^5.4.12",
|
||||
"escape-string-regexp": "^4.0.0",
|
||||
"nanoid": "^3.1.12",
|
||||
"query-string": "^6.13.1",
|
||||
|
|
@ -4606,35 +4606,35 @@
|
|||
}
|
||||
},
|
||||
"@react-navigation/drawer": {
|
||||
"version": "5.9.0",
|
||||
"resolved": "https://registry.npmjs.org/@react-navigation/drawer/-/drawer-5.9.0.tgz",
|
||||
"integrity": "sha512-YcuJ9QD4cFyjfXJx6vMsG3u3bfOU/Nt+GvMMl+4rZOxw2LStmubY1jqfsEAli/+dTUHv5kXJf5dF+/GhUCqA5g==",
|
||||
"version": "5.9.1",
|
||||
"resolved": "https://registry.npmjs.org/@react-navigation/drawer/-/drawer-5.9.1.tgz",
|
||||
"integrity": "sha512-6KJDr0looXo95w+wN8lzcQVVbPe7g/u85gmLaXbLZ1lHqeyHm3qyx5NVYBwVbbZ0/ufIlXbxOQ2h7yeV0jOvsQ==",
|
||||
"requires": {
|
||||
"color": "^3.1.2",
|
||||
"react-native-iphone-x-helper": "^1.2.1"
|
||||
}
|
||||
},
|
||||
"@react-navigation/native": {
|
||||
"version": "5.7.3",
|
||||
"resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-5.7.3.tgz",
|
||||
"integrity": "sha512-bXb1g/cLpGF2DW1Vxk90Ch5vbaZTk5b/4Fn5xjQlueQODgc9ca+GPEssKZ84hCrNmS+Xg+iK1m/ArawLF5gMlw==",
|
||||
"version": "5.7.4",
|
||||
"resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-5.7.4.tgz",
|
||||
"integrity": "sha512-ndLojJZyWqxGdWeXlSr7ylHaMbBIwvoXnmsKHOMvUN6FV0dxv8b8L9T1yRW82b9mak4y6y6Q+1gIAWjO7FhAsQ==",
|
||||
"requires": {
|
||||
"@react-navigation/core": "^5.12.3",
|
||||
"@react-navigation/core": "^5.12.4",
|
||||
"nanoid": "^3.1.12"
|
||||
}
|
||||
},
|
||||
"@react-navigation/routers": {
|
||||
"version": "5.4.11",
|
||||
"resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-5.4.11.tgz",
|
||||
"integrity": "sha512-J/CsHdIjYBRe81UUiLOoz9NSrQ91uP23Oe21QPCALInRHx+rfwo2oPl6Fn8xAa7n8Dtt2oQUGyF+g5d05cB74w==",
|
||||
"version": "5.4.12",
|
||||
"resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-5.4.12.tgz",
|
||||
"integrity": "sha512-IwMmxeb5e6LboljhakmhtrHBXLYFrFDr2c1GjAG538e4MjT4QGi/ZYckAxCh/NqKI0knnzqKppPl2NsOMv/NoQ==",
|
||||
"requires": {
|
||||
"nanoid": "^3.1.12"
|
||||
}
|
||||
},
|
||||
"@react-navigation/stack": {
|
||||
"version": "5.9.0",
|
||||
"resolved": "https://registry.npmjs.org/@react-navigation/stack/-/stack-5.9.0.tgz",
|
||||
"integrity": "sha512-kt6M0ZLMyNKXfKi50n01bHg4/d8zp0Yh5QaQG4d1roWOqdV9ou1nFEK4l2yQ6XKH2lLSYswHElPDZUuWd+6XzA==",
|
||||
"version": "5.9.1",
|
||||
"resolved": "https://registry.npmjs.org/@react-navigation/stack/-/stack-5.9.1.tgz",
|
||||
"integrity": "sha512-LPSB8/etYYBe0NLHPndrly2amM/feSXXZJ3KevvKH3zP+RbEonsLOpmjOh2jXpZy9+1oLlSuGs+xzgpamMuguw==",
|
||||
"requires": {
|
||||
"color": "^3.1.2",
|
||||
"react-native-iphone-x-helper": "^1.2.1"
|
||||
|
|
@ -14503,9 +14503,9 @@
|
|||
"integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ=="
|
||||
},
|
||||
"query-string": {
|
||||
"version": "6.13.1",
|
||||
"resolved": "https://registry.npmjs.org/query-string/-/query-string-6.13.1.tgz",
|
||||
"integrity": "sha512-RfoButmcK+yCta1+FuU8REvisx1oEzhMKwhLUNcepQTPGcNMp1sIqjnfCtfnvGSQZQEhaBHvccujtWoUV3TTbA==",
|
||||
"version": "6.13.2",
|
||||
"resolved": "https://registry.npmjs.org/query-string/-/query-string-6.13.2.tgz",
|
||||
"integrity": "sha512-BMmDaUiLDFU1hlM38jTFcRt7HYiGP/zt1sRzrIWm5zpeEuO1rkbPS0ELI3uehoLuuhHDCS8u8lhFN3fEN4JzPQ==",
|
||||
"requires": {
|
||||
"decode-uri-component": "^0.2.0",
|
||||
"split-on-first": "^1.0.0",
|
||||
|
|
@ -15203,9 +15203,9 @@
|
|||
}
|
||||
},
|
||||
"react-native-screens": {
|
||||
"version": "2.10.1",
|
||||
"resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-2.10.1.tgz",
|
||||
"integrity": "sha512-Z2kKSk4AwWRQNCBmTjViuBQK0/Lx0jc25TZptn/2gKYUCOuVRvCekoA26u0Tsb3BIQ8tWDsZW14OwDlFUXW1aw=="
|
||||
"version": "2.11.0",
|
||||
"resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-2.11.0.tgz",
|
||||
"integrity": "sha512-vJzJE3zI1XUtqthrX3Dh2TBQWB+xFyaGhF52KBq9FjJUN5ws4xpLZJxBWa1KbGV3DilmcSZ4jmZR5LGordwE7w=="
|
||||
},
|
||||
"react-native-secure-key-store": {
|
||||
"version": "git+https://github.com/BlueWallet/react-native-secure-key-store.git#4ba25dedb3d5ae15c22fd0ea0555116055630966",
|
||||
|
|
|
|||
|
|
@ -68,9 +68,9 @@
|
|||
"@react-native-community/masked-view": "0.1.10",
|
||||
"@react-native-community/push-notification-ios": "1.4.0",
|
||||
"@react-native-community/slider": "3.0.3",
|
||||
"@react-navigation/drawer": "5.9.0",
|
||||
"@react-navigation/native": "5.7.3",
|
||||
"@react-navigation/stack": "5.9.0",
|
||||
"@react-navigation/drawer": "5.9.1",
|
||||
"@react-navigation/native": "5.7.4",
|
||||
"@react-navigation/stack": "5.9.1",
|
||||
"@remobile/react-native-qrcode-local-image": "git+https://github.com/BlueWallet/react-native-qrcode-local-image.git",
|
||||
"@sentry/react-native": "1.7.2",
|
||||
"amplitude-js": "5.11.0",
|
||||
|
|
@ -141,7 +141,7 @@
|
|||
"react-native-rate": "1.2.4",
|
||||
"react-native-reanimated": "1.13.0",
|
||||
"react-native-safe-area-context": "3.1.6",
|
||||
"react-native-screens": "2.10.1",
|
||||
"react-native-screens": "2.11.0",
|
||||
"react-native-secure-key-store": "git+https://github.com/BlueWallet/react-native-secure-key-store.git#4ba25dedb3d5ae15c22fd0ea0555116055630966",
|
||||
"react-native-share": "3.7.0",
|
||||
"react-native-snap-carousel": "3.9.1",
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue