From 53ae50dc66c6ca44a546f4e5e4672e3cf727db76 Mon Sep 17 00:00:00 2001 From: kmmiio99o <164557248+kmmiio99o@users.noreply.github.com> Date: Thu, 11 Dec 2025 19:19:39 +0100 Subject: [PATCH 01/25] Update icons in Plugins sheet menu and on Plugins card Update icons from WrenchIcon to SettingsIcon to match more the actual name. Well, because "settings" --- src/core/ui/settings/pages/Plugins/components/PluginCard.tsx | 2 +- .../ui/settings/pages/Plugins/sheets/PluginInfoActionSheet.tsx | 2 +- .../settings/pages/Plugins/sheets/VdPluginInfoActionSheet.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/ui/settings/pages/Plugins/components/PluginCard.tsx b/src/core/ui/settings/pages/Plugins/components/PluginCard.tsx index a88bc0c..b922379 100644 --- a/src/core/ui/settings/pages/Plugins/components/PluginCard.tsx +++ b/src/core/ui/settings/pages/Plugins/components/PluginCard.tsx @@ -115,7 +115,7 @@ const Actions = () => { navigation.push("SHIGGYCORD_CUSTOM_PAGE", { diff --git a/src/core/ui/settings/pages/Plugins/sheets/PluginInfoActionSheet.tsx b/src/core/ui/settings/pages/Plugins/sheets/PluginInfoActionSheet.tsx index 3a0e39a..098d044 100644 --- a/src/core/ui/settings/pages/Plugins/sheets/PluginInfoActionSheet.tsx +++ b/src/core/ui/settings/pages/Plugins/sheets/PluginInfoActionSheet.tsx @@ -195,7 +195,7 @@ export default function PluginInfoActionSheet({ label="Configure" variant="secondary" disabled={!plugin.getPluginSettingsComponent()} - icon={findAssetId("WrenchIcon")} + icon={findAssetId("SettingsIcon")} onPress={() => { navigation.push("SHIGGYCORD_CUSTOM_PAGE", { title: plugin.name, diff --git a/src/core/ui/settings/pages/Plugins/sheets/VdPluginInfoActionSheet.tsx b/src/core/ui/settings/pages/Plugins/sheets/VdPluginInfoActionSheet.tsx index 796aaa6..e9f3ca6 100644 --- a/src/core/ui/settings/pages/Plugins/sheets/VdPluginInfoActionSheet.tsx +++ b/src/core/ui/settings/pages/Plugins/sheets/VdPluginInfoActionSheet.tsx @@ -43,7 +43,7 @@ export default function PluginInfoActionSheet({ size="md" text="Configure" variant="secondary" - icon={findAssetId("WrenchIcon")} + icon={findAssetId("SettingsIcon")} onPress={() => { hideSheet("PluginInfoActionSheet"); navigation.push("SHIGGYCORD_CUSTOM_PAGE", { From 218e11c75834843d5e52e01054456a5089cbd9de Mon Sep 17 00:00:00 2001 From: kmmiio99o <164557248+kmmiio99o@users.noreply.github.com> Date: Fri, 12 Dec 2025 18:31:13 +0100 Subject: [PATCH 02/25] update semantic colors --- src/core/ui/components/AddonCard.tsx | 2 +- .../ui/settings/pages/Plugins/sheets/PluginInfoActionSheet.tsx | 2 +- .../ui/settings/pages/Themes/sheets/ThemeInfoActionSheet.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/ui/components/AddonCard.tsx b/src/core/ui/components/AddonCard.tsx index b2947e8..96aa21a 100644 --- a/src/core/ui/components/AddonCard.tsx +++ b/src/core/ui/components/AddonCard.tsx @@ -44,7 +44,7 @@ const useStyles = createStyles({ }, headerLabel: { ...TextStyleSheet["heading-md/semibold"], - color: semanticColors.HEADER_PRIMARY, + color: semanticColors.MOBILE_TEXT_HEADING_PRIMARY, }, headerSubtitle: { ...TextStyleSheet["text-md/semibold"], diff --git a/src/core/ui/settings/pages/Plugins/sheets/PluginInfoActionSheet.tsx b/src/core/ui/settings/pages/Plugins/sheets/PluginInfoActionSheet.tsx index 098d044..d82d238 100644 --- a/src/core/ui/settings/pages/Plugins/sheets/PluginInfoActionSheet.tsx +++ b/src/core/ui/settings/pages/Plugins/sheets/PluginInfoActionSheet.tsx @@ -236,7 +236,7 @@ export default function PluginInfoActionSheet({ variant="text-md/semibold" style={{ marginBottom: 4, - color: semanticColors.HEADER_PRIMARY, + color: semanticColors.MOBILE_TEXT_HEADING_PRIMARY, }} > Description diff --git a/src/core/ui/settings/pages/Themes/sheets/ThemeInfoActionSheet.tsx b/src/core/ui/settings/pages/Themes/sheets/ThemeInfoActionSheet.tsx index 4307476..3a7c147 100644 --- a/src/core/ui/settings/pages/Themes/sheets/ThemeInfoActionSheet.tsx +++ b/src/core/ui/settings/pages/Themes/sheets/ThemeInfoActionSheet.tsx @@ -194,7 +194,7 @@ export default function ThemeInfoActionSheet({ variant="text-md/semibold" style={{ marginBottom: 4, - color: semanticColors.HEADER_PRIMARY, + color: semanticColors.MOBILE_TEXT_HEADING_PRIMARY, }} > Description From 18890891892cb6a593d7abec2f9b948c7f1dd2cd Mon Sep 17 00:00:00 2001 From: cocobo1 Date: Fri, 12 Dec 2025 20:08:43 +0200 Subject: [PATCH 03/25] fix(text): correct text colouring --- src/core/ui/components/AddonCard.tsx | 4 ++-- .../settings/pages/Plugins/sheets/PluginInfoActionSheet.tsx | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/core/ui/components/AddonCard.tsx b/src/core/ui/components/AddonCard.tsx index a0486d4..973ee38 100644 --- a/src/core/ui/components/AddonCard.tsx +++ b/src/core/ui/components/AddonCard.tsx @@ -32,7 +32,7 @@ const useStyles = createStyles({ }, headerLabel: { ...TextStyleSheet["heading-md/semibold"], - color: semanticColors.TEXT_NORMAL, + color: semanticColors.HEADER_PRIMARY, }, headerSubtitle: { ...TextStyleSheet["text-md/semibold"], @@ -40,7 +40,7 @@ const useStyles = createStyles({ }, descriptionLabel: { ...TextStyleSheet["text-md/semibold"], - color: semanticColors.TEXT_NORMAL, + color: semanticColors.HEADER_PRIMARY, }, actions: { flexDirection: "row-reverse", diff --git a/src/core/ui/settings/pages/Plugins/sheets/PluginInfoActionSheet.tsx b/src/core/ui/settings/pages/Plugins/sheets/PluginInfoActionSheet.tsx index b9e9858..d857f28 100644 --- a/src/core/ui/settings/pages/Plugins/sheets/PluginInfoActionSheet.tsx +++ b/src/core/ui/settings/pages/Plugins/sheets/PluginInfoActionSheet.tsx @@ -11,6 +11,7 @@ import { useState } from "react"; import { ScrollView, View } from "react-native"; import TitleComponent from "./TitleComponent"; import { PluginInfoActionSheetProps } from "./common"; +import { semanticColors } from "@lib/ui/color"; function PluginInfoIconButton(props) { const { onPress } = props; @@ -205,7 +206,10 @@ export default function PluginInfoActionSheet({ Description From 9aced932d25a05d588a5490c7daca967c3a9ace3 Mon Sep 17 00:00:00 2001 From: Bwlok Date: Sat, 13 Dec 2025 02:29:08 +0100 Subject: [PATCH 04/25] fix app crashing when closing filter on ios --- src/core/ui/settings/pages/PluginBrowser/index.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/ui/settings/pages/PluginBrowser/index.tsx b/src/core/ui/settings/pages/PluginBrowser/index.tsx index 4bf41af..85a78a3 100644 --- a/src/core/ui/settings/pages/PluginBrowser/index.tsx +++ b/src/core/ui/settings/pages/PluginBrowser/index.tsx @@ -15,7 +15,8 @@ import { ActionSheet, AlertModal, AlertActions, TableRow, TableRowGroup } from " import { lazyDestructure } from "@lib/utils/lazy"; import { findByProps } from "@metro"; -const { showSimpleActionSheet, hideActionSheet } = lazyDestructure(() => findByProps("showSimpleActionSheet")); +const { showSimpleActionSheet } = lazyDestructure(() => findByProps("showSimpleActionSheet")); +const { hideActionSheet } = findByProps("hideActionSheet") interface BaseAddonData { name: string; From ec5daf8df9fe53f4659bc9f4c95608999f71fecf Mon Sep 17 00:00:00 2001 From: kmmiio99o Date: Tue, 16 Dec 2025 12:27:01 +0100 Subject: [PATCH 05/25] disable by default custom sound --- src/core/plugins/shiggyenhancements/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/plugins/shiggyenhancements/index.tsx b/src/core/plugins/shiggyenhancements/index.tsx index 441db09..b1c5005 100644 --- a/src/core/plugins/shiggyenhancements/index.tsx +++ b/src/core/plugins/shiggyenhancements/index.tsx @@ -240,7 +240,7 @@ export default defineCorePlugin({ // Initialize sound settings settings.startupSound = settings.startupSound || { - enabled: true, + enabled: false, probability: 2, }; From 1611ff22165f2932e2d81177bcbf49b9d6fd5632 Mon Sep 17 00:00:00 2001 From: kmmiio99o <164557248+kmmiio99o@users.noreply.github.com> Date: Fri, 19 Dec 2025 23:15:05 +0100 Subject: [PATCH 06/25] Fix colors of some text in some tabs --- src/core/ui/components/AddonPage.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/ui/components/AddonPage.tsx b/src/core/ui/components/AddonPage.tsx index e7db7f2..06dd58f 100644 --- a/src/core/ui/components/AddonPage.tsx +++ b/src/core/ui/components/AddonPage.tsx @@ -236,7 +236,7 @@ export default function AddonPage({ > - + Oops! Nothing to see here… yet! @@ -303,7 +303,7 @@ export default function AddonPage({ ListEmptyComponent={() => ( - + Hmmm... could not find that! From db9f3894b2a0172290f75f0efe8840a3ea426ad9 Mon Sep 17 00:00:00 2001 From: kmmiio99o <164557248+kmmiio99o@users.noreply.github.com> Date: Fri, 19 Dec 2025 23:22:28 +0100 Subject: [PATCH 07/25] Take some color fixes from revenge Just faster, but still nice :D --- src/core/ui/components/AddonCard.tsx | 2 +- src/core/ui/settings/pages/Fonts/FontCard.tsx | 155 ++++++++++++------ .../ui/settings/pages/Fonts/FontEditor.tsx | 2 +- .../Plugins/sheets/PluginInfoActionSheet.tsx | 2 +- src/lib/ui/components/Codeblock.tsx | 66 +++++--- 5 files changed, 150 insertions(+), 77 deletions(-) diff --git a/src/core/ui/components/AddonCard.tsx b/src/core/ui/components/AddonCard.tsx index 96aa21a..e369090 100644 --- a/src/core/ui/components/AddonCard.tsx +++ b/src/core/ui/components/AddonCard.tsx @@ -60,7 +60,7 @@ const useStyles = createStyles({ gap: 5, }, iconStyle: { - tintColor: semanticColors.LOGO_PRIMARY, + tintColor: semanticColors.INTERACTIVE_ICON_DEFAULT, opacity: 0.2, height: 64, width: 64, diff --git a/src/core/ui/settings/pages/Fonts/FontCard.tsx b/src/core/ui/settings/pages/Fonts/FontCard.tsx index 478fd7a..339b90d 100644 --- a/src/core/ui/settings/pages/Fonts/FontCard.tsx +++ b/src/core/ui/settings/pages/Fonts/FontCard.tsx @@ -5,63 +5,114 @@ import { useProxy } from "@core/vendetta/storage"; import { FontDefinition, fonts, selectFont } from "@lib/addons/fonts"; import { findAssetId } from "@lib/api/assets"; import { BundleUpdaterManager } from "@lib/api/native/modules"; -import { NavigationNative } from "@metro/common"; -import { Button, Card, IconButton, Text } from "@metro/common/components"; +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"; -export default function FontCard({ item: font }: CardWrapper) { - useProxy(fonts); +const { useToken } = lazyDestructure(() => findByProps("useToken")); - const navigation = NavigationNative.useNavigation(); - const selected = fonts.__selected === font.name; +function FontPreview({ font }: { font: FontDefinition; }) { + const TEXT_DEFAULT = useToken(tokens.colors.TEXT_DEFAULT); + const { fontFamily: fontFamilyList, fontSize } = TextStyleSheet["text-md/medium"]; + const fontFamily = fontFamilyList!.split(/,/g)[0]; - return ( - - - - {font.name} + 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_DEFAULT), + 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... + + } - - -