diff --git a/KittieCats/resources/drawables/arm_second_xmas.svg b/KittieCats/resources/drawables/arm_second_xmas.svg new file mode 100644 index 0000000..f75b3c8 --- /dev/null +++ b/KittieCats/resources/drawables/arm_second_xmas.svg @@ -0,0 +1,11 @@ + + + + + diff --git a/KittieCats/resources/drawables/ball.png b/KittieCats/resources/drawables/ball.png new file mode 100644 index 0000000..bfafe82 Binary files /dev/null and b/KittieCats/resources/drawables/ball.png differ diff --git a/KittieCats/resources/drawables/drawables.xml b/KittieCats/resources/drawables/drawables.xml index 655ddd4..ecd1100 100755 --- a/KittieCats/resources/drawables/drawables.xml +++ b/KittieCats/resources/drawables/drawables.xml @@ -5,10 +5,13 @@ + + + diff --git a/KittieCats/resources/drawables/icons.png b/KittieCats/resources/drawables/icons.png index 8e921c8..c671021 100644 Binary files a/KittieCats/resources/drawables/icons.png and b/KittieCats/resources/drawables/icons.png differ diff --git a/KittieCats/resources/drawables/ticks_xmas.svg b/KittieCats/resources/drawables/ticks_xmas.svg new file mode 100644 index 0000000..534dc3a --- /dev/null +++ b/KittieCats/resources/drawables/ticks_xmas.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + diff --git a/KittieCats/resources/source/Icons.png b/KittieCats/resources/source/Icons.png index 281c074..92c84b4 100644 Binary files a/KittieCats/resources/source/Icons.png and b/KittieCats/resources/source/Icons.png differ diff --git a/KittieCats/resources/source/Layout.svg b/KittieCats/resources/source/Layout.svg index 20f28e6..51d18b4 100644 --- a/KittieCats/resources/source/Layout.svg +++ b/KittieCats/resources/source/Layout.svg @@ -10,6 +10,9 @@ sodipodi:docname="Layout.svg" inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)" xml:space="preserve" + inkscape:export-filename="Icons.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" @@ -27,9 +30,9 @@ inkscape:document-units="px" showguides="true" showgrid="false" - inkscape:zoom="4" - inkscape:cx="206.75" - inkscape:cy="335.75" + inkscape:zoom="8" + inkscape:cx="176.75" + inkscape:cy="324.875" inkscape:window-width="2560" inkscape:window-height="1368" inkscape:window-x="0" @@ -49,7 +52,8 @@ inkscape:label="" inkscape:color="rgb(0,134,229)" /> tintColor, :filterMode => Graphics.FILTER_MODE_BILINEAR, diff --git a/KittieCats/source/ThemeManager.mc b/KittieCats/source/ThemeManager.mc index 38a5b4a..4c54a0a 100644 --- a/KittieCats/source/ThemeManager.mc +++ b/KittieCats/source/ThemeManager.mc @@ -10,13 +10,16 @@ class Theme public var ArmMinute; public var ArmSecond; + public var MinuteOrnamentLo; + public var MinuteOrnamentOffset; + public var ArmHourTintHi; public var ArmHourTintLo; public var ArmMinuteTintHi; public var ArmMinuteTintLo; - function initialize(backgroundHi, backgroundLo, armHour, armMinute, armSecond, variablesJsonResource) + function initialize(backgroundHi, backgroundLo, armHour, armMinute, armSecond, minuteOrnamentLo, variablesJsonResource) { self.BackgroundHi = backgroundHi; self.BackgroundLo = backgroundLo; @@ -25,11 +28,14 @@ class Theme self.ArmMinute = armMinute; self.ArmSecond = armSecond; + self.MinuteOrnamentLo = minuteOrnamentLo; + var variables = Application.loadResource(variablesJsonResource) as Dictionary; self.ArmHourTintHi = variables["ArmHourTintHi"]; self.ArmHourTintLo = variables["ArmHourTintLo"]; self.ArmMinuteTintHi = variables["ArmMinuteTintHi"]; self.ArmMinuteTintLo = variables["ArmMinuteTintLo"]; + self.MinuteOrnamentOffset = variables["MinuteOrnamentOffset"]; } } @@ -67,16 +73,20 @@ class ThemeManager Rez.Drawables.ArmMinute, Rez.Drawables.ArmSecond, + null, + Rez.JsonData.ThemeDefault ); self.themes["xmas"] = new Theme( Rez.Drawables.BackgroundXmas, - Rez.Drawables.Ticks, + Rez.Drawables.TicksXmas, Rez.Drawables.ArmHour, Rez.Drawables.ArmMinute, - Rez.Drawables.ArmSecond, + Rez.Drawables.ArmSecondXmas, + + Rez.Drawables.Ball, Rez.JsonData.ThemeXMas );