61004b887b
* WIP * Sorting working * Rough handling of hidden/muted * Better muted/hidden sorting and handling * Clarify some naming * Fix parents * Handle first reply under highlighted/composer * WIP RaW * WIP optimistic * Optimistic WIP * Little cleanup, inserting dupes * Re-org * Add in new optimistic insert logic * Update types * Sorta working linear view optimistic state * Simple working version, no pref for OP * Working optimistic reply insertions, preference for OP * Ensure deletes are coming through * WIP scroll handling * WIP scroll tweaks * Clean up scrolling * Clean up onPostSuccess * Add annotations * Fix highlighted post calc * WIP kill me * Update APIs * Nvm don't kill me * Fix optimistic insert * Handle read more cases in tree view * Basically working read more * Handle linear view * Reorg * More reorg * Split up thread post components * New reply tree layout * Fix up traversal metadata * Tighten some spacing * Use indent ya idiot * Some linear mode cleanup * Fix lines on read more items * Vibe coding to success * Almost there with read mores * Update APIs * Bump sdk * Update import * Checkpoint new traversal * Checkpoint cleanup * Checkpoint, need to fix blocked posts * Checkpoint: think we're good, needs more cleanup * Clean it up * Two passes only * Set to default params, update comment * Fix render bug on native * Checkpoint parent rendering, can opt for slower handling here * Clean up parent handling, reply handling * Fix read more extra space * Fix read more in linear view * Fix hidden reply handling, seen count, before/after calc * Update naming * Rename Slice to ThreadItem * Add basic post and anchor skeletons * Refactor client-side hidden * WIP hidden fetching * Update types * Clean up query a bit * Scrolling still broken * Ok maybe fix scrolling * Checkpoint move state into meta query * Don't load remote hidden items unless needed * skeleton view * Reset hidden items when params change * Split up traversal and avoid multiple passes * Clean up * Checkpoint: handling exhausted replies * Clean up traversal functions further * Clean up pagination * Limit optimistic reply depth * Handle optimistic insert in hidden replies * Share root query key for easier cache extraction * Make blurred posts not look like ass * Fix double deleted item * Make optimistic deleted state not look like crap in tree view * Fix parents traversal 4 real * Rename tree post * Make optimistic deletions of linear posts not look bad * Rename linear post components * Handle tombstone views * Rename read more component * Add moreParents handling * Align interaction states of read more * Fix read more on FF * Tree view skeleton * Reply composer skele * Remove hack for showing more replies * Checkpoint: sort change scrolling fixed * Checkpoint: learned new things, reset to base * Feature gate * Rename * Replace show more * Update settings screen * Update pkg and endpoint * Remove console * Eureka * Cleanup last commit * No tests atm * Remove scroll provider * Clean up callbacks, better error state * Remove todo * Remove todo * Remove todos * Format * Ok I think scrolling is solid * Add back mobile compose input * Ok need to compute headerHeight every time * Update comments * Ok button up web too * Threads v2 tweaks (#8467) * fix error screen collapsing * use personx icon for blocked posts * Remove height/width * Revert unused Header change * Clarify code * Relate consts to theme values * Remove debug code * Typo * Fix debounce of threads prefs * Update metadata comments, dev mode * Missed a spot * Clean up todo * Fix up no-unauthenticated posts * Truncate parents if no-unauth * Update getBranch docs * Remove debug code * Expand fetching in some cases * Clear scroll need for root post to fix jump bug * Fix reply composer skeleton state * Remove uneeded initialized value * Add profile shadow cache * Some metrics * prettier tweak * eslint ignore * Fix optimistic insertion * Typo * Rename, comment * Remove wait * Counter naming * Replies seen counter for moderated sub-trees * Remove borders on skeleton * Align tombstone with optimistic deletion state * Fix optimistic deletion for thread * Add tree view icon * Rename * Cleanup * Update settings copy * Header menu open metric * Bump package * Better reply prompt (#8474) * restyle reply prompt * hide bottom bar border for cleaner look * use new border hiding hook in DMs * create `transparentifyColor` function * adjust padding * fix padding in immersive lpayer * Apply suggestions from code review Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> * Integrate post-source (cherry picked from commit fe053e9b38395a4fcb30a4367bc800f64ea84fe9) --------- Co-authored-by: Samuel Newman <mozzius@protonmail.com> Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com>
295 lines
11 KiB
TypeScript
295 lines
11 KiB
TypeScript
import {View} from 'react-native'
|
|
import {msg, Trans} from '@lingui/macro'
|
|
import {useLingui} from '@lingui/react'
|
|
|
|
import {
|
|
type CommonNavigatorParams,
|
|
type NativeStackScreenProps,
|
|
} from '#/lib/routes/types'
|
|
import {useGate} from '#/lib/statsig/statsig'
|
|
import {
|
|
usePreferencesQuery,
|
|
useSetThreadViewPreferencesMutation,
|
|
} from '#/state/queries/preferences'
|
|
import {
|
|
normalizeSort,
|
|
normalizeView,
|
|
useThreadPreferences,
|
|
} from '#/state/queries/preferences/useThreadPreferences'
|
|
import {atoms as a, useTheme} from '#/alf'
|
|
import * as Toggle from '#/components/forms/Toggle'
|
|
import {Beaker_Stroke2_Corner2_Rounded as BeakerIcon} from '#/components/icons/Beaker'
|
|
import {Bubbles_Stroke2_Corner2_Rounded as BubblesIcon} from '#/components/icons/Bubble'
|
|
import {PersonGroup_Stroke2_Corner2_Rounded as PersonGroupIcon} from '#/components/icons/Person'
|
|
import {Tree_Stroke2_Corner0_Rounded as TreeIcon} from '#/components/icons/Tree'
|
|
import * as Layout from '#/components/Layout'
|
|
import {Text} from '#/components/Typography'
|
|
import * as SettingsList from './components/SettingsList'
|
|
|
|
type Props = NativeStackScreenProps<CommonNavigatorParams, 'PreferencesThreads'>
|
|
export function ThreadPreferencesScreen({}: Props) {
|
|
const gate = useGate()
|
|
|
|
return gate('post_threads_v2_unspecced') ? (
|
|
<ThreadPreferencesV2 />
|
|
) : (
|
|
<ThreadPreferencesV1 />
|
|
)
|
|
}
|
|
|
|
export function ThreadPreferencesV2() {
|
|
const t = useTheme()
|
|
const {_} = useLingui()
|
|
const {
|
|
sort,
|
|
setSort,
|
|
view,
|
|
setView,
|
|
prioritizeFollowedUsers,
|
|
setPrioritizeFollowedUsers,
|
|
} = useThreadPreferences({save: true})
|
|
|
|
return (
|
|
<Layout.Screen testID="threadPreferencesScreen">
|
|
<Layout.Header.Outer>
|
|
<Layout.Header.BackButton />
|
|
<Layout.Header.Content>
|
|
<Layout.Header.TitleText>
|
|
<Trans>Thread Preferences</Trans>
|
|
</Layout.Header.TitleText>
|
|
</Layout.Header.Content>
|
|
<Layout.Header.Slot />
|
|
</Layout.Header.Outer>
|
|
<Layout.Content>
|
|
<SettingsList.Container>
|
|
<SettingsList.Group>
|
|
<SettingsList.ItemIcon icon={BubblesIcon} />
|
|
<SettingsList.ItemText>
|
|
<Trans>Sort replies</Trans>
|
|
</SettingsList.ItemText>
|
|
<View style={[a.w_full, a.gap_md]}>
|
|
<Text style={[a.flex_1, t.atoms.text_contrast_medium]}>
|
|
<Trans>Sort replies to the same post by:</Trans>
|
|
</Text>
|
|
<Toggle.Group
|
|
label={_(msg`Sort replies by`)}
|
|
type="radio"
|
|
values={sort ? [sort] : []}
|
|
onChange={values => setSort(normalizeSort(values[0]))}>
|
|
<View style={[a.gap_sm, a.flex_1]}>
|
|
<Toggle.Item name="top" label={_(msg`Top replies first`)}>
|
|
<Toggle.Radio />
|
|
<Toggle.LabelText>
|
|
<Trans>Top replies first</Trans>
|
|
</Toggle.LabelText>
|
|
</Toggle.Item>
|
|
<Toggle.Item
|
|
name="oldest"
|
|
label={_(msg`Oldest replies first`)}>
|
|
<Toggle.Radio />
|
|
<Toggle.LabelText>
|
|
<Trans>Oldest replies first</Trans>
|
|
</Toggle.LabelText>
|
|
</Toggle.Item>
|
|
<Toggle.Item
|
|
name="newest"
|
|
label={_(msg`Newest replies first`)}>
|
|
<Toggle.Radio />
|
|
<Toggle.LabelText>
|
|
<Trans>Newest replies first</Trans>
|
|
</Toggle.LabelText>
|
|
</Toggle.Item>
|
|
</View>
|
|
</Toggle.Group>
|
|
</View>
|
|
</SettingsList.Group>
|
|
|
|
<SettingsList.Group contentContainerStyle={{minHeight: 0}}>
|
|
<SettingsList.ItemIcon icon={PersonGroupIcon} />
|
|
<SettingsList.ItemText>
|
|
<Trans>Prioritize your Follows</Trans>
|
|
</SettingsList.ItemText>
|
|
<Toggle.Item
|
|
type="checkbox"
|
|
name="prioritize-follows"
|
|
label={_(msg`Prioritize your Follows`)}
|
|
value={prioritizeFollowedUsers}
|
|
onChange={value => setPrioritizeFollowedUsers(value)}
|
|
style={[a.w_full, a.gap_md]}>
|
|
<Toggle.LabelText style={[a.flex_1]}>
|
|
<Trans>
|
|
Show replies by people you follow before all other replies
|
|
</Trans>
|
|
</Toggle.LabelText>
|
|
<Toggle.Platform />
|
|
</Toggle.Item>
|
|
</SettingsList.Group>
|
|
|
|
<SettingsList.Group>
|
|
<SettingsList.ItemIcon icon={TreeIcon} />
|
|
<SettingsList.ItemText>
|
|
<Trans>Tree view</Trans>
|
|
</SettingsList.ItemText>
|
|
<Toggle.Item
|
|
type="checkbox"
|
|
name="threaded-mode"
|
|
label={_(msg`Tree view`)}
|
|
value={view === 'tree'}
|
|
onChange={value =>
|
|
setView(normalizeView({treeViewEnabled: value}))
|
|
}
|
|
style={[a.w_full, a.gap_md]}>
|
|
<Toggle.LabelText style={[a.flex_1]}>
|
|
<Trans>Show post replies in a threaded tree view</Trans>
|
|
</Toggle.LabelText>
|
|
<Toggle.Platform />
|
|
</Toggle.Item>
|
|
</SettingsList.Group>
|
|
</SettingsList.Container>
|
|
</Layout.Content>
|
|
</Layout.Screen>
|
|
)
|
|
}
|
|
|
|
export function ThreadPreferencesV1() {
|
|
const {_} = useLingui()
|
|
const t = useTheme()
|
|
|
|
const {data: preferences} = usePreferencesQuery()
|
|
const {mutate: setThreadViewPrefs, variables} =
|
|
useSetThreadViewPreferencesMutation()
|
|
|
|
const sortReplies = variables?.sort ?? preferences?.threadViewPrefs?.sort
|
|
|
|
const prioritizeFollowedUsers = Boolean(
|
|
variables?.prioritizeFollowedUsers ??
|
|
preferences?.threadViewPrefs?.prioritizeFollowedUsers,
|
|
)
|
|
const treeViewEnabled = Boolean(
|
|
variables?.lab_treeViewEnabled ??
|
|
preferences?.threadViewPrefs?.lab_treeViewEnabled,
|
|
)
|
|
|
|
return (
|
|
<Layout.Screen testID="threadPreferencesScreen">
|
|
<Layout.Header.Outer>
|
|
<Layout.Header.BackButton />
|
|
<Layout.Header.Content>
|
|
<Layout.Header.TitleText>
|
|
<Trans>Thread Preferences</Trans>
|
|
</Layout.Header.TitleText>
|
|
</Layout.Header.Content>
|
|
<Layout.Header.Slot />
|
|
</Layout.Header.Outer>
|
|
<Layout.Content>
|
|
<SettingsList.Container>
|
|
<SettingsList.Group>
|
|
<SettingsList.ItemIcon icon={BubblesIcon} />
|
|
<SettingsList.ItemText>
|
|
<Trans>Sort replies</Trans>
|
|
</SettingsList.ItemText>
|
|
<View style={[a.w_full, a.gap_md]}>
|
|
<Text style={[a.flex_1, t.atoms.text_contrast_medium]}>
|
|
<Trans>Sort replies to the same post by:</Trans>
|
|
</Text>
|
|
<Toggle.Group
|
|
label={_(msg`Sort replies by`)}
|
|
type="radio"
|
|
values={sortReplies ? [sortReplies] : []}
|
|
onChange={values => setThreadViewPrefs({sort: values[0]})}>
|
|
<View style={[a.gap_sm, a.flex_1]}>
|
|
<Toggle.Item name="hotness" label={_(msg`Hot replies first`)}>
|
|
<Toggle.Radio />
|
|
<Toggle.LabelText>
|
|
<Trans>Hot replies first</Trans>
|
|
</Toggle.LabelText>
|
|
</Toggle.Item>
|
|
<Toggle.Item
|
|
name="oldest"
|
|
label={_(msg`Oldest replies first`)}>
|
|
<Toggle.Radio />
|
|
<Toggle.LabelText>
|
|
<Trans>Oldest replies first</Trans>
|
|
</Toggle.LabelText>
|
|
</Toggle.Item>
|
|
<Toggle.Item
|
|
name="newest"
|
|
label={_(msg`Newest replies first`)}>
|
|
<Toggle.Radio />
|
|
<Toggle.LabelText>
|
|
<Trans>Newest replies first</Trans>
|
|
</Toggle.LabelText>
|
|
</Toggle.Item>
|
|
<Toggle.Item
|
|
name="most-likes"
|
|
label={_(msg`Most-liked replies first`)}>
|
|
<Toggle.Radio />
|
|
<Toggle.LabelText>
|
|
<Trans>Most-liked first</Trans>
|
|
</Toggle.LabelText>
|
|
</Toggle.Item>
|
|
<Toggle.Item
|
|
name="random"
|
|
label={_(msg`Random (aka "Poster's Roulette")`)}>
|
|
<Toggle.Radio />
|
|
<Toggle.LabelText>
|
|
<Trans>Random (aka "Poster's Roulette")</Trans>
|
|
</Toggle.LabelText>
|
|
</Toggle.Item>
|
|
</View>
|
|
</Toggle.Group>
|
|
</View>
|
|
</SettingsList.Group>
|
|
<SettingsList.Group>
|
|
<SettingsList.ItemIcon icon={PersonGroupIcon} />
|
|
<SettingsList.ItemText>
|
|
<Trans>Prioritize your Follows</Trans>
|
|
</SettingsList.ItemText>
|
|
<Toggle.Item
|
|
type="checkbox"
|
|
name="prioritize-follows"
|
|
label={_(msg`Prioritize your Follows`)}
|
|
value={prioritizeFollowedUsers}
|
|
onChange={value =>
|
|
setThreadViewPrefs({
|
|
prioritizeFollowedUsers: value,
|
|
})
|
|
}
|
|
style={[a.w_full, a.gap_md]}>
|
|
<Toggle.LabelText style={[a.flex_1]}>
|
|
<Trans>
|
|
Show replies by people you follow before all other replies
|
|
</Trans>
|
|
</Toggle.LabelText>
|
|
<Toggle.Platform />
|
|
</Toggle.Item>
|
|
</SettingsList.Group>
|
|
<SettingsList.Divider />
|
|
<SettingsList.Group>
|
|
<SettingsList.ItemIcon icon={BeakerIcon} />
|
|
<SettingsList.ItemText>
|
|
<Trans>Experimental</Trans>
|
|
</SettingsList.ItemText>
|
|
<Toggle.Item
|
|
type="checkbox"
|
|
name="threaded-mode"
|
|
label={_(msg`Threaded mode`)}
|
|
value={treeViewEnabled}
|
|
onChange={value =>
|
|
setThreadViewPrefs({
|
|
lab_treeViewEnabled: value,
|
|
})
|
|
}
|
|
style={[a.w_full, a.gap_md]}>
|
|
<Toggle.LabelText style={[a.flex_1]}>
|
|
<Trans>Show replies as threaded</Trans>
|
|
</Toggle.LabelText>
|
|
<Toggle.Platform />
|
|
</Toggle.Item>
|
|
</SettingsList.Group>
|
|
</SettingsList.Container>
|
|
</Layout.Content>
|
|
</Layout.Screen>
|
|
)
|
|
}
|