octo/tooot
1
0
Fork 0
mirror of https://github.com/tooot-app/app synced 2025-06-05 22:19:13 +02:00
Code Issues Projects Releases Wiki Activity

Fixed #554

Browse Source
This commit is contained in:
xmflsct
2022-12-12 20:43:45 +01:00
parent dee4e2810a
commit 6936e8009a
52 changed files with 268 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,9 +86,10 @@ const MenuRow: React.FC<Props> = ({
>
<View
style={{
flex: 3,
flexGrow: 3,
flexDirection: 'row',
alignItems: 'center'
alignItems: 'center',
marginRight: StyleConstants.Spacing.M
}}
>
{iconFront && (

2
src/i18n/en/components/instance.json
View File

@@ -1,7 +1,7 @@
{
"server": {
"textInput": {
"placeholder": "Instance' domain"
"placeholder": "Instance's domain"
},
"button": "Login",
"information": {

4
src/i18n/en/screens/compose.json
View File

@@ -1,13 +1,11 @@
{
"heading": {
"left": {
"button": "Cancel",
"alert": {
"title": "Cancel editing?",
"buttons": {
"save": "Save draft",
"delete": "Delete draft",
"cancel": "Cancel"
"delete": "Delete draft"
}
}
},

6
src/i18n/en/screens/tabs.json
View File

@@ -4,7 +4,6 @@
"name": "Following"
},
"public": {
"name": "",
"segments": {
"federated": "Federated",
"local": "Local",
@@ -13,9 +12,6 @@
},
"notifications": {
"name": "Notifications"
},
"me": {
"name": "About me"
}
},
"common": {
@@ -348,7 +344,7 @@
"notInLists": "Other lists"
},
"attachments": {
"name": "<0 /><1>\"s media</1>"
"name": "<0 /><1>'s media</1>"
},
"hashtag": {
"follow": "Follow",

8
src/screens/Compose.tsx
View File

@@ -206,7 +206,7 @@ const ScreenCompose: React.FC<RootStackScreenProps<'Screen-Compose'>> = ({
() => (
<HeaderLeft
type='text'
content={t('heading.left.button')}
content={t('common:buttons.cancel')}
onPress={() => {
if (!composeState.dirty) {
navigation.goBack()
@@ -229,7 +229,7 @@ const ScreenCompose: React.FC<RootStackScreenProps<'Screen-Compose'>> = ({
}
},
{
text: t('heading.left.alert.buttons.cancel'),
text: t('common:buttons.cancel'),
style: 'cancel'
}
])
@@ -342,9 +342,7 @@ const ScreenCompose: React.FC<RootStackScreenProps<'Screen-Compose'>> = ({
)
const headerContent = useMemo(() => {
return `${totalTextCount} / ${maxTootChars}${
__DEV__ ? ` Dirty: ${composeState.dirty.toString()}` : ''
}`
return `${totalTextCount} / ${maxTootChars}`
}, [totalTextCount, maxTootChars, composeState.dirty])
const inputProps: EmojisState['inputProps'] = [

2
src/screens/Tabs/Me/List/menus.tsx
View File

@@ -32,7 +32,7 @@ export const menuListDelete = ({
key: 'list-delete',
onSelect: () =>
Alert.alert(
i18next.t('screenTabs:me.listDelete.confirm.title', { list: params.title.slice(0, 6) }),
i18next.t('screenTabs:me.listDelete.confirm.title', { list: params.title.slice(0, 20) }),
i18next.t('screenTabs:me.listDelete.confirm.message'),
[
{

7
src/screens/Tabs/Shared/Account/Information.tsx
View File

@@ -28,10 +28,7 @@ const AccountInformation = React.memo(
<View style={styles.base}>
<Placeholder
Animation={props => (
<Fade
{...props}
style={{ backgroundColor: colors.shimmerHighlight }}
/>
<Fade {...props} style={{ backgroundColor: colors.shimmerHighlight }} />
)}
>
<View style={styles.avatarAndActions}>
@@ -41,7 +38,7 @@ const AccountInformation = React.memo(
<AccountInformationName account={account} />
<AccountInformationAccount account={account} localInstance={myInfo} />
<AccountInformationAccount account={account} />
<AccountInformationFields account={account} myInfo={myInfo} />

27
src/screens/Tabs/Shared/Account/Information/Account.tsx
View File

@@ -1,10 +1,7 @@
import Icon from '@components/Icon'
import CustomText from '@components/Text'
import { useRelationshipQuery } from '@utils/queryHooks/relationship'
import {
getInstanceAccount,
getInstanceUri
} from '@utils/slices/instancesSlice'
import { getInstanceAccount, getInstanceUri } from '@utils/slices/instancesSlice'
import { StyleConstants } from '@utils/styles/constants'
import { useTheme } from '@utils/styles/ThemeManager'
import React from 'react'
@@ -15,19 +12,12 @@ import { PlaceholderLine } from 'rn-placeholder'
export interface Props {
account: Mastodon.Account | undefined
localInstance: boolean
}
const AccountInformationAccount: React.FC<Props> = ({
account,
localInstance
}) => {
const AccountInformationAccount: React.FC<Props> = ({ account }) => {
const { t } = useTranslation('screenTabs')
const { colors } = useTheme()
const instanceAccount = useSelector(
getInstanceAccount,
(prev, next) => prev?.acct === next?.acct
)
const instanceAccount = useSelector(getInstanceAccount, (prev, next) => prev?.acct === next?.acct)
const instanceUri = useSelector(getInstanceUri)
const { data: relationship } = useRelationshipQuery({
@@ -35,6 +25,10 @@ const AccountInformationAccount: React.FC<Props> = ({
options: { enabled: account !== undefined }
})
const localInstance = instanceAccount.acct.includes('@')
? instanceAccount.acct.includes(`@${instanceUri}`)
: true
if (account || (localInstance && instanceAccount)) {
return (
<View
@@ -54,7 +48,7 @@ const AccountInformationAccount: React.FC<Props> = ({
) : null}
<CustomText
style={{
textDecorationLine: (account?.moved || account?.suspended) ? 'line-through' : undefined
textDecorationLine: account?.moved || account?.suspended ? 'line-through' : undefined
}}
selectable
>
@@ -94,7 +88,4 @@ const AccountInformationAccount: React.FC<Props> = ({
}
}
export default React.memo(
AccountInformationAccount,
(_, next) => next.account === undefined
)
export default AccountInformationAccount

30
src/screens/Tabs/Shared/Account/Information/Avatar.tsx
View File

@@ -5,7 +5,7 @@ import { StackNavigationProp } from '@react-navigation/stack'
import { TabLocalStackParamList } from '@utils/navigation/navigators'
import { StyleConstants } from '@utils/styles/constants'
import React from 'react'
import { Pressable, StyleSheet, View } from 'react-native'
import { Pressable, View } from 'react-native'
export interface Props {
account: Mastodon.Account | undefined
@@ -13,24 +13,24 @@ export interface Props {
edit?: boolean
}
const AccountInformationAvatar: React.FC<Props> = ({
account,
myInfo,
edit
}) => {
const navigation =
useNavigation<StackNavigationProp<TabLocalStackParamList>>()
const AccountInformationAvatar: React.FC<Props> = ({ account, myInfo, edit }) => {
const navigation = useNavigation<StackNavigationProp<TabLocalStackParamList>>()
return (
<Pressable
disabled={!myInfo}
onPress={() => {
myInfo && account && navigation.push('Tab-Shared-Account', { account })
}}
style={styles.base}
style={{
borderRadius: 8,
overflow: 'hidden',
width: StyleConstants.Avatar.L,
height: StyleConstants.Avatar.L
}}
>
<GracefullyImage
key={account?.avatar}
style={styles.image}
style={{ flex: 1 }}
uri={{ original: account?.avatar, static: account?.avatar_static }}
/>
{edit ? (
@@ -51,14 +51,4 @@ const AccountInformationAvatar: React.FC<Props> = ({
)
}
const styles = StyleSheet.create({
base: {
borderRadius: 8,
overflow: 'hidden',
width: StyleConstants.Avatar.L,
height: StyleConstants.Avatar.L
},
image: { flex: 1 }
})
export default AccountInformationAvatar

96
src/screens/Tabs/Shared/Account/Information/Created.tsx
View File

@@ -12,59 +12,53 @@ export interface Props {
hidden?: boolean
}
const AccountInformationCreated = React.memo(
({ account, hidden = false }: Props) => {
if (hidden) {
return null
}
const AccountInformationCreated: React.FC<Props> = ({ account, hidden = false }) => {
if (hidden) {
return null
}
const { i18n } = useTranslation()
const { colors } = useTheme()
const { t } = useTranslation('screenTabs')
const { i18n } = useTranslation()
const { colors } = useTheme()
const { t } = useTranslation('screenTabs')
if (account) {
return (
<View
style={{
flexDirection: 'row',
alignItems: 'center',
borderRadius: 0,
marginBottom: StyleConstants.Spacing.M
}}
>
<Icon
name='Calendar'
size={StyleConstants.Font.Size.S}
color={colors.secondary}
style={{ marginRight: StyleConstants.Spacing.XS }}
/>
<CustomText fontStyle='S' style={{ color: colors.secondary }}>
{t('shared.account.created_at', {
date: new Date(account.created_at || '').toLocaleDateString(
i18n.language,
{
year: 'numeric',
month: 'long',
day: 'numeric'
}
)
})}
</CustomText>
</View>
)
} else {
return (
<PlaceholderLine
width={StyleConstants.Font.Size.S * 4}
height={StyleConstants.Font.LineHeight.S}
color={colors.shimmerDefault}
noMargin
style={{ borderRadius: 0, marginBottom: StyleConstants.Spacing.M }}
if (account) {
return (
<View
style={{
flexDirection: 'row',
alignItems: 'center',
borderRadius: 0,
marginBottom: StyleConstants.Spacing.M
}}
>
<Icon
name='Calendar'
size={StyleConstants.Font.Size.S}
color={colors.secondary}
style={{ marginRight: StyleConstants.Spacing.XS }}
/>
)
}
},
(_, next) => next.account === undefined
)
<CustomText fontStyle='S' style={{ color: colors.secondary }}>
{t('shared.account.created_at', {
date: new Date(account.created_at || '').toLocaleDateString(i18n.language, {
year: 'numeric',
month: 'long',
day: 'numeric'
})
})}
</CustomText>
</View>
)
} else {
return (
<PlaceholderLine
width={StyleConstants.Font.Size.S * 4}
height={StyleConstants.Font.LineHeight.S}
color={colors.shimmerDefault}
noMargin
style={{ borderRadius: 0, marginBottom: StyleConstants.Spacing.M }}
/>
)
}
}
export default AccountInformationCreated

83
src/screens/Tabs/Shared/Account/Information/Fields.tsx
View File

@@ -10,53 +10,50 @@ export interface Props {
myInfo?: boolean
}
const AccountInformationFields = React.memo(
({ account, myInfo }: Props) => {
if (account?.suspended || myInfo || !account?.fields || account.fields.length === 0) {
return null
}
const AccountInformationFields: React.FC<Props> = ({ account, myInfo }) => {
if (account?.suspended || myInfo || !account?.fields || account.fields.length === 0) {
return null
}
const { colors } = useTheme()
const { colors } = useTheme()
return (
<View style={[styles.fields, { borderTopColor: colors.border }]}>
{account.fields.map((field, index) => (
<View key={index} style={[styles.field, { borderBottomColor: colors.border }]}>
<View style={[styles.fieldLeft, { borderRightColor: colors.border }]}>
<ParseHTML
content={field.name}
size={'S'}
emojis={account.emojis}
showFullLink
numberOfLines={5}
selectable
return (
<View style={[styles.fields, { borderTopColor: colors.border }]}>
{account.fields.map((field, index) => (
<View key={index} style={[styles.field, { borderBottomColor: colors.border }]}>
<View style={[styles.fieldLeft, { borderRightColor: colors.border }]}>
<ParseHTML
content={field.name}
size={'S'}
emojis={account.emojis}
showFullLink
numberOfLines={5}
selectable
/>
{field.verified_at ? (
<Icon
name='CheckCircle'
size={StyleConstants.Font.Size.M}
color={colors.primaryDefault}
style={styles.fieldCheck}
/>
{field.verified_at ? (
<Icon
name='CheckCircle'
size={StyleConstants.Font.Size.M}
color={colors.primaryDefault}
style={styles.fieldCheck}
/>
) : null}
</View>
<View style={styles.fieldRight}>
<ParseHTML
content={field.value}
size={'S'}
emojis={account.emojis}
showFullLink
numberOfLines={5}
selectable
/>
</View>
) : null}
</View>
))}
</View>
)
},
(_, next) => next.account === undefined
)
<View style={styles.fieldRight}>
<ParseHTML
content={field.value}
size={'S'}
emojis={account.emojis}
showFullLink
numberOfLines={5}
selectable
/>
</View>
</View>
))}
</View>
)
}
const styles = StyleSheet.create({
fields: {

2
src/screens/Tabs/Shared/Account/Information/Name.tsx
View File

@@ -66,4 +66,4 @@ const AccountInformationName: React.FC<Props> = ({ account }) => {
)
}
export default React.memo(AccountInformationName, (_, next) => next.account === undefined)
export default AccountInformationName

58
src/screens/Tabs/Shared/Account/Information/Note.tsx
View File

@@ -1,45 +1,35 @@
import { ParseHTML } from '@components/Parse'
import { StyleConstants } from '@utils/styles/constants'
import React, { useState } from 'react'
import { StyleSheet, View } from 'react-native'
import React from 'react'
import { View } from 'react-native'
export interface Props {
account: Mastodon.Account | undefined
myInfo?: boolean
}
const AccountInformationNote = React.memo(
({ account, myInfo }: Props) => {
const [note, setNote] = useState(account?.source?.note)
if (
account?.suspended ||
myInfo ||
!account?.note ||
account.note.length === 0 ||
account.note === '<p></p>'
) {
return null
}
return (
<View style={styles.note}>
<ParseHTML
content={account.note!}
size={'M'}
emojis={account.emojis}
selectable
numberOfLines={999}
/>
</View>
)
},
(_, next) => next.account === undefined
)
const styles = StyleSheet.create({
note: {
marginBottom: StyleConstants.Spacing.L
const AccountInformationNote: React.FC<Props> = ({ account, myInfo }) => {
if (
account?.suspended ||
myInfo ||
!account?.note ||
account.note.length === 0 ||
account.note === '<p></p>'
) {
return null
}
})
return (
<View style={{ marginBottom: StyleConstants.Spacing.L }}>
<ParseHTML
content={account.note!}
size={'M'}
emojis={account.emojis}
selectable
numberOfLines={999}
/>
</View>
)
}
export default AccountInformationNote

8
src/screens/Tabs/Shared/AccountInLists.tsx
View File

@@ -39,7 +39,7 @@ const TabSharedAccountInLists: React.FC<
})
}, [])
const listsQuery = useListsQuery({})
const listsQuery = useListsQuery()
const accountInListsQuery = useAccountInListsQuery({ id: account.id })
const sections = [
@@ -48,8 +48,10 @@ const TabSharedAccountInLists: React.FC<
id: 'out',
title: t('shared.accountInLists.notInLists'),
data:
listsQuery.data?.filter(
({ id }) => accountInListsQuery.data?.filter(d => d.id !== id).length
listsQuery.data?.filter(({ id }) =>
accountInListsQuery.data?.length
? accountInListsQuery.data.filter(d => d.id !== id).length
: true
) || []
}
]

6
src/screens/Tabs/Shared/Search/index.tsx
View File

@@ -54,7 +54,11 @@ const TabSharedSearch: React.FC<TabSharedStackScreenProps<'Tab-Shared-Search'>>
fontSize: StyleConstants.Font.Size.M,
flex: 1,
color: colors.primaryDefault,
paddingLeft: StyleConstants.Spacing.XS
marginLeft: StyleConstants.Spacing.XS,
paddingLeft: StyleConstants.Spacing.XS,
paddingVertical: StyleConstants.Spacing.XS,
borderBottomColor: colors.border,
borderBottomWidth: 1
}}
autoFocus
onChangeText={debounce(