Merge pull request #9 from 8fold/fix-metro-tile-color

Fix metro tile color
8fold · Dec 13, 2022 · f29fb84 · f29fb84
2 parents 20b4579 + 94563ef
commit f29fb84
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/src/Components/Favicons.php b/src/Components/Favicons.php
@@ -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';
 
@@ -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;
@@ -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;
@@ -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',

diff --git a/tests/Components/CopyrightTest.php b/tests/Components/CopyrightTest.php
@@ -68,8 +68,6 @@ public function can_have_year_range(): void
 
     /**
      * @test
-     *
-     * @group focus
      */
     public function can_include_copyright(): void
     {

diff --git a/tests/Components/FaviconsTest.php b/tests/Components/FaviconsTest.php
@@ -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"
+        );
     }
 }
diff --git a/tests/Components/favicons-windows-metro-tile-color-white.xml b/tests/Components/favicons-windows-metro-tile-color-white.xml
@@ -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">
-Original file 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 @@
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">