octo/tooot
octo
/
tooot
mirror of https://github.com/tooot-app/app
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #556

This commit is contained in:
xmflsct 2022-12-15 18:43:39 +01:00
parent 3d2339c2b5
commit 2f3e398d70
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/Menu/Row.tsx
View File

@ -65,7 +65,6 @@ const MenuRow: React.FC<Props> = ({
> >
<TapGestureHandler <TapGestureHandler
onHandlerStateChange={async ({ nativeEvent }) => { onHandlerStateChange={async ({ nativeEvent }) => {
if (typeof iconBack !== 'string') return // Let icon back handles the gesture
if (nativeEvent.state === State.ACTIVE && !loading) { if (nativeEvent.state === State.ACTIVE && !loading) {
if (screenReaderEnabled && switchOnValueChange) { if (screenReaderEnabled && switchOnValueChange) {
switchOnValueChange() switchOnValueChange()

34
src/screens/Tabs/Me/SettingsLanguage.tsx
View File

@ -1,10 +1,11 @@
import haptics from '@components/haptics' import haptics from '@components/haptics'
import { MenuContainer, MenuRow } from '@components/Menu' import { MenuRow } from '@components/Menu'
import { LOCALES } from '@root/i18n/locales' import { LOCALES } from '@root/i18n/locales'
import { TabMeStackScreenProps } from '@utils/navigation/navigators' import { TabMeStackScreenProps } from '@utils/navigation/navigators'
import { setChannels } from '@utils/slices/instances/push/utils' import { setChannels } from '@utils/slices/instances/push/utils'
import { getInstances } from '@utils/slices/instancesSlice' import { getInstances } from '@utils/slices/instancesSlice'
import { changeLanguage } from '@utils/slices/settingsSlice' import { changeLanguage } from '@utils/slices/settingsSlice'
import { StyleConstants } from '@utils/styles/constants'
import React from 'react' import React from 'react'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
import { FlatList, Platform } from 'react-native' import { FlatList, Platform } from 'react-native'
@ -33,22 +34,21 @@ const TabMeSettingsLanguage: React.FC<TabMeStackScreenProps<'Tab-Me-Settings-Lan
} }
return ( return (
<MenuContainer> <FlatList
<FlatList style={{ flex: 1, paddingHorizontal: StyleConstants.Spacing.Global.PagePadding }}
data={languages} data={languages}
renderItem={({ item }) => { renderItem={({ item }) => {
return ( return (
<MenuRow <MenuRow
key={item[0]} key={item[0]}
title={item[1]} title={item[1]}
iconBack={item[0] === i18n.language ? 'Check' : undefined} iconBack={item[0] === i18n.language ? 'Check' : undefined}
iconBackColor={'blue'} iconBackColor={'blue'}
onPress={() => item[0] !== i18n.language && change(item[0])} onPress={() => item[0] !== i18n.language && change(item[0])}
/> />
) )
}} }}
/> />
</MenuContainer>
) )
} }