forked from
jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
remove masked view dependency (#6886)
+22
-69
-1
package.json
-1
package.json
···
80
80
"@radix-ui/react-focus-guards": "^1.1.1",
81
81
"@radix-ui/react-focus-scope": "^1.1.0",
82
82
"@react-native-async-storage/async-storage": "1.23.1",
83
-
"@react-native-masked-view/masked-view": "0.3.0",
84
83
"@react-native-menu/menu": "^1.1.0",
85
84
"@react-native-picker/picker": "2.6.1",
86
85
"@react-navigation/bottom-tabs": "^6.5.20",
+22
-63
src/Splash.tsx
+22
-63
src/Splash.tsx
···
18
18
import Svg, {Path, SvgProps} from 'react-native-svg'
19
19
import {Image} from 'expo-image'
20
20
import * as SplashScreen from 'expo-splash-screen'
21
-
import MaskedView from '@react-native-masked-view/masked-view'
22
21
23
-
import {isAndroid} from '#/platform/detection'
24
22
import {Logotype} from '#/view/icons/Logotype'
25
23
// @ts-ignore
26
24
import splashImagePointer from '../assets/splash.png'
···
52
50
type Props = {
53
51
isReady: boolean
54
52
}
55
-
56
-
const AnimatedLogo = Animated.createAnimatedComponent(Logo)
57
53
58
54
export function Splash(props: React.PropsWithChildren<Props>) {
59
55
'use no memo'
···
152
148
{duration: 400, easing: Easing.out(Easing.cubic)},
153
149
async () => {
154
150
// set these values to check animation at specific point
155
-
// outroLogo.set(0.1)
156
-
// outroApp.set(0.1)
157
151
outroLogo.set(() =>
158
152
withTiming(
159
153
1,
···
221
215
</View>
222
216
)}
223
217
224
-
{isReady &&
225
-
(isAndroid || reduceMotion === true ? (
226
-
// Use a simple fade on older versions of android (work around a bug)
227
-
<>
228
-
<Animated.View style={[{flex: 1}, appAnimation]}>
229
-
{props.children}
230
-
</Animated.View>
218
+
{isReady && (
219
+
<>
220
+
<Animated.View style={[{flex: 1}, appAnimation]}>
221
+
{props.children}
222
+
</Animated.View>
231
223
232
-
{!isAnimationComplete && (
233
-
<Animated.View
234
-
style={[
235
-
StyleSheet.absoluteFillObject,
236
-
logoWrapperAnimation,
237
-
{
238
-
flex: 1,
239
-
justifyContent: 'center',
240
-
alignItems: 'center',
241
-
transform: [{translateY: -(insets.top / 2)}, {scale: 0.1}], // scale from 1000px to 100px
242
-
},
243
-
]}>
244
-
<AnimatedLogo
245
-
fill={logoBg}
246
-
style={[{opacity: 0}, logoAnimations]}
247
-
/>
224
+
{!isAnimationComplete && (
225
+
<Animated.View
226
+
style={[
227
+
StyleSheet.absoluteFillObject,
228
+
logoWrapperAnimation,
229
+
{
230
+
flex: 1,
231
+
justifyContent: 'center',
232
+
alignItems: 'center',
233
+
transform: [{translateY: -(insets.top / 2)}, {scale: 0.1}], // scale from 1000px to 100px
234
+
},
235
+
]}>
236
+
<Animated.View style={[logoAnimations]}>
237
+
<Logo fill={logoBg} />
248
238
</Animated.View>
249
-
)}
250
-
</>
251
-
) : (
252
-
<MaskedView
253
-
style={[StyleSheet.absoluteFillObject]}
254
-
maskElement={
255
-
<Animated.View
256
-
style={[
257
-
{
258
-
// Transparent background because mask is based off alpha channel.
259
-
backgroundColor: 'transparent',
260
-
flex: 1,
261
-
justifyContent: 'center',
262
-
alignItems: 'center',
263
-
transform: [{translateY: -(insets.top / 2)}, {scale: 0.1}], // scale from 1000px to 100px
264
-
},
265
-
]}>
266
-
<AnimatedLogo fill={logoBg} style={[logoAnimations]} />
267
-
</Animated.View>
268
-
}>
269
-
{!isAnimationComplete && (
270
-
<View
271
-
style={[
272
-
StyleSheet.absoluteFillObject,
273
-
{
274
-
backgroundColor: logoBg,
275
-
},
276
-
]}
277
-
/>
278
-
)}
279
-
<Animated.View style={[{flex: 1}, appAnimation]}>
280
-
{props.children}
281
239
</Animated.View>
282
-
</MaskedView>
283
-
))}
240
+
)}
241
+
</>
242
+
)}
284
243
</View>
285
244
)
286
245
}
-5
yarn.lock
-5
yarn.lock
···
5655
5655
prompts "^2.4.2"
5656
5656
semver "^7.5.2"
5657
5657
5658
-
"@react-native-masked-view/masked-view@0.3.0":
5659
-
version "0.3.0"
5660
-
resolved "https://registry.yarnpkg.com/@react-native-masked-view/masked-view/-/masked-view-0.3.0.tgz#bd29fae18d148a685331910a3c7b766ce87eafcc"
5661
-
integrity sha512-qLyoObcjzrkpNcoJjXquUePXfL1dXjHtuv+yX0zZ0Q4kG5yvVqd620+tSh7WbRoHkjpXhFBfLwvGhcWB2I0Lpw==
5662
-
5663
5658
"@react-native-menu/menu@^1.1.0":
5664
5659
version "1.1.0"
5665
5660
resolved "https://registry.yarnpkg.com/@react-native-menu/menu/-/menu-1.1.0.tgz#e89c0850f7e5aa4c671c44a9c10edafadb23c35a"