From 51af6f5c10a31deb01dc32ef5cb0e08bc206f626 Mon Sep 17 00:00:00 2001
From: Yoshinori Ikarashi <yoosee@gmail.com>
Date: Tue, 16 Mar 2021 15:05:13 +0900
Subject: [PATCH] Modified for SDK 4.2. Fixed date string width issue.

---
 app/index.js        | 10 +++++-----
 companion/index.js  |  2 +-
 package.json        | 20 +++++++++++++-------
 package.old.txt     | 28 ++++++++++++++++++++++++++++
 resources/index.gui |  5 +++--
 5 files changed, 50 insertions(+), 15 deletions(-)
 create mode 100644 package.old.txt

diff --git a/app/index.js b/app/index.js
index 5d2eb79..b58f7bd 100644
--- a/app/index.js
+++ b/app/index.js
@@ -3,11 +3,11 @@ import { units, locale, preferences } from "user-settings";
 import { display } from "display";
 
 import * as util from "../common/utils";
-import * as myActivity from "components/activity";
-import * as myClock from "components/clock";
-import * as myHRM from "components/hrm";
-import * as mySettings from "components/device-settings";
-import * as myWeather from "components/weather"
+import * as myActivity from "./components/activity";
+import * as myClock from "./components/clock";
+import * as myHRM from "./components/hrm";
+import * as mySettings from "./components/device-settings";
+import * as myWeather from "./components/weather"
 
 /* -------- UI Components --------- */
 
diff --git a/companion/index.js b/companion/index.js
index c1c8458..1759ba7 100644
--- a/companion/index.js
+++ b/companion/index.js
@@ -1,4 +1,4 @@
-import * as mySettings from "companion-settings";
+import * as mySettings from "./companion-settings";
 import Weather from '../common/weather/companion';
 
 let weather = new Weather;
diff --git a/package.json b/package.json
index eed29eb..b4bf150 100644
--- a/package.json
+++ b/package.json
@@ -1,25 +1,31 @@
 {
+  "devDependencies": {
+    "@fitbit/sdk": "~4.2.0"
+  },
   "fitbit": {
     "appUUID": "1faf9a7a-9edd-4998-b047-57c93dbd6a62",
     "appType": "clockface",
     "appDisplayName": "Obsidian",
     "iconFile": "resources/icon.png",
-    "wipeColor": "#607d8b",
+    "wipeColor": "",
     "requestedPermissions": [
       "access_activity",
+      "access_user_profile",
       "access_heart_rate",
       "access_location",
-      "run_background",
-      "access_user_profile",
-      "access_internet"
+      "access_internet",
+      "run_background"
     ],
     "buildTargets": [
-      "meson"
+      "meson",
+      "mira",
+      "gemini"
     ],
     "i18n": {
-      "en": {
+      "en-US": {
         "name": "Obsidian"
       }
-    }
+    },
+    "defaultLanguage": "en-US"
   }
 }
\ No newline at end of file
diff --git a/package.old.txt b/package.old.txt
new file mode 100644
index 0000000..3004b41
--- /dev/null
+++ b/package.old.txt
@@ -0,0 +1,28 @@
+{
+  "devDependencies": {
+    "@fitbit/sdk": "~4.2.0"
+  },
+  "fitbit": {
+    "appUUID": "1faf9a7a-9edd-4998-b047-57c93dbd6a62",
+    "appType": "clockface",
+    "appDisplayName": "Obsidian",
+    "iconFile": "resources/icon.png",
+    "wipeColor": "#607d8b",
+    "requestedPermissions": [
+      "access_activity",
+      "access_heart_rate",
+      "access_location",
+      "run_background",
+      "access_user_profile",
+      "access_internet"
+    ],
+    "buildTargets": [
+    ],
+    "i18n": {
+      "en-US": {
+        "name": "Obsidian"
+      }
+    },
+    "defaultLanguage": "en-US"
+  }
+}
\ No newline at end of file
diff --git a/resources/index.gui b/resources/index.gui
index fb09709..5bc32c9 100644
--- a/resources/index.gui
+++ b/resources/index.gui
@@ -96,9 +96,10 @@
     </use>
   </svg> 
  
+  
   <!-- Day of Week and Date -->
-  <text id="dateStr" x="77%" y="53%" font-size="24" font-family="Tungsten-Medium" class="dateText"
-        text-anchor="middle" text-length="6">-</text>
+  <text id="dateStr" x="77%" y="53%" font-size="25" font-family="Tungsten-Medium" class="dateText"
+        text-anchor="middle" text-length="8">-</text>
   
   <!-- Clock hands mins, hours and seconds -->
   <g id="mins" pointer-events="visible" transform="translate(50%,50%)">