diff options
Diffstat (limited to 'src/view/com')
-rw-r--r-- | src/view/com/notifications/Feed.tsx | 1 | ||||
-rw-r--r-- | src/view/com/posts/Feed.tsx | 2 | ||||
-rw-r--r-- | src/view/com/profile/ProfileHeader.tsx | 18 | ||||
-rw-r--r-- | src/view/com/util/FAB.tsx | 10 | ||||
-rw-r--r-- | src/view/com/util/ViewHeader.tsx | 2 | ||||
-rw-r--r-- | src/view/com/util/ViewSelector.tsx | 1 |
6 files changed, 21 insertions, 13 deletions
diff --git a/src/view/com/notifications/Feed.tsx b/src/view/com/notifications/Feed.tsx index da48059b8..09d5bf7b4 100644 --- a/src/view/com/notifications/Feed.tsx +++ b/src/view/com/notifications/Feed.tsx @@ -101,6 +101,7 @@ export const Feed = observer(function Feed({ refreshing={view.isRefreshing} onRefresh={onRefresh} onEndReached={onEndReached} + onEndReachedThreshold={0.6} onScroll={onScroll} contentContainerStyle={s.contentContainer} /> diff --git a/src/view/com/posts/Feed.tsx b/src/view/com/posts/Feed.tsx index f919c6208..5751faa68 100644 --- a/src/view/com/posts/Feed.tsx +++ b/src/view/com/posts/Feed.tsx @@ -168,7 +168,7 @@ export const Feed = observer(function Feed({ onScroll={onScroll} onRefresh={onRefresh} onEndReached={onEndReached} - onEndReachedThreshold={0.25} + onEndReachedThreshold={0.6} removeClippedSubviews={true} contentInset={{top: headerOffset}} contentOffset={{x: 0, y: headerOffset * -1}} diff --git a/src/view/com/profile/ProfileHeader.tsx b/src/view/com/profile/ProfileHeader.tsx index 087b1f39b..519d224ea 100644 --- a/src/view/com/profile/ProfileHeader.tsx +++ b/src/view/com/profile/ProfileHeader.tsx @@ -29,6 +29,8 @@ import {UserBanner} from '../util/UserBanner' import {usePalette} from 'lib/hooks/usePalette' import {useAnalytics} from 'lib/analytics' +const BACK_HITSLOP = {left: 30, top: 30, right: 30, bottom: 30} + export const ProfileHeader = observer(function ProfileHeader({ view, onRefreshAll, @@ -285,10 +287,12 @@ export const ProfileHeader = observer(function ProfileHeader({ </View> ) : undefined} </View> - <TouchableWithoutFeedback onPress={onPressBack}> - <BlurView style={styles.backBtn} blurType="dark"> - <FontAwesomeIcon size={18} icon="angle-left" style={s.white} /> - </BlurView> + <TouchableWithoutFeedback onPress={onPressBack} hitSlop={BACK_HITSLOP}> + <View style={styles.backBtnWrapper}> + <BlurView style={styles.backBtn} blurType="dark"> + <FontAwesomeIcon size={18} icon="angle-left" style={s.white} /> + </BlurView> + </View> </TouchableWithoutFeedback> <TouchableWithoutFeedback testID="profileHeaderAviButton" @@ -312,12 +316,16 @@ const styles = StyleSheet.create({ width: '100%', height: 120, }, - backBtn: { + backBtnWrapper: { position: 'absolute', top: 10, left: 10, width: 30, height: 30, + }, + backBtn: { + width: 30, + height: 30, borderRadius: 15, alignItems: 'center', justifyContent: 'center', diff --git a/src/view/com/util/FAB.tsx b/src/view/com/util/FAB.tsx index 007ca0ee4..3427d368e 100644 --- a/src/view/com/util/FAB.tsx +++ b/src/view/com/util/FAB.tsx @@ -7,9 +7,7 @@ import { TouchableWithoutFeedback, } from 'react-native' import LinearGradient from 'react-native-linear-gradient' -import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome' -import {IconProp} from '@fortawesome/fontawesome-svg-core' -import {colors, gradients} from 'lib/styles' +import {gradients} from 'lib/styles' import {useAnimatedValue} from 'lib/hooks/useAnimatedValue' import {useStores} from 'state/index' @@ -21,7 +19,7 @@ export const FAB = observer( onPress, }: { testID?: string - icon: IconProp + icon: JSX.Element onPress: OnPress }) => { const store = useStores() @@ -45,7 +43,7 @@ export const FAB = observer( start={{x: 0, y: 0}} end={{x: 1, y: 1}} style={styles.inner}> - <FontAwesomeIcon size={24} icon={icon} color={colors.white} /> + {icon} </LinearGradient> </Animated.View> </TouchableWithoutFeedback> @@ -57,7 +55,7 @@ const styles = StyleSheet.create({ outer: { position: 'absolute', zIndex: 1, - right: 22, + right: 28, bottom: 94, width: 60, height: 60, diff --git a/src/view/com/util/ViewHeader.tsx b/src/view/com/util/ViewHeader.tsx index fe195c7b1..ffd1b1d63 100644 --- a/src/view/com/util/ViewHeader.tsx +++ b/src/view/com/util/ViewHeader.tsx @@ -10,7 +10,7 @@ import {useAnimatedValue} from 'lib/hooks/useAnimatedValue' import {useAnalytics} from 'lib/analytics' import {isDesktopWeb} from '../../../platform/detection' -const BACK_HITSLOP = {left: 10, top: 10, right: 30, bottom: 10} +const BACK_HITSLOP = {left: 20, top: 20, right: 50, bottom: 20} export const ViewHeader = observer(function ViewHeader({ title, diff --git a/src/view/com/util/ViewSelector.tsx b/src/view/com/util/ViewSelector.tsx index b786c2290..e1280fd82 100644 --- a/src/view/com/util/ViewSelector.tsx +++ b/src/view/com/util/ViewSelector.tsx @@ -100,6 +100,7 @@ export function ViewSelector({ onScroll={onScroll} onRefresh={onRefresh} onEndReached={onEndReached} + onEndReachedThreshold={0.6} contentContainerStyle={s.contentContainer} removeClippedSubviews={true} /> |