Improve variants guessing

This commit is contained in:
Romain Vigier
2020-02-24 16:18:42 +01:00
parent 56d5086f13
commit df374d5e9b
+17 -20
View File
@@ -48,21 +48,17 @@ var Variants = class {
const variants = {}; const variants = {};
variants.original = name; variants.original = name;
if ( name.includes('HighContrast') ) { if ( name.includes('Adapta') ) {
variants.day = 'HighContrast';
variants.night = 'HighContrastInverse';
}
else if ( name.match(/(Canta|Materia).*-compact/g) ) {
variants.day = name.replace(/-dark(?!er)/g, '');
variants.night = variants.day.replace(/(-light)?-compact/g, '-dark-compact');
}
else if ( name.includes('Adapta') ) {
variants.day = name.replace('-Nokto', ''); variants.day = name.replace('-Nokto', '');
variants.night = variants.day.replace('Adapta', 'Adapta-Nokto'); variants.night = variants.day.replace('Adapta', 'Adapta-Nokto');
} }
else if ( name.includes('Arc') ) { else if ( name.includes('Arc') ) {
variants.day = name.replace(/-Dark(?!er)/g, ''); variants.day = name.replace(/-Dark(?!er)/, '');
variants.night = variants.day.replace(/Arc(-Darker)?/g, 'Arc-Dark'); variants.night = variants.day.replace(/Arc(-Darker)?/, 'Arc-Dark');
}
else if ( name.match(/^(Canta|Materia).*-compact/) ) {
variants.day = name.replace('-dark', '');
variants.night = variants.day.replace(/(-light)?-compact/, '-dark-compact');
} }
else if ( name.includes('Flat-Remix-GTK') ) { else if ( name.includes('Flat-Remix-GTK') ) {
const isSolid = name.includes('-Solid'); const isSolid = name.includes('-Solid');
@@ -71,13 +67,14 @@ var Variants = class {
variants.day = basename + (name.includes('-Darker') ? '-Darker' : '') + (isSolid ? '-Solid' : ''); variants.day = basename + (name.includes('-Darker') ? '-Darker' : '') + (isSolid ? '-Solid' : '');
variants.night = basename + (name.includes('-Darkest') ? '-Darkest' : '-Dark') + (isSolid ? '-Solid' : '') + (withoutBorder ? '-NoBorder' : ''); variants.night = basename + (name.includes('-Darkest') ? '-Darkest' : '-Dark') + (isSolid ? '-Solid' : '') + (withoutBorder ? '-NoBorder' : '');
} }
else if ( name.includes('Layan') ) { else if ( name.includes('HighContrast') ) {
variants.day = name.replace('-dark', ''); variants.day = 'HighContrast';
variants.night = variants.day.replace(/Layan(-light)?/g, 'Layan-dark'); variants.night = 'HighContrastInverse';
} }
else if ( name.includes('Matcha') ) { else if ( name.match(/^(Layan|Matcha)/) ) {
variants.day = name.replace('-dark-', '-'); const basename = name.split('-')[0];
variants.night = variants.day.replace(/Matcha(-light)?-/g, 'Matcha-dark-'); variants.day = name.replace('-dark', '');
variants.night = variants.day.replace(new RegExp(`${basename}(-light)?`), `${basename}-dark`);
} }
else if ( name.includes('Mojave') ) { else if ( name.includes('Mojave') ) {
variants.day = name.replace('-dark', '-light'); variants.day = name.replace('-dark', '-light');
@@ -85,11 +82,11 @@ var Variants = class {
} }
else if ( name.includes('vimix') ) { else if ( name.includes('vimix') ) {
variants.day = name.replace('-dark', ''); variants.day = name.replace('-dark', '');
variants.night = variants.day.replace(/vimix(-light)?/g, 'vimix-dark'); variants.night = variants.day.replace(/vimix(-light)?/, 'vimix-dark');
} }
else { else {
variants.day = name.replace(/-dark(?!est)/g, ''); variants.day = name.replace(/-dark(?!er)(est)?/, '');
variants.night = variants.day.replace(/(-light)?(-darker)?/g, '') + '-dark'; variants.night = variants.day.replace(/(-light|-darker)/, '') + (name.includes('-darkest') ? '-darkest' : '-dark');
} }
return variants; return variants;