From 9f40d76be80ae38010387031a6051be85a010974 Mon Sep 17 00:00:00 2001
From: illionillion <60034520+illionillion@users.noreply.github.com>
Date: Sun, 29 Dec 2024 08:18:55 +0900
Subject: [PATCH] fix: Reorder ring to be lower than text (#757)

---
 src/card.php                 | 14 +++++++-------
 tests/expected/test_card.svg | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/card.php b/src/card.php
index 256cb844..b1532e83 100644
--- a/src/card.php
+++ b/src/card.php
@@ -548,13 +548,6 @@ function generateCard(array $stats, array $params = null): string
                 </g>
             </g>
             <g style='isolation: isolate'>
-                <!-- Current Streak big number -->
-                <g transform='translate({$currentStreakOffset}, {$currentStreakHeightOffset[0]})'>
-                    <text x='0' y='32' stroke-width='0' text-anchor='middle' fill='{$theme["currStreakNum"]}' stroke='none' font-family='\"Segoe UI\", Ubuntu, sans-serif' font-weight='700' font-size='28px' font-style='normal' style='animation: currstreak 0.6s linear forwards'>
-                        {$currentStreak}
-                    </text>
-                </g>
-
                 <!-- Current Streak label -->
                 <g transform='translate({$currentStreakOffset}, {$currentStreakHeightOffset[1]})'>
                     <text x='0' y='32' stroke-width='0' text-anchor='middle' fill='{$theme["currStreakLabel"]}' stroke='none' font-family='\"Segoe UI\", Ubuntu, sans-serif' font-weight='700' font-size='14px' font-style='normal' style='opacity: 0; animation: fadein 0.5s linear forwards 0.9s'>
@@ -579,6 +572,13 @@ function generateCard(array $stats, array $params = null): string
                     <path d='M 1.5 0.67 C 1.5 0.67 2.24 3.32 2.24 5.47 C 2.24 7.53 0.89 9.2 -1.17 9.2 C -3.23 9.2 -4.79 7.53 -4.79 5.47 L -4.76 5.11 C -6.78 7.51 -8 10.62 -8 13.99 C -8 18.41 -4.42 22 0 22 C 4.42 22 8 18.41 8 13.99 C 8 8.6 5.41 3.79 1.5 0.67 Z M -0.29 19 C -2.07 19 -3.51 17.6 -3.51 15.86 C -3.51 14.24 -2.46 13.1 -0.7 12.74 C 1.07 12.38 2.9 11.53 3.92 10.16 C 4.31 11.45 4.51 12.81 4.51 14.2 C 4.51 16.85 2.36 19 -0.29 19 Z' fill='{$theme["fire"]}' stroke-opacity='0'/>
                 </g>
 
+                <!-- Current Streak big number -->
+                <g transform='translate({$currentStreakOffset}, {$currentStreakHeightOffset[0]})'>
+                    <text x='0' y='32' stroke-width='0' text-anchor='middle' fill='{$theme["currStreakNum"]}' stroke='none' font-family='\"Segoe UI\", Ubuntu, sans-serif' font-weight='700' font-size='28px' font-style='normal' style='animation: currstreak 0.6s linear forwards'>
+                        {$currentStreak}
+                    </text>
+                </g>
+
             </g>
             <g style='isolation: isolate'>
                 <!-- Longest Streak big number -->
diff --git a/tests/expected/test_card.svg b/tests/expected/test_card.svg
index 39a74a6a..08dfd779 100644
--- a/tests/expected/test_card.svg
+++ b/tests/expected/test_card.svg
@@ -52,13 +52,6 @@
                 </g>
             </g>
             <g style='isolation: isolate'>
-                <!-- Current Streak big number -->
-                <g transform='translate(247.5, 48)'>
-                    <text x='0' y='32' stroke-width='0' text-anchor='middle' fill='#555555' stroke='none' font-family='"Segoe UI", Ubuntu, sans-serif' font-weight='700' font-size='28px' font-style='normal' style='animation: currstreak 0.6s linear forwards'>
-                        16
-                    </text>
-                </g>
-
                 <!-- Current Streak label -->
                 <g transform='translate(247.5, 108)'>
                     <text x='0' y='32' stroke-width='0' text-anchor='middle' fill='#777777' stroke='none' font-family='"Segoe UI", Ubuntu, sans-serif' font-weight='700' font-size='14px' font-style='normal' style='opacity: 0; animation: fadein 0.5s linear forwards 0.9s'>
@@ -83,6 +76,13 @@
                     <path d='M 1.5 0.67 C 1.5 0.67 2.24 3.32 2.24 5.47 C 2.24 7.53 0.89 9.2 -1.17 9.2 C -3.23 9.2 -4.79 7.53 -4.79 5.47 L -4.76 5.11 C -6.78 7.51 -8 10.62 -8 13.99 C -8 18.41 -4.42 22 0 22 C 4.42 22 8 18.41 8 13.99 C 8 8.6 5.41 3.79 1.5 0.67 Z M -0.29 19 C -2.07 19 -3.51 17.6 -3.51 15.86 C -3.51 14.24 -2.46 13.1 -0.7 12.74 C 1.07 12.38 2.9 11.53 3.92 10.16 C 4.31 11.45 4.51 12.81 4.51 14.2 C 4.51 16.85 2.36 19 -0.29 19 Z' fill='#444444' stroke-opacity='0'/>
                 </g>
 
+                <!-- Current Streak big number -->
+                <g transform='translate(247.5, 48)'>
+                    <text x='0' y='32' stroke-width='0' text-anchor='middle' fill='#555555' stroke='none' font-family='"Segoe UI", Ubuntu, sans-serif' font-weight='700' font-size='28px' font-style='normal' style='animation: currstreak 0.6s linear forwards'>
+                        16
+                    </text>
+                </g>
+
             </g>
             <g style='isolation: isolate'>
                 <!-- Longest Streak big number -->