From 9f001526d3ef52b2c079b1d6c17854f9315468a5 Mon Sep 17 00:00:00 2001 From: Hailey Date: Tue, 4 Jun 2024 11:31:54 -0700 Subject: [PATCH] Fix a few border nits (#4349) * replace w/ hairline width * no border for placeholder * few notifications screen fixes tablet * still show the border on desktop * Simp --------- Co-authored-by: Dan Abramov --- src/view/com/notifications/Feed.tsx | 7 ++++++- src/view/screens/Notifications.tsx | 8 ++++++-- src/view/screens/SavedFeeds.tsx | 15 +++++++-------- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/view/com/notifications/Feed.tsx b/src/view/com/notifications/Feed.tsx index c632ed5d..e2f12e84 100644 --- a/src/view/com/notifications/Feed.tsx +++ b/src/view/com/notifications/Feed.tsx @@ -129,7 +129,11 @@ export function Feed({ ) } else if (item === LOADING_ITEM) { return ( - + ) @@ -185,6 +189,7 @@ export function Feed({ desktopFixedHeight initialNumToRender={initialNumToRender} windowSize={11} + sideBorders={false} /> ) diff --git a/src/view/screens/Notifications.tsx b/src/view/screens/Notifications.tsx index 7e2fc68b..67b00021 100644 --- a/src/view/screens/Notifications.tsx +++ b/src/view/screens/Notifications.tsx @@ -29,6 +29,7 @@ import {colors, s} from 'lib/styles' import {TextLink} from 'view/com/util/Link' import {ListMethods} from 'view/com/util/List' import {LoadLatestBtn} from 'view/com/util/load-latest/LoadLatestBtn' +import {CenteredView} from 'view/com/util/Views' import {Feed} from '../com/notifications/Feed' import {FAB} from '../com/util/fab/FAB' import {MainScrollProvider} from '../com/util/MainScrollProvider' @@ -145,7 +146,10 @@ export function NotificationsScreen({}: Props) { }, [isDesktop, pal, hasNew]) return ( - + - + ) } diff --git a/src/view/screens/SavedFeeds.tsx b/src/view/screens/SavedFeeds.tsx index a3aee19d..d79c7708 100644 --- a/src/view/screens/SavedFeeds.tsx +++ b/src/view/screens/SavedFeeds.tsx @@ -32,6 +32,7 @@ import {NoFollowingFeed} from '#/screens/Feeds/NoFollowingFeed' import {NoSavedFeedsOfAnyType} from '#/screens/Feeds/NoSavedFeedsOfAnyType' import {atoms as a, useTheme} from '#/alf' import {FilterTimeline_Stroke2_Corner0_Rounded as FilterTimeline} from '#/components/icons/FilterTimeline' +import hairlineWidth = StyleSheet.hairlineWidth const HITSLOP_TOP = { top: 20, @@ -92,7 +93,7 @@ export function SavedFeeds({}: Props) { {noSavedFeedsOfAnyType && ( - + )} @@ -134,7 +135,7 @@ export function SavedFeeds({}: Props) { )} {noFollowingFeed && ( - + )} @@ -298,9 +299,10 @@ function ListItem({ )} {isPinned ? ( @@ -435,15 +437,12 @@ const styles = StyleSheet.create({ paddingHorizontal: 14, paddingTop: 20, paddingBottom: 10, - borderBottomWidth: 1, + borderBottomWidth: hairlineWidth, }, itemContainer: { flexDirection: 'row', alignItems: 'center', - borderBottomWidth: 1, - }, - noTopBorder: { - borderTopWidth: 0, + borderBottomWidth: hairlineWidth, }, footerText: { paddingHorizontal: 26,