-
-
Notifications
You must be signed in to change notification settings - Fork 4.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #412 from nextcloud/theming-foreground-color
Theming: invert foreground color on bright backgrounds
- Loading branch information
Showing
7 changed files
with
232 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| <?php | ||
| /** | ||
| * @copyright Copyright (c) 2016 Julius Härtl <jus@bitgrid.net> | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero 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 Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| namespace OCA\Theming; | ||
|
|
||
| class Util { | ||
|
|
||
| /** | ||
| * @param string $color rgb color value | ||
| * @return bool | ||
| */ | ||
| public static function invertTextColor($color) { | ||
| $l = self::calculateLuminance($color); | ||
| if($l>0.5) { | ||
| return true; | ||
| } else { | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * @param string $color rgb color value | ||
| * @return float | ||
| */ | ||
| public static function calculateLuminance($color) { | ||
| $hex = preg_replace("/[^0-9A-Fa-f]/", '', $color); | ||
| if (strlen($hex) === 3) { | ||
| $hex = $hex{0} . $hex{0} . $hex{1} . $hex{1} . $hex{2} . $hex{2}; | ||
| } | ||
| if (strlen($hex) !== 6) { | ||
| return 0; | ||
| } | ||
| $r = hexdec(substr($hex, 0, 2)); | ||
| $g = hexdec(substr($hex, 2, 2)); | ||
| $b = hexdec(substr($hex, 4, 2)); | ||
| return (0.299 * $r + 0.587 * $g + 0.114 * $b)/255; | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| <?php | ||
| /** | ||
| * @copyright Copyright (c) 2016 Julius Härtl <jus@bitgrid.net> | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero 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 Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
| namespace OCA\Theming\Tests; | ||
|
|
||
| use OCA\Theming\Util; | ||
| use Test\TestCase; | ||
|
|
||
| class UtilTest extends TestCase { | ||
|
|
||
| public function testInvertTextColorLight() { | ||
| $invert = Util::invertTextColor('#ffffff'); | ||
| $this->assertEquals(true, $invert); | ||
| } | ||
|
|
||
| public function testInvertTextColorDark() { | ||
| $invert = Util::invertTextColor('#000000'); | ||
| $this->assertEquals(false, $invert); | ||
| } | ||
|
|
||
| public function testCalculateLuminanceLight() { | ||
| $luminance = Util::calculateLuminance('#ffffff'); | ||
| $this->assertEquals(1, $luminance); | ||
| } | ||
|
|
||
| public function testCalculateLuminanceDark() { | ||
| $luminance = Util::calculateLuminance('#000000'); | ||
| $this->assertEquals(0, $luminance); | ||
| } | ||
|
|
||
| public function testCalculateLuminanceLightShorthand() { | ||
| $luminance = Util::calculateLuminance('#fff'); | ||
| $this->assertEquals(1, $luminance); | ||
| } | ||
|
|
||
| public function testCalculateLuminanceDarkShorthand() { | ||
| $luminance = Util::calculateLuminance('#000'); | ||
| $this->assertEquals(0, $luminance); | ||
| } | ||
| public function testInvertTextColorInvalid() { | ||
| $invert = Util::invertTextColor('aaabbbcccddd123'); | ||
| $this->assertEquals(false, $invert); | ||
| } | ||
|
|
||
| public function testInvertTextColorEmpty() { | ||
| $invert = Util::invertTextColor(''); | ||
| $this->assertEquals(false, $invert); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters