Add support for Skiing and Trail running activity types

Includes icons and Strava support
piggz · Apr 23, 2022 · 3ee4553 · 3ee4553
1 parent b815667
commit 3ee4553
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 13 deletions.
diff --git a/daemon/src/activitykind.cpp b/daemon/src/activitykind.cpp
@@ -25,6 +25,10 @@ ActivityKind::Type ActivityKind::fromBipType(int type)
         return JumpRope;
     } else if (type == 60) {
         return Yoga;
+    } else if (type == 11) {
+        return TrailRunning;
+    } else if (type == 105) {
+        return Skiing;
     }
     return Activity;
 }
@@ -82,6 +86,12 @@ QString ActivityKind::toString(Type type)
     if (type == Yoga) {
         return "Yoga";
     }
+    if (type == TrailRunning) {
+        return "Trail Running";
+    }
+    if (type == Skiing) {
+        return "Skiing";
+    }
 
     return "Unknown";
 }
diff --git a/daemon/src/activitykind.h b/daemon/src/activitykind.h
@@ -23,7 +23,9 @@ class ActivityKind
         IndoorCycling = 0x00000800,
         EllipticalTrainer = 0x00001000,
         JumpRope = 0x00002000,
-        Yoga = 0x00004000
+        Yoga = 0x00004000,
+        TrailRunning = 0x00008000,
+        Skiing = 0x00010000
     };
 
     static Type fromBipType(int type);

diff --git a/lib/src/amazfish.cpp b/lib/src/amazfish.cpp
@@ -53,6 +53,12 @@ QString Amazfish::activityToString(Amazfish::ActivityType type)
     if (type == Amazfish::ActivityType::Yoga) {
         return "Yoga";
     }
+    if (type == Amazfish::ActivityType::TrailRunning) {
+        return "Trail Running";
+    }
+    if (type == Amazfish::ActivityType::Skiing) {
+        return "Skiing";
+    }
 
     return "Unknown";
 }
diff --git a/lib/src/amazfish.h b/lib/src/amazfish.h
@@ -24,7 +24,9 @@ class Amazfish : public QObject {
         IndoorCycling = 0x00000800,
         EllipticalTrainer = 0x00001000,
         JumpRope = 0x00002000,
-        Yoga = 0x00004000
+        Yoga = 0x00004000,
+        TrailRunning = 0x00008000,
+        Skiing = 0x00010000
     };
     Q_ENUM(ActivityType)
 

diff --git a/ui/icons.qrc b/ui/icons.qrc
@@ -28,5 +28,7 @@
         <file>qml/custom-icons/icon-m-indoor cycling.png</file>
         <file>qml/custom-icons/icon-m-swimming.png</file>
         <file>qml/custom-icons/icon-m-open swimming.png</file>
+        <file>qml/custom-icons/icon-m-skiing.png</file>
+        <file>qml/custom-icons/icon-m-trail running.png</file>
     </qresource>
 </RCC>
diff --git a/ui/qml/custom-icons/icon-m-skiing.png b/ui/qml/custom-icons/icon-m-skiing.png
diff --git a/ui/qml/custom-icons/icon-m-trail running.png b/ui/qml/custom-icons/icon-m-trail running.png
diff --git a/ui/qml/tools/JSTools.js b/ui/qml/tools/JSTools.js
@@ -232,7 +232,9 @@ var arrayStravaWorkoutTypes =
     { name: "indoor cycling", stravaType: "VirtualRide" },
     { name: "treadmill", stravaType: "VirtualRun" },
     { name: "swimming", stravaType: "Swim" },
-    { name: "open swimming", stravaType: "Swim" }
+    { name: "open swimming", stravaType: "Swim" },
+    { name: "trail running", stravaType: "Run" },
+    { name: "yoga", stravaType: "Yoga" }
 ]
 
 function toStravaType(t)

diff --git a/ui/translations/harbour-amazfish-ui.ts b/ui/translations/harbour-amazfish-ui.ts
@@ -386,43 +386,43 @@
     <name>JSTools</name>
     <message>
         <location filename="../qml/tools/JSTools.js" line="87"/>
-        <location filename="../qml/tools/JSTools.js" line="297"/>
+        <location filename="../qml/tools/JSTools.js" line="299"/>
         <source>Empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../qml/tools/JSTools.js" line="88"/>
         <location filename="../qml/tools/JSTools.js" line="89"/>
-        <location filename="../qml/tools/JSTools.js" line="298"/>
-        <location filename="../qml/tools/JSTools.js" line="299"/>
+        <location filename="../qml/tools/JSTools.js" line="300"/>
+        <location filename="../qml/tools/JSTools.js" line="301"/>
         <source>Heartrate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../qml/tools/JSTools.js" line="90"/>
         <location filename="../qml/tools/JSTools.js" line="91"/>
-        <location filename="../qml/tools/JSTools.js" line="300"/>
-        <location filename="../qml/tools/JSTools.js" line="301"/>
+        <location filename="../qml/tools/JSTools.js" line="302"/>
+        <location filename="../qml/tools/JSTools.js" line="303"/>
         <source>Pace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../qml/tools/JSTools.js" line="92"/>
         <location filename="../qml/tools/JSTools.js" line="93"/>
-        <location filename="../qml/tools/JSTools.js" line="302"/>
-        <location filename="../qml/tools/JSTools.js" line="303"/>
+        <location filename="../qml/tools/JSTools.js" line="304"/>
+        <location filename="../qml/tools/JSTools.js" line="305"/>
         <source>Speed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../qml/tools/JSTools.js" line="94"/>
-        <location filename="../qml/tools/JSTools.js" line="304"/>
+        <location filename="../qml/tools/JSTools.js" line="306"/>
         <source>Altitude</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../qml/tools/JSTools.js" line="95"/>
-        <location filename="../qml/tools/JSTools.js" line="305"/>
+        <location filename="../qml/tools/JSTools.js" line="307"/>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
@@ -433,7 +433,7 @@
     </message>
     <message>
         <location filename="../qml/tools/JSTools.js" line="97"/>
-        <location filename="../qml/tools/JSTools.js" line="306"/>
+        <location filename="../qml/tools/JSTools.js" line="308"/>
         <source>Duration</source>
         <translation type="unfinished"></translation>
     </message>