diff --git a/src/plugins/settings/components/icons/AssetIcon.tsx b/src/components/icons/AssetIcon.tsx similarity index 100% rename from src/plugins/settings/components/icons/AssetIcon.tsx rename to src/components/icons/AssetIcon.tsx diff --git a/src/plugins/settings/components/icons/RevengeIcon.tsx b/src/components/icons/RevengeIcon.tsx similarity index 100% rename from src/plugins/settings/components/icons/RevengeIcon.tsx rename to src/components/icons/RevengeIcon.tsx diff --git a/src/plugins/all.ts b/src/plugins/all.ts index a780ada..2c9f806 100644 --- a/src/plugins/all.ts +++ b/src/plugins/all.ts @@ -1,3 +1,4 @@ import './logging' import './staff-settings' import './settings' +import './developer-settings' diff --git a/src/plugins/developer-settings/constants.ts b/src/plugins/developer-settings/constants.ts new file mode 100644 index 0000000..3796e20 --- /dev/null +++ b/src/plugins/developer-settings/constants.ts @@ -0,0 +1,16 @@ +export const MobileSetting = { + // MAIN SETTINGS + + REVENGE_DEVELOPER: 'REVENGE_DEVELOPER', + + // SUBSETTINGS + + REACT_DEVTOOLS_VERSION: 'REACT_DEVTOOLS_VERSION', + REACT_DEVTOOLS_CONNECT: 'REACT_DEVTOOLS_CONNECT', + REACT_DEVTOOLS_DISCONNECT: 'REACT_DEVTOOLS_DISCONNECT', + EVALUATE_JAVASCRIPT: 'EVALUATE_JAVASCRIPT', +} as const + +export const UserSettingsSections = { + [MobileSetting.REVENGE_DEVELOPER]: 'Revenge Developer', +} as const diff --git a/src/plugins/settings/definitions/EvaluateJavaScriptSetting.tsx b/src/plugins/developer-settings/definitions/EvaluateJavaScriptSetting.tsx similarity index 98% rename from src/plugins/settings/definitions/EvaluateJavaScriptSetting.tsx rename to src/plugins/developer-settings/definitions/EvaluateJavaScriptSetting.tsx index 17d5d92..b437772 100644 --- a/src/plugins/settings/definitions/EvaluateJavaScriptSetting.tsx +++ b/src/plugins/developer-settings/definitions/EvaluateJavaScriptSetting.tsx @@ -6,8 +6,9 @@ import { Components } from '@revenge-mod/discord/ui' import { getErrorStack } from '@revenge-mod/utils/errors' +import AssetIcon from '~components/icons/AssetIcon' + import { pluginApi } from '..' -import AssetIcon from '../components/icons/AssetIcon' import type { SettingsItem } from '@revenge-mod/discord/ui/settings' diff --git a/src/plugins/settings/definitions/ReactDevToolsConnectSetting.tsx b/src/plugins/developer-settings/definitions/ReactDevToolsConnectSetting.tsx similarity index 76% rename from src/plugins/settings/definitions/ReactDevToolsConnectSetting.tsx rename to src/plugins/developer-settings/definitions/ReactDevToolsConnectSetting.tsx index 1b32e19..f776a9d 100644 --- a/src/plugins/settings/definitions/ReactDevToolsConnectSetting.tsx +++ b/src/plugins/developer-settings/definitions/ReactDevToolsConnectSetting.tsx @@ -1,8 +1,9 @@ import { React } from '@revenge-mod/react' -import AssetIcon from '../components/icons/AssetIcon' -import { connectToDevTools, DevToolsContext, useIsDevToolsOpen } from '../devtools' -import { MobileSetting } from '../SettingsConstants' +import AssetIcon from '~components/icons/AssetIcon' + +import { MobileSetting } from '../constants' +import { DevToolsContext, connectToDevTools, useIsDevToolsOpen } from '../devtools' import type { SettingsItem } from '@revenge-mod/discord/ui/settings' diff --git a/src/plugins/settings/definitions/ReactDevToolsDisconnectSetting.tsx b/src/plugins/developer-settings/definitions/ReactDevToolsDisconnectSetting.tsx similarity index 84% rename from src/plugins/settings/definitions/ReactDevToolsDisconnectSetting.tsx rename to src/plugins/developer-settings/definitions/ReactDevToolsDisconnectSetting.tsx index 7491c0a..611eabb 100644 --- a/src/plugins/settings/definitions/ReactDevToolsDisconnectSetting.tsx +++ b/src/plugins/developer-settings/definitions/ReactDevToolsDisconnectSetting.tsx @@ -1,8 +1,9 @@ import { React } from '@revenge-mod/react' -import AssetIcon from '../components/icons/AssetIcon' +import AssetIcon from '~components/icons/AssetIcon' + +import { MobileSetting } from '../constants' import { disconnectFromDevTools, useIsDevToolsOpen } from '../devtools' -import { MobileSetting } from '../SettingsConstants' import type { SettingsItem } from '@revenge-mod/discord/ui/settings' diff --git a/src/plugins/settings/definitions/ReactDevToolsVersionSetting.tsx b/src/plugins/developer-settings/definitions/ReactDevToolsVersionSetting.tsx similarity index 83% rename from src/plugins/settings/definitions/ReactDevToolsVersionSetting.tsx rename to src/plugins/developer-settings/definitions/ReactDevToolsVersionSetting.tsx index 9c2d807..37396bd 100644 --- a/src/plugins/settings/definitions/ReactDevToolsVersionSetting.tsx +++ b/src/plugins/developer-settings/definitions/ReactDevToolsVersionSetting.tsx @@ -1,10 +1,11 @@ import { React } from '@revenge-mod/react' -import AssetIcon from '../components/icons/AssetIcon' -import { MobileSetting } from '../SettingsConstants' +import AssetIcon from '~components/icons/AssetIcon' + +import { MobileSetting } from '../constants' +import { DevToolsContext } from '../devtools' import type { SettingsItem } from '@revenge-mod/discord/ui/settings' -import { DevToolsContext } from '../devtools' const ReactDevToolsVersionSetting: SettingsItem = { parent: MobileSetting.REVENGE_DEVELOPER, diff --git a/src/plugins/settings/definitions/RevengeDeveloperSetting.tsx b/src/plugins/developer-settings/definitions/RevengeDeveloperSetting.tsx similarity index 78% rename from src/plugins/settings/definitions/RevengeDeveloperSetting.tsx rename to src/plugins/developer-settings/definitions/RevengeDeveloperSetting.tsx index 77c3337..af4c5fa 100644 --- a/src/plugins/settings/definitions/RevengeDeveloperSetting.tsx +++ b/src/plugins/developer-settings/definitions/RevengeDeveloperSetting.tsx @@ -1,5 +1,6 @@ -import { MobileSetting, UserSettingsSections } from '../SettingsConstants' -import AssetIcon from '../components/icons/AssetIcon' +import AssetIcon from '~components/icons/AssetIcon' + +import { MobileSetting, UserSettingsSections } from '../constants' import type { SettingsItem } from '@revenge-mod/discord/ui/settings' diff --git a/src/plugins/settings/devtools.ts b/src/plugins/developer-settings/devtools.ts similarity index 100% rename from src/plugins/settings/devtools.ts rename to src/plugins/developer-settings/devtools.ts diff --git a/src/plugins/developer-settings/index.ts b/src/plugins/developer-settings/index.ts new file mode 100644 index 0000000..4c995fd --- /dev/null +++ b/src/plugins/developer-settings/index.ts @@ -0,0 +1,29 @@ +import { type PluginApi, PluginFlags } from '@revenge-mod/plugins' +import { InternalPluginFlags, registerPlugin } from '@revenge-mod/plugins/_' + +import { _data } from '@revenge-mod/discord/_/ui/settings' +import { onceSettingsModulesLoaded } from '@revenge-mod/discord/ui/settings' + +registerPlugin( + { + id: 'revenge.settings.developer', + name: 'Developer Settings', + description: 'Developer settings menus for Revenge', + author: 'Revenge', + icon: 'WrenchIcon', + }, + { + start(api) { + pluginApi = api + + onceSettingsModulesLoaded(() => { + require('./register') + }) + }, + }, + PluginFlags.Enabled, + InternalPluginFlags.Internal, +) + +// Expose to EvaluateJavaScriptSetting +export let pluginApi: PluginApi diff --git a/src/plugins/developer-settings/register.ts b/src/plugins/developer-settings/register.ts new file mode 100644 index 0000000..7c83ee2 --- /dev/null +++ b/src/plugins/developer-settings/register.ts @@ -0,0 +1,19 @@ +import { addSettingsItemToSection, registerSettingsItems } from '@revenge-mod/discord/ui/settings' + +import { MobileSetting } from './constants' + +import EvaluateJavaScriptSetting from './definitions/EvaluateJavaScriptSetting' +import ReactDevToolsConnectSetting from './definitions/ReactDevToolsConnectSetting' +import ReactDevToolsDisconnectSetting from './definitions/ReactDevToolsDisconnectSetting' +import ReactDevToolsVersionSetting from './definitions/ReactDevToolsVersionSetting' +import RevengeDeveloperSetting from './definitions/RevengeDeveloperSetting' + +registerSettingsItems({ + [MobileSetting.REVENGE_DEVELOPER]: RevengeDeveloperSetting, + [MobileSetting.REACT_DEVTOOLS_VERSION]: ReactDevToolsVersionSetting, + [MobileSetting.REACT_DEVTOOLS_CONNECT]: ReactDevToolsConnectSetting, + [MobileSetting.REACT_DEVTOOLS_DISCONNECT]: ReactDevToolsDisconnectSetting, + [MobileSetting.EVALUATE_JAVASCRIPT]: EvaluateJavaScriptSetting, +}) + +addSettingsItemToSection('REVENGE', MobileSetting.REVENGE_DEVELOPER) diff --git a/src/plugins/settings/screens/RevengeDeveloperSettingScreen.tsx b/src/plugins/developer-settings/screens/RevengeDeveloperSettingScreen.tsx similarity index 97% rename from src/plugins/settings/screens/RevengeDeveloperSettingScreen.tsx rename to src/plugins/developer-settings/screens/RevengeDeveloperSettingScreen.tsx index a50c038..62dfe46 100644 --- a/src/plugins/settings/screens/RevengeDeveloperSettingScreen.tsx +++ b/src/plugins/developer-settings/screens/RevengeDeveloperSettingScreen.tsx @@ -1,8 +1,8 @@ -import { React, ReactNative } from '@revenge-mod/react' import { Components } from '@revenge-mod/discord/ui' import { SettingListRenderer } from '@revenge-mod/discord/ui/settings' +import { React, ReactNative } from '@revenge-mod/react' -import { MobileSetting } from '../SettingsConstants' +import { MobileSetting } from '../constants' import { DevToolsContext } from '../devtools' // TODO(plugins/settings): debug bridge diff --git a/src/plugins/settings/SettingsConstants.ts b/src/plugins/settings/constants.ts similarity index 72% rename from src/plugins/settings/SettingsConstants.ts rename to src/plugins/settings/constants.ts index 61dba9e..841af60 100644 --- a/src/plugins/settings/SettingsConstants.ts +++ b/src/plugins/settings/constants.ts @@ -5,7 +5,6 @@ export const MobileSetting = { REVENGE_PLUGINS: 'REVENGE_PLUGINS', REVENGE_THEMES: 'REVENGE_THEMES', REVENGE_FONTS: 'REVENGE_FONTS', - REVENGE_DEVELOPER: 'REVENGE_DEVELOPER', // SUBSETTINGS @@ -18,11 +17,6 @@ export const MobileSetting = { REACT_NATIVE_VERSION: 'REACT_NATIVE_VERSION', HERMES_VERSION: 'HERMES_VERSION', - REACT_DEVTOOLS_VERSION: 'REACT_DEVTOOLS_VERSION', - REACT_DEVTOOLS_CONNECT: 'REACT_DEVTOOLS_CONNECT', - REACT_DEVTOOLS_DISCONNECT: 'REACT_DEVTOOLS_DISCONNECT', - EVALUATE_JAVASCRIPT: 'EVALUATE_JAVASCRIPT', - REVENGE_NOT_IMPLEMENTED: 'REVENGE_NOT_IMPLEMENTED', } as const @@ -31,5 +25,4 @@ export const UserSettingsSections = { [MobileSetting.REVENGE_PLUGINS]: 'Revenge Plugins', [MobileSetting.REVENGE_THEMES]: 'Revenge Themes', [MobileSetting.REVENGE_FONTS]: 'Revenge Fonts', - [MobileSetting.REVENGE_DEVELOPER]: 'Revenge Developer', } as const diff --git a/src/plugins/settings/definitions/HermesVersionSetting.tsx b/src/plugins/settings/definitions/HermesVersionSetting.tsx index 89c0042..037dccf 100644 --- a/src/plugins/settings/definitions/HermesVersionSetting.tsx +++ b/src/plugins/settings/definitions/HermesVersionSetting.tsx @@ -1,7 +1,8 @@ import { React } from '@revenge-mod/react' -import AssetIcon from '../components/icons/AssetIcon' -import { MobileSetting } from '../SettingsConstants' +import AssetIcon from '~components/icons/AssetIcon' + +import { MobileSetting } from '../constants' import type { SettingsItem } from '@revenge-mod/discord/ui/settings' diff --git a/src/plugins/settings/definitions/ReactNativeVersionSetting.tsx b/src/plugins/settings/definitions/ReactNativeVersionSetting.tsx index aee184d..ef75a75 100644 --- a/src/plugins/settings/definitions/ReactNativeVersionSetting.tsx +++ b/src/plugins/settings/definitions/ReactNativeVersionSetting.tsx @@ -1,7 +1,8 @@ import { React, ReactNative } from '@revenge-mod/react' -import AssetIcon from '../components/icons/AssetIcon' -import { MobileSetting } from '../SettingsConstants' +import AssetIcon from '~components/icons/AssetIcon' + +import { MobileSetting } from '../constants' import type { SettingsItem } from '@revenge-mod/discord/ui/settings' diff --git a/src/plugins/settings/definitions/ReactVersionSetting.tsx b/src/plugins/settings/definitions/ReactVersionSetting.tsx index 4260910..096cb1d 100644 --- a/src/plugins/settings/definitions/ReactVersionSetting.tsx +++ b/src/plugins/settings/definitions/ReactVersionSetting.tsx @@ -2,7 +2,7 @@ import { getAssetByName } from '@revenge-mod/assets' import { Components } from '@revenge-mod/discord/ui' import { React } from '@revenge-mod/react' -import { MobileSetting } from '../SettingsConstants' +import { MobileSetting } from '../constants' import type { SettingsItem } from '@revenge-mod/discord/ui/settings' diff --git a/src/plugins/settings/definitions/ReloadAppSetting.tsx b/src/plugins/settings/definitions/ReloadAppSetting.tsx index 5ef3c52..eb3cb2c 100644 --- a/src/plugins/settings/definitions/ReloadAppSetting.tsx +++ b/src/plugins/settings/definitions/ReloadAppSetting.tsx @@ -1,8 +1,9 @@ import { BundleUpdaterManager } from '@revenge-mod/discord/native' import { React } from '@revenge-mod/react' -import AssetIcon from '../components/icons/AssetIcon' -import { MobileSetting } from '../SettingsConstants' +import AssetIcon from '~components/icons/AssetIcon' + +import { MobileSetting } from '../constants' import type { SettingsItem } from '@revenge-mod/discord/ui/settings' diff --git a/src/plugins/settings/definitions/RevengeDiscordServerSetting.tsx b/src/plugins/settings/definitions/RevengeDiscordServerSetting.tsx index 887438b..bfac1f7 100644 --- a/src/plugins/settings/definitions/RevengeDiscordServerSetting.tsx +++ b/src/plugins/settings/definitions/RevengeDiscordServerSetting.tsx @@ -1,10 +1,11 @@ import { React, ReactNative } from '@revenge-mod/react' -import AssetIcon from '../components/icons/AssetIcon' -import { MobileSetting } from '../SettingsConstants' +import { DiscordServerURL } from '~/constants' +import AssetIcon from '~components/icons/AssetIcon' + +import { MobileSetting } from '../constants' import type { SettingsItem } from '@revenge-mod/discord/ui/settings' -import { DiscordServerURL } from '../../../constants' const RevengeDiscordServerSetting: SettingsItem = { parent: MobileSetting.REVENGE, diff --git a/src/plugins/settings/definitions/RevengeFontsSetting.tsx b/src/plugins/settings/definitions/RevengeFontsSetting.tsx index ec4dbad..9d636a2 100644 --- a/src/plugins/settings/definitions/RevengeFontsSetting.tsx +++ b/src/plugins/settings/definitions/RevengeFontsSetting.tsx @@ -1,5 +1,6 @@ -import { MobileSetting, UserSettingsSections } from '../SettingsConstants' -import AssetIcon from '../components/icons/AssetIcon' +import AssetIcon from '~components/icons/AssetIcon' + +import { MobileSetting, UserSettingsSections } from '../constants' import type { SettingsItem } from '@revenge-mod/discord/ui/settings' diff --git a/src/plugins/settings/definitions/RevengeGitHubOrganizationSetting.tsx b/src/plugins/settings/definitions/RevengeGitHubOrganizationSetting.tsx index 75fa144..93fb563 100644 --- a/src/plugins/settings/definitions/RevengeGitHubOrganizationSetting.tsx +++ b/src/plugins/settings/definitions/RevengeGitHubOrganizationSetting.tsx @@ -1,9 +1,9 @@ import { React, ReactNative } from '@revenge-mod/react' -import AssetIcon from '../components/icons/AssetIcon' -import { MobileSetting } from '../SettingsConstants' +import { GitHubOrganizationURL } from '~/constants' +import AssetIcon from '~components/icons/AssetIcon' -import { GitHubOrganizationURL } from '../../../constants' +import { MobileSetting } from '../constants' import type { SettingsItem } from '@revenge-mod/discord/ui/settings' diff --git a/src/plugins/settings/definitions/RevengeNotImplementedSetting.tsx b/src/plugins/settings/definitions/RevengeNotImplementedSetting.tsx index 9ea1c2a..471a81b 100644 --- a/src/plugins/settings/definitions/RevengeNotImplementedSetting.tsx +++ b/src/plugins/settings/definitions/RevengeNotImplementedSetting.tsx @@ -1,6 +1,6 @@ import { React } from '@revenge-mod/react' -import AssetIcon from '../components/icons/AssetIcon' +import AssetIcon from '~components/icons/AssetIcon' import type { SettingsItem } from '@revenge-mod/discord/ui/settings' diff --git a/src/plugins/settings/definitions/RevengePluginsSetting.tsx b/src/plugins/settings/definitions/RevengePluginsSetting.tsx index bb88c35..77093c5 100644 --- a/src/plugins/settings/definitions/RevengePluginsSetting.tsx +++ b/src/plugins/settings/definitions/RevengePluginsSetting.tsx @@ -1,7 +1,8 @@ import { getEnabledPluginsCount } from '@revenge-mod/plugins/_' -import { MobileSetting, UserSettingsSections } from '../SettingsConstants' -import AssetIcon from '../components/icons/AssetIcon' +import AssetIcon from '~components/icons/AssetIcon' + +import { MobileSetting, UserSettingsSections } from '../constants' import type { SettingsItem } from '@revenge-mod/discord/ui/settings' diff --git a/src/plugins/settings/definitions/RevengeSetting.tsx b/src/plugins/settings/definitions/RevengeSetting.tsx index dcfdbea..a053dab 100644 --- a/src/plugins/settings/definitions/RevengeSetting.tsx +++ b/src/plugins/settings/definitions/RevengeSetting.tsx @@ -1,5 +1,6 @@ -import RevengeIcon from '../components/icons/RevengeIcon' -import { MobileSetting, UserSettingsSections } from '../SettingsConstants' +import RevengeIcon from '~components/icons/RevengeIcon' + +import { MobileSetting, UserSettingsSections } from '../constants' import type { SettingsItem } from '@revenge-mod/discord/ui/settings' diff --git a/src/plugins/settings/definitions/RevengeThemesSetting.tsx b/src/plugins/settings/definitions/RevengeThemesSetting.tsx index 6c98778..d39771c 100644 --- a/src/plugins/settings/definitions/RevengeThemesSetting.tsx +++ b/src/plugins/settings/definitions/RevengeThemesSetting.tsx @@ -1,5 +1,6 @@ -import { MobileSetting, UserSettingsSections } from '../SettingsConstants' -import AssetIcon from '../components/icons/AssetIcon' +import AssetIcon from '~components/icons/AssetIcon' + +import { MobileSetting, UserSettingsSections } from '../constants' import type { SettingsItem } from '@revenge-mod/discord/ui/settings' diff --git a/src/plugins/settings/definitions/RevengeVersionSetting.ts b/src/plugins/settings/definitions/RevengeVersionSetting.ts index 55c479b..da255a0 100644 --- a/src/plugins/settings/definitions/RevengeVersionSetting.ts +++ b/src/plugins/settings/definitions/RevengeVersionSetting.ts @@ -1,5 +1,6 @@ -import RevengeIcon from '../components/icons/RevengeIcon' -import { MobileSetting } from '../SettingsConstants' +import RevengeIcon from '~components/icons/RevengeIcon' + +import { MobileSetting } from '../constants' import type { SettingsItem } from '@revenge-mod/discord/ui/settings' diff --git a/src/plugins/settings/index.ts b/src/plugins/settings/index.ts index 256d1c8..94a9982 100644 --- a/src/plugins/settings/index.ts +++ b/src/plugins/settings/index.ts @@ -1,14 +1,14 @@ -import { PluginFlags, type PluginApi } from '@revenge-mod/plugins' +import { type PluginApi, PluginFlags } from '@revenge-mod/plugins' import { InternalPluginFlags, registerPlugin } from '@revenge-mod/plugins/_' import { waitForModules } from '@revenge-mod/modules/finders' import { byName, byProps } from '@revenge-mod/modules/finders/filters' -import { _suiData } from '@revenge-mod/discord/_/ui/settings' +import { _subs, _data } from '@revenge-mod/discord/_/ui/settings' import { after } from '@revenge-mod/patcher' -import type { SettingsItem } from '@revenge-mod/discord/ui/settings' +import { onceSettingsModulesLoaded, type SettingsItem } from '@revenge-mod/discord/ui/settings' import type { FC } from 'react' registerPlugin( @@ -23,27 +23,34 @@ registerPlugin( start(api) { pluginApi = api - const unsubForRendererConfig = waitForModules(byProps('SETTING_RENDERER_CONFIG'), (_, exports) => { - unsubForRendererConfig() - + onceSettingsModulesLoaded(() => { require('./register') - - const SettingRendererConfig = exports as { - SETTING_RENDERER_CONFIG: Record - } - - let ORIGINAL_RENDERER_CONFIG = SettingRendererConfig.SETTING_RENDERER_CONFIG - - Object.defineProperty(SettingRendererConfig, 'SETTING_RENDERER_CONFIG', { - get: () => - ({ - ...ORIGINAL_RENDERER_CONFIG, - ..._suiData.config, - }) as Record, - set: v => (ORIGINAL_RENDERER_CONFIG = v), - }) }) + const unsubForRendererConfig = waitForModules( + byProps<{ + SETTING_RENDERER_CONFIG: Record + }>('SETTING_RENDERER_CONFIG'), + (_, SettingRendererConfig) => { + unsubForRendererConfig() + + for (const sub of _subs) sub() + // We don't ever need to call this again + _subs.clear() + + let ORIGINAL_RENDERER_CONFIG = SettingRendererConfig.SETTING_RENDERER_CONFIG + + Object.defineProperty(SettingRendererConfig, 'SETTING_RENDERER_CONFIG', { + get: () => + ({ + ...ORIGINAL_RENDERER_CONFIG, + ..._data[1], + }) as Record, + set: v => (ORIGINAL_RENDERER_CONFIG = v), + }) + }, + ) + const unsubForSettingsOverviewScreen = waitForModules( byName('SettingsOverviewScreen'), (_, exports) => { @@ -55,21 +62,22 @@ registerPlugin( settings: string[] }> - const FirstCustomRow = Object.keys( - _suiData.sections[Object.keys(_suiData.sections)[0]].settings, - )[0] + const customSections = _data[0] + // Check if we even have custom sections + const firstCustomSection = customSections[Object.keys(customSections)[0]] + if (!firstCustomSection) return tree + + // Check if sections are already spliced + const firstCustomItem = firstCustomSection.settings[0] if ( - // No custom rows - !FirstCustomRow || - // Section already added sections.findIndex(section => - section.settings.some(setting => setting === FirstCustomRow), + section.settings.some(setting => setting === firstCustomItem), ) !== -1 ) return tree - for (const section of Object.values(_suiData.sections)) + for (const section of Object.values(customSections)) if (!section.index) sections.unshift(section) else sections.splice(section.index, 0, section) diff --git a/src/plugins/settings/register.ts b/src/plugins/settings/register.ts index 7ef52e8..49f352e 100644 --- a/src/plugins/settings/register.ts +++ b/src/plugins/settings/register.ts @@ -1,31 +1,25 @@ import { registerSettingsItems, registerSettingsSection } from '@revenge-mod/discord/ui/settings' -import { MobileSetting } from './SettingsConstants' +import { MobileSetting } from './constants' -import RevengeSetting from './definitions/RevengeSetting' +import HermesVersionSetting from './definitions/HermesVersionSetting' +import ReactNativeVersionSetting from './definitions/ReactNativeVersionSetting' // import RevengePluginsSetting from './definitions/RevengePluginsSetting' // import RevengeThemesSetting from './definitions/RevengeThemesSetting' // import RevengeFontsSetting from './definitions/RevengeFontsSetting' -import RevengeDeveloperSetting from './definitions/RevengeDeveloperSetting' import ReactVersionSetting from './definitions/ReactVersionSetting' -import ReactNativeVersionSetting from './definitions/ReactNativeVersionSetting' -import RevengeVersionSetting from './definitions/RevengeVersionSetting' -import HermesVersionSetting from './definitions/HermesVersionSetting' -import RevengeNotImplementedSetting from './definitions/RevengeNotImplementedSetting' -import EvaluateJavaScriptSetting from './definitions/EvaluateJavaScriptSetting' -import ReactDevToolsVersionSetting from './definitions/ReactDevToolsVersionSetting' -import ReactDevToolsConnectSetting from './definitions/ReactDevToolsConnectSetting' -import ReactDevToolsDisconnectSetting from './definitions/ReactDevToolsDisconnectSetting' import ReloadAppSetting from './definitions/ReloadAppSetting' import RevengeDiscordServerSetting from './definitions/RevengeDiscordServerSetting' import RevengeGitHubOrganizationSetting from './definitions/RevengeGitHubOrganizationSetting' +import RevengeNotImplementedSetting from './definitions/RevengeNotImplementedSetting' +import RevengeSetting from './definitions/RevengeSetting' +import RevengeVersionSetting from './definitions/RevengeVersionSetting' registerSettingsItems({ [MobileSetting.REVENGE]: RevengeSetting, // [MobileSetting.REVENGE_PLUGINS]: RevengePluginsSetting, // [MobileSetting.REVENGE_THEMES]: RevengeThemesSetting, // [MobileSetting.REVENGE_FONTS]: RevengeFontsSetting, - [MobileSetting.REVENGE_DEVELOPER]: RevengeDeveloperSetting, [MobileSetting.REVENGE_GITHUB_ORGANIZATION]: RevengeGitHubOrganizationSetting, [MobileSetting.REVENGE_DISCORD_SERVER]: RevengeDiscordServerSetting, [MobileSetting.RELOAD_APP]: ReloadAppSetting, @@ -33,10 +27,6 @@ registerSettingsItems({ [MobileSetting.REACT_VERSION]: ReactVersionSetting, [MobileSetting.REACT_NATIVE_VERSION]: ReactNativeVersionSetting, [MobileSetting.HERMES_VERSION]: HermesVersionSetting, - [MobileSetting.REACT_DEVTOOLS_VERSION]: ReactDevToolsVersionSetting, - [MobileSetting.REACT_DEVTOOLS_CONNECT]: ReactDevToolsConnectSetting, - [MobileSetting.REACT_DEVTOOLS_DISCONNECT]: ReactDevToolsDisconnectSetting, - [MobileSetting.EVALUATE_JAVASCRIPT]: EvaluateJavaScriptSetting, [MobileSetting.REVENGE_NOT_IMPLEMENTED]: RevengeNotImplementedSetting, }) @@ -47,6 +37,5 @@ registerSettingsSection('REVENGE', { // MobileSetting.REVENGE_PLUGINS, // MobileSetting.REVENGE_THEMES, // MobileSetting.REVENGE_FONTS, - MobileSetting.REVENGE_DEVELOPER, ], }) diff --git a/src/plugins/settings/screens/RevengeFontsSettingScreen.tsx b/src/plugins/settings/screens/RevengeFontsSettingScreen.tsx index 4acbb9e..b069879 100644 --- a/src/plugins/settings/screens/RevengeFontsSettingScreen.tsx +++ b/src/plugins/settings/screens/RevengeFontsSettingScreen.tsx @@ -1,6 +1,6 @@ import { SettingListRenderer } from '@revenge-mod/discord/ui/settings' -import { MobileSetting } from '../SettingsConstants' +import { MobileSetting } from '../constants' export default function RevengeFontsSettingScreen() { return ( diff --git a/src/plugins/settings/screens/RevengePluginsSettingScreen.tsx b/src/plugins/settings/screens/RevengePluginsSettingScreen.tsx index e326f98..8e14c24 100644 --- a/src/plugins/settings/screens/RevengePluginsSettingScreen.tsx +++ b/src/plugins/settings/screens/RevengePluginsSettingScreen.tsx @@ -1,6 +1,6 @@ import { SettingListRenderer } from '@revenge-mod/discord/ui/settings' -import { MobileSetting } from '../SettingsConstants' +import { MobileSetting } from '../constants' export default function RevengePluginsSettingScreen() { return ( diff --git a/src/plugins/settings/screens/RevengeSettingScreen.tsx b/src/plugins/settings/screens/RevengeSettingScreen.tsx index 00321bc..359aede 100644 --- a/src/plugins/settings/screens/RevengeSettingScreen.tsx +++ b/src/plugins/settings/screens/RevengeSettingScreen.tsx @@ -1,6 +1,6 @@ import { SettingListRenderer } from '@revenge-mod/discord/ui/settings' -import { MobileSetting } from '../SettingsConstants' import { Components } from '../../../../lib/discord/src/ui/common' +import { MobileSetting } from '../constants' export default function RevengeSettingScreen() { return ( diff --git a/src/plugins/settings/screens/RevengeThemesSettingScreen.tsx b/src/plugins/settings/screens/RevengeThemesSettingScreen.tsx index 5b664fb..2def424 100644 --- a/src/plugins/settings/screens/RevengeThemesSettingScreen.tsx +++ b/src/plugins/settings/screens/RevengeThemesSettingScreen.tsx @@ -1,6 +1,6 @@ import { SettingListRenderer } from '@revenge-mod/discord/ui/settings' -import { MobileSetting } from '../SettingsConstants' +import { MobileSetting } from '../constants' export default function RevengeThemesSettingScreen() { return ( diff --git a/tsconfig.json b/tsconfig.json index 252cca4..4195075 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,8 +3,10 @@ "compilerOptions": { "types": ["@revenge-mod/types", "./types", "./types.modules", "node/util"], "paths": { - "~plugins/*": ["./src/plugins/*"], - "~assets/*": ["./src/assets/*"] + "~/*": ["./src/*"], + "~assets/*": ["./src/assets/*"], + "~components/*": ["./src/components/*"], + "~plugins/*": ["./src/plugins/*"] } }, "include": ["lib", "src", "shims"]