diff --git a/src/components/BottomNavigationBar/FeedButton.tsx b/src/components/BottomNavigationBar/RssButton.tsx similarity index 59% rename from src/components/BottomNavigationBar/FeedButton.tsx rename to src/components/BottomNavigationBar/RssButton.tsx index f1f94ec2..2937ca69 100644 --- a/src/components/BottomNavigationBar/FeedButton.tsx +++ b/src/components/BottomNavigationBar/RssButton.tsx @@ -1,24 +1,27 @@ import { usePrimaryPage, usePrimaryNoteView } from '@/PageManager' -import { Compass } from 'lucide-react' +import storage from '@/services/local-storage.service' +import { Rss } from 'lucide-react' import BottomNavigationBarItem from './BottomNavigationBarItem' -/** Relay explore / discovery (primary Explore page). */ -export default function FeedButton() { +export default function RssButton() { const { navigate, current, display } = usePrimaryPage() const { primaryViewType, setPrimaryNoteView } = usePrimaryNoteView() + const showRssFeed = storage.getShowRssFeed() + + if (!showRssFeed) return null return ( { if (primaryViewType !== null) { setPrimaryNoteView(null) } else { - navigate('explore') + navigate('rss') } }} > - + ) } diff --git a/src/components/BottomNavigationBar/index.tsx b/src/components/BottomNavigationBar/index.tsx index 78109894..6469becd 100644 --- a/src/components/BottomNavigationBar/index.tsx +++ b/src/components/BottomNavigationBar/index.tsx @@ -1,5 +1,5 @@ import { cn } from '@/lib/utils' -import FeedButton from './FeedButton' +import RssButton from './RssButton' import HomeButton from './HomeButton' import DiscussionsButton from './DiscussionsButton' import NotificationsButton from './NotificationsButton' @@ -20,7 +20,7 @@ export default function BottomNavigationBar() { > - + diff --git a/src/i18n/locales/de.ts b/src/i18n/locales/de.ts index a0887fa4..8bd1dafb 100644 --- a/src/i18n/locales/de.ts +++ b/src/i18n/locales/de.ts @@ -8,7 +8,7 @@ export default { Post: 'Beitrag', Home: 'Startseite', Feed: 'Feed', - 'Favorites Feed': 'Favoriten-Feed', + 'Favorites Feed': 'Favoriten', 'Pinned note': 'Angehefteter Beitrag', 'Relay settings': 'Relay-Einstellungen', Settings: 'Einstellungen', diff --git a/src/pages/primary/NoteListPage/index.tsx b/src/pages/primary/NoteListPage/index.tsx index 50eb10ed..ebfe8c60 100644 --- a/src/pages/primary/NoteListPage/index.tsx +++ b/src/pages/primary/NoteListPage/index.tsx @@ -8,7 +8,7 @@ import { useFeed } from '@/providers/FeedProvider' import { useNostr } from '@/providers/NostrProvider' import { useScreenSize } from '@/providers/ScreenSizeProvider' import { TPageRef } from '@/types' -import { Info } from 'lucide-react' +import { Compass, Info } from 'lucide-react' import React, { Dispatch, forwardRef, @@ -23,7 +23,7 @@ import { useTranslation } from 'react-i18next' import HelpAndAccountMenu from '@/components/HelpAndAccountMenu' import FollowingFeed from './FollowingFeed' import RelaysFeed from './RelaysFeed' -import { usePrimaryNoteView } from '@/PageManager' +import { usePrimaryNoteView, usePrimaryPage } from '@/PageManager' const NoteListPage = forwardRef((_, ref) => { const { t } = useTranslation() @@ -134,11 +134,32 @@ function NoteListPageTitlebar({ }) { const { t } = useTranslation() const { isSmallScreen } = useScreenSize() - const { setPrimaryNoteView } = usePrimaryNoteView() + const { navigate, current, display } = usePrimaryPage() + const { primaryViewType, setPrimaryNoteView } = usePrimaryNoteView() + const exploreActive = display && current === 'explore' && primaryViewType === null return (
-
-
{t('Favorites Feed')}
+
+ {isSmallScreen && ( + + )} +
{t('Favorites Feed')}
{isSmallScreen && (