invert the fab animation, play a haptic (#4309)

This commit is contained in:
Hailey
2024-09-23 13:06:22 -07:00
committed by GitHub
parent 0f36ffdc43
commit b77031a074
2 changed files with 44 additions and 16 deletions
+11 -7
View File
@@ -4,17 +4,21 @@ import {impactAsync, ImpactFeedbackStyle} from 'expo-haptics'
import {isIOS, isWeb} from 'platform/detection' import {isIOS, isWeb} from 'platform/detection'
import {useHapticsDisabled} from 'state/preferences/disable-haptics' import {useHapticsDisabled} from 'state/preferences/disable-haptics'
const hapticImpact: ImpactFeedbackStyle = isIOS
? ImpactFeedbackStyle.Medium
: ImpactFeedbackStyle.Light // Users said the medium impact was too strong on Android; see APP-537s
export function useHaptics() { export function useHaptics() {
const isHapticsDisabled = useHapticsDisabled() const isHapticsDisabled = useHapticsDisabled()
return React.useCallback(() => { return React.useCallback(
(strength: 'Light' | 'Medium' | 'Heavy' = 'Medium') => {
if (isHapticsDisabled || isWeb) { if (isHapticsDisabled || isWeb) {
return return
} }
impactAsync(hapticImpact)
}, [isHapticsDisabled]) // Users said the medium impact was too strong on Android; see APP-537s
const style = isIOS
? ImpactFeedbackStyle[strength]
: ImpactFeedbackStyle.Light
impactAsync(style)
},
[isHapticsDisabled],
)
} }
+30 -6
View File
@@ -1,6 +1,10 @@
import React, {ComponentProps} from 'react' import React, {ComponentProps} from 'react'
import {StyleSheet, TouchableWithoutFeedback} from 'react-native' import {StyleSheet, TouchableWithoutFeedback} from 'react-native'
import Animated, {useAnimatedStyle, withTiming} from 'react-native-reanimated' import Animated, {
Easing,
useAnimatedStyle,
withTiming,
} from 'react-native-reanimated'
import {useSafeAreaInsets} from 'react-native-safe-area-context' import {useSafeAreaInsets} from 'react-native-safe-area-context'
import {LinearGradient} from 'expo-linear-gradient' import {LinearGradient} from 'expo-linear-gradient'
@@ -9,6 +13,8 @@ import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries'
import {clamp} from '#/lib/numbers' import {clamp} from '#/lib/numbers'
import {gradients} from '#/lib/styles' import {gradients} from '#/lib/styles'
import {isWeb} from '#/platform/detection' import {isWeb} from '#/platform/detection'
import {useHaptics} from 'lib/haptics'
import {useHapticsDisabled} from 'state/preferences'
import {useInteractionState} from '#/components/hooks/useInteractionState' import {useInteractionState} from '#/components/hooks/useInteractionState'
export interface FABProps export interface FABProps
@@ -17,15 +23,17 @@ export interface FABProps
icon: JSX.Element icon: JSX.Element
} }
export function FABInner({testID, icon, ...props}: FABProps) { export function FABInner({testID, icon, onPress, ...props}: FABProps) {
const insets = useSafeAreaInsets() const insets = useSafeAreaInsets()
const {isMobile, isTablet} = useWebMediaQueries() const {isMobile, isTablet} = useWebMediaQueries()
const fabMinimalShellTransform = useMinimalShellFabTransform() const fabMinimalShellTransform = useMinimalShellFabTransform()
const { const {
state: pressed, state: isPressed,
onIn: onPressIn, onIn: onPressIn,
onOut: onPressOut, onOut: onPressOut,
} = useInteractionState() } = useInteractionState()
const playHaptic = useHaptics()
const isHapticsDisabled = useHapticsDisabled()
const size = isTablet ? styles.sizeLarge : styles.sizeRegular const size = isTablet ? styles.sizeLarge : styles.sizeRegular
@@ -33,13 +41,29 @@ export function FABInner({testID, icon, ...props}: FABProps) {
? {right: 50, bottom: 50} ? {right: 50, bottom: 50}
: {right: 24, bottom: clamp(insets.bottom, 15, 60) + 15} : {right: 24, bottom: clamp(insets.bottom, 15, 60) + 15}
const scale = useAnimatedStyle(() => ({ const animatedStyle = useAnimatedStyle(() => ({
transform: [{scale: withTiming(pressed ? 0.95 : 1)}], transform: [
{
scale: withTiming(isPressed ? 1.1 : 1, {
duration: 250,
easing: Easing.out(Easing.quad),
}),
},
],
})) }))
return ( return (
<TouchableWithoutFeedback <TouchableWithoutFeedback
testID={testID} testID={testID}
onPress={e => {
playHaptic()
setTimeout(
() => {
onPress?.(e)
},
isHapticsDisabled ? 0 : 75,
)
}}
onPressIn={onPressIn} onPressIn={onPressIn}
onPressOut={onPressOut} onPressOut={onPressOut}
{...props}> {...props}>
@@ -50,7 +74,7 @@ export function FABInner({testID, icon, ...props}: FABProps) {
tabletSpacing, tabletSpacing,
isMobile && fabMinimalShellTransform, isMobile && fabMinimalShellTransform,
]}> ]}>
<Animated.View style={scale}> <Animated.View style={animatedStyle}>
<LinearGradient <LinearGradient
colors={[gradients.blueLight.start, gradients.blueLight.end]} colors={[gradients.blueLight.start, gradients.blueLight.end]}
start={{x: 0, y: 0}} start={{x: 0, y: 0}}