octo/tooot
octo/tooot
1
0
Fork 0
mirror of https://github.com/tooot-app/app synced 2025-04-04 21:51:12 +02:00
Code Issues Projects Releases Wiki Activity

Show avatar in actioned statement

Browse Source
This commit is contained in:
xmflsct 2023-05-16 22:12:25 +02:00
parent df7eb26057
commit 4f9e9e7a14
No known key found for this signature in database
GPG Key ID: 078A93AB607D85E0
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/components/Timeline/Shared/Actioned.tsx
View File

@ -10,6 +10,7 @@ import React, { useContext } from 'react'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
import { Pressable, StyleSheet, View } from 'react-native' import { Pressable, StyleSheet, View } from 'react-native'
import StatusContext from './Context' import StatusContext from './Context'
import GracefullyImage from '@components/GracefullyImage'
export interface Props { export interface Props {
action: Mastodon.Notification['type'] | 'reblog' | 'pinned' action: Mastodon.Notification['type'] | 'reblog' | 'pinned'
@ -39,6 +40,25 @@ const TimelineActioned: React.FC<Props> = ({ action, isNotification, ...rest })
) )
const onPress = () => navigation.push('Tab-Shared-Account', { account }) const onPress = () => navigation.push('Tab-Shared-Account', { account })
const miniAvatar = (
<GracefullyImage
sources={{
default: { uri: account.avatar },
static: { uri: account.avatar_static }
}}
dimension={{
width: StyleConstants.Avatar.XS / 1.5,
height: StyleConstants.Avatar.XS / 1.5
}}
style={{
borderRadius: 99,
overflow: 'hidden',
marginRight: StyleConstants.Spacing.S
}}
dim
withoutTransition
/>
)
const children = () => { const children = () => {
switch (action) { switch (action) {
@ -63,7 +83,8 @@ const TimelineActioned: React.FC<Props> = ({ action, isNotification, ...rest })
color={iconColor} color={iconColor}
style={styles.icon} style={styles.icon}
/> />
<Pressable onPress={onPress}> <Pressable onPress={onPress} style={{ flexDirection: 'row', alignItems: 'center' }}>
{miniAvatar}
{content(t('shared.actioned.favourite', { name }))} {content(t('shared.actioned.favourite', { name }))}
</Pressable> </Pressable>
</> </>
@ -77,7 +98,8 @@ const TimelineActioned: React.FC<Props> = ({ action, isNotification, ...rest })
color={iconColor} color={iconColor}
style={styles.icon} style={styles.icon}
/> />
<Pressable onPress={onPress}> <Pressable onPress={onPress} style={{ flexDirection: 'row', alignItems: 'center' }}>
{miniAvatar}
{content(t('shared.actioned.follow', { name }))} {content(t('shared.actioned.follow', { name }))}
</Pressable> </Pressable>
</> </>
@ -91,7 +113,8 @@ const TimelineActioned: React.FC<Props> = ({ action, isNotification, ...rest })
color={iconColor} color={iconColor}
style={styles.icon} style={styles.icon}
/> />
<Pressable onPress={onPress}> <Pressable onPress={onPress} style={{ flexDirection: 'row', alignItems: 'center' }}>
{miniAvatar}
{content(t('shared.actioned.follow_request', { name }))} {content(t('shared.actioned.follow_request', { name }))}
</Pressable> </Pressable>
</> </>
@ -118,7 +141,8 @@ const TimelineActioned: React.FC<Props> = ({ action, isNotification, ...rest })
color={iconColor} color={iconColor}
style={styles.icon} style={styles.icon}
/> />
<Pressable onPress={onPress}> <Pressable onPress={onPress} style={{ flexDirection: 'row', alignItems: 'center' }}>
{!myself ? miniAvatar : null}
{content( {content(
isNotification isNotification
? t('shared.actioned.reblog.notification', { name }) ? t('shared.actioned.reblog.notification', { name })
@ -138,7 +162,8 @@ const TimelineActioned: React.FC<Props> = ({ action, isNotification, ...rest })
color={iconColor} color={iconColor}
style={styles.icon} style={styles.icon}
/> />
<Pressable onPress={onPress}> <Pressable onPress={onPress} style={{ flexDirection: 'row', alignItems: 'center' }}>
{miniAvatar}
{content(t('shared.actioned.status', { name }))} {content(t('shared.actioned.status', { name }))}
</Pressable> </Pressable>
</> </>