diff --git a/scripts/build.mjs b/scripts/build.mjs index 9dcdcdd..9c4f8b3 100644 --- a/scripts/build.mjs +++ b/scripts/build.mjs @@ -77,7 +77,7 @@ const config = { constModules: { globals: { "bunny-build-info": { - version: `"1.1.4-1"`, + version: `"1.1.4-2"`, }, }, }, diff --git a/src/core/i18n/default.json b/src/core/i18n/default.json index f13e3b1..665f451 100644 --- a/src/core/i18n/default.json +++ b/src/core/i18n/default.json @@ -6,8 +6,8 @@ "ARE_YOU_SURE_TO_DELETE_THEME": "Are you sure you wish to delete {name}?", "ASSET_BROWSER": "Asset Browser", "BRAND": "Brand", - "PUPU": "ShiggyCord", - "PUPU_URL": "ShiggyCord URL", + "SHIGGYCORD": "ShiggyCord", + "SHIGGYCORD_URL": "ShiggyCord URL", "BROWSER": "Browser", "BYTECODE": "Bytecode", "CANCEL": "Cancel", diff --git a/src/core/ui/settings/index.ts b/src/core/ui/settings/index.ts index e7f38bc..783f665 100644 --- a/src/core/ui/settings/index.ts +++ b/src/core/ui/settings/index.ts @@ -1,4 +1,4 @@ -import PupuIcon from "@assets/icons/shiggy.png"; +import shiggycordIcon from "@assets/icons/shiggy.png"; import { Strings } from "@core/i18n"; import { useProxy } from "@core/vendetta/storage"; import { findAssetId } from "@lib/api/assets"; @@ -7,7 +7,7 @@ import { settings } from "@lib/api/settings"; import { registerSection } from "@ui/settings"; import { version } from "bunny-build-info"; -export { PupuIcon }; +export { shiggycordIcon }; export default function initSettings() { registerSection({ @@ -15,8 +15,8 @@ export default function initSettings() { items: [ { key: "SHIGGYCORD", - title: () => Strings.PUPU, - icon: { uri: PupuIcon }, + title: () => Strings.SHIGGYCORD, + icon: { uri: shiggycordIcon }, render: () => import("@core/ui/settings/pages/General"), useTrailing: () => `(${version})`, }, diff --git a/src/core/ui/settings/pages/Developer/index.tsx b/src/core/ui/settings/pages/Developer/index.tsx index 7efd2be..ec5c26a 100644 --- a/src/core/ui/settings/pages/Developer/index.tsx +++ b/src/core/ui/settings/pages/Developer/index.tsx @@ -189,7 +189,7 @@ export default function Developer() { (loaderConfig.customLoadUrl.url = v) } placeholder="http://localhost:4040/shiggycord.js" - label={Strings.PUPU_URL} + label={Strings.SHIGGYCORD_URL} /> } /> @@ -204,7 +204,7 @@ export default function Developer() { icon={} trailing={TableRow.Arrow} onPress={() => - navigation.push("PUPU_CUSTOM_PAGE", { + navigation.push("SHIGGYCORD_CUSTOM_PAGE", { title: Strings.ASSET_BROWSER, render: AssetBrowser, }) @@ -231,7 +231,7 @@ export default function Developer() { // @ts-expect-error // Of course, to trigger an error, we need to do something incorrectly. The below will do! { - label: Strings.PUPU, + label: Strings.SHIGGYCORD, onPress: () => navigation.push("SHIGGYCORD_CUSTOM_PAGE", { render: () => , @@ -241,7 +241,7 @@ export default function Developer() { label: "Discord", isDestructive: true, onPress: () => - navigation.push("PUPU_CUSTOM_PAGE", { + navigation.push("SHIGGYCORD_CUSTOM_PAGE", { noErrorBoundary: true, }), }, @@ -259,7 +259,7 @@ export default function Developer() { icon={} onPress={() => { openAlert( - "pupu-clear-bundle-reload-confirmation", + "shiggycord-clear-bundle-reload-confirmation", - {Strings.PUPU} + {Strings.SHIGGYCORD} } + icon={} trailing={} /> } onPress={() => - navigation.push("PUPU_CUSTOM_PAGE", { + navigation.push("SHIGGYCORD_CUSTOM_PAGE", { title: Strings.ABOUT, render: () => , }) diff --git a/src/core/ui/settings/pages/Plugins/components/PluginCard.tsx b/src/core/ui/settings/pages/Plugins/components/PluginCard.tsx index b091fe6..e631993 100644 --- a/src/core/ui/settings/pages/Plugins/components/PluginCard.tsx +++ b/src/core/ui/settings/pages/Plugins/components/PluginCard.tsx @@ -118,7 +118,7 @@ const Actions = () => { icon={findAssetId("WrenchIcon")} disabled={!plugin.getPluginSettingsComponent()} onPress={() => - navigation.push("PUPU_CUSTOM_PAGE", { + navigation.push("SHIGGYCORD_CUSTOM_PAGE", { title: plugin.name, render: plugin.getPluginSettingsComponent(), }) diff --git a/src/core/ui/settings/pages/Plugins/models/bunny.ts b/src/core/ui/settings/pages/Plugins/models/bunny.ts index 2ef1c9c..674f993 100644 --- a/src/core/ui/settings/pages/Plugins/models/bunny.ts +++ b/src/core/ui/settings/pages/Plugins/models/bunny.ts @@ -1,4 +1,4 @@ -import { PupuIcon } from "@core/ui/settings"; +import { shiggycordIcon } from "@core/ui/settings"; import { disablePlugin, enablePlugin, @@ -22,7 +22,7 @@ export default function unifyBunnyPlugin( getBadges() { return [ - { source: { uri: PupuIcon } }, + { source: { uri: shiggycordIcon } }, // { source: findAssetId("CheckmarkLargeBoldIcon")! } ]; }, diff --git a/src/core/ui/settings/pages/Plugins/sheets/PluginInfoActionSheet.tsx b/src/core/ui/settings/pages/Plugins/sheets/PluginInfoActionSheet.tsx index 27bc723..5445d81 100644 --- a/src/core/ui/settings/pages/Plugins/sheets/PluginInfoActionSheet.tsx +++ b/src/core/ui/settings/pages/Plugins/sheets/PluginInfoActionSheet.tsx @@ -196,7 +196,7 @@ export default function PluginInfoActionSheet({ disabled={!plugin.getPluginSettingsComponent()} icon={findAssetId("WrenchIcon")} onPress={() => { - navigation.push("PUPU_CUSTOM_PAGE", { + navigation.push("SHIGGYCORD_CUSTOM_PAGE", { title: plugin.name, render: plugin.getPluginSettingsComponent(), }); diff --git a/src/core/ui/settings/pages/Plugins/sheets/VdPluginInfoActionSheet.tsx b/src/core/ui/settings/pages/Plugins/sheets/VdPluginInfoActionSheet.tsx index 73657cd..796aaa6 100644 --- a/src/core/ui/settings/pages/Plugins/sheets/VdPluginInfoActionSheet.tsx +++ b/src/core/ui/settings/pages/Plugins/sheets/VdPluginInfoActionSheet.tsx @@ -4,137 +4,190 @@ import { VdPluginManager } from "@core/vendetta/plugins"; import { purgeStorage } from "@core/vendetta/storage"; import { findAssetId } from "@lib/api/assets"; import { clipboard } from "@metro/common"; -import { ActionSheet, ActionSheetRow, Button, TableRow, Text } from "@metro/common/components"; +import { + ActionSheet, + ActionSheetRow, + Button, + TableRow, + Text, +} from "@metro/common/components"; import { hideSheet } from "@ui/sheets"; import { showToast } from "@ui/toasts"; import { ScrollView, View } from "react-native"; import { PluginInfoActionSheetProps } from "./common"; -export default function PluginInfoActionSheet({ plugin, navigation }: PluginInfoActionSheetProps) { - plugin.usePluginState(); +export default function PluginInfoActionSheet({ + plugin, + navigation, +}: PluginInfoActionSheetProps) { + plugin.usePluginState(); - const vdPlugin = VdPluginManager.plugins[plugin.id]; - const SettingsComponent = plugin.getPluginSettingsComponent(); + const vdPlugin = VdPluginManager.plugins[plugin.id]; + const SettingsComponent = plugin.getPluginSettingsComponent(); - return - - - - {plugin.name} - - - {SettingsComponent &&