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

Bump packages

Browse Source 
And deprecate react-native-feather
This commit is contained in:
xmflsct
2023-01-25 00:15:46 +01:00
parent ebc6d03c6a
commit 9d9c16df06
77 changed files with 562 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/components/Header/Left.tsx
View File

@ -1,21 +1,19 @@
import Icon from '@components/Icon'
import Icon, { IconName } from '@components/Icon'
import CustomText from '@components/Text'
import { StyleConstants } from '@utils/styles/constants'
import { useTheme } from '@utils/styles/ThemeManager'
import React from 'react'
import { Pressable } from 'react-native'
export interface Props {
type?: 'icon' | 'text'
content?: string
export type Props = {
native?: boolean
background?: boolean
onPress: () => void
}
} & ({ type?: undefined; content?: IconName } | { type: 'text'; content: string })
const HeaderLeft: React.FC<Props> = ({
type = 'icon',
type,
content,
native = true,
background = false,
@ -25,18 +23,18 @@ const HeaderLeft: React.FC<Props> = ({
const children = () => {
switch (type) {
case 'icon':
return (
<Icon
color={colors.primaryDefault}
name={content || 'ChevronLeft'}
size={StyleConstants.Spacing.M * 1.25}
/>
)
case 'text':
return (
<CustomText fontStyle='M' style={{ color: colors.primaryDefault }} children={content} />
)
default:
return (
<Icon
color={colors.primaryDefault}
name={content || 'chevron-left'}
size={StyleConstants.Spacing.M * 1.25}
/>
)
}
}
@ -52,7 +50,7 @@ const HeaderLeft: React.FC<Props> = ({
minHeight: 44,
minWidth: 44,
marginLeft: native ? -StyleConstants.Spacing.S : StyleConstants.Spacing.S,
...(type === 'icon' && {
...(type === undefined && {
borderRadius: 100
}),
...(type === 'text' && {

38
src/components/Header/Right.tsx
View File

@ -1,4 +1,4 @@
import Icon from '@components/Icon'
import Icon, { IconName } from '@components/Icon'
import { Loading } from '@components/Loading'
import CustomText from '@components/Text'
import { StyleConstants } from '@utils/styles/constants'
@ -6,13 +6,11 @@ import { useTheme } from '@utils/styles/ThemeManager'
import React from 'react'
import { AccessibilityProps, Pressable, View } from 'react-native'
export interface Props {
export type Props = {
accessibilityLabel?: string
accessibilityHint?: string
accessibilityState?: AccessibilityProps['accessibilityState']
type?: 'icon' | 'text'
content: string
native?: boolean
background?: boolean
@ -21,7 +19,7 @@ export interface Props {
destructive?: boolean
onPress: () => void
}
} & ({ type?: undefined; content: IconName } | { type: 'text'; content: string })
const HeaderRight: React.FC<Props> = ({
// Accessibility - Start
@ -29,7 +27,7 @@ const HeaderRight: React.FC<Props> = ({
accessibilityHint,
accessibilityState,
// Accessibility - End
type = 'icon',
type,
content,
native = true,
background = false,
@ -38,7 +36,7 @@ const HeaderRight: React.FC<Props> = ({
destructive = false,
onPress
}) => {
const { colors, theme } = useTheme()
const { colors } = useTheme()
const loadingSpinkit = () =>
loading ? (
@ -49,18 +47,6 @@ const HeaderRight: React.FC<Props> = ({
const children = () => {
switch (type) {
case 'icon':
return (
<>
<Icon
name={content}
style={{ opacity: loading ? 0 : 1 }}
size={StyleConstants.Spacing.M * 1.25}
color={disabled ? colors.secondary : destructive ? colors.red : colors.primaryDefault}
/>
{loadingSpinkit()}
</>
)
case 'text':
return (
<>
@ -80,6 +66,18 @@ const HeaderRight: React.FC<Props> = ({
{loadingSpinkit()}
</>
)
default:
return (
<>
<Icon
name={content}
style={{ opacity: loading ? 0 : 1 }}
size={StyleConstants.Spacing.M * 1.25}
color={disabled ? colors.secondary : destructive ? colors.red : colors.primaryDefault}
/>
{loadingSpinkit()}
</>
)
}
}
@ -100,7 +98,7 @@ const HeaderRight: React.FC<Props> = ({
minHeight: 44,
minWidth: 44,
marginRight: native ? -StyleConstants.Spacing.S : StyleConstants.Spacing.S,
...(type === 'icon' && {
...(type === undefined && {
borderRadius: 100
}),
...(type === 'text' && {