Merge branch 'theme/nextwaita' into 'master'

Add Nextwaita theme support

See merge request rmnvgr/nightthemeswitcher-gnome-shell-extension!20
This commit is contained in:
Romain
2020-04-20 17:38:06 +00:00
4 changed files with 35 additions and 1 deletions
+1
View File
@@ -23,6 +23,7 @@ These themes have been tested and work:
- Matcha (Manjaro default) - Matcha (Manjaro default)
- Materia - Materia
- Mojave - Mojave
- Nextwaita
- Orchis - Orchis
- Plata (Solus default) - Plata (Solus default)
- Pop (Pop!_OS default) - Pop (Pop!_OS default)
+1
View File
@@ -14,6 +14,7 @@ These themes have been tested and work:
- Matcha (Manjaro default) - Matcha (Manjaro default)
- Materia - Materia
- Mojave - Mojave
- Nextwaita
- Orchis - Orchis
- Plata (Solus default) - Plata (Solus default)
- Pop (Pop!_OS default) - Pop (Pop!_OS default)
+1 -1
View File
@@ -76,7 +76,7 @@ var Variants = class {
variants.set('day', 'HighContrast'); variants.set('day', 'HighContrast');
variants.set('night', 'HighContrastInverse'); variants.set('night', 'HighContrastInverse');
} }
else if ( name.match(/^(Layan|Matcha)/) ) { else if ( name.match(/^(Layan|Matcha|Nextwaita)/) ) {
const basename = name.split('-')[0]; const basename = name.split('-')[0];
variants.set('day', name.replace('-dark', '')); variants.set('day', name.replace('-dark', ''));
variants.set('night', variants.get('day').replace(new RegExp(`${basename}(-light)?`), `${basename}-dark`)); variants.set('night', variants.get('day').replace(new RegExp(`${basename}(-light)?`), `${basename}-dark`));
+32
View File
@@ -0,0 +1,32 @@
/*
Night Theme Switcher Gnome Shell extension
Copyright (C) 2020 Romain Vigier
This program is free software: you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Foundation, either version 3 of the License, or (at your option) any later
version.
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with
this program. If not, see <http s ://www.gnu.org/licenses/>.
*/
const test = require('ava');
const { Variants } = require('./_variants');
test('Nextwaita', t => {
const variants = Variants.guess_from('Nextwaita-2.2');
t.is(variants.get('day'), 'Nextwaita-2.2');
t.is(variants.get('night'), 'Nextwaita-dark-2.2');
});
test('Nextwaita-dark', t => {
const variants = Variants.guess_from('Nextwaita-dark-2.2');
t.is(variants.get('day'), 'Nextwaita-2.2');
t.is(variants.get('night'), 'Nextwaita-dark-2.2');
});