diff options
-rw-r--r-- | bskyweb/cmd/bskyweb/server.go | 2 | ||||
-rw-r--r-- | src/Navigation.tsx | 11 | ||||
-rw-r--r-- | src/lib/routes/types.ts | 2 | ||||
-rw-r--r-- | src/routes.ts | 2 | ||||
-rw-r--r-- | src/view/com/feeds/FeedPage.tsx | 2 | ||||
-rw-r--r-- | src/view/com/home/HomeHeaderLayoutMobile.tsx | 4 | ||||
-rw-r--r-- | src/view/screens/PreferencesFollowingFeed.tsx (renamed from src/view/screens/PreferencesHomeFeed.tsx) | 10 | ||||
-rw-r--r-- | src/view/screens/Settings/index.tsx | 8 |
8 files changed, 22 insertions, 19 deletions
diff --git a/bskyweb/cmd/bskyweb/server.go b/bskyweb/cmd/bskyweb/server.go index 76b7bcc06..f4da22ca3 100644 --- a/bskyweb/cmd/bskyweb/server.go +++ b/bskyweb/cmd/bskyweb/server.go @@ -191,7 +191,7 @@ func serve(cctx *cli.Context) error { e.GET("/settings", server.WebGeneric) e.GET("/settings/language", server.WebGeneric) e.GET("/settings/app-passwords", server.WebGeneric) - e.GET("/settings/home-feed", server.WebGeneric) + e.GET("/settings/following-feed", server.WebGeneric) e.GET("/settings/saved-feeds", server.WebGeneric) e.GET("/settings/threads", server.WebGeneric) e.GET("/settings/external-embeds", server.WebGeneric) diff --git a/src/Navigation.tsx b/src/Navigation.tsx index 897d86e40..6ca4212e2 100644 --- a/src/Navigation.tsx +++ b/src/Navigation.tsx @@ -71,7 +71,7 @@ import {AppPasswords} from 'view/screens/AppPasswords' import {ModerationMutedAccounts} from 'view/screens/ModerationMutedAccounts' import {ModerationBlockedAccounts} from 'view/screens/ModerationBlockedAccounts' import {SavedFeeds} from 'view/screens/SavedFeeds' -import {PreferencesHomeFeed} from 'view/screens/PreferencesHomeFeed' +import {PreferencesFollowingFeed} from 'view/screens/PreferencesFollowingFeed' import {PreferencesThreads} from 'view/screens/PreferencesThreads' import {PreferencesExternalEmbeds} from '#/view/screens/PreferencesExternalEmbeds' import {createNativeStackNavigatorWithAuth} from './view/shell/createNativeStackNavigatorWithAuth' @@ -242,9 +242,12 @@ function commonScreens(Stack: typeof HomeTab, unreadCountLabel?: string) { options={{title: title(msg`Edit My Feeds`), requireAuth: true}} /> <Stack.Screen - name="PreferencesHomeFeed" - getComponent={() => PreferencesHomeFeed} - options={{title: title(msg`Home Feed Preferences`), requireAuth: true}} + name="PreferencesFollowingFeed" + getComponent={() => PreferencesFollowingFeed} + options={{ + title: title(msg`Following Feed Preferences`), + requireAuth: true, + }} /> <Stack.Screen name="PreferencesThreads" diff --git a/src/lib/routes/types.ts b/src/lib/routes/types.ts index 90ae75830..0fb36fa7c 100644 --- a/src/lib/routes/types.ts +++ b/src/lib/routes/types.ts @@ -30,7 +30,7 @@ export type CommonNavigatorParams = { CopyrightPolicy: undefined AppPasswords: undefined SavedFeeds: undefined - PreferencesHomeFeed: undefined + PreferencesFollowingFeed: undefined PreferencesThreads: undefined PreferencesExternalEmbeds: undefined } diff --git a/src/routes.ts b/src/routes.ts index e58fddd42..d17f15912 100644 --- a/src/routes.ts +++ b/src/routes.ts @@ -24,7 +24,7 @@ export const router = new Router({ Debug: '/sys/debug', Log: '/sys/log', AppPasswords: '/settings/app-passwords', - PreferencesHomeFeed: '/settings/home-feed', + PreferencesFollowingFeed: '/settings/following-feed', PreferencesThreads: '/settings/threads', PreferencesExternalEmbeds: '/settings/external-embeds', SavedFeeds: '/settings/saved-feeds', diff --git a/src/view/com/feeds/FeedPage.tsx b/src/view/com/feeds/FeedPage.tsx index d8da569b1..60814e837 100644 --- a/src/view/com/feeds/FeedPage.tsx +++ b/src/view/com/feeds/FeedPage.tsx @@ -138,7 +138,7 @@ export function FeedPage({ {hasSession && ( <TextLink type="title-lg" - href="/settings/home-feed" + href="/settings/following-feed" style={{fontWeight: 'bold'}} accessibilityLabel={_(msg`Feed Preferences`)} accessibilityHint="" diff --git a/src/view/com/home/HomeHeaderLayoutMobile.tsx b/src/view/com/home/HomeHeaderLayoutMobile.tsx index 0478f69a4..6c4b911f0 100644 --- a/src/view/com/home/HomeHeaderLayoutMobile.tsx +++ b/src/view/com/home/HomeHeaderLayoutMobile.tsx @@ -77,10 +77,10 @@ export function HomeHeaderLayoutMobile({ )} <Link testID="viewHeaderHomeFeedPrefsBtn" - href="/settings/home-feed" + href="/settings/following-feed" hitSlop={HITSLOP_10} accessibilityRole="button" - accessibilityLabel={_(msg`Home Feed Preferences`)} + accessibilityLabel={_(msg`Following Feed Preferences`)} accessibilityHint=""> <FontAwesomeIcon icon="sliders" diff --git a/src/view/screens/PreferencesHomeFeed.tsx b/src/view/screens/PreferencesFollowingFeed.tsx index 7ad870937..b4acbcd44 100644 --- a/src/view/screens/PreferencesHomeFeed.tsx +++ b/src/view/screens/PreferencesFollowingFeed.tsx @@ -78,9 +78,9 @@ function RepliesThresholdInput({ type Props = NativeStackScreenProps< CommonNavigatorParams, - 'PreferencesHomeFeed' + 'PreferencesFollowingFeed' > -export function PreferencesHomeFeed({navigation}: Props) { +export function PreferencesFollowingFeed({navigation}: Props) { const pal = usePalette('default') const {_} = useLingui() const {isTabletOrDesktop} = useWebMediaQueries() @@ -101,14 +101,14 @@ export function PreferencesHomeFeed({navigation}: Props) { styles.container, isTabletOrDesktop && styles.desktopContainer, ]}> - <ViewHeader title={_(msg`Home Feed Preferences`)} showOnDesktop /> + <ViewHeader title={_(msg`Following Feed Preferences`)} showOnDesktop /> <View style={[ styles.titleSection, isTabletOrDesktop && {paddingTop: 20, paddingBottom: 20}, ]}> <Text type="xl" style={[pal.textLight, styles.description]}> - <Trans>Fine-tune the content you see on your home screen.</Trans> + <Trans>Fine-tune the content you see on your Following feed.</Trans> </Text> </View> @@ -260,7 +260,7 @@ export function PreferencesHomeFeed({navigation}: Props) { <Text style={[pal.text, s.pb10]}> <Trans> Set this setting to "Yes" to show samples of your saved feeds in - your following feed. This is an experimental feature. + your Following feed. This is an experimental feature. </Trans> </Text> <ToggleButton diff --git a/src/view/screens/Settings/index.tsx b/src/view/screens/Settings/index.tsx index 9abf0f2bd..00b507a99 100644 --- a/src/view/screens/Settings/index.tsx +++ b/src/view/screens/Settings/index.tsx @@ -241,8 +241,8 @@ export function SettingsScreen({}: Props) { Toast.show(_(msg`Copied build version to clipboard`)) }, [_]) - const openHomeFeedPreferences = React.useCallback(() => { - navigation.navigate('PreferencesHomeFeed') + const openFollowingFeedPreferences = React.useCallback(() => { + navigation.navigate('PreferencesFollowingFeed') }, [navigation]) const openThreadsPreferences = React.useCallback(() => { @@ -529,7 +529,7 @@ export function SettingsScreen({}: Props) { pal.view, isSwitchingAccounts && styles.dimmed, ]} - onPress={openHomeFeedPreferences} + onPress={openFollowingFeedPreferences} accessibilityRole="button" accessibilityHint="" accessibilityLabel={_(msg`Opens the home feed preferences`)}> @@ -540,7 +540,7 @@ export function SettingsScreen({}: Props) { /> </View> <Text type="lg" style={pal.text}> - <Trans>Home Feed Preferences</Trans> + <Trans>Following Feed Preferences</Trans> </Text> </TouchableOpacity> <TouchableOpacity |