diff options
Diffstat (limited to 'src/view')
5 files changed, 17 insertions, 20 deletions
diff --git a/src/view/com/composer/Composer.tsx b/src/view/com/composer/Composer.tsx index 68f706828..cdc9768f7 100644 --- a/src/view/com/composer/Composer.tsx +++ b/src/view/com/composer/Composer.tsx @@ -53,9 +53,8 @@ import {useModals, useModalControls} from '#/state/modals' import {useRequireAltTextEnabled} from '#/state/preferences' import { useLanguagePrefs, - useSetLanguagePrefs, + useLanguagePrefsApi, toPostLanguages, - savePostLanguageToHistory, } from '#/state/preferences/languages' type Props = ComposerOpts @@ -73,7 +72,7 @@ export const ComposePost = observer(function ComposePost({ const store = useStores() const requireAltTextEnabled = useRequireAltTextEnabled() const langPrefs = useLanguagePrefs() - const setLangPrefs = useSetLanguagePrefs() + const setLangPrefs = useLanguagePrefsApi() const textInput = useRef<TextInputRef>(null) const [isKeyboardVisible] = useIsKeyboardVisible({iosUseWillEvents: true}) const [isProcessing, setIsProcessing] = useState(false) @@ -245,7 +244,7 @@ export const ComposePost = observer(function ComposePost({ if (!replyTo) { store.me.mainFeed.onPostCreated() } - savePostLanguageToHistory(setLangPrefs) + setLangPrefs.savePostLanguageToHistory() onPost?.() onClose() Toast.show(`Your ${replyTo ? 'reply' : 'post'} has been published`) diff --git a/src/view/com/composer/select-language/SelectLangBtn.tsx b/src/view/com/composer/select-language/SelectLangBtn.tsx index 6c45f3384..896df041e 100644 --- a/src/view/com/composer/select-language/SelectLangBtn.tsx +++ b/src/view/com/composer/select-language/SelectLangBtn.tsx @@ -17,7 +17,7 @@ import {codeToLanguageName} from '../../../../locale/helpers' import {useModalControls} from '#/state/modals' import { useLanguagePrefs, - useSetLanguagePrefs, + useLanguagePrefsApi, toPostLanguages, hasPostLanguage, } from '#/state/preferences/languages' @@ -26,7 +26,7 @@ export const SelectLangBtn = observer(function SelectLangBtn() { const pal = usePalette('default') const {openModal} = useModalControls() const langPrefs = useLanguagePrefs() - const setLangPrefs = useSetLanguagePrefs() + const setLangPrefs = useLanguagePrefsApi() const onPressMore = useCallback(async () => { if (isNative) { @@ -63,7 +63,7 @@ export const SelectLangBtn = observer(function SelectLangBtn() { : ['far', 'circle'], label: langName, onPress() { - setLangPrefs(v => ({...v, postLanguage: commaSeparatedLangCodes})) + setLangPrefs.setPostLanguage(commaSeparatedLangCodes) }, }) } diff --git a/src/view/com/modals/lang-settings/ContentLanguagesSettings.tsx b/src/view/com/modals/lang-settings/ContentLanguagesSettings.tsx index d37d51e47..0b19abc68 100644 --- a/src/view/com/modals/lang-settings/ContentLanguagesSettings.tsx +++ b/src/view/com/modals/lang-settings/ContentLanguagesSettings.tsx @@ -11,8 +11,7 @@ import {ConfirmLanguagesButton} from './ConfirmLanguagesButton' import {useModalControls} from '#/state/modals' import { useLanguagePrefs, - useSetLanguagePrefs, - toggleContentLanguage, + useLanguagePrefsApi, } from '#/state/preferences/languages' export const snapPoints = ['100%'] @@ -20,7 +19,7 @@ export const snapPoints = ['100%'] export function Component({}: {}) { const {closeModal} = useModalControls() const langPrefs = useLanguagePrefs() - const setLangPrefs = useSetLanguagePrefs() + const setLangPrefs = useLanguagePrefsApi() const pal = usePalette('default') const {isMobile} = useWebMediaQueries() const onPressDone = React.useCallback(() => { @@ -50,9 +49,9 @@ export function Component({}: {}) { const onPress = React.useCallback( (code2: string) => { - toggleContentLanguage(langPrefs, setLangPrefs, code2) + setLangPrefs.toggleContentLanguage(code2) }, - [langPrefs, setLangPrefs], + [setLangPrefs], ) return ( diff --git a/src/view/com/modals/lang-settings/PostLanguagesSettings.tsx b/src/view/com/modals/lang-settings/PostLanguagesSettings.tsx index 4a39da752..7ec26ca52 100644 --- a/src/view/com/modals/lang-settings/PostLanguagesSettings.tsx +++ b/src/view/com/modals/lang-settings/PostLanguagesSettings.tsx @@ -12,9 +12,8 @@ import {ToggleButton} from 'view/com/util/forms/ToggleButton' import {useModalControls} from '#/state/modals' import { useLanguagePrefs, - useSetLanguagePrefs, + useLanguagePrefsApi, hasPostLanguage, - togglePostLanguage, } from '#/state/preferences/languages' export const snapPoints = ['100%'] @@ -22,7 +21,7 @@ export const snapPoints = ['100%'] export const Component = observer(function PostLanguagesSettingsImpl() { const {closeModal} = useModalControls() const langPrefs = useLanguagePrefs() - const setLangPrefs = useSetLanguagePrefs() + const setLangPrefs = useLanguagePrefsApi() const pal = usePalette('default') const {isMobile} = useWebMediaQueries() const onPressDone = React.useCallback(() => { @@ -52,9 +51,9 @@ export const Component = observer(function PostLanguagesSettingsImpl() { const onPress = React.useCallback( (code2: string) => { - togglePostLanguage(langPrefs, setLangPrefs, code2) + setLangPrefs.togglePostLanguage(code2) }, - [langPrefs, setLangPrefs], + [setLangPrefs], ) return ( diff --git a/src/view/screens/LanguageSettings.tsx b/src/view/screens/LanguageSettings.tsx index c94364e9a..677451526 100644 --- a/src/view/screens/LanguageSettings.tsx +++ b/src/view/screens/LanguageSettings.tsx @@ -19,7 +19,7 @@ import {LANGUAGES} from 'lib/../locale/languages' import RNPickerSelect, {PickerSelectProps} from 'react-native-picker-select' import {useSetMinimalShellMode} from '#/state/shell' import {useModalControls} from '#/state/modals' -import {useLanguagePrefs, useSetLanguagePrefs} from '#/state/preferences' +import {useLanguagePrefs, useLanguagePrefsApi} from '#/state/preferences' type Props = NativeStackScreenProps<CommonNavigatorParams, 'LanguageSettings'> @@ -28,7 +28,7 @@ export const LanguageSettingsScreen = observer(function LanguageSettingsImpl( ) { const pal = usePalette('default') const langPrefs = useLanguagePrefs() - const setLangPrefs = useSetLanguagePrefs() + const setLangPrefs = useLanguagePrefsApi() const {isTabletOrDesktop} = useWebMediaQueries() const {screen, track} = useAnalytics() const setMinimalShellMode = useSetMinimalShellMode() @@ -49,7 +49,7 @@ export const LanguageSettingsScreen = observer(function LanguageSettingsImpl( const onChangePrimaryLanguage = React.useCallback( (value: Parameters<PickerSelectProps['onValueChange']>[0]) => { if (langPrefs.primaryLanguage !== value) { - setLangPrefs(v => ({...v, primaryLanguage: value})) + setLangPrefs.setPrimaryLanguage(value) } }, [langPrefs, setLangPrefs], |