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

Some translations are done

Browse Source
This commit is contained in:
Zhiyuan Zheng
2020-11-30 00:24:53 +01:00
parent 1493e20962
commit 0e3528d2cd
42 changed files with 428 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/Timelines/Timeline/Conversation.tsx
View File

@ -5,8 +5,7 @@ import { useNavigation } from '@react-navigation/native'
import Avatar from './Shared/Avatar'
import HeaderConversation from './Shared/HeaderConversation'
import Content from './Shared/Content'
import constants from 'src/utils/styles/constants'
import { StyleConstants } from 'src/utils/styles/constants'
export interface Props {
item: Mastodon.Conversation
@ -60,7 +59,7 @@ const styles = StyleSheet.create({
statusView: {
flex: 1,
flexDirection: 'column',
padding: constants.GLOBAL_PAGE_PADDING
padding: StyleConstants.Spacing.Global.PagePadding
},
status: {
flex: 1,

7
src/components/Timelines/Timeline/Default.tsx
View File

@ -10,8 +10,7 @@ import Poll from './Shared/Poll'
import Attachment from './Shared/Attachment'
import Card from './Shared/Card'
import ActionsStatus from './Shared/ActionsStatus'
import constants from 'src/utils/styles/constants'
import { StyleConstants } from 'src/utils/styles/constants'
export interface Props {
item: Mastodon.Status
@ -51,7 +50,7 @@ const TimelineDefault: React.FC<Props> = ({ item, queryKey }) => {
media_attachments={actualStatus.media_attachments}
sensitive={actualStatus.sensitive}
width={
Dimensions.get('window').width - constants.SPACING_M * 2 - 50 - 8
Dimensions.get('window').width - StyleConstants.Spacing.M * 2 - 50 - 8
}
/>
)}
@ -107,7 +106,7 @@ const styles = StyleSheet.create({
statusView: {
flex: 1,
flexDirection: 'column',
padding: constants.GLOBAL_PAGE_PADDING
padding: StyleConstants.Spacing.Global.PagePadding
},
status: {
flex: 1,

5
src/components/Timelines/Timeline/Notifications.tsx
View File

@ -10,8 +10,7 @@ import Poll from './Shared/Poll'
import Attachment from './Shared/Attachment'
import Card from './Shared/Card'
import ActionsStatus from './Shared/ActionsStatus'
import constants from 'src/utils/styles/constants'
import { StyleConstants } from 'src/utils/styles/constants'
export interface Props {
notification: Mastodon.Notification
@ -98,7 +97,7 @@ const styles = StyleSheet.create({
notificationView: {
flex: 1,
flexDirection: 'column',
padding: constants.GLOBAL_PAGE_PADDING
padding: StyleConstants.Spacing.Global.PagePadding
},
notification: {
flex: 1,

9
src/components/Timelines/Timeline/Separator.tsx
View File

@ -1,8 +1,8 @@
import React from 'react'
import { StyleSheet, View } from 'react-native'
import constants from 'src/utils/styles/constants'
import { useTheme } from 'src/utils/styles/ThemeManager'
import { StyleConstants } from 'src/utils/styles/constants'
const TimelineSeparator = () => {
const { theme } = useTheme()
@ -13,8 +13,11 @@ const TimelineSeparator = () => {
const styles = StyleSheet.create({
base: {
borderTopWidth: 1,
marginLeft: constants.SPACING_M + constants.AVATAR_S + constants.SPACING_S,
marginRight: constants.SPACING_M
marginLeft:
StyleConstants.Spacing.M +
StyleConstants.Avatar.S +
StyleConstants.Spacing.S,
marginRight: StyleConstants.Spacing.M
}
})

19
src/components/Timelines/Timeline/Shared/Actioned.tsx
View File

@ -4,8 +4,7 @@ import { Feather } from '@expo/vector-icons'
import Emojis from './Emojis'
import { useTheme } from 'src/utils/styles/ThemeManager'
import constants from 'src/utils/styles/constants'
import { StyleConstants } from 'src/utils/styles/constants'
export interface Props {
action: 'favourite' | 'follow' | 'mention' | 'poll' | 'reblog'
@ -30,7 +29,7 @@ const Actioned: React.FC<Props> = ({
icon = (
<Feather
name='heart'
size={constants.FONT_SIZE_S}
size={StyleConstants.Font.Size.S}
color={iconColor}
style={styles.icon}
/>
@ -41,7 +40,7 @@ const Actioned: React.FC<Props> = ({
icon = (
<Feather
name='user-plus'
size={constants.FONT_SIZE_S}
size={StyleConstants.Font.Size.S}
color={iconColor}
style={styles.icon}
/>
@ -52,7 +51,7 @@ const Actioned: React.FC<Props> = ({
icon = (
<Feather
name='bar-chart-2'
size={constants.FONT_SIZE_S}
size={StyleConstants.Font.Size.S}
color='black'
style={styles.icon}
/>
@ -63,7 +62,7 @@ const Actioned: React.FC<Props> = ({
icon = (
<Feather
name='repeat'
size={constants.FONT_SIZE_S}
size={StyleConstants.Font.Size.S}
color={iconColor}
style={styles.icon}
/>
@ -81,7 +80,7 @@ const Actioned: React.FC<Props> = ({
<Emojis
content={content}
emojis={emojis}
size={constants.FONT_SIZE_S}
size={StyleConstants.Font.Size.S}
/>
) : (
<Text>{content}</Text>
@ -97,11 +96,11 @@ const Actioned: React.FC<Props> = ({
const styles = StyleSheet.create({
actioned: {
flexDirection: 'row',
marginBottom: constants.SPACING_S
marginBottom: StyleConstants.Spacing.S
},
icon: {
marginLeft: constants.AVATAR_S - constants.FONT_SIZE_S,
marginRight: constants.SPACING_S
marginLeft: StyleConstants.Avatar.S - StyleConstants.Font.Size.S,
marginRight: StyleConstants.Spacing.S
},
content: {
flexDirection: 'row'

18
src/components/Timelines/Timeline/Shared/ActionsStatus.tsx
View File

@ -14,9 +14,9 @@ import { Feather } from '@expo/vector-icons'
import client from 'src/api/client'
import { getLocalAccountId } from 'src/utils/slices/instancesSlice'
import { useTheme } from 'src/utils/styles/ThemeManager'
import constants from 'src/utils/styles/constants'
import { toast } from 'src/components/toast'
import { useSelector } from 'react-redux'
import { StyleConstants } from 'src/utils/styles/constants'
const fireMutation = async ({
id,
@ -175,14 +175,14 @@ const ActionsStatus: React.FC<Props> = ({ queryKey, status }) => {
<Feather
name='message-circle'
color={iconColor}
size={constants.FONT_SIZE_M + 2}
size={StyleConstants.Font.Size.M + 2}
/>
{status.replies_count > 0 && (
<Text
style={{
color: theme.secondary,
fontSize: constants.FONT_SIZE_M,
marginLeft: constants.SPACING_XS
fontSize: StyleConstants.Font.Size.M,
marginLeft: StyleConstants.Spacing.XS
}}
>
{status.replies_count}
@ -201,7 +201,7 @@ const ActionsStatus: React.FC<Props> = ({ queryKey, status }) => {
? iconColorAction(status.reblogged)
: theme.disabled
}
size={constants.FONT_SIZE_M + 2}
size={StyleConstants.Font.Size.M + 2}
/>
),
[status.reblogged]
@ -211,7 +211,7 @@ const ActionsStatus: React.FC<Props> = ({ queryKey, status }) => {
<Feather
name='heart'
color={iconColorAction(status.favourited)}
size={constants.FONT_SIZE_M + 2}
size={StyleConstants.Font.Size.M + 2}
/>
),
[status.favourited]
@ -221,7 +221,7 @@ const ActionsStatus: React.FC<Props> = ({ queryKey, status }) => {
<Feather
name='bookmark'
color={iconColorAction(status.bookmarked)}
size={constants.FONT_SIZE_M + 2}
size={StyleConstants.Font.Size.M + 2}
/>
),
[status.bookmarked]
@ -231,7 +231,7 @@ const ActionsStatus: React.FC<Props> = ({ queryKey, status }) => {
<Feather
name='share-2'
color={iconColor}
size={constants.FONT_SIZE_M + 2}
size={StyleConstants.Font.Size.M + 2}
/>
),
[]
@ -374,7 +374,7 @@ const styles = StyleSheet.create({
width: '100%',
flex: 1,
flexDirection: 'row',
marginTop: constants.SPACING_M
marginTop: StyleConstants.Spacing.M
},
action: {
width: '20%',

9
src/components/Timelines/Timeline/Shared/Avatar.tsx
View File

@ -1,8 +1,7 @@
import React, { useCallback } from 'react'
import { Image, Pressable, StyleSheet } from 'react-native'
import { useNavigation } from '@react-navigation/native'
import constants from 'src/utils/styles/constants'
import { StyleConstants } from 'src/utils/styles/constants'
export interface Props {
uri: string
@ -27,9 +26,9 @@ const Avatar: React.FC<Props> = ({ uri, id }) => {
const styles = StyleSheet.create({
avatar: {
width: constants.AVATAR_S,
height: constants.AVATAR_S,
marginRight: constants.SPACING_S
width: StyleConstants.Avatar.S,
height: StyleConstants.Avatar.S,
marginRight: StyleConstants.Spacing.S
},
image: {
width: '100%',

6
src/components/Timelines/Timeline/Shared/Content.tsx
View File

@ -4,8 +4,8 @@ import Collapsible from 'react-native-collapsible'
import ParseContent from 'src/components/ParseContent'
import constants from 'src/utils/styles/constants'
import { useTheme } from 'src/utils/styles/ThemeManager'
import { StyleConstants } from 'src/utils/styles/constants'
export interface Props {
content: string
@ -40,7 +40,7 @@ const Content: React.FC<Props> = ({
<Collapsible collapsed={spoilerCollapsed}>
<ParseContent
content={content}
size={constants.FONT_SIZE_M}
size={StyleConstants.Font.Size.M}
emojis={emojis}
mentions={mentions}
/>
@ -49,7 +49,7 @@ const Content: React.FC<Props> = ({
) : (
<ParseContent
content={content}
size={constants.FONT_SIZE_M}
size={StyleConstants.Font.Size.M}
emojis={emojis}
mentions={mentions}
/>

5
src/components/Timelines/Timeline/Shared/Emojis.tsx
View File

@ -1,8 +1,7 @@
import React from 'react'
import { Image, StyleSheet, Text } from 'react-native'
import { useTheme } from 'src/utils/styles/ThemeManager'
import constants from 'src/utils/styles/constants'
import { StyleConstants } from 'src/utils/styles/constants'
const regexEmoji = new RegExp(/(:[a-z0-9_]+:)/)
@ -25,7 +24,7 @@ const Emojis: React.FC<Props> = ({
fontSize: size,
lineHeight: size + 2,
color: theme.primary,
...(fontBold && { fontWeight: constants.FONT_WEIGHT_BOLD })
...(fontBold && { fontWeight: StyleConstants.Font.Weight.Bold })
},
image: {
width: size,

24
src/components/Timelines/Timeline/Shared/HeaderDefault.tsx
View File

@ -9,11 +9,11 @@ import relativeTime from 'src/utils/relativeTime'
import client from 'src/api/client'
import { getLocalAccountId, getLocalUrl } from 'src/utils/slices/instancesSlice'
import { useTheme } from 'src/utils/styles/ThemeManager'
import constants from 'src/utils/styles/constants'
import BottomSheet from 'src/components/BottomSheet'
import BottomSheetRow from 'src/components/BottomSheet/Row'
import { toast } from 'src/components/toast'
import { useSelector } from 'react-redux'
import { StyleConstants } from 'src/utils/styles/constants'
const fireMutation = async ({
id,
@ -156,7 +156,7 @@ const HeaderDefault: React.FC<Props> = ({
<Feather
name='more-horizontal'
color={theme.secondary}
size={constants.FONT_SIZE_M + 2}
size={StyleConstants.Font.Size.M + 2}
/>
),
[]
@ -170,7 +170,7 @@ const HeaderDefault: React.FC<Props> = ({
<Emojis
content={name}
emojis={emojis}
size={constants.FONT_SIZE_M}
size={StyleConstants.Font.Size.M}
fontBold={true}
/>
) : (
@ -202,7 +202,7 @@ const HeaderDefault: React.FC<Props> = ({
{visibility === 'private' && (
<Feather
name='lock'
size={constants.FONT_SIZE_S}
size={StyleConstants.Font.Size.S}
color={theme.secondary}
style={styles.visibility}
/>
@ -297,24 +297,24 @@ const styles = StyleSheet.create({
},
account: {
flexShrink: 1,
marginLeft: constants.SPACING_XS,
lineHeight: constants.FONT_SIZE_M + 2
marginLeft: StyleConstants.Spacing.XS,
lineHeight: StyleConstants.Font.Size.M + 2
},
meta: {
flexDirection: 'row',
alignItems: 'center',
marginTop: constants.SPACING_XS,
marginBottom: constants.SPACING_S
marginTop: StyleConstants.Spacing.XS,
marginBottom: StyleConstants.Spacing.S
},
created_at: {
fontSize: constants.FONT_SIZE_S
fontSize: StyleConstants.Font.Size.S
},
visibility: {
marginLeft: constants.SPACING_S
marginLeft: StyleConstants.Spacing.S
},
application: {
fontSize: constants.FONT_SIZE_S,
marginLeft: constants.SPACING_S
fontSize: StyleConstants.Font.Size.S,
marginLeft: StyleConstants.Spacing.S
}
})