From d457f8244e342d64750d923c5da2cfb19d34b97d Mon Sep 17 00:00:00 2001 From: ericwyuan Date: Wed, 9 Sep 2026 23:53:18 +0800 Subject: [PATCH] Add the on-device data field catalogue, always-on mode, and real icons Fields 75 selectable fields across date/time, activity, body, system, environment, weather and custom text, numbered to match watchface.io/docs/datafields so the two catalogues line up. All four slots (both top, both bottom) pick from the same table and the bottom captions follow the selection. tools/gen_fields.py owns the table and emits FieldTable.mc, settings.xml and both languages' strings, so those cannot drift apart. Fields.Ctx fetches each API at most once per draw, and only if some slot asks -- the forecast, user profile and sensor history lookups are lazy. The rest of that catalogue is deliberately absent: OpenWeatherMap and StormGlass need network calls and user API keys, the per-sport weekly and 28-day aggregates come from a phone-side Garmin Connect integration rather than any on-device API, and the app complications need those apps installed. README section 7 lists what was left out and why. Permissions UserProfile and SensorHistory are now declared; without them resting heart rate, VO2 max, pulse ox and body battery throw at runtime. Sensor turns out to be rejected outright for type="watchface", so altitude and pressure read from Activity.Info instead. Always-on display AMOLED devices need the lit-pixel count cut while asleep. drawAmbient drops the band fill and the unlit ticks, dims what remains, hides the complications, and walks the layout within +/-4 px per minute so nothing burns in. Gated on requiresBurnInProtection, so MIP devices are untouched. Icons The comps' sunrise and weather icons have two- and three-pixel features. Rebuilding them from circles and lines looked right at 454 px and turned to mush at 280. They are now rasterised from the design paths once per screen width and tinted with drawBitmap2(:tintColor) -- which needs packingFormat="png", since a palettised source is refused at runtime. Launcher icons are generated at the five sizes the devices ask for. All 17 devices build; checked on fenix847mm and enduro3 in the simulator. Co-Authored-By: Claude Opus 5 --- README.md | 121 ++++- manifest.xml | 7 + monkey.jungle | 29 +- resources-chn/strings/fields.xml | 89 ++++ resources-chn/strings/strings.xml | 33 +- resources-icons-240/drawables/drawables.xml | 5 + resources-icons-240/drawables/sunrise.png | Bin 0 -> 155 bytes resources-icons-240/drawables/sunset.png | Bin 0 -> 148 bytes resources-icons-240/drawables/weather.png | Bin 0 -> 157 bytes resources-icons-260/drawables/drawables.xml | 5 + resources-icons-260/drawables/sunrise.png | Bin 0 -> 172 bytes resources-icons-260/drawables/sunset.png | Bin 0 -> 165 bytes resources-icons-260/drawables/weather.png | Bin 0 -> 163 bytes resources-icons-280/drawables/drawables.xml | 5 + resources-icons-280/drawables/sunrise.png | Bin 0 -> 172 bytes resources-icons-280/drawables/sunset.png | Bin 0 -> 168 bytes resources-icons-280/drawables/weather.png | Bin 0 -> 173 bytes resources-icons-390/drawables/drawables.xml | 5 + resources-icons-390/drawables/sunrise.png | Bin 0 -> 636 bytes resources-icons-390/drawables/sunset.png | Bin 0 -> 662 bytes resources-icons-390/drawables/weather.png | Bin 0 -> 677 bytes resources-icons-416/drawables/drawables.xml | 5 + resources-icons-416/drawables/sunrise.png | Bin 0 -> 701 bytes resources-icons-416/drawables/sunset.png | Bin 0 -> 733 bytes resources-icons-416/drawables/weather.png | Bin 0 -> 746 bytes resources-icons-454/drawables/drawables.xml | 5 + resources-icons-454/drawables/sunrise.png | Bin 0 -> 767 bytes resources-icons-454/drawables/sunset.png | Bin 0 -> 783 bytes resources-icons-454/drawables/weather.png | Bin 0 -> 829 bytes .../drawables/drawables.xml | 0 .../drawables/launcher_icon.png | Bin 0 -> 2510 bytes resources-launcher-56/drawables/drawables.xml | 3 + .../drawables/launcher_icon.png | Bin 0 -> 3962 bytes resources-launcher-60/drawables/drawables.xml | 3 + .../drawables/launcher_icon.png | Bin 0 -> 4249 bytes resources-launcher-65/drawables/drawables.xml | 3 + .../drawables/launcher_icon.png | Bin 0 -> 4841 bytes resources-launcher-70/drawables/drawables.xml | 3 + .../drawables/launcher_icon.png | Bin 0 -> 5264 bytes resources/drawables/launcher_icon.png | Bin 498 -> 0 bytes resources/settings/properties.xml | 13 +- resources/settings/settings.xml | 408 ++++++++++++--- resources/strings/fields.xml | 89 ++++ resources/strings/strings.xml | 37 +- source/Fenix8V3View.mc | 399 ++++++-------- source/FieldTable.mc | 22 + source/Fields.mc | 491 ++++++++++++++++++ tools/gen_fields.py | 252 +++++++++ tools/gen_icons.py | 199 +++++++ 49 files changed, 1852 insertions(+), 379 deletions(-) create mode 100644 resources-chn/strings/fields.xml create mode 100644 resources-icons-240/drawables/drawables.xml create mode 100644 resources-icons-240/drawables/sunrise.png create mode 100644 resources-icons-240/drawables/sunset.png create mode 100644 resources-icons-240/drawables/weather.png create mode 100644 resources-icons-260/drawables/drawables.xml create mode 100644 resources-icons-260/drawables/sunrise.png create mode 100644 resources-icons-260/drawables/sunset.png create mode 100644 resources-icons-260/drawables/weather.png create mode 100644 resources-icons-280/drawables/drawables.xml create mode 100644 resources-icons-280/drawables/sunrise.png create mode 100644 resources-icons-280/drawables/sunset.png create mode 100644 resources-icons-280/drawables/weather.png create mode 100644 resources-icons-390/drawables/drawables.xml create mode 100644 resources-icons-390/drawables/sunrise.png create mode 100644 resources-icons-390/drawables/sunset.png create mode 100644 resources-icons-390/drawables/weather.png create mode 100644 resources-icons-416/drawables/drawables.xml create mode 100644 resources-icons-416/drawables/sunrise.png create mode 100644 resources-icons-416/drawables/sunset.png create mode 100644 resources-icons-416/drawables/weather.png create mode 100644 resources-icons-454/drawables/drawables.xml create mode 100644 resources-icons-454/drawables/sunrise.png create mode 100644 resources-icons-454/drawables/sunset.png create mode 100644 resources-icons-454/drawables/weather.png rename {resources => resources-launcher-40}/drawables/drawables.xml (100%) create mode 100644 resources-launcher-40/drawables/launcher_icon.png create mode 100644 resources-launcher-56/drawables/drawables.xml create mode 100644 resources-launcher-56/drawables/launcher_icon.png create mode 100644 resources-launcher-60/drawables/drawables.xml create mode 100644 resources-launcher-60/drawables/launcher_icon.png create mode 100644 resources-launcher-65/drawables/drawables.xml create mode 100644 resources-launcher-65/drawables/launcher_icon.png create mode 100644 resources-launcher-70/drawables/drawables.xml create mode 100644 resources-launcher-70/drawables/launcher_icon.png delete mode 100644 resources/drawables/launcher_icon.png create mode 100644 resources/strings/fields.xml create mode 100644 source/FieldTable.mc create mode 100644 source/Fields.mc create mode 100644 tools/gen_fields.py create mode 100644 tools/gen_icons.py diff --git a/README.md b/README.md index caa4323..7213e0e 100644 --- a/README.md +++ b/README.md @@ -23,17 +23,30 @@ fenix8v3-watchface/ │ └── rebuild.py # 原作者从位图逆向出 SVG 的脚本（仅存档，不参与构建） ├── tools/ │ ├── gen_themes.py # design/*.svg -> source/Themes.mc +│ ├── gen_fields.py # 字段表 -> FieldTable.mc + settings.xml + 两种语言文案 +│ ├── gen_icons.py # design/*.svg -> 各尺寸图标位图 + 启动图标 │ └── gen_preview_svg.py # source/Themes.mc -> preview-themes.svg + preview.html ├── source/ │ ├── Fenix8V3App.mc # 应用入口 -│ ├── Fenix8V3View.mc # 全部渲染逻辑 -│ └── Themes.mc # ⚠️ 自动生成，勿手改 -├── resources/ # 英文文案 + 设置项定义 +│ ├── Fenix8V3View.mc # 渲染逻辑（含常亮模式） +│ ├── Fields.mc # 75 项数据字段的取值与格式化 +│ ├── FieldTable.mc # ⚠️ 自动生成：字段 id 表 +│ └── Themes.mc # ⚠️ 自动生成：七套主题配色 +├── resources/ # 英文文案 + 设置项定义（部分自动生成） ├── resources-chn/ # 简体中文文案 +├── resources-icons-<宽度>/ # ⚠️ 自动生成：按屏幕尺寸光栅化的图标 +├── resources-launcher-<尺寸>/ # ⚠️ 自动生成：各尺寸启动图标 └── bin/ # 编译产物（已 gitignore） ``` -三份实现（表盘 / SVG 预览 / HTML 预览）只有 **一份颜色数据**：`Themes.mc`。预览脚本直接解析它，不会与固件漂移。 +重新生成全部派生文件： + +```bash +python3 tools/gen_themes.py && python3 tools/gen_fields.py \ + && python3 tools/gen_icons.py && python3 tools/gen_preview_svg.py +``` + +三份渲染实现（表盘 / SVG 预览 / HTML 预览）只有 **一份颜色数据**：`Themes.mc`。预览脚本直接解析它，不会与固件漂移。字段表、设置项、两种语言的文案同样只有 `tools/gen_fields.py` 里那一张表。 --- @@ -127,42 +140,94 @@ python3 tools/gen_themes.py && python3 tools/gen_preview_svg.py --- -## 7. 可配置设置 +## 7. 可配置设置与数据字段 -共 13 项，通过 Garmin Connect 手机 App 的「表盘设置」修改（定义在 `resources/settings/settings.xml`，默认值在 `properties.xml`）。 +19 项设置，在 Garmin Connect 手机 App 的「表盘设置」里改（定义在 `resources/settings/settings.xml`，默认值在 `properties.xml`，两者由 `tools/gen_fields.py` 生成）。 -| 设置 | 键 | 可选值 | 默认 | -|------|----|--------|------| -| 主题 | `Theme` | 1–7 | 1 | -| 顶右 / 顶左 / 底右 / 底左弧指标 | `RingTR/TL/BR/BL` | 0 步数 / 1 卡路里 / 2 距离 / 3 楼层 / 4 动动条 | 0 / 1 / 4 / 3 | -| 左上数据 | `LeftTop` | 见下 | 6（日出） | -| 右上数据 | `RightTop` | 见下 | 8（最高/最低气温） | -| 左下数据 | `BottomLeft` | 见下 | 3（距离） | -| 右下数据 | `BottomRight` | 见下 | 2（步数） | -| 温度单位 | `TempUnit` | 0 跟随手表 / 1 °C / 2 °F | 0 | -| 显示顶行 / 日期带 / 底行 | `ShowTop` / `ShowBand` / `ShowBottom` | 布尔 | true | +| 设置 | 键 | 默认 | +|------|----|------| +| 主题 | `Theme` | 1 (Ember) | +| 四段进度环指标 | `RingTR/TL/BR/BL` | 步数 / 卡路里 / 动动条 / 楼层 | +| 四个数据位 | `LeftTop` `RightTop` `BottomLeft` `BottomRight` | 日出 / 高低温 / 距离 / 步数 | +| 温度单位 | `TempUnit` | 跟随手表 | +| 第二时区 1 / 2 偏移（分钟） | `AltOffset1` `AltOffset2` | 0 | +| 自定义文字 1 / 2 / 3 | `Custom1/2/3` | 空 | +| 显示顶行 / 日期带 / 底行 | `ShowTop` `ShowBand` `ShowBottom` | true | -**数据项**（四个数据位共用同一张表）：`0` 当前气温 · `1` 卡路里 · `2` 步数 · `3` 距离 · `4` 楼层 · `5` 电量 · `6` 日出 · `7` 日落 · `8` 最高/最低气温 · `9` 心率。 +进度环指标：步数、卡路里、距离、楼层、动动条、活动分钟（对周目标）、身体电量。 -默认值即设计稿的配置：左上=日出时间、右上=`63°/52°`、左下=距离、右下=步数。 +### 数据字段 -底部两格的小标签跟随所选数据自动变化（`距离` / `步数` / `心率` …），不需要单独配置。 +四个数据位共用一张 **75 项** 的字段表，编号沿用 [watchface.io/docs/datafields](https://watchface.io/docs/datafields)，两边可以直接对照。底部两格的小标签跟随所选字段自动变化，不需要单独配置。 + +| 分类 | 字段 | +|------|------| +| 日期时间 | 时间、UTC 时间、第二时区 1/2、星期月日、星期日、月日、日、星期（简写/全称）、月份（名称/数字）、上午下午、周数（ISO / 日历） | +| 活动 | 步数、步数取整、剩余步数、卡路里、活动卡路里、活动分钟（总/中强度/高强度/本周）、距离、上楼层数、下楼层数、爬升高度、推行距离、推行次数 | +| 身体 | 心率、静息心率、压力指数、血氧、呼吸频率、身体电量、活动条（正/反向）、体重、BMI、恢复时间、最大摄氧量（跑/骑） | +| 系统 | 电量、剩余天数、电量+天数、闹钟、通知、勿扰、蓝牙、太阳能强度 | +| 环境 | 海拔、海平面气压、环境气压、日出、日落、下一太阳事件、距太阳事件、月龄、月球照明 | +| 天气 | 气温、最高/最低、体感、最高、最低、湿度、降水概率、风速、风向角、风向、更新时间 | +| 自定义 | 自定义文字 1 / 2 / 3 | + +加字段：在 `tools/gen_fields.py` 的 `FIELDS` 表里加一行，跑一遍生成器，再到 `source/Fields.mc` 的 `value()` 里补一个分支。设置项、两种语言的文案、表盘标签会自动跟上。 + +### ⚠️ 没有实现的字段，以及原因 + +watchface.io 的完整目录约 300 项，本表只收了 **手表本机能算出来的** 那些。其余几类不是没做，是一个自包含的 Connect IQ 表盘做不了： + +| 没做的 | 原因 | +|--------|------| +| OpenWeatherMap（约 30 项）、StormGlass.io（5 项） | 需要 `Communications.makeWebRequest` + 用户自备 API key + 后台服务定时拉取与缓存。是另一个子系统，且要求用户自己去注册 key | +| 各运动项目的 WTD / 近 7 天 / 本月 / 近 28 天 汇总（约 80 项） | Connect IQ 不暴露按运动分类的历史累计。这些数据在 GreenBlack 那边是通过手机侧与 Garmin Connect 的集成同步来的，本机 API 只有 `ActivityMonitor.getHistory()` 的最近几天步数/卡路里/距离 | +| 第三方 App 复杂功能（CGM、Hydration、QuoteGlance 等 12 项） | 需要用户装了对应的 App，并通过 Complications API 订阅 | +| 日历事件、计时器、倒计时 | 日历不对 CIQ 开放；表盘拿不到触摸输入，没法做启停 | +| 秒数 | 需要 `onPartialUpdate` 每秒重绘。技术上可行，但会明显吃电，暂未做 | +| 晨昏蒙影、黄金/蓝调时刻（约 14 项） | 可以自己算太阳高度角推出来，只是还没写；月龄和月球照明已经是这样算的 | +| 睡眠得分、训练状态 | `ActivityMonitor.Info` 上没有这两个字段（SDK 9.1.0 实测） | +| 标记类字段（Marker，约 35 项） | 那是给刻度型表盘做环形标记用的，本表盘的进度环用的是自己的指标体系 | --- -## 8. 数据来源 +## 8. 数据来源与权限 | 元素 | API | |------|-----| -| 步数 / 卡路里 / 距离 / 楼层 / 动动条 | `ActivityMonitor.getInfo()` | -| 日出 / 日落 | `Weather.getSunrise/getSunset(location, Time.now())`，位置取 `CurrentConditions.observationLocationPosition`，回退 `Activity.getActivityInfo().currentLocation` | -| 最高 / 最低气温 | `Weather.getDailyForecast()[0].highTemperature / lowTemperature` | -| 当前气温 | `Weather.getCurrentConditions().temperature` | -| 电量 | `System.getSystemStats().battery`（0–100 的百分比） | -| 时间 / 日期 | `Time.Gregorian`，`FORMAT_SHORT`（只有短格式的 `day_of_week` / `month` 是数字） | -| 蓝牙 | `DeviceSettings.phoneConnected`，未连接时图标压暗 | +| 步数 / 卡路里 / 距离 / 楼层 / 动动条 / 活动分钟 / 呼吸 / 压力 / 恢复时间 | `ActivityMonitor.getInfo()` | +| 心率 | `Activity.getActivityInfo().currentHeartRate`，回退 `ActivityMonitor.getHeartRateHistory()` | +| 血氧 / 身体电量 | `SensorHistory`（需 `SensorHistory` 权限） | +| 静息心率 / 体重 / 身高 / 最大摄氧量 | `UserProfile.getProfile()`（需 `UserProfile` 权限） | +| 海拔 / 环境气压 / 海平面气压 | `Activity.getActivityInfo()` | +| 日出 / 日落 | `Weather.getSunrise/getSunset(location, time)`，位置取 `CurrentConditions.observationLocationPosition`，回退 `Activity.currentLocation` | +| 气温 / 体感 / 湿度 / 降水 / 风 | `Weather.getCurrentConditions()` | +| 最高 / 最低气温 | `Weather.getDailyForecast()[0]` | +| 电量 / 剩余天数 / 太阳能 | `System.getSystemStats()`（`battery` 是 0–100 的百分比，不是 0–1） | +| 闹钟 / 通知 / 勿扰 / 蓝牙 / 单位制 | `System.getDeviceSettings()` | +| 月龄 / 月球照明 | 自算（儒略日 + 朔望月 29.530588853 天） | +| 周数 | 自算（ISO 8601 与日历周两种） | -单位与制式跟随手表设置：`is24Hour`（24 小时制下不显示 AM/PM）、`distanceUnits`（km / mi）、`temperatureUnits`（°C / °F）。天气与日出需手表已配对并同步过数据，否则显示 `--`。 +### 权限 + +`manifest.xml` 声明两项：`UserProfile`（静息心率、体重、VO2max）与 `SensorHistory`（血氧、身体电量）。用户安装时会看到授权提示。 + +> `Sensor` 权限**不能**用于 `type="watchface"`（除非同时申请 `Background`），编译器会直接拒绝。所以海拔与气压走 `Activity.Info` 而不是 `Sensor.getInfo()`。 + +单位与制式跟随手表：`is24Hour`、`distanceUnits`、`temperatureUnits`（温度可用 `TempUnit` 覆盖）。天气与日出需手表已配对并同步过数据，否则显示 `--`。 + +--- + +## 8.2 常亮显示（AOD） + +AMOLED 机型在常亮模式下必须压低点亮像素，否则既费电又有烧屏风险，Garmin 上架审核也会卡。`onEnterSleep` / `onExitSleep` 切换到 `drawAmbient()`： + +- 不画日期带底色（整条亮橙色横幅是最费电的元素） +- 进度环只画**点亮的**刻度，且整体压暗到 45% +- 时间与日期压暗到 55%，其余数据位全部隐藏 +- 整个画面按分钟在 ±4px 内游走，避免固定像素长期点亮 + +只在 `DeviceSettings.requiresBurnInProtection` 为真时启用；MIP 机型（Fenix 7 / Enduro 3 等）不受影响，照常全量绘制。 + +模拟器可用 `Settings → Display Mode` 切换验证。 --- diff --git a/manifest.xml b/manifest.xml index e24ad13..c7cbb4c 100644 --- a/manifest.xml +++ b/manifest.xml @@ -34,5 +34,12 @@ eng + + + + + + diff --git a/monkey.jungle b/monkey.jungle index 19faf56..500909f 100644 --- a/monkey.jungle +++ b/monkey.jungle @@ -1,7 +1,32 @@ project.manifest = manifest.xml base.sourcePath = source -# resources-chn holds the Simplified Chinese variant of every string; -# the -chn suffix is what tells monkeyc which language it belongs to. + +# resources-chn holds the Simplified Chinese variant of every string; the +# -chn suffix is what tells monkeyc which language it belongs to. base.resourcePath = resources;resources-chn + +# Two more resource trees per device, both generated by tools/gen_icons.py: +# resources-icons- sunrise/sunset/weather rasterised from the +# design paths for that exact pixel grid +# resources-launcher- launcher icon at the size the device asks for + +enduro3.resourcePath = $(base.resourcePath);resources-icons-280;resources-launcher-40 +epix2.resourcePath = $(base.resourcePath);resources-icons-416;resources-launcher-60 +epix2pro47mm.resourcePath = $(base.resourcePath);resources-icons-416;resources-launcher-60 +epix2pro51mm.resourcePath = $(base.resourcePath);resources-icons-454;resources-launcher-60 +fenix7.resourcePath = $(base.resourcePath);resources-icons-260;resources-launcher-40 +fenix7s.resourcePath = $(base.resourcePath);resources-icons-240;resources-launcher-40 +fenix7x.resourcePath = $(base.resourcePath);resources-icons-280;resources-launcher-40 +fenix843mm.resourcePath = $(base.resourcePath);resources-icons-416;resources-launcher-60 +fenix847mm.resourcePath = $(base.resourcePath);resources-icons-454;resources-launcher-65 +fenix8pro47mm.resourcePath = $(base.resourcePath);resources-icons-454;resources-launcher-65 +fenix8solar47mm.resourcePath = $(base.resourcePath);resources-icons-260;resources-launcher-40 +fenix8solar51mm.resourcePath = $(base.resourcePath);resources-icons-280;resources-launcher-40 +fr255.resourcePath = $(base.resourcePath);resources-icons-260;resources-launcher-40 +fr265.resourcePath = $(base.resourcePath);resources-icons-416;resources-launcher-60 +fr965.resourcePath = $(base.resourcePath);resources-icons-454;resources-launcher-65 +venu3.resourcePath = $(base.resourcePath);resources-icons-454;resources-launcher-70 +vivoactive5.resourcePath = $(base.resourcePath);resources-icons-390;resources-launcher-56 + base.excludeAnnotations = release diff --git a/resources-chn/strings/fields.xml b/resources-chn/strings/fields.xml new file mode 100644 index 0000000..bba8ac3 --- /dev/null +++ b/resources-chn/strings/fields.xml @@ -0,0 +1,89 @@ + + + 关闭 + 时间 + UTC 时间 + 第二时区 1 + 第二时区 2 + 星期 月 日 + 星期 日 + 月 日 + 日 + 星期简写 + 星期全称 + 月份 + 月份数字 + 上午/下午 + 周数 (ISO) + 周数 + 步数 + 步数 (取整) + 剩余步数 + 卡路里 + 活动卡路里 + 活动分钟 + 中强度分钟 + 高强度分钟 + 本周活动分钟 + 距离 + 上楼层数 + 下楼层数 + 爬升高度 + 推行距离 + 推行次数 + 心率 + 静息心率 + 压力指数 + 血氧 + 呼吸频率 + 身体电量 + 活动条 + 活动条 (反向) + 体重 + BMI + 恢复时间 + 最大摄氧量 (跑) + 最大摄氧量 (骑) + 电量 + 剩余天数 + 电量 / 天数 + 闹钟 + 通知 + 勿扰模式 + 蓝牙 + 太阳能强度 + 海拔 + 海平面气压 + 环境气压 + 日出 + 日落 + 下一太阳事件 + 距太阳事件 + 月龄 + 月球照明 + 气温 + 最高/最低气温 + 体感温度 + 最高气温 + 最低气温 + 湿度 + 降水概率 + 风速 + 风向角 + 风向 + 天气更新时间 + 自定义文字 1 + 自定义文字 2 + 自定义文字 3 + + + ,时间,UTC,时区1,时区2,日期,日期,日期,日,星期,星期,月,月,,周,周,步数,步数,还差,千卡,活动,分钟,中强度,高强度,周分钟,距离,楼层,下楼,爬升,推行,推行,心率,静息,压力,血氧,呼吸,体能,活动,活动,体重,BMI,恢复,摄氧,摄氧,电量,天数,电量,闹钟,通知,勿扰,蓝牙,太阳能,海拔,气压,气压,日出,日落,太阳,太阳,月龄,月相,气温,高低温,体感,最高,最低,湿度,降水,风速,风向,风向,更新,,, + + 步数 + 卡路里 + 距离 + 楼层 + 动动条 + 活动分钟 + 身体电量 + diff --git a/resources-chn/strings/strings.xml b/resources-chn/strings/strings.xml index 299ef15..c94db93 100644 --- a/resources-chn/strings/strings.xml +++ b/resources-chn/strings/strings.xml @@ -10,10 +10,20 @@ 右上数据 左下数据 右下数据 + 温度单位 + 第二时区 1（相对本地分钟数） + 第二时区 2（相对本地分钟数） + 自定义文字 1 + 自定义文字 2 + 自定义文字 3 显示顶部一行 显示日期带 显示底部一行 + 跟随手表 + 摄氏度 (°C) + 华氏度 (°F) + 1 · 余烬 2 · 极光 3 · 黄铜 @@ -22,32 +32,9 @@ 6 · 酸绿 7 · 海藻 - 步数 - 卡路里 - 距离 - 楼层 - 动动条 - - 气温 - 最高 / 最低气温 - 日出 - 日落 - 卡路里 - 步数 - 距离 - 楼层 - 电量 - 心率 - 周日,周一,周二,周三,周四,周五,周六 1月,2月,3月,4月,5月,6月,7月,8月,9月,10月,11月,12月 $1$$2$日 上午,下午 - 气温,卡路里,步数,距离,楼层,电量,日出,日落,高低温,心率 - - 温度单位 - 跟随手表 - 摄氏度 (°C) - 华氏度 (°F) diff --git a/resources-icons-240/drawables/drawables.xml b/resources-icons-240/drawables/drawables.xml new file mode 100644 index 0000000..b1703a8 --- /dev/null +++ b/resources-icons-240/drawables/drawables.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/resources-icons-240/drawables/sunrise.png b/resources-icons-240/drawables/sunrise.png new file mode 100644 index 0000000000000000000000000000000000000000..3184f149aa3c31bd47266ffccfde1aa8436142fc GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^{2mdKI;Vst E00=cYPXGV_ literal 0 HcmV?d00001 diff --git a/resources-icons-240/drawables/sunset.png b/resources-icons-240/drawables/sunset.png new file mode 100644 index 0000000000000000000000000000000000000000..e60eb2bbd1df5fafaa3a68ee4f6b3282a1c270c1 GIT binary patch literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^{2<=Ubs2zU`U}QKC_0YG)GHq)&EKbdLRiNCY*@vb)rxs`GM9an uQx)v>*VL#Kyl<16P{tl|IXW*e#F!z%RGQzRfAJHbH4L7velF{r5}E+MA}vn< literal 0 HcmV?d00001 diff --git a/resources-icons-240/drawables/weather.png b/resources-icons-240/drawables/weather.png new file mode 100644 index 0000000000000000000000000000000000000000..dfb6b84524982e77bb1d62a5895e322bd0f4b68c GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^{2%7yv + + + + diff --git a/resources-icons-260/drawables/sunrise.png b/resources-icons-260/drawables/sunrise.png new file mode 100644 index 0000000000000000000000000000000000000000..e901d32ac6e838b875472755b3786d04d4f46ac4 GIT binary patch literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^f*{Pn1|+R>-G2e8Vow*xkcv55Ck1jbC~~-%?)pFV zt+&DKgSVm-n>LwGUX`Y{{o*>#*%L0k()TOlHhHS3F1ciCK-&WLeHn4=ej+PdH|u=a zw&8>kH}`JKCnYJ<-@oYI`2CR5r9~$`S?%oLkJzrJ?qS%Jk!`z5Ec=$dqgO-635F}0 WvQifN4n+a2XYh3Ob6Mw<&;$Tt8bD$I literal 0 HcmV?d00001 diff --git a/resources-icons-260/drawables/sunset.png b/resources-icons-260/drawables/sunset.png new file mode 100644 index 0000000000000000000000000000000000000000..6af60c44ed8440f08a0f8e43f847cbe614c00391 GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^f*{Pn1|+R>-G2e898VX=kcv5HgB-aI7;r=%`}hCp z8x;%btxKhSG@6ze20DJa(OWz_anh2hzd9$~WV9{t@>FrUt}$r^|F@t!s#6?Fi?`l* zardCs$;b<-QYT-X-G2e8EKe85kcv55C*9^dpupkW`s4rp zJGQ!pPaj!rw^N!krHfHw`KRP2hRnBN0v8sPUWjzKrdXE9b9e3JwSrmuSx;A%II(Wr zs<^UUiv6~w#{EB@m(N|~4a~Dod8VXrH9daLQa$H34z6_jmmjCmdKI;Vst0DsRsegFUf literal 0 HcmV?d00001 diff --git a/resources-icons-280/drawables/drawables.xml b/resources-icons-280/drawables/drawables.xml new file mode 100644 index 0000000..b1703a8 --- /dev/null +++ b/resources-icons-280/drawables/drawables.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/resources-icons-280/drawables/sunrise.png b/resources-icons-280/drawables/sunrise.png new file mode 100644 index 0000000000000000000000000000000000000000..9d5fec6129eca0015bea94f5141003ccd1f2d369 GIT binary patch literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@RheVow*xkcv5bgB`gJ7;to_{{O#e zcaP#MkJBlQPSK`;*=O$>Hkuy#WIoaUwedwUy+wQsV()lFkLIs2$(|Q48PR66SdTeN zI=3ujL8f^{@^lV6)h+98x}R7oy0m24zKtfP6>{H#3YMFgy=DE`9k7*m{!YtXjO$xu VrDQf|FS$kcv5LCwU4nC~`0}KmEV| z%$#LjhI$H?n@ko68aua|1nizG!I-<1N%E$H$63K6vn2j-yh_}6Gv*&h(uCAGjf?6G z7&258Id8C>+7aBar~l7-z6B@DCW~(Iw(- + + + + diff --git a/resources-icons-390/drawables/sunrise.png b/resources-icons-390/drawables/sunrise.png new file mode 100644 index 0000000000000000000000000000000000000000..67f053e1e524cbaf3042eabd3388be939947a279 GIT binary patch literal 636 zcmV-?0)zdDP)P000>X1^@s6#OZ}&0006*Nkl&TG-6|;aA2ue zX(Om0iU?u~MTuad$=&VOV&}1Q>+by!6bFXK&dztLN$si<|+P_QBCrZQ>SbIth#hwX`3FWI-#C#O|gf0X50h4se`Kn<7%W`Ks- zf&~D$3w#4^7jO}K0hk5WnXQMe#Mb@F<&JxoIBF&wRo;HxVGnycJ)eoBF-Z@c^MMlH zk<@Uunr$5Ap`;BKFZh~7I#z(wz&tPkd;+?_BybftLViyklXcn~tI;jI%yE>kOr2CRmNoy4+ zX-n!zdZqks72}0CR(1f}fUm%FtIrcrF zct!SAGGn;Q1^cl&uoYMaewx0vte*joEUTDpQQ|2-n{NQ#0WX0qz#{N5NJ@ZB7G&A9 zK{g@+Fm8dmE@-4LG5v0B+W^|OZZ!Hk|76tHf!)A4`j71|z=Ew!vO&2XI0J0&gH3=I zlIE>I>43t%m$cW4J1Obu0RL3dilpfvX&e{>mMStyfP=t2JIM{;Jg^J61hmM;N?L+n z1=fZcD^X7rGMya~7yJYceKbzplSb1;^_ WF`t^q3}u=C0000P000>X1^@s6#OZ}&0007ANkl83&c{FCqYw+lU?CQ28f&o;?9{^AU?~cMWyC5r z0To2C@Dag)4>TIR$$l0)$DMobuHGvM4h(yDcD^~Y-#qRHN&IWc{=z@+7Z?7gH;H~* zfQ!IrUwBEW=B6RBA?d10xoh_==Mx;ZBW7N6?!s?!`fk^6b@?`7{p$vx1sn&)fB~}w z3jlBv_yk-}a1nbHI1MZ{TL)d4UAL=}3HK~>)C@VQy#12H?)G$gJ~K(nB;9e&J8F1G z(txwI?BFQ(B(1P`!Pg|x@fA1-oCk)0cfcaB0XPfnp_-HXl%4j>YIMzf$1P4pb4_=p zdRWqo>gA)PQ#BahnH@EW90y5*){3JpU|Z6n)3$qd!0>~P`WTO{QytGi(rrnFq#q4$ z(w4L!>4~b@O5=sNRyF|}f%m|))n^2FwbFvjQLYX@ z<*QuK%(O6#@&#xoxYb5~?W&JKJfIhe{t^Gno;io8(Lv4@hjth^N7*EpJ>73b60c*W zHW^)m5DS}tkI4v5#clD77O50Z`mCn$TmMfY4R0d@lG zfiu8m;1FP000>X1^@s6#OZ}&0007PNklN&K(Aq@nd9WBg8CFnx#^TwNkQ?Qdmr6t63^5O4-=hurdUlV z78+9wMKgEq+>gb5&fGI^_kCw1-#VT5JF^AA=@UfIo4O?477{uWkCjFJ`22!Z86pxz#MQ5_#DBL zpCRBLaA<}9itVYX!|Js9Ngc}MgX(~~DO;ecw(uilTq-_;rQ zm3lnnQ|iuw{i?+01Wu@P_Q!&HuFOxF^G1xpn1|KZYDfL0w$!EgUyMM%)g!TO>oOnp zGUD4Y7GpjJ90`&)0)s(nCmLZ9*Z`c5wN~b%)5sjB7HtC8>9+4Ya2I$EOoh$@uot)h zYyp<&wfRIOa3yqVz|%ZPLI?N_90=pbz?;Z)9qYXg`;eN#DhYR(5C@)o1kkF3# zgL*@~Z2#6LRe(CCeh%Z*o>l0C-cR*}I<8Kt+lzrxv{CilUsO?r_v#+AYo!kC2A%;2 zvv&MjNbh{KfE}^kJr?S%$e>l0+8U8M?2NrzWBEO4{zC=*DjK2iQr3Ydbl-_i1Y7H) zpSCF3b;9|_koEjTNe>I9r_QMw{qVrvnOkn*Mnu0D8Jq@o0b|9I`(O^3iSHl43*cth zb#le-%e4|sV4UvdM literal 0 HcmV?d00001 diff --git a/resources-icons-416/drawables/drawables.xml b/resources-icons-416/drawables/drawables.xml new file mode 100644 index 0000000..b1703a8 --- /dev/null +++ b/resources-icons-416/drawables/drawables.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/resources-icons-416/drawables/sunrise.png b/resources-icons-416/drawables/sunrise.png new file mode 100644 index 0000000000000000000000000000000000000000..10d3e223b508ee6058ac8086fe3e3979bac95618 GIT binary patch literal 701 zcmV;u0z&ewgiQgoLoUwncdaZ{ zvK%-7tgfsNC$)}?nzc^I^OkfY{@V+*udS>Aq`5Eafhk~3%D1xLu2}=>VH6kzdJRS| zfDzz%mRwFfN~r1E&&q6tyr{lYFQ`iblAPCt&W8AJRiHbkzE^Js^#4Ozhx0S%=xo-n zy56LorM;t>?PqmamSkULg}PmR69$iCts6RBb&GmX9al$VeI)F!hTWvPuYy?LX-w5^ zR8OmWvb_`P6SbFR|62V!)7h^6qwc5%steYqpsrP~JD+-$p!d{GL;R3e)Xo%ImWKoN zN;sUV1V}-D#P`GSkswWe+Gahg8^ENzHG)j5vo_OI$iEyg=&hKgKY)Y4&dU6q2D%ON zlvBD0&Q#X_1jd0CfLJ#3WtQcwEVH{ARJ{S5Aby%5bxEBGpC8rn7O)%GoMp2rtKv~q zITEsoyCEl{!U9-Jd36Dd0o_7f0UQD*ftfJ)o(0?wECr^Az&Hauro1=;(->>ODo35FmM6=Q8SLzYxzioTf zi6Ntr{GRMk_U8fcf%+$>pgaJFf!n|-;0kaYxJ=p4JHVG3+f?OS;C|CfUB}zhPm$$B zmieKD`balOE1+rOkucb!e$C)H=G<#A$iAZ%i>WN{)3vOkrgyH77kl(uapIc(2U2Ia j$~>B7ZWN##fd$ilDO$?~cRd`400000NkvXXu0mjf$N5M; literal 0 HcmV?d00001 diff --git a/resources-icons-416/drawables/sunset.png b/resources-icons-416/drawables/sunset.png new file mode 100644 index 0000000000000000000000000000000000000000..9a6648d9e015e9baeac95996fdf57e36d2b2921a GIT binary patch literal 733 zcmV<30wVp1P)qK zS}3HGD1yIG41rX!keIvNeJ$QRZ*Ffl$)yMmJl^iS`M#O?&YQQJNMfxdT?HlqGMjq? z{;!$EOf~{%fNeSb@*=5dBn7&P&9@cgiM?kl#203k0HVAuJApc|J;s|`&kA%vF^vKS zfMyBk6VL~IbisLP5~!wY-KCk@d{5F(Np~f!GfMo}VK%$%JgbJThmp|rYh-xq!CHOk_JrQXZS~ko0D`h z$5_{CjM?pxG$!eUTRSglN>bBB|5egOXEP+}s-z=%M@7!M3?vOodaO=q=A6Eiw0D_( z@EK*!AXPXVNP1`+)^iS`(*=8eWqU+Q<35>O&59Z@8Xq(#4M{DPOWo#CEz#(y_0lF_ z1UQ=OzcHX%(obIEMKGSz?+1o~8Xy#k`PoJJ%tiLxQPo^xM2g=#rXEOIv^{4e4X40y zV4sU-tIOiGW!YzQ*{Iq)X&ENKAmQo)*aB1&Nj0Nz4p=n6ALsBCupVeQU8F6F2-nmb zv%?%6BV2u7fbVPhJxeMUrN59{bVi-I=adk64fq9AOdst%*6%Bz)$w8@8paXzi8;Cs zOaV6uw9DZ=7KaUM1^uwpxSZ>+TRmWt3eXR127Z@t9Y2N_fIGkpa344aT(PJp2nQrz z0xbJ^tk1?R$_49-h8v4cCxwgmutmB{(q!?4(joJbzDXLb5RUo_LN9r~V=ZH(?|>V? ztl3Tjr-4hrAy+TlbNs#N2U@E+`YG)L(-XL2;FSPV+I4~UO_7x%I;Hg&(fUF@x~RiI P00000NkvXXu0mjf-%&|O+-Xc@dNxM*qO%0V55Rs2#Sb}jiwR7!haxY5m2F5 z28*aaz)0d(V+vzp?!CLO#hH^k+3ejLH8?Qr$C;UT&dhseH<85ulJp<_P64~@K3NU0 z6sUDry9FGxdvBAJ`P5ecmOIeg0>yV5O6(IrKvrB>$<7`ECk-IAKy}j>z-O0q1nLEj zP~4rQPFl0;0|hxJDUsAu;Zv8iPSS*=NwZDkdQ}XOn4GursMWvMu`x9p>{-ANu+Mtl za+((j63@~oaNL}yfh)im@D7+W+fBe_;6MqfwgI!iO`wNx1RfQ^WD66(c5~bdj2qK> zfVIF^;1h7$p6}QigtL|bKg?&q5}qm}gFi1wdR)RhFBc@8F_JW_cRR|sP|xdXj6+$#8(`RazLUVfrJo&FzH63Yt70eJGCyALuK~CHaFOt9wj0>o zrL+w~3qIQOEbz)I^?~;P$f5*Fwx@lRK46Oj^Pn-nFT$X0vRsw{c`yh)ixVL)8dgZ0 cFiAK6-(dHPMS(wsrvLx|07*qoM6N<$g2(V)Bme*a literal 0 HcmV?d00001 diff --git a/resources-icons-454/drawables/drawables.xml b/resources-icons-454/drawables/drawables.xml new file mode 100644 index 0000000..b1703a8 --- /dev/null +++ b/resources-icons-454/drawables/drawables.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/resources-icons-454/drawables/sunrise.png b/resources-icons-454/drawables/sunrise.png new file mode 100644 index 0000000000000000000000000000000000000000..ba3a9a8505e5ea84b508c47e6a7e9ee41dd60aea GIT binary patch literal 767 zcmVayu+Nl&^=$AqZ?@SGze}0E&#_#izUkNJT%!mPLDF*W56X~d(*`v1+3V5Qz_gwTFLR1 z4TmLF?K^U3NSbgu9%S@47!3kvjd|JD15PM%{8W%j2fEt!GXLLV?T`cKPcD?LaeQabQMCCe~`eiN`@;amo)G($|<*CW6i z)3;1x_1A+TPpFf&N$A%rs~E)PT*e=h4h%Wn0Fn1}$kutMY^!;>J_r;Tg|trv>;~rC z*^pgiA$ZycOaZgN3`sTCjJe;ujLnl)7?VT;V5hBHfET8B7I*~=AZa|O8b___23)^& z0>f4`dvneXN0Ms5Wy{M);4SdfqEH780VjdpobWCIzl>ftnK|ITqwNQd*x58N<#XyG zRBq%#)(NzdFBKVW1yvefo)XDq>gY!OB(Fg)ut-|k9)gh>;0cKb;Wb$S4jTFvEVB0q zN#{E(l6z_#ZId0!pQ-@QfG>tcw~R=7^%`&nSVuC*$ANReCtw2jK=Xf7*vG(o;B(RJ zEy6xYvv%V!bAKpljkfiKSD>QwaW2BD2@OhGG=twHjTybC4IL$A27WtGwlEC>CxFMm xJ4bH|x@nm(G>Z1CLf+rtY7iz*FxHVlfWNB9oZ%rX9?1Xz002ovPDHLkV1gD#P*(r| literal 0 HcmV?d00001 diff --git a/resources-icons-454/drawables/sunset.png b/resources-icons-454/drawables/sunset.png new file mode 100644 index 0000000000000000000000000000000000000000..c772780875351d37d9d27b6518d29cf805c71a8a GIT binary patch literal 783 zcmV+q1MvKbP)U^1r>rQqKzb=Q6njAENtvV)K0V#3qQajsRR+hNO}?EKsHiuxDL1goFFBO%jrBZ+Xn%Ta=(XxE5O#KgGutEX7e4Ta^Kb} zfnL?dfTS+_?SefdT@5hCbNCsj-r%e$FWP)CFmi!@et6LBl735CGW$z8{7g+FOU*-I zBXHB!8ziLgbsho+tqcpmB=FMqt3WqUH{DynZNp7#TySEa%AJz-ORC#|Aw}Z_3NPB<@Ua6S3n<<&K0n6$XM4G z^xJA=z(}*NVDG4t)BvtoT|NVEfv1**7&r`^1lAO!cOLj<>#^BP1CN5W1Hg#wO#%~P zO*gX1J^0}cUmlsCTvHUXo+ z9$=j01vvv;1ik~8fe*R*`Z{`ykH8#~&abTX{>nXNUyjjL+MjZgdhNtz_iA|Bcfd0{ zwI^Xra>TOuZjaHao!qd(FRuB5IAGt1yi+#3);(C>E4h$V!w__Ux?GWTj>^C1scXI0X-1pvd&i|bAo^$R=B=Nr~*M@9j-$7t=>a4lo z96U`3##K`11)vPv1%3j@qqDTU(t@o>2ACH1eRmy$Vz7)?&BE)U+DPz1sdL}|1^$o? zt@C$eG)rom;q0)R{7P%w&elh#9$7ps~k?B^|PTzobz~6Ozi3s**lSx+Q6~@m!F!!}dw6b1tAU zFp>^R`k}`3M$%x!KMQcapan^Nk|s_0l%$Gz>1*2VUP)SOG8xcD+3U6Gt4OH7^S~JZ(?CCP%J_;YT}dNQSLSQV1P1Kh>oRZ4`G|h+x8Kt#T}pSPoL%e$M$DTc za2vP?^a0y|??4Gy3Y-K^M8fFbkh81U7MSOP2uJ^^2V z2eu!!NR$bk?j^9rjPw@y78q-mJl*!)5G79|x}s38A1#@xl5RHA9sfuann9PO`<9vC zB$Z5Y$<91uD+)F089QupPJ2~rAcbfpF{rn-Q4^{}3aTwUb;HIbeNbo;-WD6yX~Dj` z4XmWu_1B7=e>76wkp}aXNXlEXYyutwJ(h*@ec)w@c-4~W0B{F5Yr1OBoT2wfdSOtpOunTx? zda5;!P`tg8o-bg=PDwhN&RRuv>S0(693eF50bo0@%p=mk%iq9z;3;7u1egTI%|m~+ zGU0Wl>HpMUlxF1PXFaM57=t>nXIk9^XrkQnz-8k{JwyKhN4?MI>xz&G00000NkvXX Hu0mjfqyUXT literal 0 HcmV?d00001 diff --git a/resources/drawables/drawables.xml b/resources-launcher-40/drawables/drawables.xml similarity index 100% rename from resources/drawables/drawables.xml rename to resources-launcher-40/drawables/drawables.xml diff --git a/resources-launcher-40/drawables/launcher_icon.png b/resources-launcher-40/drawables/launcher_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..9b00253a87121fbef98e9d520418c0fda7e16a64 GIT binary patch literal 2510 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 YU+)~o+K|2|E&u=k07*qoM6N<$g5md}asU7T literal 0 HcmV?d00001 diff --git a/resources-launcher-56/drawables/drawables.xml b/resources-launcher-56/drawables/drawables.xml new file mode 100644 index 0000000..579343d --- /dev/null +++ b/resources-launcher-56/drawables/drawables.xml @@ -0,0 +1,3 @@ + + + diff --git a/resources-launcher-56/drawables/launcher_icon.png b/resources-launcher-56/drawables/launcher_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..71f9b1847d585e3c2757cbf630aef2323305a0a7 GIT binary patch literal 3962 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 UFhu?F*Z=?k07*qoM6N<$g8xTaDF6Tf literal 0 HcmV?d00001 diff --git a/resources-launcher-60/drawables/drawables.xml b/resources-launcher-60/drawables/drawables.xml new file mode 100644 index 0000000..579343d --- /dev/null +++ b/resources-launcher-60/drawables/drawables.xml @@ -0,0 +1,3 @@ + + + diff --git a/resources-launcher-60/drawables/launcher_icon.png b/resources-launcher-60/drawables/launcher_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b3f858336d84c3022bfd4624cf3889cf1454e933 GIT binary patch literal 4249 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 literal 0 HcmV?d00001 diff --git a/resources-launcher-65/drawables/drawables.xml b/resources-launcher-65/drawables/drawables.xml new file mode 100644 index 0000000..579343d --- /dev/null +++ b/resources-launcher-65/drawables/drawables.xml @@ -0,0 +1,3 @@ + + + diff --git a/resources-launcher-65/drawables/launcher_icon.png b/resources-launcher-65/drawables/launcher_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b8bbe02ed7e8a95c4174e675fd27a8c0edbdb061 GIT binary patch literal 4841 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 P00000NkvXXu0mjfl2Rpz literal 0 HcmV?d00001 diff --git a/resources-launcher-70/drawables/drawables.xml b/resources-launcher-70/drawables/drawables.xml new file mode 100644 index 0000000..579343d --- /dev/null +++ b/resources-launcher-70/drawables/drawables.xml @@ -0,0 +1,3 @@ + + + diff --git a/resources-launcher-70/drawables/launcher_icon.png b/resources-launcher-70/drawables/launcher_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..15ca2ff4e214ee297e1e5a5bcb8a6b9e312ccd86 GIT binary patch literal 5264 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 4 3 - 6 - 8 + + 712 + 639 3 - 2 + 1 0 + 0 + 0 + + + true true true diff --git a/resources/settings/settings.xml b/resources/settings/settings.xml index 6982840..464ed79 100644 --- a/resources/settings/settings.xml +++ b/resources/settings/settings.xml @@ -1,4 +1,5 @@ + @Strings.ThemeEmber @@ -11,6 +12,326 @@ + + + @Strings.FldOff + @Strings.FldTime + @Strings.FldUtcTime + @Strings.FldAltTime1 + @Strings.FldAltTime2 + @Strings.FldDayMonthDay + @Strings.FldDayDate + @Strings.FldMonthDay + @Strings.FldDayOfMonth + @Strings.FldDayShort + @Strings.FldDayFull + @Strings.FldMonthName + @Strings.FldMonthNum + @Strings.FldMeridiem + @Strings.FldWeekIso + @Strings.FldWeekCal + @Strings.FldSteps + @Strings.FldStepsRound + @Strings.FldStepsToGo + @Strings.FldCalories + @Strings.FldActiveCal + @Strings.FldActiveMin + @Strings.FldActiveMod + @Strings.FldActiveVig + @Strings.FldActiveWeek + @Strings.FldDistance + @Strings.FldFloorsUp + @Strings.FldFloorsDown + @Strings.FldMetersUp + @Strings.FldPushDist + @Strings.FldPushes + @Strings.FldHeartRate + @Strings.FldRestingHr + @Strings.FldStress + @Strings.FldPulseOx + @Strings.FldRespiration + @Strings.FldBodyBattery + @Strings.FldMoveBar + @Strings.FldMoveBarRev + @Strings.FldWeight + @Strings.FldBmi + @Strings.FldRecovery + @Strings.FldVo2Run + @Strings.FldVo2Bike + @Strings.FldBattery + @Strings.FldBatteryDays + @Strings.FldBatteryBoth + @Strings.FldAlarms + @Strings.FldNotifications + @Strings.FldDoNotDisturb + @Strings.FldBluetooth + @Strings.FldSolar + @Strings.FldAltitude + @Strings.FldSeaPressure + @Strings.FldAmbPressure + @Strings.FldSunrise + @Strings.FldSunset + @Strings.FldNextSun + @Strings.FldUntilSun + @Strings.FldMoonAge + @Strings.FldMoonLit + @Strings.FldTemp + @Strings.FldTempHiLo + @Strings.FldFeelsLike + @Strings.FldTempHigh + @Strings.FldTempLow + @Strings.FldHumidity + @Strings.FldPrecip + @Strings.FldWindSpeed + @Strings.FldWindBearing + @Strings.FldWindDir + @Strings.FldWeatherTime + @Strings.FldCustom1 + @Strings.FldCustom2 + @Strings.FldCustom3 + + + + + + @Strings.FldOff + @Strings.FldTime + @Strings.FldUtcTime + @Strings.FldAltTime1 + @Strings.FldAltTime2 + @Strings.FldDayMonthDay + @Strings.FldDayDate + @Strings.FldMonthDay + @Strings.FldDayOfMonth + @Strings.FldDayShort + @Strings.FldDayFull + @Strings.FldMonthName + @Strings.FldMonthNum + @Strings.FldMeridiem + @Strings.FldWeekIso + @Strings.FldWeekCal + @Strings.FldSteps + @Strings.FldStepsRound + @Strings.FldStepsToGo + @Strings.FldCalories + @Strings.FldActiveCal + @Strings.FldActiveMin + @Strings.FldActiveMod + @Strings.FldActiveVig + @Strings.FldActiveWeek + @Strings.FldDistance + @Strings.FldFloorsUp + @Strings.FldFloorsDown + @Strings.FldMetersUp + @Strings.FldPushDist + @Strings.FldPushes + @Strings.FldHeartRate + @Strings.FldRestingHr + @Strings.FldStress + @Strings.FldPulseOx + @Strings.FldRespiration + @Strings.FldBodyBattery + @Strings.FldMoveBar + @Strings.FldMoveBarRev + @Strings.FldWeight + @Strings.FldBmi + @Strings.FldRecovery + @Strings.FldVo2Run + @Strings.FldVo2Bike + @Strings.FldBattery + @Strings.FldBatteryDays + @Strings.FldBatteryBoth + @Strings.FldAlarms + @Strings.FldNotifications + @Strings.FldDoNotDisturb + @Strings.FldBluetooth + @Strings.FldSolar + @Strings.FldAltitude + @Strings.FldSeaPressure + @Strings.FldAmbPressure + @Strings.FldSunrise + @Strings.FldSunset + @Strings.FldNextSun + @Strings.FldUntilSun + @Strings.FldMoonAge + @Strings.FldMoonLit + @Strings.FldTemp + @Strings.FldTempHiLo + @Strings.FldFeelsLike + @Strings.FldTempHigh + @Strings.FldTempLow + @Strings.FldHumidity + @Strings.FldPrecip + @Strings.FldWindSpeed + @Strings.FldWindBearing + @Strings.FldWindDir + @Strings.FldWeatherTime + @Strings.FldCustom1 + @Strings.FldCustom2 + @Strings.FldCustom3 + + + + + + @Strings.FldOff + @Strings.FldTime + @Strings.FldUtcTime + @Strings.FldAltTime1 + @Strings.FldAltTime2 + @Strings.FldDayMonthDay + @Strings.FldDayDate + @Strings.FldMonthDay + @Strings.FldDayOfMonth + @Strings.FldDayShort + @Strings.FldDayFull + @Strings.FldMonthName + @Strings.FldMonthNum + @Strings.FldMeridiem + @Strings.FldWeekIso + @Strings.FldWeekCal + @Strings.FldSteps + @Strings.FldStepsRound + @Strings.FldStepsToGo + @Strings.FldCalories + @Strings.FldActiveCal + @Strings.FldActiveMin + @Strings.FldActiveMod + @Strings.FldActiveVig + @Strings.FldActiveWeek + @Strings.FldDistance + @Strings.FldFloorsUp + @Strings.FldFloorsDown + @Strings.FldMetersUp + @Strings.FldPushDist + @Strings.FldPushes + @Strings.FldHeartRate + @Strings.FldRestingHr + @Strings.FldStress + @Strings.FldPulseOx + @Strings.FldRespiration + @Strings.FldBodyBattery + @Strings.FldMoveBar + @Strings.FldMoveBarRev + @Strings.FldWeight + @Strings.FldBmi + @Strings.FldRecovery + @Strings.FldVo2Run + @Strings.FldVo2Bike + @Strings.FldBattery + @Strings.FldBatteryDays + @Strings.FldBatteryBoth + @Strings.FldAlarms + @Strings.FldNotifications + @Strings.FldDoNotDisturb + @Strings.FldBluetooth + @Strings.FldSolar + @Strings.FldAltitude + @Strings.FldSeaPressure + @Strings.FldAmbPressure + @Strings.FldSunrise + @Strings.FldSunset + @Strings.FldNextSun + @Strings.FldUntilSun + @Strings.FldMoonAge + @Strings.FldMoonLit + @Strings.FldTemp + @Strings.FldTempHiLo + @Strings.FldFeelsLike + @Strings.FldTempHigh + @Strings.FldTempLow + @Strings.FldHumidity + @Strings.FldPrecip + @Strings.FldWindSpeed + @Strings.FldWindBearing + @Strings.FldWindDir + @Strings.FldWeatherTime + @Strings.FldCustom1 + @Strings.FldCustom2 + @Strings.FldCustom3 + + + + + + @Strings.FldOff + @Strings.FldTime + @Strings.FldUtcTime + @Strings.FldAltTime1 + @Strings.FldAltTime2 + @Strings.FldDayMonthDay + @Strings.FldDayDate + @Strings.FldMonthDay + @Strings.FldDayOfMonth + @Strings.FldDayShort + @Strings.FldDayFull + @Strings.FldMonthName + @Strings.FldMonthNum + @Strings.FldMeridiem + @Strings.FldWeekIso + @Strings.FldWeekCal + @Strings.FldSteps + @Strings.FldStepsRound + @Strings.FldStepsToGo + @Strings.FldCalories + @Strings.FldActiveCal + @Strings.FldActiveMin + @Strings.FldActiveMod + @Strings.FldActiveVig + @Strings.FldActiveWeek + @Strings.FldDistance + @Strings.FldFloorsUp + @Strings.FldFloorsDown + @Strings.FldMetersUp + @Strings.FldPushDist + @Strings.FldPushes + @Strings.FldHeartRate + @Strings.FldRestingHr + @Strings.FldStress + @Strings.FldPulseOx + @Strings.FldRespiration + @Strings.FldBodyBattery + @Strings.FldMoveBar + @Strings.FldMoveBarRev + @Strings.FldWeight + @Strings.FldBmi + @Strings.FldRecovery + @Strings.FldVo2Run + @Strings.FldVo2Bike + @Strings.FldBattery + @Strings.FldBatteryDays + @Strings.FldBatteryBoth + @Strings.FldAlarms + @Strings.FldNotifications + @Strings.FldDoNotDisturb + @Strings.FldBluetooth + @Strings.FldSolar + @Strings.FldAltitude + @Strings.FldSeaPressure + @Strings.FldAmbPressure + @Strings.FldSunrise + @Strings.FldSunset + @Strings.FldNextSun + @Strings.FldUntilSun + @Strings.FldMoonAge + @Strings.FldMoonLit + @Strings.FldTemp + @Strings.FldTempHiLo + @Strings.FldFeelsLike + @Strings.FldTempHigh + @Strings.FldTempLow + @Strings.FldHumidity + @Strings.FldPrecip + @Strings.FldWindSpeed + @Strings.FldWindBearing + @Strings.FldWindDir + @Strings.FldWeatherTime + @Strings.FldCustom1 + @Strings.FldCustom2 + @Strings.FldCustom3 + + + @Strings.MetricSteps @@ -18,6 +339,8 @@ @Strings.MetricDistance @Strings.MetricFloors @Strings.MetricMoveBar + @Strings.MetricActiveMin + @Strings.MetricBodyBattery @@ -28,6 +351,8 @@ @Strings.MetricDistance @Strings.MetricFloors @Strings.MetricMoveBar + @Strings.MetricActiveMin + @Strings.MetricBodyBattery @@ -38,6 +363,8 @@ @Strings.MetricDistance @Strings.MetricFloors @Strings.MetricMoveBar + @Strings.MetricActiveMin + @Strings.MetricBodyBattery @@ -48,68 +375,11 @@ @Strings.MetricDistance @Strings.MetricFloors @Strings.MetricMoveBar + @Strings.MetricActiveMin + @Strings.MetricBodyBattery - - - @Strings.FieldWeather - @Strings.FieldHiLo - @Strings.FieldSunrise - @Strings.FieldSunset - @Strings.FieldCalories - @Strings.FieldSteps - @Strings.FieldDistance - @Strings.FieldFloors - @Strings.FieldBattery - @Strings.FieldHeartRate - - - - - - @Strings.FieldWeather - @Strings.FieldHiLo - @Strings.FieldSunrise - @Strings.FieldSunset - @Strings.FieldCalories - @Strings.FieldSteps - @Strings.FieldDistance - @Strings.FieldFloors - @Strings.FieldBattery - @Strings.FieldHeartRate - - - - - - @Strings.FieldWeather - @Strings.FieldHiLo - @Strings.FieldSunrise - @Strings.FieldSunset - @Strings.FieldCalories - @Strings.FieldSteps - @Strings.FieldDistance - @Strings.FieldFloors - @Strings.FieldBattery - @Strings.FieldHeartRate - - - - - - @Strings.FieldWeather - @Strings.FieldHiLo - @Strings.FieldSunrise - @Strings.FieldSunset - @Strings.FieldCalories - @Strings.FieldSteps - @Strings.FieldDistance - @Strings.FieldFloors - @Strings.FieldBattery - @Strings.FieldHeartRate - - @@ -119,6 +389,26 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/resources/strings/fields.xml b/resources/strings/fields.xml new file mode 100644 index 0000000..99e8030 --- /dev/null +++ b/resources/strings/fields.xml @@ -0,0 +1,89 @@ + + + Off + Time + UTC Time + Alternate Time 1 + Alternate Time 2 + Day Month Day + Day Date + Month Day + Day of Month + Day (Tue) + Full Day (Tuesday) + Month (Jan) + Month (6) + AM/PM + Week Number (ISO) + Week Number + Steps + Steps Rounded + Steps to Go + Calories + Active Calories + Active Minutes + Active Min (Moderate) + Active Min (Vigorous) + Active Minutes (Week) + Distance + Floors Climbed + Floors Descended + Distance Climbed + Push Distance + Pushes + Heart Rate + Resting Heart Rate + Stress Score + Pulse Ox + Respiration Rate + Body Battery + Move Bar + Move Bar Reversed + Weight + BMI + Time to Recovery + VO2 Max (Run) + VO2 Max (Bike) + Battery + Battery in Days + Battery / Days + Alarms + Notifications + Do Not Disturb + Bluetooth + Solar Intensity + Altitude + Sea Level Pressure + Ambient Pressure + Sunrise + Sunset + Next Sun Event + Time Until Sun Event + Moon Age + Moon Illumination + Temperature + Temperature High/Low + Feels Like + High Temperature + Low Temperature + Humidity + Precipitation % + Wind Speed + Wind Bearing + Wind Direction + Weather Update Time + Custom Text 1 + Custom Text 2 + Custom Text 3 + + + ,TIME,UTC,TZ1,TZ2,DATE,DATE,DATE,DAY,DAY,DAY,MON,MON,,WEEK,WEEK,STEP,STEP,TO GO,KCAL,ACAL,MIN,MOD,VIG,WEEK,DST,FLR,DESC,ASC,PUSH,PUSH,HR,RHR,STRS,SPO2,RESP,BODY,MOVE,MOVE,WT,BMI,RCVR,VO2,VO2,BATT,DAYS,BATT,ALRM,MSG,DND,BT,SOLR,ALT,hPa,hPa,RISE,SET,SUN,SUN,MOON,MOON,TEMP,HI/LO,FEEL,HIGH,LOW,HUM,RAIN,WIND,WIND,WIND,WX,,, + + Steps + Calories + Distance + Floors + Move Bar + Active Minutes + Body Battery + diff --git a/resources/strings/strings.xml b/resources/strings/strings.xml index ae399b9..babfaf1 100644 --- a/resources/strings/strings.xml +++ b/resources/strings/strings.xml @@ -6,14 +6,24 @@ Ring · Top-Left Ring · Bottom-Right Ring · Bottom-Left - Top-Left Complication - Top-Right Complication + Top-Left Field + Top-Right Field Bottom-Left Field Bottom-Right Field + Temperature Unit + Alternate Time 1 (minutes from local) + Alternate Time 2 (minutes from local) + Custom Text 1 + Custom Text 2 + Custom Text 3 Show Top Row Show Date Band Show Bottom Row + Follow watch + Celsius (°C) + Fahrenheit (°F) + 1 · Ember 2 · Aurora 3 · Brass @@ -22,32 +32,9 @@ 6 · Acid 7 · Kelp - Steps - Calories - Distance - Floors - Move Bar - - Temperature - Hi / Lo Temp - Sunrise - Sunset - Calories - Steps - Distance - Floors - Battery - Heart Rate - SUN,MON,TUE,WED,THU,FRI,SAT JAN,FEB,MAR,APR,MAY,JUN,JUL,AUG,SEP,OCT,NOV,DEC $1$ $2$ AM,PM - TEMP,KCAL,STEP,DST,FLR,BATT,RISE,SET,HI/LO,HR - - Temperature Unit - Follow watch - Celsius (°C) - Fahrenheit (°F) diff --git a/source/Fenix8V3View.mc b/source/Fenix8V3View.mc index be4633d..a2d6500 100644 --- a/source/Fenix8V3View.mc +++ b/source/Fenix8V3View.mc @@ -11,6 +11,8 @@ import Toybox.Time; import Toybox.Time.Gregorian; import Toybox.WatchUi; import Themes; +import Fields; +import Toybox.SensorHistory; // Every literal below is a coordinate on the 500x500 design canvas, measured // from design/watchface-*.svg. Nothing here is eyeballed: ring geometry comes @@ -47,7 +49,7 @@ class Fenix8V3View extends WatchUi.WatchFace { const LEFT_X = 157.00; // top complications, centred const RIGHT_X = 343.70; - const ICON_CY = 90.00; + const ICON_CY = 89.50; const VALUE_CY = 131.06; const TIME_CY = 221.10; @@ -89,22 +91,37 @@ class Fenix8V3View extends WatchUi.WatchFace { private var mFontBand = Graphics.FONT_SMALL; private var mFontComp = Graphics.FONT_MEDIUM; private var mFontTime = Graphics.FONT_NUMBER_HOT; - private var mDow = null; - private var mMon = null; - private var mLabels = null; - private var mMeridiem = null; - private var mDateFmt = " "; + // Always-on display: AMOLED devices must cut lit pixels hard while + // asleep, and shift what is left so nothing burns in. + private var mSleeping = false; + private var mBurnIn = false; + private var mIconSunrise = null; + private var mIconSunset = null; + private var mIconWeather = null; function initialize() { WatchFace.initialize(); } + function onEnterSleep() as Void { + mSleeping = true; + WatchUi.requestUpdate(); + } + + function onExitSleep() as Void { + mSleeping = false; + WatchUi.requestUpdate(); + } + function onLayout(dc as Dc) as Void { mW = dc.getWidth(); mH = dc.getHeight(); mS = mW / 500.0; mCx = mW / 2; mCy = mH / 2; + var ds = System.getDeviceSettings(); + mBurnIn = (ds != null) && (ds has :requiresBurnInProtection) + && ds.requiresBurnInProtection; var text = [Graphics.FONT_XTINY, Graphics.FONT_TINY, Graphics.FONT_SMALL, Graphics.FONT_MEDIUM, Graphics.FONT_LARGE]; var nums = [Graphics.FONT_NUMBER_MILD, Graphics.FONT_NUMBER_MEDIUM, @@ -115,28 +132,11 @@ class Fenix8V3View extends WatchUi.WatchFace { loadStrings(); } - // Every piece of on-face wording lives in resources so resources-chn can - // replace it. loadResource is not cheap, so pull it all once per layout. function loadStrings() as Void { - mDow = splitCsv(WatchUi.loadResource(Rez.Strings.DowNames) as String); - mMon = splitCsv(WatchUi.loadResource(Rez.Strings.MonNames) as String); - mLabels = splitCsv(WatchUi.loadResource(Rez.Strings.FieldLabels) as String); - mMeridiem = splitCsv(WatchUi.loadResource(Rez.Strings.Meridiem) as String); - mDateFmt = WatchUi.loadResource(Rez.Strings.DateFormat) as String; - } - - // Monkey C has no String.split. - function splitCsv(str as String) as Array { - var out = [] as Array; - var rest = str; - var cut = rest.find(","); - while (cut != null) { - out.add(rest.substring(0, cut) as String); - rest = rest.substring(cut + 1, rest.length()) as String; - cut = rest.find(","); - } - out.add(rest); - return out; + Fields.loadStrings(); + mIconSunrise = WatchUi.loadResource(Rez.Drawables.IconSunrise); + mIconSunset = WatchUi.loadResource(Rez.Drawables.IconSunset); + mIconWeather = WatchUi.loadResource(Rez.Drawables.IconWeather); } // Connect IQ exposes ascent and descent but not cap height, and the ascent @@ -254,6 +254,15 @@ class Fenix8V3View extends WatchUi.WatchFace { ? info.floorsClimbedGoal.toFloat() : 10.0f; p = info.floorsClimbed.toFloat() / goal; } + } else if (idx == 5) { // Active minutes vs the weekly goal + if (info.activeMinutesWeek != null && info.activeMinutesWeekGoal != null + && info.activeMinutesWeekGoal > 0) { + p = info.activeMinutesWeek.total.toFloat() + / info.activeMinutesWeekGoal.toFloat(); + } + } else if (idx == 6) { // Body battery is already 0..100 + var bb = Fields.latest(SensorHistory.getBodyBatteryHistory({:period => 1})); + if (bb != null) { p = bb.toFloat() / 100.0; } } else if (idx == 4) { // Move bar: an integer level, not a ratio if (info.moveBarLevel != null) { var span = (ActivityMonitor.MOVE_BAR_LEVEL_MAX @@ -268,103 +277,6 @@ class Fenix8V3View extends WatchUi.WatchFace { return p; } - // ------------------------------------------------------------ data bits - function distanceString(info as ActivityMonitor.Info, ds as System.DeviceSettings) as String { - if (info == null || info.distance == null) { return "0.0"; } - var km = info.distance.toFloat() / 100000.0; - if (ds != null && ds.distanceUnits == System.UNIT_STATUTE) { km = km * 0.621371; } - return km.format("%.1f"); - } - - // TempUnit: 0 follow the watch, 1 force Celsius, 2 force Fahrenheit. - function tempString(c as Numeric?, ds as System.DeviceSettings) as String { - if (c == null) { return "--"; } - var t = c.toFloat(); - var mode = getSetting("TempUnit", 0); - var fahrenheit = (mode == 2) - || (mode == 0 && ds != null && ds.temperatureUnits == System.UNIT_STATUTE); - if (fahrenheit) { t = t * 9.0 / 5.0 + 32.0; } - return t.format("%d") + "°"; - } - - function clockString(m as Time.Moment?, ds as System.DeviceSettings) as String { - if (m == null) { return "--:--"; } - var g = Gregorian.info(m, Time.FORMAT_SHORT); - var h = g.hour; - if (ds == null || !ds.is24Hour) { - if (h == 0) { h = 12; } else if (h > 12) { h = h - 12; } - } - return h.format("%d") + ":" + g.min.format("%02d"); - } - - function here(weather as Weather.CurrentConditions?) as Position.Location? { - if (weather != null && weather.observationLocationPosition != null) { - return weather.observationLocationPosition; - } - var act = Activity.getActivityInfo(); - if (act != null && act.currentLocation != null) { return act.currentLocation; } - return null; - } - - // value string for a complication slot - function complicationValue(typeIdx as Number, info as ActivityMonitor.Info, - weather as Weather.CurrentConditions?, stats as System.Stats, - ds as System.DeviceSettings) as String { - if (typeIdx == 1) { // Calories - return info != null && info.calories != null ? info.calories.format("%d") : "0"; - } else if (typeIdx == 2) { // Steps - return info != null && info.steps != null ? info.steps.format("%d") : "0"; - } else if (typeIdx == 3) { // Distance - return distanceString(info, ds); - } else if (typeIdx == 4) { // Floors - return info != null && info.floorsClimbed != null - ? info.floorsClimbed.format("%d") : "0"; - } else if (typeIdx == 5) { // Battery - var pct = 0; - if (stats != null && stats.battery != null) { pct = (stats.battery * 100.0).toNumber(); } - return pct.format("%d") + "%"; - } else if (typeIdx == 6 || typeIdx == 7) { // Sunrise / sunset - var loc = here(weather); - if (loc == null) { return "--:--"; } - var m = typeIdx == 6 ? Weather.getSunrise(loc, Time.now()) - : Weather.getSunset(loc, Time.now()); - return clockString(m, ds); - } else if (typeIdx == 9) { // Heart rate - var act = Activity.getActivityInfo(); - if (act != null && act.currentHeartRate != null) { - return act.currentHeartRate.format("%d"); - } - var hist = ActivityMonitor.getHeartRateHistory(1, true); - if (hist != null) { - var sample = hist.next(); - if (sample != null && sample.heartRate != null - && sample.heartRate != ActivityMonitor.INVALID_HR_SAMPLE) { - return sample.heartRate.format("%d"); - } - } - return "--"; - } else if (typeIdx == 8) { // Forecast high / low - var fc = Weather.getDailyForecast(); - if (fc != null && fc.size() > 0) { - return tempString(fc[0].highTemperature, ds) + "/" - + tempString(fc[0].lowTemperature, ds); - } - return "--/--"; - } - // 0: current temperature - if (weather != null && weather.temperature != null) { - return tempString(weather.temperature, ds); - } - return "--"; - } - - // Short caption under a bottom-row value. Indexed like the field types, so - // the label always follows whatever the slot is set to. - function fieldLabel(typeIdx as Number) as String { - if (mLabels == null || typeIdx < 0 || typeIdx >= mLabels.size()) { return ""; } - return mLabels[typeIdx]; - } - // ----------------------------------------------------------------- ring function tick(dc as Dc, ang as Float, hw as Float) as Void { var a0 = ang - hw; @@ -441,79 +353,19 @@ class Fenix8V3View extends WatchUi.WatchFace { } } - // Filled half-ellipse, flat side down. The comp's dome is 14.90 wide but - // 8.93 tall, so it is not a plain semicircle. - function dome(dc as Dc, cx as Numeric, baseY as Numeric, - rx as Numeric, ry as Numeric) as Void { - var pts = []; - for (var i = 0; i <= 12; i++) { - var rad = Math.toRadians(180.0 - 15.0 * i); - pts.add([Math.round(px(cx) + Math.cos(rad) * px(rx)).toNumber(), - Math.round(px(baseY) - Math.sin(rad) * px(ry)).toNumber()]); - } - dc.fillPolygon(pts); - } - function stub(dc as Dc, x1 as Numeric, y1 as Numeric, x2 as Numeric, y2 as Numeric) as Void { dc.drawLine(px(x1), px(y1), px(x2), px(y2)); } - // Sun over a horizon bar with a chevron. Every ray in the comp is a short - // stub roughly as long as the pen is wide -- drawing them longer is what - // made this icon read taller than the weather one. - // dir = -1 flips the chevron up, which is what the sunset slot uses. - function iconSun(dc as Dc, cx as Numeric, cy as Numeric, scale as Float, - col as Number, dir as Number) as Void { - var k = scale; - var ox = cx - 156.32 * k; // design-space offset of this icon - var oy = cy - 90.34 * k; - dc.setColor(col, Graphics.COLOR_TRANSPARENT); - dome(dc, ox + 156.39 * k, oy + 94.02 * k, 7.45 * k, 8.93 * k); - dc.setPenWidth(maxNum(2, px(2.96 * k))); - stub(dc, ox + 156.39 * k, oy + 79.4 * k, ox + 156.39 * k, oy + 81.1 * k); - stub(dc, ox + 148.2 * k, oy + 83.3 * k, ox + 146.5 * k, oy + 84.5 * k); - stub(dc, ox + 164.6 * k, oy + 84.5 * k, ox + 166.3 * k, oy + 83.3 * k); - stub(dc, ox + 142.6 * k, oy + 92.5 * k, ox + 144.7 * k, oy + 92.5 * k); - stub(dc, ox + 168.0 * k, oy + 92.5 * k, ox + 170.1 * k, oy + 92.5 * k); - dc.setPenWidth(maxNum(2, px(2.6 * k))); - var by = oy + 98.45 * k; - stub(dc, ox + 142.3 * k, by, ox + 170.3 * k, by); - stub(dc, ox + 152.6 * k, by, ox + 156.3 * k, by + dir * 3.05 * k); - stub(dc, ox + 156.3 * k, by + dir * 3.05 * k, ox + 160.0 * k, by); - } - - // Sun peeking out from behind a cloud. The comp keeps a dark notch where - // the cloud crosses the sun; without it the two shapes merge into one blob - // and the icon reads much heavier than the sunrise one next to it. So the - // cloud is stamped twice: once inflated in black to cut the notch, then at - // true size in the accent colour. - function cloudBody(dc as Dc, ox as Numeric, oy as Numeric, k as Float, - grow as Float) as Void { - dc.fillCircle(px(ox + 336.6 * k), px(oy + 94.4 * k), px(8.7 * k + grow)); - dc.fillCircle(px(ox + 346.4 * k), px(oy + 96.9 * k), px(6.3 * k + grow)); - var g = px(grow); - dc.fillRoundedRectangle(px(ox + 328.0 * k) - g, px(oy + 95.5 * k) - g, - px(24.6 * k) + 2 * g, px(7.75 * k) + g, - px(3.4 * k)); - } - - function iconCloud(dc as Dc, cx as Numeric, cy as Numeric, scale as Float, - col as Number) as Void { - var k = scale; - var ox = cx - 343.55 * k; - var oy = cy - 89.25 * k; - dc.setColor(col, Graphics.COLOR_TRANSPARENT); - dc.fillCircle(px(ox + 347.0 * k), px(oy + 88.9 * k), px(7.8 * k)); - dc.setPenWidth(maxNum(2, px(2.3 * k))); - stub(dc, ox + 346.2 * k, oy + 76.0 * k, ox + 346.2 * k, oy + 78.7 * k); - stub(dc, ox + 354.9 * k, oy + 87.7 * k, ox + 357.5 * k, oy + 87.7 * k); - dc.setPenWidth(maxNum(2, px(2.7 * k))); - stub(dc, ox + 339.5 * k, oy + 79.5 * k, ox + 338.1 * k, oy + 80.9 * k); - stub(dc, ox + 353.5 * k, oy + 80.9 * k, ox + 354.6 * k, oy + 79.8 * k); - dc.setColor(Graphics.COLOR_BLACK, Graphics.COLOR_TRANSPARENT); - cloudBody(dc, ox, oy, k, 1.7 * k); - dc.setColor(col, Graphics.COLOR_TRANSPARENT); - cloudBody(dc, ox, oy, k, 0.0); + // The comps' sunrise and weather icons are traced outlines with two- and + // three-pixel features. Rebuilding them from circles and lines held up at + // 454 px and turned to mush at 280, so they ship as bitmaps rasterised + // from the design paths at each screen size (tools/gen_icons.py) and get + // the theme's accent applied through :tintColor. + function blitIcon(dc as Dc, bmp, cx as Numeric, cy as Numeric, col as Number) as Void { + if (bmp == null) { return; } + dc.drawBitmap2(px(cx) - bmp.getWidth() / 2, px(cy) - bmp.getHeight() / 2, + bmp, {:tintColor => col}); } function maxNum(a as Number, b as Number) as Number { @@ -522,47 +374,52 @@ class Fenix8V3View extends WatchUi.WatchFace { function drawComplicationIcon(dc as Dc, cx as Numeric, cy as Numeric, scale as Float, col as Number, typeIdx as Number, level as Float) as Void { - if (typeIdx == 6) { - iconSun(dc, cx, cy, scale, col, 1); - } else if (typeIdx == 7) { - iconSun(dc, cx, cy, scale, col, -1); - } else if (typeIdx == 0 || typeIdx == 8) { - iconCloud(dc, cx, cy, scale, col); - } else if (typeIdx == 5) { + if (typeIdx == 712 || typeIdx == 700) { + blitIcon(dc, mIconSunrise, cx, ICON_CY, col); + } else if (typeIdx == 717 || typeIdx == 731) { + blitIcon(dc, mIconSunset, cx, ICON_CY, col); + } else if (typeIdx == 306 || typeIdx == 639 || typeIdx == 300 + || typeIdx == 301 || typeIdx == 302 || typeIdx == 304 + || typeIdx == 305 || typeIdx == 308 || typeIdx == 309 + || typeIdx == 310 || typeIdx == 307) { + blitIcon(dc, mIconWeather, cx, ICON_CY, col); + } else if (typeIdx == 250 || typeIdx == 251 || typeIdx == 257) { iconBattery(dc, cx - 14.4 * scale, cy, scale, col, level); } else { var r = 13.0 * scale; dc.setColor(col, Graphics.COLOR_TRANSPARENT); dc.setPenWidth(maxNum(2, px(3.0 * scale))); - if (typeIdx == 1) { // calories: flame + if (typeIdx == 2 || typeIdx == 603) { // calories: flame dc.fillPolygon([[px(cx), px(cy - r)], [px(cx + r * 0.72), px(cy + r * 0.25)], [px(cx + r * 0.40), px(cy + r * 0.85)], [px(cx - r * 0.40), px(cy + r * 0.85)], [px(cx - r * 0.72), px(cy + r * 0.25)]]); - } else if (typeIdx == 2) { // steps: two prints + } else if (typeIdx == 1 || typeIdx == 14 || typeIdx == 707) { // steps dc.fillRoundedRectangle(px(cx - r * 0.85), px(cy - r * 0.75), px(r * 0.62), px(r * 1.15), px(r * 0.3)); dc.fillRoundedRectangle(px(cx + r * 0.22), px(cy - r * 0.35), px(r * 0.62), px(r * 1.15), px(r * 0.3)); - } else if (typeIdx == 3) { // distance: arrow + } else if (typeIdx == 3 || typeIdx == 9 || typeIdx == 615) { // distance dc.fillPolygon([[px(cx), px(cy - r)], [px(cx + r * 0.75), px(cy + r * 0.8)], [px(cx), px(cy + r * 0.35)], [px(cx - r * 0.75), px(cy + r * 0.8)]]); - } else if (typeIdx == 9) { // heart rate + } else if (typeIdx == 618 || typeIdx == 276 || typeIdx == 623) { // heart dc.fillCircle(px(cx - r * 0.38), px(cy - r * 0.28), px(r * 0.44)); dc.fillCircle(px(cx + r * 0.38), px(cy - r * 0.28), px(r * 0.44)); dc.fillPolygon([[px(cx - r * 0.78), px(cy - r * 0.12)], [px(cx + r * 0.78), px(cy - r * 0.12)], [px(cx), px(cy + r * 0.85)]]); - } else { // floors: stairs + } else if (typeIdx == 4 || typeIdx == 5 || typeIdx == 6) { // stairs for (var i = 0; i < 3; i++) { dc.fillRectangle(px(cx - r * 0.85 + r * 0.58 * i), px(cy + r * 0.6 - r * 0.55 * i), px(r * 0.62), px(r * 0.4)); } } + // Everything else -- dates, week numbers, custom text -- reads fine + // without a glyph, so no icon is drawn. } } @@ -578,14 +435,10 @@ class Fenix8V3View extends WatchUi.WatchFace { } function drawTopComplication(dc as Dc, ti as Number, typeIdx as Number, isLeft as Boolean, - info as ActivityMonitor.Info, weather as Weather.CurrentConditions?, - stats as System.Stats, ds as System.DeviceSettings) as Void { + ctx as Fields.Ctx, level as Float) as Void { var x = isLeft ? LEFT_X : RIGHT_X; - var level = 0.0f; - if (stats != null && stats.battery != null) { level = stats.battery / 100.0; } drawComplicationIcon(dc, x, ICON_CY, 1.0, Themes.ACCENT[ti] as Number, typeIdx, level); - text(dc, x, VALUE_CY, mFontComp, - complicationValue(typeIdx, info, weather, stats, ds), + text(dc, x, VALUE_CY, mFontComp, Fields.value(typeIdx, ctx), Graphics.TEXT_JUSTIFY_CENTER, Themes.TEXTPRIMARY[ti] as Number); } @@ -615,15 +468,12 @@ class Fenix8V3View extends WatchUi.WatchFace { // FORMAT_SHORT, not FORMAT_MEDIUM: only the short form returns // day_of_week and month as numbers rather than localised strings. var g = Gregorian.info(Time.now(), Time.FORMAT_SHORT); - text(dc, DOW_CX, BAND_CY, mFontBand, mDow[g.day_of_week - 1], + text(dc, DOW_CX, BAND_CY, mFontBand, Fields.dow(g), Graphics.TEXT_JUSTIFY_CENTER, col); - // DateFormat is "$1$ $2$" in English and "$1$$2$日" in Chinese, where - // the Chinese month names already carry their own 月. - text(dc, MD_CX, BAND_CY, mFontBand, - Lang.format(mDateFmt, [mMon[g.month - 1], g.day.format("%d")]), + text(dc, MD_CX, BAND_CY, mFontBand, Fields.monthDay(g), Graphics.TEXT_JUSTIFY_CENTER, col); if (ds == null || !ds.is24Hour) { - text(dc, AMPM_R, BAND_CY, mFontBand, mMeridiem[g.hour >= 12 ? 1 : 0], + text(dc, AMPM_R, BAND_CY, mFontBand, Fields.meridiem(g), Graphics.TEXT_JUSTIFY_RIGHT, col); } } @@ -653,49 +503,120 @@ class Fenix8V3View extends WatchUi.WatchFace { dc.fillRectangle(px(COLON_X), px(COLON_Y2), px(COLON_W), px(COLON_H)); } - function drawBottom(dc as Dc, ti as Number, info as ActivityMonitor.Info, - weather as Weather.CurrentConditions?, stats as System.Stats, - ds as System.DeviceSettings) as Void { + function drawBottom(dc as Dc, ti as Number, ctx as Fields.Ctx) as Void { var value = Themes.TEXTPRIMARY[ti] as Number; var label = Themes.ACCENT[ti] as Number; var left = getSetting("BottomLeft", 3); - var right = getSetting("BottomRight", 2); - text(dc, DIST_R, BOT_VAL_CY, mFontComp, - complicationValue(left, info, weather, stats, ds), + var right = getSetting("BottomRight", 1); + text(dc, DIST_R, BOT_VAL_CY, mFontComp, Fields.value(left, ctx), Graphics.TEXT_JUSTIFY_RIGHT, value); - text(dc, DIST_R, BOT_LAB_CY, mFontComp, fieldLabel(left), + text(dc, DIST_R, BOT_LAB_CY, mFontComp, Fields.label(left), Graphics.TEXT_JUSTIFY_RIGHT, label); - text(dc, STEP_L, BOT_VAL_CY, mFontComp, - complicationValue(right, info, weather, stats, ds), + text(dc, STEP_L, BOT_VAL_CY, mFontComp, Fields.value(right, ctx), Graphics.TEXT_JUSTIFY_LEFT, value); - text(dc, STEP_L, BOT_LAB_CY, mFontComp, fieldLabel(right), + text(dc, STEP_L, BOT_LAB_CY, mFontComp, Fields.label(right), Graphics.TEXT_JUSTIFY_LEFT, label); } + // ------------------------------------------------------------------ AOD + function dim(col as Number, f as Float) as Number { + var r = (((col >> 16) & 0xFF) * f).toNumber(); + var g = (((col >> 8) & 0xFF) * f).toNumber(); + var b = ((col & 0xFF) * f).toNumber(); + return (r << 16) | (g << 8) | b; + } + + // Low-power face: no band fill, no unlit ticks, no complications -- just a + // dimmed time, the lit part of the ring, and the date. The whole thing + // walks a few pixels each minute so no pixel stays lit in one place. + function drawAmbient(dc as Dc, ti as Number, ds as System.DeviceSettings, + pTR as Float, pTL as Float, pBR as Float, pBL as Float) as Void { + var g = Gregorian.info(Time.now(), Time.FORMAT_SHORT); + var ox = ((g.min % 5) - 2) * 2.0 / mS; // +/- 4 device px, in design units + var oy = ((g.min / 5) % 5 - 2) * 2.0 / mS; + + var top = Themes.RINGTOP[ti] as Array; + var bot = Themes.RINGBOTTOM[ti] as Array; + var litTR = (pTR * TOP_N).toNumber(); + var litTL = (pTL * TOP_N).toNumber(); + var litBR = (pBR * BOT_N).toNumber(); + var litBL = (pBL * BOT_N).toNumber(); + for (var i = 0; i < TOP_N; i++) { + var a = TOP_PH + TOP_PITCH * i; + if (i >= TOP_N - litTR) { + dc.setColor(dim(top[i], 0.45), Graphics.COLOR_TRANSPARENT); + tick(dc, a, TOP_HW); + } + if (i >= TOP_N - litTL) { + dc.setColor(dim(top[i], 0.45), Graphics.COLOR_TRANSPARENT); + tick(dc, -a, TOP_HW); + } + } + for (var i = 0; i < BOT_N; i++) { + var a = BOT_PH + BOT_PITCH * i; + if (i < litBL) { + dc.setColor(dim(bot[i], 0.45), Graphics.COLOR_TRANSPARENT); + tick(dc, 180.0 + a, BOT_HW); + } + if (i < litBR) { + dc.setColor(dim(bot[i], 0.45), Graphics.COLOR_TRANSPARENT); + tick(dc, 180.0 - a, BOT_HW); + } + } + + var h = g.hour; + if (ds == null || !ds.is24Hour) { + if (h == 0) { h = 12; } else if (h > 12) { h = h - 12; } + } + var hours = Themes.HOURS[ti] as Array; + var mins = Themes.MINUTES[ti] as Array; + text(dc, HOURS_R + ox, TIME_CY + oy, mFontTime, h.format("%d"), + Graphics.TEXT_JUSTIFY_RIGHT, dim(hours[hours.size() / 2], 0.55)); + text(dc, MINUTES_L + ox, TIME_CY + oy, mFontTime, g.min.format("%02d"), + Graphics.TEXT_JUSTIFY_LEFT, dim(mins[mins.size() / 2], 0.55)); + dc.setColor(dim(Themes.COLON[ti] as Number, 0.55), Graphics.COLOR_TRANSPARENT); + dc.fillRectangle(px(COLON_X + ox), px(COLON_Y1 + oy), px(COLON_W), px(COLON_H)); + dc.fillRectangle(px(COLON_X + ox), px(COLON_Y2 + oy), px(COLON_W), px(COLON_H)); + + var band = dim(Themes.ACCENT[ti] as Number, 0.55); + text(dc, DOW_CX + ox, BAND_CY + oy, mFontBand, Fields.dow(g), + Graphics.TEXT_JUSTIFY_CENTER, band); + text(dc, MD_CX + ox, BAND_CY + oy, mFontBand, Fields.monthDay(g), + Graphics.TEXT_JUSTIFY_CENTER, band); + } + // ----------------------------------------------------------------- main function onUpdate(dc as Dc) as Void { - if (mW != dc.getWidth() || mDow == null) { onLayout(dc); } + if (mW != dc.getWidth() || !Fields.ready()) { onLayout(dc); } if (dc has :setAntiAlias) { dc.setAntiAlias(true); } var ti = themeIndex(); - var info = ActivityMonitor.getInfo(); - var stats = System.getSystemStats(); var ds = System.getDeviceSettings(); - var weather = Weather.getCurrentConditions(); + var ctx = new Fields.Ctx(ds, getSetting("TempUnit", 0)); + var info = ctx.info(); + var stats = ctx.stats(); dc.setColor(Graphics.COLOR_BLACK, Graphics.COLOR_BLACK); dc.clear(); - drawRing(dc, ti, - metricProgress(getSetting("RingTR", 0), info), - metricProgress(getSetting("RingTL", 1), info), - metricProgress(getSetting("RingBR", 4), info), - metricProgress(getSetting("RingBL", 3), info)); + var pTR = metricProgress(getSetting("RingTR", 0), info); + var pTL = metricProgress(getSetting("RingTL", 1), info); + var pBR = metricProgress(getSetting("RingBR", 4), info); + var pBL = metricProgress(getSetting("RingBL", 3), info); + + if (mSleeping && mBurnIn) { + drawAmbient(dc, ti, ds, pTR, pTL, pBR, pBL); + return; + } + + drawRing(dc, ti, pTR, pTL, pBR, pBL); if (getBool("ShowTop", true)) { + var level = 0.0f; + if (stats != null && stats.battery != null) { level = stats.battery / 100.0; } drawBattery(dc, ti, stats); - drawTopComplication(dc, ti, getSetting("LeftTop", 6), true, info, weather, stats, ds); - drawTopComplication(dc, ti, getSetting("RightTop", 8), false, info, weather, stats, ds); + drawTopComplication(dc, ti, getSetting("LeftTop", 712), true, ctx, level); + drawTopComplication(dc, ti, getSetting("RightTop", 639), false, ctx, level); } drawTime(dc, ti, ds); @@ -705,7 +626,7 @@ class Fenix8V3View extends WatchUi.WatchFace { } if (getBool("ShowBottom", true)) { - drawBottom(dc, ti, info, weather, stats, ds); + drawBottom(dc, ti, ctx); } } } diff --git a/source/FieldTable.mc b/source/FieldTable.mc new file mode 100644 index 0000000..00b1cfb --- /dev/null +++ b/source/FieldTable.mc @@ -0,0 +1,22 @@ +// AUTO-GENERATED by tools/gen_fields.py -- do not edit by hand. +// Ids follow https://watchface.io/docs/datafields; only the fields a +// Connect IQ watch face can source on-device are listed. +import Toybox.Lang; + +module FieldTable { + + // Field ids, in the same order as the Labels resource string. + const IDS = [ + 0,860,880,864,865,851,872,852,855,870,856,853,868,858,859,873,1,14,707,2,603,150, + 152,154,151,3,4,5,6,9,10,618,276,12,635,11,623,8,15,281,742,13,278,277,250,251,257, + 253,255,254,256,252,615,616,733,712,717,700,731,706,732,306,639,300,301,302,305,304, + 308,307,310,309,703,704,705 + ]; + + function indexOf(id as Number) as Number { + for (var i = 0; i < IDS.size(); i++) { + if (IDS[i] == id) { return i; } + } + return 0; + } +} diff --git a/source/Fields.mc b/source/Fields.mc new file mode 100644 index 0000000..3cca859 --- /dev/null +++ b/source/Fields.mc @@ -0,0 +1,491 @@ +import Toybox.Lang; +import Toybox.Math; +import Toybox.System; +import Toybox.Time; +import Toybox.Time.Gregorian; +import Toybox.Application; +import Toybox.ActivityMonitor; +import Toybox.Activity; +import Toybox.UserProfile; +import Toybox.SensorHistory; +import Toybox.Weather; +import Toybox.Position; +import Toybox.WatchUi; +import FieldTable; + +// Everything a complication slot can show. Ids match +// https://watchface.io/docs/datafields so the two catalogues line up; see +// tools/gen_fields.py for the table that drives the settings and the labels. +// +// Only fields Connect IQ can answer from the watch itself are here. The +// week-to-date and 7/28-day per-sport aggregates in that catalogue come from a +// phone-side Garmin Connect integration, and the OpenWeatherMap / StormGlass / +// third-party-app fields need network calls and API keys; neither is something +// a self-contained watch face can produce. +module Fields { + + const DASH = "--"; + + var mDow as Array?; + var mMon as Array?; + var mLabels as Array?; + var mMeridiem as Array?; + var mDateFmt as String = "$1$ $2$"; + + function loadStrings() as Void { + mDow = splitCsv(WatchUi.loadResource(Rez.Strings.DowNames) as String); + mMon = splitCsv(WatchUi.loadResource(Rez.Strings.MonNames) as String); + mLabels = splitCsv(WatchUi.loadResource(Rez.Strings.FieldLabels) as String); + mMeridiem = splitCsv(WatchUi.loadResource(Rez.Strings.Meridiem) as String); + mDateFmt = WatchUi.loadResource(Rez.Strings.DateFormat) as String; + } + + function ready() as Boolean { return mDow != null; } + + // Monkey C has no String.split. + function splitCsv(str as String) as Array { + var out = [] as Array; + var rest = str; + var cut = rest.find(","); + while (cut != null) { + out.add(rest.substring(0, cut) as String); + rest = rest.substring(cut + 1, rest.length()) as String; + cut = rest.find(","); + } + out.add(rest); + return out; + } + + function dow(g as Gregorian.Info) as String { + return mDow == null ? "" : mDow[g.day_of_week - 1]; + } + + function month(g as Gregorian.Info) as String { + return mMon == null ? "" : mMon[g.month - 1]; + } + + function monthDay(g as Gregorian.Info) as String { + return Lang.format(mDateFmt, [month(g), g.day.format("%d")]); + } + + function meridiem(g as Gregorian.Info) as String { + return mMeridiem == null ? "" : mMeridiem[g.hour >= 12 ? 1 : 0]; + } + + // Short caption printed under a bottom-row value. + function label(id as Number) as String { + if (mLabels == null) { return ""; } + var i = FieldTable.indexOf(id); + return i < mLabels.size() ? mLabels[i] : ""; + } + + // One of these is built per onUpdate and handed to every slot, so the + // expensive lookups (forecast, sensor history, user profile) happen at most + // once per draw and only if some slot actually asks for them. + class Ctx { + var greg as Gregorian.Info; + var is24 as Boolean = true; + var metric as Boolean = true; + var fahrenheit as Boolean = false; + + private var mInfo as ActivityMonitor.Info?; + private var mStats as System.Stats?; + private var mDs as System.DeviceSettings?; + private var mAct as Activity.Info?; + private var mWx as Weather.CurrentConditions?; + private var mFc as Array?; + private var mProf as UserProfile.Profile?; + private var mGotAct = false; + private var mGotWx = false; + private var mGotFc = false; + private var mGotProf = false; + + function initialize(ds as System.DeviceSettings?, tempUnit as Number) { + mDs = ds; + greg = Gregorian.info(Time.now(), Time.FORMAT_SHORT); + if (ds != null) { + is24 = ds.is24Hour; + metric = (ds.distanceUnits != System.UNIT_STATUTE); + fahrenheit = (tempUnit == 2) + || (tempUnit == 0 && ds.temperatureUnits == System.UNIT_STATUTE); + } + if (tempUnit == 1) { fahrenheit = false; } + } + + function ds() as System.DeviceSettings? { return mDs; } + + function info() as ActivityMonitor.Info? { + if (mInfo == null) { mInfo = ActivityMonitor.getInfo(); } + return mInfo; + } + + function stats() as System.Stats? { + if (mStats == null) { mStats = System.getSystemStats(); } + return mStats; + } + + function act() as Activity.Info? { + if (!mGotAct) { mAct = Activity.getActivityInfo(); mGotAct = true; } + return mAct; + } + + function wx() as Weather.CurrentConditions? { + if (!mGotWx) { mWx = Weather.getCurrentConditions(); mGotWx = true; } + return mWx; + } + + function forecast() as Weather.DailyForecast? { + if (!mGotFc) { mFc = Weather.getDailyForecast(); mGotFc = true; } + if (mFc != null && mFc.size() > 0) { return mFc[0]; } + return null; + } + + function profile() as UserProfile.Profile? { + if (!mGotProf) { mProf = UserProfile.getProfile(); mGotProf = true; } + return mProf; + } + + function where() as Position.Location? { + var w = wx(); + if (w != null && w.observationLocationPosition != null) { + return w.observationLocationPosition; + } + var a = act(); + if (a != null && a.currentLocation != null) { return a.currentLocation; } + return null; + } + } + + // ------------------------------------------------------------- helpers + function num(v as Numeric?) as String { + return v == null ? DASH : v.format("%d"); + } + + function one(v as Float?) as String { + return v == null ? DASH : v.format("%.1f"); + } + + function clock(m as Time.Moment?, c as Ctx) as String { + if (m == null) { return DASH; } + return clockInfo(Gregorian.info(m, Time.FORMAT_SHORT), c); + } + + function clockInfo(g as Gregorian.Info, c as Ctx) as String { + var h = g.hour; + if (!c.is24) { + if (h == 0) { h = 12; } else if (h > 12) { h = h - 12; } + } + return h.format("%d") + ":" + g.min.format("%02d"); + } + + function offsetClock(minutes as Number, c as Ctx) as String { + var m = Time.now().add(new Time.Duration(minutes * 60)); + return clock(m, c); + } + + function temp(celsius as Numeric?, c as Ctx) as String { + if (celsius == null) { return DASH; } + var t = celsius.toFloat(); + if (c.fahrenheit) { t = t * 9.0 / 5.0 + 32.0; } + return t.format("%d") + "°"; + } + + // ActivityMonitor distances are centimetres. + function dist(cm as Numeric?, c as Ctx) as String { + if (cm == null) { return DASH; } + var km = cm.toFloat() / 100000.0; + return (c.metric ? km : km * 0.621371).format("%.1f"); + } + + function metres(m as Numeric?, c as Ctx) as String { + if (m == null) { return DASH; } + var v = m.toFloat(); + return (c.metric ? v : v * 3.28084).format("%d"); + } + + function rounded(v as Numeric?) as String { + if (v == null) { return DASH; } + var n = v.toNumber(); + if (n < 1000) { return n.format("%d"); } + return (n / 1000.0).format("%.1f") + "k"; + } + + function setting(name as String, def as Number) as Number { + var v = Application.Properties.getValue(name); + if (v == null) { return def; } + return v as Number; + } + + function settingText(name as String) as String { + var v = Application.Properties.getValue(name); + if (v == null) { return ""; } + return v.toString(); + } + + // Newest reading out of a SensorHistory iterator, or null. + function latest(iter) as Numeric? { + if (iter == null) { return null; } + var s = iter.next(); + if (s == null) { return null; } + return s.data; + } + + function dayOfYear(g as Gregorian.Info) as Number { + var cum = [0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334]; + var d = cum[g.month - 1] + g.day; + var y = g.year; + var leap = (y % 4 == 0 && y % 100 != 0) || (y % 400 == 0); + if (leap && g.month > 2) { d = d + 1; } + return d; + } + + // ISO 8601 week: weeks start Monday, week 1 holds the first Thursday. + function isoWeek(g as Gregorian.Info) as Number { + var dow = g.day_of_week - 1; // 0 = Sunday + var iso = dow == 0 ? 7 : dow; // 1 = Monday .. 7 = Sunday + var w = (dayOfYear(g) - iso + 10) / 7; + if (w < 1) { return 52; } + if (w > 52) { return 1; } + return w; + } + + // Days since the new moon of 2000-01-06, folded into one synodic month. + function moonAge(g as Gregorian.Info) as Float { + var y = g.year; + var m = g.month; + if (m <= 2) { y = y - 1; m = m + 12; } + var a = y / 100; + var b = 2 - a + a / 4; + var jd = (365.25 * (y + 4716)).toNumber() + (30.6001 * (m + 1)).toNumber() + + g.day + b - 1524.5 + g.hour / 24.0; + // Monkey C has no float modulo. + var syn = 29.530588853; + var x = jd - 2451550.1; + var age = x - (x / syn).toNumber() * syn; + if (age < 0) { age = age + syn; } + return age.toFloat(); + } + + function windDir(bearingDeg as Numeric?) as String { + if (bearingDeg == null) { return DASH; } + var pts = ["N", "NNE", "NE", "ENE", "E", "ESE", "SE", "SSE", + "S", "SSW", "SW", "WSW", "W", "WNW", "NW", "NNW"]; + var b = bearingDeg.toFloat(); + while (b < 0) { b = b + 360.0; } + var i = ((b + 11.25) / 22.5).toNumber() % 16; + return pts[i]; + } + + // --------------------------------------------------------------- value + function value(id as Number, c as Ctx) as String { + // ---- date / time + if (id == 860) { return clockInfo(c.greg, c); } + if (id == 880) { + var utc = Gregorian.utcInfo(Time.now(), Time.FORMAT_SHORT); + return clockInfo(utc, c); + } + if (id == 864) { return offsetClock(setting("AltOffset1", 0), c); } + if (id == 865) { return offsetClock(setting("AltOffset2", 0), c); } + if (id == 855) { return c.greg.day.format("%d"); } + if (id == 868) { return c.greg.month.format("%d"); } + if (id == 859) { return isoWeek(c.greg).format("%d"); } + if (id == 873) { return ((dayOfYear(c.greg) + 6) / 7).format("%d"); } + if (id == 870) { return dow(c.greg); } + if (id == 856) { return dow(c.greg); } + if (id == 853) { return month(c.greg); } + if (id == 852) { return monthDay(c.greg); } + if (id == 872) { return dow(c.greg) + " " + c.greg.day.format("%d"); } + if (id == 851) { return dow(c.greg) + " " + monthDay(c.greg); } + if (id == 858) { return meridiem(c.greg); } + + // ---- activity + var i = c.info(); + if (id == 1) { return i == null ? DASH : num(i.steps); } + if (id == 14) { return i == null ? DASH : rounded(i.steps); } + if (id == 707) { + if (i == null || i.steps == null || i.stepGoal == null) { return DASH; } + var left = i.stepGoal - i.steps; + return left > 0 ? left.format("%d") : "0"; + } + if (id == 2) { return i == null ? DASH : num(i.calories); } + if (id == 603) { + if (i == null || i.calories == null) { return DASH; } + var p = c.profile(); + if (p == null || p.weight == null || p.height == null) { return num(i.calories); } + return num(i.calories); // device reports total only + } + if (id == 150 || id == 152 || id == 154) { + if (i == null || i.activeMinutesDay == null) { return DASH; } + var am = i.activeMinutesDay; + if (id == 152) { return num(am.moderate); } + if (id == 154) { return num(am.vigorous); } + return num(am.total); + } + if (id == 151) { + if (i == null || i.activeMinutesWeek == null) { return DASH; } + return num(i.activeMinutesWeek.total); + } + if (id == 3) { return i == null ? DASH : dist(i.distance, c); } + if (id == 4) { return i == null ? DASH : num(i.floorsClimbed); } + if (id == 5) { return i == null ? DASH : num(i.floorsDescended); } + if (id == 6) { return i == null ? DASH : metres(i.metersClimbed, c); } + if (id == 9) { return i == null ? DASH : dist(i.pushDistance, c); } + if (id == 10) { return i == null ? DASH : num(i.pushes); } + if (id == 8 || id == 15) { + if (i == null || i.moveBarLevel == null) { return DASH; } + var lvl = i.moveBarLevel; + if (id == 15) { lvl = ActivityMonitor.MOVE_BAR_LEVEL_MAX - lvl; } + return lvl.format("%d"); + } + if (id == 13) { return i == null ? DASH : num(i.timeToRecovery); } + if (id == 11) { return i == null ? DASH : num(i.respirationRate); } + if (id == 12) { return i == null ? DASH : num(i.stressScore); } + + // ---- body + if (id == 618) { + var a = c.act(); + if (a != null && a.currentHeartRate != null) { return num(a.currentHeartRate); } + var h = ActivityMonitor.getHeartRateHistory(1, true); + if (h != null) { + var s = h.next(); + if (s != null && s.heartRate != null + && s.heartRate != ActivityMonitor.INVALID_HR_SAMPLE) { + return num(s.heartRate); + } + } + return DASH; + } + if (id == 276) { + var p = c.profile(); + return (p == null) ? DASH : num(p.restingHeartRate); + } + if (id == 635) { + if (!(SensorHistory has :getOxygenSaturationHistory)) { return DASH; } + return num(latest(SensorHistory.getOxygenSaturationHistory({:period => 1}))); + } + if (id == 623) { + if (!(SensorHistory has :getBodyBatteryHistory)) { return DASH; } + return num(latest(SensorHistory.getBodyBatteryHistory({:period => 1}))); + } + if (id == 281 || id == 742) { + var p = c.profile(); + if (p == null || p.weight == null) { return DASH; } + var kg = p.weight.toFloat() / 1000.0; + if (id == 281) { + return (c.metric ? kg : kg * 2.20462).format("%.1f"); + } + if (p.height == null || p.height <= 0) { return DASH; } + var m = p.height.toFloat() / 100.0; + return (kg / (m * m)).format("%.1f"); + } + if (id == 277 || id == 278) { + var p = c.profile(); + if (p == null) { return DASH; } + return num(id == 278 ? p.vo2maxRunning : p.vo2maxCycling); + } + + // ---- system + var st = c.stats(); + if (id == 250) { + return st == null || st.battery == null ? DASH + : st.battery.format("%d") + "%"; + } + if (id == 251) { + if (st == null || !(st has :batteryInDays) || st.batteryInDays == null) { + return DASH; + } + return st.batteryInDays.format("%d") + "d"; + } + if (id == 257) { + var pct = (st == null || st.battery == null) ? DASH : st.battery.format("%d"); + var d = (st == null || !(st has :batteryInDays) || st.batteryInDays == null) + ? DASH : st.batteryInDays.format("%d"); + return pct + "/" + d; + } + if (id == 252) { + if (st == null || !(st has :solarIntensity) || st.solarIntensity == null) { + return DASH; + } + return st.solarIntensity.format("%d") + "%"; + } + var ds = c.ds(); + if (id == 253) { return ds == null ? DASH : num(ds.alarmCount); } + if (id == 255) { return ds == null ? DASH : num(ds.notificationCount); } + if (id == 254) { + return ds == null ? DASH : (ds.doNotDisturb ? "ON" : "OFF"); + } + if (id == 256) { + return ds == null ? DASH : (ds.phoneConnected ? "ON" : "OFF"); + } + + // ---- environment + if (id == 615) { + var a = c.act(); + return (a == null) ? DASH : metres(a.altitude, c); + } + if (id == 616 || id == 733) { + var a = c.act(); + if (a == null) { return DASH; } + var pa = (id == 616) ? a.meanSeaLevelPressure : a.ambientPressure; + if (pa == null) { return DASH; } + return (pa.toFloat() / 100.0).format("%d"); + } + if (id == 712 || id == 717 || id == 700 || id == 731) { + var loc = c.where(); + if (loc == null) { return DASH; } + var now = Time.now(); + var rise = Weather.getSunrise(loc, now); + var set = Weather.getSunset(loc, now); + if (id == 712) { return clock(rise, c); } + if (id == 717) { return clock(set, c); } + if (rise == null || set == null) { return DASH; } + var next = (now.compare(rise) < 0) ? rise + : ((now.compare(set) < 0) ? set : rise); + if (id == 700) { return clock(next, c); } + var secs = next.compare(now); + if (secs < 0) { secs = secs + 86400; } + return (secs / 3600).format("%d") + "h" + ((secs % 3600) / 60).format("%02d"); + } + if (id == 706) { return moonAge(c.greg).format("%.1f"); } + if (id == 732) { + var age = moonAge(c.greg); + var lit = (1.0 - Math.cos(2.0 * Math.PI * age / 29.530588853)) / 2.0; + return (lit * 100.0).format("%d") + "%"; + } + + // ---- weather + var w = c.wx(); + if (id == 306) { return w == null ? DASH : temp(w.temperature, c); } + if (id == 300) { return w == null ? DASH : temp(w.feelsLikeTemperature, c); } + if (id == 305) { return w == null ? DASH : num(w.relativeHumidity) + "%"; } + if (id == 304) { + if (w == null || !(w has :precipitationChance)) { return DASH; } + return num(w.precipitationChance) + "%"; + } + if (id == 308) { + if (w == null || w.windSpeed == null) { return DASH; } + var kmh = w.windSpeed.toFloat() * 3.6; + return (c.metric ? kmh : kmh * 0.621371).format("%d"); + } + if (id == 307) { return w == null ? DASH : num(w.windBearing); } + if (id == 310) { return w == null ? DASH : windDir(w.windBearing); } + if (id == 309) { + if (w == null || w.observationTime == null) { return DASH; } + return clock(w.observationTime, c); + } + if (id == 301 || id == 302 || id == 639) { + var f = c.forecast(); + if (f == null) { return DASH; } + if (id == 301) { return temp(f.highTemperature, c); } + if (id == 302) { return temp(f.lowTemperature, c); } + return temp(f.highTemperature, c) + "/" + temp(f.lowTemperature, c); + } + + // ---- custom + if (id == 703) { return settingText("Custom1"); } + if (id == 704) { return settingText("Custom2"); } + if (id == 705) { return settingText("Custom3"); } + + return ""; + } +} diff --git a/tools/gen_fields.py b/tools/gen_fields.py new file mode 100644 index 0000000..81f82e8 --- /dev/null +++ b/tools/gen_fields.py @@ -0,0 +1,252 @@ +#!/usr/bin/env python3 +"""One table -> the field id list, both languages, and the settings XML. + +Field ids follow the numbering at https://watchface.io/docs/datafields so the +two catalogues line up, but only the fields Connect IQ can actually serve from +the watch are here. Anything needing a web service (OpenWeatherMap, +StormGlass), a companion phone integration (the week-to-date and 7/28-day +per-sport aggregates), or another installed app (CGM, hydration, quotes) is +deliberately absent -- see README section 8 for the full reasoning. + + python3 tools/gen_fields.py + +Writes: + source/FieldTable.mc ids + short label lookup + resources/settings/settings.xml the four field pickers + resources/strings/fields.xml English names and labels + resources-chn/strings/fields.xml Chinese names and labels +""" +import os + +HERE = os.path.dirname(os.path.abspath(__file__)) +ROOT = os.path.dirname(HERE) + +# id, key, English name, Chinese name, on-face label (en), on-face label (cn) +FIELDS = [ + (0, "Off", "Off", "关闭", "", ""), + + # ---- date / time ---------------------------------------------------- + (860, "Time", "Time", "时间", "TIME", "时间"), + (880, "UtcTime", "UTC Time", "UTC 时间", "UTC", "UTC"), + (864, "AltTime1", "Alternate Time 1", "第二时区 1", "TZ1", "时区1"), + (865, "AltTime2", "Alternate Time 2", "第二时区 2", "TZ2", "时区2"), + (851, "DayMonthDay", "Day Month Day", "星期 月 日", "DATE", "日期"), + (872, "DayDate", "Day Date", "星期 日", "DATE", "日期"), + (852, "MonthDay", "Month Day", "月 日", "DATE", "日期"), + (855, "DayOfMonth", "Day of Month", "日", "DAY", "日"), + (870, "DayShort", "Day (Tue)", "星期简写", "DAY", "星期"), + (856, "DayFull", "Full Day (Tuesday)", "星期全称", "DAY", "星期"), + (853, "MonthName", "Month (Jan)", "月份", "MON", "月"), + (868, "MonthNum", "Month (6)", "月份数字", "MON", "月"), + (858, "Meridiem", "AM/PM", "上午/下午", "", ""), + (859, "WeekIso", "Week Number (ISO)", "周数 (ISO)", "WEEK", "周"), + (873, "WeekCal", "Week Number", "周数", "WEEK", "周"), + + # ---- activity ------------------------------------------------------- + (1, "Steps", "Steps", "步数", "STEP", "步数"), + (14, "StepsRound", "Steps Rounded", "步数 (取整)", "STEP", "步数"), + (707, "StepsToGo", "Steps to Go", "剩余步数", "TO GO", "还差"), + (2, "Calories", "Calories", "卡路里", "KCAL", "千卡"), + (603, "ActiveCal", "Active Calories", "活动卡路里", "ACAL", "活动"), + (150, "ActiveMin", "Active Minutes", "活动分钟", "MIN", "分钟"), + (152, "ActiveMod", "Active Min (Moderate)", "中强度分钟", "MOD", "中强度"), + (154, "ActiveVig", "Active Min (Vigorous)", "高强度分钟", "VIG", "高强度"), + (151, "ActiveWeek", "Active Minutes (Week)", "本周活动分钟", "WEEK", "周分钟"), + (3, "Distance", "Distance", "距离", "DST", "距离"), + (4, "FloorsUp", "Floors Climbed", "上楼层数", "FLR", "楼层"), + (5, "FloorsDown", "Floors Descended", "下楼层数", "DESC", "下楼"), + (6, "MetersUp", "Distance Climbed", "爬升高度", "ASC", "爬升"), + (9, "PushDist", "Push Distance", "推行距离", "PUSH", "推行"), + (10, "Pushes", "Pushes", "推行次数", "PUSH", "推行"), + + # ---- body ----------------------------------------------------------- + (618, "HeartRate", "Heart Rate", "心率", "HR", "心率"), + (276, "RestingHr", "Resting Heart Rate", "静息心率", "RHR", "静息"), + (12, "Stress", "Stress Score", "压力指数", "STRS", "压力"), + (635, "PulseOx", "Pulse Ox", "血氧", "SPO2", "血氧"), + (11, "Respiration", "Respiration Rate", "呼吸频率", "RESP", "呼吸"), + (623, "BodyBattery", "Body Battery", "身体电量", "BODY", "体能"), + (8, "MoveBar", "Move Bar", "活动条", "MOVE", "活动"), + (15, "MoveBarRev", "Move Bar Reversed", "活动条 (反向)", "MOVE", "活动"), + (281, "Weight", "Weight", "体重", "WT", "体重"), + (742, "Bmi", "BMI", "BMI", "BMI", "BMI"), + (13, "Recovery", "Time to Recovery", "恢复时间", "RCVR", "恢复"), + (278, "Vo2Run", "VO2 Max (Run)", "最大摄氧量 (跑)", "VO2", "摄氧"), + (277, "Vo2Bike", "VO2 Max (Bike)", "最大摄氧量 (骑)", "VO2", "摄氧"), + + # ---- system --------------------------------------------------------- + (250, "Battery", "Battery", "电量", "BATT", "电量"), + (251, "BatteryDays", "Battery in Days", "剩余天数", "DAYS", "天数"), + (257, "BatteryBoth", "Battery / Days", "电量 / 天数", "BATT", "电量"), + (253, "Alarms", "Alarms", "闹钟", "ALRM", "闹钟"), + (255, "Notifications", "Notifications", "通知", "MSG", "通知"), + (254, "DoNotDisturb", "Do Not Disturb", "勿扰模式", "DND", "勿扰"), + (256, "Bluetooth", "Bluetooth", "蓝牙", "BT", "蓝牙"), + (252, "Solar", "Solar Intensity", "太阳能强度", "SOLR", "太阳能"), + + # ---- environment ---------------------------------------------------- + (615, "Altitude", "Altitude", "海拔", "ALT", "海拔"), + (616, "SeaPressure", "Sea Level Pressure", "海平面气压", "hPa", "气压"), + (733, "AmbPressure", "Ambient Pressure", "环境气压", "hPa", "气压"), + (712, "Sunrise", "Sunrise", "日出", "RISE", "日出"), + (717, "Sunset", "Sunset", "日落", "SET", "日落"), + (700, "NextSun", "Next Sun Event", "下一太阳事件", "SUN", "太阳"), + (731, "UntilSun", "Time Until Sun Event", "距太阳事件", "SUN", "太阳"), + (706, "MoonAge", "Moon Age", "月龄", "MOON", "月龄"), + (732, "MoonLit", "Moon Illumination", "月球照明", "MOON", "月相"), + + # ---- weather -------------------------------------------------------- + (306, "Temp", "Temperature", "气温", "TEMP", "气温"), + (639, "TempHiLo", "Temperature High/Low", "最高/最低气温", "HI/LO", "高低温"), + (300, "FeelsLike", "Feels Like", "体感温度", "FEEL", "体感"), + (301, "TempHigh", "High Temperature", "最高气温", "HIGH", "最高"), + (302, "TempLow", "Low Temperature", "最低气温", "LOW", "最低"), + (305, "Humidity", "Humidity", "湿度", "HUM", "湿度"), + (304, "Precip", "Precipitation %", "降水概率", "RAIN", "降水"), + (308, "WindSpeed", "Wind Speed", "风速", "WIND", "风速"), + (307, "WindBearing", "Wind Bearing", "风向角", "WIND", "风向"), + (310, "WindDir", "Wind Direction", "风向", "WIND", "风向"), + (309, "WeatherTime", "Weather Update Time", "天气更新时间", "WX", "更新"), + + # ---- custom --------------------------------------------------------- + (703, "Custom1", "Custom Text 1", "自定义文字 1", "", ""), + (704, "Custom2", "Custom Text 2", "自定义文字 2", "", ""), + (705, "Custom3", "Custom Text 3", "自定义文字 3", "", ""), +] + +SLOTS = [("LeftTop", "Top-Left Field", "左上数据"), + ("RightTop", "Top-Right Field", "右上数据"), + ("BottomLeft", "Bottom-Left Field", "左下数据"), + ("BottomRight", "Bottom-Right Field", "右下数据")] + +RING = [(0, "Steps", "Steps", "步数"), (1, "Calories", "Calories", "卡路里"), + (2, "Distance", "Distance", "距离"), (3, "Floors", "Floors", "楼层"), + (4, "MoveBar", "Move Bar", "动动条"), (5, "ActiveMin", "Active Minutes", "活动分钟"), + (6, "BodyBattery", "Body Battery", "身体电量")] + +OTHER_SETTINGS = """ + + + @Strings.TempUnitAuto + @Strings.TempUnitC + @Strings.TempUnitF + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +""" + + +def field_list(indent=8): + pad = " " * indent + return "\n".join('%s@Strings.Fld%s' + % (pad, fid, key) for fid, key, _, _, _, _ in FIELDS) + + +def write(path, text): + os.makedirs(os.path.dirname(path), exist_ok=True) + open(path, "w").write(text) + print("wrote", os.path.relpath(path, ROOT)) + + +def main(): + ids = [f[0] for f in FIELDS] + assert len(ids) == len(set(ids)), "duplicate field id" + + # ---- FieldTable.mc ---- + L = ["// AUTO-GENERATED by tools/gen_fields.py -- do not edit by hand.", + "// Ids follow https://watchface.io/docs/datafields; only the fields a", + "// Connect IQ watch face can source on-device are listed.", + "import Toybox.Lang;", "", "module FieldTable {", "", + " // Field ids, in the same order as the Labels resource string.", + " const IDS = ["] + row = " " + for i, fid in enumerate(ids): + piece = "%d%s" % (fid, "," if i < len(ids) - 1 else "") + if len(row) + len(piece) > 92: + L.append(row) + row = " " + row += piece + L += [row, " ];", "", + " function indexOf(id as Number) as Number {", + " for (var i = 0; i < IDS.size(); i++) {", + " if (IDS[i] == id) { return i; }", + " }", + " return 0;", + " }", + "}"] + write(os.path.join(ROOT, "source", "FieldTable.mc"), "\n".join(L) + "\n") + + # ---- settings.xml ---- + S = ['', '', + ' ', + ' '] + names = ["Ember", "Aurora", "Brass", "Voltage", "Reef", "Acid", "Kelp"] + for i, n in enumerate(names): + S.append(' @Strings.Theme%s' % (i + 1, n)) + S += [' ', ' ', ''] + for slot, _, _ in SLOTS: + S += [' ' % (slot, slot), + ' ', field_list(12), + ' ', ' ', ''] + for ring in ("RingTR", "RingTL", "RingBR", "RingBL"): + S += [' ' % (ring, ring), + ' '] + for rid, key, _, _ in RING: + S.append(' @Strings.Metric%s' % (rid, key)) + S += [' ', ' ', ''] + S.append(OTHER_SETTINGS.rstrip()) + S.append('') + write(os.path.join(ROOT, "resources", "settings", "settings.xml"), "\n".join(S) + "\n") + + # ---- field strings, both languages ---- + for lang, folder, ni, li in (("en", "resources", 2, 4), ("chn", "resources-chn", 3, 5)): + X = [''] + X.append(' ') + for f in FIELDS: + X.append(' %s' % (f[1], f[ni])) + X.append('') + X.append(' ') + X.append(' %s' + % ",".join(f[li] for f in FIELDS)) + X.append('') + for rid, key, en, cn in RING: + X.append(' %s' % (key, en if lang == "en" else cn)) + X.append('') + write(os.path.join(ROOT, folder, "strings", "fields.xml"), "\n".join(X) + "\n") + + print("%d fields, %d slots" % (len(FIELDS), len(SLOTS))) + + +if __name__ == "__main__": + main() diff --git a/tools/gen_icons.py b/tools/gen_icons.py new file mode 100644 index 0000000..69e5ce5 --- /dev/null +++ b/tools/gen_icons.py @@ -0,0 +1,199 @@ +#!/usr/bin/env python3 +"""Rasterise the design's icon paths into tintable bitmap resources. + +The sunrise and weather icons in design/*.svg are traced outlines whose finest +features are two or three design pixels across. Redrawing them from circles +and lines works at 454 px and falls apart at 280 px, where those features land +under one device pixel. Rendering the real paths once per screen size and +blitting them with drawBitmap2(:tintColor) keeps them exact everywhere. + + python3 tools/gen_icons.py + +Writes resources-icons-/drawables/{sunrise,sunset,weather}.png plus the +matching drawables.xml. White pixels, alpha coverage; the theme's accent +colour is applied at draw time via :tintColor. + +MIP devices have no alpha blending, so for those widths the coverage mask is +thresholded to hard edges rather than left antialiased -- a soft edge there +would be quantised to something muddier than a clean one. +""" +import os +import re + +HERE = os.path.dirname(os.path.abspath(__file__)) +ROOT = os.path.dirname(HERE) +SRC = os.path.join(ROOT, "design", "watchface-01-ember.svg") + +try: + from PIL import Image +except ImportError: + raise SystemExit("this generator needs Pillow: python3 -m pip install pillow") + +# The three icons the comps actually contain, and the design-space centre each +# one is drawn around. A common 32x32 design box keeps blitting trivial. +BOX = 32.0 +ICONS = { + "sunrise": ("sunrise-icon", 156.32, 89.5, False), + "sunset": ("sunrise-icon", 156.32, 89.5, True), # same art, chevron flipped + "weather": ("weather-icon", 343.55, 89.5, False), +} + +# screen width -> whether the panel can blend alpha (MIP cannot) +WIDTHS = {240: False, 260: False, 280: False, 390: True, 416: True, 454: True} + +SS = 8 # supersampling factor + + +def subpaths(svg, pid): + d = re.search(r'= 3: + out.append(pts) + return out + + +def flip_chevron(paths): + """Mirror the horizon bar so its notch points up -- our sunset variant.""" + out = [] + for p in paths: + ys = [q[1] for q in p] + if min(ys) > 96.0: # the bar is the lowest subpath + mid = (min(ys) + max(ys)) / 2.0 + p = [(x, 2 * mid - y) for x, y in p] + out.append(p) + return out + + +def scanline_evenodd(paths, size, ox, oy, scale): + """Even-odd fill at supersampled resolution, returned as a coverage mask.""" + n = size * SS + cov = [bytearray(n) for _ in range(n)] + edges = [] + for p in paths: + for i in range(len(p)): + x0, y0 = p[i] + x1, y1 = p[(i + 1) % len(p)] + X0 = (x0 - ox) * scale * SS + Y0 = (y0 - oy) * scale * SS + X1 = (x1 - ox) * scale * SS + Y1 = (y1 - oy) * scale * SS + if Y0 != Y1: + edges.append((Y0, Y1, X0, X1)) + for row in range(n): + yc = row + 0.5 + xs = [] + for Y0, Y1, X0, X1 in edges: + if (Y0 <= yc < Y1) or (Y1 <= yc < Y0): + xs.append(X0 + (yc - Y0) * (X1 - X0) / (Y1 - Y0)) + if not xs: + continue + xs.sort() + line = cov[row] + for i in range(0, len(xs) - 1, 2): + a = max(0, int(round(xs[i]))) + b = min(n, int(round(xs[i + 1]))) + for x in range(a, b): + line[x] = 255 + return cov + + +def render(paths, size, cx, cy, blend): + scale = size / BOX + ox, oy = cx - BOX / 2, cy - BOX / 2 + cov = scanline_evenodd(paths, size, ox, oy, scale) + n = size * SS + big = Image.frombytes("L", (n, n), b"".join(bytes(r) for r in cov)) + small = big.resize((size, size), Image.LANCZOS) + if not blend: + small = small.point(lambda v: 255 if v >= 110 else 0) + white = Image.new("RGB", (size, size), (255, 255, 255)) + img = white.convert("RGBA") + img.putalpha(small) + return img + + +# Launcher icon sizes the target devices ask for. +LAUNCHER = [40, 56, 60, 65, 70] + + +def launcher(size): + """A miniature of the face: the gradient ring plus the date band.""" + from PIL import ImageDraw + ss = 8 + n = size * ss + img = Image.new("RGBA", (n, n), (0, 0, 0, 0)) + d = ImageDraw.Draw(img) + d.ellipse([0, 0, n - 1, n - 1], fill=(0, 0, 0, 255)) + svg = open(SRC).read() + top = re.findall(r'fill="(#[0-9A-Fa-f]{6})"', + re.search(r'(.*?)', svg, re.S).group(1)) + bot = re.findall(r'fill="(#[0-9A-Fa-f]{6})"', + re.search(r'(.*?)', svg, re.S).group(1)) + ro, ri = n * 0.495, n * 0.375 + box_o = [n / 2 - ro, n / 2 - ro, n / 2 + ro, n / 2 + ro] + # sweep the whole rim, mirroring the comp's two ramps into four quadrants + for q, ramp in ((0, top), (1, top), (2, bot), (3, bot)): + for i, c in enumerate(ramp): + col = tuple(int(c[1 + 2 * j:3 + 2 * j], 16) for j in range(3)) + (255,) + span = 90.0 / len(ramp) + if q == 0: + a0 = -90 + i * span + elif q == 1: + a0 = -90 - (i + 1) * span + elif q == 2: + a0 = 90 - (i + 1) * span + else: + a0 = 90 + i * span + d.pieslice(box_o, a0, a0 + span, fill=col) + d.ellipse([n / 2 - ri, n / 2 - ri, n / 2 + ri, n / 2 + ri], fill=(0, 0, 0, 255)) + band = tuple(int("FEAA00"[2 * j:2 * j + 2], 16) for j in range(3)) + (255,) + d.rectangle([0, n * 0.44, n, n * 0.60], fill=band) + mask = Image.new("L", (n, n), 0) + ImageDraw.Draw(mask).ellipse([0, 0, n - 1, n - 1], fill=255) + img.putalpha(mask) + return img.resize((size, size), Image.LANCZOS) + + +def main(): + svg = open(SRC).read() + for size in LAUNCHER: + outdir = os.path.join(ROOT, "resources-launcher-%d" % size, "drawables") + os.makedirs(outdir, exist_ok=True) + launcher(size).save(os.path.join(outdir, "launcher_icon.png")) + with open(os.path.join(outdir, "drawables.xml"), "w") as f: + f.write('\n' + ' \n' + '\n') + print("wrote %s (%dx%d)" % (outdir, size, size)) + cache = {} + for width, blend in sorted(WIDTHS.items()): + size = int(round(BOX * width / 500.0)) + outdir = os.path.join(ROOT, "resources-icons-%d" % width, "drawables") + os.makedirs(outdir, exist_ok=True) + names = [] + for name, (pid, cx, cy, flip) in ICONS.items(): + key = (pid, flip) + if key not in cache: + p = subpaths(svg, pid) + cache[key] = flip_chevron(p) if flip else p + img = render(cache[key], size, cx, cy, blend) + img.save(os.path.join(outdir, "%s.png" % name)) + names.append(name) + with open(os.path.join(outdir, "drawables.xml"), "w") as f: + f.write("\n") + for n in names: + # packingFormat="png" keeps the alpha channel instead of + # collapsing the image to a palette; drawBitmap2(:tintColor) + # refuses a palettised source. + f.write(' \n' % (n.capitalize(), n)) + f.write("\n") + print("wrote %s (%dx%d, %s edges)" + % (outdir, size, size, "soft" if blend else "hard")) + + +if __name__ == "__main__": + main()