Skip to content

Fix metro tile color #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 13, 2022
Merged

Fix metro tile color #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fc8846
feature: Metro can accept string-based tile color
joshbruce Dec 13, 2022
94563ef
remove: @group focus
joshbruce Dec 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions src/Components/Favicons.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class Favicons implements Stringable

private bool $metroUsesWhite;

private FaviconMetroColors $metroTileColor = FaviconMetroColors::DarkOrange;
private FaviconMetroColors|string $metroTileColor = FaviconMetroColors::DarkOrange;

private string $safariThemeColor = '#5bbad5';

Expand Down Expand Up @@ -70,7 +70,7 @@ private function hasAppName(): bool
}

public function withMetro(
FaviconMetroColors $tileColor = FaviconMetroColors::DarkOrange,
FaviconMetroColors|string $tileColor = FaviconMetroColors::DarkOrange,
bool $useWhite = false
): self {
$this->metroTileColor = $tileColor;
Expand Down Expand Up @@ -98,6 +98,14 @@ private function metroUsesWhite(): bool
return $this->metroUsesWhite;
}

private function metroTileColor(): string
{
if (is_string($this->metroTileColor)) {
return $this->metroTileColor;
}
return $this->metroTileColor->value;
}

public function withSafariThemeColor(string $color): self
{
$this->safariThemeColor = $color;
Expand Down Expand Up @@ -135,7 +143,7 @@ public function __toString(): string
),
Element::meta()->omitEndTag()->props(
'name msapplication-TileColor',
'content ' . $this->metroTileColor->value
'content ' . $this->metroTileColor()
),
Element::meta()->omitEndTag()->props(
'name theme-color',
Expand Down
2 changes: 0 additions & 2 deletions tests/Components/CopyrightTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ public function can_have_year_range(): void

/**
* @test
*
* @group focus
*/
public function can_include_copyright(): void
{
Expand Down
13 changes: 13 additions & 0 deletions tests/Components/FaviconsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,5 +99,18 @@ public function can_use_windows_metro_settings(): void
$expected,
$result . "\n"
);

$expected = file_get_contents(
__DIR__ . '/favicons-windows-metro-tile-color-white.xml'
);

$result = (string) Favicons::create()->withMetro(
'#ffffff'
);

$this->assertSame(
$expected,
$result . "\n"
);
}
}
1 change: 1 addition & 0 deletions tests/Components/favicons-windows-metro-tile-color-white.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<link rel="apple-touch-icon" href="/apple-touch-icon.png" sizes="180x180"><link type="image/png" rel="icon" href="/favicon-32x32.png" sizes="32x32"><link type="image/png" rel="icon" href="/favicon-16x16.png" sizes="16x16"><link rel="manifest" href="/site.webmanifest"><meta name="msapplication-TileColor" content="#ffffff"><meta name="theme-color" content="#ffffff"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">