From 83a937294fc13c0038e54d55b0fd487860e1d01a Mon Sep 17 00:00:00 2001
From: Gavriel Fleischer <flocsy@gmail.com>
Date: Sun, 4 Jul 2021 10:52:09 +0300
Subject: [PATCH 1/2] fix sunrise when it's tomorrow

---
 source/DataFields.mc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/DataFields.mc b/source/DataFields.mc
index 2f2cf216..514a347a 100644
--- a/source/DataFields.mc
+++ b/source/DataFields.mc
@@ -643,7 +643,7 @@ class DataFields extends Ui.Drawable {
 		if (tomorrow) {
 			now = now.add(new Time.Duration(24 * 60 * 60));
 		}
-		var d = Gregorian.info(Time.now(), Time.FORMAT_SHORT);
+		var d = Gregorian.info(now, Time.FORMAT_SHORT);
 		var rad = Math.PI / 180.0d;
 		var deg = 180.0d / Math.PI;
 		

From ad4bf28eacf9ce51619fdc05996fc3e41b98b1b5 Mon Sep 17 00:00:00 2001
From: Gavriel Fleischer <flocsy@gmail.com>
Date: Sun, 4 Jul 2021 16:12:31 +0300
Subject: [PATCH 2/2] change a/p to am/pm

---
 resources-fr920xt/fonts/fonts.xml           | 2 +-
 resources-rectangle-205x148/fonts/fonts.xml | 2 +-
 resources-rectangle-240x240/fonts/fonts.xml | 4 ++--
 resources-round-208x208/fonts/fonts.xml     | 2 +-
 resources-round-260x260/fonts/fonts.xml     | 2 +-
 resources-round-280x280/fonts/fonts.xml     | 2 +-
 resources-round-360x360/fonts/fonts.xml     | 4 ++--
 resources-round-390x390/fonts/fonts.xml     | 4 ++--
 resources-round-416x416/fonts/fonts.xml     | 4 ++--
 resources-small-time/fonts/fonts.xml        | 2 +-
 resources/fonts/fonts.xml                   | 2 +-
 source/CrystalApp.mc                        | 4 ++--
 12 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/resources-fr920xt/fonts/fonts.xml b/resources-fr920xt/fonts/fonts.xml
index 75736182..00bfc774 100644
--- a/resources-fr920xt/fonts/fonts.xml
+++ b/resources-fr920xt/fonts/fonts.xml
@@ -6,7 +6,7 @@
 	<font id="MinutesFont" filename="../../resources-rectangle-205x148/fonts/titillium-web-light-54.fnt" antialias="false"/>
 
 	<!-- Manually symlinked from resources-small-time/fonts. -->
-	<font id="SecondsFont" filename="../../resources-small-time/fonts/titillium-web-semibold-20.fnt" antialias="false" filter="0123456789AP"/>
+	<font id="SecondsFont" filename="../../resources-small-time/fonts/titillium-web-semibold-20.fnt" antialias="false" filter="0123456789APM"/>
 
 	<!-- Manually symlinked from resources/fonts. -->
 	<font id="DateFont" filename="../../resources/fonts/titillium-web-semibold-16.fnt" antialias="false" filter=" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÁÄÅÉÍÖØÚČĚŘŚŠŹŽ"/>
diff --git a/resources-rectangle-205x148/fonts/fonts.xml b/resources-rectangle-205x148/fonts/fonts.xml
index dec28d6e..d059cccc 100644
--- a/resources-rectangle-205x148/fonts/fonts.xml
+++ b/resources-rectangle-205x148/fonts/fonts.xml
@@ -3,7 +3,7 @@
 	<font id="MinutesFont" filename="titillium-web-light-54.fnt" antialias="true" />
 
 	<!-- Same SecondsFont and DateFont as resources-small-time -->
-	<!--font id="SecondsFont" filename="titillium-web-semibold-20.fnt" antialias="true" filter="0123456789AP"/-->
+	<!--font id="SecondsFont" filename="titillium-web-semibold-20.fnt" antialias="true" filter="0123456789APM"/-->
 
 	<!-- Manually symlinked from resources/fonts. -->
 	<!-- Select date glyphs from titillium-web-semibold-16.fnt -->
diff --git a/resources-rectangle-240x240/fonts/fonts.xml b/resources-rectangle-240x240/fonts/fonts.xml
index 0e2c8c73..18e6b37f 100644
--- a/resources-rectangle-240x240/fonts/fonts.xml
+++ b/resources-rectangle-240x240/fonts/fonts.xml
@@ -2,7 +2,7 @@
 <fonts>
 	<font id="HoursFont" filename="../../resources-round-260x260/fonts/titillium-web-bold-74-tall.fnt" antialias="true"/>
 	<font id="MinutesFont" filename="../../resources-round-260x260/fonts/titillium-web-light-74-tall.fnt" antialias="true"/>
-	<font id="SecondsFont" filename="../../resources-round-260x260/fonts/titillium-web-semibold-26.fnt" antialias="true" filter="0123456789AP"/>
+	<font id="SecondsFont" filename="../../resources-round-260x260/fonts/titillium-web-semibold-26.fnt" antialias="true" filter="0123456789APM"/>
 	<font id="DateFont" filename="../../resources-round-260x260/fonts/titillium-web-semibold-26.fnt" antialias="true" filter=" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÁÄÅÉÍÖØÚČĚŘŚŠŹŽ"/>
 
 	<!-- Locale-specific manual date font overrides, because fonts cannot automatically be overridden by locale -->
@@ -14,7 +14,7 @@
 	<!-- Always on fonts -->
 	<font id="AlwaysOnHoursFont" filename="../../resources-rectangle-205x148/fonts/titillium-web-bold-54.fnt" antialias="true"/>
 	<font id="AlwaysOnMinutesFont" filename="../../resources-rectangle-205x148/fonts/titillium-web-light-54.fnt" antialias="true"/>
-	<font id="AlwaysOnSecondsFont" filename="../../resources-small-time/fonts/titillium-web-semibold-20.fnt" antialias="true" filter="AP"/> <!-- AM/PM only -->
+	<font id="AlwaysOnSecondsFont" filename="../../resources-small-time/fonts/titillium-web-semibold-20.fnt" antialias="true" filter="APM"/> <!-- AM/PM only -->
 	<font id="AlwaysOnDateFont" filename="../../resources/fonts/titillium-web-semibold-16.fnt" antialias="true" filter=" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÁÄÅÉÍÖØÚČĚŘŚŠŹŽ"/>
 	<font id="AlwaysOnDateFontOverrideZHS" filename="../../resources-rectangle-205x148/fonts/noto-sans-cjk-sc-medium-16.fnt" antialias="true"/>
 	<font id="AlwaysOnDateFontOverrideZHT" filename="../../resources-rectangle-205x148/fonts/noto-sans-cjk-tc-medium-16.fnt" antialias="true"/>
diff --git a/resources-round-208x208/fonts/fonts.xml b/resources-round-208x208/fonts/fonts.xml
index 5583da69..00b4c209 100644
--- a/resources-round-208x208/fonts/fonts.xml
+++ b/resources-round-208x208/fonts/fonts.xml
@@ -1,7 +1,7 @@
 <fonts>
 	<font id="HoursFont" filename="../../resources-small-time/fonts/titillium-web-bold-58-tall.fnt" antialias="false"/>
 	<font id="MinutesFont" filename="../../resources-small-time/fonts/titillium-web-light-58-tall.fnt" antialias="false"/>
-	<font id="SecondsFont" filename="../../resources-small-time/fonts/titillium-web-semibold-20.fnt" antialias="false" filter="0123456789AP"/>
+	<font id="SecondsFont" filename="../../resources-small-time/fonts/titillium-web-semibold-20.fnt" antialias="false" filter="0123456789APM"/>
     <font id="DateFont" filename="../../resources-small-time/fonts/titillium-web-semibold-20.fnt" antialias="false" filter=" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÁÄÅÉÍÖØÚČĚŘŚŠŹŽ"/>
 
     <font id="NormalFont" filename="../../resources/fonts/titillium-web-semibold-16.fnt" antialias="false" filter="%-.0123456789!:?CFabefgikmpsty°"/>
diff --git a/resources-round-260x260/fonts/fonts.xml b/resources-round-260x260/fonts/fonts.xml
index 42f35466..edfa6a27 100644
--- a/resources-round-260x260/fonts/fonts.xml
+++ b/resources-round-260x260/fonts/fonts.xml
@@ -1,7 +1,7 @@
 <fonts>
 	<font id="HoursFont" filename="titillium-web-bold-74-tall.fnt" antialias="true"/>
 	<font id="MinutesFont" filename="titillium-web-light-74-tall.fnt" antialias="true"/>
-	<font id="SecondsFont" filename="titillium-web-semibold-26.fnt" antialias="true" filter="0123456789AP"/>
+	<font id="SecondsFont" filename="titillium-web-semibold-26.fnt" antialias="true" filter="0123456789APM"/>
 	<font id="DateFont" filename="titillium-web-semibold-26.fnt" antialias="true" filter=" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÁÄÅÉÍÖØÚČĚŘŚŠŹŽ"/>
 
 	<!-- Locale-specific manual date font overrides, because fonts cannot automatically be overridden by locale -->
diff --git a/resources-round-280x280/fonts/fonts.xml b/resources-round-280x280/fonts/fonts.xml
index 497b4c78..5461c939 100644
--- a/resources-round-280x280/fonts/fonts.xml
+++ b/resources-round-280x280/fonts/fonts.xml
@@ -1,7 +1,7 @@
 <fonts>
 	<font id="HoursFont" filename="titillium-web-bold-80-tall.fnt" antialias="true"/>
 	<font id="MinutesFont" filename="titillium-web-light-80-tall.fnt" antialias="true"/>
-	<font id="SecondsFont" filename="titillium-web-semibold-28.fnt" antialias="true" filter="0123456789AP"/>
+	<font id="SecondsFont" filename="titillium-web-semibold-28.fnt" antialias="true" filter="0123456789APM"/>
 	<font id="DateFont" filename="titillium-web-semibold-28.fnt" antialias="true" filter=" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÁÄÅÉÍÖØÚČĚŘŚŠŹŽ"/>
 	<font id="NormalFont" filename="titillium-web-semibold-18.fnt" antialias="true" filter="%-.0123456789!:?CFabefgikmpsty°"/>
 	<font id="NormalFontCities" filename="titillium-web-semibold-18.fnt" antialias="true" filter=" %',-.0123456789!:?ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz°ÅÍÎÖáãäåæèéíðñóôöøûüž"/>
diff --git a/resources-round-360x360/fonts/fonts.xml b/resources-round-360x360/fonts/fonts.xml
index 9fba4349..f70b9c56 100644
--- a/resources-round-360x360/fonts/fonts.xml
+++ b/resources-round-360x360/fonts/fonts.xml
@@ -1,7 +1,7 @@
 <fonts>
 	<font id="HoursFont" filename="titillium-web-bold-102-tall.fnt" antialias="true"/>
 	<font id="MinutesFont" filename="titillium-web-light-102-tall.fnt" antialias="true"/>
-	<font id="SecondsFont" filename="titillium-web-semibold-36.fnt" antialias="true" filter="0123456789AP"/>
+	<font id="SecondsFont" filename="titillium-web-semibold-36.fnt" antialias="true" filter="0123456789APM"/>
 	<font id="DateFont" filename="titillium-web-semibold-36.fnt" antialias="true" filter=" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÁÄÅÉÍÖØÚČĚŘŚŠŹŽ"/>
 
 	<!-- Manually symlinked from /fonts. -->
@@ -26,7 +26,7 @@
 	<!-- Date/battery fonts should strictly be 22px, but keep number of fonts to a sensible minimum -->
 	<font id="AlwaysOnHoursFont" filename="../../resources-round-260x260/fonts/titillium-web-bold-74-tall.fnt" antialias="true"/>
 	<font id="AlwaysOnMinutesFont" filename="../../resources-round-260x260/fonts/titillium-web-light-74-tall.fnt" antialias="true"/>
-	<font id="AlwaysOnSecondsFont" filename="../../resources-round-260x260/fonts/titillium-web-semibold-26.fnt" antialias="true" filter="AP"/> <!-- AM/PM only -->
+	<font id="AlwaysOnSecondsFont" filename="../../resources-round-260x260/fonts/titillium-web-semibold-26.fnt" antialias="true" filter="APM"/> <!-- AM/PM only -->
 	<font id="AlwaysOnDateFont" filename="../../resources/fonts/titillium-web-semibold-24.fnt" antialias="true" filter=" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÁÄÅÉÍÖØÚČĚŘŚŠŹŽ"/>
 	<font id="AlwaysOnDateFontOverrideZHS" filename="../../resources/fonts/noto-sans-cjk-sc-medium-24.fnt" antialias="true"/>
 	<font id="AlwaysOnDateFontOverrideZHT" filename="../../resources/fonts/noto-sans-cjk-tc-medium-24.fnt" antialias="true"/>
diff --git a/resources-round-390x390/fonts/fonts.xml b/resources-round-390x390/fonts/fonts.xml
index 268d5e92..7922aae5 100644
--- a/resources-round-390x390/fonts/fonts.xml
+++ b/resources-round-390x390/fonts/fonts.xml
@@ -1,7 +1,7 @@
 <fonts>
 	<font id="HoursFont" filename="titillium-web-bold-110-tall.fnt" antialias="true"/>
 	<font id="MinutesFont" filename="titillium-web-light-110-tall.fnt" antialias="true"/>
-	<font id="SecondsFont" filename="titillium-web-semibold-39.fnt" antialias="true" filter="0123456789AP"/>
+	<font id="SecondsFont" filename="titillium-web-semibold-39.fnt" antialias="true" filter="0123456789APM"/>
 	<font id="DateFont" filename="titillium-web-semibold-39.fnt" antialias="true" filter=" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÁÄÅÉÍÖØÚČĚŘŚŠŹŽ"/>
 
 	<!-- Manually symlinked from resources-round-260x260/fonts. -->
@@ -24,7 +24,7 @@
 	<!-- Always on fonts -->
 	<font id="AlwaysOnHoursFont" filename="../../resources-round-280x280/fonts/titillium-web-bold-80-tall.fnt" antialias="true"/>
 	<font id="AlwaysOnMinutesFont" filename="../../resources-round-280x280/fonts/titillium-web-light-80-tall.fnt" antialias="true"/>
-	<font id="AlwaysOnSecondsFont" filename="../../resources-round-280x280/fonts/titillium-web-semibold-28.fnt" antialias="true" filter="AP"/> <!-- AM/PM only -->
+	<font id="AlwaysOnSecondsFont" filename="../../resources-round-280x280/fonts/titillium-web-semibold-28.fnt" antialias="true" filter="APM"/> <!-- AM/PM only -->
 	<font id="AlwaysOnDateFont" filename="../../resources/fonts/titillium-web-semibold-24.fnt" antialias="true" filter=" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÁÄÅÉÍÖØÚČĚŘŚŠŹŽ"/>
 	<font id="AlwaysOnDateFontOverrideZHS" filename="../../resources/fonts/noto-sans-cjk-sc-medium-24.fnt" antialias="true"/>
 	<font id="AlwaysOnDateFontOverrideZHT" filename="../../resources/fonts/noto-sans-cjk-tc-medium-24.fnt" antialias="true"/>
diff --git a/resources-round-416x416/fonts/fonts.xml b/resources-round-416x416/fonts/fonts.xml
index 5541a4f7..704c73c4 100644
--- a/resources-round-416x416/fonts/fonts.xml
+++ b/resources-round-416x416/fonts/fonts.xml
@@ -1,7 +1,7 @@
 <fonts>
 	<font id="HoursFont" filename="titillium-web-bold-118-tall.fnt" antialias="true"/>
 	<font id="MinutesFont" filename="titillium-web-light-118-tall.fnt" antialias="true"/>
-	<font id="SecondsFont" filename="titillium-web-semibold-42.fnt" antialias="true" filter="0123456789AP"/>
+	<font id="SecondsFont" filename="titillium-web-semibold-42.fnt" antialias="true" filter="0123456789APM"/>
 	<font id="DateFont" filename="titillium-web-semibold-42.fnt" antialias="true" filter=" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÁÄÅÉÍÖØÚČĚŘŚŠŹŽ"/>
 
 	<!-- Manually symlinked from resources-round-280x280/fonts. -->
@@ -25,7 +25,7 @@
 	<!-- Always on fonts -->
 	<font id="AlwaysOnHoursFont" filename="titillium-web-bold-85-tall.fnt" antialias="true"/>
 	<font id="AlwaysOnMinutesFont" filename="titillium-web-light-85-tall.fnt" antialias="true"/>
-	<font id="AlwaysOnSecondsFont" filename="titillium-web-semibold-30.fnt" antialias="true" filter="AP"/> <!-- AM/PM only -->
+	<font id="AlwaysOnSecondsFont" filename="titillium-web-semibold-30.fnt" antialias="true" filter="APM"/> <!-- AM/PM only -->
 	<font id="AlwaysOnDateFont" filename="../../resources-round-260x260/fonts/titillium-web-semibold-26.fnt" antialias="true" filter=" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÁÄÅÉÍÖØÚČĚŘŚŠŹŽ"/>
 	<font id="AlwaysOnDateFontOverrideZHS" filename="../../resources-round-260x260/fonts/noto-sans-cjk-sc-medium-26.fnt" antialias="true"/>
 	<font id="AlwaysOnDateFontOverrideZHT" filename="../../resources-round-260x260/fonts/noto-sans-cjk-tc-medium-26.fnt" antialias="true"/>
diff --git a/resources-small-time/fonts/fonts.xml b/resources-small-time/fonts/fonts.xml
index dc63011b..cc99236e 100644
--- a/resources-small-time/fonts/fonts.xml
+++ b/resources-small-time/fonts/fonts.xml
@@ -1,7 +1,7 @@
 <fonts>
 	<font id="HoursFont" filename="titillium-web-bold-58-tall.fnt" antialias="true"/>
 	<font id="MinutesFont" filename="titillium-web-light-58-tall.fnt" antialias="true"/>
-	<font id="SecondsFont" filename="titillium-web-semibold-20.fnt" antialias="true" filter="0123456789AP"/>
+	<font id="SecondsFont" filename="titillium-web-semibold-20.fnt" antialias="true" filter="0123456789APM"/>
 	<font id="DateFont" filename="titillium-web-semibold-20.fnt" antialias="true" filter=" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÁÄÅÉÍÖØÚČĚŘŚŠŹŽ"/>
 
 	<!-- Locale-specific manual date font overrides, because fonts cannot automatically be overridden by locale -->
diff --git a/resources/fonts/fonts.xml b/resources/fonts/fonts.xml
index 18a64842..2e194788 100644
--- a/resources/fonts/fonts.xml
+++ b/resources/fonts/fonts.xml
@@ -1,7 +1,7 @@
 <fonts>
 	<font id="HoursFont" filename="titillium-web-bold-68-tall.fnt" antialias="true"/>
 	<font id="MinutesFont" filename="titillium-web-light-68-tall.fnt" antialias="true"/>
-	<font id="SecondsFont" filename="titillium-web-semibold-24.fnt" antialias="true" filter="0123456789AP"/>
+	<font id="SecondsFont" filename="titillium-web-semibold-24.fnt" antialias="true" filter="0123456789APM"/>
 	<font id="DateFont" filename="titillium-web-semibold-24.fnt" antialias="true" filter=" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÁÄÅÉÍÖØÚČĚŘŚŠŹŽ"/>
 	<font id="NormalFont" filename="titillium-web-semibold-16.fnt" antialias="true" filter="%-.0123456789!:?CFabefgikmpsty°"/>
 	<font id="NormalFontCities" filename="titillium-web-semibold-16.fnt" antialias="true" filter=" %',-.0123456789!:?ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz°ÅÍÎÖáãäåæèéíðñóôöøûüž"/>
diff --git a/source/CrystalApp.mc b/source/CrystalApp.mc
index 20d3a0a4..1f6ae4fb 100644
--- a/source/CrystalApp.mc
+++ b/source/CrystalApp.mc
@@ -238,14 +238,14 @@ class CrystalApp extends App.AppBase {
 				if (hour > 12) {
 					hour = hour - 12;
 				}
-				amPm = "p";
+				amPm = "pm";
 			} else {
 				
 				// #27 Ensure midnight is shown as 12, not 00.
 				if (hour == 0) {
 					hour = 12;
 				}
-				amPm = "a";
+				amPm = "am";
 			}
 		}