diff --git a/.config/ags/modules/indicators/colorscheme.js b/.config/ags/modules/indicators/colorscheme.js index be9fe6f9d..3d205dd03 100644 --- a/.config/ags/modules/indicators/colorscheme.js +++ b/.config/ags/modules/indicators/colorscheme.js @@ -88,6 +88,9 @@ const schemeOptionsArr = [ { name: 'Expressive', value: 'expressive' }, { name: 'Vibrant', value: 'vibrant' }, ], + [ + { name: 'Vibrant+', value: 'morevibrant' }, + ], //[ // { name: 'Content', value: 'content' }, //] diff --git a/.config/ags/scripts/color_generation/generate_colors_material.py b/.config/ags/scripts/color_generation/generate_colors_material.py index bf400a937..9ef0c2157 100755 --- a/.config/ags/scripts/color_generation/generate_colors_material.py +++ b/.config/ags/scripts/color_generation/generate_colors_material.py @@ -99,8 +99,10 @@ elif args.scheme == 'fidelity': from materialyoucolor.scheme.scheme_fidelity import SchemeFidelity as Scheme elif args.scheme == 'content': from materialyoucolor.scheme.scheme_content import SchemeContent as Scheme -else: +elif args.scheme == 'vibrant': from materialyoucolor.scheme.scheme_vibrant import SchemeVibrant as Scheme +else: + from schemes.scheme_morevibrant import SchemeMoreVibrant as Scheme # Generate scheme = Scheme(hct, darkmode, 0.0) diff --git a/.config/ags/scripts/color_generation/schemes/scheme_morevibrant.py b/.config/ags/scripts/color_generation/schemes/scheme_morevibrant.py new file mode 100644 index 000000000..d67f7834e --- /dev/null +++ b/.config/ags/scripts/color_generation/schemes/scheme_morevibrant.py @@ -0,0 +1,44 @@ +from materialyoucolor.scheme.dynamic_scheme import DynamicSchemeOptions, DynamicScheme +from materialyoucolor.scheme.variant import Variant +from materialyoucolor.palettes.tonal_palette import TonalPalette + + +class SchemeMoreVibrant(DynamicScheme): + hues = [0.0, 41.0, 61.0, 101.0, 131.0, 181.0, 251.0, 301.0, 360.0] + secondary_rotations = [18.0, 15.0, 10.0, 12.0, 15.0, 18.0, 15.0, 12.0, 12.0] + tertiary_rotations = [35.0, 30.0, 20.0, 25.0, 30.0, 35.0, 30.0, 25.0, 25.0] + + def __init__(self, source_color_hct, is_dark, contrast_level): + super().__init__( + DynamicSchemeOptions( + source_color_argb=source_color_hct.to_int(), + variant=Variant.VIBRANT, + contrast_level=contrast_level, + is_dark=is_dark, + primary_palette=TonalPalette.from_hue_and_chroma( + source_color_hct.hue, 200.0 + ), + secondary_palette=TonalPalette.from_hue_and_chroma( + DynamicScheme.get_rotated_hue( + source_color_hct, + SchemeMoreVibrant.hues, + SchemeMoreVibrant.secondary_rotations, + ), + 32.0, + ), + tertiary_palette=TonalPalette.from_hue_and_chroma( + DynamicScheme.get_rotated_hue( + source_color_hct, + SchemeMoreVibrant.hues, + SchemeMoreVibrant.tertiary_rotations, + ), + 32.0, + ), + neutral_palette=TonalPalette.from_hue_and_chroma( + source_color_hct.hue, 13.0 + ), + neutral_variant_palette=TonalPalette.from_hue_and_chroma( + source_color_hct.hue, 15.0 + ), + ) + )