diff --git a/front/App.tsx b/front/App.tsx index 243702a..d4a7529 100644 --- a/front/App.tsx +++ b/front/App.tsx @@ -1,4 +1,4 @@ -import React from 'react'; +import React, { useEffect } from 'react'; import { QueryClient, QueryClientProvider } from 'react-query'; import { Provider } from 'react-redux'; import store, { persistor } from './state/Store'; @@ -10,12 +10,22 @@ import LanguageGate from './i18n/LanguageGate'; import ThemeProvider, { ColorSchemeProvider } from './Theme'; import 'react-native-url-polyfill/auto'; import { QueryRules } from './Queries'; +import { useFonts } from 'expo-font'; const queryClient = new QueryClient(QueryRules); export default function App() { SplashScreen.preventAutoHideAsync(); - setTimeout(SplashScreen.hideAsync, 500); + + const [fontsLoaded] = useFonts({ + 'Lexend': require('./assets/fonts/lexend.ttf'), + }); + + useEffect(() => { + if (fontsLoaded) { + SplashScreen.hideAsync(); + } + }, [fontsLoaded]); return ( diff --git a/front/Theme.tsx b/front/Theme.tsx index 6d7fc57..627dd3f 100644 --- a/front/Theme.tsx +++ b/front/Theme.tsx @@ -12,6 +12,11 @@ const ThemeProvider = ({ children }: { children: JSX.Element }) => { useSystemColorMode: false, initialColorMode: colorScheme, }, + fonts: { + heading: "Lexend", + body: "Lexend", + mono: "Lexend", + }, colors: { primary: { 50: '#e6faea', diff --git a/front/assets/fonts/lexend.ttf b/front/assets/fonts/lexend.ttf new file mode 100644 index 0000000..b294dc8 Binary files /dev/null and b/front/assets/fonts/lexend.ttf differ diff --git a/front/package.json b/front/package.json index af082b0..c9f7587 100644 --- a/front/package.json +++ b/front/package.json @@ -34,6 +34,7 @@ "expo": "^47.0.8", "expo-asset": "^8.12.0", "expo-dev-client": "~2.0.1", + "expo-font": "^11.6.0", "expo-image-picker": "~14.0.2", "expo-linking": "~3.3.1", "expo-screen-orientation": "~5.0.1", diff --git a/front/yarn.lock b/front/yarn.lock index 6cad207..1ba4419 100644 --- a/front/yarn.lock +++ b/front/yarn.lock @@ -9187,6 +9187,12 @@ expo-file-system@~15.6.0: integrity sha512-a2hvSWPQLgzw6/u7QuVjVs44Zqgkq3EQJ94tUpw9GbAxj2RsdS3tPnzakBb3Mc6VoQ2Aop6FIgSKeYCeYJAzsg== dependencies: uuid "^3.4.0" +expo-font@^11.6.0: + version "11.6.0" + resolved "https://registry.yarnpkg.com/expo-font/-/expo-font-11.6.0.tgz#7c1c8c82e3b437d54d911808fdf03578763913f3" + integrity sha512-ekfU0MN7vzJNGwQCJhxnhF2M9Fq/RtVF5xSQpr8+f4ISPimmKfEcArMHKCl4oG3saFVjSRX7fLbo38WOv3z5Mw== + dependencies: + fontfaceobserver "^2.1.0" expo-font@~11.0.1: version "11.0.1"