diff --git a/scripts/build.mjs b/scripts/build.mjs index 899ab6b..5574a91 100644 --- a/scripts/build.mjs +++ b/scripts/build.mjs @@ -74,7 +74,7 @@ const config = { constModules: { globals: { "bunny-build-info": { - version: `"v1.4.0-alpha"` + version: `"v1.3.8"` } } }, diff --git a/shims/depsModule.ts b/shims/depsModule.ts index 8df1d12..cccc4d5 100644 --- a/shims/depsModule.ts +++ b/shims/depsModule.ts @@ -7,5 +7,4 @@ module.exports = { "moment": findByPropsLazy("isMoment"), "chroma-js": findByPropsLazy("brewer"), "lodash": findByPropsLazy("forEachRight"), - "@shopify/react-native-skia": findByPropsLazy("useFont") }; diff --git a/src/core/ui/settings/pages/Fonts/FontCard.tsx b/src/core/ui/settings/pages/Fonts/FontCard.tsx index bc350b8..dec6441 100644 --- a/src/core/ui/settings/pages/Fonts/FontCard.tsx +++ b/src/core/ui/settings/pages/Fonts/FontCard.tsx @@ -9,56 +9,12 @@ import { lazyDestructure } from "@lib/utils/lazy"; import { findByProps } from "@metro"; import { NavigationNative, tokens } from "@metro/common"; import { Button, Card, IconButton, Stack, Text } from "@metro/common/components"; -import * as Skia from "@shopify/react-native-skia"; -import { TextStyleSheet } from "@ui/styles"; -import { useMemo } from "react"; import { View } from "react-native"; import FontEditor from "./FontEditor"; const { useToken } = lazyDestructure(() => findByProps("useToken")); -function FontPreview({ font }: { font: FontDefinition; }) { - const TEXT_NORMAL = useToken(tokens.colors.TEXT_NORMAL); - const { fontFamily: fontFamilyList, fontSize } = TextStyleSheet["text-md/medium"]; - const fontFamily = fontFamilyList!.split(/,/g)[0]; - - const typeface = Skia.useFont(font.main[fontFamily])?.getTypeface(); - - const paragraph = useMemo(() => { - if (!typeface) return null; - - const fMgr = SkiaApi.TypefaceFontProvider.Make(); - fMgr.registerFont(typeface, fontFamily); - - - return SkiaApi.ParagraphBuilder.Make({}, fMgr) - .pushStyle({ - color: SkiaApi.Color(TEXT_NORMAL), - fontFamilies: [fontFamily], - fontSize, - }) - .addText("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.") - .pop() - .build(); - }, [typeface]); - - return ( - // This does not work, actually :woeis: - - {typeface - ? - - - : - - Loading... - - } - - ); -} - export default function FontCard({ item: font }: CardWrapper) { useProxy(fonts); @@ -111,7 +67,6 @@ export default function FontCard({ item: font }: CardWrapper) { - ); diff --git a/src/entry.ts b/src/entry.ts index 5e67916..5202d28 100644 --- a/src/entry.ts +++ b/src/entry.ts @@ -11,7 +11,6 @@ async function initializeKettu() { Object.freeze = Object.seal = Object; await require("@metro/internals/caches").initMetroCache(); - // "savage" approach of just nuking the await, but the speedup could be amazing require(".").default(); } catch (e) { const { ClientInfoManager } = require("@lib/api/native/modules");