hide bottom bar border for cleaner look
This commit is contained in:
@@ -73,6 +73,7 @@ import {Provider as PortalProvider} from '#/components/Portal'
|
|||||||
import {Splash} from '#/Splash'
|
import {Splash} from '#/Splash'
|
||||||
import {BottomSheetProvider} from '../modules/bottom-sheet'
|
import {BottomSheetProvider} from '../modules/bottom-sheet'
|
||||||
import {BackgroundNotificationPreferencesProvider} from '../modules/expo-background-notification-handler/src/BackgroundNotificationHandlerProvider'
|
import {BackgroundNotificationPreferencesProvider} from '../modules/expo-background-notification-handler/src/BackgroundNotificationHandlerProvider'
|
||||||
|
import {Provider as HideBottomBarBorderProvider} from './lib/hooks/useHideBottomBarBorder'
|
||||||
|
|
||||||
SplashScreen.preventAutoHideAsync()
|
SplashScreen.preventAutoHideAsync()
|
||||||
if (isIOS) {
|
if (isIOS) {
|
||||||
@@ -152,6 +153,7 @@ function InnerApp() {
|
|||||||
<ProgressGuideProvider>
|
<ProgressGuideProvider>
|
||||||
<ServiceAccountManager>
|
<ServiceAccountManager>
|
||||||
<UnstablePostSourceProvider>
|
<UnstablePostSourceProvider>
|
||||||
|
<HideBottomBarBorderProvider>
|
||||||
<GestureHandlerRootView
|
<GestureHandlerRootView
|
||||||
style={s.h100pct}>
|
style={s.h100pct}>
|
||||||
<IntentDialogProvider>
|
<IntentDialogProvider>
|
||||||
@@ -160,6 +162,7 @@ function InnerApp() {
|
|||||||
<NuxDialogs />
|
<NuxDialogs />
|
||||||
</IntentDialogProvider>
|
</IntentDialogProvider>
|
||||||
</GestureHandlerRootView>
|
</GestureHandlerRootView>
|
||||||
|
</HideBottomBarBorderProvider>
|
||||||
</UnstablePostSourceProvider>
|
</UnstablePostSourceProvider>
|
||||||
</ServiceAccountManager>
|
</ServiceAccountManager>
|
||||||
</ProgressGuideProvider>
|
</ProgressGuideProvider>
|
||||||
|
|||||||
@@ -62,6 +62,7 @@ import {useStarterPackEntry} from '#/components/hooks/useStarterPackEntry'
|
|||||||
import {Provider as IntentDialogProvider} from '#/components/intents/IntentDialogs'
|
import {Provider as IntentDialogProvider} from '#/components/intents/IntentDialogs'
|
||||||
import {Provider as PortalProvider} from '#/components/Portal'
|
import {Provider as PortalProvider} from '#/components/Portal'
|
||||||
import {BackgroundNotificationPreferencesProvider} from '../modules/expo-background-notification-handler/src/BackgroundNotificationHandlerProvider'
|
import {BackgroundNotificationPreferencesProvider} from '../modules/expo-background-notification-handler/src/BackgroundNotificationHandlerProvider'
|
||||||
|
import {Provider as HideBottomBarBorderProvider} from './lib/hooks/useHideBottomBarBorder'
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Begin geolocation ASAP
|
* Begin geolocation ASAP
|
||||||
@@ -133,10 +134,12 @@ function InnerApp() {
|
|||||||
<ProgressGuideProvider>
|
<ProgressGuideProvider>
|
||||||
<ServiceConfigProvider>
|
<ServiceConfigProvider>
|
||||||
<UnstablePostSourceProvider>
|
<UnstablePostSourceProvider>
|
||||||
|
<HideBottomBarBorderProvider>
|
||||||
<IntentDialogProvider>
|
<IntentDialogProvider>
|
||||||
<Shell />
|
<Shell />
|
||||||
<NuxDialogs />
|
<NuxDialogs />
|
||||||
</IntentDialogProvider>
|
</IntentDialogProvider>
|
||||||
|
</HideBottomBarBorderProvider>
|
||||||
</UnstablePostSourceProvider>
|
</UnstablePostSourceProvider>
|
||||||
</ServiceConfigProvider>
|
</ServiceConfigProvider>
|
||||||
</ProgressGuideProvider>
|
</ProgressGuideProvider>
|
||||||
|
|||||||
@@ -0,0 +1,50 @@
|
|||||||
|
import {createContext, useCallback, useContext, useState} from 'react'
|
||||||
|
import {useFocusEffect} from '@react-navigation/native'
|
||||||
|
|
||||||
|
type HideBottomBarBorderSetter = () => () => void
|
||||||
|
|
||||||
|
const HideBottomBarBorderContext = createContext<boolean>(false)
|
||||||
|
const HideBottomBarBorderSetterContext =
|
||||||
|
createContext<HideBottomBarBorderSetter | null>(null)
|
||||||
|
|
||||||
|
export function useHideBottomBarBorderSetter() {
|
||||||
|
const hideBottomBarBorder = useContext(HideBottomBarBorderSetterContext)
|
||||||
|
if (!hideBottomBarBorder) {
|
||||||
|
throw new Error(
|
||||||
|
'useHideBottomBarBorderSetter must be used within a HideBottomBarBorderProvider',
|
||||||
|
)
|
||||||
|
}
|
||||||
|
return hideBottomBarBorder
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useHideBottomBarBorderForScreen() {
|
||||||
|
const hideBorder = useHideBottomBarBorderSetter()
|
||||||
|
|
||||||
|
useFocusEffect(
|
||||||
|
useCallback(() => {
|
||||||
|
const cleanup = hideBorder()
|
||||||
|
return () => cleanup()
|
||||||
|
}, [hideBorder]),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useHideBottomBarBorder() {
|
||||||
|
return useContext(HideBottomBarBorderContext)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function Provider({children}: {children: React.ReactNode}) {
|
||||||
|
const [refCount, setRefCount] = useState(0)
|
||||||
|
|
||||||
|
const setter = useCallback(() => {
|
||||||
|
setRefCount(prev => prev + 1)
|
||||||
|
return () => setRefCount(prev => prev - 1)
|
||||||
|
}, [])
|
||||||
|
|
||||||
|
return (
|
||||||
|
<HideBottomBarBorderSetterContext.Provider value={setter}>
|
||||||
|
<HideBottomBarBorderContext.Provider value={refCount > 0}>
|
||||||
|
{children}
|
||||||
|
</HideBottomBarBorderContext.Provider>
|
||||||
|
</HideBottomBarBorderSetterContext.Provider>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -5,6 +5,7 @@ import {useLingui} from '@lingui/react'
|
|||||||
|
|
||||||
import {PressableScale} from '#/lib/custom-animations/PressableScale'
|
import {PressableScale} from '#/lib/custom-animations/PressableScale'
|
||||||
import {useHaptics} from '#/lib/haptics'
|
import {useHaptics} from '#/lib/haptics'
|
||||||
|
import {useHideBottomBarBorderForScreen} from '#/lib/hooks/useHideBottomBarBorder'
|
||||||
import {useProfileQuery} from '#/state/queries/profile'
|
import {useProfileQuery} from '#/state/queries/profile'
|
||||||
import {useSession} from '#/state/session'
|
import {useSession} from '#/state/session'
|
||||||
import {UserAvatar} from '#/view/com/util/UserAvatar'
|
import {UserAvatar} from '#/view/com/util/UserAvatar'
|
||||||
@@ -29,6 +30,8 @@ export function PostThreadComposePrompt({
|
|||||||
onOut: onHoverOut,
|
onOut: onHoverOut,
|
||||||
} = useInteractionState()
|
} = useInteractionState()
|
||||||
|
|
||||||
|
useHideBottomBarBorderForScreen()
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View
|
<View
|
||||||
style={[
|
style={[
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import {PressableScale} from '#/lib/custom-animations/PressableScale'
|
|||||||
import {BOTTOM_BAR_AVI} from '#/lib/demo'
|
import {BOTTOM_BAR_AVI} from '#/lib/demo'
|
||||||
import {useHaptics} from '#/lib/haptics'
|
import {useHaptics} from '#/lib/haptics'
|
||||||
import {useDedupe} from '#/lib/hooks/useDedupe'
|
import {useDedupe} from '#/lib/hooks/useDedupe'
|
||||||
|
import {useHideBottomBarBorder} from '#/lib/hooks/useHideBottomBarBorder'
|
||||||
import {useMinimalShellFooterTransform} from '#/lib/hooks/useMinimalShellTransform'
|
import {useMinimalShellFooterTransform} from '#/lib/hooks/useMinimalShellTransform'
|
||||||
import {useNavigationTabState} from '#/lib/hooks/useNavigationTabState'
|
import {useNavigationTabState} from '#/lib/hooks/useNavigationTabState'
|
||||||
import {usePalette} from '#/lib/hooks/usePalette'
|
import {usePalette} from '#/lib/hooks/usePalette'
|
||||||
@@ -73,6 +74,7 @@ export function BottomBar({navigation}: BottomTabBarProps) {
|
|||||||
const playHaptic = useHaptics()
|
const playHaptic = useHaptics()
|
||||||
const hasHomeBadge = useHomeBadge()
|
const hasHomeBadge = useHomeBadge()
|
||||||
const gate = useGate()
|
const gate = useGate()
|
||||||
|
const hideBorder = useHideBottomBarBorder()
|
||||||
const iconWidth = 28
|
const iconWidth = 28
|
||||||
|
|
||||||
const showSignIn = useCallback(() => {
|
const showSignIn = useCallback(() => {
|
||||||
@@ -146,7 +148,7 @@ export function BottomBar({navigation}: BottomTabBarProps) {
|
|||||||
style={[
|
style={[
|
||||||
styles.bottomBar,
|
styles.bottomBar,
|
||||||
pal.view,
|
pal.view,
|
||||||
pal.border,
|
hideBorder ? {borderColor: pal.view.backgroundColor} : pal.border,
|
||||||
{paddingBottom: clamp(safeAreaInsets.bottom, 15, 60)},
|
{paddingBottom: clamp(safeAreaInsets.bottom, 15, 60)},
|
||||||
footerMinimalShellTransform,
|
footerMinimalShellTransform,
|
||||||
]}
|
]}
|
||||||
|
|||||||
@@ -5,16 +5,18 @@ import {msg, plural, Trans} from '@lingui/macro'
|
|||||||
import {useLingui} from '@lingui/react'
|
import {useLingui} from '@lingui/react'
|
||||||
import {useNavigationState} from '@react-navigation/native'
|
import {useNavigationState} from '@react-navigation/native'
|
||||||
|
|
||||||
|
import {useHideBottomBarBorder} from '#/lib/hooks/useHideBottomBarBorder'
|
||||||
import {useMinimalShellFooterTransform} from '#/lib/hooks/useMinimalShellTransform'
|
import {useMinimalShellFooterTransform} from '#/lib/hooks/useMinimalShellTransform'
|
||||||
import {getCurrentRoute, isTab} from '#/lib/routes/helpers'
|
import {getCurrentRoute, isTab} from '#/lib/routes/helpers'
|
||||||
import {makeProfileLink} from '#/lib/routes/links'
|
import {makeProfileLink} from '#/lib/routes/links'
|
||||||
import {CommonNavigatorParams} from '#/lib/routes/types'
|
import {type CommonNavigatorParams} from '#/lib/routes/types'
|
||||||
import {useGate} from '#/lib/statsig/statsig'
|
import {useGate} from '#/lib/statsig/statsig'
|
||||||
import {useHomeBadge} from '#/state/home-badge'
|
import {useHomeBadge} from '#/state/home-badge'
|
||||||
import {useUnreadMessageCount} from '#/state/queries/messages/list-conversations'
|
import {useUnreadMessageCount} from '#/state/queries/messages/list-conversations'
|
||||||
import {useUnreadNotifications} from '#/state/queries/notifications/unread'
|
import {useUnreadNotifications} from '#/state/queries/notifications/unread'
|
||||||
import {useSession} from '#/state/session'
|
import {useSession} from '#/state/session'
|
||||||
import {useLoggedOutViewControls} from '#/state/shell/logged-out'
|
import {useLoggedOutViewControls} from '#/state/shell/logged-out'
|
||||||
|
import {useShellLayout} from '#/state/shell/shell-layout'
|
||||||
import {useCloseAllActiveElements} from '#/state/util'
|
import {useCloseAllActiveElements} from '#/state/util'
|
||||||
import {Link} from '#/view/com/util/Link'
|
import {Link} from '#/view/com/util/Link'
|
||||||
import {Logo} from '#/view/icons/Logo'
|
import {Logo} from '#/view/icons/Logo'
|
||||||
@@ -49,6 +51,8 @@ export function BottomBarWeb() {
|
|||||||
const footerMinimalShellTransform = useMinimalShellFooterTransform()
|
const footerMinimalShellTransform = useMinimalShellFooterTransform()
|
||||||
const {requestSwitchToAccount} = useLoggedOutViewControls()
|
const {requestSwitchToAccount} = useLoggedOutViewControls()
|
||||||
const closeAllActiveElements = useCloseAllActiveElements()
|
const closeAllActiveElements = useCloseAllActiveElements()
|
||||||
|
const {footerHeight} = useShellLayout()
|
||||||
|
const hideBorder = useHideBottomBarBorder()
|
||||||
const iconWidth = 26
|
const iconWidth = 26
|
||||||
|
|
||||||
const unreadMessageCount = useUnreadMessageCount()
|
const unreadMessageCount = useUnreadMessageCount()
|
||||||
@@ -74,9 +78,12 @@ export function BottomBarWeb() {
|
|||||||
styles.bottomBar,
|
styles.bottomBar,
|
||||||
styles.bottomBarWeb,
|
styles.bottomBarWeb,
|
||||||
t.atoms.bg,
|
t.atoms.bg,
|
||||||
t.atoms.border_contrast_low,
|
hideBorder
|
||||||
|
? {borderColor: t.atoms.bg.backgroundColor}
|
||||||
|
: t.atoms.border_contrast_low,
|
||||||
footerMinimalShellTransform,
|
footerMinimalShellTransform,
|
||||||
]}>
|
]}
|
||||||
|
onLayout={event => footerHeight.set(event.nativeEvent.layout.height)}>
|
||||||
{hasSession ? (
|
{hasSession ? (
|
||||||
<>
|
<>
|
||||||
<NavItem
|
<NavItem
|
||||||
|
|||||||
Reference in New Issue
Block a user