diff options
Diffstat (limited to 'src/view/screens')
-rw-r--r-- | src/view/screens/Feeds.tsx | 5 | ||||
-rw-r--r-- | src/view/screens/Notifications.tsx | 2 | ||||
-rw-r--r-- | src/view/screens/Search/Search.tsx | 11 |
3 files changed, 7 insertions, 11 deletions
diff --git a/src/view/screens/Feeds.tsx b/src/view/screens/Feeds.tsx index 837e58195..f3db5ef17 100644 --- a/src/view/screens/Feeds.tsx +++ b/src/view/screens/Feeds.tsx @@ -29,7 +29,7 @@ import {HITSLOP_10} from 'lib/constants' import {usePalette} from 'lib/hooks/usePalette' import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries' import {CogIcon, ComposeIcon2, MagnifyingGlassIcon2} from 'lib/icons' -import {FeedsTabNavigatorParams, NativeStackScreenProps} from 'lib/routes/types' +import {CommonNavigatorParams, NativeStackScreenProps} from 'lib/routes/types' import {cleanError} from 'lib/strings/errors' import {s} from 'lib/styles' import {FeedSourceCard} from 'view/com/feeds/FeedSourceCard' @@ -54,7 +54,7 @@ import {ListMagnifyingGlass_Stroke2_Corner0_Rounded} from '#/components/icons/Li import {ListSparkle_Stroke2_Corner0_Rounded} from '#/components/icons/ListSparkle' import hairlineWidth = StyleSheet.hairlineWidth -type Props = NativeStackScreenProps<FeedsTabNavigatorParams, 'Feeds'> +type Props = NativeStackScreenProps<CommonNavigatorParams, 'Feeds'> type FlatlistSlice = | { @@ -594,7 +594,6 @@ export function FeedsScreen(_props: Props) { {isMobile && ( <ViewHeader title={_(msg`Feeds`)} - canGoBack={false} renderButton={renderHeaderBtn} showBorder /> diff --git a/src/view/screens/Notifications.tsx b/src/view/screens/Notifications.tsx index 765b783e8..f1ae7945a 100644 --- a/src/view/screens/Notifications.tsx +++ b/src/view/screens/Notifications.tsx @@ -163,7 +163,7 @@ export function NotificationsScreen({}: Props) { return ( <CenteredView testID="notificationsScreen" - style={s.hContentRegion} + style={[s.hContentRegion, {paddingTop: 2}]} sideBorders={true}> <ViewHeader title={_(msg`Notifications`)} diff --git a/src/view/screens/Search/Search.tsx b/src/view/screens/Search/Search.tsx index 118a8be25..b6daf84b3 100644 --- a/src/view/screens/Search/Search.tsx +++ b/src/view/screens/Search/Search.tsx @@ -59,6 +59,7 @@ import {CenteredView, ScrollView} from '#/view/com/util/Views' import {SearchLinkCard, SearchProfileCard} from '#/view/shell/desktop/Search' import {ProfileCardFeedLoadingPlaceholder} from 'view/com/util/LoadingPlaceholder' import {atoms as a} from '#/alf' +import {Menu_Stroke2_Corner0_Rounded as Menu} from '#/components/icons/Menu' function Loader() { const pal = usePalette('default') @@ -712,11 +713,7 @@ export function SearchScreen( accessibilityRole="button" accessibilityLabel={_(msg`Menu`)} accessibilityHint={_(msg`Access navigation links and settings`)}> - <FontAwesomeIcon - icon="bars" - size={18} - color={pal.colors.textLight} - /> + <Menu size="lg" fill={pal.colors.textLight} /> </Pressable> )} <SearchInputBox @@ -1073,13 +1070,14 @@ function scrollToTopWeb() { } } -const HEADER_HEIGHT = 50 +const HEADER_HEIGHT = 46 const styles = StyleSheet.create({ header: { flexDirection: 'row', alignItems: 'center', paddingHorizontal: 12, + paddingLeft: 13, paddingVertical: 4, height: HEADER_HEIGHT, // @ts-ignore web only @@ -1092,7 +1090,6 @@ const styles = StyleSheet.create({ height: 30, borderRadius: 30, marginRight: 6, - paddingBottom: 2, alignItems: 'center', justifyContent: 'center', }, |