Merge pull request #636 from mathoudebine/fix/635-showing-1-jan-20254…

…-after-running-during-year-change
mathoudebine · Jan 2, 2025 · 5a0f531 · 5a0f531
2 parents b72b67b + e75821e
commit 5a0f531
Show file tree

Hide file tree

Showing 25 changed files with 162 additions and 37 deletions.
diff --git a/res/themes/3.5inchTheme2/theme.yaml b/res/themes/3.5inchTheme2/theme.yaml
@@ -213,6 +213,8 @@ STATS:
         FONT_SIZE: 10
         FONT_COLOR: 255, 255, 255
         BACKGROUND_COLOR: 132, 154, 165
+        WIDTH: 90
+        ANCHOR: lm
     HOUR:
       TEXT:
         SHOW: True
@@ -221,4 +223,6 @@ STATS:
         FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
         FONT_SIZE: 10
         FONT_COLOR: 255, 255, 255
-        BACKGROUND_COLOR: 132, 154, 165
+        BACKGROUND_IMAGE: background.png
+        WIDTH: 64
+        ANCHOR: lm
diff --git a/res/themes/5inchTheme2/background.png b/res/themes/5inchTheme2/background.png
diff --git a/res/themes/5inchTheme2/theme.yaml b/res/themes/5inchTheme2/theme.yaml
@@ -17,23 +17,23 @@ static_text:
   DISK_USED_LABEL:
     TEXT: "Used:"
     X: 124
-    Y: 625
+    Y: 615
     FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
     FONT_SIZE: 23
     FONT_COLOR: 255, 255, 255
     BACKGROUND_COLOR: 132, 154, 165
   DISK_FREE_LABEL:
     TEXT: "Free:"
     X: 124
-    Y: 679
+    Y: 669
     FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
     FONT_SIZE: 23
     FONT_COLOR: 255, 255, 255
     BACKGROUND_COLOR: 132, 154, 165
   DISK_TOTAL_LABEL:
     TEXT: "Total:"
     X: 124
-    Y: 652
+    Y: 642
     FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
     FONT_SIZE: 23
     FONT_COLOR: 255, 255, 255
@@ -165,7 +165,7 @@ STATS:
       GRAPH:
         SHOW: True
         X: 124
-        Y: 600
+        Y: 590
         WIDTH: 178
         HEIGHT: 15
         MIN_VALUE: 0
@@ -177,7 +177,7 @@ STATS:
         SHOW: TRUE
         SHOW_UNIT: True
         X: 204
-        Y: 625
+        Y: 615
         FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
         FONT_SIZE: 23
         FONT_COLOR: 255, 255, 255
@@ -187,7 +187,7 @@ STATS:
         SHOW: TRUE
         SHOW_UNIT: True
         X: 204
-        Y: 652
+        Y: 642
         FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
         FONT_SIZE: 23
         FONT_COLOR: 255, 255, 255
@@ -197,7 +197,7 @@ STATS:
         SHOW: TRUE
         SHOW_UNIT: True
         X: 204
-        Y: 679
+        Y: 669
         FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
         FONT_SIZE: 23
         FONT_COLOR: 255, 255, 255
@@ -214,6 +214,8 @@ STATS:
         FONT_SIZE: 25
         FONT_COLOR: 255, 255, 255
         BACKGROUND_COLOR: 132, 154, 165
+        WIDTH: 230
+        ANCHOR: lt
     HOUR:
       TEXT:
         SHOW: True
@@ -223,3 +225,31 @@ STATS:
         FONT_SIZE: 25
         FONT_COLOR: 255, 255, 255
         BACKGROUND_COLOR: 132, 154, 165
+        WIDTH: 230
+        ANCHOR: lt
+
+  WEATHER:
+    # For optimal use, if you don't want to trigger the free threshold daily call (1000 calls), the interval should be 90 MINIMUM (not really useful as the API didn't update that quickly)
+    INTERVAL: 300
+    TEMPERATURE:
+      TEXT:
+        SHOW: True
+        X: 270
+        Y: 768
+        FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
+        FONT_SIZE: 25
+        FONT_COLOR: 255, 255, 255
+        BACKGROUND_IMAGE: background.png 
+        WIDTH: 200
+        ANCHOR: rt
+    WEATHER_DESCRIPTION:
+      TEXT:
+        SHOW: True
+        X: 270
+        Y: 740
+        FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
+        FONT_SIZE: 25
+        FONT_COLOR: 255, 255, 255
+        BACKGROUND_IMAGE: background.png 
+        WIDTH: 200
+        ANCHOR: rt
diff --git a/res/themes/5inchTheme2Radial/background.png b/res/themes/5inchTheme2Radial/background.png
diff --git a/res/themes/5inchTheme2Radial/theme.yaml b/res/themes/5inchTheme2Radial/theme.yaml
@@ -17,23 +17,23 @@ static_text:
   DISK_USED_LABEL:
     TEXT: "Used:"
     X: 124
-    Y: 625
+    Y: 615
     FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
     FONT_SIZE: 23
     FONT_COLOR: 255, 255, 255
     BACKGROUND_COLOR: 132, 154, 165
   DISK_FREE_LABEL:
     TEXT: "Free:"
     X: 124
-    Y: 679
+    Y: 669
     FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
     FONT_SIZE: 23
     FONT_COLOR: 255, 255, 255
     BACKGROUND_COLOR: 132, 154, 165
   DISK_TOTAL_LABEL:
     TEXT: "Total:"
     X: 124
-    Y: 652
+    Y: 642
     FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
     FONT_SIZE: 23
     FONT_COLOR: 255, 255, 255
@@ -184,7 +184,7 @@ STATS:
       GRAPH:
         SHOW: True
         X: 124
-        Y: 600
+        Y: 590
         WIDTH: 178
         HEIGHT: 15
         MIN_VALUE: 0
@@ -196,7 +196,7 @@ STATS:
         SHOW: TRUE
         SHOW_UNIT: True
         X: 204
-        Y: 625
+        Y: 615
         FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
         FONT_SIZE: 23
         FONT_COLOR: 255, 255, 255
@@ -206,7 +206,7 @@ STATS:
         SHOW: TRUE
         SHOW_UNIT: True
         X: 204
-        Y: 652
+        Y: 642
         FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
         FONT_SIZE: 23
         FONT_COLOR: 255, 255, 255
@@ -216,7 +216,7 @@ STATS:
         SHOW: TRUE
         SHOW_UNIT: True
         X: 204
-        Y: 679
+        Y: 669
         FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
         FONT_SIZE: 23
         FONT_COLOR: 255, 255, 255
@@ -233,6 +233,8 @@ STATS:
         FONT_SIZE: 25
         FONT_COLOR: 255, 255, 255
         BACKGROUND_COLOR: 132, 154, 165
+        WIDTH: 230
+        ANCHOR: lt
     HOUR:
       TEXT:
         SHOW: True
@@ -242,3 +244,31 @@ STATS:
         FONT_SIZE: 25
         FONT_COLOR: 255, 255, 255
         BACKGROUND_COLOR: 132, 154, 165
+        WIDTH: 230
+        ANCHOR: lt
+
+  WEATHER:
+    # For optimal use, if you don't want to trigger the free threshold daily call (1000 calls), the interval should be 90 MINIMUM (not really useful as the API didn't update that quickly)
+    INTERVAL: 300
+    TEMPERATURE:
+      TEXT:
+        SHOW: True
+        X: 270
+        Y: 768
+        FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
+        FONT_SIZE: 25
+        FONT_COLOR: 255, 255, 255
+        BACKGROUND_IMAGE: background.png 
+        WIDTH: 200
+        ANCHOR: rt
+    WEATHER_DESCRIPTION:
+      TEXT:
+        SHOW: True
+        X: 270
+        Y: 740
+        FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
+        FONT_SIZE: 25
+        FONT_COLOR: 255, 255, 255
+        BACKGROUND_IMAGE: background.png 
+        WIDTH: 200
+        ANCHOR: rt
diff --git a/res/themes/BigClock/theme.yaml b/res/themes/BigClock/theme.yaml
@@ -25,6 +25,8 @@ STATS:
         FONT_SIZE: 80
         FONT_COLOR: 200, 200, 200
         BACKGROUND_COLOR: 0, 0, 0
+        WIDTH: 460
+        ANCHOR: mm
     HOUR:
       TEXT:
         SHOW: True
@@ -34,3 +36,5 @@ STATS:
         FONT_SIZE: 80
         FONT_COLOR: 200, 200, 200
         BACKGROUND_COLOR: 50, 0, 0
+        WIDTH: 460
+        ANCHOR: mm
diff --git a/res/themes/ColoredFlat/theme.yaml b/res/themes/ColoredFlat/theme.yaml
@@ -484,22 +484,26 @@ STATS:
       TEXT:
         FORMAT: medium # short (2/20/23) / medium (Feb 20, 2023) / long (February 20, 2023) / full (Monday, February 20, 2023)
         SHOW: True
-        X: 275
+        X: 240
         Y: 25
         FONT: roboto/Roboto-Bold.ttf
         FONT_SIZE: 30
         FONT_COLOR: 247, 227, 227
         BACKGROUND_IMAGE: background.png
+        WIDTH: 240
+        ANCHOR: mt
     HOUR: # Format (12/24h, timezone translations) will match your computer locale
       TEXT:
         FORMAT: medium # short (6:48 PM) / medium (6:48:53 PM) / long (6:48:53 PM UTC) / full (6:48:53 PM Coordinated Universal Time)
         SHOW: True
-        X: 55
+        X: 0
         Y: 25
         FONT: roboto/Roboto-Bold.ttf
         FONT_SIZE: 30
         FONT_COLOR: 247, 227, 227
         BACKGROUND_IMAGE: background.png
+        WIDTH: 240
+        ANCHOR: mt
   WEATHER:
     # For optimal use, if you don't want to trigger the free threshold daily call (1000 calls), the interval should be 90 MINIMUM (not really useful as the API didn't update that quickly)
     INTERVAL: 300

diff --git a/res/themes/CyanTheme/theme.yaml b/res/themes/CyanTheme/theme.yaml
@@ -195,6 +195,8 @@ STATS:
         FONT_SIZE: 25
         FONT_COLOR: 255, 255, 255
         BACKGROUND_IMAGE: background.png
+        WIDTH: 300
+        ANCHOR: lt
     HOUR: # Format (12/24h, timezone translations) will match your computer locale
       TEXT:
         FORMAT: medium # short (6:48 PM) / medium (6:48:53 PM) / long (6:48:53 PM UTC) / full (6:48:53 PM Coordinated Universal Time)
@@ -205,3 +207,5 @@ STATS:
         FONT_SIZE: 25
         FONT_COLOR: 255, 255, 255
         BACKGROUND_IMAGE: background.png
+        WIDTH: 300
+        ANCHOR: lt
diff --git a/res/themes/Cyberpunk-net/theme.yaml b/res/themes/Cyberpunk-net/theme.yaml
@@ -236,6 +236,8 @@ STATS:
         FONT_SIZE: 18
         FONT_COLOR: 255, 239, 8
         BACKGROUND_IMAGE: background.png
+        WIDTH: 160
+        ANCHOR: lt
     HOUR:
       TEXT:
         SHOW: True
@@ -245,3 +247,5 @@ STATS:
         FONT_SIZE: 15
         FONT_COLOR: 255, 239, 8
         BACKGROUND_IMAGE: background.png
+        WIDTH: 100
+        ANCHOR: lt
diff --git a/res/themes/Cyberpunk/theme.yaml b/res/themes/Cyberpunk/theme.yaml
@@ -225,6 +225,8 @@ STATS:
         FONT_SIZE: 18
         FONT_COLOR: 255, 239, 8
         BACKGROUND_IMAGE: background.png
+        WIDTH: 160
+        ANCHOR: lt
     HOUR:
       TEXT:
         SHOW: True
@@ -234,3 +236,5 @@ STATS:
         FONT_SIZE: 15
         FONT_COLOR: 255, 239, 8
         BACKGROUND_IMAGE: background.png
+        WIDTH: 100
+        ANCHOR: lt
diff --git a/res/themes/DragonBall5inch/theme.yaml b/res/themes/DragonBall5inch/theme.yaml
@@ -134,6 +134,8 @@ STATS:
         FONT_SIZE: 22
         FONT_COLOR: 0, 0, 0
         BACKGROUND_IMAGE: background.png
+        WIDTH: 200
+        ANCHOR: lt
     HOUR: # Format (12/24h, timezone translations) will match your computer locale
       TEXT:
         FORMAT: medium # short (6:48 PM) / medium (6:48:53 PM) / long (6:48:53 PM UTC) / full (6:48:53 PM Coordinated Universal Time)
@@ -144,4 +146,6 @@ STATS:
         FONT_SIZE: 28
         FONT_COLOR: 0, 0, 0
         BACKGROUND_IMAGE: background.png
+        WIDTH: 200
+        ANCHOR: lt
 
diff --git a/res/themes/Landscape15Grid/theme.yaml b/res/themes/Landscape15Grid/theme.yaml
@@ -291,6 +291,8 @@ STATS:
         FONT_SIZE: 20
         FONT_COLOR: 255, 255, 255
         BACKGROUND_IMAGE: background_grid.png
+        WIDTH: 130
+        ANCHOR: lt
     HOUR: # Format (12/24h, timezone translations) will match your computer locale
       TEXT:
         FORMAT: short # short (6:48 PM) / medium (6:48:53 PM) / long (6:48:53 PM UTC) / full (6:48:53 PM Coordinated Universal Time)
@@ -300,4 +302,6 @@ STATS:
         FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
         FONT_SIZE: 28
         FONT_COLOR: 255, 255, 255
-        BACKGROUND_IMAGE: background_grid.png
+        BACKGROUND_IMAGE: background_grid.png
+        WIDTH: 130
+        ANCHOR: lt
diff --git a/res/themes/LandscapeEarth/theme.yaml b/res/themes/LandscapeEarth/theme.yaml
@@ -116,13 +116,18 @@ STATS:
         FONT_SIZE: 20
         FONT_COLOR: 252, 255, 255
         BACKGROUND_IMAGE: background.png
+        WIDTH: 180
+        ANCHOR: lt
     HOUR:
       TEXT:
         FORMAT: short
         SHOW: True
         X: 14
-        Y: 30
+        Y: 26
         FONT: generale-mono/GeneraleMonoA.ttf
         FONT_SIZE: 26
         FONT_COLOR: 255, 255, 255
-        BACKGROUND_COLOR: 16, 28, 57  # In case hour is over the star in background
+        BACKGROUND_COLOR: 16, 24, 49
+        WIDTH: 115  # Increase to 160 if you need the time to cover the star (e.g. am/pm indicator) 
+        HEIGHT: 30
+        ANCHOR: lm
diff --git a/res/themes/LandscapeMagicBlue/theme.yaml b/res/themes/LandscapeMagicBlue/theme.yaml
@@ -248,16 +248,20 @@ STATS:
         SHOW: True
         X: 58
         Y: 10
+        WIDTH: 100
         FONT: generale-mono/GeneraleMonoA.ttf
         FONT_SIZE: 12
         FONT_COLOR: 128, 255, 255
         BACKGROUND_IMAGE: background.png
+        ANCHOR: mt  # Text is centered (needs fixed WIDTH)
     HOUR:
       TEXT:
         SHOW: True
-        X: 334
+        X: 325
         Y: 10
+        WIDTH: 100
         FONT: generale-mono/GeneraleMonoA.ttf
         FONT_SIZE: 12
         FONT_COLOR: 128, 255, 255
         BACKGROUND_IMAGE: background.png
+        ANCHOR: mt  # Text is centered (needs fixed WIDTH)