diff --git a/components/helpers/text.tsx b/components/helpers/text.tsx index 4246f7cb..09ed9255 100644 --- a/components/helpers/text.tsx +++ b/components/helpers/text.tsx @@ -28,6 +28,6 @@ export function Label(props: LabelProps): React.JSX.Element { export function Heading({ children }: { children: string }): React.JSX.Element { return ( -

{ children }

+

{ children }

) } \ No newline at end of file diff --git a/react-native.config.js b/react-native.config.js index c36c7928..4d6bdc5c 100644 --- a/react-native.config.js +++ b/react-native.config.js @@ -1,3 +1,7 @@ module.exports = { + project: { + ios: {}, + android: {}, + }, assets: ['./assets/fonts/'], }; \ No newline at end of file diff --git a/tamagui.config.ts b/tamagui.config.ts index c7f45c0f..90dd402b 100644 --- a/tamagui.config.ts +++ b/tamagui.config.ts @@ -1,30 +1,39 @@ -import { animations, tokens, themes, media, shorthands } from '@tamagui/config/v3' +import { animations, tokens, themes, media, shorthands, config } from '@tamagui/config/v3' import { createFont, createTamagui } from 'tamagui' // or '@tamagui/core' -const jellifyFont = createFont({ - family: 'Aileron-Regular, Helvetica, Arial, sans-serif', - size: { - 1: 12, - 2: 14, - 3: 15, - }, - face: { - 100: { normal: 'Aileron-UltraLight', italic: 'Aileron-UltraLightItalic' }, - 200: { normal: 'Aileron-Thin', italic: 'Aileron-ThinItalic' }, - 300: { normal: 'Aileron-Light', italic: 'Aileron-LightItalic' }, - 400: { normal: 'Aileron-Regular', italic: 'Aileron-Italic'} , - 500: { normal: 'Aileron-Regular', italic: 'Aileron-Italic' }, - 600: { normal: 'Aileron-SemiBold', italic: 'Aileron-SemiBoldItalic' }, - 700: { normal: 'Aileron-Bold', italic: 'Aileron-BoldItalic' }, - 800: { normal: 'Aileron-Heavy', italic: 'Aileron-HeavyItalic' }, - 900: { normal: 'Aileron-Black', italic: 'Aileron-BlackItalic' }, - } +const aileronFace = { + 100: { normal: 'Aileron-UltraLight', italic: 'Aileron-UltraLightItalic' }, + 200: { normal: 'Aileron-Thin', italic: 'Aileron-ThinItalic' }, + 300: { normal: 'Aileron-Light', italic: 'Aileron-LightItalic' }, + 400: { normal: 'Aileron-Regular', italic: 'Aileron-Italic'} , + 500: { normal: 'Aileron-Regular', italic: 'Aileron-Italic' }, + 600: { normal: 'Aileron-SemiBold', italic: 'Aileron-SemiBoldItalic' }, + 700: { normal: 'Aileron-Bold', italic: 'Aileron-BoldItalic' }, + 800: { normal: 'Aileron-Heavy', italic: 'Aileron-HeavyItalic' }, + 900: { normal: 'Aileron-Black', italic: 'Aileron-BlackItalic' }, +}; + +const bodyFont = createFont({ + size: config.fonts.body.size, + lineHeight: config.fonts.body.lineHeight, + weight: config.fonts.body.weight, + letterSpacing: config.fonts.body.letterSpacing, + face: aileronFace }) + +const headingFont = createFont({ + size: config.fonts.heading.size, + lineHeight: config.fonts.heading.lineHeight, + weight: config.fonts.heading.weight, + letterSpacing: config.fonts.heading.letterSpacing, + face: aileronFace +}) + const jellifyConfig = createTamagui({ animations, fonts:{ - heading: jellifyFont, - body: jellifyFont, + heading: headingFont, + body: bodyFont, }, media, shorthands,