diff --git a/app.json b/app.json index 49b6be9..d3f47ad 100644 --- a/app.json +++ b/app.json @@ -6,7 +6,7 @@ "appType": "watchface", "version": { "code": 1, - "name": "1.0.6" + "name": "1.1.0" }, "icon": "icon.png", "vender": "zepp", @@ -51,6 +51,9 @@ "i18n": { "en-US": { "appName": "VHS Watch" + }, + "ru-RU": { + "appName": "VHS Watch" } }, "defaultLanguage": "en-US" diff --git a/assets/390x450-amazfit-gts-4/misc/week.kra b/assets/390x450-amazfit-gts-4/misc/week.kra new file mode 100644 index 0000000..a567048 Binary files /dev/null and b/assets/390x450-amazfit-gts-4/misc/week.kra differ diff --git a/assets/390x450-amazfit-gts-4/week/WeekEn/Friday.PNG b/assets/390x450-amazfit-gts-4/week/WeekEn/Friday.PNG new file mode 100644 index 0000000..3acd2a7 Binary files /dev/null and b/assets/390x450-amazfit-gts-4/week/WeekEn/Friday.PNG differ diff --git a/assets/390x450-amazfit-gts-4/week/WeekEn/Monday.PNG b/assets/390x450-amazfit-gts-4/week/WeekEn/Monday.PNG new file mode 100644 index 0000000..567fbfe Binary files /dev/null and b/assets/390x450-amazfit-gts-4/week/WeekEn/Monday.PNG differ diff --git a/assets/390x450-amazfit-gts-4/week/WeekEn/Saturday.PNG b/assets/390x450-amazfit-gts-4/week/WeekEn/Saturday.PNG new file mode 100644 index 0000000..6f98d2a Binary files /dev/null and b/assets/390x450-amazfit-gts-4/week/WeekEn/Saturday.PNG differ diff --git a/assets/390x450-amazfit-gts-4/week/WeekEn/Sunday.PNG b/assets/390x450-amazfit-gts-4/week/WeekEn/Sunday.PNG new file mode 100644 index 0000000..9975322 Binary files /dev/null and b/assets/390x450-amazfit-gts-4/week/WeekEn/Sunday.PNG differ diff --git a/assets/390x450-amazfit-gts-4/week/WeekEn/Thursday.PNG b/assets/390x450-amazfit-gts-4/week/WeekEn/Thursday.PNG new file mode 100644 index 0000000..860a6df Binary files /dev/null and b/assets/390x450-amazfit-gts-4/week/WeekEn/Thursday.PNG differ diff --git a/assets/390x450-amazfit-gts-4/week/WeekEn/Tuesday.PNG b/assets/390x450-amazfit-gts-4/week/WeekEn/Tuesday.PNG new file mode 100644 index 0000000..78220e1 Binary files /dev/null and b/assets/390x450-amazfit-gts-4/week/WeekEn/Tuesday.PNG differ diff --git a/assets/390x450-amazfit-gts-4/week/WeekEn/Wednesday.PNG b/assets/390x450-amazfit-gts-4/week/WeekEn/Wednesday.PNG new file mode 100644 index 0000000..fb238b1 Binary files /dev/null and b/assets/390x450-amazfit-gts-4/week/WeekEn/Wednesday.PNG differ diff --git a/assets/390x450-amazfit-gts-4/week/WeekRu/Воскресенье.PNG b/assets/390x450-amazfit-gts-4/week/WeekRu/Воскресенье.PNG new file mode 100644 index 0000000..4fcdfe9 Binary files /dev/null and b/assets/390x450-amazfit-gts-4/week/WeekRu/Воскресенье.PNG differ diff --git a/assets/390x450-amazfit-gts-4/week/WeekRu/Вторник.PNG b/assets/390x450-amazfit-gts-4/week/WeekRu/Вторник.PNG new file mode 100644 index 0000000..ffe4bdd Binary files /dev/null and b/assets/390x450-amazfit-gts-4/week/WeekRu/Вторник.PNG differ diff --git a/assets/390x450-amazfit-gts-4/week/WeekRu/Понедельник.PNG b/assets/390x450-amazfit-gts-4/week/WeekRu/Понедельник.PNG new file mode 100644 index 0000000..c9c97ca Binary files /dev/null and b/assets/390x450-amazfit-gts-4/week/WeekRu/Понедельник.PNG differ diff --git a/assets/390x450-amazfit-gts-4/week/WeekRu/Пятница.PNG b/assets/390x450-amazfit-gts-4/week/WeekRu/Пятница.PNG new file mode 100644 index 0000000..6cffc24 Binary files /dev/null and b/assets/390x450-amazfit-gts-4/week/WeekRu/Пятница.PNG differ diff --git a/assets/390x450-amazfit-gts-4/week/WeekRu/Среда.PNG b/assets/390x450-amazfit-gts-4/week/WeekRu/Среда.PNG new file mode 100644 index 0000000..256f37e Binary files /dev/null and b/assets/390x450-amazfit-gts-4/week/WeekRu/Среда.PNG differ diff --git a/assets/390x450-amazfit-gts-4/week/WeekRu/Суббота.PNG b/assets/390x450-amazfit-gts-4/week/WeekRu/Суббота.PNG new file mode 100644 index 0000000..bed57ed Binary files /dev/null and b/assets/390x450-amazfit-gts-4/week/WeekRu/Суббота.PNG differ diff --git a/assets/390x450-amazfit-gts-4/week/WeekRu/Четверг.PNG b/assets/390x450-amazfit-gts-4/week/WeekRu/Четверг.PNG new file mode 100644 index 0000000..aacbac0 Binary files /dev/null and b/assets/390x450-amazfit-gts-4/week/WeekRu/Четверг.PNG differ diff --git a/package.json b/package.json index c7b9217..010d58d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vhs-watch", - "version": "1.0.6", + "version": "1.1.0", "description": "vhs watch for Zepp OS 3.0 (GTS 4)", "main": "app.js", "scripts": { diff --git a/watchface/fontData/primaryFont.js b/watchface/fontData/primaryFont.js index 4079710..1d6f20f 100644 --- a/watchface/fontData/primaryFont.js +++ b/watchface/fontData/primaryFont.js @@ -9,4 +9,4 @@ export default [ 'clk/7.PNG', 'clk/8.PNG', 'clk/9.PNG' -]; \ No newline at end of file +] \ No newline at end of file diff --git a/watchface/fontData/secondaryFont.js b/watchface/fontData/secondaryFont.js index 82183a9..cbdb907 100644 --- a/watchface/fontData/secondaryFont.js +++ b/watchface/fontData/secondaryFont.js @@ -9,4 +9,4 @@ export default [ 'date/7.PNG', 'date/8.PNG', 'date/9.PNG' -]; \ No newline at end of file +] \ No newline at end of file diff --git a/watchface/fontData/weekData.js b/watchface/fontData/weekData.js new file mode 100644 index 0000000..3504319 --- /dev/null +++ b/watchface/fontData/weekData.js @@ -0,0 +1,19 @@ +export const en = [ + 'week/WeekEn/Monday.PNG', + 'week/WeekEn/Tuesday.PNG', + 'week/WeekEn/Wednesday.PNG', + 'week/WeekEn/Thursday.PNG', + 'week/WeekEn/Friday.PNG', + 'week/WeekEn/Saturday.PNG', + 'week/WeekEn/Sunday.PNG' +] + +export const ru = [ + 'week/WeekRu/Понедельник.PNG', + 'week/WeekRu/Вторник.PNG', + 'week/WeekRu/Среда.PNG', + 'week/WeekRu/Четверг.PNG', + 'week/WeekRu/Пятница.PNG', + 'week/WeekRu/Суббота.PNG', + 'week/WeekRu/Воскресенье.PNG' +] \ No newline at end of file diff --git a/watchface/index.js b/watchface/index.js index 1210357..d0f1010 100644 --- a/watchface/index.js +++ b/watchface/index.js @@ -3,6 +3,7 @@ import clockModule from "./modules/clock" import dateModule from "./modules/date" import distanceModule from "./modules/distance" import heartRateModule from "./modules/heartRate" +import weekModule from "./modules/week" WatchFace({ onInit() { @@ -11,6 +12,7 @@ WatchFace({ batteryModule() heartRateModule() distanceModule() + weekModule() }, build() { diff --git a/watchface/modules/distance.js b/watchface/modules/distance.js index defb3fe..1c53b1e 100644 --- a/watchface/modules/distance.js +++ b/watchface/modules/distance.js @@ -1,6 +1,6 @@ import { getScene, SCENE_AOD } from '@zos/app' -import * as hmUI from '@zos/ui'; -import secondaryFont from '../fontData/secondaryFont'; +import * as hmUI from '@zos/ui' +import secondaryFont from '../fontData/secondaryFont' const moduleX = 50 const moduleY = 405 @@ -24,7 +24,7 @@ export default function () { hmUI.createWidget(hmUI.widget.IMG, { x: moduleX + 243, y: moduleY, - src: "misc/km.png" + src: "misc/km.PNG" }) } } \ No newline at end of file diff --git a/watchface/modules/week.js b/watchface/modules/week.js new file mode 100644 index 0000000..1a6458f --- /dev/null +++ b/watchface/modules/week.js @@ -0,0 +1,34 @@ +import { getScene, SCENE_AOD } from '@zos/app' +import * as hmSetting from '@zos/settings' +import * as hmUI from '@zos/ui' +import { ru, en } from '../fontData/weekData' + +const moduleX = 225 +const moduleY = 90 + +export default function () { + console.log("[modules]: week module init") + const language = hmSetting.getLanguage() + if (getScene() != SCENE_AOD) { + switch (language) { + case 4: //ru-RU + hmUI.createWidget(hmUI.widget.IMG_WEEK, { + x: moduleX, + y: moduleY, + week_en: ru, + week_tc: ru, + week_sc: ru + }) + break; + default: + hmUI.createWidget(hmUI.widget.IMG_WEEK, { + x: moduleX, + y: moduleY, + week_en: en, + week_tc: en, + week_sc: en + }) + break; + } + } +} \ No newline at end of file