Rename Home Feed Prefs to Following Feed Prefs (#2965)
parent
1ccb3be961
commit
894f00d687
|
@ -191,7 +191,7 @@ func serve(cctx *cli.Context) error {
|
||||||
e.GET("/settings", server.WebGeneric)
|
e.GET("/settings", server.WebGeneric)
|
||||||
e.GET("/settings/language", server.WebGeneric)
|
e.GET("/settings/language", server.WebGeneric)
|
||||||
e.GET("/settings/app-passwords", 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/saved-feeds", server.WebGeneric)
|
||||||
e.GET("/settings/threads", server.WebGeneric)
|
e.GET("/settings/threads", server.WebGeneric)
|
||||||
e.GET("/settings/external-embeds", server.WebGeneric)
|
e.GET("/settings/external-embeds", server.WebGeneric)
|
||||||
|
|
|
@ -71,7 +71,7 @@ import {AppPasswords} from 'view/screens/AppPasswords'
|
||||||
import {ModerationMutedAccounts} from 'view/screens/ModerationMutedAccounts'
|
import {ModerationMutedAccounts} from 'view/screens/ModerationMutedAccounts'
|
||||||
import {ModerationBlockedAccounts} from 'view/screens/ModerationBlockedAccounts'
|
import {ModerationBlockedAccounts} from 'view/screens/ModerationBlockedAccounts'
|
||||||
import {SavedFeeds} from 'view/screens/SavedFeeds'
|
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 {PreferencesThreads} from 'view/screens/PreferencesThreads'
|
||||||
import {PreferencesExternalEmbeds} from '#/view/screens/PreferencesExternalEmbeds'
|
import {PreferencesExternalEmbeds} from '#/view/screens/PreferencesExternalEmbeds'
|
||||||
import {createNativeStackNavigatorWithAuth} from './view/shell/createNativeStackNavigatorWithAuth'
|
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}}
|
options={{title: title(msg`Edit My Feeds`), requireAuth: true}}
|
||||||
/>
|
/>
|
||||||
<Stack.Screen
|
<Stack.Screen
|
||||||
name="PreferencesHomeFeed"
|
name="PreferencesFollowingFeed"
|
||||||
getComponent={() => PreferencesHomeFeed}
|
getComponent={() => PreferencesFollowingFeed}
|
||||||
options={{title: title(msg`Home Feed Preferences`), requireAuth: true}}
|
options={{
|
||||||
|
title: title(msg`Following Feed Preferences`),
|
||||||
|
requireAuth: true,
|
||||||
|
}}
|
||||||
/>
|
/>
|
||||||
<Stack.Screen
|
<Stack.Screen
|
||||||
name="PreferencesThreads"
|
name="PreferencesThreads"
|
||||||
|
|
|
@ -30,7 +30,7 @@ export type CommonNavigatorParams = {
|
||||||
CopyrightPolicy: undefined
|
CopyrightPolicy: undefined
|
||||||
AppPasswords: undefined
|
AppPasswords: undefined
|
||||||
SavedFeeds: undefined
|
SavedFeeds: undefined
|
||||||
PreferencesHomeFeed: undefined
|
PreferencesFollowingFeed: undefined
|
||||||
PreferencesThreads: undefined
|
PreferencesThreads: undefined
|
||||||
PreferencesExternalEmbeds: undefined
|
PreferencesExternalEmbeds: undefined
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,7 +24,7 @@ export const router = new Router({
|
||||||
Debug: '/sys/debug',
|
Debug: '/sys/debug',
|
||||||
Log: '/sys/log',
|
Log: '/sys/log',
|
||||||
AppPasswords: '/settings/app-passwords',
|
AppPasswords: '/settings/app-passwords',
|
||||||
PreferencesHomeFeed: '/settings/home-feed',
|
PreferencesFollowingFeed: '/settings/following-feed',
|
||||||
PreferencesThreads: '/settings/threads',
|
PreferencesThreads: '/settings/threads',
|
||||||
PreferencesExternalEmbeds: '/settings/external-embeds',
|
PreferencesExternalEmbeds: '/settings/external-embeds',
|
||||||
SavedFeeds: '/settings/saved-feeds',
|
SavedFeeds: '/settings/saved-feeds',
|
||||||
|
|
|
@ -138,7 +138,7 @@ export function FeedPage({
|
||||||
{hasSession && (
|
{hasSession && (
|
||||||
<TextLink
|
<TextLink
|
||||||
type="title-lg"
|
type="title-lg"
|
||||||
href="/settings/home-feed"
|
href="/settings/following-feed"
|
||||||
style={{fontWeight: 'bold'}}
|
style={{fontWeight: 'bold'}}
|
||||||
accessibilityLabel={_(msg`Feed Preferences`)}
|
accessibilityLabel={_(msg`Feed Preferences`)}
|
||||||
accessibilityHint=""
|
accessibilityHint=""
|
||||||
|
|
|
@ -77,10 +77,10 @@ export function HomeHeaderLayoutMobile({
|
||||||
)}
|
)}
|
||||||
<Link
|
<Link
|
||||||
testID="viewHeaderHomeFeedPrefsBtn"
|
testID="viewHeaderHomeFeedPrefsBtn"
|
||||||
href="/settings/home-feed"
|
href="/settings/following-feed"
|
||||||
hitSlop={HITSLOP_10}
|
hitSlop={HITSLOP_10}
|
||||||
accessibilityRole="button"
|
accessibilityRole="button"
|
||||||
accessibilityLabel={_(msg`Home Feed Preferences`)}
|
accessibilityLabel={_(msg`Following Feed Preferences`)}
|
||||||
accessibilityHint="">
|
accessibilityHint="">
|
||||||
<FontAwesomeIcon
|
<FontAwesomeIcon
|
||||||
icon="sliders"
|
icon="sliders"
|
||||||
|
|
|
@ -78,9 +78,9 @@ function RepliesThresholdInput({
|
||||||
|
|
||||||
type Props = NativeStackScreenProps<
|
type Props = NativeStackScreenProps<
|
||||||
CommonNavigatorParams,
|
CommonNavigatorParams,
|
||||||
'PreferencesHomeFeed'
|
'PreferencesFollowingFeed'
|
||||||
>
|
>
|
||||||
export function PreferencesHomeFeed({navigation}: Props) {
|
export function PreferencesFollowingFeed({navigation}: Props) {
|
||||||
const pal = usePalette('default')
|
const pal = usePalette('default')
|
||||||
const {_} = useLingui()
|
const {_} = useLingui()
|
||||||
const {isTabletOrDesktop} = useWebMediaQueries()
|
const {isTabletOrDesktop} = useWebMediaQueries()
|
||||||
|
@ -101,14 +101,14 @@ export function PreferencesHomeFeed({navigation}: Props) {
|
||||||
styles.container,
|
styles.container,
|
||||||
isTabletOrDesktop && styles.desktopContainer,
|
isTabletOrDesktop && styles.desktopContainer,
|
||||||
]}>
|
]}>
|
||||||
<ViewHeader title={_(msg`Home Feed Preferences`)} showOnDesktop />
|
<ViewHeader title={_(msg`Following Feed Preferences`)} showOnDesktop />
|
||||||
<View
|
<View
|
||||||
style={[
|
style={[
|
||||||
styles.titleSection,
|
styles.titleSection,
|
||||||
isTabletOrDesktop && {paddingTop: 20, paddingBottom: 20},
|
isTabletOrDesktop && {paddingTop: 20, paddingBottom: 20},
|
||||||
]}>
|
]}>
|
||||||
<Text type="xl" style={[pal.textLight, styles.description]}>
|
<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>
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
|
|
||||||
|
@ -260,7 +260,7 @@ export function PreferencesHomeFeed({navigation}: Props) {
|
||||||
<Text style={[pal.text, s.pb10]}>
|
<Text style={[pal.text, s.pb10]}>
|
||||||
<Trans>
|
<Trans>
|
||||||
Set this setting to "Yes" to show samples of your saved feeds in
|
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>
|
</Trans>
|
||||||
</Text>
|
</Text>
|
||||||
<ToggleButton
|
<ToggleButton
|
|
@ -241,8 +241,8 @@ export function SettingsScreen({}: Props) {
|
||||||
Toast.show(_(msg`Copied build version to clipboard`))
|
Toast.show(_(msg`Copied build version to clipboard`))
|
||||||
}, [_])
|
}, [_])
|
||||||
|
|
||||||
const openHomeFeedPreferences = React.useCallback(() => {
|
const openFollowingFeedPreferences = React.useCallback(() => {
|
||||||
navigation.navigate('PreferencesHomeFeed')
|
navigation.navigate('PreferencesFollowingFeed')
|
||||||
}, [navigation])
|
}, [navigation])
|
||||||
|
|
||||||
const openThreadsPreferences = React.useCallback(() => {
|
const openThreadsPreferences = React.useCallback(() => {
|
||||||
|
@ -529,7 +529,7 @@ export function SettingsScreen({}: Props) {
|
||||||
pal.view,
|
pal.view,
|
||||||
isSwitchingAccounts && styles.dimmed,
|
isSwitchingAccounts && styles.dimmed,
|
||||||
]}
|
]}
|
||||||
onPress={openHomeFeedPreferences}
|
onPress={openFollowingFeedPreferences}
|
||||||
accessibilityRole="button"
|
accessibilityRole="button"
|
||||||
accessibilityHint=""
|
accessibilityHint=""
|
||||||
accessibilityLabel={_(msg`Opens the home feed preferences`)}>
|
accessibilityLabel={_(msg`Opens the home feed preferences`)}>
|
||||||
|
@ -540,7 +540,7 @@ export function SettingsScreen({}: Props) {
|
||||||
/>
|
/>
|
||||||
</View>
|
</View>
|
||||||
<Text type="lg" style={pal.text}>
|
<Text type="lg" style={pal.text}>
|
||||||
<Trans>Home Feed Preferences</Trans>
|
<Trans>Following Feed Preferences</Trans>
|
||||||
</Text>
|
</Text>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
|
|
Loading…
Reference in New Issue