From 8713eb3d0c4e0c58417b827ce3e4c9c6381cc516 Mon Sep 17 00:00:00 2001
From: Peter Storch <peter.storch@tuta.io>
Date: Wed, 7 Apr 2021 07:48:38 +0200
Subject: [PATCH] fix #698 added activity icon for kayaking

---
 drawable-svg/ic_activity_kayaking.svg         | 57 +++++++++++++++++++
 .../opentracks/util/TrackIconUtils.java       |  8 ++-
 .../drawable/ic_activity_kayaking_24dp.xml    | 10 ++++
 3 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 drawable-svg/ic_activity_kayaking.svg
 create mode 100644 src/main/res/drawable/ic_activity_kayaking_24dp.xml

diff --git a/drawable-svg/ic_activity_kayaking.svg b/drawable-svg/ic_activity_kayaking.svg
new file mode 100644
index 000000000..6ef3c8324
--- /dev/null
+++ b/drawable-svg/ic_activity_kayaking.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="22"
+   width="22"
+   fill="#000000"
+   version="1.0"
+   x="0px"
+   y="0px"
+   viewBox="0 0 21.84952 21.99934"
+   enable-background="new 0 0 99.316 99.997"
+   xml:space="preserve"
+   id="svg10"
+   sodipodi:docname="ic_activity_kayaking.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"><metadata
+     id="metadata16"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+     id="defs14" /><sodipodi:namedview
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1024"
+     id="namedview12"
+     showgrid="false"
+     inkscape:pagecheckerboard="false"
+     inkscape:zoom="22.472123"
+     inkscape:cx="11.932326"
+     inkscape:cy="8.4821218"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg10"
+     inkscape:document-rotation="0" /><path
+     id="path2"
+     style="fill:#ffffff;stroke-width:0.20758"
+     d="m 18.296044,13.516712 c -1.017125,-0.01824 -1.903328,0.770666 -2.945647,0.500454 -0.952298,-0.271819 -1.950516,-0.765534 -2.949277,-0.338881 -0.938402,0.492101 -2.078868,0.493759 -3.017025,0 C 8.3845167,13.251481 7.3852162,13.744815 6.4321693,14.017166 5.229901,14.31201 4.2005498,13.256398 2.9984219,13.558671 2.2076549,13.806805 1.0222411,14.11299 1.0222411,14.11299 v 1.764949 c 1.0226762,0.01947 1.9128198,-0.776355 2.9601398,-0.498166 0.4416703,0.216761 1.6682446,0.3639 1.6529583,0.601941 l -1.3879215,1.383539 c -0.7385797,-0.502111 -1.5118619,0.0527 -1.9901253,0.625328 -0.5087615,0.568011 -1.1635382,1.025896 -1.5505475,1.687065 -0.44607206,0.952772 0.6576964,2.056499 1.6104671,1.610525 0.7016688,-0.428027 1.2006595,-1.122907 1.8093513,-1.672458 0.6218606,-0.429609 0.7776032,-1.247655 0.6297837,-1.861615 l 2.0038313,-1.999046 c 0.9553792,-0.44042 2.0942104,-0.606317 3.0559286,-0.07975 0.9566571,0.429062 1.9815791,0.09313 2.8934291,-0.263824 1.038124,-0.339466 1.95525,0.382078 2.955963,0.461915 1.087184,0.105691 2.019821,-0.784126 3.121615,-0.493622 0.55673,-0.01509 1.943197,1.034046 1.977683,0.148315 v -1.471252 c -0.878739,0.05089 -1.592095,-0.588897 -2.468753,-0.540124 z"
+     sodipodi:nodetypes="sccccccccccccccccccccccss" /><path
+     id="path4"
+     style="fill:#ffffff;stroke-width:0.20758"
+     d="M 19.135498,4.6094374 C 19.777729,3.9239548 20.518106,3.3189058 21.090567,2.5760423 21.630775,1.6723294 20.631775,0.46345938 19.642408,0.81572972 18.952145,1.1177762 18.525406,1.7968856 17.966518,2.2833866 17.44088,2.7777653 16.748383,3.4079168 17.123672,4.2079927 17.316456,4.5791871 16.670933,4.8230987 16.479267,5.1359209 L 15.065885,6.5509368 C 13.459538,5.9569743 11.849312,5.3583867 10.246781,4.7652258 9.2045735,4.5310231 8.2546176,5.3827898 8.1060604,6.3824119 7.7002321,7.7689937 7.2645314,9.1479847 6.8776693,10.539386 h -5.851069 v 2.366209 c 1.0341353,-0.06583 1.9719234,-0.790016 3.0482038,-0.491433 0.8514673,0.182595 1.7032854,0.742921 2.5975093,0.377297 1.0893234,-0.553582 2.4097276,-0.562618 3.4983496,-0.0022 0.895986,0.368665 1.751474,-0.190407 2.60469,-0.37517 1.078334,-0.302717 2.015803,0.427862 3.051521,0.490909 0.985146,-0.07753 1.867505,-0.470806 2.884112,-0.579104 0.847652,-0.0903 2.163908,-1.785603 2.163908,-1.785603 0,0 -1.819193,-0.01538 -2.935123,0.0029 -1.990467,-2.45e-4 -3.980934,-0.0021 -5.9714,-0.0044 l 2.483907,-2.4814163 c 0.762424,0.5726687 1.957001,-0.3877847 1.20272,-1.1977389 l 2.032212,-2.039685 c 0.462782,0.2519942 1.079225,0.1706574 1.448288,-0.2104864 z m -8.060346,5.9299486 c -0.486522,0.101516 -0.612149,-0.06543 -0.374498,-0.502616 l 0.909432,-3.029364 2.189559,0.8099787 z"
+     sodipodi:nodetypes="cccccccccccccccccsccccccccccccc" /><path
+     id="path851"
+     style="fill:#ffffff;stroke-width:1.16861"
+     d="m 12.520186,2.6733336 c 0.05505,1.1807821 -1.406378,2.0132887 -2.394197,1.3656163 -1.0445314,-0.553724 -1.0179219,-2.235304 0.04332,-2.7559413 1.018447,-0.59197226 2.378758,0.20782 2.350878,1.390325 z" /></svg>
diff --git a/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java b/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java
index 6eed23eda..0fd2d6511 100644
--- a/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java
@@ -38,6 +38,7 @@ public class TrackIconUtils {
     private static final String BIKE = "BIKE";
     private static final String MOUNTAIN_BIKE = "MOUNTAIN_BIKE";
     private static final String MOTOR_BIKE = "MOTOR_BIKE";
+    private static final String KAYAK = "KAYAK";
     private static final String BOAT = "BOAT";
     private static final String SAILING = "SAILING";
     private static final String DRIVE = "DRIVE";
@@ -67,6 +68,7 @@ public class TrackIconUtils {
     private static final int[] SKI_LIST = new int[]{R.string.activity_type_cross_country_skiing, R.string.activity_type_skiing};
     private static final int[] SNOW_BOARDING_LIST = new int[]{R.string.activity_type_snow_boarding};
     private static final int[] SKATE_BOARDING_LIST = new int[]{R.string.activity_type_skate_boarding};
+    private static final int[] KAYAKING_LIST = new int[]{R.string.activity_type_kayaking};
     private static final int[] WALK_LIST = new int[]{R.string.activity_type_hiking, R.string.activity_type_off_trail_hiking, R.string.activity_type_speed_walking, R.string.activity_type_trail_hiking, R.string.activity_type_walking};
 
     // List of icons whose sports associated use speed (in km/h or mi/h).
@@ -78,7 +80,7 @@ public class TrackIconUtils {
             // All bike categories.
             R.string.activity_type_biking, R.string.activity_type_cycling, R.string.activity_type_dirt_bike, R.string.activity_type_motor_bike, R.string.activity_type_mountain_biking, R.string.activity_type_road_biking, R.string.activity_type_track_cycling, R.string.activity_type_inline_skating,
             // All boat categories.
-            R.string.activity_type_boat, R.string.activity_type_ferry, R.string.activity_type_motor_boating, R.string.activity_type_rc_boat, R.string.activity_type_sailing,
+            R.string.activity_type_boat, R.string.activity_type_ferry, R.string.activity_type_motor_boating, R.string.activity_type_rc_boat, R.string.activity_type_sailing, R.string.activity_type_kayaking,
             // All drive categories.
             R.string.activity_type_atv, R.string.activity_type_driving, R.string.activity_type_driving_bus, R.string.activity_type_driving_car, R.string.activity_type_escooter, R.string.activity_type_skate_boarding,
             // All wintersport categories
@@ -104,6 +106,7 @@ public class TrackIconUtils {
         MAP.put(MOTOR_BIKE, new Pair<>(R.string.activity_type_motor_bike, R.drawable.ic_activity_motorbike_24dp));
         MAP.put(DRIVE, new Pair<>(R.string.activity_type_driving, R.drawable.ic_activity_drive_24dp));
         MAP.put(AIRPLANE, new Pair<>(R.string.activity_type_airplane, R.drawable.ic_activity_flight_24dp));
+        MAP.put(KAYAK, new Pair<>(R.string.activity_type_kayaking, R.drawable.ic_activity_kayaking_24dp));
         MAP.put(BOAT, new Pair<>(R.string.activity_type_boat, R.drawable.ic_activity_boat_24dp));
         MAP.put(SAILING, new Pair<>(R.string.activity_type_sailing, R.drawable.ic_activity_sailing_24dp));
     }
@@ -170,6 +173,9 @@ public class TrackIconUtils {
         if (inList(context, activityType, MOTOR_BIKE_LIST)) {
             return MOTOR_BIKE;
         }
+        if (inList(context, activityType, KAYAKING_LIST)) {
+            return KAYAK;
+        }
         if (inList(context, activityType, BOAT_LIST)) {
             return BOAT;
         }
diff --git a/src/main/res/drawable/ic_activity_kayaking_24dp.xml b/src/main/res/drawable/ic_activity_kayaking_24dp.xml
new file mode 100644
index 000000000..7023b467c
--- /dev/null
+++ b/src/main/res/drawable/ic_activity_kayaking_24dp.xml
@@ -0,0 +1,10 @@
+<vector android:height="24dp" android:viewportHeight="21.99934"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="21.84952" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffff"
+        android:pathData="m18.296,13.5167c-1.0171,-0.0182 -1.9033,0.7707 -2.9456,0.5005 -0.9523,-0.2718 -1.9505,-0.7655 -2.9493,-0.3389 -0.9384,0.4921 -2.0789,0.4938 -3.017,0C8.3845,13.2515 7.3852,13.7448 6.4322,14.0172 5.2299,14.312 4.2005,13.2564 2.9984,13.5587 2.2077,13.8068 1.0222,14.113 1.0222,14.113v1.7649c1.0227,0.0195 1.9128,-0.7764 2.9601,-0.4982 0.4417,0.2168 1.6682,0.3639 1.653,0.6019l-1.3879,1.3835c-0.7386,-0.5021 -1.5119,0.0527 -1.9901,0.6253 -0.5088,0.568 -1.1635,1.0259 -1.5505,1.6871 -0.4461,0.9528 0.6577,2.0565 1.6105,1.6105 0.7017,-0.428 1.2007,-1.1229 1.8094,-1.6725 0.6219,-0.4296 0.7776,-1.2477 0.6298,-1.8616l2.0038,-1.999c0.9554,-0.4404 2.0942,-0.6063 3.0559,-0.0798 0.9567,0.4291 1.9816,0.0931 2.8934,-0.2638 1.0381,-0.3395 1.9553,0.3821 2.956,0.4619 1.0872,0.1057 2.0198,-0.7841 3.1216,-0.4936 0.5567,-0.0151 1.9432,1.034 1.9777,0.1483v-1.4713c-0.8787,0.0509 -1.5921,-0.5889 -2.4688,-0.5401z" android:strokeWidth="0.20758"/>
+    <path android:fillColor="#ffffff"
+        android:pathData="M19.1355,4.6094C19.7777,3.924 20.5181,3.3189 21.0906,2.576 21.6308,1.6723 20.6318,0.4635 19.6424,0.8157 18.9521,1.1178 18.5254,1.7969 17.9665,2.2834 17.4409,2.7778 16.7484,3.4079 17.1237,4.208 17.3165,4.5792 16.6709,4.8231 16.4793,5.1359L15.0659,6.5509C13.4595,5.957 11.8493,5.3584 10.2468,4.7652 9.2046,4.531 8.2546,5.3828 8.1061,6.3824 7.7002,7.769 7.2645,9.148 6.8777,10.5394h-5.8511v2.3662c1.0341,-0.0658 1.9719,-0.79 3.0482,-0.4914 0.8515,0.1826 1.7033,0.7429 2.5975,0.3773 1.0893,-0.5536 2.4097,-0.5626 3.4983,-0.0022 0.896,0.3687 1.7515,-0.1904 2.6047,-0.3752 1.0783,-0.3027 2.0158,0.4279 3.0515,0.4909 0.9851,-0.0775 1.8675,-0.4708 2.8841,-0.5791 0.8477,-0.0903 2.1639,-1.7856 2.1639,-1.7856 0,0 -1.8192,-0.0154 -2.9351,0.0029 -1.9905,-0.0002 -3.9809,-0.0021 -5.9714,-0.0044l2.4839,-2.4814c0.7624,0.5727 1.957,-0.3878 1.2027,-1.1977l2.0322,-2.0397c0.4628,0.252 1.0792,0.1707 1.4483,-0.2105zM11.0752,10.5394c-0.4865,0.1015 -0.6121,-0.0654 -0.3745,-0.5026l0.9094,-3.0294 2.1896,0.81z" android:strokeWidth="0.20758"/>
+    <path android:fillColor="#ffffff"
+        android:pathData="m12.5202,2.6733c0.0551,1.1808 -1.4064,2.0133 -2.3942,1.3656 -1.0445,-0.5537 -1.0179,-2.2353 0.0433,-2.7559 1.0184,-0.592 2.3788,0.2078 2.3509,1.3903z" android:strokeWidth="1.16861"/>
+</vector>