diff --git a/src/view/com/home/HomeHeaderLayoutMobile.tsx b/src/view/com/home/HomeHeaderLayoutMobile.tsx index 95b49912e1..e2957d529e 100644 --- a/src/view/com/home/HomeHeaderLayoutMobile.tsx +++ b/src/view/com/home/HomeHeaderLayoutMobile.tsx @@ -1,5 +1,5 @@ import React from 'react' -import {StyleSheet, TouchableOpacity, View} from 'react-native' +import {StyleSheet, View} from 'react-native' import Animated from 'react-native-reanimated' import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome' import {FontAwesomeIconStyle} from '@fortawesome/react-native-fontawesome' @@ -13,6 +13,7 @@ import {useMinimalShellMode} from 'lib/hooks/useMinimalShellMode' import {usePalette} from 'lib/hooks/usePalette' import {isWeb} from 'platform/detection' import {Logo} from '#/view/icons/Logo' +import {Logotype} from '#/view/icons/Logotype' import {atoms} from '#/alf' import {ColorPalette_Stroke2_Corner0_Rounded as ColorPalette} from '#/components/icons/ColorPalette' import {Link as Link2} from '#/components/Link' @@ -38,25 +39,9 @@ export function HomeHeaderLayoutMobile({ headerHeight.value = e.nativeEvent.layout.height }}> - - - - - - + + - {IS_DEV && ( + {IS_DEV && false && ( @@ -75,7 +60,7 @@ export function HomeHeaderLayoutMobile({ {hasSession && ( { if (navigation.canGoBack()) { @@ -83,25 +82,17 @@ export function ProfileSubpageHeader({ ]}> - {canGoBack ? ( - - ) : ( - - )} + {children} @@ -184,11 +175,6 @@ const styles = StyleSheet.create({ width: 20, height: 30, }, - backBtnWide: { - width: 20, - height: 30, - paddingHorizontal: 6, - }, backIcon: { marginTop: 6, }, diff --git a/src/view/com/util/SimpleViewHeader.tsx b/src/view/com/util/SimpleViewHeader.tsx index 679e350637..3f1d98495d 100644 --- a/src/view/com/util/SimpleViewHeader.tsx +++ b/src/view/com/util/SimpleViewHeader.tsx @@ -10,7 +10,6 @@ import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome' import {useNavigation} from '@react-navigation/native' import {isWeb} from '#/platform/detection' -import {useAnalytics} from 'lib/analytics/analytics' import {usePalette} from 'lib/hooks/usePalette' import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries' import {NavigationProp} from 'lib/routes/types' @@ -28,7 +27,6 @@ export function SimpleViewHeader({ }>) { const pal = usePalette('default') const navigation = useNavigation() - const {track} = useAnalytics() const {isMobile} = useWebMediaQueries() const canGoBack = navigation.canGoBack() @@ -40,11 +38,6 @@ export function SimpleViewHeader({ } }, [navigation]) - const onPressMenu = React.useCallback(() => { - track('ViewHeader:MenuButtonClicked') - // TODO - }, [track]) - const Container = isMobile ? View : CenteredView return ( - {showBackButton ? ( + {showBackButton && canGoBack ? ( - {canGoBack ? ( - - ) : ( - - )} + ) : null} {children} diff --git a/src/view/com/util/ViewHeader.tsx b/src/view/com/util/ViewHeader.tsx index 85476de15a..606c118e13 100644 --- a/src/view/com/util/ViewHeader.tsx +++ b/src/view/com/util/ViewHeader.tsx @@ -6,7 +6,6 @@ import {msg} from '@lingui/macro' import {useLingui} from '@lingui/react' import {useNavigation} from '@react-navigation/native' -import {useAnalytics} from 'lib/analytics/analytics' import {useMinimalShellMode} from 'lib/hooks/useMinimalShellMode' import {usePalette} from 'lib/hooks/usePalette' import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries' @@ -39,8 +38,7 @@ export function ViewHeader({ const pal = usePalette('default') const {_} = useLingui() const navigation = useNavigation() - const {track} = useAnalytics() - const {isDesktop, isTablet} = useWebMediaQueries() + const {isDesktop} = useWebMediaQueries() const t = useTheme() const onPressBack = React.useCallback(() => { @@ -51,11 +49,6 @@ export function ViewHeader({ } }, [navigation]) - const onPressMenu = React.useCallback(() => { - track('ViewHeader:MenuButtonClicked') - // TODO - }, [track]) - if (isDesktop) { if (showOnDesktop) { return ( @@ -73,37 +66,37 @@ export function ViewHeader({ canGoBack = navigation.canGoBack() } + const showBackButtonAndCan = showBackButton && canGoBack return ( - - {showBackButton ? ( + + {showBackButtonAndCan ? ( - {canGoBack ? ( - - ) : !isTablet ? ( - - ) : null} + accessibilityHint=""> + ) : null} - + {title} @@ -111,7 +104,7 @@ export function ViewHeader({ {renderButton ? ( renderButton() ) : showBackButton ? ( - + ) : null} {subtitle ? ( @@ -263,11 +256,6 @@ const styles = StyleSheet.create({ width: 30, height: 30, }, - backBtnWide: { - width: 30, - height: 30, - paddingHorizontal: 6, - }, backIcon: { marginTop: 6, }, diff --git a/src/view/screens/Search/Search.tsx b/src/view/screens/Search/Search.tsx index ddbdfbee11..45b855835f 100644 --- a/src/view/screens/Search/Search.tsx +++ b/src/view/screens/Search/Search.tsx @@ -17,7 +17,6 @@ import {useLingui} from '@lingui/react' import AsyncStorage from '@react-native-async-storage/async-storage' import {useFocusEffect, useNavigation} from '@react-navigation/native' -import {useAnalytics} from '#/lib/analytics/analytics' import {HITSLOP_10} from '#/lib/constants' import {usePalette} from '#/lib/hooks/usePalette' import {MagnifyingGlassIcon} from '#/lib/icons' @@ -531,11 +530,10 @@ export function SearchScreen( const textInput = React.useRef(null) const {_} = useLingui() const pal = usePalette('default') - const {track} = useAnalytics() const moderationOpts = useModerationOpts() const search = useActorAutocompleteFn() const setMinimalShellMode = useSetMinimalShellMode() - const {isTabletOrDesktop, isTabletOrMobile} = useWebMediaQueries() + const {isTabletOrDesktop} = useWebMediaQueries() const searchDebounceTimeout = React.useRef( undefined, @@ -586,10 +584,6 @@ export function SearchScreen( loadSearchHistory() }, []) - const onPressMenu = React.useCallback(() => { - track('ViewHeader:MenuButtonClicked') - }, [track]) - const onPressCancelSearch = React.useCallback(() => { scrollToTopWeb() textInput.current?.blur() @@ -711,23 +705,6 @@ export function SearchScreen( isTabletOrDesktop && {paddingTop: 10}, ]} sideBorders={isTabletOrDesktop}> - {isTabletOrMobile && ( - - - - )} -