From 32340786629519530471a6cc9623998489c1e529 Mon Sep 17 00:00:00 2001 From: Gyuri Horak Date: Tue, 3 Oct 2023 17:33:02 +0200 Subject: [PATCH] fenix (260x260) support --- manifest.xml | 2 + resources-round-260x260/layouts.xml | 73 ++++++++++++++++++++++++++++ resources/drawables/e_gain_sm.png | Bin 0 -> 2965 bytes resources/drawables/e_loss_sm.png | Bin 0 -> 2970 bytes resources/drawables/hills_sm.png | Bin 0 -> 2994 bytes resources/settings/properties.xml | 4 +- source/RepaFieldHeartRate.mc | 2 +- source/RepaFieldTrack.mc | 2 +- 8 files changed, 79 insertions(+), 4 deletions(-) create mode 100755 resources-round-260x260/layouts.xml create mode 100644 resources/drawables/e_gain_sm.png create mode 100644 resources/drawables/e_loss_sm.png create mode 100644 resources/drawables/hills_sm.png diff --git a/manifest.xml b/manifest.xml index 87fc462..1defba8 100644 --- a/manifest.xml +++ b/manifest.xml @@ -11,6 +11,8 @@ + + diff --git a/resources-round-260x260/layouts.xml b/resources-round-260x260/layouts.xml new file mode 100755 index 0000000..d7900e2 --- /dev/null +++ b/resources-round-260x260/layouts.xml @@ -0,0 +1,73 @@ + + + + + + 100 + 42 + 180 + 160 + -18 + + + 42 + + + + + + + + + + + + 42 + + + + + + + + 42 + + + + + diff --git a/resources/drawables/e_gain_sm.png b/resources/drawables/e_gain_sm.png new file mode 100644 index 0000000000000000000000000000000000000000..935246e28952582ed5f7c31d4ef15d1e1cd91c34 GIT binary patch literal 2965 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 literal 0 HcmV?d00001 diff --git a/resources/drawables/hills_sm.png b/resources/drawables/hills_sm.png new file mode 100644 index 0000000000000000000000000000000000000000..3729cf7f5f7e0c75b6727c7aeba579fbab4c52fc GIT binary patch literal 2994 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 literal 0 HcmV?d00001 diff --git a/resources/settings/properties.xml b/resources/settings/properties.xml index 8dca41f..8ddb74e 100644 --- a/resources/settings/properties.xml +++ b/resources/settings/properties.xml @@ -1,6 +1,6 @@ - 1.0.0 + 1.0.3 0088FF 0088FF FFFF00 - \ No newline at end of file + diff --git a/source/RepaFieldHeartRate.mc b/source/RepaFieldHeartRate.mc index 3782987..3a01b82 100644 --- a/source/RepaFieldHeartRate.mc +++ b/source/RepaFieldHeartRate.mc @@ -37,7 +37,7 @@ class HeartRate extends WatchUi.Drawable { } function draw(dc as Dc) as Void { - dc.setPenWidth(8); + dc.setPenWidth((dc.getHeight() * 0.02).toNumber()); dc.setColor(0x555555, Graphics.COLOR_TRANSPARENT); var width = dc.getWidth(); dc.drawLine(width * .1, y, width * .9, y); diff --git a/source/RepaFieldTrack.mc b/source/RepaFieldTrack.mc index e66e776..4618163 100644 --- a/source/RepaFieldTrack.mc +++ b/source/RepaFieldTrack.mc @@ -48,7 +48,7 @@ class Track extends WatchUi.Drawable { var h = dc.getHeight(); var astart = 150; var aend = 390; - dc.setPenWidth(4); + dc.setPenWidth((dc.getWidth() * 0.01).toNumber()); dc.setColor(0x555555, Graphics.COLOR_TRANSPARENT); dc.drawArc(w / 2, h / 2, w / 2 - 2, Graphics.ARC_COUNTER_CLOCKWISE, astart, aend);