Improve Device Detection For Better Responsiveness (#1512)
* Refactor `useOnMainScroll` function to use responsive device detection - Replace static `isDesktopWeb` with `useWebMediaQueries` hook to enable dynamic device type detection. - Create `useDeviceLimits` hook to dynamically determine `DY_LIMIT_UP` and `DY_LIMIT_DOWN` based on device type. - Update dependency arrays for the `useCallback` hooks to include new dynamic variables. * Refactor styles to be responsive to device type - Create `useStyles` hook that generates styles object based on device type detected from `useWebMediaQueries`. - Replace static styles object with dynamic styles object generated from `useStyles` hook in components. - This allows `paddingLeft` values for 'ul' and 'ol' styles to adapt to device type dynamically. - This allows `maxWidth` values for 'metaItem'' styles to adapt to device type dynamically. * Remove `isDesktopWeb` in favor of `useWebMediaQueries().isDesktop` * Refactor `SplashScreen` component for responsive design * Revision based on review results * Fix isNative check --------- Co-authored-by: Paul Frazee <pfrazee@gmail.com>
This commit is contained in:
parent
2e5f73ff61
commit
2aae37d67b
9 changed files with 289 additions and 244 deletions
|
@ -4,13 +4,13 @@ import {usePalette} from 'lib/hooks/usePalette'
|
|||
import {useTheme} from 'lib/ThemeContext'
|
||||
import {Text} from './text/Text'
|
||||
import {TextLink} from './Link'
|
||||
import {isDesktopWeb} from 'platform/detection'
|
||||
import {
|
||||
H1 as ExpoH1,
|
||||
H2 as ExpoH2,
|
||||
H3 as ExpoH3,
|
||||
H4 as ExpoH4,
|
||||
} from '@expo/html-elements'
|
||||
import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries'
|
||||
|
||||
/**
|
||||
* These utilities are used to define long documents in an html-like
|
||||
|
@ -27,30 +27,35 @@ interface IsChildProps {
|
|||
// | React.ReactNode
|
||||
|
||||
export function H1({children}: React.PropsWithChildren<{}>) {
|
||||
const styles = useStyles()
|
||||
const pal = usePalette('default')
|
||||
const typography = useTheme().typography['title-xl']
|
||||
return <ExpoH1 style={[typography, pal.text, styles.h1]}>{children}</ExpoH1>
|
||||
}
|
||||
|
||||
export function H2({children}: React.PropsWithChildren<{}>) {
|
||||
const styles = useStyles()
|
||||
const pal = usePalette('default')
|
||||
const typography = useTheme().typography['title-lg']
|
||||
return <ExpoH2 style={[typography, pal.text, styles.h2]}>{children}</ExpoH2>
|
||||
}
|
||||
|
||||
export function H3({children}: React.PropsWithChildren<{}>) {
|
||||
const styles = useStyles()
|
||||
const pal = usePalette('default')
|
||||
const typography = useTheme().typography.title
|
||||
return <ExpoH3 style={[typography, pal.text, styles.h3]}>{children}</ExpoH3>
|
||||
}
|
||||
|
||||
export function H4({children}: React.PropsWithChildren<{}>) {
|
||||
const styles = useStyles()
|
||||
const pal = usePalette('default')
|
||||
const typography = useTheme().typography['title-sm']
|
||||
return <ExpoH4 style={[typography, pal.text, styles.h4]}>{children}</ExpoH4>
|
||||
}
|
||||
|
||||
export function P({children}: React.PropsWithChildren<{}>) {
|
||||
const styles = useStyles()
|
||||
const pal = usePalette('default')
|
||||
return (
|
||||
<Text type="md" style={[pal.text, styles.p]}>
|
||||
|
@ -60,6 +65,7 @@ export function P({children}: React.PropsWithChildren<{}>) {
|
|||
}
|
||||
|
||||
export function UL({children, isChild}: React.PropsWithChildren<IsChildProps>) {
|
||||
const styles = useStyles()
|
||||
return (
|
||||
<View style={[styles.ul, isChild && styles.ulChild]}>
|
||||
{markChildProps(children)}
|
||||
|
@ -68,6 +74,7 @@ export function UL({children, isChild}: React.PropsWithChildren<IsChildProps>) {
|
|||
}
|
||||
|
||||
export function OL({children, isChild}: React.PropsWithChildren<IsChildProps>) {
|
||||
const styles = useStyles()
|
||||
return (
|
||||
<View style={[styles.ol, isChild && styles.olChild]}>
|
||||
{markChildProps(children)}
|
||||
|
@ -79,6 +86,7 @@ export function LI({
|
|||
children,
|
||||
value,
|
||||
}: React.PropsWithChildren<{value?: string}>) {
|
||||
const styles = useStyles()
|
||||
const pal = usePalette('default')
|
||||
return (
|
||||
<View style={styles.li}>
|
||||
|
@ -91,6 +99,7 @@ export function LI({
|
|||
}
|
||||
|
||||
export function A({children, href}: React.PropsWithChildren<{href: string}>) {
|
||||
const styles = useStyles()
|
||||
const pal = usePalette('default')
|
||||
return (
|
||||
<TextLink
|
||||
|
@ -112,6 +121,7 @@ export function STRONG({children}: React.PropsWithChildren<{}>) {
|
|||
}
|
||||
|
||||
export function EM({children}: React.PropsWithChildren<{}>) {
|
||||
const styles = useStyles()
|
||||
const pal = usePalette('default')
|
||||
return (
|
||||
<Text type="md" style={[pal.text, styles.em]}>
|
||||
|
@ -132,58 +142,61 @@ function markChildProps(children: React.ReactNode) {
|
|||
})
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
h1: {
|
||||
marginTop: 20,
|
||||
marginBottom: 10,
|
||||
letterSpacing: 0.8,
|
||||
},
|
||||
h2: {
|
||||
marginTop: 20,
|
||||
marginBottom: 10,
|
||||
letterSpacing: 0.8,
|
||||
},
|
||||
h3: {
|
||||
marginTop: 0,
|
||||
marginBottom: 10,
|
||||
},
|
||||
h4: {
|
||||
marginTop: 0,
|
||||
marginBottom: 10,
|
||||
fontWeight: 'bold',
|
||||
},
|
||||
p: {
|
||||
marginBottom: 10,
|
||||
},
|
||||
ul: {
|
||||
marginBottom: 10,
|
||||
paddingLeft: isDesktopWeb ? 18 : 4,
|
||||
},
|
||||
ulChild: {
|
||||
paddingTop: 10,
|
||||
marginBottom: 0,
|
||||
},
|
||||
ol: {
|
||||
marginBottom: 10,
|
||||
paddingLeft: isDesktopWeb ? 18 : 4,
|
||||
},
|
||||
olChild: {
|
||||
paddingTop: 10,
|
||||
marginBottom: 0,
|
||||
},
|
||||
li: {
|
||||
flexDirection: 'row',
|
||||
paddingRight: 20,
|
||||
marginBottom: 10,
|
||||
},
|
||||
liBullet: {
|
||||
paddingRight: 10,
|
||||
},
|
||||
liText: {},
|
||||
a: {
|
||||
marginBottom: 10,
|
||||
},
|
||||
em: {
|
||||
fontStyle: 'italic',
|
||||
},
|
||||
})
|
||||
const useStyles = () => {
|
||||
const {isDesktop} = useWebMediaQueries()
|
||||
return StyleSheet.create({
|
||||
h1: {
|
||||
marginTop: 20,
|
||||
marginBottom: 10,
|
||||
letterSpacing: 0.8,
|
||||
},
|
||||
h2: {
|
||||
marginTop: 20,
|
||||
marginBottom: 10,
|
||||
letterSpacing: 0.8,
|
||||
},
|
||||
h3: {
|
||||
marginTop: 0,
|
||||
marginBottom: 10,
|
||||
},
|
||||
h4: {
|
||||
marginTop: 0,
|
||||
marginBottom: 10,
|
||||
fontWeight: 'bold',
|
||||
},
|
||||
p: {
|
||||
marginBottom: 10,
|
||||
},
|
||||
ul: {
|
||||
marginBottom: 10,
|
||||
paddingLeft: isDesktop ? 18 : 4,
|
||||
},
|
||||
ulChild: {
|
||||
paddingTop: 10,
|
||||
marginBottom: 0,
|
||||
},
|
||||
ol: {
|
||||
marginBottom: 10,
|
||||
paddingLeft: isDesktop ? 18 : 4,
|
||||
},
|
||||
olChild: {
|
||||
paddingTop: 10,
|
||||
marginBottom: 0,
|
||||
},
|
||||
li: {
|
||||
flexDirection: 'row',
|
||||
paddingRight: 20,
|
||||
marginBottom: 10,
|
||||
},
|
||||
liBullet: {
|
||||
paddingRight: 10,
|
||||
},
|
||||
liText: {},
|
||||
a: {
|
||||
marginBottom: 10,
|
||||
},
|
||||
em: {
|
||||
fontStyle: 'italic',
|
||||
},
|
||||
})
|
||||
}
|
||||
|
|
|
@ -24,10 +24,11 @@ import {NavigationProp} from 'lib/routes/types'
|
|||
import {router} from '../../../routes'
|
||||
import {useStores, RootStoreModel} from 'state/index'
|
||||
import {convertBskyAppUrlIfNeeded, isExternalUrl} from 'lib/strings/url-helpers'
|
||||
import {isAndroid, isDesktopWeb} from 'platform/detection'
|
||||
import {isAndroid} from 'platform/detection'
|
||||
import {sanitizeUrl} from '@braintree/sanitize-url'
|
||||
import {PressableWithHover} from './PressableWithHover'
|
||||
import FixedTouchableHighlight from '../pager/FixedTouchableHighlight'
|
||||
import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries'
|
||||
|
||||
type Event =
|
||||
| React.MouseEvent<HTMLAnchorElement, MouseEvent>
|
||||
|
@ -224,7 +225,9 @@ export const DesktopWebTextLink = observer(function DesktopWebTextLink({
|
|||
lineHeight,
|
||||
...props
|
||||
}: DesktopWebTextLinkProps) {
|
||||
if (isDesktopWeb) {
|
||||
const {isDesktop} = useWebMediaQueries()
|
||||
|
||||
if (isDesktop) {
|
||||
return (
|
||||
<TextLink
|
||||
testID={testID}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue