jollywhoppers.com
Bluesky app fork with some witchin' additions 💫
witchsky.app
bluesky
fork
client
Merge branch 'main' of https://github.com/AutumnAurelium/deer-social
+21
src/screens/Settings/DeerSettings.tsx
+21
src/screens/Settings/DeerSettings.tsx
···
34
useSetDirectFetchRecords,
35
} from '#/state/preferences/direct-fetch-records'
36
import {
37
useHideFollowNotifications,
38
useSetHideFollowNotifications,
39
} from '#/state/preferences/hide-follow-notifications'
···
227
228
const hideFollowNotifications = useHideFollowNotifications()
229
const setHideFollowNotifications = useSetHideFollowNotifications()
230
231
const constellationInstance = useConstellationInstance()
232
const setConstellationInstanceControl = Dialog.useDialogControl()
···
491
longer to load and use more bandwidth.
492
</Trans>
493
</Admonition>
494
</SettingsList.Group>
495
496
<SettingsList.Group contentContainerStyle={[a.gap_sm]}>
···
34
useSetDirectFetchRecords,
35
} from '#/state/preferences/direct-fetch-records'
36
import {
37
+
useHideFeedsPromoTab,
38
+
useSetHideFeedsPromoTab,
39
+
} from '#/state/preferences/hide-feeds-promo-tab'
40
+
import {
41
useHideFollowNotifications,
42
useSetHideFollowNotifications,
43
} from '#/state/preferences/hide-follow-notifications'
···
231
232
const hideFollowNotifications = useHideFollowNotifications()
233
const setHideFollowNotifications = useSetHideFollowNotifications()
234
+
235
+
const hideFeedsPromoTab = useHideFeedsPromoTab()
236
+
const setHideFeedsPromoTab = useSetHideFeedsPromoTab()
237
238
const constellationInstance = useConstellationInstance()
239
const setConstellationInstanceControl = Dialog.useDialogControl()
···
498
longer to load and use more bandwidth.
499
</Trans>
500
</Admonition>
501
+
502
+
<Toggle.Item
503
+
name="hide_feeds_promo_tab"
504
+
label={_(msg`Hide "Feeds ✨" tab when only one feed is selected`)}
505
+
value={hideFeedsPromoTab}
506
+
onChange={value => setHideFeedsPromoTab(value)}
507
+
style={[a.w_full]}>
508
+
<Toggle.LabelText style={[a.flex_1]}>
509
+
<Trans>
510
+
Hide "Feeds ✨" tab when only one feed is selected
511
+
</Trans>
512
+
</Toggle.LabelText>
513
+
<Toggle.Platform />
514
+
</Toggle.Item>
515
</SettingsList.Group>
516
517
<SettingsList.Group contentContainerStyle={[a.gap_sm]}>
+2
src/state/persisted/schema.ts
+2
src/state/persisted/schema.ts
···
134
hideFollowNotifications: z.boolean().optional(),
135
constellationInstance: z.string().optional(),
136
showLinkInHandle: z.boolean().optional(),
137
deerVerification: z
138
.object({
139
enabled: z.boolean(),
···
204
hideFollowNotifications: false,
205
constellationInstance: 'https://constellation.microcosm.blue/',
206
showLinkInHandle: false,
207
deerVerification: {
208
enabled: false,
209
// https://social.daniela.lol/profile/did:plc:p2cp5gopk7mgjegy6wadk3ep/post/3lndyqyyr4k2k
···
134
hideFollowNotifications: z.boolean().optional(),
135
constellationInstance: z.string().optional(),
136
showLinkInHandle: z.boolean().optional(),
137
+
hideFeedsPromoTab: z.boolean().optional(),
138
deerVerification: z
139
.object({
140
enabled: z.boolean(),
···
205
hideFollowNotifications: false,
206
constellationInstance: 'https://constellation.microcosm.blue/',
207
showLinkInHandle: false,
208
+
hideFeedsPromoTab: false,
209
deerVerification: {
210
enabled: false,
211
// https://social.daniela.lol/profile/did:plc:p2cp5gopk7mgjegy6wadk3ep/post/3lndyqyyr4k2k
+50
src/state/preferences/hide-feeds-promo-tab.tsx
+50
src/state/preferences/hide-feeds-promo-tab.tsx
···
···
1
+
import React from 'react'
2
+
3
+
import * as persisted from '#/state/persisted'
4
+
5
+
// Preference: hideFeedsPromoTab – when true, suppress the "Feeds ✨" promotional tab in HomeHeader.
6
+
7
+
type StateContext = persisted.Schema['hideFeedsPromoTab']
8
+
// Same setter signature used across other preference modules
9
+
type SetContext = (v: persisted.Schema['hideFeedsPromoTab']) => void
10
+
11
+
const stateContext = React.createContext<StateContext>(
12
+
persisted.defaults.hideFeedsPromoTab,
13
+
)
14
+
const setContext = React.createContext<SetContext>(
15
+
(_: persisted.Schema['hideFeedsPromoTab']) => {},
16
+
)
17
+
18
+
export function Provider({children}: React.PropsWithChildren<{}>) {
19
+
const [state, setState] = React.useState(persisted.get('hideFeedsPromoTab'))
20
+
21
+
const setStateWrapped = React.useCallback(
22
+
(value: persisted.Schema['hideFeedsPromoTab']) => {
23
+
setState(value)
24
+
persisted.write('hideFeedsPromoTab', value)
25
+
},
26
+
[setState],
27
+
)
28
+
29
+
React.useEffect(() => {
30
+
return persisted.onUpdate('hideFeedsPromoTab', next => {
31
+
setState(next)
32
+
})
33
+
}, [setStateWrapped])
34
+
35
+
return (
36
+
<stateContext.Provider value={state}>
37
+
<setContext.Provider value={setStateWrapped}>
38
+
{children}
39
+
</setContext.Provider>
40
+
</stateContext.Provider>
41
+
)
42
+
}
43
+
44
+
export function useHideFeedsPromoTab() {
45
+
return React.useContext(stateContext)
46
+
}
47
+
48
+
export function useSetHideFeedsPromoTab() {
49
+
return React.useContext(setContext)
50
+
}
+8
-1
src/state/preferences/index.tsx
+8
-1
src/state/preferences/index.tsx
···
10
import {Provider as ExternalEmbedsProvider} from './external-embeds-prefs'
11
import {Provider as GoLinksProvider} from './go-links-enabled'
12
import {Provider as HiddenPostsProvider} from './hidden-posts'
13
import {Provider as FollowNotificationsProvider} from './hide-follow-notifications'
14
import {Provider as HighQualityImagesProvider} from './high-quality-images'
15
import {Provider as InAppBrowserProvider} from './in-app-browser'
···
36
} from './external-embeds-prefs'
37
export {useGoLinksEnabled, useSetGoLinksEnabled} from './go-links-enabled'
38
export * from './hidden-posts'
39
export {useLabelDefinitions} from './label-defs'
40
export {useLanguagePrefs, useLanguagePrefsApi} from './languages'
41
export {useSetSubtitlesEnabled, useSubtitlesEnabled} from './subtitles'
···
65
<TrendingSettingsProvider>
66
<RepostCarouselProvider>
67
<KawaiiProvider>
68
-
{children}
69
</KawaiiProvider>
70
</RepostCarouselProvider>
71
</TrendingSettingsProvider>
···
10
import {Provider as ExternalEmbedsProvider} from './external-embeds-prefs'
11
import {Provider as GoLinksProvider} from './go-links-enabled'
12
import {Provider as HiddenPostsProvider} from './hidden-posts'
13
+
import {Provider as HideFeedsPromoTabProvider} from './hide-feeds-promo-tab'
14
import {Provider as FollowNotificationsProvider} from './hide-follow-notifications'
15
import {Provider as HighQualityImagesProvider} from './high-quality-images'
16
import {Provider as InAppBrowserProvider} from './in-app-browser'
···
37
} from './external-embeds-prefs'
38
export {useGoLinksEnabled, useSetGoLinksEnabled} from './go-links-enabled'
39
export * from './hidden-posts'
40
+
export {
41
+
useHideFeedsPromoTab,
42
+
useSetHideFeedsPromoTab,
43
+
} from './hide-feeds-promo-tab'
44
export {useLabelDefinitions} from './label-defs'
45
export {useLanguagePrefs, useLanguagePrefsApi} from './languages'
46
export {useSetSubtitlesEnabled, useSubtitlesEnabled} from './subtitles'
···
70
<TrendingSettingsProvider>
71
<RepostCarouselProvider>
72
<KawaiiProvider>
73
+
<HideFeedsPromoTabProvider>
74
+
{children}
75
+
</HideFeedsPromoTabProvider>
76
</KawaiiProvider>
77
</RepostCarouselProvider>
78
</TrendingSettingsProvider>
+16
-4
src/view/com/home/HomeHeader.tsx
+16
-4
src/view/com/home/HomeHeader.tsx
···
2
import {useNavigation} from '@react-navigation/native'
3
4
import {type NavigationProp} from '#/lib/routes/types'
5
import {type FeedSourceInfo} from '#/state/queries/feed'
6
import {useSession} from '#/state/session'
7
import {type RenderTabBarFnProps} from '#/view/com/pager/Pager'
···
17
) {
18
const {feeds, onSelect: onSelectProp} = props
19
const {hasSession} = useSession()
20
const navigation = useNavigation<NavigationProp>()
21
22
const hasPinnedCustom = React.useMemo<boolean>(() => {
···
29
30
const items = React.useMemo(() => {
31
const pinnedNames = feeds.map(f => f.displayName)
32
-
if (!hasPinnedCustom) {
33
return pinnedNames.concat('Feeds ✨')
34
}
35
return pinnedNames
36
-
}, [hasPinnedCustom, feeds])
37
38
const onPressFeedsLink = React.useCallback(() => {
39
navigation.navigate('Feeds')
···
41
42
const onSelect = React.useCallback(
43
(index: number) => {
44
-
if (!hasPinnedCustom && index === items.length - 1) {
45
onPressFeedsLink()
46
} else if (onSelectProp) {
47
onSelectProp(index)
48
}
49
},
50
-
[items.length, onPressFeedsLink, onSelectProp, hasPinnedCustom],
51
)
52
53
return (
···
2
import {useNavigation} from '@react-navigation/native'
3
4
import {type NavigationProp} from '#/lib/routes/types'
5
+
import {useHideFeedsPromoTab} from '#/state/preferences/hide-feeds-promo-tab'
6
import {type FeedSourceInfo} from '#/state/queries/feed'
7
import {useSession} from '#/state/session'
8
import {type RenderTabBarFnProps} from '#/view/com/pager/Pager'
···
18
) {
19
const {feeds, onSelect: onSelectProp} = props
20
const {hasSession} = useSession()
21
+
const hideFeedsPromoTab = useHideFeedsPromoTab()
22
const navigation = useNavigation<NavigationProp>()
23
24
const hasPinnedCustom = React.useMemo<boolean>(() => {
···
31
32
const items = React.useMemo(() => {
33
const pinnedNames = feeds.map(f => f.displayName)
34
+
if (!hasPinnedCustom && !hideFeedsPromoTab) {
35
return pinnedNames.concat('Feeds ✨')
36
}
37
return pinnedNames
38
+
}, [hasPinnedCustom, hideFeedsPromoTab, feeds])
39
40
const onPressFeedsLink = React.useCallback(() => {
41
navigation.navigate('Feeds')
···
43
44
const onSelect = React.useCallback(
45
(index: number) => {
46
+
if (
47
+
!hasPinnedCustom &&
48
+
!hideFeedsPromoTab &&
49
+
index === items.length - 1
50
+
) {
51
onPressFeedsLink()
52
} else if (onSelectProp) {
53
onSelectProp(index)
54
}
55
},
56
+
[
57
+
items.length,
58
+
onPressFeedsLink,
59
+
onSelectProp,
60
+
hasPinnedCustom,
61
+
hideFeedsPromoTab,
62
+
],
63
)
64
65
return (