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/CustomFeed.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/CustomFeed.tsx')
-rw-r--r-- | src/view/screens/CustomFeed.tsx | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/src/view/screens/CustomFeed.tsx b/src/view/screens/CustomFeed.tsx index 01d499dad..f4e1b0eb7 100644 --- a/src/view/screens/CustomFeed.tsx +++ b/src/view/screens/CustomFeed.tsx @@ -22,7 +22,7 @@ import {ViewHeader} from 'view/com/util/ViewHeader' import {Button} from 'view/com/util/forms/Button' import {Text} from 'view/com/util/text/Text' import * as Toast from 'view/com/util/Toast' -import {isDesktopWeb} from 'platform/detection' +import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries' import {useSetTitle} from 'lib/hooks/useSetTitle' import {shareUrl} from 'lib/sharing' import {toShareUrl} from 'lib/strings/url-helpers' @@ -122,6 +122,7 @@ export const CustomFeedScreenInner = observer( ({route, feedOwnerDid}: Props & {feedOwnerDid: string}) => { const store = useStores() const pal = usePalette('default') + const {isTabletOrDesktop} = useWebMediaQueries() const {track} = useAnalytics() const {rkey, name: handleOrDid} = route.params const uri = useMemo( @@ -357,7 +358,7 @@ export const CustomFeedScreenInner = observer( )} </Text> )} - {isDesktopWeb && ( + {isTabletOrDesktop && ( <View style={[styles.headerBtns, styles.headerBtnsDesktop]}> <Button type={currentFeed?.isSaved ? 'default' : 'inverted'} @@ -452,7 +453,14 @@ export const CustomFeedScreenInner = observer( ) : null} </View> </View> - <View style={[styles.fakeSelector, pal.border]}> + <View + style={[ + styles.fakeSelector, + { + paddingHorizontal: isTabletOrDesktop ? 16 : 6, + }, + pal.border, + ]}> <View style={[styles.fakeSelectorItem, {borderColor: pal.colors.link}]}> <Text type="md-medium" style={[pal.text]}> @@ -474,6 +482,7 @@ export const CustomFeedScreenInner = observer( rkey, isPinned, onTogglePinned, + isTabletOrDesktop, ]) const renderEmptyState = React.useCallback(() => { @@ -486,7 +495,9 @@ export const CustomFeedScreenInner = observer( return ( <View style={s.hContentRegion}> - <ViewHeader title="" renderButton={currentFeed && renderHeaderBtns} /> + {!isTabletOrDesktop && ( + <ViewHeader title="" renderButton={currentFeed && renderHeaderBtns} /> + )} <Feed scrollElRef={scrollElRef} feed={algoFeed} @@ -495,6 +506,7 @@ export const CustomFeedScreenInner = observer( ListHeaderComponent={renderListHeaderComponent} renderEmptyState={renderEmptyState} extraData={[uri, isPinned]} + style={!isTabletOrDesktop ? {flex: 1} : undefined} /> {isScrolledDown ? ( <LoadLatestBtn @@ -550,7 +562,6 @@ const styles = StyleSheet.create({ }, fakeSelector: { flexDirection: 'row', - paddingHorizontal: isDesktopWeb ? 16 : 6, }, fakeSelectorItem: { paddingHorizontal: 12, |