Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-11-22 15:43:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add easily switchable predefined themes

Browse Source 
Includes the default theme and a Monokai-ish variant
This commit is contained in:
Martin Fournier 2021-12-18 16:22:10 -05:00
parent 853125009b
commit db64d9869c
3 changed files with 373 additions and 344 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
src/Settings/Settings.ts
View File

@ -1,5 +1,6 @@
import { ISelfInitializer, ISelfLoading } from "../types"; import { ISelfInitializer, ISelfLoading } from "../types";
import { OwnedAugmentationsOrderSetting, PurchaseAugmentationsOrderSetting } from "./SettingEnums"; import { OwnedAugmentationsOrderSetting, PurchaseAugmentationsOrderSetting } from "./SettingEnums";
import { defaultTheme, ITheme } from "./Themes";
/** /**
* Represents the default settings the player could customize. * Represents the default settings the player could customize.
@ -111,42 +112,7 @@ interface IDefaultSettings {
/* /*
* Theme colors * Theme colors
*/ */
theme: { theme: ITheme;
[key: string]: string | undefined;
primarylight: string;
primary: string;
primarydark: string;
successlight: string;
success: string;
successdark: string;
errorlight: string;
error: string;
errordark: string;
secondarylight: string;
secondary: string;
secondarydark: string;
warninglight: string;
warning: string;
warningdark: string;
infolight: string;
info: string;
infodark: string;
welllight: string;
well: string;
white: string;
black: string;
hp: string;
money: string;
hack: string;
combat: string;
cha: string;
int: string;
rep: string;
disabled: string;
backgroundprimary: string;
backgroundsecondary: string;
button: string;
};
} }
/** /**
@ -193,41 +159,7 @@ export const defaultSettings: IDefaultSettings = {
SuppressTIXPopup: false, SuppressTIXPopup: false,
SuppressSavedGameToast: false, SuppressSavedGameToast: false,
theme: { theme: defaultTheme,
primarylight: "#0f0",
primary: "#0c0",
primarydark: "#090",
successlight: "#0f0",
success: "#0c0",
successdark: "#090",
errorlight: "#f00",
error: "#c00",
errordark: "#900",
secondarylight: "#AAA",
secondary: "#888",
secondarydark: "#666",
warninglight: "#ff0",
warning: "#cc0",
warningdark: "#990",
infolight: "#69f",
info: "#36c",
infodark: "#039",
welllight: "#444",
well: "#222",
white: "#fff",
black: "#000",
hp: "#dd3434",
money: "#ffd700",
hack: "#adff2f",
combat: "#faffdf",
cha: "#a671d1",
int: "#6495ed",
rep: "#faffdf",
disabled: "#66cfbc",
backgroundprimary: "#000",
backgroundsecondary: "#000",
button: "#333",
},
}; };
/** /**
@ -262,41 +194,7 @@ export const Settings: ISettings & ISelfInitializer & ISelfLoading = {
MonacoInsertSpaces: false, MonacoInsertSpaces: false,
MonacoFontSize: 20, MonacoFontSize: 20,
theme: { theme: { ...defaultTheme },
primarylight: defaultSettings.theme.primarylight,
primary: defaultSettings.theme.primary,
primarydark: defaultSettings.theme.primarydark,
successlight: defaultSettings.theme.successlight,
success: defaultSettings.theme.success,
successdark: defaultSettings.theme.successdark,
errorlight: defaultSettings.theme.errorlight,
error: defaultSettings.theme.error,
errordark: defaultSettings.theme.errordark,
secondarylight: defaultSettings.theme.secondarylight,
secondary: defaultSettings.theme.secondary,
secondarydark: defaultSettings.theme.secondarydark,
warninglight: defaultSettings.theme.warninglight,
warning: defaultSettings.theme.warning,
warningdark: defaultSettings.theme.warningdark,
infolight: defaultSettings.theme.infolight,
info: defaultSettings.theme.info,
infodark: defaultSettings.theme.infodark,
welllight: defaultSettings.theme.welllight,
well: defaultSettings.theme.well,
white: defaultSettings.theme.white,
black: defaultSettings.theme.black,
hp: defaultSettings.theme.hp,
money: defaultSettings.theme.money,
hack: defaultSettings.theme.hack,
combat: defaultSettings.theme.combat,
cha: defaultSettings.theme.cha,
int: defaultSettings.theme.int,
rep: defaultSettings.theme.rep,
disabled: defaultSettings.theme.disabled,
backgroundprimary: defaultSettings.theme.backgroundprimary,
backgroundsecondary: defaultSettings.theme.backgroundsecondary,
button: defaultSettings.theme.button,
},
init() { init() {
Object.assign(Settings, defaultSettings); Object.assign(Settings, defaultSettings);
}, },

110
src/Settings/Themes.ts Normal file
View File

@ -0,0 +1,110 @@
export interface ITheme {
[key: string]: string | undefined;
primarylight: string;
primary: string;
primarydark: string;
successlight: string;
success: string;
successdark: string;
errorlight: string;
error: string;
errordark: string;
secondarylight: string;
secondary: string;
secondarydark: string;
warninglight: string;
warning: string;
warningdark: string;
infolight: string;
info: string;
infodark: string;
welllight: string;
well: string;
white: string;
black: string;
hp: string;
money: string;
hack: string;
combat: string;
cha: string;
int: string;
rep: string;
disabled: string;
backgroundprimary: string;
backgroundsecondary: string;
button: string;
}
export const defaultTheme: ITheme = {
primarylight: "#0f0",
primary: "#0c0",
primarydark: "#090",
successlight: "#0f0",
success: "#0c0",
successdark: "#090",
errorlight: "#f00",
error: "#c00",
errordark: "#900",
secondarylight: "#AAA",
secondary: "#888",
secondarydark: "#666",
warninglight: "#ff0",
warning: "#cc0",
warningdark: "#990",
infolight: "#69f",
info: "#36c",
infodark: "#039",
welllight: "#444",
well: "#222",
white: "#fff",
black: "#000",
hp: "#dd3434",
money: "#ffd700",
hack: "#adff2f",
combat: "#faffdf",
cha: "#a671d1",
int: "#6495ed",
rep: "#faffdf",
disabled: "#66cfbc",
backgroundprimary: "#000",
backgroundsecondary: "#000",
button: "#333",
};
export interface IPredefinedThemes {
'Default': ITheme;
'Monokai': ITheme;
}
export const getPredefinedThemes = (): IPredefinedThemes => ({
'Default': defaultTheme,
'Monokai': {
...defaultTheme,
backgroundprimary: '#272822',
backgroundsecondary: '#1B1C18',
primary: '#F8F8F2',
primarylight: '#FFF',
primarydark: '#FAFAEB',
success: '#A6E22E',
successlight: '#ADE146',
successdark: '#98E104',
error: '#F92672',
errorlight: '#FF69A0',
errordark: '#D10F56',
warning: '#E6DB74',
warninglight: '#E1D992',
warningdark: '#EDDD54',
info: '#66D9EF',
infolight: '#92E1F1',
infodark: '#31CDED',
hp: '#F92672',
money: '#E6DB74',
hack: '#A6E22E',
combat: '#75715E',
cha: '#AE81FF',
int: '#66D9EF',
rep: '#E69F66',
}
});

497
src/ui/React/ThemeEditorModal.tsx
View File

@ -7,9 +7,11 @@ import Paper from "@mui/material/Paper";
import TextField from "@mui/material/TextField"; import TextField from "@mui/material/TextField";
import IconButton from "@mui/material/IconButton"; import IconButton from "@mui/material/IconButton";
import ReplyIcon from "@mui/icons-material/Reply"; import ReplyIcon from "@mui/icons-material/Reply";
import PaletteSharpIcon from "@mui/icons-material/PaletteSharp";
import { Color, ColorPicker } from "material-ui-color"; import { Color, ColorPicker } from "material-ui-color";
import { ThemeEvents } from "./Theme"; import { ThemeEvents } from "./Theme";
import { Settings, defaultSettings } from "../../Settings/Settings"; import { Settings, defaultSettings } from "../../Settings/Settings";
import { ITheme, getPredefinedThemes } from "../../Settings/Themes";
interface IProps { interface IProps {
open: boolean; open: boolean;
@ -64,11 +66,18 @@ export function ThemeEditorModal(props: IProps): React.ReactElement {
...Settings.theme, ...Settings.theme,
}); });
function resetTheme(): void { const predefinedThemes = getPredefinedThemes();
setCustomTheme({ const themes = predefinedThemes && Object.entries(predefinedThemes)
...defaultSettings.theme, .map(([name, templateTheme]) => (
}); <Button onClick={() => setTemplateTheme(templateTheme)}
Object.assign(Settings.theme, defaultSettings.theme); startIcon={<PaletteSharpIcon />} key={name} sx={{ mr: 1 }}>
<Typography>{name}</Typography>
</Button>
)) || <></>;
function setTheme(theme: ITheme): void {
setCustomTheme(theme);
Object.assign(Settings.theme, theme);
ThemeEvents.emit(); ThemeEvents.emit();
} }
@ -96,250 +105,262 @@ export function ThemeEditorModal(props: IProps): React.ReactElement {
ThemeEvents.emit(); ThemeEvents.emit();
} }
function setTemplateTheme(theme: ITheme): void {
setTheme(theme);
}
return ( return (
<Modal open={props.open} onClose={props.onClose}> <Modal open={props.open} onClose={props.onClose}>
<Paper> <Paper sx={{ px: 1, py: 1, my: 1 }}>
<Tooltip open={true} placement={"top"} title={<Typography>Example tooltip</Typography>}> <Tooltip open={true} placement={"top"} title={<Typography>Example tooltip</Typography>}>
<Button color="primary">primary button</Button> <Button color="primary" size="small">primary button</Button>
</Tooltip> </Tooltip>
<Button color="secondary">secondary button</Button> <Button color="secondary" size="small">secondary button</Button>
<Button color="warning">warning button</Button> <Button color="warning" size="small">warning button</Button>
<Button color="info">info button</Button> <Button color="info" size="small">info button</Button>
<Button color="error">error button</Button> <Button color="error" size="small">error button</Button>
<Button disabled>disabled button</Button> <Button disabled size="small">disabled button</Button>
<Typography color="primary">text with primary color</Typography>
<Typography color="secondary">text with secondary color</Typography> <br />
<Typography color="error">text with error color</Typography> <Typography color="primary" variant="caption">text with primary color</Typography>&nbsp;
<TextField value={"Text field"} /> <Typography color="secondary" variant="caption">text with secondary color</Typography>&nbsp;
<Typography color="error" variant="caption">text with error color</Typography>
<br />
<TextField value={"Text field"} size="small" />
</Paper> </Paper>
<br />
<ColorEditor
name="primarylight"
onColorChange={onColorChange}
color={customTheme["primarylight"]}
defaultColor={defaultSettings.theme["primarylight"]}
/>
<ColorEditor
name="primary"
onColorChange={onColorChange}
color={customTheme["primary"]}
defaultColor={defaultSettings.theme["primary"]}
/>
<ColorEditor
name="primarydark"
onColorChange={onColorChange}
color={customTheme["primarydark"]}
defaultColor={defaultSettings.theme["primarydark"]}
/>
<br /> <Paper sx={{ py: 1, my: 1 }}>
<ColorEditor
name="primarylight"
onColorChange={onColorChange}
color={customTheme["primarylight"]}
defaultColor={defaultSettings.theme["primarylight"]}
/>
<ColorEditor
name="primary"
onColorChange={onColorChange}
color={customTheme["primary"]}
defaultColor={defaultSettings.theme["primary"]}
/>
<ColorEditor
name="primarydark"
onColorChange={onColorChange}
color={customTheme["primarydark"]}
defaultColor={defaultSettings.theme["primarydark"]}
/>
<ColorEditor <br />
name="successlight" <ColorEditor
onColorChange={onColorChange} name="successlight"
color={customTheme["successlight"]} onColorChange={onColorChange}
defaultColor={defaultSettings.theme["successlight"]} color={customTheme["successlight"]}
/> defaultColor={defaultSettings.theme["successlight"]}
<ColorEditor />
name="success" <ColorEditor
onColorChange={onColorChange} name="success"
color={customTheme["success"]} onColorChange={onColorChange}
defaultColor={defaultSettings.theme["success"]} color={customTheme["success"]}
/> defaultColor={defaultSettings.theme["success"]}
<ColorEditor />
name="successdark" <ColorEditor
onColorChange={onColorChange} name="successdark"
color={customTheme["successdark"]} onColorChange={onColorChange}
defaultColor={defaultSettings.theme["successdark"]} color={customTheme["successdark"]}
/> defaultColor={defaultSettings.theme["successdark"]}
/>
<br /> <br />
<ColorEditor <ColorEditor
name="errorlight" name="errorlight"
onColorChange={onColorChange} onColorChange={onColorChange}
color={customTheme["errorlight"]} color={customTheme["errorlight"]}
defaultColor={defaultSettings.theme["errorlight"]} defaultColor={defaultSettings.theme["errorlight"]}
/> />
<ColorEditor <ColorEditor
name="error" name="error"
onColorChange={onColorChange} onColorChange={onColorChange}
color={customTheme["error"]} color={customTheme["error"]}
defaultColor={defaultSettings.theme["error"]} defaultColor={defaultSettings.theme["error"]}
/> />
<ColorEditor <ColorEditor
name="errordark" name="errordark"
onColorChange={onColorChange} onColorChange={onColorChange}
color={customTheme["errordark"]} color={customTheme["errordark"]}
defaultColor={defaultSettings.theme["errordark"]} defaultColor={defaultSettings.theme["errordark"]}
/> />
<br /> <br />
<ColorEditor <ColorEditor
name="secondarylight" name="secondarylight"
onColorChange={onColorChange} onColorChange={onColorChange}
color={customTheme["secondarylight"]} color={customTheme["secondarylight"]}
defaultColor={defaultSettings.theme["secondarylight"]} defaultColor={defaultSettings.theme["secondarylight"]}
/> />
<ColorEditor <ColorEditor
name="secondary" name="secondary"
onColorChange={onColorChange} onColorChange={onColorChange}
color={customTheme["secondary"]} color={customTheme["secondary"]}
defaultColor={defaultSettings.theme["secondary"]} defaultColor={defaultSettings.theme["secondary"]}
/> />
<ColorEditor <ColorEditor
name="secondarydark" name="secondarydark"
onColorChange={onColorChange} onColorChange={onColorChange}
color={customTheme["secondarydark"]} color={customTheme["secondarydark"]}
defaultColor={defaultSettings.theme["secondarydark"]} defaultColor={defaultSettings.theme["secondarydark"]}
/> />
<br /> <br />
<ColorEditor <ColorEditor
name="warninglight" name="warninglight"
onColorChange={onColorChange} onColorChange={onColorChange}
color={customTheme["warninglight"]} color={customTheme["warninglight"]}
defaultColor={defaultSettings.theme["warninglight"]} defaultColor={defaultSettings.theme["warninglight"]}
/> />
<ColorEditor <ColorEditor
name="warning" name="warning"
onColorChange={onColorChange} onColorChange={onColorChange}
color={customTheme["warning"]} color={customTheme["warning"]}
defaultColor={defaultSettings.theme["warning"]} defaultColor={defaultSettings.theme["warning"]}
/> />
<ColorEditor <ColorEditor
name="warningdark" name="warningdark"
onColorChange={onColorChange} onColorChange={onColorChange}
color={customTheme["warningdark"]} color={customTheme["warningdark"]}
defaultColor={defaultSettings.theme["warningdark"]} defaultColor={defaultSettings.theme["warningdark"]}
/> />
<br /> <br />
<ColorEditor <ColorEditor
name="infolight" name="infolight"
onColorChange={onColorChange} onColorChange={onColorChange}
color={customTheme["infolight"]} color={customTheme["infolight"]}
defaultColor={defaultSettings.theme["infolight"]} defaultColor={defaultSettings.theme["infolight"]}
/> />
<ColorEditor <ColorEditor
name="info" name="info"
onColorChange={onColorChange} onColorChange={onColorChange}
color={customTheme["info"]} color={customTheme["info"]}
defaultColor={defaultSettings.theme["info"]} defaultColor={defaultSettings.theme["info"]}
/> />
<ColorEditor <ColorEditor
name="infodark" name="infodark"
onColorChange={onColorChange} onColorChange={onColorChange}
color={customTheme["infodark"]} color={customTheme["infodark"]}
defaultColor={defaultSettings.theme["infodark"]} defaultColor={defaultSettings.theme["infodark"]}
/> />
<br /> <br />
<ColorEditor <ColorEditor
name="welllight" name="welllight"
onColorChange={onColorChange} onColorChange={onColorChange}
color={customTheme["welllight"]} color={customTheme["welllight"]}
defaultColor={defaultSettings.theme["welllight"]} defaultColor={defaultSettings.theme["welllight"]}
/> />
<ColorEditor <ColorEditor
name="well" name="well"
onColorChange={onColorChange} onColorChange={onColorChange}
color={customTheme["well"]} color={customTheme["well"]}
defaultColor={defaultSettings.theme["well"]} defaultColor={defaultSettings.theme["well"]}
/> />
<ColorEditor <ColorEditor
name="white" name="white"
onColorChange={onColorChange} onColorChange={onColorChange}
color={customTheme["white"]} color={customTheme["white"]}
defaultColor={defaultSettings.theme["white"]} defaultColor={defaultSettings.theme["white"]}
/> />
<ColorEditor <ColorEditor
name="black" name="black"
onColorChange={onColorChange} onColorChange={onColorChange}
color={customTheme["black"]} color={customTheme["black"]}
defaultColor={defaultSettings.theme["black"]} defaultColor={defaultSettings.theme["black"]}
/> />
<ColorEditor <ColorEditor
name="backgroundprimary" name="backgroundprimary"
onColorChange={onColorChange} onColorChange={onColorChange}
color={customTheme["backgroundprimary"]} color={customTheme["backgroundprimary"]}
defaultColor={defaultSettings.theme["backgroundprimary"]} defaultColor={defaultSettings.theme["backgroundprimary"]}
/> />
<ColorEditor <ColorEditor
name="backgroundsecondary" name="backgroundsecondary"
onColorChange={onColorChange} onColorChange={onColorChange}
color={customTheme["backgroundsecondary"]} color={customTheme["backgroundsecondary"]}
defaultColor={defaultSettings.theme["backgroundsecondary"]} defaultColor={defaultSettings.theme["backgroundsecondary"]}
/> />
<ColorEditor <ColorEditor
name="button" name="button"
onColorChange={onColorChange} onColorChange={onColorChange}
color={customTheme["button"]} color={customTheme["button"]}
defaultColor={defaultSettings.theme["button"]} defaultColor={defaultSettings.theme["button"]}
/> />
<br /> <br />
<ColorEditor <ColorEditor
name="hp" name="hp"
onColorChange={onColorChange} onColorChange={onColorChange}
color={customTheme["hp"]} color={customTheme["hp"]}
defaultColor={defaultSettings.theme["hp"]} defaultColor={defaultSettings.theme["hp"]}
/> />
<ColorEditor <ColorEditor
name="money" name="money"
onColorChange={onColorChange} onColorChange={onColorChange}
color={customTheme["money"]} color={customTheme["money"]}
defaultColor={defaultSettings.theme["money"]} defaultColor={defaultSettings.theme["money"]}
/> />
<ColorEditor <ColorEditor
name="hack" name="hack"
onColorChange={onColorChange} onColorChange={onColorChange}
color={customTheme["hack"]} color={customTheme["hack"]}
defaultColor={defaultSettings.theme["hack"]} defaultColor={defaultSettings.theme["hack"]}
/> />
<ColorEditor <ColorEditor
name="combat" name="combat"
onColorChange={onColorChange} onColorChange={onColorChange}
color={customTheme["combat"]} color={customTheme["combat"]}
defaultColor={defaultSettings.theme["combat"]} defaultColor={defaultSettings.theme["combat"]}
/> />
<ColorEditor <ColorEditor
name="cha" name="cha"
onColorChange={onColorChange} onColorChange={onColorChange}
color={customTheme["cha"]} color={customTheme["cha"]}
defaultColor={defaultSettings.theme["cha"]} defaultColor={defaultSettings.theme["cha"]}
/> />
<ColorEditor <ColorEditor
name="int" name="int"
onColorChange={onColorChange} onColorChange={onColorChange}
color={customTheme["int"]} color={customTheme["int"]}
defaultColor={defaultSettings.theme["int"]} defaultColor={defaultSettings.theme["int"]}
/> />
<ColorEditor <ColorEditor
name="rep" name="rep"
onColorChange={onColorChange} onColorChange={onColorChange}
color={customTheme["rep"]} color={customTheme["rep"]}
defaultColor={defaultSettings.theme["rep"]} defaultColor={defaultSettings.theme["rep"]}
/> />
<ColorEditor <ColorEditor
name="disabled" name="disabled"
onColorChange={onColorChange} onColorChange={onColorChange}
color={customTheme["disabled"]} color={customTheme["disabled"]}
defaultColor={defaultSettings.theme["disabled"]} defaultColor={defaultSettings.theme["disabled"]}
/> />
<br /> </Paper>
<br />
<TextField <Paper sx={{ px: 1, py: 1, my: 1 }}>
label={"import / export theme"} <TextField
value={JSON.stringify(customTheme)} sx={{ mb: 1 }}
onChange={onThemeChange} multiline
InputProps={{ fullWidth
endAdornment: ( maxRows={3}
<IconButton onClick={resetTheme} size="large"> label={"import / export theme"}
<ReplyIcon /> value={JSON.stringify(customTheme)}
</IconButton> onChange={onThemeChange}
), />
}} <>
/> <Typography sx={{ my: 1 }}>Copy the string above if you want to backup or share your theme with others.</Typography>
<Typography sx={{ my: 1 }}>Use the buttons below to replace the current theme with a pre-built template</Typography>
{themes}
</>
</Paper>
</Modal> </Modal>
); );
} }