From aaecce6cd4b1b3aaf81654aef8cc0c911e232f23 Mon Sep 17 00:00:00 2001 From: amsyarasyiq <82711525+amsyarasyiq@users.noreply.github.com> Date: Tue, 9 Jul 2024 15:53:34 +0800 Subject: [PATCH] refactor: rename assets api --- src/core/plugins/quickInstall/forumPost.tsx | 6 ++-- src/core/plugins/quickInstall/url.tsx | 6 ++-- src/core/polyfills/vendettaObject.tsx | 6 ++-- src/core/ui/components/AddonCard.tsx | 10 +++---- src/core/ui/components/AddonPage.tsx | 4 +-- src/core/ui/components/InstallButton.tsx | 4 +-- src/core/ui/settings/index.ts | 10 +++---- .../ui/settings/pages/Developer/index.tsx | 22 +++++++-------- src/core/ui/settings/pages/Fonts/FontCard.tsx | 4 +-- .../ui/settings/pages/Fonts/FontEditor.tsx | 22 +++++++-------- .../ui/settings/pages/General/Version.tsx | 4 +-- src/core/ui/settings/pages/General/index.tsx | 18 ++++++------ .../ui/settings/pages/Plugins/PluginCard.tsx | 10 +++---- .../Plugins/sheets/PluginInfoActionSheet.tsx | 28 +++++++++---------- .../ui/settings/pages/Themes/ThemeCard.tsx | 8 +++--- src/lib/api/assets.ts | 26 +++++++++++++---- src/lib/debug.ts | 8 +++--- src/lib/ui/components/Search.tsx | 4 +-- src/lib/ui/components/Summary.tsx | 4 +-- src/lib/ui/toasts.ts | 4 +-- 20 files changed, 111 insertions(+), 97 deletions(-) diff --git a/src/core/plugins/quickInstall/forumPost.tsx b/src/core/plugins/quickInstall/forumPost.tsx index 27789c5..b9606c2 100644 --- a/src/core/plugins/quickInstall/forumPost.tsx +++ b/src/core/plugins/quickInstall/forumPost.tsx @@ -1,5 +1,5 @@ import { Strings } from "@core/i18n"; -import { requireAssetIndex } from "@lib/api/assets"; +import { findAssetId } from "@lib/api/assets"; import { isThemeSupported } from "@lib/api/native/loader"; import { after } from "@lib/api/patcher"; import { useProxy } from "@lib/api/storage"; @@ -77,7 +77,7 @@ function useInstaller(thread: any, firstMessage = null, actionSheet = false): [t try { await postMap[postType].installOrRemove(url); } catch (e: any) { - showToast(e.message, requireAssetIndex("Small")); + showToast(e.message, findAssetId("Small")); } finally { setIsInstalling(false); } @@ -119,7 +119,7 @@ const installButtonPatch = () => after("MostCommonForumPostReaction", forumReact variant={installed ? "secondary" : "primary"} text={installed ? Strings.UNINSTALL : Strings.INSTALL} onPress={installOrRemove} - icon={requireAssetIndex(installed ? "ic_message_delete" : "DownloadIcon")} + icon={findAssetId(installed ? "ic_message_delete" : "DownloadIcon")} style={{ marginLeft: 8 }} /> diff --git a/src/core/plugins/quickInstall/url.tsx b/src/core/plugins/quickInstall/url.tsx index 1b33938..8344feb 100644 --- a/src/core/plugins/quickInstall/url.tsx +++ b/src/core/plugins/quickInstall/url.tsx @@ -1,5 +1,5 @@ import { formatString, Strings } from "@core/i18n"; -import { requireAssetIndex } from "@lib/api/assets"; +import { findAssetId } from "@lib/api/assets"; import { isThemeSupported } from "@lib/api/native/loader"; import { after, instead } from "@lib/api/patcher"; import { installPlugin } from "@lib/managers/plugins"; @@ -30,10 +30,10 @@ function typeFromUrl(url: string) { function installWithToast(type: "plugin" | "theme", url: string) { (type === "plugin" ? installPlugin : installTheme)(url) .then(() => { - showToast(Strings.SUCCESSFULLY_INSTALLED, requireAssetIndex("Check")); + showToast(Strings.SUCCESSFULLY_INSTALLED, findAssetId("Check")); }) .catch((e: Error) => { - showToast(e.message, requireAssetIndex("Small")); + showToast(e.message, findAssetId("Small")); }); } diff --git a/src/core/polyfills/vendettaObject.tsx b/src/core/polyfills/vendettaObject.tsx index 30d5cc7..30c9c9b 100644 --- a/src/core/polyfills/vendettaObject.tsx +++ b/src/core/polyfills/vendettaObject.tsx @@ -163,9 +163,9 @@ export const initVendettaObject = (): any => { assets: { all: assets.assetsMap, find: (filter: (a: any) => void) => assets.findAsset(filter), - getAssetByName: (name: string) => assets.requireAssetByName(name), - getAssetByID: (id: number) => assets.requireAssetByIndex(id), - getAssetIDByName: (name: string) => assets.requireAssetIndex(name) + getAssetByName: (name: string) => assets.findAsset(name), + getAssetByID: (id: number) => assets.findAsset(id), + getAssetIDByName: (name: string) => assets.findAssetId(name) }, semanticColors: color.semanticColors, rawColors: color.rawColors diff --git a/src/core/ui/components/AddonCard.tsx b/src/core/ui/components/AddonCard.tsx index 47839d4..927334a 100644 --- a/src/core/ui/components/AddonCard.tsx +++ b/src/core/ui/components/AddonCard.tsx @@ -1,4 +1,4 @@ -import { requireAssetIndex } from "@lib/api/assets"; +import { findAssetId } from "@lib/api/assets"; import { lazyDestructure } from "@lib/utils/lazy"; import { Card, FormRadio, FormSwitch, IconButton, LegacyFormRow, Stack, Text } from "@metro/common/components"; import { findByProps } from "@metro/utils"; @@ -108,17 +108,17 @@ export default function AddonCard(props: CardProps) { key: "CardOverflow", header: { title: props.overflowTitle, - icon: props.headerIcon && , + icon: props.headerIcon && , onClose: () => hideActionSheet(), }, options: props.overflowActions?.map(i => ({ ...i, - icon: requireAssetIndex(i.icon) + icon: findAssetId(i.icon) })), })} size="sm" variant="secondary" - icon={requireAssetIndex("CircleInformationIcon-primary")} + icon={findAssetId("CircleInformationIcon-primary")} />} {props.actions?.map(({ icon, onPress, disabled }) => ( ))} diff --git a/src/core/ui/components/AddonPage.tsx b/src/core/ui/components/AddonPage.tsx index a132fa0..b4201d3 100644 --- a/src/core/ui/components/AddonPage.tsx +++ b/src/core/ui/components/AddonPage.tsx @@ -1,6 +1,6 @@ import { Strings } from "@core/i18n"; import { CardWrapper } from "@core/ui/components/AddonCard"; -import { requireAssetIndex } from "@lib/api/assets"; +import { findAssetId } from "@lib/api/assets"; import { useProxy } from "@lib/api/storage"; import { settings } from "@lib/settings"; import { HTTP_REGEX_MULTI } from "@lib/utils/constants"; @@ -76,7 +76,7 @@ export default function AddonPage({ card: CardComponent, ...pr )} /> { // from ./InstallButton.tsx clipboard.getString().then(content => diff --git a/src/core/ui/components/InstallButton.tsx b/src/core/ui/components/InstallButton.tsx index 525bf17..a810bd1 100644 --- a/src/core/ui/components/InstallButton.tsx +++ b/src/core/ui/components/InstallButton.tsx @@ -1,5 +1,5 @@ import { Strings } from "@core/i18n"; -import { requireAssetIndex } from "@lib/api/assets"; +import { findAssetId } from "@lib/api/assets"; import { HTTP_REGEX_MULTI } from "@lib/utils/constants"; import { clipboard } from "@metro/common"; import { showInputAlert } from "@ui/alerts"; @@ -35,7 +35,7 @@ export default function InstallButton({ alertTitle, installFunction: fetchFuncti }) ) }> - + ); } diff --git a/src/core/ui/settings/index.ts b/src/core/ui/settings/index.ts index 7006434..7433740 100644 --- a/src/core/ui/settings/index.ts +++ b/src/core/ui/settings/index.ts @@ -1,6 +1,6 @@ import PyoncordIcon from "@assets/icons/pyoncord.png"; import { Strings } from "@core/i18n"; -import { requireAssetIndex } from "@lib/api/assets"; +import { findAssetId } from "@lib/api/assets"; import { isFontSupported, isThemeSupported } from "@lib/api/native/loader"; import { useProxy } from "@lib/api/storage"; import { settings } from "@lib/settings"; @@ -25,27 +25,27 @@ export default function initSettings() { { key: "BUNNY_PLUGINS", title: () => Strings.PLUGINS, - icon: requireAssetIndex("ActivitiesIcon"), + icon: findAssetId("ActivitiesIcon"), render: () => import("@core/ui/settings/pages/Plugins") }, { key: "BUNNY_THEMES", title: () => Strings.THEMES, - icon: requireAssetIndex("PaintPaletteIcon"), + icon: findAssetId("PaintPaletteIcon"), render: () => import("@core/ui/settings/pages/Themes"), usePredicate: () => isThemeSupported() }, { key: "BUNNY_FONTS", title: () => Strings.FONTS, - icon: requireAssetIndex("ic_add_text"), + icon: findAssetId("ic_add_text"), render: () => import("@core/ui/settings/pages/Fonts"), usePredicate: () => isFontSupported() }, { key: "BUNNY_DEVELOPER", title: () => Strings.DEVELOPER, - icon: requireAssetIndex("WrenchIcon"), + icon: findAssetId("WrenchIcon"), render: () => import("@core/ui/settings/pages/Developer"), usePredicate: () => useProxy(settings).developerSettings ?? false } diff --git a/src/core/ui/settings/pages/Developer/index.tsx b/src/core/ui/settings/pages/Developer/index.tsx index 85a52b0..c340bf2 100644 --- a/src/core/ui/settings/pages/Developer/index.tsx +++ b/src/core/ui/settings/pages/Developer/index.tsx @@ -1,7 +1,7 @@ import { Strings } from "@core/i18n"; import { CheckState, useFileExists } from "@core/ui/settings/hooks/useFS"; import AssetBrowser from "@core/ui/settings/pages/Developer/AssetBrowser"; -import { requireAssetIndex } from "@lib/api/assets"; +import { findAssetId } from "@lib/api/assets"; import { getReactDevToolsProp, getReactDevToolsVersion, isLoaderConfigSupported, isReactDevToolsPreloaded, isVendettaLoader } from "@lib/api/native/loader"; import { useProxy } from "@lib/api/storage"; import { connectToDebugger } from "@lib/debug"; @@ -52,13 +52,13 @@ export default function Developer() { } + icon={} onPress={() => connectToDebugger(settings.debuggerUrl)} /> {isReactDevToolsPreloaded() && <> } + icon={} onPress={() => window[getReactDevToolsProp() || "__vendetta_rdc"]?.connectToDevTools({ host: settings.debuggerUrl.split(":")?.[0], resolveRNStyle: StyleSheet.flatten, @@ -71,7 +71,7 @@ export default function Developer() { } + icon={} value={loaderConfig.customLoadUrl.enabled} onValueChange={(v: boolean) => { loaderConfig.customLoadUrl.enabled = v; @@ -87,7 +87,7 @@ export default function Developer() { {isReactDevToolsPreloaded() && isVendettaLoader() && } + icon={} value={loaderConfig.loadReactDevTools} onValueChange={(v: boolean) => { loaderConfig.loadReactDevTools = v; @@ -99,7 +99,7 @@ export default function Developer() { } + icon={} trailing={TableRow.Arrow} onPress={() => navigation.push("VendettaCustomPage", { title: Strings.ASSET_BROWSER, @@ -109,12 +109,12 @@ export default function Developer() { } + icon={} onPress={() => showSimpleActionSheet({ key: "ErrorBoundaryTools", header: { title: "Which ErrorBoundary do you want to trip?", - icon: , + icon: , onClose: () => hideActionSheet(), }, options: [ @@ -128,7 +128,7 @@ export default function Developer() { } + icon={} trailing={