lightcordwarez
/
BetterDiscordApp-v2
mirror of https://github.com/JsSucks/BetterDiscordApp
1
0
Fork 0
Code Issues 3 Releases Wiki Activity

proper color mixing, support light theme

This commit is contained in:
Zack Rauen 2018-08-21 01:50:54 -04:00
parent a8c8c017f6
commit 4784b13c86
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/src/builtin/ColoredText.js
View File

@ -11,7 +11,7 @@
import BuiltinModule from './BuiltinModule';
import { Utils } from 'common';
import { Settings, Patcher, MonkeyPatch, WebpackModules, ReactComponents } from 'modules';
import { Settings, Patcher, MonkeyPatch, WebpackModules, ReactComponents, DiscordApi } from 'modules';
export default new class ColoredText extends BuiltinModule {
@ -34,7 +34,7 @@ export default new class ColoredText extends BuiltinModule {
}
get intensity() {
return 1 - this.intensitySetting.value / 100;
return 100 - this.intensitySetting.value;
}
_intensityUpdated() {
@ -50,10 +50,14 @@ export default new class ColoredText extends BuiltinModule {
}
injectColoredText(thisObject, args, returnValue) {
const ColorShader = WebpackModules.getModuleByName('ColorShader');
const TinyColor = WebpackModules.getModuleByName('TinyColor');
const markup = Utils.findInReactTree(returnValue, m => m && m.props && m.props.className && m.props.className.includes('da-markup'));
const roleColor = thisObject.props.message.colorString;
if (markup && roleColor) markup.props.style = {color: ColorShader.lighten(roleColor, this.intensity)};
if (markup && roleColor) markup.props.style = {color: TinyColor.mix(roleColor, this.defaultColor, this.intensity)};
}
get defaultColor() {
return DiscordApi.UserSettings.theme == 'light' ? '#747f8d' : '#dcddde';
}
disabled(e) {

1
client/src/modules/webpackmodules.js
View File

@ -74,6 +74,7 @@ const KnownModules = {
Permissions: Filters.byProperties(['getHighestRole']),
ColorConverter: Filters.byProperties(['hex2int']),
ColorShader: Filters.byProperties(['darken']),
TinyColor: Filters.byPrototypeFields(['toRgb']),
ClassResolver: Filters.byProperties(['getClass']),
ButtonData: Filters.byProperties(['ButtonSizes']),
IconNames: Filters.byProperties(['IconNames']),