SDK5 support (#18)

* Added SDK5 support

* Updated workflows

Co-authored-by: smirko-dev <smirko@arcor.de>

.github/workflows/CodeQL.yml

@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ main ]
+    branches: [ master ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ main ]
+    branches: [ master ]
   schedule:
     - cron: '41 16 * * 4'
 

.github/workflows/FitbitBuild.yml

@@ -5,14 +5,14 @@ name: FitbitBuild
 
 on:
   push:
-    branches: [ main ]
+    branches: [ master ]
   pull_request:
-    branches: [ main ]
+    branches: [ master ]
   workflow_dispatch:
 
 jobs:
-  build:
-    name: Build
+  build-sdk4:
+    name: Build SDK4
     runs-on: ubuntu-latest
 
     steps:
@@ -24,6 +24,41 @@ jobs:
     - name: Setup node
       uses: actions/setup-node@v1
 
+    - name: Select SDK 4
+      run: cp package.sdk4.json package.json
+
+    - name: Checkout Fitbit SDK
+      run: npm add --also=dev @fitbit/sdk
+
+    - name: Checkout Fitbit SDK-CLI
+      run: npm add --also=dev @fitbit/sdk-cli
+
+    - name: Run Build
+      run: npx fitbit-build --if-present
+
+    - name: Upload artifact
+      uses: actions/upload-artifact@v2
+      if: ${{ success() }}
+      with:
+        path: build/app.fba
+        if-no-files-found: error
+
+  build-sdk5:
+    name: Build SDK5
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout branch
+      uses: actions/checkout@v2
+      with:
+          lfs: true
+
+    - name: Setup node
+      uses: actions/setup-node@v1
+
+    - name: Select SDK 5
+      run: cp package.sdk5.json package.json
+
     - name: Checkout Fitbit SDK
       run: npm add --also=dev @fitbit/sdk
 

.gitignore

@@ -2,3 +2,4 @@
 /node_modules
 /build
 /package-lock.json
+/package.json

README.md

@@ -2,8 +2,8 @@
 
 [![](https://img.shields.io/badge/Fitbit%20App%20Gallery-%2300B0B9?style=flat&logo=fitbit&logoColor=white)](https://gallery.fitbit.com/details/ae441b73-2660-407f-b796-a98d1d0583a0)
 ![languages](https://img.shields.io/badge/languages-JavaScript%20|%20CSS-blue)
-![platform](https://img.shields.io/badge/platforms-Ionic%20|%20Versa%20|%20Versa%202%20|%20Versa%20Lite-silver)
-![version](https://img.shields.io/badge/version-%201.5.1-green)
+![platform](https://img.shields.io/badge/platforms-Ionic%20|%20Versa%20|%20Versa%202%20|%20Versa%20Lite%20|%20Versa%203%20|%20Sense-silver)
+![version](https://img.shields.io/badge/version-%201.5.2-green)
 [![](https://img.shields.io/github/license/smirko-dev/fitbit-clockface.svg)](https://github.com/smirko-dev/fitbit-clockface/blob/master/LICENSE)
 [![FitbitBuild Actions Status](https://github.com/smirko-dev/fitbit-clockface/workflows/FitbitBuild/badge.svg)](https://github.com/smirko-dev/fitbit-clockface/actions)
 [![CodeQL Actions Status](https://github.com/smirko-dev/fitbit-clockface/workflows/CodeQL/badge.svg)](https://github.com/smirko-dev/fitbit-clockface/actions)
@@ -28,20 +28,22 @@ Icons are from https://materialdesignicons.com/ ([Apache license version 2.0](ht
 
 ## Screenshots
 
-### Fitbit Ionic
+![Activity](screenshots/activity.png) ![Event](screenshots/event.png)
 
-![Ionic Appointment](screenshots/ionic-event.png) ![Ionic Activity](screenshots/ionic-activity.png)
-
-### Fitbit Versa
-
-![Versa 2 Appointment](screenshots/versa2-event.png) ![Versa 2 Activity](screenshots/versa2-activity.png)
+## How to build
 
-### Settings
+Choose SDK version
 
-![Settings](screenshots/settings.png) ![Activities](screenshots/activities.png)
+| SDK | Device                            |
+|-----|-----------------------------------|
+| 4   | Versa, Versa Lite, Versa 2, Ionic |
+| 5   | Versa 3, Sense                    |
 
-## How to build
+```
+cp package.sdkX.json package.json
+```
 
+Run Fitbit CLI build
 ```
 git clone git@github.com:smirko-dev/fitbit-clockface.git
 cd fitbit-clockface

package.sdk5.json

@@ -0,0 +1,45 @@
+{
+  "name": "compactclock",
+  "version": "1.5.2",
+  "license": "MIT",
+  "devDependencies": {
+    "@fitbit/sdk": "~5.0.0",
+    "@fitbit/sdk-cli": "^1.7.3"
+  },
+  "bugs": {
+    "url": "https://github.com/smirko-dev/fitbit-clockface/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/smirko-dev/fitbit-clockface.git"
+  },
+  "fitbit": {
+    "appUUID": "ae441b73-2660-407f-b796-a98d1d0583a0",
+    "appType": "clockface",
+    "appDisplayName": "CompactClock",
+    "iconFile": "resources/icon.png",
+    "wipeColor": "",
+    "requestedPermissions": [
+      "access_calendar",
+      "run_background",
+      "access_activity"
+    ],
+    "buildTargets": [
+      "atlas",
+      "vulcan"
+    ],
+    "i18n": {
+      "en-US": {
+        "name": "CompactClock"
+      },
+      "de-DE": {
+        "name": "CompactClock"
+      }
+    },
+    "defaultLanguage": "en-US"
+  },
+  "scripts": {
+    "build": "fitbit-build",
+    "debug": "fitbit"
+  }
+}

resources/index.view

@@ -0,0 +1,10 @@
+<svg class="background">
+  <text id="hourLabel" />
+  <text id="minuteLabel" />
+  <text id="dateLabel" opacity=".8" />
+  <textarea id="appointmentsLabel" opacity=".8" pointer-events="visible" />
+  <image id="batteryImage" href="battery-alert.png" x="270" y="4%" width="24" height="24" opacity=".6" class="batteryIcon" />
+  <text id="batteryLabel" opacity=".8" />
+  <image id="activityIcon" href="steps.png" x="35%" y="80%" width="32" height="32" opacity=".8" class="activityIcon" />
+  <text id="activityLabel" opacity=".8" />
+</svg>

resources/styles.sdk5.css

@@ -0,0 +1,72 @@
+.background {
+  viewport-fill: black;
+}
+
+#hourLabel {
+  font-size: 148;
+  font-family: Colfax-Thin;
+  text-length: 32;
+  text-anchor: end;
+  x: 60%;
+  y: 55%+20;
+  fill: #2490DD;
+}
+
+#minuteLabel {
+  font-size: 96;
+  font-family: Colfax-Thin;
+  text-length: 32;
+  text-anchor: start;
+  x: 60%;
+  y: 55%+20;
+  fill: white;
+}
+
+#dateLabel {
+  font-size: 20;
+  font-family: Colfax-Regular;
+  text-length: 32;
+  text-anchor: start;
+  x: 12%;
+  y: 10%;
+  fill: white;
+}
+
+#appointmentsLabel {
+  font-size: 28;
+  font-family: Colfax-Regular;
+  text-length: 128;
+  text-anchor: start;
+  x: 12%;
+  y: 75%;
+  width: 90%;
+  fill: white;
+}
+
+#batteryLabel {
+  font-size: 20;
+  font-family: Colfax-Regular;
+  text-length: 32;
+  text-anchor: start;
+  x: 85%;
+  y: 10%;
+  fill: white;
+}
+
+#activityLabel {
+  font-size: 28;
+  font-family: Colfax-Regular;
+  text-length: 32;
+  text-anchor: start;
+  x: 35%+30;
+  y: 80%+25;
+  fill: white;
+}
+
+.activityIcon {
+  fill: #2490DD
+}
+
+.batteryIcon {
+  fill: #FFFFFF
+}

resources/widget.defs

@@ -0,0 +1,7 @@
+<svg>
+  <defs>
+    <link rel="stylesheet" href="styles.sdk5.css" />
+    <link rel="import" href="/mnt/sysassets/system_widget.defs" />
+    <link rel="import" href="/mnt/sysassets/widgets/baseview_widget.defs" />
+  </defs>
+</svg>

resources/widgets.gui

@@ -1,6 +1,6 @@
 <svg>
   <defs>
-    <link rel="stylesheet" href="styles.css" />
+    <link rel="stylesheet" href="styles.sdk4.css" />
     <link rel="import" href="/mnt/sysassets/widgets_common.gui" />
     <link rel="stylesheet" href="/mnt/sysassets/widgets/dynamic_textarea.css"/>
     <link rel="import" href="/mnt/sysassets/widgets/dynamic_textarea.gui"/>