Ditch feeds, drop size
This commit is contained in:
@@ -36,10 +36,6 @@ import {
|
|||||||
Bell2_Filled_Corner0_Rounded as BellFilled,
|
Bell2_Filled_Corner0_Rounded as BellFilled,
|
||||||
Bell2_Stroke2_Corner0_Rounded as Bell,
|
Bell2_Stroke2_Corner0_Rounded as Bell,
|
||||||
} from '#/components/icons/Bell2'
|
} from '#/components/icons/Bell2'
|
||||||
import {
|
|
||||||
Hashtag_Filled_Corner0_Rounded as HashtagFilled,
|
|
||||||
Hashtag_Stroke2_Corner0_Rounded as Hashtag,
|
|
||||||
} from '#/components/icons/Hashtag'
|
|
||||||
import {
|
import {
|
||||||
HomeOpen_Filled_Corner0_Rounded as HomeFilled,
|
HomeOpen_Filled_Corner0_Rounded as HomeFilled,
|
||||||
HomeOpen_Stoke2_Corner0_Rounded as Home,
|
HomeOpen_Stoke2_Corner0_Rounded as Home,
|
||||||
@@ -67,14 +63,8 @@ export function BottomBar({navigation}: BottomTabBarProps) {
|
|||||||
const safeAreaInsets = useSafeAreaInsets()
|
const safeAreaInsets = useSafeAreaInsets()
|
||||||
const {track} = useAnalytics()
|
const {track} = useAnalytics()
|
||||||
const {footerHeight} = useShellLayout()
|
const {footerHeight} = useShellLayout()
|
||||||
const {
|
const {isAtHome, isAtSearch, isAtNotifications, isAtMyProfile, isAtMessages} =
|
||||||
isAtHome,
|
useNavigationTabState()
|
||||||
isAtSearch,
|
|
||||||
isAtFeeds,
|
|
||||||
isAtNotifications,
|
|
||||||
isAtMyProfile,
|
|
||||||
isAtMessages,
|
|
||||||
} = useNavigationTabState()
|
|
||||||
const numUnreadNotifications = useUnreadNotifications()
|
const numUnreadNotifications = useUnreadNotifications()
|
||||||
const numUnreadMessages = useUnreadMessageCount()
|
const numUnreadMessages = useUnreadMessageCount()
|
||||||
const {footerMinimalShellTransform} = useMinimalShellMode()
|
const {footerMinimalShellTransform} = useMinimalShellMode()
|
||||||
@@ -85,7 +75,7 @@ export function BottomBar({navigation}: BottomTabBarProps) {
|
|||||||
const accountSwitchControl = useDialogControl()
|
const accountSwitchControl = useDialogControl()
|
||||||
const playHaptic = useHaptics()
|
const playHaptic = useHaptics()
|
||||||
const gate = useGate()
|
const gate = useGate()
|
||||||
const iconWidth = 30
|
const iconWidth = 28
|
||||||
|
|
||||||
const showSignIn = React.useCallback(() => {
|
const showSignIn = React.useCallback(() => {
|
||||||
closeAllActiveElements()
|
closeAllActiveElements()
|
||||||
@@ -118,10 +108,6 @@ export function BottomBar({navigation}: BottomTabBarProps) {
|
|||||||
() => onPressTab('Search'),
|
() => onPressTab('Search'),
|
||||||
[onPressTab],
|
[onPressTab],
|
||||||
)
|
)
|
||||||
const onPressFeeds = React.useCallback(
|
|
||||||
() => onPressTab('Feeds'),
|
|
||||||
[onPressTab],
|
|
||||||
)
|
|
||||||
const onPressNotifications = React.useCallback(
|
const onPressNotifications = React.useCallback(
|
||||||
() => onPressTab('Notifications'),
|
() => onPressTab('Notifications'),
|
||||||
[onPressTab],
|
[onPressTab],
|
||||||
@@ -196,26 +182,6 @@ export function BottomBar({navigation}: BottomTabBarProps) {
|
|||||||
accessibilityLabel={_(msg`Search`)}
|
accessibilityLabel={_(msg`Search`)}
|
||||||
accessibilityHint=""
|
accessibilityHint=""
|
||||||
/>
|
/>
|
||||||
<Btn
|
|
||||||
testID="bottomBarFeedsBtn"
|
|
||||||
icon={
|
|
||||||
isAtFeeds ? (
|
|
||||||
<HashtagFilled
|
|
||||||
width={iconWidth}
|
|
||||||
style={[styles.ctrlIcon, pal.text, styles.feedsIcon]}
|
|
||||||
/>
|
|
||||||
) : (
|
|
||||||
<Hashtag
|
|
||||||
width={iconWidth}
|
|
||||||
style={[styles.ctrlIcon, pal.text, styles.feedsIcon]}
|
|
||||||
/>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
onPress={onPressFeeds}
|
|
||||||
accessibilityRole="tab"
|
|
||||||
accessibilityLabel={_(msg`Feeds`)}
|
|
||||||
accessibilityHint=""
|
|
||||||
/>
|
|
||||||
<Btn
|
<Btn
|
||||||
testID="bottomBarNotificationsBtn"
|
testID="bottomBarNotificationsBtn"
|
||||||
icon={
|
icon={
|
||||||
|
|||||||
@@ -26,10 +26,6 @@ import {
|
|||||||
Bell2_Filled_Corner0_Rounded as BellFilled,
|
Bell2_Filled_Corner0_Rounded as BellFilled,
|
||||||
Bell2_Stroke2_Corner0_Rounded as Bell,
|
Bell2_Stroke2_Corner0_Rounded as Bell,
|
||||||
} from '#/components/icons/Bell2'
|
} from '#/components/icons/Bell2'
|
||||||
import {
|
|
||||||
Hashtag_Filled_Corner0_Rounded as HashtagFilled,
|
|
||||||
Hashtag_Stroke2_Corner0_Rounded as Hashtag,
|
|
||||||
} from '#/components/icons/Hashtag'
|
|
||||||
import {
|
import {
|
||||||
HomeOpen_Filled_Corner0_Rounded as HomeFilled,
|
HomeOpen_Filled_Corner0_Rounded as HomeFilled,
|
||||||
HomeOpen_Stoke2_Corner0_Rounded as Home,
|
HomeOpen_Stoke2_Corner0_Rounded as Home,
|
||||||
@@ -55,7 +51,7 @@ export function BottomBarWeb() {
|
|||||||
const {requestSwitchToAccount} = useLoggedOutViewControls()
|
const {requestSwitchToAccount} = useLoggedOutViewControls()
|
||||||
const closeAllActiveElements = useCloseAllActiveElements()
|
const closeAllActiveElements = useCloseAllActiveElements()
|
||||||
const gate = useGate()
|
const gate = useGate()
|
||||||
const iconWidth = 28
|
const iconWidth = 26
|
||||||
|
|
||||||
const showSignIn = React.useCallback(() => {
|
const showSignIn = React.useCallback(() => {
|
||||||
closeAllActiveElements()
|
closeAllActiveElements()
|
||||||
@@ -105,17 +101,6 @@ export function BottomBarWeb() {
|
|||||||
|
|
||||||
{hasSession && (
|
{hasSession && (
|
||||||
<>
|
<>
|
||||||
<NavItem routeName="Feeds" href="/feeds">
|
|
||||||
{({isActive}) => {
|
|
||||||
const Icon = isActive ? HashtagFilled : Hashtag
|
|
||||||
return (
|
|
||||||
<Icon
|
|
||||||
width={iconWidth}
|
|
||||||
style={[styles.ctrlIcon, pal.text, styles.feedsIcon]}
|
|
||||||
/>
|
|
||||||
)
|
|
||||||
}}
|
|
||||||
</NavItem>
|
|
||||||
<NavItem routeName="Notifications" href="/notifications">
|
<NavItem routeName="Notifications" href="/notifications">
|
||||||
{({isActive}) => {
|
{({isActive}) => {
|
||||||
const Icon = isActive ? BellFilled : Bell
|
const Icon = isActive ? BellFilled : Bell
|
||||||
|
|||||||
@@ -288,7 +288,7 @@ export function DesktopLeftNav() {
|
|||||||
const numUnreadNotifications = useUnreadNotifications()
|
const numUnreadNotifications = useUnreadNotifications()
|
||||||
const numUnreadMessages = useUnreadMessageCount()
|
const numUnreadMessages = useUnreadMessageCount()
|
||||||
const gate = useGate()
|
const gate = useGate()
|
||||||
const iconWidth = isDesktop ? 28 : 32
|
const iconWidth = 28
|
||||||
|
|
||||||
if (!hasSession && !isDesktop) {
|
if (!hasSession && !isDesktop) {
|
||||||
return null
|
return null
|
||||||
|
|||||||
Reference in New Issue
Block a user