From 4b2297bf7fa63c75c95f33119218562eabcb8c76 Mon Sep 17 00:00:00 2001 From: thororen1234 <78185467+thororen1234@users.noreply.github.com> Date: Sun, 2 Feb 2025 12:20:00 -0500 Subject: [PATCH] Another Console Icon --- src/components/PluginSettings/index.tsx | 2 +- src/components/PluginSettings/styles.css | 11 ++- src/plugins/platformIndicators/index.tsx | 85 ++++++++++++++++-------- 3 files changed, 61 insertions(+), 37 deletions(-) diff --git a/src/components/PluginSettings/index.tsx b/src/components/PluginSettings/index.tsx index 83855b55..6b949e6a 100644 --- a/src/components/PluginSettings/index.tsx +++ b/src/components/PluginSettings/index.tsx @@ -71,7 +71,7 @@ function ReloadRequiredCard({ required, enabledPlugins, openDisablePluginsModal, Restart now to apply new plugins and their settings - diff --git a/src/components/PluginSettings/styles.css b/src/components/PluginSettings/styles.css index fbb9a523..199405d6 100644 --- a/src/components/PluginSettings/styles.css +++ b/src/components/PluginSettings/styles.css @@ -76,20 +76,17 @@ color: var(--info-warning-text); } -.vc-plugins-restart-button { - margin-top: 0.5em; -} - -.vc-plugins-info-icon:not(:hover, :focus) { +.vc-plugins-info-button svg:not(:hover, :focus) { color: var(--text-muted); } -.vc-restart-button { +.vc-plugins-restart-button { background-color: var(--background-color) !important; border: 1px solid var(--info-warning-foreground) !important; + margin-top: 0.5em; } -.vc-restart-button:hover { +.vc-plugins-restart-button:hover { background-color: var(--info-warning-foreground) !important; } diff --git a/src/plugins/platformIndicators/index.tsx b/src/plugins/platformIndicators/index.tsx index e95da487..15cfe4db 100644 --- a/src/plugins/platformIndicators/index.tsx +++ b/src/plugins/platformIndicators/index.tsx @@ -66,8 +66,9 @@ const Icons = { desktop: Icon("M4 2.5c-1.103 0-2 .897-2 2v11c0 1.104.897 2 2 2h7v2H7v2h10v-2h-4v-2h7c1.103 0 2-.896 2-2v-11c0-1.103-.897-2-2-2H4Zm16 2v9H4v-9h16Z"), web: Icon("M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2Zm-1 17.93c-3.95-.49-7-3.85-7-7.93 0-.62.08-1.21.21-1.79L9 15v1c0 1.1.9 2 2 2v1.93Zm6.9-2.54c-.26-.81-1-1.39-1.9-1.39h-1v-3c0-.55-.45-1-1-1H8v-2h2c.55 0 1-.45 1-1V7h2c1.1 0 2-.9 2-2v-.41c2.93 1.19 5 4.06 5 7.41 0 2.08-.8 3.97-2.1 5.39Z"), mobile: Icon("M 187 0 L 813 0 C 916.277 0 1000 83.723 1000 187 L 1000 1313 C 1000 1416.277 916.277 1500 813 1500 L 187 1500 C 83.723 1500 0 1416.277 0 1313 L 0 187 C 0 83.723 83.723 0 187 0 Z M 125 1000 L 875 1000 L 875 250 L 125 250 Z M 500 1125 C 430.964 1125 375 1180.964 375 1250 C 375 1319.036 430.964 1375 500 1375 C 569.036 1375 625 1319.036 625 1250 C 625 1180.964 569.036 1125 500 1125 Z", { viewBox: "0 0 1000 1500", height: 17, width: 17 }), - embedded: Icon("M7 4a6 6 0 00-6 6v4a6 6 0 006 6h10a6 6 0 006-6v-4a6 6 0 00-6-6H7zm0 11a1 1 0 01-1-1v-1H5a1 1 0 010-2h1v-1a1 1 0 012 0v1h1a1 1 0 010 2H8v1a1 1 0 01-1 1zm10-4a1 1 0 100-2 1 1 0 000 2zm1 3a1 1 0 11-2 0 1 1 0 012 0zm0-2a1 1 0 102 0 1 1 0 00-2 0zm-3 1a1 1 0 110-2 1 1 0 010 2z", { viewBox: "0 0 24 24", height: 24, width: 24 }), - embeddedvc: Icon("M14.8 2.7 9 3.1V47h3.3c1.7 0 6.2.3 10 .7l6.7.6V2l-4.2.2c-2.4.1-6.9.3-10 .5zm1.8 6.4c1 1.7-1.3 3.6-2.7 2.2C12.7 10.1 13.5 8 15 8c.5 0 1.2.5 1.6 1.1zM16 33c0 6-.4 10-1 10s-1-4-1-10 .4-10 1-10 1 4 1 10zm15-8v23.3l3.8-.7c2-.3 4.7-.6 6-.6H43V3h-2.2c-1.3 0-4-.3-6-.6L31 1.7V25z", { viewBox: "0 0 50 50" }), + embedded: Icon("M3.06 20.4q-1.53 0-2.37-1.065T.06 16.74l1.26-9q.27-1.8 1.605-2.97T6.06 3.6h11.88q1.8 0 3.135 1.17t1.605 2.97l1.26 9q.21 1.53-.63 2.595T20.94 20.4q-.63 0-1.17-.225T18.78 19.5l-2.7-2.7H7.92l-2.7 2.7q-.45.45-.99.675t-1.17.225Zm14.94-7.2q.51 0 .855-.345T19.2 12q0-.51-.345-.855T18 10.8q-.51 0-.855.345T16.8 12q0 .51.345 .855T18 13.2Zm-2.4-3.6q.51 0 .855-.345T16.8 8.4q0-.51-.345-.855T15.6 7.2q-.51 0-.855.345T14.4 8.4q0 .51.345 .855T15.6 9.6ZM6.9 13.2h1.8v-2.1h2.1v-1.8h-2.1v-2.1h-1.8v2.1h-2.1v1.8h2.1v2.1Z", { viewBox: "0 0 24 24", height: 20, width: 20 }), + suncord: Icon("M7 4a6 6 0 00-6 6v4a6 6 0 006 6h10a6 6 0 006-6v-4a6 6 0 00-6-6H7zm0 11a1 1 0 01-1-1v-1H5a1 1 0 010-2h1v-1a1 1 0 012 0v1h1a1 1 0 010 2H8v1a1 1 0 01-1 1zm10-4a1 1 0 100-2 1 1 0 000 2zm1 3a1 1 0 11-2 0 1 1 0 012 0zm0-2a1 1 0 102 0 1 1 0 00-2 0zm-3 1a1 1 0 110-2 1 1 0 010 2z", { viewBox: "0 0 24 24", height: 24, width: 24 }), + vencord: Icon("M14.8 2.7 9 3.1V47h3.3c1.7 0 6.2.3 10 .7l6.7.6V2l-4.2.2c-2.4.1-6.9.3-10 .5zm1.8 6.4c1 1.7-1.3 3.6-2.7 2.2C12.7 10.1 13.5 8 15 8c.5 0 1.2.5 1.6 1.1zM16 33c0 6-.4 10-1 10s-1-4-1-10 .4-10 1-10 1 4 1 10zm15-8v23.3l3.8-.7c2-.3 4.7-.6 6-.6H43V3h-2.2c-1.3 0-4-.3-6-.6L31 1.7V25z", { viewBox: "0 0 50 50" }), }; type Platform = keyof typeof Icons; @@ -80,8 +81,12 @@ const PlatformIcon = ({ platform, status, small }: { platform: Platform, status: ? "Console" : platform[0].toUpperCase() + platform.slice(1); let Icon = Icons[platform] ?? Icons.desktop; - if (Settings.plugins.PlatformIndicators.VencordConsoleIcon && platform === "embedded") { - Icon = Icons.embeddedvc; + const { ConsoleIcon } = Settings.plugins.PlatformIndicators; + if (platform === "embedded" && ConsoleIcon === "vencord") { + Icon = Icons.vencord; + } + if (platform === "embedded" && ConsoleIcon === "suncord") { + Icon = Icons.suncord; } return ; @@ -200,6 +205,32 @@ const indicatorLocations = { } }; +function addAllIndicators() { + const settings = Settings.plugins.PlatformIndicators; + const { displayMode } = settings; + + // transfer settings from the old ones, which had a select menu instead of booleans + if (displayMode) { + if (displayMode !== "both") settings[displayMode] = true; + else { + settings.list = true; + settings.badges = true; + } + settings.messages = true; + delete settings.displayMode; + } + + Object.entries(indicatorLocations).forEach(([key, value]) => { + if (settings[key]) value.onEnable(); + }); +} + +function deleteAllIndicators() { + Object.entries(indicatorLocations).forEach(([_, value]) => { + value.onDisable(); + }); +} + export default definePlugin({ name: "PlatformIndicators", description: "Adds platform indicators (Desktop, Mobile, Web...) to users", @@ -207,29 +238,11 @@ export default definePlugin({ dependencies: ["MessageDecorationsAPI", "MemberListDecoratorsAPI"], start() { - const settings = Settings.plugins.PlatformIndicators; - const { displayMode } = settings; - - // transfer settings from the old ones, which had a select menu instead of booleans - if (displayMode) { - if (displayMode !== "both") settings[displayMode] = true; - else { - settings.list = true; - settings.badges = true; - } - settings.messages = true; - delete settings.displayMode; - } - - Object.entries(indicatorLocations).forEach(([key, value]) => { - if (settings[key]) value.onEnable(); - }); + addAllIndicators(); }, stop() { - Object.entries(indicatorLocations).forEach(([_, value]) => { - value.onDisable(); - }); + deleteAllIndicators(); }, patches: [ @@ -305,11 +318,25 @@ export default definePlugin({ default: false, restartNeeded: false }, - VencordConsoleIcon: { - type: OptionType.BOOLEAN, - description: "Use Vencords Console Icon", - default: false, + ConsoleIcon: { + type: OptionType.SELECT, + description: "What console icon to use", restartNeeded: true, - } + options: [ + { + label: "Equicord", + value: "equicord", + default: true + }, + { + label: "Suncord", + value: "suncord", + }, + { + label: "Vencord", + value: "vencord", + }, + ], + }, } });