chore: use new instead of old scaling system

This commit is contained in:
fuwaa 2022-07-24 22:49:46 +08:00
parent f6413164fa
commit 6766a32f31
No known key found for this signature in database
GPG key ID: 2E4F5DC11DE1D654
2 changed files with 19 additions and 15 deletions

View file

@ -1,16 +1,14 @@
import react from "react";
import "../../assets/styles/App.css";
import "../../assets/styles/RC.css";
import { HexColorPicker, HexColorInput } from "react-colorful";
import updateScale from "../../methods/helpers/scaleHelper";
import * as updateManual from "../../methods/helpers/scaleHelper";
import { TextField } from "@mui/material";
import { IoIosBrush } from "react-icons/io";
import CardTitle from "../global/CardTitle";
import { pintGetUpdate } from "../../methods/helpers/storageHelper";
import {
bgGen,
generateAccent,
updateText,
updateViaQuickScheme,
} from "../../methods/schemeGen";
import { updateOpacity } from "../../methods/helpers/opacityHelper";
var defaultValue = "#c0ffee";
@ -29,18 +27,19 @@ export default function QuickChange() {
const [l4, setL4] = react.useState(`${defaultValue}`);
function paintAccent() {
updateViaQuickScheme(color);
updateManual.updateAccent(color);
setL4(color);
}
function paintBg() {
setBgColor(color);
bgGen(color);
updateText(generateAccent(color, -130));
updateScale(color);
updateOpacity();
chrome.tabs.reload();
}
function paintText() {
updateText(color);
updateManual.text(color);
setTextColor(color);
}
@ -56,7 +55,11 @@ export default function QuickChange() {
/>
</div>
<div className="flex justify-content p-1">
<HexColorPicker color={color} onChange={setColor} />
<HexColorPicker
className="custom-layout"
color={color}
onChange={setColor}
/>
</div>
</div>
<div className="flex-grow flex-col rounded-lg m-1 p-1 bg-white">

View file

@ -8,7 +8,7 @@ import ChangeCard from "../components/options/ChangeCard";
import react from "react";
import { RgbaColorPicker } from "react-colorful";
import CardTitle from "../components/global/CardTitle";
import { rgba2hex } from "../methods/schemeGen";
import chroma from "chroma-js";
var settingsList = Object.keys(settings);
@ -17,11 +17,12 @@ var stringifiedColor = `rgba(${defaultValue.r},${defaultValue.g},${defaultValue.
export default function Options() {
const [color, setColor] = react.useState(defaultValue);
const [hexColor, setHexColor] = react.useState();
const [hexColor, setHexColor] = react.useState(
chroma(stringifiedColor).hex()
);
react.useLayoutEffect(() => {
stringifiedColor = `rgba(${color.r},${color.g},${color.b},${color.a})`;
setHexColor(rgba2hex(stringifiedColor));
setHexColor(chroma(stringifiedColor).hex());
});
return (