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

Temp visual fix

This commit is contained in:
xmflsct 2022-08-19 12:22:30 +02:00
parent 1bcdc9fa93
commit d1a737eb51
2 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/components/Header/Center.tsx
View File

@ -22,12 +22,7 @@ const HeaderCenter: React.FC<Props> = ({
const { colors } = useTheme() const { colors } = useTheme()
return ( return (
<View <View style={{ flexDirection: 'row', alignItems: 'center' }}>
style={{
flexDirection: 'row',
alignItems: 'center'
}}
>
<CustomText <CustomText
style={{ style={{
color: inverted ? colors.primaryOverlay : colors.primaryDefault color: inverted ? colors.primaryOverlay : colors.primaryDefault
@ -38,15 +33,13 @@ const HeaderCenter: React.FC<Props> = ({
children={content} children={content}
{...(onPress && { onPress })} {...(onPress && { onPress })}
/> />
{dropdown ? ( <Icon
<Icon name='ChevronDown'
name='ChevronDown' size={StyleConstants.Font.Size.M}
size={StyleConstants.Font.Size.M} color={colors.primaryDefault}
color={colors.primaryDefault} style={{ marginLeft: StyleConstants.Spacing.XS, opacity: dropdown ? undefined : 0 }}
style={{ marginLeft: StyleConstants.Spacing.XS }} strokeWidth={3}
strokeWidth={3} />
/>
) : null}
</View> </View>
) )
} }

21
src/screens/Tabs/Local.tsx
View File

@ -3,10 +3,7 @@ import { HeaderCenter, HeaderRight } from '@components/Header'
import Timeline from '@components/Timeline' import Timeline from '@components/Timeline'
import TimelineDefault from '@components/Timeline/Default' import TimelineDefault from '@components/Timeline/Default'
import { createNativeStackNavigator } from '@react-navigation/native-stack' import { createNativeStackNavigator } from '@react-navigation/native-stack'
import { import { ScreenTabsScreenProps, TabLocalStackParamList } from '@utils/navigation/navigators'
ScreenTabsScreenProps,
TabLocalStackParamList
} from '@utils/navigation/navigators'
import { useListsQuery } from '@utils/queryHooks/lists' import { useListsQuery } from '@utils/queryHooks/lists'
import { QueryKeyTimeline } from '@utils/queryHooks/timeline' import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
import layoutAnimation from '@utils/styles/layoutAnimation' import layoutAnimation from '@utils/styles/layoutAnimation'
@ -26,10 +23,7 @@ const TabLocal = React.memo(
layoutAnimation() layoutAnimation()
}, [lists?.length]) }, [lists?.length])
const [queryKey, setQueryKey] = useState<QueryKeyTimeline>([ const [queryKey, setQueryKey] = useState<QueryKeyTimeline>(['Timeline', { page: 'Following' }])
'Timeline',
{ page: 'Following' }
])
return ( return (
<Stack.Navigator screenOptions={{ headerShadowVisible: false }}> <Stack.Navigator screenOptions={{ headerShadowVisible: false }}>
@ -51,9 +45,7 @@ const TabLocal = React.memo(
...lists.map(list => ({ ...lists.map(list => ({
id: list.id, id: list.id,
title: list.title, title: list.title,
disabled: disabled: queryKey[1].page === 'List' && queryKey[1].list === list.id
queryKey[1].page === 'List' &&
queryKey[1].list === list.id
})) }))
] ]
: undefined : undefined
@ -68,8 +60,7 @@ const TabLocal = React.memo(
dropdown={(lists?.length ?? 0) > 0} dropdown={(lists?.length ?? 0) > 0}
content={ content={
queryKey[1].page === 'List' && queryKey[1].list?.length queryKey[1].page === 'List' && queryKey[1].list?.length
? lists?.find(list => list.id === queryKey[1].list) ? lists?.find(list => list.id === queryKey[1].list)?.title
?.title
: t('tabs.local.name') : t('tabs.local.name')
} }
/> />
@ -96,9 +87,7 @@ const TabLocal = React.memo(
queryKey={queryKey} queryKey={queryKey}
lookback='Following' lookback='Following'
customProps={{ customProps={{
renderItem: ({ item }) => ( renderItem: ({ item }) => <TimelineDefault item={item} queryKey={queryKey} />
<TimelineDefault item={item} queryKey={queryKey} />
)
}} }}
/> />
)} )}