diff options
author | Paul Frazee <pfrazee@gmail.com> | 2023-09-05 10:42:19 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-05 10:42:19 -0700 |
commit | 764c7cd5694a41c98d8543b68d7791fa90db4291 (patch) | |
tree | 8a11af0aa0e898cf7fb57ab0354f9fb5d28f004e /src/view/screens/Feeds.tsx | |
parent | be8084ae103064d5680485f25e202c763957f2b4 (diff) | |
download | voidsky-764c7cd5694a41c98d8543b68d7791fa90db4291.tar.zst |
Updates to use dynamic/responsive styles on web (#1351)
* Move most responsive queries to the hook * Fix invalid CSS value * Fixes to tablet render of post thread * Fix overflow issues on web * Fix search header on tablet * Fix QP margin in web composer * Fix: only apply double gutter once to flatlist (close #1368) * Fix styles on discover feeds header * Fix double discover links in multifeed
Diffstat (limited to 'src/view/screens/Feeds.tsx')
-rw-r--r-- | src/view/screens/Feeds.tsx | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/view/screens/Feeds.tsx b/src/view/screens/Feeds.tsx index 7d45ce4c1..6e0706737 100644 --- a/src/view/screens/Feeds.tsx +++ b/src/view/screens/Feeds.tsx @@ -12,22 +12,23 @@ import {NativeStackScreenProps, FeedsTabNavigatorParams} from 'lib/routes/types' import {observer} from 'mobx-react-lite' import {PostsMultiFeedModel} from 'state/models/feeds/multi-feed' import {MultiFeed} from 'view/com/posts/MultiFeed' -import {isDesktopWeb} from 'platform/detection' import {usePalette} from 'lib/hooks/usePalette' import {useTimer} from 'lib/hooks/useTimer' import {useStores} from 'state/index' +import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries' import {useOnMainScroll} from 'lib/hooks/useOnMainScroll' import {ComposeIcon2, CogIcon} from 'lib/icons' import {s} from 'lib/styles' const LOAD_NEW_PROMPT_TIME = 60e3 // 60 seconds -const HEADER_OFFSET = isDesktopWeb ? 0 : 40 +const MOBILE_HEADER_OFFSET = 40 type Props = NativeStackScreenProps<FeedsTabNavigatorParams, 'Feeds'> export const FeedsScreen = withAuthRequired( observer<Props>(({}: Props) => { const pal = usePalette('default') const store = useStores() + const {isMobile} = useWebMediaQueries() const flatListRef = React.useRef<FlatList>(null) const multifeed = React.useMemo<PostsMultiFeedModel>( () => new PostsMultiFeedModel(store), @@ -105,14 +106,16 @@ export const FeedsScreen = withAuthRequired( multifeed={multifeed} onScroll={onMainScroll} scrollEventThrottle={100} - headerOffset={HEADER_OFFSET} - /> - <ViewHeader - title="My Feeds" - canGoBack={false} - hideOnScroll - renderButton={renderHeaderBtn} + headerOffset={isMobile ? MOBILE_HEADER_OFFSET : undefined} /> + {isMobile && ( + <ViewHeader + title="My Feeds" + canGoBack={false} + hideOnScroll + renderButton={renderHeaderBtn} + /> + )} {isScrolledDown || loadPromptVisible ? ( <LoadLatestBtn onPress={onSoftReset} |