Release: v3.11.0

F-Droid now signs APKs with v2, so installing on Android 11 works.
More info: #421 This reverts commit ee22fd8e
2020-09-26 20:23:32 +02:00 · 2020-09-26 19:56:22 +02:00 · 2020-09-26 19:52:48 +02:00 · 2020-09-26 16:47:51 +02:00 · 2020-09-25 18:20:32 +02:00 · 2020-09-25 12:37:58 +02:00
625 changed files with 31086 additions and 32681 deletions
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+liberapay: OpenTracks
+custom: https://play.google.com/store/apps/details?id=de.dennisguse.opentracks.playstore
@@ -1,5 +1,13 @@
 # Thanks for your contribution.

+## PLEASE REMOVE
+To support us in providing a nice (and fast) open-source experience:
+1. Verify that the tests are passing
+2. Check that the code is properly formatted (using AndroidStudio's autoformatter)
+3. Provide write access to the [branch](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)
+4. If the PR is not ready for review, please submit it as a [draft](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests#draft-pull-requests)
+## PLEASE REMOVE
+
 **Describe the pull request**
 A clear and concise description of what the pull request changes/adds.

@@ -7,4 +15,7 @@ A clear and concise description of what the pull request changes/adds.
 (If available): The link to the issue that this pull request solves.

 **License agreement**
-By opening this pull request, you are providing your contribution under the _Apache License 2.0_ (see [LICENSE.md](LICENSE.md)).
+By opening this pull request, you are providing your contribution under the _Apache License 2.0_ (see [LICENSE.md](LICENSE.md)).
+
+**Note: new dependencies/libraries**
+Please refrain from introducing new libraries without consulting the team.
@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "gradle"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
@@ -0,0 +1,34 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+  schedule:
+    - cron: '0 6 * * 1'
+
+jobs:
+  analyse:
+    name: Analyse
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 2
+
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: java
+
+    - run: |
+       ./gradlew build
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
@@ -0,0 +1,21 @@
+#https://github.com/marketplace/actions/android-emulator-runner
+name: Test
+on: [push, pull_request]
+jobs:
+  test:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        api-level: [29]
+        target: [default]
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2
+
+      - name: run tests
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ matrix.api-level }}
+          target: ${{ matrix.target }}
+          arch: x86_64
+          script: ./gradlew connectedCheck
@@ -45,19 +45,16 @@ captures/


 # IntelliJ IDEA
-*.iml
 *.iws
 /out/

 # User-specific configurations
 .idea/.name
-.idea/assetWizardSettings.xml
 .idea/caches/
 .idea/compiler.xml
 .idea/copyright/profiles_settings.xml
 .idea/dataSources.ids
 .idea/datasources.xml
-.idea/dictionaries
 .idea/dynamic.xml
 .idea/encodings.xml
 .idea/jsLibraryMappings.xml
@@ -67,14 +64,19 @@ captures/
 .idea/scopes/scope_settings.xml
 .idea/shelf/
 .idea/sqlDataSources.xml
-.idea/tasks.xml
 .idea/vcs.xml
 .idea/uiDesigner.xml
-.idea/workspace.xml
+.idea/jarRepositories.xml
+.idea/markdown-navigator-enh.xml
+.idea/markdown-navigator.xml

 # Keystore files
-# Uncomment the following line if you do not want to check your keystore files in.
-#*.jks
+*.jks

 # External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild
+
+# Fastlane
+Appfile
+releasePlayStore/*
+Gemfile.lock
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/build/classes" />
  </component>
  <component name="ProjectType">
@@ -1,45 +0,0 @@
-#See https://docs.travis-ci.com/user/languages/android/
-#See https://github.com/ankidroid/Anki-Android/blob/master/.travis.yml
-language: android
-
-env:
-  global:
-    - ADB_INSTALL_TIMEOUT=8
-    - ABI=armeabi-v7a
-    - EMU_FLAVOR=default
-    # PATH order is incredibly important. e.g. the 'emulator' script exists in more than one place!
-    - ANDROID_HOME=/usr/local/android-sdk
-    - TOOLS=${ANDROID_HOME}/tools
-    - PATH=${ANDROID_HOME}:${ANDROID_HOME}/emulator:${TOOLS}:${TOOLS}/bin:${ANDROID_HOME}/platform-tools:${PATH}
-  matrix:
-    - API=27 ABI=x86_64
-
-android:
-  components:
-    # installing tools to start, then use `sdkmanager` below to get the rest
-    - tools
-    - build-tools-28.0.3
-    - android-28
-
-# Emulator Management: Create, Start and Wait
-install:
-  - echo y | sdkmanager "platform-tools"
-  - echo y | sdkmanager --channel=4 "emulator"
-  - echo y | sdkmanager "system-images;android-$API;$EMU_FLAVOR;$ABI"
-  - echo no | avdmanager create avd --force -n test -k "system-images;android-$API;$EMU_FLAVOR;$ABI" -c 10M
-  - emulator -verbose -avd test -no-accel -no-snapshot -no-window -camera-back none -camera-front none -selinux permissive -qemu -m 2048 &
-  - android-wait-for-emulator
-  - adb shell input keyevent 82 &
-
-script:
-  - ./gradlew clean build
-  - ./gradlew connectedCheck
-
-sbefore_cache:
-  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
-  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
-cache:
-  directories:
-    - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/
-    - $HOME/.android/build-cache
@@ -0,0 +1,10 @@
+[main]
+host = https://www.transifex.com
+
+[opentracks.src-main-res-values-strings-xml--main]
+file_filter = src/main/res/values-<lang>/strings.xml
+minimum_perc = 0
+source_file = src/main/res/values/strings.xml
+source_lang = en
+type = ANDROID
+
@@ -0,0 +1,35 @@
+# How to contribute?
+
+## Testing 
+
+Just use OpenTracks and tell us what can be improved by opening an issue [here](https://github.com/OpenTracksApp/OpenTracks/issues/new/choose)
+
+If we broke things (happens now and then), please tell us also.
+
+## Coding new features
+
+You have a cool idea for a feature that is missing in OpenTracks?
+And you would like to help by implementing it?
+If not, you can just take a look at the [issue tracker](https://github.com/OpenTracksApp/OpenTracks/issues).
+
+Advices:
+* creating an issue beforehand might be a good idea
+  Sometimes it is helpful to discuss your idea and also your implementation approach first.
+  We may be able to give you some hints on how to tackle the problem.
+  It also makes merging your changes easier and, usually, faster.
+* please only add new dependencies if is absolutely necessary
+  If you need to:
+  * tell us why those are required,
+  * what alternatives are existing, and
+  * why you choose this dependency.
+  And also verify that the license(s) are compatible with _Apache 2.0_ as well as open-source.
+ 
+## Coding conventions
+
+None so far.
+Just keep it simple.
+And follow the _scout rule_. 
+
+You can take a look at existing code and get a feeling for it.
+
+Please autoformat your code using AndroidStudio's code formatter. 
@@ -1,16 +0,0 @@
-# OpenTrack: Developer information
-
-## Create releases for FDroid
-
-1. Get next _version code_ (master branch): `git rev-list HEAD --count master`
-2. Decide on _version name_ (semantic versioning)
-3. Manually update _version code_ and _version name_ in `AndroidManifest.xml` (used by FDroid)
-4. Create changelog (`_version code_.txt`)
-5. Create commit with all changes
-6. Tag newly create commit with _version name_ (e.g., v3.2.1)
-7. Push commits and tags to public repository
-8. Add changelog to tag (Github releases)  
-
-## Translations (localization)
-
-Translations of the OpenTracks are handled in Transifex: [https://www.transifex.com/opentracks](https://www.transifex.com/opentracks/).
@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "fastlane"
@@ -2,40 +2,79 @@

 _OpenTracks_ is a sport tracking application that completely respects your privacy.

-<a href="https://f-droid.org/packages/de.dennisguse.opentracks">
-    <img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" height="60">
-</a>
+<table>
+    <tr>
+        <th>Free</th>
+        <th>Paid (same as free)</th>
+        <th>Donations</th>
+        <th>Translations</th>
+    </tr>
+    <tr>
+        <td>
+            <a href="https://f-droid.org/packages/de.dennisguse.opentracks">
+                <img alt="Get it on F-Droid" src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" height="60" align="middle">
+                <br />
+                <img alt="OpenTracks version published on F-Droid" src="https://img.shields.io/f-droid/v/de.dennisguse.opentracks.svg" align="middle" >
+            </a>
+        </td>
+        <td>
+            <a href="https://play.google.com/store/apps/details?id=de.dennisguse.opentracks.playstore">
+                <img alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png" height="60" align="middle">
+            </a>
+        </td>
+        <td>
+            <a href="https://liberapay.com/OpenTracks/donate">
+                <img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg" height="45" align="middle">
+            </a>
+        </td>
+        <td>
+            <a href="https://www.transifex.com/opentracks/opentracks/">
+                Transifex
+            </a>
+        </td>
+    </tr>
+</table>

 ## Features:
 * __Tracking:__ track your sport and outdoor activities 
 * __Photos and Markers:__ mark interesting locations while tracking (also with photos)
-* __Heart rate:__ supports bluetooth LE sensors
+* __Bluetooth LE sensors:__ 
+  * heart rate
+  * cycling: speed and cadence
 * __Export data:__ export tracks either as KMZ (incl. photos), KML or GPX
 * __No Internet access:__ Internet is not used
-* __Voice annoucements__
+* __Voice announcements__
 * __No advertising__
 * __Privacy:__
    * _does not contain any in-app analytics_
-    * _does not have Google Play Services_ 
+    * _does not use Google Play Services_ 
    * _has no cloud integration_
    
 __Only required permissions:__
 * _ACCESS_FINE_LOCATION_: required to use the GPS.

-_Please note:_
-_Tracks_ does not contain a _map_ (as this would required Internet access).
-To show your tracks on a map, a 3rd party application (e.g., [OsmAnd](https://play.google.com/store/apps/details?id=net.osmand) or [MAPS.ME](https://play.google.com/store/apps/details?id=com.mapswithme.maps.pro)) needs to be installed.  
+An overview of Bluetooth LE sensors that are known to work with OpenTracks is in [README_TESTED_SENSORS.md](README_TESTED_SENSORS.md).
+
+_Please note:_
+_OpenTracks_ does not contain a _map_ (as this would required Internet access).
+
+## Custom Dashboards (incl. Map)
+As of v3.3.1 OpenTracks enables to use custom dashboards.
+The reference implementation is [OSMDashboard](https://github.com/OpenTracksApp/OSMDashboard), which presents an OpenStreetMap map (showing the current track, incl. updates).
+The developer documentation is in [README_API.md](README_API.md).
+
+Alternatively, recorded tracks can be shared as KMZ/GPX to installed applications (e.g., [OsmAnd](https://play.google.com/store/apps/details?id=net.osmand) or [MAPS.ME](https://play.google.com/store/apps/details?id=com.mapswithme.maps.pro)).
+However, this is rather slow and does not provide updates while recording.

-<a href="https://liberapay.com/dennis.guse/donate">
-    <img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg" height="45">
-</a>

 ## Screenshots
 <div>
-    <img width="20%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_1.png">
-    <img width="20%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_2.png">
-    <img width="20%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_3.png">
-    <img width="20%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_4.png">
+    <img width="15%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_1.png">
+    <img width="15%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_2.png">
+    <img width="15%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_3.png">
+    <img width="15%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_4.png">
+    <img width="15%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_5.png">
+    <img width="15%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_6.png">
 </div>

 ## Project history
@@ -56,7 +95,7 @@ Rework of _OpenTracks_ included:
 * removing calorie estimation and activity estimation,
 * removing support for ANT+ and Classic Bluetooth,
 * adding support for Bluetooth LE heart rate sensors,
-* removing Protobuf (store sensor data in SQLite columns directly), and
+* removing Protobuf (store sensosensorr data in SQLite columns directly), and
 * removing Android Service API for other apps.

 Artwork, logos and user interface remained more or less unchanged. 
@@ -0,0 +1,27 @@
+# OpenTracks Data API
+
+## Reason
+OpenTracks by itself only provides basic features for data visualization and also lacks functionality for analytics.
+By itself OpenTracks provides a basic dashboard that can show summary of a track (while recording as well as afterwards).
+Although this might be (mostly) sufficient, it has some limitations.
+This include limited configurability (e.g., ordering of shown elements) and the lack of Internet access.
+In fact, the later is considered a feature but severely limits the implementation presenting a map (at least in an easy way). 
+
+For the time being, the OpenTracks Data API can be used to implement mainly custom dashboards.
+
+## Implementation
+OpenTracks by default does not expose any data to 3rd-party applications.
+On the request of the user (i.e., pressing a button), an Intent is created that exposes the `Track` data (it's summary), the `TrackPoint`s, and the `Waypoint`s of one or more selected tracks.
+For each, one URI is provided.
+These URIs notify observers if on content changes (e.g., a new `TrackPoint` was added).
+
+Limitations:
+* only tracks selected by the user are exposed,
+* `Waypoints` are not exposed,
+* access is only granted temporarily and automatically revoked (see `FLAG_GRANT_READ_URI_PERMISSION`),
+* no write access is possible, and
+* neither track recordings can be started, paused, or stopped.
+
+All required information can be found in `IntentDashboardUtils.java`. 
+
+A _reference implementation_ is the [OSMDashboard](https://github.com/OpenTracksApp/OSMDashboard).
@@ -0,0 +1,37 @@
+# OpenTracks: Developer information
+
+## Craft new releases
+
+1. Get next _version code_ (main): `git rev-list HEAD --count main`
+2. Decide on _version name_ (semantic versioning)
+3. Manually update _version code_ and _version name_ in `build.gradle`
+4. Create changelog (`_version code_.txt`)
+5. Create commit with all changes
+6. Tag newly create commit with _version name_ (e.g., v3.2.1)
+7. Push commits and tags to public repository
+8. Add changelog to tag (Github releases)
+
+## F-Droid
+Application id: de.dennisguse.opentracks
+
+It if it properly tagged F-Droid takes care of building the app and publishing.
+Usually, it takes two days before the update is published (build, signed, and published). 
+
+The recent build activity can be found [here](https://f-droid.org/wiki/index.php?title=Special:RecentChanges&days=7&from=&hidebots=0&hideanons=1&hideliu=1&limit=500)
+
+## Google Play Store
+Application id: de.dennisguse.opentracks.playstore
+
+Requirement: `gem install fastlane`
+
+1. Build signed apk
+   (requires keystore)
+2. Upload signed apk to [Google Play Console](https://play.google.com/apps/publish)
+3. Update store meta data (e.g., description and screenshots)
+   `fastlane supply --version_code VERSION_CODE --skip_upload_apk`
+   (use the version code from the manifest)
+   (requires API key)
+
+## Translations (localization)
+
+Translations of the OpenTracks are handled in Transifex: [https://www.transifex.com/opentracks](https://www.transifex.com/opentracks/).
@@ -0,0 +1,20 @@
+# Overview of tested Bluetooth LE sensors
+
+## HRS: Heartrate Service
+* Decathlon|Geonaute|Kalenji Dual HRM Belt
+* Polar H7
+* Polar OH1
+  Has updatable firmware that requires a user account at polar.com
+* Wahoo Tickr (Model: WFBTHR02)
+
+## CSCP: Cycling Cadence and Speed Service
+Please note that the according to the specification these sensors _may_ provide speed as well as cadence.
+However, often only one value is provided.
+
+### Speed
+* Wahoo Speed (Model: WFRPMSPD)
+
+### Cadence 
+* Wahoo Cadence (Model: WFPODCAD2)
+  This sensor reports cadence data as speed.
+  A workaround is in place. 
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+set -e
+
+CHANGELOG_DIR="fastlane/metadata/android/en-US/changelogs/"
+
+echo "Checking main branch"
+git checkout main
+VERSIONID=$(git rev-list HEAD --count main)
+CHANGELOG_FILE="$CHANGELOG_DIR/$VERSIONID.txt"
+
+git diff --exit-code || echo -e "\nWARNING WARNING WARNING WARNING WARNING: this branch contains uncommit changes."
+
+#TODO Execute all tests: we are destroying data, running on a real device.
+# ./gradlew connectedCheck
+
+# Changelog
+echo -e "\nPrevious changelog\n------------"
+PREVIOUS_CHANGELOG=$(find "$CHANGELOG_DIR" -iname "[[:digit:]]**.txt" | sort -n | tail -1)
+sed 's/^/>/' "$PREVIOUS_CHANGELOG"
+
+#For F-Droid, a version starts with a 'v'
+read -p $'\n\nPlease enter the versionname (e.g., v3.9.5):\n> v' VERSIONNAME
+VERSIONNAME="v$VERSIONNAME"
+
+cp "$CHANGELOG_DIR/next_release.txt" "$CHANGELOG_FILE"
+sed -i "s/(versionName)/$VERSIONNAME/" "$CHANGELOG_FILE"
+
+echo -e "\nGit commit since last release\n------------"
+git log $(git describe --tags --abbrev=0)..HEAD --no-merges --oneline
+
+echo -e "\nPlease edit the changelog for the new release"
+gedit -w "$CHANGELOG_FILE"
+git add "$CHANGELOG_FILE"
+
+echo "Updating build.gradle"
+sed -i s/versionCode\ .*/versionCode\ "$VERSIONID"/g build.gradle
+sed -i s/versionName\ .*/versionName\ "\"$VERSIONNAME\""/g build.gradle
+
+git diff
+
+COMMIT_MESSAGE="Release: $VERSIONNAME"
+echo -e "\nCommit message will be: '$COMMIT_MESSAGE'"
+
+echo -e "\nPress ENTER, if everything looks good."
+read
+
+git add -u
+git commit -m "$COMMIT_MESSAGE"
+
+echo -e "Next steps:\n1. Push to Github\n2. Create release on Github: https://github.com/OpenTracksApp/OpenTracks/releases"
@@ -6,7 +6,7 @@ buildscript {
        jcenter()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:4.0.1'
    }
 }

@@ -17,20 +17,6 @@ allprojects {
    }
 }

-def getVersionCode = { ->
-    try {
-        def stdout = new ByteArrayOutputStream()
-        exec {
-            commandLine 'git', 'rev-list', 'HEAD', '--count'
-            standardOutput = stdout
-        }
-        return Integer.parseInt(stdout.toString().trim())
-    }
-    catch (ignored) {
-        return -1
-    }
-}
-
 def getVersionName = { ->
    try {
        def stdout = new ByteArrayOutputStream()
@@ -50,17 +36,26 @@ def getVersionName = { ->
 }

 android {
-    compileSdkVersion 29
+    compileOptions {
+        coreLibraryDesugaringEnabled true
+
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    compileSdkVersion 30

    defaultConfig {
        applicationId "de.dennisguse.opentracks"
-        //Useful for debugging.
-        //versionCode getVersionCode()
+        versionCode 3656
+        versionName "v3.11.0"

        buildConfigField "String", "VERSION_NAME_FULL", "\"${getVersionName()}\""

+
+
        minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 30

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }
@@ -74,6 +69,11 @@ android {
        release {
            minifyEnabled false
        }
+
+        releasePlayStore {
+            applicationIdSuffix ".playstore"
+            versionNameSuffix "-PlayStore"
+        }
    }

    applicationVariants.all { variant ->
@@ -82,17 +82,17 @@ android {
 }

 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.preference:preference:1.1.0'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.10'

-    androidTestImplementation 'androidx.test:core:1.2.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.2.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test:rules:1.2.0'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'org.mockito:mockito-android:3.0.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.preference:preference:1.1.1'
+    implementation 'androidx.documentfile:documentfile:1.0.1'
+    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'com.android.support.constraint:constraint-layout:2.0.1'

-    testImplementation 'androidx.test:core:1.2.0'
-    testImplementation 'org.mockito:mockito-core:3.0.0'
+    androidTestImplementation 'androidx.test:core:1.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test:rules:1.3.0'
+    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'org.mockito:mockito-android:3.5.13'
 }
@@ -0,0 +1,55 @@
+@startuml
+title
+State of OpenTracks
+end title
+
+legend right
+SettingsActivity can be reached
+from every activity showing a menu.
+endlegend
+
+[*] --> TrackListActivity
+TrackListActivity --> TrackRecordingActivity : Start recording
+TrackListActivity --> SearchListActivity
+TrackListActivity --> MarkerListActivity : Show all markers
+TrackListActivity --> AggregatedStatisticsActivity : Aggregated stats
+TrackListActivity --> TrackRecordedActivity : Show track
+TrackListActivity --> TrackDeleteActivity
+
+SearchListActivity --> MarkerDetailActivity : Search result
+SearchListActivity --> TrackRecordedActivity : Search result
+
+TrackRecordedActivity --> TrackDeleteActivity
+TrackRecordedActivity --> TrackEditActivity
+TrackRecordedActivity --> MarkerListActivity
+TrackRecordedActivity --> MarkerEditActivity : Add marker
+TrackRecordedActivity --> CameraIntent : Add marker (with photo)
+TrackRecordedActivity --> ShareFileIntent
+TrackRecordedActivity --> DashboardIntent : Database cursor
+TrackRecordedActivity --> TrackOnMapIntent : KMZ
+TrackRecordedActivity --> TrackRecordingActivity
+TrackRecordedActivity --> SettingsActivity
+TrackRecordedActivity --> TrackListActivity : Back button
+
+TrackRecordingActivity --> TrackOnMapIntent
+TrackRecordingActivity --> MarkerEditActivity : Add marker
+TrackRecordingActivity --> MarkerListActivity
+TrackRecordingActivity --> TrackEditActivity
+TrackRecordingActivity --> SettingsActivity
+TrackRecordingActivity --> TrackRecordedActivity : Stop recording
+TrackRecordingActivity --> TrackListActivity : Back button
+
+MarkerListActivity --> MarkerDetailActivity
+
+MarkerDetailActivity --> MarkerEditActivity
+MarkerDetailActivity --> CoordinateOnMapIntent : URI
+
+SettingsActivity --> AboutActivity
+SettingsActivity --> HelpActivity
+SettingsActivity --> ExportActivity
+SettingsActivity --> DirectoryChooserActivity
+SettingsActivity --> DirectoryChooserActivity
+DirectoryChooserActivity$ImportDirectoryChooserActivity --> ImportActivity
+DirectoryChooserActivity$ExportDirectoryChooserActivity --> ExportActivity
+
+@enduml
@@ -0,0 +1,29 @@
+@startuml
+interface TrackExporter {
+}
+class KmzTrackExporter implements TrackExporter
+KmzTrackExporter o-- FileTrackExporter
+class FileTrackExporter implements TrackExporter {
+/' One track only '/
+}
+FileTrackExporter o-- TrackWriter
+
+interface TrackWriter {
+}
+class GpxTrackWriter implements TrackWriter
+class KmlTrackWriter implements TrackWriter
+
+
+interface TrackImporter {
+}
+class KmzTrackImporter implements TrackImporter {
+}
+KmzTrackImporter o-- KmlFileTrackImporter
+class AbstractFileTrackImporter implements TrackImporter {
+}
+class GpxFileTrackImporter extends AbstractFileTrackImporter {
+}
+class KmlFileTrackImporter extends AbstractFileTrackImporter {
+/' Supports multiple tracks via folders '/
+}
+@enduml
@@ -0,0 +1,18 @@
+@startuml
+SensorManager --> ElevationSumManager
+LocationManager --> TrackRecordingService
+ElevationSumManager --> TrackRecordingService
+
+TrackRecordingService --> TrackRecordingServiceConnection
+TrackRecordingService --> Database
+
+Database --> CustomContentProvider
+CustomContentProvider --> TrackDataHub
+CustomContentProvider --> ShareContentProvider
+TrackDataHub --> StatisticsRecordingFragment : TrackPoints, TrackStatistics, Waypoints (push)
+TrackDataHub --> StatisticsRecordedFragment : TrackPoints, TrackStatistics, Waypoints (push)
+TrackDataHub --> ChartFragment --> ChartView
+
+TrackRecordingServiceConnection --> StatisticsRecordingFragment : Sensor data (heartrate, cadence, elevation gain; pull 1s)
+TrackRecordingServiceConnection --> TrackController : Start time (pull, onStart)
+@enduml
@@ -0,0 +1,52 @@
+@startuml
+class Track {
+    -id
+    -name
+    -description
+    -category
+    -numberOfPoints
+    -icon
+}
+Track o-- TrackPoint
+Track o-- Waypoint
+Track "1" - "1" TripStatistics
+
+class TripStatistics {
+    - startTime
+    - stopTime
+    - totalDistance
+    - totalTime
+    - movingTime
+    - maxSpeed
+    - totalElevationGain
+}
+
+class TrackPoint extends android.location.Location {
+    - id
+    - trackId
+    - longitude
+    - latitude
+    - time
+    - altitude
+    - accuracy
+    - speed
+    - bearing
+    - sensor_heartrate
+    - sensor_cadence
+    - sensor_power
+}
+
+class Waypoint {
+    - id
+    - trackId
+    - name
+    - description
+    - category
+    - icon
+    - length
+    - duration
+    - location
+    - tripStatistics
+    - photoUrl
+}
+@enduml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://opentracksapp.com/xmlschemas/v1">
+
+    <xs:element name="trackuuid"
+        type="xs:string" />
+
+</xs:schema>
@@ -0,0 +1,474 @@
+<?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"
+   sodipodi:docname="ic_activity_climbing.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 5.8208333 5.8208333"
+   height="22"
+   width="22">
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect3162"
+       effect="spiro" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.9999999,0,1 @ F,0,0,1,0,2.0000001,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect3149"
+       effect="fillet_chamfer" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect2514"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,4,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.97014234,0,1 @ F,0,0,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0.51887107,0,1 @ F,0,0,1,0,0.22687835,0,1 @ F,0,0,1,0,0,0,1 @ F,0,1,1,0,0.51887107,0,1 @ F,0,0,1,0,0.22687835,0,1 @ F,0,0,1,0,0,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect950"
+       effect="fillet_chamfer" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0.34892149,0,1 @ F,0,0,1,0,0.18398697,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.34892149,0,1 @ F,0,0,1,0,0.18398697,0,1 @ F,0,1,1,0,0,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect946"
+       effect="fillet_chamfer" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,1,1,0,2.00309,0,1 @ F,0,0,1,0,2.00309,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect918"
+       effect="fillet_chamfer" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,7.0000002,0,1 @ F,0,0,1,0,0,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect912"
+       effect="fillet_chamfer" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0.49832891,0,1 @ F,0,0,1,0,0.49832891,0,1 @ F,0,1,1,0,0.5316463,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.49999976,0,1 @ F,0,0,1,0,0.50000024,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.0000001,0,1 @ F,0,0,1,0,0.99999982,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.0295214,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.5316463,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect894"
+       effect="fillet_chamfer" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-maximized="0"
+     inkscape:window-y="64"
+     inkscape:window-x="219"
+     inkscape:window-height="880"
+     inkscape:window-width="1500"
+     inkscape:guide-bbox="true"
+     showguides="false"
+     inkscape:snap-text-baseline="true"
+     inkscape:snap-center="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-paths="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:bbox-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:snap-bbox="true"
+     units="px"
+     showgrid="false"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="mm"
+     inkscape:cy="12.271037"
+     inkscape:cx="7.0404004"
+     inkscape:zoom="22.390336"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="1"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#232629"
+     id="base">
+    <inkscape:grid
+       dotted="true"
+       empspacing="22"
+       id="grid833"
+       type="xygrid" />
+    <inkscape:grid
+       originy="0.26458333"
+       originx="0.26458333"
+       spacingx="1.0583333"
+       spacingy="1.0583333"
+       empspacing="1"
+       id="grid835"
+       type="xygrid" />
+    <sodipodi:guide
+       inkscape:color="rgb(0,0,255)"
+       inkscape:locked="false"
+       inkscape:label=""
+       id="guide887"
+       orientation="0.96592583,0.25881905"
+       position="4.195,4.2333333" />
+    <sodipodi:guide
+       id="guide900"
+       orientation="0,-1"
+       position="0.26458333,1.9843751" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <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></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <g
+       transform="matrix(0.38576851,0,0,0.38576851,152.56385,-12.494408)"
+       id="g954">
+      <rect
+         style="fill:#cacaca;fill-opacity:1;stroke-width:14.6855;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect919"
+         width="68.791664"
+         height="79.375"
+         x="-357.1875"
+         y="-7.9375" />
+      <rect
+         style="fill:#e74c3c;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect851"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54169"
+         y="-5.2916665" />
+      <rect
+         y="-5.2916665"
+         x="-343.95834"
+         height="10.583333"
+         width="10.583333"
+         id="rect853"
+         style="fill:#ed1515;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#f47750;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect855"
+         width="10.583333"
+         height="10.583333"
+         x="-333.375"
+         y="-5.2916665" />
+      <rect
+         y="-5.2916665"
+         x="-322.79169"
+         height="10.583333"
+         width="10.583333"
+         id="rect857"
+         style="fill:#fdbc4b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#c9ce3b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect859"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20834"
+         y="-5.2916665" />
+      <rect
+         y="5.291667"
+         x="-354.54169"
+         height="10.583333"
+         width="10.583333"
+         id="rect861"
+         style="fill:#da4453;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#c0392b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect863"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95834"
+         y="5.291667" />
+      <rect
+         y="5.291667"
+         x="-333.375"
+         height="10.583333"
+         width="10.583333"
+         id="rect865"
+         style="fill:#d35400;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#f67400;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect867"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79169"
+         y="5.291667" />
+      <rect
+         y="5.291667"
+         x="-312.20834"
+         height="10.583333"
+         width="10.583333"
+         id="rect869"
+         style="fill:#f39c1f;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         y="21.166666"
+         x="-354.54169"
+         height="10.583333"
+         width="10.583333"
+         id="rect871"
+         style="fill:#1cdc9a;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#2ecc71;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect873"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95834"
+         y="21.166666" />
+      <rect
+         y="21.166666"
+         x="-333.375"
+         height="10.583333"
+         width="10.583333"
+         id="rect875"
+         style="fill:#1abc9c;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#3498db;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect877"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79169"
+         y="21.166666" />
+      <rect
+         y="21.166666"
+         x="-312.20834"
+         height="10.583333"
+         width="10.583333"
+         id="rect879"
+         style="fill:#3daee9;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#10d116;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect881"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54169"
+         y="31.75" />
+      <rect
+         y="31.75"
+         x="-343.95834"
+         height="10.583333"
+         width="10.583333"
+         id="rect883"
+         style="fill:#27ae60;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#16a085;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect885"
+         width="10.583333"
+         height="10.583333"
+         x="-333.375"
+         y="31.75" />
+      <rect
+         y="31.75"
+         x="-322.79169"
+         height="10.583333"
+         width="10.583333"
+         id="rect887"
+         style="fill:#2980b9;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#1d99f3;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect889"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20834"
+         y="31.75" />
+      <rect
+         style="fill:#9b59b6;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect891"
+         width="10.583333"
+         height="10.583333"
+         x="-301.625"
+         y="21.166666" />
+      <rect
+         y="31.75"
+         x="-301.625"
+         height="10.583333"
+         width="10.583333"
+         id="rect893"
+         style="fill:#8e44ad;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#34495e;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect895"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54166"
+         y="47.625" />
+      <rect
+         y="47.625"
+         x="-343.95831"
+         height="10.583333"
+         width="10.583333"
+         id="rect897"
+         style="fill:#31363b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#7f8c8d;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect899"
+         width="10.583333"
+         height="10.583333"
+         x="-333.37497"
+         y="47.625" />
+      <rect
+         y="47.625"
+         x="-322.79166"
+         height="10.583333"
+         width="10.583333"
+         id="rect901"
+         style="fill:#bdc3c7;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#fcfcfc;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect903"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20831"
+         y="47.625" />
+      <rect
+         y="58.208336"
+         x="-354.54166"
+         height="10.583333"
+         width="10.583333"
+         id="rect905"
+         style="fill:#2c3e50;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#232629;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect907"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95831"
+         y="58.208336" />
+      <rect
+         y="58.208336"
+         x="-333.37497"
+         height="10.583333"
+         width="10.583333"
+         id="rect909"
+         style="fill:#4d4d4d;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#95a5a6;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect911"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79166"
+         y="58.208336" />
+      <rect
+         y="58.208336"
+         x="-312.20831"
+         height="10.583333"
+         width="10.583333"
+         id="rect913"
+         style="fill:#eff0f1;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+    </g>
+    <path
+       id="path920"
+       d="M 6.3144531 -0.15234375 L 5.6464844 0.34179688 L 4.8945312 2.8847656 L 3.7050781 3.2324219 L 3.0292969 4.9121094 L 1.6992188 5.1113281 L 1.5371094 5.4570312 L -0.2265625 5.8183594 L -0.17382812 6.0761719 L 1.7207031 5.6914062 L 1.8789062 5.3515625 L 3.21875 5.1503906 L 3.9023438 3.4492188 L 5.1074219 3.0976562 L 5.875 0.50195312 L 6.4726562 0.060546875 L 6.3144531 -0.15234375 z "
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" />
+    <g
+       transform="matrix(1.226984,0,0,1.226984,-0.81596813,-1.2462535)"
+       id="g924">
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.168524;stroke-opacity:1"
+         id="path17"
+         d="M 2.4564013,2.0252139 C 2.6387748,1.9919855 2.7608027,1.8155843 2.7275743,1.6332107 2.6943459,1.4508371 2.5179443,1.3288092 2.3355708,1.3620376 2.1531971,1.395266 2.0311693,1.5716675 2.0643978,1.7540412 2.0976262,1.9364148 2.2740276,2.0584424 2.4564013,2.0252139 Z M 2.0390821,4.4361706 2.2561417,3.8057362 2.6726641,3.9140028 3.0571092,4.4259571 3.3404272,4.1900271 2.8859586,3.5506757 2.4962919,3.3764255 2.6074394,2.8541847 C 2.8682831,3.0636061 3.230079,3.168985 3.5948261,3.1025284 L 3.5344109,2.7709399 C 3.219402,2.8283344 2.9239238,2.7108724 2.7489979,2.5029267 L 2.5348714,2.2678637 C 2.4504294,2.1804703 2.3388697,2.1322773 2.2228138,2.1534226 c -0.049738,0.00906 -0.079877,0.031683 -0.1296145,0.040745 L 1.9734996,2.8024787 1.8537998,3.4107898 1.689464,4.211545 1.0707466,5.2436753 1.3712806,5.4904898 Z"
+         sodipodi:nodetypes="sssssccccccccccccsccccccc" />
+      <path
+         id="rect915"
+         style="opacity:0.997;fill:#ffffff;stroke:#ffffff;stroke-width:0.248933;stroke-linejoin:round;stroke-opacity:1;paint-order:stroke fill markers"
+         transform="matrix(0.99300752,0.11805114,-0.2203786,0.97541441,0,0)"
+         d="m 2.276527,2.111288 v 0 0.8237278 -0.08059 z"
+         sodipodi:nodetypes="ccccc" />
+    </g>
+  </g>
+</svg>
@@ -0,0 +1,496 @@
+<?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"
+   width="22"
+   height="22"
+   viewBox="0 0 5.8208333 5.8208333"
+   version="1.1"
+   id="svg8"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="ic_activity_escooter.svg">
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect3162"
+       is_visible="true"
+       lpeversion="1" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect3149"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.9999999,0,1 @ F,0,0,1,0,2.0000001,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,4,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.97014234,0,1 @ F,0,0,1,0,0,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect2514"
+       effect="fillet_chamfer" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect950"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.51887107,0,1 @ F,0,0,1,0,0.22687835,0,1 @ F,0,0,1,0,0,0,1 @ F,0,1,1,0,0.51887107,0,1 @ F,0,0,1,0,0.22687835,0,1 @ F,0,0,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect946"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.34892149,0,1 @ F,0,0,1,0,0.18398697,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.34892149,0,1 @ F,0,0,1,0,0.18398697,0,1 @ F,0,1,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect918"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,1,1,0,2.00309,0,1 @ F,0,0,1,0,2.00309,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect912"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,7.0000002,0,1 @ F,0,0,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect894"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.49832891,0,1 @ F,0,0,1,0,0.49832891,0,1 @ F,0,1,1,0,0.5316463,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.49999976,0,1 @ F,0,0,1,0,0.50000024,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.0000001,0,1 @ F,0,0,1,0,0.99999982,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.0295214,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.5316463,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#232629"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.390336"
+     inkscape:cx="13.383174"
+     inkscape:cy="12.569634"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-text-baseline="true"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1444"
+     inkscape:window-height="780"
+     inkscape:window-x="245"
+     inkscape:window-y="142"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid833"
+       empspacing="22"
+       dotted="true" />
+    <inkscape:grid
+       type="xygrid"
+       id="grid835"
+       empspacing="1"
+       spacingy="1.0583333"
+       spacingx="1.0583333"
+       originx="0.26458333"
+       originy="0.26458333" />
+    <sodipodi:guide
+       position="4.195,4.2333333"
+       orientation="0.96592583,0.25881905"
+       id="guide887"
+       inkscape:label=""
+       inkscape:locked="false"
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="0.26458333,1.9843751"
+       orientation="0,-1"
+       id="guide900" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <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>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g3168"
+       style="stroke:#909090;stroke-opacity:1">
+      <path
+         id="path901"
+         d="M 2.3632812 1.984375 A 0.1324995 0.1324995 0 0 0 2.25 2.1347656 A 0.1324995 0.1324995 0 0 0 2.3984375 2.2480469 C 2.6424435 2.2158044 2.9061719 2.3043649 3.0820312 2.4765625 C 3.2048822 2.5968554 3.2894144 2.7590671 3.3085938 2.9257812 C 3.3213476 3.0366427 3.3054638 3.1596364 3.2929688 3.2949219 C 3.2804368 3.4306071 3.2701901 3.583197 3.3105469 3.7382812 C 3.3438455 3.8662421 3.4102315 3.9828889 3.5019531 4.078125 C 3.5936748 4.1733611 3.7093185 4.2451189 3.8359375 4.2832031 A 0.1324995 0.1324995 0 0 0 4.0019531 4.1933594 A 0.1324995 0.1324995 0 0 0 3.9121094 4.0292969 C 3.8297238 4.0045171 3.7530387 3.9564973 3.6933594 3.8945312 C 3.63368 3.8325652 3.5900254 3.7531805 3.5683594 3.6699219 C 3.5418024 3.5678678 3.5466893 3.4492033 3.5585938 3.3203125 C 3.5705351 3.191022 3.5879256 3.0476308 3.5703125 2.8945312 C 3.5435298 2.6617257 3.4320694 2.4481756 3.2675781 2.2871094 C 3.0309201 2.0553789 2.691646 1.9409856 2.3632812 1.984375 z "
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#909090;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:531.552;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" />
+      <path
+         transform="scale(0.26458333)"
+         id="path905"
+         d="M 6 5.5 A 0.50083507 0.50083507 0 0 0 5.5 6 L 5.5 10 A 0.50083507 0.50083507 0 0 0 6 10.5 L 7 10.5 C 8.3752137 10.5 9.5000001 9.3752139 9.5 8 C 9.4999999 6.6247863 8.3752137 5.5000001 7 5.5 L 6 5.5 z M 6.5 6.5 L 7 6.5 C 7.8339253 6.5000001 8.4999999 7.1660747 8.5 8 C 8.5000001 8.8339251 7.8339253 9.4999999 7 9.5 L 6.5 9.5 L 6.5 6.5 z "
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#909090;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00157;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:531.552;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" />
+      <path
+         id="path909"
+         d="M 1.0585938 1.71875 A 0.1324995 0.1324995 0 0 0 0.92578125 1.8515625 A 0.1324995 0.1324995 0 0 0 1.0585938 1.984375 L 1.5878906 1.984375 A 0.1324995 0.1324995 0 0 0 1.7207031 1.8515625 A 0.1324995 0.1324995 0 0 0 1.5878906 1.71875 L 1.0585938 1.71875 z "
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#909090;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:531.552;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" />
+      <path
+         id="path913"
+         d="M 1.0585938 2.2480469 A 0.1324995 0.1324995 0 0 0 0.92578125 2.3808594 A 0.1324995 0.1324995 0 0 0 1.0585938 2.5136719 L 1.5878906 2.5136719 A 0.1324995 0.1324995 0 0 0 1.7207031 2.3808594 A 0.1324995 0.1324995 0 0 0 1.5878906 2.2480469 L 1.0585938 2.2480469 z "
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#909090;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:531.552;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" />
+    </g>
+    <path
+       id="path924"
+       style="opacity:1;fill:#fdbc4b;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:531.552;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m -1.3252903,1.5032615 -0.4100651,0.6834418 a 0.12845631,0.12845631 60.481872 0 0 0.1101504,0.1945466 l 0.2495783,-10e-8 -0.1100188,0.5495576 a 0.08982544,0.08982544 21.142221 0 0 0.1651025,0.063848 L -0.91047797,2.3112131 A 0.12845634,0.12845634 60.481877 0 0 -1.0206284,2.1166665 H -1.2702067 L -1.1601879,1.567109 a 0.08982541,0.08982541 21.142225 0 0 -0.1651024,-0.063848 z"
+       sodipodi:nodetypes="ccccccc"
+       inkscape:original-d="m -1.0583333,1.0583332 -0.79375,1.3229167 0.4764566,-10e-8 L -1.5875,3.4395832 -0.79375003,2.1166665 H -1.2702067 Z"
+       inkscape:path-effect="#path-effect950" />
+    <g
+       id="g954"
+       transform="matrix(0.38576851,0,0,0.38576851,152.56385,-12.494408)">
+      <rect
+         y="-7.9375"
+         x="-357.1875"
+         height="79.375"
+         width="68.791664"
+         id="rect919"
+         style="fill:#cacaca;fill-opacity:1;stroke-width:14.6855;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         y="-5.2916665"
+         x="-354.54169"
+         height="10.583333"
+         width="10.583333"
+         id="rect851"
+         style="fill:#e74c3c;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#ed1515;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect853"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95834"
+         y="-5.2916665" />
+      <rect
+         y="-5.2916665"
+         x="-333.375"
+         height="10.583333"
+         width="10.583333"
+         id="rect855"
+         style="fill:#f47750;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#fdbc4b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect857"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79169"
+         y="-5.2916665" />
+      <rect
+         y="-5.2916665"
+         x="-312.20834"
+         height="10.583333"
+         width="10.583333"
+         id="rect859"
+         style="fill:#c9ce3b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#da4453;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect861"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54169"
+         y="5.291667" />
+      <rect
+         y="5.291667"
+         x="-343.95834"
+         height="10.583333"
+         width="10.583333"
+         id="rect863"
+         style="fill:#c0392b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#d35400;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect865"
+         width="10.583333"
+         height="10.583333"
+         x="-333.375"
+         y="5.291667" />
+      <rect
+         y="5.291667"
+         x="-322.79169"
+         height="10.583333"
+         width="10.583333"
+         id="rect867"
+         style="fill:#f67400;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#f39c1f;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect869"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20834"
+         y="5.291667" />
+      <rect
+         style="fill:#1cdc9a;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect871"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54169"
+         y="21.166666" />
+      <rect
+         y="21.166666"
+         x="-343.95834"
+         height="10.583333"
+         width="10.583333"
+         id="rect873"
+         style="fill:#2ecc71;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#1abc9c;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect875"
+         width="10.583333"
+         height="10.583333"
+         x="-333.375"
+         y="21.166666" />
+      <rect
+         y="21.166666"
+         x="-322.79169"
+         height="10.583333"
+         width="10.583333"
+         id="rect877"
+         style="fill:#3498db;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#3daee9;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect879"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20834"
+         y="21.166666" />
+      <rect
+         y="31.75"
+         x="-354.54169"
+         height="10.583333"
+         width="10.583333"
+         id="rect881"
+         style="fill:#10d116;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#27ae60;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect883"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95834"
+         y="31.75" />
+      <rect
+         y="31.75"
+         x="-333.375"
+         height="10.583333"
+         width="10.583333"
+         id="rect885"
+         style="fill:#16a085;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#2980b9;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect887"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79169"
+         y="31.75" />
+      <rect
+         y="31.75"
+         x="-312.20834"
+         height="10.583333"
+         width="10.583333"
+         id="rect889"
+         style="fill:#1d99f3;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         y="21.166666"
+         x="-301.625"
+         height="10.583333"
+         width="10.583333"
+         id="rect891"
+         style="fill:#9b59b6;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#8e44ad;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect893"
+         width="10.583333"
+         height="10.583333"
+         x="-301.625"
+         y="31.75" />
+      <rect
+         y="47.625"
+         x="-354.54166"
+         height="10.583333"
+         width="10.583333"
+         id="rect895"
+         style="fill:#34495e;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#31363b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect897"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95831"
+         y="47.625" />
+      <rect
+         y="47.625"
+         x="-333.37497"
+         height="10.583333"
+         width="10.583333"
+         id="rect899"
+         style="fill:#7f8c8d;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#bdc3c7;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect901"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79166"
+         y="47.625" />
+      <rect
+         y="47.625"
+         x="-312.20831"
+         height="10.583333"
+         width="10.583333"
+         id="rect903"
+         style="fill:#fcfcfc;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#2c3e50;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect905"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54166"
+         y="58.208336" />
+      <rect
+         y="58.208336"
+         x="-343.95831"
+         height="10.583333"
+         width="10.583333"
+         id="rect907"
+         style="fill:#232629;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#4d4d4d;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect909"
+         width="10.583333"
+         height="10.583333"
+         x="-333.37497"
+         y="58.208336" />
+      <rect
+         y="58.208336"
+         x="-322.79166"
+         height="10.583333"
+         width="10.583333"
+         id="rect911"
+         style="fill:#95a5a6;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#eff0f1;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect913"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20831"
+         y="58.208336" />
+    </g>
+    <path
+       transform="scale(0.26458333)"
+       id="path887"
+       d="M 13.994141 4.5 A 0.49999949 0.49999949 0 0 0 13.552734 4.7773438 A 0.49999949 0.49999949 0 0 0 13.777344 5.4472656 L 14.908203 6.0136719 C 15.328243 6.2241517 15.636226 6.6066586 15.75 7.0625 L 17.390625 13.623047 C 15.381402 13.909129 13.837817 15.475476 13.601562 17.5 L 8.3984375 17.5 C 8.1378934 15.267332 6.3043435 13.50201 4.0039062 13.5 C 3.982495 13.499838 3.9608645 13.499856 3.9394531 13.5 L 2 13.5 A 0.49999949 0.49999949 0 0 0 1.5 14 A 0.49999949 0.49999949 0 0 0 2 14.5 L 3.9394531 14.5 A 0.50004949 0.50004949 0 0 0 3.9433594 14.5 C 3.9610145 14.499866 3.9784387 14.499866 3.9960938 14.5 A 0.50004949 0.50004949 0 0 0 4 14.5 C 5.9389193 14.5 7.5000003 16.061081 7.5 18 A 0.50004949 0.50004949 0 0 0 8 18.5 L 14 18.5 A 0.50004949 0.50004949 0 0 0 14.5 18 C 14.5 16.061081 16.061081 14.5 18 14.5 A 0.50004949 0.50004949 0 0 0 18.484375 13.878906 L 16.71875 6.8203125 C 16.534472 6.0819921 16.037756 5.460052 15.357422 5.1191406 A 0.50004949 0.50004949 0 0 0 15.355469 5.1191406 L 14.222656 4.5527344 A 0.49999949 0.49999949 0 0 0 13.994141 4.5 z "
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00157481;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:531.552;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" />
+    <path
+       id="path970"
+       d="M 4.7617188 4.1367188 C 4.4265639 4.1367188 4.1523438 4.4109389 4.1523438 4.7460938 C 4.1523438 5.0812486 4.4265639 5.3554687 4.7617188 5.3554688 C 5.0968736 5.3554687 5.3710937 5.0812486 5.3710938 4.7460938 C 5.3710937 4.4109389 5.0968736 4.1367188 4.7617188 4.1367188 z M 4.7617188 4.3378906 C 4.9879388 4.3378906 5.1679687 4.5198737 5.1679688 4.7460938 C 5.1679687 4.9723138 4.9879388 5.1542969 4.7617188 5.1542969 C 4.5354987 5.1542969 4.3535156 4.9723138 4.3535156 4.7460938 C 4.3535156 4.5198737 4.5354987 4.3378906 4.7617188 4.3378906 z "
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.201567;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:0.997" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.997;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.201567;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       d="m 1.0221536,4.1367188 c -0.33515491,0 -0.60937501,0.2742201 -0.60937501,0.609375 0,0.3351548 0.2742201,0.6093749 0.60937501,0.609375 0.3351548,-10e-8 0.6093749,-0.2742202 0.609375,-0.609375 -1e-7,-0.3351549 -0.2742202,-0.609375 -0.609375,-0.609375 z m 0,0.2011718 c 0.22622,0 0.4062499,0.1819831 0.40625,0.4082032 -1e-7,0.2262201 -0.18003,0.4082031 -0.40625,0.4082031 -0.22622011,0 -0.40820321,-0.181983 -0.40820321,-0.4082031 0,-0.2262201 0.1819831,-0.4082032 0.40820321,-0.4082032 z"
+       id="path970-7" />
+  </g>
+</svg>
@@ -0,0 +1,515 @@
+<?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"
+   sodipodi:docname="ic_activity_inlineskater.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 5.8208333 5.8208333"
+   height="22"
+   width="22">
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect3162"
+       effect="spiro" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.9999999,0,1 @ F,0,0,1,0,2.0000001,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect3149"
+       effect="fillet_chamfer" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect2514"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,4,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.97014234,0,1 @ F,0,0,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0.51887107,0,1 @ F,0,0,1,0,0.22687835,0,1 @ F,0,0,1,0,0,0,1 @ F,0,1,1,0,0.51887107,0,1 @ F,0,0,1,0,0.22687835,0,1 @ F,0,0,1,0,0,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect950"
+       effect="fillet_chamfer" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0.34892149,0,1 @ F,0,0,1,0,0.18398697,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.34892149,0,1 @ F,0,0,1,0,0.18398697,0,1 @ F,0,1,1,0,0,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect946"
+       effect="fillet_chamfer" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,1,1,0,2.00309,0,1 @ F,0,0,1,0,2.00309,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect918"
+       effect="fillet_chamfer" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,7.0000002,0,1 @ F,0,0,1,0,0,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect912"
+       effect="fillet_chamfer" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0.49832891,0,1 @ F,0,0,1,0,0.49832891,0,1 @ F,0,1,1,0,0.5316463,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.49999976,0,1 @ F,0,0,1,0,0.50000024,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.0000001,0,1 @ F,0,0,1,0,0.99999982,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.0295214,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.5316463,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect894"
+       effect="fillet_chamfer" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-maximized="1"
+     inkscape:window-y="27"
+     inkscape:window-x="67"
+     inkscape:window-height="1025"
+     inkscape:window-width="1853"
+     inkscape:guide-bbox="true"
+     showguides="false"
+     inkscape:snap-text-baseline="true"
+     inkscape:snap-center="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-paths="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:bbox-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:snap-bbox="true"
+     units="px"
+     showgrid="false"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="mm"
+     inkscape:cy="10.868962"
+     inkscape:cx="8.471442"
+     inkscape:zoom="22.390336"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="1"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#232629"
+     id="base">
+    <inkscape:grid
+       dotted="true"
+       empspacing="22"
+       id="grid833"
+       type="xygrid" />
+    <inkscape:grid
+       originy="0.26458333"
+       originx="0.26458333"
+       spacingx="1.0583333"
+       spacingy="1.0583333"
+       empspacing="1"
+       id="grid835"
+       type="xygrid" />
+    <sodipodi:guide
+       inkscape:color="rgb(0,0,255)"
+       inkscape:locked="false"
+       inkscape:label=""
+       id="guide887"
+       orientation="0.96592583,0.25881905"
+       position="4.195,4.2333333" />
+    <sodipodi:guide
+       id="guide900"
+       orientation="0,-1"
+       position="0.26458333,1.9843751" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <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>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <path
+       d="m 3.3722093,1.2527829 c 0.2415068,0 0.4391032,-0.1975962 0.4391032,-0.43910305 0,-0.24150691 -0.1975964,-0.43910339 -0.4391032,-0.43910339 -0.241507,0 -0.4391033,0.19759648 -0.4391033,0.43910339 0,0.24150685 0.1975963,0.43910305 0.4391033,0.43910305 z M 2.5818232,4.3045509 2.8013749,3.3385235 3.2624334,3.7776271 V 5.0949369 H 3.7015366 V 3.4482998 L 3.2404782,3.0091963 3.3722093,2.3505413 c 0.285417,0.3293275 0.7245203,0.5488792 1.207534,0.5488792 V 2.4603172 c -0.4171482,0 -0.7684308,-0.2195517 -0.944072,-0.5269241 L 3.4161195,1.5821105 C 3.3282991,1.4503796 3.1965678,1.3625589 3.0428817,1.3625589 c -0.065865,0 -0.1097755,0.021955 -0.1756413,0.021955 L 1.7255717,1.867528 V 2.8994208 H 2.1646753 V 2.1529448 L 2.5598682,1.9992587 2.2085854,3.7776271 1.1327827,3.5580754 1.0449623,3.9971789 Z"
+       id="path17"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.219552;stroke-opacity:1" />
+    <g
+       transform="matrix(0.38576851,0,0,0.38576851,152.56385,-12.494408)"
+       id="g954">
+      <rect
+         style="fill:#cacaca;fill-opacity:1;stroke-width:14.6855;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect919"
+         width="68.791664"
+         height="79.375"
+         x="-357.1875"
+         y="-7.9375" />
+      <rect
+         style="fill:#e74c3c;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect851"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54169"
+         y="-5.2916665" />
+      <rect
+         y="-5.2916665"
+         x="-343.95834"
+         height="10.583333"
+         width="10.583333"
+         id="rect853"
+         style="fill:#ed1515;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#f47750;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect855"
+         width="10.583333"
+         height="10.583333"
+         x="-333.375"
+         y="-5.2916665" />
+      <rect
+         y="-5.2916665"
+         x="-322.79169"
+         height="10.583333"
+         width="10.583333"
+         id="rect857"
+         style="fill:#fdbc4b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#c9ce3b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect859"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20834"
+         y="-5.2916665" />
+      <rect
+         y="5.291667"
+         x="-354.54169"
+         height="10.583333"
+         width="10.583333"
+         id="rect861"
+         style="fill:#da4453;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#c0392b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect863"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95834"
+         y="5.291667" />
+      <rect
+         y="5.291667"
+         x="-333.375"
+         height="10.583333"
+         width="10.583333"
+         id="rect865"
+         style="fill:#d35400;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#f67400;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect867"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79169"
+         y="5.291667" />
+      <rect
+         y="5.291667"
+         x="-312.20834"
+         height="10.583333"
+         width="10.583333"
+         id="rect869"
+         style="fill:#f39c1f;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         y="21.166666"
+         x="-354.54169"
+         height="10.583333"
+         width="10.583333"
+         id="rect871"
+         style="fill:#1cdc9a;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#2ecc71;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect873"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95834"
+         y="21.166666" />
+      <rect
+         y="21.166666"
+         x="-333.375"
+         height="10.583333"
+         width="10.583333"
+         id="rect875"
+         style="fill:#1abc9c;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#3498db;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect877"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79169"
+         y="21.166666" />
+      <rect
+         y="21.166666"
+         x="-312.20834"
+         height="10.583333"
+         width="10.583333"
+         id="rect879"
+         style="fill:#3daee9;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#10d116;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect881"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54169"
+         y="31.75" />
+      <rect
+         y="31.75"
+         x="-343.95834"
+         height="10.583333"
+         width="10.583333"
+         id="rect883"
+         style="fill:#27ae60;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#16a085;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect885"
+         width="10.583333"
+         height="10.583333"
+         x="-333.375"
+         y="31.75" />
+      <rect
+         y="31.75"
+         x="-322.79169"
+         height="10.583333"
+         width="10.583333"
+         id="rect887"
+         style="fill:#2980b9;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#1d99f3;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect889"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20834"
+         y="31.75" />
+      <rect
+         style="fill:#9b59b6;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect891"
+         width="10.583333"
+         height="10.583333"
+         x="-301.625"
+         y="21.166666" />
+      <rect
+         y="31.75"
+         x="-301.625"
+         height="10.583333"
+         width="10.583333"
+         id="rect893"
+         style="fill:#8e44ad;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#34495e;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect895"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54166"
+         y="47.625" />
+      <rect
+         y="47.625"
+         x="-343.95831"
+         height="10.583333"
+         width="10.583333"
+         id="rect897"
+         style="fill:#31363b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#7f8c8d;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect899"
+         width="10.583333"
+         height="10.583333"
+         x="-333.37497"
+         y="47.625" />
+      <rect
+         y="47.625"
+         x="-322.79166"
+         height="10.583333"
+         width="10.583333"
+         id="rect901"
+         style="fill:#bdc3c7;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#fcfcfc;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect903"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20831"
+         y="47.625" />
+      <rect
+         y="58.208336"
+         x="-354.54166"
+         height="10.583333"
+         width="10.583333"
+         id="rect905"
+         style="fill:#2c3e50;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#232629;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect907"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95831"
+         y="58.208336" />
+      <rect
+         y="58.208336"
+         x="-333.37497"
+         height="10.583333"
+         width="10.583333"
+         id="rect909"
+         style="fill:#4d4d4d;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#95a5a6;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect911"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79166"
+         y="58.208336" />
+      <rect
+         y="58.208336"
+         x="-312.20831"
+         height="10.583333"
+         width="10.583333"
+         id="rect913"
+         style="fill:#eff0f1;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+    </g>
+    <g
+       transform="matrix(-0.30905888,1.6151387,-1.6151387,-0.30905888,9.3627856,1.8488419)"
+       id="g943">
+      <circle
+         style="opacity:0.997;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264999;stroke-linejoin:round;paint-order:stroke fill markers"
+         id="path892"
+         cx="1.6512442"
+         cy="4.9452085"
+         r="0.12575205" />
+      <circle
+         r="0.12575205"
+         cy="4.9452085"
+         cx="1.9359355"
+         id="path892-3"
+         style="opacity:0.997;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264999;stroke-linejoin:round;paint-order:stroke fill markers" />
+      <circle
+         style="opacity:0.997;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264999;stroke-linejoin:round;paint-order:stroke fill markers"
+         id="path892-3-6"
+         cx="2.2206268"
+         cy="4.9452085"
+         r="0.12575205" />
+      <circle
+         r="0.12575205"
+         cy="4.9452085"
+         cx="2.5053182"
+         id="path892-3-6-7"
+         style="opacity:0.997;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264999;stroke-linejoin:round;paint-order:stroke fill markers" />
+    </g>
+    <g
+       id="g943-2"
+       transform="matrix(1.6443153,-0.0204346,0.0204346,1.6443153,-0.01361945,-2.6499566)">
+      <circle
+         r="0.12575205"
+         cy="4.9452085"
+         cx="1.6512442"
+         id="path892-7"
+         style="opacity:0.997;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264999;stroke-linejoin:round;paint-order:stroke fill markers" />
+      <circle
+         style="opacity:0.997;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264999;stroke-linejoin:round;paint-order:stroke fill markers"
+         id="path892-3-0"
+         cx="1.9359355"
+         cy="4.9452085"
+         r="0.12575205" />
+      <circle
+         r="0.12575205"
+         cy="4.9452085"
+         cx="2.2206268"
+         id="path892-3-6-9"
+         style="opacity:0.997;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264999;stroke-linejoin:round;paint-order:stroke fill markers" />
+      <circle
+         style="opacity:0.997;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264999;stroke-linejoin:round;paint-order:stroke fill markers"
+         id="path892-3-6-7-3"
+         cx="2.5053182"
+         cy="4.9452085"
+         r="0.12575205" />
+    </g>
+  </g>
+</svg>
@@ -0,0 +1,546 @@
+<?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"
+   sodipodi:docname="ic_activity_motorbike.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 5.8208333 5.8208333"
+   height="22"
+   width="22">
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect1386"
+       effect="spiro" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect1382"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.99999977,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect1373"
+       effect="spiro" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect1369"
+       is_visible="true"
+       lpeversion="1" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect1357"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,2,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.0000001,0,1 @ F,0,0,1,0,0.093080149,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect3277"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,2,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,1,1,0,0,0,1 @ F,0,1,1,0,0,0,1 @ F,0,0,1,0,3.210527,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect2514"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,4,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.97014234,0,1 @ F,0,0,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0.51887107,0,1 @ F,0,0,1,0,0.22687835,0,1 @ F,0,0,1,0,0,0,1 @ F,0,1,1,0,0.51887107,0,1 @ F,0,0,1,0,0.22687835,0,1 @ F,0,0,1,0,0,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect950"
+       effect="fillet_chamfer" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0.34892149,0,1 @ F,0,0,1,0,0.18398697,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.34892149,0,1 @ F,0,0,1,0,0.18398697,0,1 @ F,0,1,1,0,0,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect946"
+       effect="fillet_chamfer" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,1,1,0,2.00309,0,1 @ F,0,0,1,0,2.00309,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect918"
+       effect="fillet_chamfer" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,7.0000002,0,1 @ F,0,0,1,0,0,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect912"
+       effect="fillet_chamfer" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0.49832891,0,1 @ F,0,0,1,0,0.49832891,0,1 @ F,0,1,1,0,0.5316463,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.49999976,0,1 @ F,0,0,1,0,0.50000024,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.0000001,0,1 @ F,0,0,1,0,0.99999982,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.0295214,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.5316463,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect894"
+       effect="fillet_chamfer" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-maximized="1"
+     inkscape:window-y="27"
+     inkscape:window-x="67"
+     inkscape:window-height="1025"
+     inkscape:window-width="1853"
+     inkscape:guide-bbox="true"
+     showguides="false"
+     inkscape:snap-text-baseline="true"
+     inkscape:snap-center="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-paths="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:bbox-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:snap-bbox="true"
+     units="px"
+     showgrid="false"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="mm"
+     inkscape:cy="12.219337"
+     inkscape:cx="11.776234"
+     inkscape:zoom="27.983802"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="1"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#232629"
+     id="base">
+    <inkscape:grid
+       dotted="true"
+       empspacing="22"
+       id="grid833"
+       type="xygrid" />
+    <inkscape:grid
+       originy="0.26458333"
+       originx="0.26458333"
+       spacingx="1.0583333"
+       spacingy="1.0583333"
+       empspacing="1"
+       id="grid835"
+       type="xygrid" />
+    <sodipodi:guide
+       inkscape:color="rgb(0,0,255)"
+       inkscape:locked="false"
+       inkscape:label=""
+       id="guide887"
+       orientation="0.96592583,0.25881905"
+       position="4.195,4.2333333" />
+    <sodipodi:guide
+       id="guide900"
+       orientation="0,-1"
+       position="0.26458333,1.9843751" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <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>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <g
+       transform="matrix(0.38576851,0,0,0.38576851,152.56385,-12.494408)"
+       id="g954">
+      <rect
+         style="fill:#cacaca;fill-opacity:1;stroke-width:14.6855;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect919"
+         width="68.791664"
+         height="79.375"
+         x="-357.1875"
+         y="-7.9375" />
+      <rect
+         style="fill:#e74c3c;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect851"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54169"
+         y="-5.2916665" />
+      <rect
+         y="-5.2916665"
+         x="-343.95834"
+         height="10.583333"
+         width="10.583333"
+         id="rect853"
+         style="fill:#ed1515;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#f47750;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect855"
+         width="10.583333"
+         height="10.583333"
+         x="-333.375"
+         y="-5.2916665" />
+      <rect
+         y="-5.2916665"
+         x="-322.79169"
+         height="10.583333"
+         width="10.583333"
+         id="rect857"
+         style="fill:#fdbc4b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#c9ce3b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect859"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20834"
+         y="-5.2916665" />
+      <rect
+         y="5.291667"
+         x="-354.54169"
+         height="10.583333"
+         width="10.583333"
+         id="rect861"
+         style="fill:#da4453;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#c0392b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect863"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95834"
+         y="5.291667" />
+      <rect
+         y="5.291667"
+         x="-333.375"
+         height="10.583333"
+         width="10.583333"
+         id="rect865"
+         style="fill:#d35400;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#f67400;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect867"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79169"
+         y="5.291667" />
+      <rect
+         y="5.291667"
+         x="-312.20834"
+         height="10.583333"
+         width="10.583333"
+         id="rect869"
+         style="fill:#f39c1f;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         y="21.166666"
+         x="-354.54169"
+         height="10.583333"
+         width="10.583333"
+         id="rect871"
+         style="fill:#1cdc9a;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#2ecc71;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect873"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95834"
+         y="21.166666" />
+      <rect
+         y="21.166666"
+         x="-333.375"
+         height="10.583333"
+         width="10.583333"
+         id="rect875"
+         style="fill:#1abc9c;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#3498db;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect877"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79169"
+         y="21.166666" />
+      <rect
+         y="21.166666"
+         x="-312.20834"
+         height="10.583333"
+         width="10.583333"
+         id="rect879"
+         style="fill:#3daee9;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#10d116;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect881"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54169"
+         y="31.75" />
+      <rect
+         y="31.75"
+         x="-343.95834"
+         height="10.583333"
+         width="10.583333"
+         id="rect883"
+         style="fill:#27ae60;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#16a085;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect885"
+         width="10.583333"
+         height="10.583333"
+         x="-333.375"
+         y="31.75" />
+      <rect
+         y="31.75"
+         x="-322.79169"
+         height="10.583333"
+         width="10.583333"
+         id="rect887"
+         style="fill:#2980b9;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#1d99f3;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect889"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20834"
+         y="31.75" />
+      <rect
+         style="fill:#9b59b6;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect891"
+         width="10.583333"
+         height="10.583333"
+         x="-301.625"
+         y="21.166666" />
+      <rect
+         y="31.75"
+         x="-301.625"
+         height="10.583333"
+         width="10.583333"
+         id="rect893"
+         style="fill:#8e44ad;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#34495e;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect895"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54166"
+         y="47.625" />
+      <rect
+         y="47.625"
+         x="-343.95831"
+         height="10.583333"
+         width="10.583333"
+         id="rect897"
+         style="fill:#31363b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#7f8c8d;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect899"
+         width="10.583333"
+         height="10.583333"
+         x="-333.37497"
+         y="47.625" />
+      <rect
+         y="47.625"
+         x="-322.79166"
+         height="10.583333"
+         width="10.583333"
+         id="rect901"
+         style="fill:#bdc3c7;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#fcfcfc;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect903"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20831"
+         y="47.625" />
+      <rect
+         y="58.208336"
+         x="-354.54166"
+         height="10.583333"
+         width="10.583333"
+         id="rect905"
+         style="fill:#2c3e50;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#232629;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect907"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95831"
+         y="58.208336" />
+      <rect
+         y="58.208336"
+         x="-333.37497"
+         height="10.583333"
+         width="10.583333"
+         id="rect909"
+         style="fill:#4d4d4d;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#95a5a6;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect911"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79166"
+         y="58.208336" />
+      <rect
+         y="58.208336"
+         x="-312.20831"
+         height="10.583333"
+         width="10.583333"
+         id="rect913"
+         style="fill:#eff0f1;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+    </g>
+    <path
+       id="path901"
+       d="M 1.8574219 3.3066406 A 0.1322915 0.1322915 0 0 0 1.7363281 3.375 L 1.0742188 4.5664062 A 0.13230472 0.13230472 0 0 0 1.2050781 4.7617188 L 2.3964844 4.6289062 A 0.1322915 0.1322915 0 0 0 2.5136719 4.4824219 A 0.1322915 0.1322915 0 0 0 2.3671875 4.3671875 L 1.4316406 4.4707031 L 1.9667969 3.5039062 A 0.1322915 0.1322915 0 0 0 1.9160156 3.3242188 A 0.1322915 0.1322915 0 0 0 1.8574219 3.3066406 z "
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:531.552;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" />
+    <path
+       id="path905"
+       d="M 3.1757812 1.984375 A 0.1322915 0.1322915 0 0 0 3.0429688 2.1171875 A 0.1322915 0.1322915 0 0 0 3.1757812 2.2480469 L 3.6113281 2.2480469 L 4.5058594 4.6757812 A 0.1322915 0.1322915 0 0 0 4.6757812 4.7539062 A 0.1322915 0.1322915 0 0 0 4.7539062 4.5839844 L 3.828125 2.0703125 A 0.13230472 0.13230472 0 0 0 3.7050781 1.984375 L 3.1757812 1.984375 z "
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:531.552;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" />
+    <path
+       transform="scale(0.26458333)"
+       id="path909"
+       d="M 4.9765625 11.5 A 0.50004949 0.50004949 0 0 0 4.5 12 L 4.5 13 A 0.50004949 0.50004949 0 0 0 5 13.5 L 8 13.5 A 0.50004949 0.50004949 0 0 0 8.4882812 13.064453 A 0.50004949 0.50004949 0 0 0 8.4921875 13.005859 A 0.50004949 0.50004949 0 0 0 8.2871094 12.595703 A 0.50004949 0.50004949 0 0 0 8.2382812 12.564453 A 0.50004949 0.50004949 0 0 0 8.0703125 12.505859 A 0.50004949 0.50004949 0 0 0 8.0117188 12.5 A 0.50004949 0.50004949 0 0 0 8 12.5 C 7.0833333 12.5 6.4130278 12.27292 5.9726562 12.052734 C 5.5322847 11.832549 5.3535156 11.646484 5.3535156 11.646484 A 0.50004949 0.50004949 0 0 0 4.9765625 11.5 z "
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:531.552;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" />
+    <path
+       id="path913"
+       d="M 2.7773438 4.1015625 A 0.13249999 0.13249999 0 0 0 2.6464844 4.2324219 A 0.13249999 0.13249999 0 0 0 2.7773438 4.3652344 L 3.0429688 4.3652344 A 0.13249999 0.13249999 0 0 0 3.1757812 4.2324219 A 0.13249999 0.13249999 0 0 0 3.0429688 4.1015625 L 2.7773438 4.1015625 z "
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.265;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" />
+    <g
+       style="opacity:1"
+       transform="scale(0.26458333)"
+       id="g915">
+      <path
+         id="path917"
+         d="m 16.5,10.5 c -0.271556,0.0063 -0.500074,0.228371 -0.5,0.5 0,0.276144 0.223858,0.5 0.5,0.5 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00157;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:531.552;stroke-opacity:1.0;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;" />
+      <path
+         id="path919"
+         d="M 16.488281 10 C 15.950439 10.012478 15.499849 10.447427 15.5 11 C 15.5 11.546787 15.953215 12 16.5 12 A 0.50083507 0.50083507 0 0 0 17 11.5 L 17 10.5 A 0.50083507 0.50083507 0 0 0 16.488281 10 z "
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00157;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:531.552;stroke-opacity:1.0;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;" />
+    </g>
+    <path
+       transform="scale(0.26458333)"
+       id="path923"
+       d="M 11 11.5 C 10.371809 11.5 9.9307721 11.946836 9.7089844 12.5 L 8 12.5 A 0.50004949 0.50004949 0 0 0 7.5234375 13.152344 L 9.1230469 18.152344 A 0.50004949 0.50004949 0 0 0 9.5996094 18.5 L 13 18.5 A 0.50004949 0.50004949 0 0 0 13.5 18 C 13.5 17.777537 13.499839 17.669786 13.5 17.5 C 13.500093 15.822204 14.542706 14.325749 16.117188 13.746094 A 0.50004949 0.50004949 0 0 0 16.414062 13.103516 L 15.943359 11.826172 A 0.50004949 0.50004949 0 0 0 15.474609 11.5 L 11 11.5 z M 11 12.5 L 15.126953 12.5 L 15.357422 13.128906 C 13.674401 13.966365 12.500106 15.589879 12.5 17.5 L 9.9648438 17.5 L 8.6855469 13.5 L 10 13.5 A 0.50004949 0.50004949 0 0 0 10.5 13 C 10.5 12.717935 10.717935 12.5 11 12.5 z "
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:531.552;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:0.994135" />
+    <path
+       id="path927"
+       d="M 2.7773438 3.703125 A 0.13249999 0.13249999 0 0 0 2.6464844 3.8359375 A 0.13249999 0.13249999 0 0 0 2.7773438 3.96875 L 3.0429688 3.96875 A 0.13249999 0.13249999 0 0 0 3.1757812 3.8359375 A 0.13249999 0.13249999 0 0 0 3.0429688 3.703125 L 2.7773438 3.703125 z "
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.265;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.997;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.261354;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       d="m 4.6258209,3.8250746 c -0.4345653,0 -0.7901218,0.3555565 -0.7901218,0.7901218 0,0.4345652 0.3555565,0.7901217 0.7901218,0.7901218 0.4345652,-1e-7 0.7901217,-0.3555566 0.7901217,-0.7901218 0,-0.4345653 -0.3555565,-0.7901218 -0.7901217,-0.7901218 z m 0,0.2608413 c 0.2933192,0 0.5267476,0.2359612 0.5267479,0.5292805 0,0.2933193 -0.2334287,0.5292803 -0.5267479,0.5292803 -0.2933193,0 -0.5292805,-0.235961 -0.5292805,-0.5292803 0,-0.2933193 0.2359612,-0.5292805 0.5292805,-0.5292805 z"
+       id="path970-7-3" />
+    <path
+       id="path970-7-3-6"
+       d="m 1.2138007,3.8250746 c -0.43456528,0 -0.79012178,0.3555565 -0.79012178,0.7901218 0,0.4345652 0.3555565,0.7901217 0.79012178,0.7901218 0.4345652,-1e-7 0.7901217,-0.3555566 0.7901217,-0.7901218 0,-0.4345653 -0.3555565,-0.7901218 -0.7901217,-0.7901218 z m 0,0.2608413 c 0.2933192,0 0.5267476,0.2359612 0.5267479,0.5292805 0,0.2933193 -0.2334287,0.5292803 -0.5267479,0.5292803 -0.29331928,0 -0.52928048,-0.235961 -0.52928048,-0.5292803 0,-0.2933193 0.2359612,-0.5292805 0.52928048,-0.5292805 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.997;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.261354;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1" />
+  </g>
+</svg>
@@ -0,0 +1,464 @@
+<?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"
+   width="22"
+   height="22"
+   viewBox="0 0 5.8208333 5.8208333"
+   version="1.1"
+   id="svg8"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="ic_activity_mtb.svg">
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect3162"
+       is_visible="true"
+       lpeversion="1" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect3149"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.9999999,0,1 @ F,0,0,1,0,2.0000001,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,4,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.97014234,0,1 @ F,0,0,1,0,0,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect2514"
+       effect="fillet_chamfer" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect950"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.51887107,0,1 @ F,0,0,1,0,0.22687835,0,1 @ F,0,0,1,0,0,0,1 @ F,0,1,1,0,0.51887107,0,1 @ F,0,0,1,0,0.22687835,0,1 @ F,0,0,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect946"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.34892149,0,1 @ F,0,0,1,0,0.18398697,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.34892149,0,1 @ F,0,0,1,0,0.18398697,0,1 @ F,0,1,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect918"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,1,1,0,2.00309,0,1 @ F,0,0,1,0,2.00309,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect912"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,7.0000002,0,1 @ F,0,0,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect894"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.49832891,0,1 @ F,0,0,1,0,0.49832891,0,1 @ F,0,1,1,0,0.5316463,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.49999976,0,1 @ F,0,0,1,0,0.50000024,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.0000001,0,1 @ F,0,0,1,0,0.99999982,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.0295214,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.5316463,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#232629"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.832358"
+     inkscape:cx="2.2323103"
+     inkscape:cy="8.8776466"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-text-baseline="true"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1596"
+     inkscape:window-height="917"
+     inkscape:window-x="123"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid833"
+       empspacing="22"
+       dotted="true" />
+    <inkscape:grid
+       type="xygrid"
+       id="grid835"
+       empspacing="1"
+       spacingy="1.0583333"
+       spacingx="1.0583333"
+       originx="0.26458333"
+       originy="0.26458333" />
+    <sodipodi:guide
+       position="4.195,4.2333333"
+       orientation="0.96592583,0.25881905"
+       id="guide887"
+       inkscape:label=""
+       inkscape:locked="false"
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="0.26458333,1.9843751"
+       orientation="0,-1"
+       id="guide900" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <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>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g954"
+       transform="matrix(0.38576851,0,0,0.38576851,152.56385,-12.494408)">
+      <rect
+         y="-7.9375"
+         x="-357.1875"
+         height="79.375"
+         width="68.791664"
+         id="rect919"
+         style="fill:#cacaca;fill-opacity:1;stroke-width:14.6855;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         y="-5.2916665"
+         x="-354.54169"
+         height="10.583333"
+         width="10.583333"
+         id="rect851"
+         style="fill:#e74c3c;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#ed1515;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect853"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95834"
+         y="-5.2916665" />
+      <rect
+         y="-5.2916665"
+         x="-333.375"
+         height="10.583333"
+         width="10.583333"
+         id="rect855"
+         style="fill:#f47750;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#fdbc4b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect857"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79169"
+         y="-5.2916665" />
+      <rect
+         y="-5.2916665"
+         x="-312.20834"
+         height="10.583333"
+         width="10.583333"
+         id="rect859"
+         style="fill:#c9ce3b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#da4453;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect861"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54169"
+         y="5.291667" />
+      <rect
+         y="5.291667"
+         x="-343.95834"
+         height="10.583333"
+         width="10.583333"
+         id="rect863"
+         style="fill:#c0392b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#d35400;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect865"
+         width="10.583333"
+         height="10.583333"
+         x="-333.375"
+         y="5.291667" />
+      <rect
+         y="5.291667"
+         x="-322.79169"
+         height="10.583333"
+         width="10.583333"
+         id="rect867"
+         style="fill:#f67400;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#f39c1f;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect869"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20834"
+         y="5.291667" />
+      <rect
+         style="fill:#1cdc9a;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect871"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54169"
+         y="21.166666" />
+      <rect
+         y="21.166666"
+         x="-343.95834"
+         height="10.583333"
+         width="10.583333"
+         id="rect873"
+         style="fill:#2ecc71;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#1abc9c;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect875"
+         width="10.583333"
+         height="10.583333"
+         x="-333.375"
+         y="21.166666" />
+      <rect
+         y="21.166666"
+         x="-322.79169"
+         height="10.583333"
+         width="10.583333"
+         id="rect877"
+         style="fill:#3498db;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#3daee9;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect879"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20834"
+         y="21.166666" />
+      <rect
+         y="31.75"
+         x="-354.54169"
+         height="10.583333"
+         width="10.583333"
+         id="rect881"
+         style="fill:#10d116;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#27ae60;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect883"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95834"
+         y="31.75" />
+      <rect
+         y="31.75"
+         x="-333.375"
+         height="10.583333"
+         width="10.583333"
+         id="rect885"
+         style="fill:#16a085;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#2980b9;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect887"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79169"
+         y="31.75" />
+      <rect
+         y="31.75"
+         x="-312.20834"
+         height="10.583333"
+         width="10.583333"
+         id="rect889"
+         style="fill:#1d99f3;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         y="21.166666"
+         x="-301.625"
+         height="10.583333"
+         width="10.583333"
+         id="rect891"
+         style="fill:#9b59b6;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#8e44ad;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect893"
+         width="10.583333"
+         height="10.583333"
+         x="-301.625"
+         y="31.75" />
+      <rect
+         y="47.625"
+         x="-354.54166"
+         height="10.583333"
+         width="10.583333"
+         id="rect895"
+         style="fill:#34495e;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#31363b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect897"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95831"
+         y="47.625" />
+      <rect
+         y="47.625"
+         x="-333.37497"
+         height="10.583333"
+         width="10.583333"
+         id="rect899"
+         style="fill:#7f8c8d;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#bdc3c7;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect901"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79166"
+         y="47.625" />
+      <rect
+         y="47.625"
+         x="-312.20831"
+         height="10.583333"
+         width="10.583333"
+         id="rect903"
+         style="fill:#fcfcfc;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#2c3e50;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect905"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54166"
+         y="58.208336" />
+      <rect
+         y="58.208336"
+         x="-343.95831"
+         height="10.583333"
+         width="10.583333"
+         id="rect907"
+         style="fill:#232629;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#4d4d4d;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect909"
+         width="10.583333"
+         height="10.583333"
+         x="-333.37497"
+         y="58.208336" />
+      <rect
+         y="58.208336"
+         x="-322.79166"
+         height="10.583333"
+         width="10.583333"
+         id="rect911"
+         style="fill:#95a5a6;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#eff0f1;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect913"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20831"
+         y="58.208336" />
+    </g>
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke-width:0.196349"
+       id="path51"
+       d="M 1.8042087,1.0709424 C 1.9783861,0.94322723 2.0164009,0.69622363 1.8886857,0.52204593 1.7609704,0.34786823 1.5139667,0.30985363 1.3397894,0.43756873 1.1656114,0.56528423 1.1275967,0.81228773 1.2553124,0.98646553 1.3830273,1.1606434 1.6300308,1.198658 1.8042087,1.0709424 Z M 0.89628461,3.3192757 C 0.4529229,3.6443694 0.35999832,4.2481554 0.68509192,4.6915169 1.0101856,5.1348783 1.6139715,5.2278033 2.0573332,4.9027093 2.5006949,4.5776158 2.5936197,3.9738298 2.2685259,3.5304682 1.9434323,3.0871067 1.3396463,2.9941819 0.89628461,3.3192757 Z M 1.883176,4.6651945 C 1.5823234,4.8857933 1.143206,4.8182123 0.92260684,4.5173598 0.70200762,4.2165074 0.76958946,3.77739 1.0704419,3.5567908 1.3712945,3.3361914 1.8104113,3.4037735 2.0310104,3.7046258 2.2516097,4.0054783 2.1840285,4.4445951 1.883176,4.6651945 Z M 1.6405189,2.4083524 1.7418913,1.7496767 1.9614496,1.7834677 c 0.3567831,0.05491 0.7188509,-0.015794 1.051372,-0.2596139 L 2.7806119,1.2071669 C 2.5430963,1.3813245 2.2834214,1.4256443 2.0364186,1.3876293 L 1.5149667,1.3073761 C 1.3893532,1.3020906 1.2869605,1.3284748 1.1919542,1.3981379 1.0969485,1.4678006 1.0409979,1.5575218 1.0399363,1.6556909 L 0.92166874,2.4241458 c -0.0168959,0.1097797 0.009488,0.2121721 0.0675406,0.2913438 0.0696627,0.095006 0.15938086,0.150959 0.25755306,0.1520177 L 2.0785546,2.9393333 2.6590789,3.7310504 2.9757655,3.4988407 2.2559153,2.5171116 Z M 3.1130918,1.6938078 C 2.6697307,2.0189011 2.5768054,2.6226876 2.9018991,3.0660491 3.2269927,3.5094107 3.8307793,3.602335 4.2741404,3.2772417 4.7175021,2.952148 4.8104268,2.348362 4.4853331,1.9050004 4.1602394,1.4616389 3.5564535,1.368714 3.1130918,1.6938078 Z M 4.0999832,3.0397266 C 3.7991307,3.2603259 3.3600139,3.1927439 3.1394147,2.8918914 2.9188155,2.5910391 2.9863967,2.1519221 3.2872491,1.9313229 3.5881015,1.7107237 4.0272189,1.7783052 4.2478182,2.0791576 4.4684174,2.38001 4.4008356,2.8191274 4.0999832,3.0397266 Z" />
+    <path
+       sodipodi:nodetypes="ccccccccccccc"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       d="M 6.2355927,2.3458251 4.366485,3.4225311 3.0292969,4.9121094 2.0999371,5.0657395 1.5371094,5.4570312 -0.2265625,5.8183594 -0.17382812,6.0761719 1.7207031,5.6914062 2.2796245,5.3059739 3.21875,5.1503906 4.5637507,3.639328 6.4484834,2.5587157 Z"
+       id="path920" />
+  </g>
+</svg>
@@ -0,0 +1,477 @@
+<?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"
+   width="22"
+   height="22"
+   viewBox="0 0 5.8208333 5.8208333"
+   version="1.1"
+   id="svg8"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="ic_activity_sailing.svg">
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect3162"
+       is_visible="true"
+       lpeversion="1" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect3149"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.9999999,0,1 @ F,0,0,1,0,2.0000001,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,4,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.97014234,0,1 @ F,0,0,1,0,0,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect2514"
+       effect="fillet_chamfer" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect950"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.51887107,0,1 @ F,0,0,1,0,0.22687835,0,1 @ F,0,0,1,0,0,0,1 @ F,0,1,1,0,0.51887107,0,1 @ F,0,0,1,0,0.22687835,0,1 @ F,0,0,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect946"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.34892149,0,1 @ F,0,0,1,0,0.18398697,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.34892149,0,1 @ F,0,0,1,0,0.18398697,0,1 @ F,0,1,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect918"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,1,1,0,2.00309,0,1 @ F,0,0,1,0,2.00309,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect912"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,7.0000002,0,1 @ F,0,0,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect894"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.49832891,0,1 @ F,0,0,1,0,0.49832891,0,1 @ F,0,1,1,0,0.5316463,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.49999976,0,1 @ F,0,0,1,0,0.50000024,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.0000001,0,1 @ F,0,0,1,0,0.99999982,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.0295214,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.5316463,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#232629"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.390336"
+     inkscape:cx="13.656644"
+     inkscape:cy="9.1983306"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-text-baseline="true"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1596"
+     inkscape:window-height="917"
+     inkscape:window-x="123"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid833"
+       empspacing="22"
+       dotted="true" />
+    <inkscape:grid
+       type="xygrid"
+       id="grid835"
+       empspacing="1"
+       spacingy="1.0583333"
+       spacingx="1.0583333"
+       originx="0.26458333"
+       originy="0.26458333" />
+    <sodipodi:guide
+       position="4.195,4.2333333"
+       orientation="0.96592583,0.25881905"
+       id="guide887"
+       inkscape:label=""
+       inkscape:locked="false"
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="0.26458333,1.9843751"
+       orientation="0,-1"
+       id="guide900" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <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></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g954"
+       transform="matrix(0.38576851,0,0,0.38576851,152.56385,-12.494408)">
+      <rect
+         y="-7.9375"
+         x="-357.1875"
+         height="79.375"
+         width="68.791664"
+         id="rect919"
+         style="fill:#cacaca;fill-opacity:1;stroke-width:14.6855;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         y="-5.2916665"
+         x="-354.54169"
+         height="10.583333"
+         width="10.583333"
+         id="rect851"
+         style="fill:#e74c3c;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#ed1515;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect853"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95834"
+         y="-5.2916665" />
+      <rect
+         y="-5.2916665"
+         x="-333.375"
+         height="10.583333"
+         width="10.583333"
+         id="rect855"
+         style="fill:#f47750;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#fdbc4b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect857"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79169"
+         y="-5.2916665" />
+      <rect
+         y="-5.2916665"
+         x="-312.20834"
+         height="10.583333"
+         width="10.583333"
+         id="rect859"
+         style="fill:#c9ce3b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#da4453;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect861"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54169"
+         y="5.291667" />
+      <rect
+         y="5.291667"
+         x="-343.95834"
+         height="10.583333"
+         width="10.583333"
+         id="rect863"
+         style="fill:#c0392b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#d35400;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect865"
+         width="10.583333"
+         height="10.583333"
+         x="-333.375"
+         y="5.291667" />
+      <rect
+         y="5.291667"
+         x="-322.79169"
+         height="10.583333"
+         width="10.583333"
+         id="rect867"
+         style="fill:#f67400;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#f39c1f;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect869"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20834"
+         y="5.291667" />
+      <rect
+         style="fill:#1cdc9a;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect871"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54169"
+         y="21.166666" />
+      <rect
+         y="21.166666"
+         x="-343.95834"
+         height="10.583333"
+         width="10.583333"
+         id="rect873"
+         style="fill:#2ecc71;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#1abc9c;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect875"
+         width="10.583333"
+         height="10.583333"
+         x="-333.375"
+         y="21.166666" />
+      <rect
+         y="21.166666"
+         x="-322.79169"
+         height="10.583333"
+         width="10.583333"
+         id="rect877"
+         style="fill:#3498db;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#3daee9;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect879"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20834"
+         y="21.166666" />
+      <rect
+         y="31.75"
+         x="-354.54169"
+         height="10.583333"
+         width="10.583333"
+         id="rect881"
+         style="fill:#10d116;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#27ae60;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect883"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95834"
+         y="31.75" />
+      <rect
+         y="31.75"
+         x="-333.375"
+         height="10.583333"
+         width="10.583333"
+         id="rect885"
+         style="fill:#16a085;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#2980b9;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect887"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79169"
+         y="31.75" />
+      <rect
+         y="31.75"
+         x="-312.20834"
+         height="10.583333"
+         width="10.583333"
+         id="rect889"
+         style="fill:#1d99f3;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         y="21.166666"
+         x="-301.625"
+         height="10.583333"
+         width="10.583333"
+         id="rect891"
+         style="fill:#9b59b6;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#8e44ad;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect893"
+         width="10.583333"
+         height="10.583333"
+         x="-301.625"
+         y="31.75" />
+      <rect
+         y="47.625"
+         x="-354.54166"
+         height="10.583333"
+         width="10.583333"
+         id="rect895"
+         style="fill:#34495e;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#31363b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect897"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95831"
+         y="47.625" />
+      <rect
+         y="47.625"
+         x="-333.37497"
+         height="10.583333"
+         width="10.583333"
+         id="rect899"
+         style="fill:#7f8c8d;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#bdc3c7;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect901"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79166"
+         y="47.625" />
+      <rect
+         y="47.625"
+         x="-312.20831"
+         height="10.583333"
+         width="10.583333"
+         id="rect903"
+         style="fill:#fcfcfc;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#2c3e50;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect905"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54166"
+         y="58.208336" />
+      <rect
+         y="58.208336"
+         x="-343.95831"
+         height="10.583333"
+         width="10.583333"
+         id="rect907"
+         style="fill:#232629;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#4d4d4d;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect909"
+         width="10.583333"
+         height="10.583333"
+         x="-333.37497"
+         y="58.208336" />
+      <rect
+         y="58.208336"
+         x="-322.79166"
+         height="10.583333"
+         width="10.583333"
+         id="rect911"
+         style="fill:#95a5a6;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#eff0f1;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect913"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20831"
+         y="58.208336" />
+    </g>
+    <path
+       sodipodi:nodetypes="ccccc"
+       id="path900"
+       d="M 0.56041665,4.4708333 1.1604167,5.4 h 3.5 l 0.6,-0.9291667 z"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       id="path902"
+       d="M 2.8024332,0.32721116 V 4.5 H 3.0184001 V 0.32721116 Z"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.244823px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path904"
+       d="M 2.6527855,1.0066933 2.6459669,4.192806 0.73848581,4.2035269 Z"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.257218px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.281927px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 3.1616713,0.35463877 0.00682,3.82765233 1.9074808,0.01288 z"
+       id="path904-3" />
+    <path
+       id="path921"
+       d="M 2.8105515,0.32721116 V 0.75450025 L 2.0324942,0.57664397 Z"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.286457px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+</svg>
@@ -0,0 +1,482 @@
+<?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"
+   width="22"
+   height="22"
+   viewBox="0 0 5.8208333 5.8208333"
+   version="1.1"
+   id="svg8"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="ic_activity_skateboarding.svg">
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect3162"
+       is_visible="true"
+       lpeversion="1" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect3149"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.9999999,0,1 @ F,0,0,1,0,2.0000001,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,4,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.97014234,0,1 @ F,0,0,1,0,0,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect2514"
+       effect="fillet_chamfer" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect950"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.51887107,0,1 @ F,0,0,1,0,0.22687835,0,1 @ F,0,0,1,0,0,0,1 @ F,0,1,1,0,0.51887107,0,1 @ F,0,0,1,0,0.22687835,0,1 @ F,0,0,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect946"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.34892149,0,1 @ F,0,0,1,0,0.18398697,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.34892149,0,1 @ F,0,0,1,0,0.18398697,0,1 @ F,0,1,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect918"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,1,1,0,2.00309,0,1 @ F,0,0,1,0,2.00309,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect912"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,7.0000002,0,1 @ F,0,0,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect894"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.49832891,0,1 @ F,0,0,1,0,0.49832891,0,1 @ F,0,1,1,0,0.5316463,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.49999976,0,1 @ F,0,0,1,0,0.50000024,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.0000001,0,1 @ F,0,0,1,0,0.99999982,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.0295214,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.5316463,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+  </defs>
+  <sodipodi:namedview
+     guidetolerance="7.7"
+     objecttolerance="7.7"
+     inkscape:lockguides="true"
+     id="base"
+     pagecolor="#232629"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.195168"
+     inkscape:cx="12.030411"
+     inkscape:cy="9.6162221"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-text-baseline="true"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1853"
+     inkscape:window-height="1025"
+     inkscape:window-x="67"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       snapvisiblegridlinesonly="false"
+       type="xygrid"
+       id="grid833"
+       empspacing="22"
+       dotted="true" />
+    <inkscape:grid
+       type="xygrid"
+       id="grid835"
+       empspacing="1"
+       spacingy="1.0583333"
+       spacingx="1.0583333"
+       originx="0.26458333"
+       originy="0.26458333" />
+    <sodipodi:guide
+       position="4.195,4.2333333"
+       orientation="0.96592583,0.25881905"
+       id="guide887"
+       inkscape:label=""
+       inkscape:locked="true"
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       inkscape:locked="true"
+       position="0.26458333,1.9843751"
+       orientation="0,-1"
+       id="guide900" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <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></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       sodipodi:nodetypes="sssssccccccccccccsccccccccccc"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.244651;stroke-opacity:1"
+       id="path17"
+       d="M 3.4497594,1.2723995 C 3.7188321,1.2675879 3.9350456,1.043501 3.9302338,0.7744294 3.9254222,0.50535723 3.7013352,0.28914379 3.4322626,0.29395542 3.1631898,0.29876705 2.9469764,0.5228543 2.9517881,0.7919262 2.9565981,1.0609979 3.1806867,1.2772111 3.4497594,1.2723995 Z M 3.0637352,4.3310097 2.8499094,3.4654121 3.5050565,3.7377246 4.0318851,5.1078311 4.4885872,4.9322216 3.8300515,3.2195885 3.1749046,2.9472761 3.3770914,2.4212785 C 3.7016475,2.7825092 4.1834322,3.0452834 4.7215778,3.0356596 L 4.7128291,2.5464372 C 4.2480673,2.5547482 3.9586663,2.3644029 3.7568534,2.0254461 L 3.5052429,1.6384419 C 3.4047741,1.4934249 3.2562572,1.3982048 3.0850292,1.4012668 c -0.073384,0.00131 -0.1218679,0.026649 -0.1952518,0.02796 L 1.627421,1.9901187 1.2471269,3.0265669 1.6538376,3.2423177 2.0691965,2.3071052 2.5595693,2.120264 2.1081061,3.2524111 2.4089713,4.1591882 1.3164273,4.8578585 1.9480117,4.971638 Z" />
+    <g
+       id="g954"
+       transform="matrix(0.38576851,0,0,0.38576851,152.56385,-12.494408)">
+      <rect
+         y="-7.9375"
+         x="-357.1875"
+         height="79.375"
+         width="68.791664"
+         id="rect919"
+         style="fill:#cacaca;fill-opacity:1;stroke-width:14.6855;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         y="-5.2916665"
+         x="-354.54169"
+         height="10.583333"
+         width="10.583333"
+         id="rect851"
+         style="fill:#e74c3c;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#ed1515;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect853"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95834"
+         y="-5.2916665" />
+      <rect
+         y="-5.2916665"
+         x="-333.375"
+         height="10.583333"
+         width="10.583333"
+         id="rect855"
+         style="fill:#f47750;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#fdbc4b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect857"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79169"
+         y="-5.2916665" />
+      <rect
+         y="-5.2916665"
+         x="-312.20834"
+         height="10.583333"
+         width="10.583333"
+         id="rect859"
+         style="fill:#c9ce3b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#da4453;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect861"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54169"
+         y="5.291667" />
+      <rect
+         y="5.291667"
+         x="-343.95834"
+         height="10.583333"
+         width="10.583333"
+         id="rect863"
+         style="fill:#c0392b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#d35400;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect865"
+         width="10.583333"
+         height="10.583333"
+         x="-333.375"
+         y="5.291667" />
+      <rect
+         y="5.291667"
+         x="-322.79169"
+         height="10.583333"
+         width="10.583333"
+         id="rect867"
+         style="fill:#f67400;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#f39c1f;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect869"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20834"
+         y="5.291667" />
+      <rect
+         style="fill:#1cdc9a;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect871"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54169"
+         y="21.166666" />
+      <rect
+         y="21.166666"
+         x="-343.95834"
+         height="10.583333"
+         width="10.583333"
+         id="rect873"
+         style="fill:#2ecc71;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#1abc9c;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect875"
+         width="10.583333"
+         height="10.583333"
+         x="-333.375"
+         y="21.166666" />
+      <rect
+         y="21.166666"
+         x="-322.79169"
+         height="10.583333"
+         width="10.583333"
+         id="rect877"
+         style="fill:#3498db;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#3daee9;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect879"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20834"
+         y="21.166666" />
+      <rect
+         y="31.75"
+         x="-354.54169"
+         height="10.583333"
+         width="10.583333"
+         id="rect881"
+         style="fill:#10d116;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#27ae60;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect883"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95834"
+         y="31.75" />
+      <rect
+         y="31.75"
+         x="-333.375"
+         height="10.583333"
+         width="10.583333"
+         id="rect885"
+         style="fill:#16a085;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#2980b9;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect887"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79169"
+         y="31.75" />
+      <rect
+         y="31.75"
+         x="-312.20834"
+         height="10.583333"
+         width="10.583333"
+         id="rect889"
+         style="fill:#1d99f3;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         y="21.166666"
+         x="-301.625"
+         height="10.583333"
+         width="10.583333"
+         id="rect891"
+         style="fill:#9b59b6;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#8e44ad;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect893"
+         width="10.583333"
+         height="10.583333"
+         x="-301.625"
+         y="31.75" />
+      <rect
+         y="47.625"
+         x="-354.54166"
+         height="10.583333"
+         width="10.583333"
+         id="rect895"
+         style="fill:#34495e;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#31363b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect897"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95831"
+         y="47.625" />
+      <rect
+         y="47.625"
+         x="-333.37497"
+         height="10.583333"
+         width="10.583333"
+         id="rect899"
+         style="fill:#7f8c8d;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#bdc3c7;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect901"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79166"
+         y="47.625" />
+      <rect
+         y="47.625"
+         x="-312.20831"
+         height="10.583333"
+         width="10.583333"
+         id="rect903"
+         style="fill:#fcfcfc;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#2c3e50;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect905"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54166"
+         y="58.208336" />
+      <rect
+         y="58.208336"
+         x="-343.95831"
+         height="10.583333"
+         width="10.583333"
+         id="rect907"
+         style="fill:#232629;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#4d4d4d;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect909"
+         width="10.583333"
+         height="10.583333"
+         x="-333.37497"
+         y="58.208336" />
+      <rect
+         y="58.208336"
+         x="-322.79166"
+         height="10.583333"
+         width="10.583333"
+         id="rect911"
+         style="fill:#95a5a6;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#eff0f1;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect913"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20831"
+         y="58.208336" />
+    </g>
+    <path
+       sodipodi:nodetypes="cccccccccccccc"
+       d="M 0.70720657,4.618942 0.50519813,4.8871827 c -3e-8,0 0.1915452,0.1543669 0.29349555,0.2268814 0.0408697,0.022353 0.0297057,0.028139 0.10131117,0.035126 l 2.08762525,-0.0023 2.0876253,0.0023 c 0.071605,-0.00699 0.061055,-0.012773 0.1019258,-0.035126 C 5.2791315,5.04155 5.4700628,4.8871827 5.4700628,4.8871827 L 5.2680537,4.618942 5.0181529,4.8124246 3.1356059,4.811273 H 2.8396543 l -1.88193269,0.00115 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.304444px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       id="path894-3" />
+    <circle
+       r="0.1149179"
+       cy="5.4143333"
+       cx="1.4282604"
+       id="path999"
+       style="opacity:0.997;fill:#ffffff;stroke:#ffffff;stroke-width:0.264999;stroke-linejoin:round;stroke-opacity:1;paint-order:stroke fill markers" />
+    <circle
+       style="opacity:0.997;fill:#ffffff;stroke:#ffffff;stroke-width:0.264999;stroke-linejoin:round;stroke-opacity:1;paint-order:stroke fill markers"
+       id="path999-5"
+       cx="4.4387093"
+       cy="5.4143333"
+       r="0.1149179" />
+  </g>
+</svg>
@@ -0,0 +1,469 @@
+<?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"
+   sodipodi:docname="ic_activity_skiing.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 5.8208333 5.8208333"
+   height="22"
+   width="22">
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect3162"
+       effect="spiro" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.9999999,0,1 @ F,0,0,1,0,2.0000001,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect3149"
+       effect="fillet_chamfer" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect2514"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,4,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.97014234,0,1 @ F,0,0,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0.51887107,0,1 @ F,0,0,1,0,0.22687835,0,1 @ F,0,0,1,0,0,0,1 @ F,0,1,1,0,0.51887107,0,1 @ F,0,0,1,0,0.22687835,0,1 @ F,0,0,1,0,0,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect950"
+       effect="fillet_chamfer" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0.34892149,0,1 @ F,0,0,1,0,0.18398697,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.34892149,0,1 @ F,0,0,1,0,0.18398697,0,1 @ F,0,1,1,0,0,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect946"
+       effect="fillet_chamfer" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,1,1,0,2.00309,0,1 @ F,0,0,1,0,2.00309,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect918"
+       effect="fillet_chamfer" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,7.0000002,0,1 @ F,0,0,1,0,0,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect912"
+       effect="fillet_chamfer" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0.49832891,0,1 @ F,0,0,1,0,0.49832891,0,1 @ F,0,1,1,0,0.5316463,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.49999976,0,1 @ F,0,0,1,0,0.50000024,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.0000001,0,1 @ F,0,0,1,0,0.99999982,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.0295214,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.5316463,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect894"
+       effect="fillet_chamfer" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-maximized="0"
+     inkscape:window-y="175"
+     inkscape:window-x="67"
+     inkscape:window-height="780"
+     inkscape:window-width="1444"
+     inkscape:guide-bbox="true"
+     showguides="false"
+     inkscape:snap-text-baseline="true"
+     inkscape:snap-center="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-paths="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:bbox-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:snap-bbox="true"
+     units="px"
+     showgrid="false"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="mm"
+     inkscape:cy="11.008507"
+     inkscape:cx="12.634965"
+     inkscape:zoom="15.832358"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="1"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#232629"
+     id="base">
+    <inkscape:grid
+       dotted="true"
+       empspacing="22"
+       id="grid833"
+       type="xygrid" />
+    <inkscape:grid
+       originy="0.26458333"
+       originx="0.26458333"
+       spacingx="1.0583333"
+       spacingy="1.0583333"
+       empspacing="1"
+       id="grid835"
+       type="xygrid" />
+    <sodipodi:guide
+       inkscape:color="rgb(0,0,255)"
+       inkscape:locked="false"
+       inkscape:label=""
+       id="guide887"
+       orientation="0.96592583,0.25881905"
+       position="4.195,4.2333333" />
+    <sodipodi:guide
+       id="guide900"
+       orientation="0,-1"
+       position="0.26458333,1.9843751" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <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>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <path
+       sodipodi:nodetypes="ssssscccccccccccsacccccc"
+       d="M 4.5585535,1.8682464 C 4.730575,2.037758 5.0100109,2.0357042 5.1795224,1.8636824 5.3490338,1.6916608 5.3469796,1.4122249 5.1749586,1.2427137 5.0029369,1.0732022 4.7235009,1.075256 4.5539893,1.2472777 4.3844781,1.419299 4.3865322,1.6987351 4.5585535,1.8682464 Z M 2.5616473,2.8895379 2.9818066,3.7412695 2.1627798,4.156586 2.4890714,4.5159652 3.6644142,3.9783412 3.3324214,3.2071044 3.7880462,2.6501643 C 3.760192,3.0850707 3.9188577,3.5496566 4.2629009,3.8886795 L 4.5711034,3.575913 C 4.2739752,3.2831205 4.1778634,2.8801752 4.2684987,2.5379577 L 4.3586776,2.1336426 C 4.3885856,1.9781722 4.356396,1.8231572 4.2469278,1.7152862 4.2000132,1.6690561 4.0431309,1.5310148 3.9171527,1.4852939 3.6109432,1.3741621 2.9436171,1.4000918 2.9436171,1.4000918 L 1.9817647,1.9917143 2.2945313,2.2999171 3.0666299,1.8154812 3.4559921,1.8297725 Z"
+       id="path17"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.219552;stroke-opacity:1" />
+    <g
+       transform="matrix(0.38576851,0,0,0.38576851,152.97482,-12.494408)"
+       id="g954">
+      <rect
+         style="fill:#cacaca;fill-opacity:1;stroke-width:14.6855;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect919"
+         width="68.791664"
+         height="79.375"
+         x="-357.1875"
+         y="-7.9375" />
+      <rect
+         style="fill:#e74c3c;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect851"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54169"
+         y="-5.2916665" />
+      <rect
+         y="-5.2916665"
+         x="-343.95834"
+         height="10.583333"
+         width="10.583333"
+         id="rect853"
+         style="fill:#ed1515;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#f47750;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect855"
+         width="10.583333"
+         height="10.583333"
+         x="-333.375"
+         y="-5.2916665" />
+      <rect
+         y="-5.2916665"
+         x="-322.79169"
+         height="10.583333"
+         width="10.583333"
+         id="rect857"
+         style="fill:#fdbc4b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#c9ce3b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect859"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20834"
+         y="-5.2916665" />
+      <rect
+         y="5.291667"
+         x="-354.54169"
+         height="10.583333"
+         width="10.583333"
+         id="rect861"
+         style="fill:#da4453;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#c0392b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect863"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95834"
+         y="5.291667" />
+      <rect
+         y="5.291667"
+         x="-333.375"
+         height="10.583333"
+         width="10.583333"
+         id="rect865"
+         style="fill:#d35400;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#f67400;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect867"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79169"
+         y="5.291667" />
+      <rect
+         y="5.291667"
+         x="-312.20834"
+         height="10.583333"
+         width="10.583333"
+         id="rect869"
+         style="fill:#f39c1f;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         y="21.166666"
+         x="-354.54169"
+         height="10.583333"
+         width="10.583333"
+         id="rect871"
+         style="fill:#1cdc9a;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#2ecc71;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect873"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95834"
+         y="21.166666" />
+      <rect
+         y="21.166666"
+         x="-333.375"
+         height="10.583333"
+         width="10.583333"
+         id="rect875"
+         style="fill:#1abc9c;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#3498db;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect877"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79169"
+         y="21.166666" />
+      <rect
+         y="21.166666"
+         x="-312.20834"
+         height="10.583333"
+         width="10.583333"
+         id="rect879"
+         style="fill:#3daee9;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#10d116;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect881"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54169"
+         y="31.75" />
+      <rect
+         y="31.75"
+         x="-343.95834"
+         height="10.583333"
+         width="10.583333"
+         id="rect883"
+         style="fill:#27ae60;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#16a085;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect885"
+         width="10.583333"
+         height="10.583333"
+         x="-333.375"
+         y="31.75" />
+      <rect
+         y="31.75"
+         x="-322.79169"
+         height="10.583333"
+         width="10.583333"
+         id="rect887"
+         style="fill:#2980b9;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#1d99f3;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect889"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20834"
+         y="31.75" />
+      <rect
+         style="fill:#9b59b6;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect891"
+         width="10.583333"
+         height="10.583333"
+         x="-301.625"
+         y="21.166666" />
+      <rect
+         y="31.75"
+         x="-301.625"
+         height="10.583333"
+         width="10.583333"
+         id="rect893"
+         style="fill:#8e44ad;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#34495e;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect895"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54166"
+         y="47.625" />
+      <rect
+         y="47.625"
+         x="-343.95831"
+         height="10.583333"
+         width="10.583333"
+         id="rect897"
+         style="fill:#31363b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#7f8c8d;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect899"
+         width="10.583333"
+         height="10.583333"
+         x="-333.37497"
+         y="47.625" />
+      <rect
+         y="47.625"
+         x="-322.79166"
+         height="10.583333"
+         width="10.583333"
+         id="rect901"
+         style="fill:#bdc3c7;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#fcfcfc;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect903"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20831"
+         y="47.625" />
+      <rect
+         y="58.208336"
+         x="-354.54166"
+         height="10.583333"
+         width="10.583333"
+         id="rect905"
+         style="fill:#2c3e50;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#232629;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect907"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95831"
+         y="58.208336" />
+      <rect
+         y="58.208336"
+         x="-333.37497"
+         height="10.583333"
+         width="10.583333"
+         id="rect909"
+         style="fill:#4d4d4d;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#95a5a6;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect911"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79166"
+         y="58.208336" />
+      <rect
+         y="58.208336"
+         x="-312.20831"
+         height="10.583333"
+         width="10.583333"
+         id="rect913"
+         style="fill:#eff0f1;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+    </g>
+    <path
+       sodipodi:nodetypes="cccccccc"
+       id="path894-3"
+       d="m 0.42966147,3.4124371 3.27271563,1.98984 c 0.1037203,0.05566 0.091268,0.04209 0.159023,0.05977 0.1768227,0.031256 0.4686557,-0.030884 0.4686557,-0.030884 L 4.2534675,5.1832708 3.8763995,5.1892147 0.56600626,3.186415 Z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.369514px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1" />
+    <path
+       d="M 1.3650688,1.2665262 1.2347897,1.4356529 1.0541865,1.3107744 0.939761,1.4515535 1.1246616,1.5780728 0.99349664,1.748178 1.1114823,1.8390193 1.247937,1.6625738 4.3621692,3.7943987 4.471835,3.6701937 1.357598,1.5201785 1.4830545,1.3573675 Z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.238916px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       id="path898" />
+  </g>
+</svg>
@@ -0,0 +1,470 @@
+<?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"
+   width="22"
+   height="22"
+   viewBox="0 0 5.8208333 5.8208333"
+   version="1.1"
+   id="svg8"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="ic_activity_snowboarding.svg">
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect3162"
+       is_visible="true"
+       lpeversion="1" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect3149"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.9999999,0,1 @ F,0,0,1,0,2.0000001,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,4,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.97014234,0,1 @ F,0,0,1,0,0,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect2514"
+       effect="fillet_chamfer" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect950"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.51887107,0,1 @ F,0,0,1,0,0.22687835,0,1 @ F,0,0,1,0,0,0,1 @ F,0,1,1,0,0.51887107,0,1 @ F,0,0,1,0,0.22687835,0,1 @ F,0,0,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect946"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.34892149,0,1 @ F,0,0,1,0,0.18398697,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.34892149,0,1 @ F,0,0,1,0,0.18398697,0,1 @ F,0,1,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect918"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,1,1,0,2.00309,0,1 @ F,0,0,1,0,2.00309,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect912"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,7.0000002,0,1 @ F,0,0,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect894"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0.49832891,0,1 @ F,0,0,1,0,0.49832891,0,1 @ F,0,1,1,0,0.5316463,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.49999976,0,1 @ F,0,0,1,0,0.50000024,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.0000001,0,1 @ F,0,0,1,0,0.99999982,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.0295214,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.5316463,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+  </defs>
+  <sodipodi:namedview
+     guidetolerance="7.7"
+     objecttolerance="7.7"
+     inkscape:lockguides="true"
+     id="base"
+     pagecolor="#232629"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.390336"
+     inkscape:cx="3.9483707"
+     inkscape:cy="10.41996"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-text-baseline="true"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1853"
+     inkscape:window-height="1025"
+     inkscape:window-x="67"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       snapvisiblegridlinesonly="false"
+       type="xygrid"
+       id="grid833"
+       empspacing="22"
+       dotted="true" />
+    <inkscape:grid
+       type="xygrid"
+       id="grid835"
+       empspacing="1"
+       spacingy="1.0583333"
+       spacingx="1.0583333"
+       originx="0.26458333"
+       originy="0.26458333" />
+    <sodipodi:guide
+       position="4.195,4.2333333"
+       orientation="0.96592583,0.25881905"
+       id="guide887"
+       inkscape:label=""
+       inkscape:locked="true"
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       inkscape:locked="true"
+       position="0.26458333,1.9843751"
+       orientation="0,-1"
+       id="guide900" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <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></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       sodipodi:nodetypes="sssssccccccccccccsccccccccccc"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.244651;stroke-opacity:1"
+       id="path17"
+       d="M 3.4497594,1.6623572 C 3.7188321,1.6575456 3.9350456,1.4334587 3.9302338,1.1643861 3.9254222,0.89531328 3.7013352,0.67909984 3.4322626,0.68391147 3.1631898,0.6887231 2.9469764,0.91281035 2.9517881,1.181883 2.9566019,1.4509556 3.1806867,1.6671688 3.4497594,1.6623572 Z M 3.0637352,4.7209674 2.8499094,3.8553698 3.5050565,4.1276823 4.0318851,5.4977888 4.4885872,5.3221793 3.8300515,3.6095462 3.1749046,3.3372338 3.3770914,2.8112362 C 3.7016475,3.1724669 4.1834322,3.4352411 4.7215778,3.4256173 L 4.7128291,2.9363949 C 4.2480673,2.9447059 3.9586663,2.7543606 3.7568534,2.4154038 L 3.5052429,2.0283996 C 3.4047741,1.8833826 3.2562572,1.7881625 3.0850292,1.7912245 3.0116457,1.7925394 2.9631613,1.8178734 2.8897774,1.819185 L 1.627421,2.3800764 1.2471269,3.4165246 1.6538376,3.6322754 2.0691965,2.6970629 2.5595693,2.5102217 2.1081061,3.6423688 2.4089713,4.5491459 1.3164273,5.2478162 1.9480117,5.3615957 Z" />
+    <g
+       id="g954"
+       transform="matrix(0.38576851,0,0,0.38576851,152.56385,-12.494408)">
+      <rect
+         y="-7.9375"
+         x="-357.1875"
+         height="79.375"
+         width="68.791664"
+         id="rect919"
+         style="fill:#cacaca;fill-opacity:1;stroke-width:14.6855;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         y="-5.2916665"
+         x="-354.54169"
+         height="10.583333"
+         width="10.583333"
+         id="rect851"
+         style="fill:#e74c3c;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#ed1515;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect853"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95834"
+         y="-5.2916665" />
+      <rect
+         y="-5.2916665"
+         x="-333.375"
+         height="10.583333"
+         width="10.583333"
+         id="rect855"
+         style="fill:#f47750;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#fdbc4b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect857"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79169"
+         y="-5.2916665" />
+      <rect
+         y="-5.2916665"
+         x="-312.20834"
+         height="10.583333"
+         width="10.583333"
+         id="rect859"
+         style="fill:#c9ce3b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#da4453;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect861"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54169"
+         y="5.291667" />
+      <rect
+         y="5.291667"
+         x="-343.95834"
+         height="10.583333"
+         width="10.583333"
+         id="rect863"
+         style="fill:#c0392b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#d35400;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect865"
+         width="10.583333"
+         height="10.583333"
+         x="-333.375"
+         y="5.291667" />
+      <rect
+         y="5.291667"
+         x="-322.79169"
+         height="10.583333"
+         width="10.583333"
+         id="rect867"
+         style="fill:#f67400;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#f39c1f;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect869"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20834"
+         y="5.291667" />
+      <rect
+         style="fill:#1cdc9a;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect871"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54169"
+         y="21.166666" />
+      <rect
+         y="21.166666"
+         x="-343.95834"
+         height="10.583333"
+         width="10.583333"
+         id="rect873"
+         style="fill:#2ecc71;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#1abc9c;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect875"
+         width="10.583333"
+         height="10.583333"
+         x="-333.375"
+         y="21.166666" />
+      <rect
+         y="21.166666"
+         x="-322.79169"
+         height="10.583333"
+         width="10.583333"
+         id="rect877"
+         style="fill:#3498db;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#3daee9;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect879"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20834"
+         y="21.166666" />
+      <rect
+         y="31.75"
+         x="-354.54169"
+         height="10.583333"
+         width="10.583333"
+         id="rect881"
+         style="fill:#10d116;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#27ae60;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect883"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95834"
+         y="31.75" />
+      <rect
+         y="31.75"
+         x="-333.375"
+         height="10.583333"
+         width="10.583333"
+         id="rect885"
+         style="fill:#16a085;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#2980b9;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect887"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79169"
+         y="31.75" />
+      <rect
+         y="31.75"
+         x="-312.20834"
+         height="10.583333"
+         width="10.583333"
+         id="rect889"
+         style="fill:#1d99f3;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         y="21.166666"
+         x="-301.625"
+         height="10.583333"
+         width="10.583333"
+         id="rect891"
+         style="fill:#9b59b6;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#8e44ad;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect893"
+         width="10.583333"
+         height="10.583333"
+         x="-301.625"
+         y="31.75" />
+      <rect
+         y="47.625"
+         x="-354.54166"
+         height="10.583333"
+         width="10.583333"
+         id="rect895"
+         style="fill:#34495e;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#31363b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect897"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95831"
+         y="47.625" />
+      <rect
+         y="47.625"
+         x="-333.37497"
+         height="10.583333"
+         width="10.583333"
+         id="rect899"
+         style="fill:#7f8c8d;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#bdc3c7;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect901"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79166"
+         y="47.625" />
+      <rect
+         y="47.625"
+         x="-312.20831"
+         height="10.583333"
+         width="10.583333"
+         id="rect903"
+         style="fill:#fcfcfc;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#2c3e50;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect905"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54166"
+         y="58.208336" />
+      <rect
+         y="58.208336"
+         x="-343.95831"
+         height="10.583333"
+         width="10.583333"
+         id="rect907"
+         style="fill:#232629;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#4d4d4d;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect909"
+         width="10.583333"
+         height="10.583333"
+         x="-333.37497"
+         y="58.208336" />
+      <rect
+         y="58.208336"
+         x="-322.79166"
+         height="10.583333"
+         width="10.583333"
+         id="rect911"
+         style="fill:#95a5a6;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#eff0f1;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect913"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20831"
+         y="58.208336" />
+    </g>
+    <path
+       sodipodi:nodetypes="cccccccccccccc"
+       d="M 0.70720657,5.0088997 0.50519813,5.2771404 c -3e-8,0 0.1915452,0.1543669 0.29349555,0.2268814 0.0408697,0.022353 0.0297057,0.028139 0.10131117,0.035126 l 2.08762525,-0.0023 2.0876253,0.0023 c 0.071605,-0.00699 0.061055,-0.012773 0.1019258,-0.035126 C 5.2791315,5.4315077 5.4700628,5.2771404 5.4700628,5.2771404 L 5.2680537,5.0088997 5.0181529,5.2023823 3.1356059,5.2012307 H 2.8396543 l -1.88193269,0.00115 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.304444px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+       id="path894-3" />
+  </g>
+</svg>
@@ -17,7 +17,7 @@
        <rdf:RDF>
            <cc:Work rdf:about="">
                <dc:format>image/svg+xml</dc:format>
-                <dc:title></dc:title>
+                <dc:title />
                <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
            </cc:Work>
        </rdf:RDF>
@@ -0,0 +1,29 @@
+<?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="http://www.w3.org/2000/svg"
+    id="svg6"
+    version="1.1"
+    height="24px"
+    width="24px"
+    fill="black"
+    viewBox="0 0 24 24">
+    <metadata id="metadata12">
+        <rdf:RDF>
+            <cc:Work rdf:about="">
+                <dc:format>image/svg+xml</dc:format>
+                <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+            </cc:Work>
+        </rdf:RDF>
+    </metadata>
+    <path
+        id="dotSmall"
+        d="m 14.24,12.01 2.32,2.32 C 16.84,13.61 17,12.82 17,12 17,11.18 16.84,10.41 16.57,9.69 Z" />
+    <path
+        id="dotBig"
+        d="m 19.53,6.71 -1.26,1.26 c 0.63,1.21 0.98,2.57 0.98,4.02 0,1.45 -0.36,2.82 -0.98,4.02 l 1.2,1.2 C 20.44,15.67 21.01,13.85 21.01,11.9 21,10.01 20.46,8.23 19.53,6.71 Z" />
+    <path
+        d="M 12.88,16.29 11,18.17 V 14.41 Z M 11,5.83 12.88,7.71 11,9.59 Z M 15.71,7.71 10,2 H 9 V 9.59 L 4.41,5 3,6.41 8.59,12 3,17.59 4.41,19 9,14.41 V 22 h 1 L 15.71,16.29 11.41,12 Z"
+        id="path4" />
+</svg>
@@ -43,7 +43,7 @@
        <rdf:RDF>
            <cc:Work rdf:about="">
                <dc:format>image/svg+xml</dc:format>
-                <dc:title></dc:title>
+                <dc:title />
                <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
            </cc:Work>
        </rdf:RDF>
@@ -41,7 +41,7 @@
        <rdf:RDF>
            <cc:Work rdf:about="">
                <dc:format>image/svg+xml</dc:format>
-                <dc:title></dc:title>
+                <dc:title />
                <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
            </cc:Work>
        </rdf:RDF>
@@ -33,7 +33,7 @@
        <rdf:RDF>
            <cc:Work rdf:about="">
                <dc:format>image/svg+xml</dc:format>
-                <dc:title></dc:title>
+                <dc:title />
                <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
            </cc:Work>
        </rdf:RDF>
@@ -39,7 +39,7 @@
        <rdf:RDF>
            <cc:Work rdf:about="">
                <dc:format>image/svg+xml</dc:format>
-                <dc:title></dc:title>
+                <dc:title />
                <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
            </cc:Work>
        </rdf:RDF>
@@ -0,0 +1,116 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="210mm"
+   height="297mm"
+   viewBox="0 0 210 297"
+   version="1.1"
+   id="svg8"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="ic_marker_orange_pushpin_with_shadow.svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient871"
+       
+       x1="91.712517"
+       y1="266.48581"
+       x2="95.902588"
+       y2="266.72339"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="rotate(22.027833,208.46275,168.26892)"
+       
+       
+       >
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop867" />
+      <stop
+         style="stop-color:#898d8d;stop-opacity:1"
+         offset="1"
+         id="stop869" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.49497475"
+     inkscape:cx="298.98541"
+     inkscape:cy="561.0427"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="1080"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <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></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       d="m 108.52826,213.29755 a 56.035402,7.0061195 5.281088 0 0 -22.425508,2.5321 56.035402,7.0061195 5.281088 0 0 -0.233576,0.17697 l -0.206706,-0.0237 c -0.04471,0.11554 -0.07454,0.2314 -0.09612,0.34752 a 56.035402,7.0061195 5.281088 0 0 0.337963,1.58159 c 0.980726,1.70884 3.760629,3.46326 6.583579,5.2188 l -22.744347,15.50009 a 67.064653,11.556784 4.2275244 0 0 -39.967588,5.26867 67.064653,11.556784 4.2275244 0 0 -0.729154,0.57564 67.064653,11.556784 4.2275244 0 0 -2.754353,1.36358 67.064653,11.556784 4.2275244 0 0 38.908736,16.04324 l -32.176847,27.0646 52.228334,-24.74551 a 67.064653,11.556784 4.2275244 0 0 71.411147,-3.8186 67.064653,11.556784 4.2275244 0 0 0.72812,-0.57507 67.064653,11.556784 4.2275244 0 0 2.75539,-1.36415 67.064653,11.556784 4.2275244 0 0 -12.38374,-10.59818 40.033569,5.0733922 5.2502179 0 0 0.0563,-0.0369 40.033569,5.0733922 5.2502179 0 0 0.37672,-0.34325 l 22.45186,-15.30075 c 8.23597,-0.65161 17.65581,-1.47811 22.94433,-3.00957 a 56.035402,7.0061195 5.281088 0 0 2.65514,-1.03772 56.035402,7.0061195 5.281088 0 0 -46.08401,-12.26953 56.035402,7.0061195 5.281088 0 0 -41.6357,-2.54991 z"
+       style="fill:#333333;fill-opacity:0.49421525;stroke:#000000;stroke-width:0.138931px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.265501"
+       id="path839" />
+    <path
+       style="fill:url(#linearGradient871);fill-opacity:1;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.265501"
+       d="M 70.603317,174.30832 33.024148,288.94657 94.566672,183.19473 Z"
+       id="path865"
+       sodipodi:nodetypes="cccc" />
+    <ellipse
+       cx="144.42586"
+       cy="113.06232"
+       rx="70.318817"
+       ry="39.974442"
+       id="ellipse26"
+       style="fill:#d45500;fill-opacity:1;fill-rule:evenodd;stroke-width:0.264583"
+       transform="rotate(22.027833)" />
+    <ellipse
+       style="fill:#ff6600;fill-opacity:1;fill-rule:evenodd;stroke-width:0.264583"
+       id="ellipse30"
+       ry="39.974442"
+       rx="70.318817"
+       cy="105.23625"
+       cx="145.017"
+       transform="rotate(22.027833)" />
+    <path
+       id="rect28"
+       style="fill:#d45500;fill-opacity:1;fill-rule:evenodd;stroke-width:0.264583"
+       d="m 85.662408,24.322061 c -0.890996,8.350369 2.928035,17.133472 6.825491,25.923906 l -23.333902,57.672763 -0.730686,1.80598 0.248621,0.10059 a 42.43035,17.360788 22.027833 0 0 33.303948,30.10067 42.43035,17.360788 22.027833 0 0 44.86507,1.52585 l 0.13892,0.0562 0.24519,-0.60599 a 42.43035,17.360788 22.027833 0 0 0.59472,-1.15581 42.43035,17.360788 22.027833 0 0 0.37668,-1.24514 l 22.45185,-55.492655 c 9.28986,-2.66566 20.09069,-6.13552 24.76397,-13.17485 z" />
+    <ellipse
+       style="fill:#ff6600;fill-opacity:1;fill-rule:evenodd;stroke-width:0.264583"
+       id="path24"
+       ry="23.966745"
+       rx="59.409279"
+       cy="-10.262156"
+       cx="148.14029"
+       transform="rotate(22.027833)" />
+  </g>
+</svg>
@@ -18,7 +18,7 @@
        <rdf:RDF>
            <cc:Work rdf:about="">
                <dc:format>image/svg+xml</dc:format>
-                <dc:title></dc:title>
+                <dc:title />
                <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
            </cc:Work>
        </rdf:RDF>
@@ -21,7 +21,7 @@
        <rdf:RDF>
            <cc:Work rdf:about="">
                <dc:format>image/svg+xml</dc:format>
-                <dc:title></dc:title>
+                <dc:title />
                <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
            </cc:Work>
        </rdf:RDF>
@@ -0,0 +1,38 @@
+# This file contains the fastlane.tools configuration
+# You can find the documentation at https://docs.fastlane.tools
+#
+# For a list of all available actions, check out
+#
+#     https://docs.fastlane.tools/actions
+#
+# For a list of all available plugins, check out
+#
+#     https://docs.fastlane.tools/plugins/available-plugins
+#
+
+# Uncomment the line if you want fastlane to automatically update itself
+# update_fastlane
+
+default_platform(:android)
+
+platform :android do
+  desc "Runs all the tests"
+  lane :test do
+    gradle(task: "test")
+  end
+
+  desc "Submit a new Beta Build to Crashlytics Beta"
+  lane :beta do
+    gradle(task: "clean assembleRelease")
+    crashlytics
+  
+    # sh "your_script.sh"
+    # You can also use other beta testing services here
+  end
+
+  desc "Deploy a new version to the Google Play"
+  lane :deploy do
+    gradle(task: "clean assembleRelease")
+    upload_to_play_store
+  end
+end
@@ -4,6 +4,7 @@ Erfasst deine Kilometer, ohne dass es jemand anderes tut.
 Funktionen & Features:
 * zeichnet Sport und andere Outdooraktivitäten auf
 * unterstützt das Markieren interessanter Orte, inkl. Foto-Funktion
-* zeichnet deine Herzfrequenz auf (unterstützt Bluetooth-LE-Sensoren)
+* zeichnet deine Herzfrequenz auf (Bluetooth LE)
+* nutze beim Radfahren deine Trittfrequenz- und Geschwindigkeitssensoren (Bluetooth LE)
 * exportiert deine Daten als KML oder GPX
 * funktioniert ganz ohne Internet
@@ -1 +1 @@
-OpenTracks – ein GPS-Tracker, der deine Daten für sich behält.
+OpenTracks – ein GPS-Tracker, der deine Daten für sich behält.
@@ -0,0 +1,10 @@
+v3.2.9: OpenTracks
+
+Changes:
+- Option to keep screen on while recording
+- Markers: removed split markers completely
+- Voice announcement now work without READ_PHONE_STATE permission
+
+Bugfixes:
+- Statistics: heart rate was not shown
+- Statistics: time was briefly reset to 0s
@@ -0,0 +1,11 @@
+v3.2.10: OpenTracks
+
+Changes:
+- ChartView is not configurable anymore
+- After reboot: removed automatic restart of an unfinished recording
+
+Bugfix:
+- Speech announcements use MAY_DUCK (again)
+- ChartView shows markers (again)
+- Fixed landscape layout of TrackListActivity
+- Request legacy file API behavior (necessary for Android 10)
@@ -0,0 +1,12 @@
+v3.2.11: OpenTracks
+
+Bug:
+- Max speed is identical to avg speed
+
+Bugfix:
+- Crash on heart rate sensor selection
+
+Developer:
+- Replaced TabHost by TabsLayout
+- Removed special first waypoint
+- Removed duplicate translations
@@ -0,0 +1,13 @@
+v3.3.0: OpenTracks
+
+Breaking changes:
+- Pictures are now stored in app-private storage (do not show up other picture apps)
+  NOTE: Pictures taking with previous version cannot be shown
+- Localization for Spanish (Latin America) only works on Android 7.0 or later
+
+Changes:
+- Import/Export via Storage Access Framework (avoids READ/WRITE_EXTERNAL_STORAGE permission)
+
+Developer:
+- Cleaned internal data structures
+- Use separate icons/app names for debug version
@@ -0,0 +1,12 @@
+v3.3.1: OpenTracks
+
+Changes:
+- Android 10: on uninstall allow to keep app data
+- Introduced Dashboard API: map icon can be used to open current track in external app
+  (requires installation of another app like OSMDashboard)
+
+Bugfix:
+- App label was broken (introduced in v3.3.0)
+
+Developer:
+- Documentation for Dashboard API can be found in README_DEVELOPER.md
@@ -0,0 +1,11 @@
+v3.3.2: OpenTracks
+
+Changes:
+- Export: overwrites files now
+
+Bugfix:
+- Always remove recording notification
+
+Developer:
+- On API 26+ java.time is used for parsing and writing dates
+- Refactoring of TrackRecordingService
@@ -0,0 +1,12 @@
+v3.4.0: OpenTracks
+
+Changes:
+- Dashboard API: multiple tracks
+- Updated help
+
+Bugfix:
+- Fixed crash on fragment re-creation
+- When paused: prevent stopping app
+
+Developer:
+- Enable testing via CI (Github Actions and TravisCI)
@@ -0,0 +1,14 @@
+v3.5.0: OpenTracks
+
+Changes:
+- Marker: select pictures from gallery
+- Marker: share picture
+- Use track name as filename when sharing
+- Removed elevation min/max (was imprecise)
+
+Bugfix:
+- Charts use preferred units and rate
+
+Developer:
+- Database: remove unused columns
+- Database: add indices
@@ -0,0 +1,10 @@
+v3.6.0: OpenTracks
+
+Changes:
+- Stopped tracks can now be resumed
+
+Bugfix:
+- Import of KMZ did not process the photo URL correctly
+
+Developer:
+- Simplified data processing
@@ -0,0 +1,4 @@
+v3.6.1: OpenTracks
+
+Bugfix:
+- KMZ import: store correct picture path
@@ -0,0 +1,4 @@
+v3.6.2: OpenTracks
+
+Bugfix:
+- Charts were not shown correctly (introduced in v3.6.0)
@@ -0,0 +1,13 @@
+v3.7.0: OpenTracks
+
+Changes:
+- Report speed/pace by activity type
+- Added workaround for GPS week rollover
+- (Experimental) Support for Bluetooth LE cycling sensors (cadence and speed)
+- KMZ/KML import enhanced
+
+Bugfix:
+- KMZ import: only import used images
+
+Developer:
+- Refactored TrackRecordingService
@@ -0,0 +1,7 @@
+v3.7.1: OpenTracks
+
+Workaround:
+- Hide start GPS button
+
+Bugfix:
+- Fixed null pointer
@@ -0,0 +1,6 @@
+v3.7.2: OpenTracks
+
+Bugfix:
+- Re-added start GPS button
+- Track name is not overwritten at the end of a recording
+- Markers: removing a photo also deletes the file
@@ -0,0 +1,7 @@
+v3.7.3: OpenTracks
+
+Bugfix:
+- Fixed computation of cadence and speed (via Bluetooth LE sensor)
+
+Developer:
+- Removed unused translations
@@ -0,0 +1,12 @@
+v3.7.4: OpenTracks
+
+Changes:
+- Sharing/export format configurable
+
+Bugfix:
+- Wheel diameter not stored correctly (for speed sensor)
+- Help: links are clickable
+
+Developer:
+- Split TrackDetailActivity
+- StatsFragement successor uses ConstraintLayout
@@ -0,0 +1,11 @@
+v3.7.5: OpenTracks
+
+Changes:
+- Added aggregated statistics summary (from main the screen's menu)
+- Dashboard API: pass "show on lock screen"- and "keep screen on"-setting
+- Updated translations
+- Import: be lenient with ISO8601 date format
+- Show track on map: file format can be selected and opening dashboard works on Android R (API 30+)
+
+Bugfix:
+- App icon now correctly implemented
@@ -0,0 +1,11 @@
+v3.7.6: OpenTracks
+
+Changes:
+- Landscape mode
+- Track deletion UI is now only a spinner
+- Speed is exported and imported (GPX/KML/KMZ)
+- Default export format is KMZ incl. all data and pictures
+
+Developer:
+- Replaced AsyncTasks with Threads
+- Synchronization: UUID is generated per track (not yet exported)
@@ -0,0 +1,16 @@
+v3.8.0: OpenTracks
+
+Breaking change:
+- GPX import/export speed, cadence, and heartrate via TrackPointExtension/v2
+
+Changes:
+- Dashboard API: provide access to markers (incl. callback to show in OpenTracks)
+- New marker icon (orange push pin, SVG)
+- Files to import can be selected via file manager
+
+Bugfixes:
+- Aggregated stats UI respects preferred rate
+- Editing a marker failed on orientation change
+
+Developer:
+- Refactored TrackRecordingService
@@ -0,0 +1,8 @@
+v3.8.1: OpenTracks
+
+Changes:
+- While recording: add option for fullscreen
+- Dashboard is started on the same task
+
+Bugfixes:
+- Intent filters for importing files were far too optimistic
@@ -0,0 +1,14 @@
+v3.9.0: OpenTracks
+
+Changes:
+- Export tracks with their UUID
+- Prevent import of already existing tracks by UUID (configurable; default yes)
+- Pause/stop button now require long press
+- GPS pre-start shows status of fix
+- Added new activity icons
+- Speed sensor: wheelsize now configurable in millimeter
+
+Bugfixes:
+- Fixed some rare crashes (NPE)
+- Pace formatting corrected
+- App icon in launcher repositioned
@@ -0,0 +1,4 @@
+v3.9.1: OpenTracks
+
+Bugfixes:
+- GPS pre-start shows status of fix
@@ -0,0 +1,5 @@
+v3.9.2: OpenTracks
+
+Bugfixes:
+- Fixed force close on API<25 (due to an animation)
+- Reset recording state (on app startup) if crashed while recording
@@ -0,0 +1,4 @@
+v3.9.3: OpenTracks
+
+Bugfixes:
+- Fixed export all tracks bug.
@@ -0,0 +1,10 @@
+v3.9.4: OpenTracks
+
+Changes:
+- Added interval computation
+- Voice announcements present last interval statistics
+- Settings: Bluetooth icon is animated
+
+Bugfix:
+- GPS was not turned off when stopping a recording
+- Show on map via KML/KMZ/GPX was broken due to refactoring
@@ -0,0 +1,8 @@
+v3.9.5: OpenTracks
+
+Changes:
+- UI shows speed only with one fractional digit
+
+Bugfix:
+- App crash in search (due to Track.Id refactoring)
+- Track list did now show if a recording was ongoing (due to Track.Id refactoring)
@@ -0,0 +1,10 @@
+v3.10.0: OpenTracks
+
+Changes:
+- Elevation gain via barometer
+- Add splash screen
+- Android 11/F-Droid: downgrade to targetSDK 29 (v1 signature)
+  see https://gitlab.com/fdroid/fdroidserver/-/issues/827
+
+Bugfix:
+- Several fixes due to trackId refactoring
@@ -0,0 +1,10 @@
+v3.11.0: OpenTracks
+
+Changes:
+- Theming: day/night mode (default: night)
+- Theming: use Material Design instead of custom element theming
+- Use targetSDK 30 again (F-Droid signs now with V2)
+
+Bugfix:
+- Android 11: export all crashed
+- TrackDetail not updated in UI after data was changed by user
@@ -1,4 +1,4 @@
-(tbd): OpenTracks
+(versionName): OpenTracks

 Changes:
 -
@@ -3,6 +3,8 @@ OpenTracks is a sport tracking application that completely respects your privacy
 Features:
 * Sport tracking: track your sport and outdoor activities
 * Photos and markers: mark interesting locations while tracking
-* Heart rate: supports Bluetooth LE sensors
+* Supports Bluetooth LE sensors:
+  * heart rate
+  * cycling: speed and cadence
 * Export data: export tracks either as KML or GPX
 * No Internet access: Internet is not used
@@ -1 +1 @@
-OpenTracks est une application de suivi d'activités sportives qui respecte totalement votre vie privée.
+OpenTracks - Suivi d'activités sportives respectueux de votre vie privée.
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -82,6 +82,7 @@ esac

 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    
    JAVACMD=`cygpath --unix "$JAVACMD"`

    # We build the pattern for arguments to be converted via cygpath
@@ -154,19 +156,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
        else
            eval `echo args$i`="\"$arg\""
        fi
-        i=$((i+1))
+        i=`expr $i + 1`
    done
    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
    esac
 fi

@@ -175,14 +177,9 @@ save () {
    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
    echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`

 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
@@ -1,100 +1,104 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
@@ -1,103 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.dennisguse.opentracks;
-
-import android.app.ActivityManager;
-import android.app.ActivityManager.RunningServiceInfo;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.platform.app.InstrumentationRegistry;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.List;
-
-import de.dennisguse.opentracks.services.TrackRecordingService;
-
-/**
- * Tests for the BootReceiver.
- *
- * @author Youtao Liu
- */
-@RunWith(AndroidJUnit4.class)
-public class BootReceiverTest {
-    private static final String SERVICE_NAME = "de.dennisguse.opentracks.services.TrackRecordingService";
-
-    private Context context = InstrumentationRegistry.getInstrumentation().getContext();
-
-    /**
-     * Tests the behavior when receive notification which is the phone boot.
-     */
-    @Test
-    public void testOnReceive_startService() {
-        // Make sure no TrackRecordingService
-        Intent stopIntent = new Intent(context, TrackRecordingService.class);
-        context.stopService(stopIntent);
-        Assert.assertFalse(isServiceExisted(context));
-
-        BootReceiver bootReceiver = new BootReceiver();
-        Intent intent = new Intent();
-        intent.setAction(Intent.ACTION_BOOT_COMPLETED);
-        bootReceiver.onReceive(context, intent);
-        // Check if the service is started
-        Assert.assertFalse(isServiceExisted(context));
-    }
-
-    /**
-     * Tests the behavior when receive notification which is not the phone boot.
-     */
-    @Test
-    public void testOnReceive_noStartService() {
-        // Make sure no TrackRecordingService
-        Intent stopIntent = new Intent(context, TrackRecordingService.class);
-        context.stopService(stopIntent);
-        Assert.assertFalse(isServiceExisted(context));
-
-        BootReceiver bootReceiver = new BootReceiver();
-        Intent intent = new Intent();
-        intent.setAction(Intent.ACTION_BUG_REPORT);
-        bootReceiver.onReceive(context, intent);
-
-        // Check if the service is not started
-        Assert.assertFalse(isServiceExisted(context));
-    }
-
-    /**
-     * Checks if a service is started in a context.
-     *
-     * @param context the context for checking a service
-     */
-    private boolean isServiceExisted(Context context) {
-        ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-        Assert.assertNotNull(activityManager);
-
-        List<ActivityManager.RunningServiceInfo> serviceList = activityManager.getRunningServices(Integer.MAX_VALUE);
-
-        for (int i = 0; i < serviceList.size(); i++) {
-            RunningServiceInfo serviceInfo = serviceList.get(i);
-            ComponentName componentName = serviceInfo.service;
-            if (componentName.getClassName().equals(SERVICE_NAME)) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
@@ -18,9 +18,7 @@ package de.dennisguse.opentracks;

 import android.location.Location;

-import de.dennisguse.opentracks.content.SensorDataSetLocation;
-import de.dennisguse.opentracks.content.Track;
-import de.dennisguse.opentracks.content.sensor.SensorDataSet;
+import de.dennisguse.opentracks.content.data.TrackPoint;

 /**
 * Commons utilities for creating stubs of track, location.
@@ -37,50 +35,31 @@ public class TrackStubUtils {
    private static final float INITIAL_ACCURACY = 5;
    private static final float INITIAL_SPEED = 10;
    private static final float INITIAL_BEARING = 3.0f;
-    // Used to change the value of latitude, longitude, and altitude.
-    private static final double DIFFERENCE = 0.01;
-
-    /**
-     * Gets a a {@link Track} stub with specified number of locations.
-     *
-     * @param numberOfLocations the number of locations for the track
-     * @return a track stub.
-     */
-    public static Track createTrack(int numberOfLocations) {
-        Track track = new Track();
-        for (int i = 0; i < numberOfLocations; i++) {
-            track.addLocation(createSensorDataSetLocation(INITIAL_LATITUDE + i * DIFFERENCE, INITIAL_LONGITUDE + i * DIFFERENCE, INITIAL_ALTITUDE + i * DIFFERENCE));
-        }
-
-        return track;
-    }

    /**
     * Create a MyTracks location with default values.
     *
     * @return a track stub.
     */
-    public static SensorDataSetLocation createSensorDataSetLocation() {
-        return createSensorDataSetLocation(INITIAL_LATITUDE, INITIAL_LONGITUDE, INITIAL_ALTITUDE);
+    public static TrackPoint createDefaultTrackPoint() {
+        return createDefaultTrackPoint(INITIAL_LATITUDE, INITIAL_LONGITUDE, INITIAL_ALTITUDE);
    }

    /**
-     * Creates a {@link SensorDataSetLocation} stub with specified values.
+     * Creates a {@link TrackPoint} stub with specified values.
     *
     * @return a SensorDataSetLocation stub.
     */
-    private static SensorDataSetLocation createSensorDataSetLocation(double latitude, double longitude, double altitude) {
-        // Initial Location
-        Location loc = new Location(LOCATION_PROVIDER);
-        loc.setLatitude(latitude);
-        loc.setLongitude(longitude);
-        loc.setAltitude(altitude);
-        loc.setAccuracy(INITIAL_ACCURACY);
-        loc.setSpeed(INITIAL_SPEED);
-        loc.setTime(INITIAL_TIME);
-        loc.setBearing(INITIAL_BEARING);
-        SensorDataSet sd = new SensorDataSet(Float.NaN, Float.NaN);
+    private static TrackPoint createDefaultTrackPoint(double latitude, double longitude, double altitude) {
+        Location location = new Location(LOCATION_PROVIDER);
+        location.setLatitude(latitude);
+        location.setLongitude(longitude);
+        location.setAltitude(altitude);
+        location.setAccuracy(INITIAL_ACCURACY);
+        location.setSpeed(INITIAL_SPEED);
+        location.setTime(INITIAL_TIME);
+        location.setBearing(INITIAL_BEARING);

-        return new SensorDataSetLocation(loc, sd);
+        return new TrackPoint(location);
    }
 }
@@ -15,16 +15,20 @@
 */
 package de.dennisguse.opentracks.chart;

+import androidx.annotation.NonNull;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;

-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

 import de.dennisguse.opentracks.R;

+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 /**
 * Tests {@link ChartValueSeries}.
 *
@@ -44,50 +48,60 @@ public class ChartValueSeriesTest {
                R.string.description_elevation_metric,
                R.string.description_elevation_imperial,
                R.color.chart_elevation_fill,
-                R.color.chart_elevation_border);
+                R.color.chart_elevation_border) {
+            @Override
+            double extractDataFromChartPoint(@NonNull ChartPoint chartPoint) {
+                return chartPoint.getElevation();
+            }
+
+            @Override
+            protected boolean drawIfChartPointHasNoData() {
+                return false;
+            }
+        };
    }

    @Test
    public void testInitialConditions() {
-        Assert.assertEquals(1, series.getInterval());
-        Assert.assertEquals(0, series.getMinMarkerValue());
-        Assert.assertEquals(5, series.getMaxMarkerValue());
-        Assert.assertTrue(series.isEnabled());
+        assertEquals(1, series.getInterval());
+        assertEquals(0, series.getMinMarkerValue());
+        assertEquals(5, series.getMaxMarkerValue());
+        assertTrue(series.isEnabled());
    }

    @Test
    public void testEnabled() {
        series.setEnabled(false);
-        Assert.assertFalse(series.isEnabled());
+        assertFalse(series.isEnabled());
    }

    @Test
    public void testSmallUpdates() {
-        series.update(0);
-        series.update(10);
+        series.update(new ChartPoint(0));
+        series.update(new ChartPoint(10));
        series.updateDimension();
-        Assert.assertEquals(100, series.getInterval());
-        Assert.assertEquals(0, series.getMinMarkerValue());
-        Assert.assertEquals(500, series.getMaxMarkerValue());
+        assertEquals(100, series.getInterval());
+        assertEquals(0, series.getMinMarkerValue());
+        assertEquals(500, series.getMaxMarkerValue());
    }

    @Test
    public void testBigUpdates() {
-        series.update(0);
-        series.update(901);
+        series.update(new ChartPoint(0));
+        series.update(new ChartPoint(901));
        series.updateDimension();
-        Assert.assertEquals(1000, series.getInterval());
-        Assert.assertEquals(0, series.getMinMarkerValue());
-        Assert.assertEquals(5000, series.getMaxMarkerValue());
+        assertEquals(1000, series.getInterval());
+        assertEquals(0, series.getMinMarkerValue());
+        assertEquals(5000, series.getMaxMarkerValue());
    }

    @Test
    public void testNotZeroBasedUpdates() {
-        series.update(220);
-        series.update(250);
+        series.update(new ChartPoint(220));
+        series.update(new ChartPoint(250));
        series.updateDimension();
-        Assert.assertEquals(100, series.getInterval());
-        Assert.assertEquals(200, series.getMinMarkerValue());
-        Assert.assertEquals(700, series.getMaxMarkerValue());
+        assertEquals(100, series.getInterval());
+        assertEquals(200, series.getMinMarkerValue());
+        assertEquals(700, series.getMaxMarkerValue());
    }
 }
@@ -1,145 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package de.dennisguse.opentracks.content;
-
-import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
-import android.net.Uri;
-
-import androidx.test.core.app.ApplicationProvider;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import de.dennisguse.opentracks.content.CustomContentProvider.DatabaseHelper;
-
-/**
- * Tests {@link CustomContentProvider}.
- *
- * @author Youtao Liu
- */
-public class CustomContentProviderTest {
-
-    private static final String DATABASE_NAME = "test.db";
-
-    private SQLiteDatabase db;
-    private CustomContentProvider customContentProvider;
-    private Context context = ApplicationProvider.getApplicationContext();
-
-    @Before
-    public void setUp() {
-        context.deleteDatabase(DATABASE_NAME);
-        db = (new DatabaseHelper(context, DATABASE_NAME)).getWritableDatabase();
-        customContentProvider = new CustomContentProvider() {
-        };
-    }
-
-    /**
-     * Tests {@link CustomContentProvider.DatabaseHelper#onCreate(SQLiteDatabase)}.
-     */
-    @Test
-    public void testDatabaseHelper_OnCreate() {
-        Assert.assertTrue(hasTable(TracksColumns.TABLE_NAME));
-        Assert.assertTrue(hasTable(TrackPointsColumns.TABLE_NAME));
-        Assert.assertTrue(hasTable(WaypointsColumns.TABLE_NAME));
-    }
-
-    /**
-     * Tests {@link CustomContentProvider#onCreate(android.content.Context)}.
-     */
-    @Test
-    public void testOnCreate() {
-        Assert.assertTrue(customContentProvider.onCreate(context));
-    }
-
-    /**
-     * Tests {@link CustomContentProvider#getType(Uri)}.
-     */
-    @Test
-    public void testGetType() {
-        Assert.assertEquals(TracksColumns.CONTENT_TYPE, customContentProvider.getType(TracksColumns.CONTENT_URI));
-        Assert.assertEquals(TrackPointsColumns.CONTENT_TYPE, customContentProvider.getType(TrackPointsColumns.CONTENT_URI));
-        Assert.assertEquals(WaypointsColumns.CONTENT_TYPE, customContentProvider.getType(WaypointsColumns.CONTENT_URI));
-    }
-
-    /**
-     * Creates a table, containing one column.
-     *
-     * @param table the table name
-     */
-    private void createTable(String table) {
-        db.execSQL("CREATE TABLE " + table + " (test INTEGER)");
-    }
-
-    /**
-     * Drops a table in database.
-     *
-     * @param table the table name
-     */
-    private void dropTable(String table) {
-        db.execSQL("Drop TABLE " + table);
-    }
-
-    /**
-     * Returns true if the table exists.
-     *
-     * @param table the table name
-     */
-    private boolean hasTable(String table) {
-        try {
-            db.rawQuery("select count(*) from " + table, null);
-            return true;
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    /**
-     * Returns true if the column in the table exists.
-     *
-     * @param table  the table name
-     * @param column the column name
-     */
-    private boolean hasColumn(String table, String column) {
-        try {
-            db.execSQL("SElECT count(*) from  " + table + " order by  " + column);
-        } catch (Exception e) {
-            if (e.getMessage().contains("no such column")) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Sets up upgrade.
-     *
-     * @param oldVersion thd old database version
-     */
-    private void setupUpgrade(int oldVersion) {
-        dropTable(TracksColumns.TABLE_NAME);
-        dropTable(TrackPointsColumns.TABLE_NAME);
-        dropTable(WaypointsColumns.TABLE_NAME);
-        createTable(TracksColumns.TABLE_NAME);
-        createTable(TrackPointsColumns.TABLE_NAME);
-        createTable(WaypointsColumns.TABLE_NAME);
-
-        DatabaseHelper databaseHelper = new DatabaseHelper(context);
-        databaseHelper.onUpgrade(db, oldVersion, CustomContentProvider.DATABASE_VERSION);
-    }
-}
@@ -1,912 +0,0 @@
-/*
- * Copyright 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package de.dennisguse.opentracks.content;
-
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.location.Location;
-
-import androidx.test.core.app.ApplicationProvider;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import de.dennisguse.opentracks.content.Waypoint.WaypointType;
-import de.dennisguse.opentracks.stats.TripStatistics;
-
-import static org.mockito.Mockito.when;
-
-/**
- * A unit test for {@link ContentProviderUtils}.
- *
- * @author Bartlomiej Niechwiej
- * @author Youtao Liu
- */
-@RunWith(MockitoJUnitRunner.class)
-public class CustomContentProviderUtilsTest {
-    private static final String NAME_PREFIX = "test name";
-    private static final String MOCK_DESC = "Mock Next Waypoint Desc!";
-    private static final String TEST_DESC = "Test Desc!";
-    private static final String TEST_DESC_NEW = "Test Desc new!";
-    private static final double INITIAL_LATITUDE = 37.0;
-    private static final double INITIAL_LONGITUDE = -57.0;
-    private static final double ALTITUDE_INTERVAL = 2.5;
-
-    private Context context = ApplicationProvider.getApplicationContext();
-    private ContentProviderUtils providerUtils;
-
-    @Mock
-    private Cursor cursorMock;
-
-    @Mock
-    private ContentResolver contentResolverMock;
-
-    @Before
-    public void setUp() {
-        providerUtils = new ContentProviderUtils(context);
-        providerUtils.deleteAllTracks(context);
-    }
-
-    @Test
-    public void testLocationIterator_noPoints() {
-        testIterator(1, 0, 1, false, LocationFactory.DEFAULT_LOCATION_FACTORY);
-    }
-
-    @Test
-    public void testLocationIterator_customFactory() {
-        final Location location = new Location("test_location");
-        final AtomicInteger counter = new AtomicInteger();
-        testIterator(1, 15, 4, false, new LocationFactory() {
-            @Override
-            public Location createLocation() {
-                counter.incrementAndGet();
-                return location;
-            }
-        });
-        // Make sure we were called exactly as many times as we had track points.
-        Assert.assertEquals(15, counter.get());
-    }
-
-    @Test
-    public void testLocationIterator_nullFactory() {
-        try {
-            testIterator(1, 15, 4, false, null);
-            Assert.fail("Expecting IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-            // Expected.
-        }
-    }
-
-    @Test
-    public void testLocationIterator_noBatchAscending() {
-        testIterator(1, 50, 100, false, LocationFactory.DEFAULT_LOCATION_FACTORY);
-        testIterator(2, 50, 50, false, LocationFactory.DEFAULT_LOCATION_FACTORY);
-    }
-
-    @Test
-    public void testLocationIterator_noBatchDescending() {
-        testIterator(1, 50, 100, true, LocationFactory.DEFAULT_LOCATION_FACTORY);
-        testIterator(2, 50, 50, true, LocationFactory.DEFAULT_LOCATION_FACTORY);
-    }
-
-    @Test
-    public void testLocationIterator_batchAscending() {
-        testIterator(1, 50, 11, false, LocationFactory.DEFAULT_LOCATION_FACTORY);
-        testIterator(2, 50, 25, false, LocationFactory.DEFAULT_LOCATION_FACTORY);
-    }
-
-    @Test
-    public void testLocationIterator_batchDescending() {
-        testIterator(1, 50, 11, true, LocationFactory.DEFAULT_LOCATION_FACTORY);
-        testIterator(2, 50, 25, true, LocationFactory.DEFAULT_LOCATION_FACTORY);
-    }
-
-    @Test
-    public void testLocationIterator_largeTrack() {
-        testIterator(1, 20000, 2000, false, LocationFactory.DEFAULT_LOCATION_FACTORY);
-    }
-
-    private List<Location> testIterator(long trackId, int numPoints, int batchSize, boolean descending, LocationFactory locationFactory) {
-        long lastPointId = initializeTrack(trackId, numPoints);
-        ((ContentProviderUtils) providerUtils).setDefaultCursorBatchSize(batchSize);
-        List<Location> locations = new ArrayList<Location>(numPoints);
-        try (LocationIterator it = providerUtils.getTrackPointLocationIterator(trackId, -1L, descending, locationFactory)) {
-            while (it.hasNext()) {
-                Location loc = it.next();
-                Assert.assertNotNull(loc);
-                locations.add(loc);
-                // Make sure the IDs are returned in the right order.
-                Assert.assertEquals(descending ? lastPointId - locations.size() + 1
-                        : lastPointId - numPoints + locations.size(), it.getLocationId());
-            }
-            Assert.assertEquals(numPoints, locations.size());
-        }
-        return locations;
-    }
-
-    private long initializeTrack(long id, int numPoints) {
-        Track track = new Track();
-        track.setId(id);
-        track.setName("Test: " + id);
-        track.setNumberOfPoints(numPoints);
-        providerUtils.insertTrack(track);
-        track = providerUtils.getTrack(id);
-        Assert.assertNotNull(track);
-
-        Location[] locations = new Location[numPoints];
-        for (int i = 0; i < numPoints; ++i) {
-            Location loc = new Location("test");
-            loc.setLatitude(37.0 + (double) i / 10000.0);
-            loc.setLongitude(57.0 - (double) i / 10000.0);
-            loc.setAccuracy((float) i / 100.0f);
-            loc.setAltitude(i * 2.5);
-            locations[i] = loc;
-        }
-        providerUtils.bulkInsertTrackPoint(locations, numPoints, id);
-
-        // Load all inserted locations.
-        long lastPointId = -1;
-        int counter = 0;
-        try (LocationIterator it = providerUtils.getTrackPointLocationIterator(id, -1L, false, LocationFactory.DEFAULT_LOCATION_FACTORY)) {
-            while (it.hasNext()) {
-                it.next();
-                lastPointId = it.getLocationId();
-                counter++;
-            }
-        }
-
-        Assert.assertTrue(numPoints == 0 || lastPointId > 0);
-        Assert.assertEquals(numPoints, track.getNumberOfPoints());
-        Assert.assertEquals(numPoints, counter);
-
-        return lastPointId;
-    }
-
-    /**
-     * Tests the method {@link ContentProviderUtils#createTrack(Cursor)}.
-     */
-    @Test
-    public void testCreateTrack() {
-        int startColumnIndex = 1;
-        int columnIndex = startColumnIndex;
-        when(cursorMock.getColumnIndexOrThrow(TracksColumns._ID)).thenReturn(columnIndex++);
-        when(cursorMock.getColumnIndexOrThrow(TracksColumns.NAME)).thenReturn(columnIndex++);
-        columnIndex = startColumnIndex;
-        // Id
-        when(cursorMock.isNull(columnIndex++)).thenReturn(false);
-        // Name
-        when(cursorMock.isNull(columnIndex++)).thenReturn(false);
-        long trackId = System.currentTimeMillis();
-        columnIndex = startColumnIndex;
-        // Id
-        when(cursorMock.getLong(columnIndex++)).thenReturn(trackId);
-        // Name
-        String name = NAME_PREFIX + trackId;
-        when(cursorMock.getString(columnIndex++)).thenReturn(name);
-
-        Track track = providerUtils.createTrack(cursorMock);
-        Assert.assertEquals(trackId, track.getId());
-        Assert.assertEquals(name, track.getName());
-    }
-
-    /**
-     * Tests the method {@link ContentProviderUtils#deleteAllTracks(Context)}
-     */
-    @Test
-    public void testDeleteAllTracks() {
-        // Insert track, points and waypoint at first.
-        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
-        insertTrackWithLocations(track);
-        Waypoint waypoint = new Waypoint();
-        providerUtils.insertWaypoint(waypoint);
-        ContentResolver contentResolver = context.getContentResolver();
-        Cursor tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
-        Assert.assertEquals(1, tracksCursor.getCount());
-        Cursor tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI, null, null, null, TrackPointsColumns._ID);
-        Assert.assertEquals(10, tracksPointsCursor.getCount());
-        Cursor waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null, null, WaypointsColumns._ID);
-        Assert.assertEquals(1, waypointCursor.getCount());
-        // Delete all.
-        providerUtils.deleteAllTracks(context);
-        // Check whether all have been deleted.
-        tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
-        Assert.assertEquals(0, tracksCursor.getCount());
-        tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI, null, null, null, TrackPointsColumns._ID);
-        Assert.assertEquals(0, tracksPointsCursor.getCount());
-        waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null, null, WaypointsColumns._ID);
-        Assert.assertEquals(0, waypointCursor.getCount());
-    }
-
-    /**
-     * Tests the method {@link ContentProviderUtils#deleteTrack(Context, long)}.
-     */
-    @Test
-    public void testDeleteTrack() {
-        // Insert three tracks, points of two tracks and way point of one track.
-        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
-
-        providerUtils.insertTrack(track);
-        insertTrackWithLocations(getTrack(trackId + 1, 10));
-        insertTrackWithLocations(getTrack(trackId + 2, 10));
-
-        Waypoint waypoint = new Waypoint();
-        waypoint.setTrackId(trackId);
-        providerUtils.insertWaypoint(waypoint);
-
-        ContentResolver contentResolver = context.getContentResolver();
-        Cursor tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
-        Assert.assertEquals(3, tracksCursor.getCount());
-        Cursor tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI, null, null, null, TrackPointsColumns._ID);
-        Assert.assertEquals(20, tracksPointsCursor.getCount());
-        Cursor waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null, null, WaypointsColumns._ID);
-        Assert.assertEquals(1, waypointCursor.getCount());
-        // Delete one track.
-        providerUtils.deleteTrack(context, trackId);
-        // Check whether all data of a track has been deleted.
-        tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
-        Assert.assertEquals(2, tracksCursor.getCount());
-        tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI, null, null, null, TrackPointsColumns._ID);
-        Assert.assertEquals(20, tracksPointsCursor.getCount());
-        waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null, null, WaypointsColumns._ID);
-        Assert.assertEquals(0, waypointCursor.getCount());
-    }
-
-    /**
-     * Tests the method {@link ContentProviderUtils#getAllTracks()}
-     */
-    @Test
-    public void testGetAllTracks() {
-        int initialTrackNumber = providerUtils.getAllTracks().size();
-        long trackId = System.currentTimeMillis();
-        providerUtils.insertTrack(getTrack(trackId, 0));
-        List<Track> allTracks = providerUtils.getAllTracks();
-        Assert.assertEquals(initialTrackNumber + 1, allTracks.size());
-        Assert.assertEquals(trackId, allTracks.get(allTracks.size() - 1).getId());
-    }
-
-    /**
-     * Tests the method {@link ContentProviderUtils#getLastTrack()}
-     */
-    @Test
-    public void testGetLastTrack() {
-        long trackId = System.currentTimeMillis();
-        providerUtils.insertTrack(getTrack(trackId, 0));
-        Assert.assertEquals(trackId, providerUtils.getLastTrack().getId());
-    }
-
-    /**
-     * Tests the method {@link ContentProviderUtils#getTrack(long)}
-     */
-    @Test
-    public void testGetTrack() {
-        long trackId = System.currentTimeMillis();
-        providerUtils.insertTrack(getTrack(trackId, 0));
-        Assert.assertNotNull(providerUtils.getTrack(trackId));
-    }
-
-    /**
-     * Tests the method {@link ContentProviderUtils#updateTrack(Track)}
-     */
-    @Test
-    public void testUpdateTrack() {
-        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 0);
-        String nameOld = "name1";
-        String nameNew = "name2";
-        track.setName(nameOld);
-        providerUtils.insertTrack(track);
-        Assert.assertEquals(nameOld, providerUtils.getTrack(trackId).getName());
-        track.setName(nameNew);
-        providerUtils.updateTrack(track);
-        Assert.assertEquals(nameNew, providerUtils.getTrack(trackId).getName());
-    }
-
-    /**
-     * Tests the method {@link ContentProviderUtils#createContentValues(Waypoint)}.
-     */
-    @Test
-    public void testCreateContentValues_waypoint() {
-        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
-        providerUtils.insertTrack(track);
-        // Bottom
-        long startTime = 1000L;
-        // AverageSpeed
-        double minGrade = -20.11;
-        TripStatistics statistics = new TripStatistics();
-        statistics.setStartTime(startTime);
-        statistics.setStopTime(2500L);
-        statistics.setTotalTime(1500L);
-        statistics.setMovingTime(700L);
-        statistics.setTotalDistance(750.0);
-        statistics.setTotalElevationGain(50.0);
-        statistics.setMaxSpeed(60.0);
-        statistics.setMaxElevation(1250.0);
-        statistics.setMinElevation(1200.0);
-        statistics.setMaxGrade(15.0);
-        statistics.setMinGrade(minGrade);
-        statistics.setBounds(-10000, 20000, 30000, -40000);
-        // Insert at first.
-        Waypoint waypoint = new Waypoint();
-        waypoint.setDescription(TEST_DESC);
-        waypoint.setType(WaypointType.STATISTICS);
-        waypoint.setTripStatistics(statistics);
-
-        Location location = new Location("test");
-        location.setLatitude(22);
-        location.setLongitude(22);
-        location.setAccuracy((float) 1 / 100.0f);
-        location.setAltitude(2.5);
-        waypoint.setLocation(location);
-        providerUtils.insertWaypoint(waypoint);
-
-        ContentProviderUtils contentProviderUtils = new ContentProviderUtils(contentResolverMock);
-
-        long waypointId = System.currentTimeMillis();
-        waypoint.setId(waypointId);
-        ContentValues contentValues = contentProviderUtils.createContentValues(waypoint);
-        Assert.assertEquals(waypointId, contentValues.get(WaypointsColumns._ID));
-        Assert.assertEquals(22 * 1000000, contentValues.get(WaypointsColumns.LONGITUDE));
-        Assert.assertEquals(TEST_DESC, contentValues.get(WaypointsColumns.DESCRIPTION));
-        Assert.assertEquals(startTime, contentValues.get(WaypointsColumns.STARTTIME));
-        Assert.assertEquals(minGrade, contentValues.get(WaypointsColumns.MINGRADE));
-    }
-
-    /**
-     * Tests the method {@link ContentProviderUtils#createWaypoint(Cursor)}.
-     */
-    @Test
-    public void testCreateWaypoint() {
-        int startColumnIndex = 1;
-        int columnIndex = startColumnIndex;
-        when(cursorMock.getColumnIndexOrThrow(WaypointsColumns._ID)).thenReturn(columnIndex++);
-        when(cursorMock.getColumnIndexOrThrow(WaypointsColumns.NAME)).thenReturn(columnIndex++);
-        when(cursorMock.getColumnIndexOrThrow(WaypointsColumns.TRACKID)).thenReturn(columnIndex++);
-        columnIndex = startColumnIndex;
-        // Id
-        when(cursorMock.isNull(columnIndex++)).thenReturn(false);
-        // Name
-        when(cursorMock.isNull(columnIndex++)).thenReturn(false);
-        // trackIdIndex
-        when(cursorMock.isNull(columnIndex++)).thenReturn(false);
-        long id = System.currentTimeMillis();
-        columnIndex = startColumnIndex;
-        // Id
-        when(cursorMock.getLong(columnIndex++)).thenReturn(id);
-        // Name
-        String name = NAME_PREFIX + id;
-        when(cursorMock.getString(columnIndex++)).thenReturn(name);
-        // trackIdIndex
-        long trackId = 11L;
-        when(cursorMock.getLong(columnIndex++)).thenReturn(trackId);
-
-        Waypoint waypoint = providerUtils.createWaypoint(cursorMock);
-        Assert.assertEquals(id, waypoint.getId());
-        Assert.assertEquals(name, waypoint.getName());
-        Assert.assertEquals(trackId, waypoint.getTrackId());
-    }
-
-    /**
-     * Tests the method
-     * {@link ContentProviderUtils#deleteWaypoint(Context, long, DescriptionGenerator)}
-     * when there is only one waypoint in the track.
-     */
-    @Test
-    public void testDeleteWaypoint_onlyOneWayPoint() {
-        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
-        providerUtils.insertTrack(track);
-
-        // Insert at first.
-        Waypoint waypoint1 = new Waypoint();
-        waypoint1.setDescription(TEST_DESC);
-        waypoint1.setTrackId(trackId);
-        waypoint1.setType(WaypointType.STATISTICS);
-        providerUtils.insertWaypoint(waypoint1);
-
-        // Delete
-        DescriptionGenerator descriptionGenerator = new DescriptionGenerator() {
-
-            @Override
-            public String generateWaypointDescription(TripStatistics tripStatistics) {
-                return CustomContentProviderUtilsTest.MOCK_DESC;
-            }
-
-            @Override
-            public String generateTrackDescription(Track aTrack, boolean html) {
-                return null;
-            }
-        };
-        providerUtils.deleteWaypoint(context, 1, descriptionGenerator);
-
-        Assert.assertNull(providerUtils.getWaypoint(1));
-    }
-
-    /**
-     * Tests the method
-     * {@link ContentProviderUtils#deleteWaypoint(Context, long, DescriptionGenerator)}
-     * when there is more than one waypoint in the track.
-     */
-    @Test
-    public void testDeleteWaypoint_hasNextWayPoint() {
-        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
-        providerUtils.insertTrack(track);
-
-        TripStatistics statistics = new TripStatistics();
-        statistics.setStartTime(1000L);
-        statistics.setStopTime(2500L);
-        statistics.setTotalTime(1500L);
-        statistics.setMovingTime(700L);
-        statistics.setTotalDistance(750.0);
-        statistics.setTotalElevationGain(50.0);
-        statistics.setMaxSpeed(60.0);
-        statistics.setMaxElevation(1250.0);
-        statistics.setMinElevation(1200.0);
-        statistics.setMaxGrade(15.0);
-        statistics.setMinGrade(-25.0);
-        statistics.setBounds(-10000, 20000, 30000, -40000);
-
-        // Insert at first.
-        Waypoint waypoint1 = new Waypoint();
-        waypoint1.setDescription(Long.toString(trackId));
-        waypoint1.setTrackId(trackId);
-        waypoint1.setType(WaypointType.STATISTICS);
-        waypoint1.setTripStatistics(statistics);
-        long waypoint1Id = ContentUris.parseId(providerUtils.insertWaypoint(waypoint1));
-
-        Waypoint waypoint2 = new Waypoint();
-        waypoint2.setDescription(Long.toString(trackId));
-        waypoint2.setTrackId(trackId);
-        waypoint2.setType(WaypointType.STATISTICS);
-        waypoint2.setTripStatistics(statistics);
-        long waypoint2Id = ContentUris.parseId(providerUtils.insertWaypoint(waypoint2));
-
-
-        // Delete
-        DescriptionGenerator descriptionGenerator = new DescriptionGenerator() {
-            @Override
-            public String generateWaypointDescription(TripStatistics tripStatistics) {
-                return CustomContentProviderUtilsTest.MOCK_DESC;
-            }
-
-            @Override
-            public String generateTrackDescription(Track aTrack, boolean html) {
-                return null;
-            }
-        };
-
-        Assert.assertNotNull(providerUtils.getWaypoint(waypoint1Id));
-        providerUtils.deleteWaypoint(context, waypoint1Id, descriptionGenerator);
-        Assert.assertNull(providerUtils.getWaypoint(waypoint1Id));
-
-        Assert.assertEquals(CustomContentProviderUtilsTest.MOCK_DESC, providerUtils.getWaypoint(waypoint2Id)
-                .getDescription());
-    }
-
-    /**
-     * Tests the method {@link ContentProviderUtils#getFirstWaypointId(long)}.
-     */
-    @Test
-    public void testGetFirstWaypointId() {
-        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
-        providerUtils.insertTrack(track);
-
-        Waypoint waypoint1 = new Waypoint();
-        waypoint1.setTrackId(trackId);
-        long waypoint1id = ContentUris.parseId(providerUtils.insertWaypoint(waypoint1));
-
-        Waypoint waypoint2 = new Waypoint();
-        waypoint2.setTrackId(trackId);
-        long waypoint2id = ContentUris.parseId(providerUtils.insertWaypoint(waypoint2));
-
-        Assert.assertEquals(-1L, providerUtils.getFirstWaypointId(-1));
-        Assert.assertEquals(waypoint1id, providerUtils.getFirstWaypointId(trackId));
-        Assert.assertEquals(waypoint2id, providerUtils.getLastWaypoint(trackId, WaypointType.WAYPOINT).getId());
-    }
-
-    /**
-     * Tests the method {@link ContentProviderUtils#getNextWaypointNumber(long, WaypointType)}.
-     */
-    @Test
-    public void testGetNextWaypointNumber() {
-        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
-        providerUtils.insertTrack(track);
-
-        Waypoint waypoint1 = new Waypoint();
-        waypoint1.setType(WaypointType.STATISTICS);
-        waypoint1.setTrackId(trackId);
-        Waypoint waypoint2 = new Waypoint();
-        waypoint2.setType(WaypointType.WAYPOINT);
-        waypoint2.setTrackId(trackId);
-        Waypoint waypoint3 = new Waypoint();
-        waypoint3.setType(WaypointType.STATISTICS);
-        waypoint3.setTrackId(trackId);
-        Waypoint waypoint4 = new Waypoint();
-        waypoint4.setType(WaypointType.WAYPOINT);
-        waypoint4.setTrackId(trackId);
-        providerUtils.insertWaypoint(waypoint1);
-        providerUtils.insertWaypoint(waypoint2);
-        providerUtils.insertWaypoint(waypoint3);
-        providerUtils.insertWaypoint(waypoint4);
-
-        Assert.assertEquals(2, providerUtils.getNextWaypointNumber(trackId, WaypointType.STATISTICS));
-        Assert.assertEquals(3, providerUtils.getNextWaypointNumber(trackId, WaypointType.WAYPOINT));
-    }
-
-    /**
-     * Tests the method
-     * {@link ContentProviderUtils#getLastWaypoint(long, WaypointType)}.
-     */
-    @Test
-    public void testGetLastStatisticsWaypoint() {
-        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
-        providerUtils.insertTrack(track);
-
-        Waypoint waypoint1 = new Waypoint();
-        waypoint1.setTrackId(trackId);
-        waypoint1.setType(WaypointType.STATISTICS);
-        waypoint1.setDescription("Desc1");
-        Waypoint waypoint2 = new Waypoint();
-        waypoint2.setTrackId(trackId);
-        waypoint2.setType(WaypointType.STATISTICS);
-        waypoint2.setDescription("Desc2");
-        Waypoint waypoint3 = new Waypoint();
-        waypoint3.setTrackId(trackId);
-        waypoint3.setType(WaypointType.WAYPOINT);
-        waypoint3.setDescription("Desc3");
-        providerUtils.insertWaypoint(waypoint1);
-        providerUtils.insertWaypoint(waypoint2);
-        providerUtils.insertWaypoint(waypoint3);
-
-        Assert.assertEquals("Desc2", providerUtils.getLastWaypoint(trackId, WaypointType.STATISTICS).getDescription());
-    }
-
-    /**
-     * Tests the method {@link ContentProviderUtils#insertWaypoint(Waypoint)} and
-     * {@link ContentProviderUtils#getWaypoint(long)}.
-     */
-    @Test
-    public void testInsertAndGetWaypoint() {
-        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
-        providerUtils.insertTrack(track);
-
-        Waypoint waypoint = new Waypoint();
-        waypoint.setDescription(TEST_DESC);
-        waypoint.setTrackId(trackId);
-        long waypointId = ContentUris.parseId(providerUtils.insertWaypoint(waypoint));
-
-        Assert.assertEquals(TEST_DESC, providerUtils.getWaypoint(waypointId).getDescription());
-    }
-
-    /**
-     * Tests the method {@link ContentProviderUtils#updateWaypoint(Waypoint)}.
-     */
-    @Test
-    public void testUpdateWaypoint() {
-        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
-        providerUtils.insertTrack(track);
-        // Insert at first.
-        Waypoint waypoint = new Waypoint();
-        waypoint.setDescription(TEST_DESC);
-        waypoint.setTrackId(trackId);
-        long waypointId = ContentUris.parseId(providerUtils.insertWaypoint(waypoint));
-
-        // Update
-        waypoint = providerUtils.getWaypoint(waypointId);
-        waypoint.setDescription(TEST_DESC_NEW);
-        providerUtils.updateWaypoint(waypoint);
-
-        Assert.assertEquals(TEST_DESC_NEW, providerUtils.getWaypoint(waypointId).getDescription());
-    }
-
-    /**
-     * Tests the method {@link ContentProviderUtils#bulkInsertTrackPoint(Location[], int, long)}.
-     */
-    @Test
-    public void testBulkInsertTrackPoint() {
-        // Insert track, point at first.
-        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
-        insertTrackWithLocations(track);
-
-        providerUtils.bulkInsertTrackPoint(track.getLocations().toArray(new Location[0]), -1, trackId);
-        Assert.assertEquals(20, providerUtils.getTrackPointCursor(trackId, -1L, 1000, false).getCount());
-        providerUtils.bulkInsertTrackPoint(track.getLocations().toArray(new Location[0]), 8, trackId);
-        Assert.assertEquals(28, providerUtils.getTrackPointCursor(trackId, -1L, 1000, false).getCount());
-    }
-
-    /**
-     * Tests the method {@link ContentProviderUtils#createTrackPoint(Cursor)}.
-     */
-    @Test
-    public void testCreateTrackPoint() {
-        // Set index.
-        int index = 1;
-        // Id
-        when(cursorMock.getColumnIndex(TrackPointsColumns._ID)).thenReturn(index++);
-        // Longitude
-        when(cursorMock.getColumnIndexOrThrow(TrackPointsColumns.LONGITUDE)).thenReturn(index++);
-        // Latitude
-        when(cursorMock.getColumnIndexOrThrow(TrackPointsColumns.LATITUDE)).thenReturn(index++);
-        // Time
-        when(cursorMock.getColumnIndexOrThrow(TrackPointsColumns.TIME))
-                .thenReturn(index++);
-        // Speed
-        when(cursorMock.getColumnIndexOrThrow(TrackPointsColumns.SPEED)).thenReturn(index++);
-        // Sensor
-        when(cursorMock.getColumnIndexOrThrow(TrackPointsColumns.SENSOR_HEARTRATE)).thenReturn(index++);
-
-        // Set return value of isNull().
-        index = 2;
-        // Longitude
-        when(cursorMock.isNull(index++)).thenReturn(false);
-        // Latitude
-        when(cursorMock.isNull(index++)).thenReturn(false);
-        // Time
-        when(cursorMock.isNull(index++)).thenReturn(false);
-        // Speed
-        when(cursorMock.isNull(index++)).thenReturn(false);
-        // Sensor
-        when(cursorMock.isNull(index++)).thenReturn(false);
-
-        // Set return value of isNull().
-        index = 2;
-        // Longitude
-        int longitude = 11;
-        when(cursorMock.getInt(index++)).thenReturn(longitude * 1000000);
-        // Latitude.
-        int latitude = 22;
-        when(cursorMock.getInt(index++)).thenReturn(latitude * 1000000);
-        // Time
-        long time = System.currentTimeMillis();
-        when(cursorMock.getLong(index++)).thenReturn(time);
-        // Speed
-        float speed = 2.2f;
-        when(cursorMock.getFloat(index++)).thenReturn(speed);
-        // Sensor
-        byte[] sensor = "Sensor state".getBytes();
-        when(cursorMock.getBlob(index++)).thenReturn(sensor);
-
-        Location location = providerUtils.createTrackPoint(cursorMock);
-        Assert.assertEquals((double) longitude, location.getLongitude(), 0.01);
-        Assert.assertEquals((double) latitude, location.getLatitude(), 0.01);
-        Assert.assertEquals(time, location.getTime(), 0.01);
-        Assert.assertEquals(speed, location.getSpeed(), 0.01);
-    }
-
-    /**
-     * Tests the method
-     * {@link ContentProviderUtils#insertTrackPoint(Location, long)}.
-     */
-    @Test
-    public void testInsertTrackPoint() {
-        // Insert track, point at first.
-        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
-        insertTrackWithLocations(track);
-
-        providerUtils.insertTrackPoint(createLocation(22), trackId);
-        Assert.assertEquals(11, providerUtils.getTrackPointCursor(trackId, -1L, 1000, false).getCount());
-    }
-
-    /**
-     * Tests the method {@link ContentProviderUtils#getFirstTrackPointId(long)}.
-     */
-    @Test
-    public void testGetFirstTrackPointId() {
-        // Insert track, point at first.
-        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
-        insertTrackWithLocations(track);
-
-        Assert.assertNotEquals(-1L, providerUtils.getFirstTrackPointId(trackId));
-    }
-
-    /**
-     * Tests the method {@link ContentProviderUtils#getLastTrackPointId(long)}.
-     */
-    @Test
-    public void testGetLastTrackPointId() {
-        // Insert track, point at first.
-        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
-        insertTrackWithLocations(track);
-
-        Assert.assertTrue(providerUtils.getFirstTrackPointId(trackId) < providerUtils.getLastTrackPointId(trackId));
-    }
-
-    /**
-     * Tests the method {@link ContentProviderUtils#getLastValidTrackPoint(long)}.
-     */
-    @Test
-    public void testGetLastValidTrackPoint() {
-        // Insert track, points at first.
-        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
-        insertTrackWithLocations(track);
-
-        Location lastLocation = providerUtils.getLastValidTrackPoint(trackId);
-        checkLocation(9, lastLocation);
-    }
-
-    /**
-     * Tests the method {@link ContentProviderUtils#getTrackPointCursor(long, long, int, boolean)} in descending.
-     */
-    @Test
-    public void testGetTrackPointCursor_desc() {
-        // Insert track, points at first.
-        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
-        providerUtils.insertTrack(track);
-
-        long[] trackpointIds = new long[track.getNumberOfPoints()];
-        for (int i = 0; i < trackpointIds.length; i++) {
-            trackpointIds[i] = ContentUris.parseId(providerUtils.insertTrackPoint(track.getLocations().get(i), track.getId()));
-        }
-
-        Cursor cursor = providerUtils.getTrackPointCursor(trackId, trackpointIds[1], 5, true);
-        Assert.assertEquals(2, cursor.getCount());
-    }
-
-    /**
-     * Tests the method {@link ContentProviderUtils#getTrackPointCursor(long, long, int, boolean)} in ascending.
-     */
-    @Test
-    public void testGetTrackPointCursor_asc() {
-        // Insert track, points at first.
-        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
-        providerUtils.insertTrack(track);
-
-        long[] trackpointIds = new long[track.getNumberOfPoints()];
-        for (int i = 0; i < trackpointIds.length; i++) {
-            trackpointIds[i] = ContentUris.parseId(providerUtils.insertTrackPoint(track.getLocations().get(i), track.getId()));
-        }
-
-        Cursor cursor = providerUtils.getTrackPointCursor(trackId, trackpointIds[8], 5, false);
-        Assert.assertEquals(2, cursor.getCount());
-    }
-
-    /**
-     * Tests the method {@link ContentProviderUtils#getTrackPointLocationIterator(long, long, boolean, LocationFactory)} in descending.
-     */
-    @Test
-    public void testGetTrackPointLocationIterator_desc() {
-        // Insert track, points at first.
-        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
-        providerUtils.insertTrack(track);
-
-        long[] trackpointIds = new long[track.getNumberOfPoints()];
-        for (int i = 0; i < trackpointIds.length; i++) {
-            trackpointIds[i] = ContentUris.parseId(providerUtils.insertTrackPoint(track.getLocations().get(i), track.getId()));
-        }
-
-        long startTrackPointId = trackpointIds[9];
-
-        LocationIterator locationIterator = providerUtils.getTrackPointLocationIterator(trackId, startTrackPointId, true, LocationFactory.DEFAULT_LOCATION_FACTORY);
-        for (int i = 0; i < trackpointIds.length; i++) {
-            Assert.assertTrue(locationIterator.hasNext());
-            Location location = locationIterator.next();
-            Assert.assertEquals(startTrackPointId - i, locationIterator.getLocationId());
-            checkLocation((trackpointIds.length - 1) - i, location);
-        }
-        Assert.assertFalse(locationIterator.hasNext());
-    }
-
-    /**
-     * Tests the method {@link ContentProviderUtils#getTrackPointLocationIterator(long, long, boolean, LocationFactory)} in ascending.
-     */
-    @Test
-    public void testGetTrackPointLocationIterator_asc() {
-        // Insert track, point at first.
-        long trackId = System.currentTimeMillis();
-        Track track = getTrack(trackId, 10);
-        providerUtils.insertTrack(track);
-
-        long[] trackpointIds = new long[track.getNumberOfPoints()];
-        for (int i = 0; i < trackpointIds.length; i++) {
-            trackpointIds[i] = ContentUris.parseId(providerUtils.insertTrackPoint(track.getLocations().get(i), track.getId()));
-        }
-
-        long startTrackPointId = trackpointIds[0];
-
-        LocationIterator locationIterator = providerUtils.getTrackPointLocationIterator(trackId, startTrackPointId, false, LocationFactory.DEFAULT_LOCATION_FACTORY);
-        for (int i = 0; i < trackpointIds.length; i++) {
-            Assert.assertTrue(locationIterator.hasNext());
-            Location location = locationIterator.next();
-            Assert.assertEquals(startTrackPointId + i, locationIterator.getLocationId());
-
-            checkLocation(i, location);
-        }
-        Assert.assertFalse(locationIterator.hasNext());
-    }
-
-    /**
-     * Simulates a track which is used for testing.
-     *
-     * @param id        the id of the track
-     * @param numPoints the location number in the track
-     * @return the simulated track
-     */
-    private Track getTrack(long id, int numPoints) {
-        Track track = new Track();
-        track.setId(id);
-        track.setName("Test: " + id);
-        track.setNumberOfPoints(numPoints);
-        for (int i = 0; i < numPoints; i++) {
-            track.addLocation(createLocation(i));
-        }
-        return track;
-    }
-
-    /**
-     * Creates a location.
-     *
-     * @param i the index to set the value of location.
-     * @return created location
-     */
-    private Location createLocation(int i) {
-        Location loc = new Location("test");
-        loc.setLatitude(INITIAL_LATITUDE + (double) i / 10000.0);
-        loc.setLongitude(INITIAL_LONGITUDE - (double) i / 10000.0);
-        loc.setAccuracy((float) i / 100.0f);
-        loc.setAltitude(i * ALTITUDE_INTERVAL);
-        return loc;
-    }
-
-    /**
-     * Checks the value of a location.
-     *
-     * @param i        the index of this location which created in the method {@link CustomContentProviderUtilsTest#getTrack(long, int)}
-     * @param location the location to be checked
-     */
-    private void checkLocation(int i, Location location) {
-        Assert.assertEquals(INITIAL_LATITUDE + (double) i / 10000.0, location.getLatitude(), 0.01);
-        Assert.assertEquals(INITIAL_LONGITUDE - (double) i / 10000.0, location.getLongitude(), 0.01);
-        Assert.assertEquals((float) i / 100.0f, location.getAccuracy(), 0.01);
-        Assert.assertEquals(i * ALTITUDE_INTERVAL, location.getAltitude(), 0.01);
-    }
-
-    /**
-     * Inserts a track with locations into the database.
-     *
-     * @param track track to be inserted
-     */
-    private void insertTrackWithLocations(Track track) {
-        providerUtils.insertTrack(track);
-        providerUtils.bulkInsertTrackPoint(track.getLocations().toArray(new Location[0]), track.getLocations().size(), track.getId());
-    }
-}
@@ -1,209 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package de.dennisguse.opentracks.content;
-
-import android.content.Context;
-
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.stats.TripStatistics;
-import de.dennisguse.opentracks.util.StringUtils;
-
-/**
- * Tests for {@link DescriptionGeneratorImpl}.
- *
- * @author Jimmy Shih
- */
-@RunWith(AndroidJUnit4.class)
-public class DescriptionGeneratorImplTest {
-
-    private static final long START_TIME = 1288721514000L;
-    private DescriptionGeneratorImpl descriptionGenerator;
-
-    private Context context = ApplicationProvider.getApplicationContext();
-
-    @Before
-    public void setUp() {
-        descriptionGenerator = new DescriptionGeneratorImpl(ApplicationProvider.getApplicationContext());
-    }
-
-    /**
-     * Tests {@link DescriptionGeneratorImpl#generateTrackDescription(Track, boolean)}.
-     */
-    @Test
-    public void testGenerateTrackDescription() {
-        Track track = new Track();
-        TripStatistics stats = new TripStatistics();
-        stats.setTotalDistance(20000);
-        stats.setTotalTime(600000);
-        stats.setMovingTime(300000);
-        stats.setMaxSpeed(100);
-        stats.setMaxElevation(550);
-        stats.setMinElevation(-500);
-        stats.setTotalElevationGain(6000);
-        stats.setMaxGrade(0.42);
-        stats.setMinGrade(0.11);
-        stats.setStartTime(START_TIME);
-        track.setTripStatistics(stats);
-        track.setCategory("hiking");
-        String expected = //"Created by"
-                "<a href='https://github.com/dennisguse/opentracks'>OpenTracks</a><p>"
-                + "Name: -<br>"
-                + "Activity type: hiking<br>"
-                + "Description: -<br>"
-                + "Total distance: 20.00 km (12.4 mi)<br>"
-                + "Total time: 10:00<br>"
-                + "Moving time: 05:00<br>"
-                + "Average speed: 120.00 km/h (74.6 mi/h)<br>"
-                + "Average moving speed: 240.00 km/h (149.1 mi/h)<br>"
-                + "Max speed: 360.00 km/h (223.7 mi/h)<br>"
-                + "Average pace: 0:30 min/km (0:48 min/mi)<br>"
-                + "Average moving pace: 0:15 min/km (0:24 min/mi)<br>"
-                + "Fastest pace: 0:10 min/km (0:16 min/mi)<br>"
-                + "Max elevation: 550 m (1804 ft)<br>"
-                + "Min elevation: -500 m (-1640 ft)<br>"
-                + "Elevation gain: 6000 m (19685 ft)<br>"
-                + "Max grade: 42 %<br>"
-                + "Min grade: 11 %<br>"
-                + "Recorded: " + StringUtils.formatDateTime(context, START_TIME) + "<br>";
-
-        Assert.assertEquals(expected, descriptionGenerator.generateTrackDescription(track, true));
-    }
-
-    /**
-     * Tests {@link DescriptionGeneratorImpl#generateWaypointDescription(TripStatistics)}.
-     */
-    @Test
-    public void testGenerateWaypointDescription() {
-        Waypoint waypoint = new Waypoint();
-        TripStatistics stats = new TripStatistics();
-        stats.setTotalDistance(20000);
-        stats.setTotalTime(600000);
-        stats.setMovingTime(300000);
-        stats.setMaxSpeed(100);
-        stats.setMaxElevation(550);
-        stats.setMinElevation(-500);
-        stats.setTotalElevationGain(6000);
-        stats.setMaxGrade(0.42);
-        stats.setMinGrade(0.11);
-        stats.setStartTime(START_TIME);
-        waypoint.setTripStatistics(stats);
-        String expected = "Total distance: 20.00 km (12.4 mi)\n"
-                + "Total time: 10:00\n"
-                + "Moving time: 05:00\n"
-                + "Average speed: 120.00 km/h (74.6 mi/h)\n"
-                + "Average moving speed: 240.00 km/h (149.1 mi/h)\n"
-                + "Max speed: 360.00 km/h (223.7 mi/h)\n"
-                + "Average pace: 0:30 min/km (0:48 min/mi)\n"
-                + "Average moving pace: 0:15 min/km (0:24 min/mi)\n"
-                + "Fastest pace: 0:10 min/km (0:16 min/mi)\n"
-                + "Max elevation: 550 m (1804 ft)\n"
-                + "Min elevation: -500 m (-1640 ft)\n"
-                + "Elevation gain: 6000 m (19685 ft)\n"
-                + "Max grade: 42 %\n"
-                + "Min grade: 11 %\n"
-                + "Recorded: " + StringUtils.formatDateTime(context, START_TIME) + "\n";
-        Assert.assertEquals(expected, descriptionGenerator.generateWaypointDescription(waypoint.getTripStatistics()));
-    }
-
-    /**
-     * Tests {@link DescriptionGeneratorImpl#writeDistance(double, StringBuilder, int, String)}.
-     */
-    @Test
-    public void testWriteDistance() {
-        StringBuilder builder = new StringBuilder();
-        descriptionGenerator.writeDistance(1100, builder, R.string.description_total_distance, "<br>");
-        Assert.assertEquals("Total distance: 1.10 km (0.7 mi)<br>", builder.toString());
-    }
-
-    /**
-     * Tests {@link DescriptionGeneratorImpl#writeTime(long, StringBuilder, int, String)}.
-     */
-    @Test
-    public void testWriteTime() {
-        StringBuilder builder = new StringBuilder();
-        descriptionGenerator.writeTime(1000, builder, R.string.description_total_time, "<br>");
-        Assert.assertEquals("Total time: 00:01<br>", builder.toString());
-    }
-
-    /**
-     * Tests {@link DescriptionGeneratorImpl#writeSpeed(double, StringBuilder, int, String)}.
-     */
-    @Test
-    public void testWriteSpeed() {
-        StringBuilder builder = new StringBuilder();
-        descriptionGenerator.writeSpeed(1.1, builder, R.string.description_average_speed, "\n");
-        Assert.assertEquals("Average speed: 3.96 km/h (2.5 mi/h)\n", builder.toString());
-    }
-
-    /**
-     * Tests {@link DescriptionGeneratorImpl#writeElevation(double, StringBuilder, int, String)}.
-     */
-    @Test
-    public void testWriteElevation() {
-        StringBuilder builder = new StringBuilder();
-        descriptionGenerator.writeElevation(4.2, builder, R.string.description_min_elevation, "<br>");
-        Assert.assertEquals("Min elevation: 4 m (14 ft)<br>", builder.toString());
-    }
-
-    /**
-     * Tests {@link DescriptionGeneratorImpl#writePace(double, StringBuilder, int, String)}.
-     */
-    @Test
-    public void testWritePace() {
-        StringBuilder builder = new StringBuilder();
-        descriptionGenerator.writePace(1.1, builder, R.string.description_average_pace_in_minute, "\n");
-        Assert.assertEquals("Average pace: 15:09 min/km (24:23 min/mi)\n", builder.toString());
-    }
-
-    /**
-     * Tests {@link DescriptionGeneratorImpl#writeGrade(double, StringBuilder, int, String)}.
-     */
-    @Test
-    public void testWriteGrade() {
-        StringBuilder builder = new StringBuilder();
-        descriptionGenerator.writeGrade(.042, builder, R.string.description_max_grade, "<br>");
-        Assert.assertEquals("Max grade: 4 %<br>", builder.toString());
-    }
-
-    /**
-     * Tests {@link DescriptionGeneratorImpl#writeGrade(double, StringBuilder, int, String)} with a NaN.
-     */
-    @Test
-    public void testWriteGrade_nan() {
-        StringBuilder builder = new StringBuilder();
-        descriptionGenerator.writeGrade(Double.NaN, builder, R.string.description_max_grade, "<br>");
-        Assert.assertEquals("Max grade: 0 %<br>", builder.toString());
-    }
-
-    /**
-     * Tests {@link DescriptionGeneratorImpl#writeGrade(double, StringBuilder, int, String)} with an infinite number.
-     */
-    @Test
-    public void testWriteGrade_infinite() {
-        StringBuilder builder = new StringBuilder();
-        descriptionGenerator.writeGrade(Double.POSITIVE_INFINITY, builder, R.string.description_max_grade, "<br>");
-        Assert.assertEquals("Max grade: 0 %<br>", builder.toString());
-    }
-}
@@ -0,0 +1,176 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package de.dennisguse.opentracks.content;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.stats.TrackStatistics;
+import de.dennisguse.opentracks.util.StringUtils;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Tests for {@link DescriptionGenerator}.
+ *
+ * @author Jimmy Shih
+ */
+@RunWith(AndroidJUnit4.class)
+public class DescriptionGeneratorTest {
+
+    private static final long START_TIME = 1288721514000L;
+    private DescriptionGenerator descriptionGenerator;
+
+    private final Context context = ApplicationProvider.getApplicationContext();
+
+    @Before
+    public void setUp() {
+        descriptionGenerator = new DescriptionGenerator(ApplicationProvider.getApplicationContext());
+    }
+
+    /**
+     * Tests {@link DescriptionGenerator#generateTrackDescription(Track, boolean)}.
+     */
+    @Test
+    public void testGenerateTrackDescription() {
+        Track track = new Track();
+        TrackStatistics stats = new TrackStatistics();
+        stats.setTotalDistance(20000);
+        stats.setTotalTime(600000);
+        stats.setMovingTime(300000);
+        stats.setMaxSpeed(100);
+        stats.setMaxElevation(550);
+        stats.setMinElevation(-500);
+        stats.setTotalElevationGain(6000);
+        stats.setStartTime_ms(START_TIME);
+        track.setTrackStatistics(stats);
+        track.setCategory("hiking");
+        String expected = //"Created by"
+                "<a href='https://github.com/OpenTracksApp/OpenTracks'>OpenTracks (Debug)</a><p>"
+                + "Name: -<br>"
+                + "Activity type: hiking<br>"
+                + "Description: -<br>"
+                + "Total distance: 20.00 km (12.4 mi)<br>"
+                + "Total time: 10:00<br>"
+                + "Moving time: 05:00<br>"
+                + "Average speed: 120.00 km/h (74.6 mi/h)<br>"
+                + "Average moving speed: 240.00 km/h (149.1 mi/h)<br>"
+                + "Max speed: 360.00 km/h (223.7 mi/h)<br>"
+                + "Average pace: 0:30 min/km (0:48 min/mi)<br>"
+                + "Average moving pace: 0:15 min/km (0:24 min/mi)<br>"
+                + "Fastest pace: 0:10 min/km (0:16 min/mi)<br>"
+                + "Max elevation: 550 m (1804 ft)<br>"
+                + "Min elevation: -500 m (-1640 ft)<br>"
+                + "Elevation gain: 6000 m (19685 ft)<br>"
+                + "Recorded: " + StringUtils.formatDateTime(context, START_TIME) + "<br>";
+
+        assertEquals(expected, descriptionGenerator.generateTrackDescription(track, true));
+    }
+
+    @Test
+    public void testGenerateTrackDescriptionWithoutMaxMinElevation() {
+        Track track = new Track();
+        TrackStatistics stats = new TrackStatistics();
+        stats.setTotalDistance(20000);
+        stats.setTotalTime(600000);
+        stats.setMovingTime(300000);
+        stats.setMaxSpeed(100);
+        stats.setMaxElevation(Double.POSITIVE_INFINITY);
+        stats.setMinElevation(Double.NEGATIVE_INFINITY);
+        stats.setTotalElevationGain(6000);
+        stats.setStartTime_ms(START_TIME);
+        track.setTrackStatistics(stats);
+        track.setCategory("hiking");
+        String expected = //"Created by"
+                "<a href='https://github.com/OpenTracksApp/OpenTracks'>OpenTracks (Debug)</a><p>"
+                        + "Name: -<br>"
+                        + "Activity type: hiking<br>"
+                        + "Description: -<br>"
+                        + "Total distance: 20.00 km (12.4 mi)<br>"
+                        + "Total time: 10:00<br>"
+                        + "Moving time: 05:00<br>"
+                        + "Average speed: 120.00 km/h (74.6 mi/h)<br>"
+                        + "Average moving speed: 240.00 km/h (149.1 mi/h)<br>"
+                        + "Max speed: 360.00 km/h (223.7 mi/h)<br>"
+                        + "Average pace: 0:30 min/km (0:48 min/mi)<br>"
+                        + "Average moving pace: 0:15 min/km (0:24 min/mi)<br>"
+                        + "Fastest pace: 0:10 min/km (0:16 min/mi)<br>"
+                        + "Elevation gain: 6000 m (19685 ft)<br>"
+                        + "Recorded: " + StringUtils.formatDateTime(context, START_TIME) + "<br>";
+
+        assertEquals(expected, descriptionGenerator.generateTrackDescription(track, true));
+    }
+
+
+    /**
+     * Tests {@link DescriptionGenerator#writeDistance(double, StringBuilder, int, String)}.
+     */
+    @Test
+    public void testWriteDistance() {
+        StringBuilder builder = new StringBuilder();
+        descriptionGenerator.writeDistance(1100, builder, R.string.description_total_distance, "<br>");
+        assertEquals("Total distance: 1.10 km (0.7 mi)<br>", builder.toString());
+    }
+
+    /**
+     * Tests {@link DescriptionGenerator#writeTime(long, StringBuilder, int, String)}.
+     */
+    @Test
+    public void testWriteTime() {
+        StringBuilder builder = new StringBuilder();
+        descriptionGenerator.writeTime(1000, builder, R.string.description_total_time, "<br>");
+        assertEquals("Total time: 00:01<br>", builder.toString());
+    }
+
+    /**
+     * Tests {@link DescriptionGenerator#writeSpeed(double, StringBuilder, int, String)}.
+     */
+    @Test
+    public void testWriteSpeed() {
+        StringBuilder builder = new StringBuilder();
+        descriptionGenerator.writeSpeed(1.1, builder, R.string.description_average_speed, "\n");
+        assertEquals("Average speed: 3.96 km/h (2.5 mi/h)\n", builder.toString());
+    }
+
+    /**
+     * Tests {@link DescriptionGenerator#writeElevation(double, StringBuilder, int, String)}.
+     */
+    @Test
+    public void testWriteElevation() {
+        StringBuilder builder = new StringBuilder();
+        descriptionGenerator.writeElevation(4.2, builder, R.string.description_min_elevation, "<br>");
+        assertEquals("Min elevation: 4 m (14 ft)<br>", builder.toString());
+    }
+
+    /**
+     * Tests {@link DescriptionGenerator#writePace(double, StringBuilder, int, String)}.
+     */
+    @Test
+    public void testWritePace() {
+        StringBuilder builder = new StringBuilder();
+        descriptionGenerator.writePace(1.1, builder, R.string.description_average_pace_in_minute, "\n");
+        assertEquals("Average pace: 15:09 min/km (24:23 min/mi)\n", builder.toString());
+    }
+}
@@ -17,18 +17,16 @@
 package de.dennisguse.opentracks.content;

 import android.content.ContentUris;
-import android.content.Context;
 import android.location.Location;
 import android.net.Uri;

-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.rule.provider.ProviderTestRule;

 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
-import org.junit.runner.RunWith;

 import java.util.ArrayList;
 import java.util.Arrays;
@@ -36,7 +34,16 @@ import java.util.List;

 import de.dennisguse.opentracks.content.SearchEngine.ScoredResult;
 import de.dennisguse.opentracks.content.SearchEngine.SearchQuery;
-import de.dennisguse.opentracks.stats.TripStatistics;
+import de.dennisguse.opentracks.content.data.Marker;
+import de.dennisguse.opentracks.content.data.Track;
+import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.content.provider.CustomContentProvider;
+import de.dennisguse.opentracks.content.provider.CustomSQLiteOpenHelper;
+import de.dennisguse.opentracks.stats.TrackStatistics;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;

 /**
 * Tests for {@link SearchEngine}.
@@ -45,93 +52,86 @@ import de.dennisguse.opentracks.stats.TripStatistics;
 *
 * @author Rodrigo Damazio
 */
-@RunWith(AndroidJUnit4.class)
 public class SearchEngineTest {

+    private static final String TAG = SearchEngineTest.class.getSimpleName();
+
    private static final Location HERE = new Location("gps");
-    private static final long NOW = SearchEngine.OLDEST_ALLOWED_TIMESTAMP + 1000;  // After OLDEST_ALLOWED_TIMESTAMP
+    private static final long NOW = SearchEngine.OLDEST_ALLOWED_TIMESTAMP + 1000;
+
+    @Rule
+    public ProviderTestRule sqliteContentProviderRule = new ProviderTestRule.Builder(CustomContentProvider.class, ContentProviderUtils.AUTHORITY_PACKAGE).setPrefix(TAG).build();
+
    private ContentProviderUtils providerUtils;
    private SearchEngine engine;

-    private Context context = ApplicationProvider.getApplicationContext();
-
-
    @Before
    public void setUp() {
-        providerUtils = new ContentProviderUtils(context);
+        providerUtils = new ContentProviderUtils(sqliteContentProviderRule.getResolver());
+
        engine = new SearchEngine(providerUtils);
    }

    @After
-    public void tearDown() throws Exception {
-        providerUtils.deleteAllTracks(context);
+    public void tearDown() {
+        InstrumentationRegistry.getInstrumentation().getTargetContext().deleteDatabase(TAG + CustomSQLiteOpenHelper.DATABASE_NAME);
    }

-    private long insertTrack(String title, String description, String category, double distance, long hoursAgo) {
+    private Track.Id insertTrack(String title, String description, String category, long hoursAgo) {
        Track track = new Track();
        track.setName(title);
        track.setDescription(description);
        track.setCategory(category);

-        TripStatistics stats = track.getTripStatistics();
+        TrackStatistics stats = track.getTrackStatistics();
        if (hoursAgo > 0) {
            // Started twice hoursAgo, so the average time is hoursAgo.
-            stats.setStartTime(NOW - hoursAgo * 1000L * 60L * 60L * 2);
-            stats.setStopTime(NOW);
+            stats.setStartTime_ms(NOW - hoursAgo * 1000L * 60L * 60L * 2);
+            stats.setStopTime_ms(NOW);
        }

-        int latitude = (int) ((HERE.getLatitude() + distance) * 1E6);
-        int longitude = (int) ((HERE.getLongitude() + distance) * 1E6);
-        stats.setBounds(latitude, longitude, latitude, longitude);
-
        Uri uri = providerUtils.insertTrack(track);
-        return ContentUris.parseId(uri);
+        return new Track.Id(ContentUris.parseId(uri));
    }

-    private long insertTrack(String title, String description, String category) {
-        return insertTrack(title, description, category, 0, -1);
+    private Track.Id insertTrack(String title, String description, String category) {
+        return insertTrack(title, description, category, -1);
    }

-    private long insertTrack(String title, double distance) {
-        return insertTrack(title, "", "", distance, -1);
+    private Track.Id insertTrack(String title, long hoursAgo) {
+        return insertTrack(title, "", "", hoursAgo);
    }

-    private long insertTrack(String title, long hoursAgo) {
-        return insertTrack(title, "", "", 0.0, hoursAgo);
-    }
-
-    private long insertWaypoint(String title, String description, String category, double distance, long hoursAgo, long trackId) {
-        Waypoint waypoint = new Waypoint();
-        waypoint.setName(title);
-        waypoint.setDescription(description);
-        waypoint.setCategory(category);
-        waypoint.setTrackId(trackId);
-
+    private Marker.Id insertWaypoint(String title, String description, String category, double distance, long hoursAgo, Track.Id trackId) {
        Location location = new Location(HERE);
        location.setLatitude(location.getLatitude() + distance);
        location.setLongitude(location.getLongitude() + distance);
        if (hoursAgo >= 0) {
            location.setTime(NOW - hoursAgo * 1000L * 60L * 60L);
        }
-        waypoint.setLocation(location);
+        Marker waypoint = new Marker(location);
+        waypoint.setName(title);
+        waypoint.setDescription(description);
+        waypoint.setCategory(category);
+        waypoint.setTrackId(trackId);

-        Uri uri = providerUtils.insertWaypoint(waypoint);
-        return ContentUris.parseId(uri);
+        Uri uri = providerUtils.insertMarker(waypoint);
+        return new Marker.Id(ContentUris.parseId(uri));
    }

-    private long insertWaypoint(String title, String description, String category) {
-        return insertWaypoint(title, description, category, 0.0, -1, -1);
+    private Marker.Id insertWaypoint(String title, String description, String category) {
+        return insertWaypoint(title, description, category, 0.0, -1, null);
    }

-    private long insertWaypoint(String title, double distance) {
-        return insertWaypoint(title, "", "", distance, -1, -1);
+    private Marker.Id insertWaypoint(String title, double distance) {
+        return insertWaypoint(title, "", "", distance, -1, null);
    }

-    private long insertWaypoint(String title, long hoursAgo) {
-        return insertWaypoint(title, "", "", 0.0, hoursAgo, -1);
+    private Marker.Id insertWaypoint(String title, long hoursAgo) {
+        return insertWaypoint(title, "", "", 0.0, hoursAgo, null);
    }

-    private long insertWaypoint(String title, long hoursAgo, long trackId) {
+    private Marker.Id insertWaypoint(String title, long hoursAgo, Track.Id trackId) {
        return insertWaypoint(title, "", "", 0.0, hoursAgo, trackId);
    }

@@ -146,15 +146,15 @@ public class SearchEngineTest {
        // - one which will match in title and description
        // - one which will match in all fields
        insertTrack("bb", "cc", "dd");
-        long descriptionMatchId = insertTrack("bb", "aa", "cc");
-        long categoryMatchId = insertTrack("bb", "cc", "aa");
-        long titleMatchId = insertTrack("aa", "bb", "cc");
-        long titleCategoryMatchId = insertTrack("aa", "bb", "ca");
-        long titleDescriptionMatchId = insertTrack("aa", "ba", "cc");
-        long allMatchId = insertTrack("aa", "ba", "ca");
+        Track.Id descriptionMatchId = insertTrack("bb", "aa", "cc");
+        Track.Id categoryMatchId = insertTrack("bb", "cc", "aa");
+        Track.Id titleMatchId = insertTrack("aa", "bb", "cc");
+        Track.Id titleCategoryMatchId = insertTrack("aa", "bb", "ca");
+        Track.Id titleDescriptionMatchId = insertTrack("aa", "ba", "cc");
+        Track.Id allMatchId = insertTrack("aa", "ba", "ca");

-        SearchQuery query = new SearchQuery("a", null, -1, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<ScoredResult>(engine.search(query));
+        SearchQuery query = new SearchQuery("a", null, null, NOW);
+        ArrayList<ScoredResult> results = new ArrayList<>(engine.search(query));

        // Title > Description > Category.
        assertTrackResults(results, allMatchId, titleDescriptionMatchId, titleCategoryMatchId, titleMatchId, descriptionMatchId, categoryMatchId);
@@ -171,15 +171,15 @@ public class SearchEngineTest {
        // - one which will match in title and description
        // - one which will match in all fields
        insertWaypoint("bb", "cc", "dd");
-        long descriptionMatchId = insertWaypoint("bb", "aa", "cc");
-        long categoryMatchId = insertWaypoint("bb", "cc", "aa");
-        long titleMatchId = insertWaypoint("aa", "bb", "cc");
-        long titleCategoryMatchId = insertWaypoint("aa", "bb", "ca");
-        long titleDescriptionMatchId = insertWaypoint("aa", "ba", "cc");
-        long allMatchId = insertWaypoint("aa", "ba", "ca");
+        Marker.Id descriptionMatchId = insertWaypoint("bb", "aa", "cc");
+        Marker.Id categoryMatchId = insertWaypoint("bb", "cc", "aa");
+        Marker.Id titleMatchId = insertWaypoint("aa", "bb", "cc");
+        Marker.Id titleCategoryMatchId = insertWaypoint("aa", "bb", "ca");
+        Marker.Id titleDescriptionMatchId = insertWaypoint("aa", "ba", "cc");
+        Marker.Id allMatchId = insertWaypoint("aa", "ba", "ca");

-        SearchQuery query = new SearchQuery("a", null, -1, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<ScoredResult>(engine.search(query));
+        SearchQuery query = new SearchQuery("a", null, null, NOW);
+        ArrayList<ScoredResult> results = new ArrayList<>(engine.search(query));

        // Title > Description > Category.
        assertWaypointResults(results, allMatchId, titleDescriptionMatchId, titleCategoryMatchId, titleMatchId, descriptionMatchId, categoryMatchId);
@@ -193,45 +193,31 @@ public class SearchEngineTest {
        // - one waypoint which will match by title
        // - one track which won't match
        // - one track which will match by title
-        long descriptionWaypointId = insertWaypoint("bb", "aa", "cc");
+        Marker.Id descriptionWaypointId = insertWaypoint("bb", "aa", "cc");
        insertWaypoint("bb", "cc", "dd");
-        long titleWaypointId = insertWaypoint("aa", "bb", "cc");
+        Marker.Id titleWaypointId = insertWaypoint("aa", "bb", "cc");
        insertTrack("bb", "cc", "dd");
-        long trackId = insertTrack("aa", "bb", "cc");
+        Track.Id trackId = insertTrack("aa", "bb", "cc");

-        SearchQuery query = new SearchQuery("a", null, -1, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<ScoredResult>(engine.search(query));
+        SearchQuery query = new SearchQuery("a", null, null, NOW);
+        ArrayList<ScoredResult> results = new ArrayList<>(engine.search(query));

        // Title > Description > Category.
-        Assert.assertEquals(results.toString(), 3, results.size());
+        assertEquals(results.toString(), 3, results.size());
        assertTrackResult(trackId, results.get(0));
        assertWaypointResult(titleWaypointId, results.get(1));
        assertWaypointResult(descriptionWaypointId, results.get(2));
    }

-    @Test
-    public void testSearchTrackDistance() {
-        // All results match text, but they're at difference distances from the user.
-        long farFarAwayId = insertTrack("aa", 0.3);
-        long nearId = insertTrack("ab", 0.1);
-        long farId = insertTrack("ac", 0.2);
-
-        SearchQuery query = new SearchQuery("a", HERE, -1, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<ScoredResult>(engine.search(query));
-
-        // Distance order.
-        assertTrackResults(results, nearId, farId, farFarAwayId);
-    }
-
    @Test
    public void testSearchWaypointDistance() {
        // All results match text, but they're at difference distances from the user.
-        long farFarAwayId = insertWaypoint("aa", 0.3);
-        long nearId = insertWaypoint("ab", 0.1);
-        long farId = insertWaypoint("ac", 0.2);
+        Marker.Id farFarAwayId = insertWaypoint("aa", 0.3);
+        Marker.Id nearId = insertWaypoint("ab", 0.1);
+        Marker.Id farId = insertWaypoint("ac", 0.2);

-        SearchQuery query = new SearchQuery("a", HERE, -1, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<ScoredResult>(engine.search(query));
+        SearchQuery query = new SearchQuery("a", HERE, null, NOW);
+        ArrayList<ScoredResult> results = new ArrayList<>(engine.search(query));

        // Distance order.
        assertWaypointResults(results, nearId, farId, farFarAwayId);
@@ -239,12 +225,12 @@ public class SearchEngineTest {

    public void testSearchTrackRecent() {
        // All results match text, but they're were recorded at different times.
-        long oldestId = insertTrack("aa", 3);
-        long recentId = insertTrack("ab", 1);
-        long oldId = insertTrack("ac", 2);
+        Track.Id oldestId = insertTrack("aa", 3);
+        Track.Id recentId = insertTrack("ab", 1);
+        Track.Id oldId = insertTrack("ac", 2);

-        SearchQuery query = new SearchQuery("a", null, -1, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<ScoredResult>(engine.search(query));
+        SearchQuery query = new SearchQuery("a", null, null, NOW);
+        ArrayList<ScoredResult> results = new ArrayList<>(engine.search(query));

        // Reverse time order.
        assertTrackResults(results, recentId, oldId, oldestId);
@@ -253,12 +239,12 @@ public class SearchEngineTest {
    @Test
    public void testSearchWaypointRecent() {
        // All results match text, but they're were recorded at different times.
-        long oldestId = insertWaypoint("aa", 2);
-        long recentId = insertWaypoint("ab", 0);
-        long oldId = insertWaypoint("ac", 1);
+        Marker.Id oldestId = insertWaypoint("aa", 2);
+        Marker.Id recentId = insertWaypoint("ab", 0);
+        Marker.Id oldId = insertWaypoint("ac", 1);

-        SearchQuery query = new SearchQuery("a", null, -1, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<ScoredResult>(engine.search(query));
+        SearchQuery query = new SearchQuery("a", null, null, NOW);
+        ArrayList<ScoredResult> results = new ArrayList<>(engine.search(query));

        // Reverse time order.
        assertWaypointResults(results, recentId, oldId, oldestId);
@@ -267,11 +253,11 @@ public class SearchEngineTest {
    @Test
    public void testSearchCurrentTrack() {
        // All results match text, but one of them is the current track.
-        long currentId = insertTrack("ab", 1);
-        long otherId = insertTrack("aa", 1);
+        Track.Id currentId = insertTrack("ab", 1);
+        Track.Id otherId = insertTrack("aa", 1);

        SearchQuery query = new SearchQuery("a", null, currentId, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<ScoredResult>(engine.search(query));
+        ArrayList<ScoredResult> results = new ArrayList<>(engine.search(query));

        // Current track should be demoted.
        assertTrackResults(results, otherId, currentId);
@@ -280,47 +266,57 @@ public class SearchEngineTest {
    @Test
    public void testSearchCurrentTrackWaypoint() {
        // All results match text, but one of them is in the current track.
-        long otherId = insertWaypoint("aa", 1, 456);
-        long currentId = insertWaypoint("ab", 1, 123);
+        Marker.Id otherId = insertWaypoint("aa", 1, new Track.Id(456));
+        Marker.Id currentId = insertWaypoint("ab", 1, new Track.Id(123));

-        SearchQuery query = new SearchQuery("a", null, 123, NOW);
-        ArrayList<ScoredResult> results = new ArrayList<ScoredResult>(engine.search(query));
+        SearchQuery query = new SearchQuery("a", null, new Track.Id(123), NOW);
+        ArrayList<ScoredResult> results = new ArrayList<>(engine.search(query));

        // Waypoint in current track should be promoted.
        assertWaypointResults(results, currentId, otherId);
    }

-    private void assertTrackResult(long trackId, ScoredResult result) {
-        Assert.assertNotNull("Not a track", result.track);
-        Assert.assertNull("Ambiguous result", result.waypoint);
-        Assert.assertEquals(trackId, result.track.getId());
+    private void assertTrackResult(Track.Id trackId, ScoredResult result) {
+        assertNotNull("Not a track", result.track);
+        assertNull("Ambiguous result", result.marker);
+        assertEquals(trackId, result.track.getId());
    }

-    private void assertTrackResults(List<ScoredResult> results, long... trackIds) {
-        String errMsg = "Expected IDs=" + Arrays.toString(trackIds) + "; results=" + results;
-        Assert.assertEquals(results.size(), trackIds.length);
+    private void assertTrackResults(List<ScoredResult> results, Track.Id... trackIds) {
+        long[] longTrackIds = new long[trackIds.length];
+        for (int i = 0; i < trackIds.length; i++) {
+            longTrackIds[i] = trackIds[i].getId();
+        }
+
+        String errMsg = "Expected IDs=" + Arrays.toString(longTrackIds) + "; results=" + results;
+        assertEquals(results.size(), trackIds.length);
        for (int i = 0; i < results.size(); i++) {
            ScoredResult result = results.get(i);
-            Assert.assertNotNull(errMsg, result.track);
-            Assert.assertNull(errMsg, result.waypoint);
-            Assert.assertEquals(errMsg, trackIds[i], result.track.getId());
+            assertNotNull(errMsg, result.track);
+            assertNull(errMsg, result.marker);
+            assertEquals(errMsg, trackIds[i], result.track.getId());
        }
    }

-    private void assertWaypointResult(long waypointId, ScoredResult result) {
-        Assert.assertNotNull("Not a waypoint", result.waypoint);
-        Assert.assertNull("Ambiguous result", result.track);
-        Assert.assertEquals(waypointId, result.waypoint.getId());
+    private void assertWaypointResult(Marker.Id waypointId, ScoredResult result) {
+        assertNotNull("Not a waypoint", result.marker);
+        assertNull("Ambiguous result", result.track);
+        assertEquals(waypointId, result.marker.getId());
    }

-    private void assertWaypointResults(List<ScoredResult> results, long... waypointIds) {
-        String errMsg = "Expected IDs=" + Arrays.toString(waypointIds) + "; results=" + results;
-        Assert.assertEquals(results.size(), waypointIds.length);
+    private void assertWaypointResults(List<ScoredResult> results, Marker.Id... waypointIds) {
+        long[] longWaypointIds = new long[waypointIds.length];
+        for (int i = 0; i < waypointIds.length; i++) {
+            longWaypointIds[i] = waypointIds[i].getId();
+        }
+
+        String errMsg = "Expected IDs=" + Arrays.toString(longWaypointIds) + "; results=" + results;
+        assertEquals(results.size(), waypointIds.length);
        for (int i = 0; i < results.size(); i++) {
            ScoredResult result = results.get(i);
-            Assert.assertNotNull(errMsg, result.waypoint);
-            Assert.assertNull(errMsg, result.track);
-            Assert.assertEquals(errMsg, waypointIds[i], result.waypoint.getId());
+            assertNotNull(errMsg, result.marker);
+            assertNull(errMsg, result.track);
+            assertEquals(errMsg, waypointIds[i], result.marker.getId());
        }
    }
 }
@@ -0,0 +1,104 @@
+package de.dennisguse.opentracks.content.data;
+
+import android.content.Context;
+import android.location.Location;
+import android.net.Uri;
+import android.util.Pair;
+
+import java.io.File;
+import java.io.IOException;
+
+import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
+import de.dennisguse.opentracks.util.FileUtils;
+
+public class TestDataUtil {
+
+    public static final double INITIAL_LATITUDE = 37.0;
+    public static final double INITIAL_LONGITUDE = -57.0;
+    public static final double ALTITUDE_INTERVAL = 2.5;
+
+    /**
+     * Create a track without any trackPoints.
+     */
+    public static Track createTrack(Track.Id trackId) {
+        Track track = new Track();
+        track.setId(trackId);
+        track.setName("Test: " + trackId.getId());
+
+        return track;
+    }
+
+    /**
+     * Simulates a track which is used for testing.
+     *
+     * @param trackId   the trackId of the track
+     * @param numPoints the trackPoints number in the track
+     */
+    public static Pair<Track, TrackPoint[]> createTrack(Track.Id trackId, int numPoints) {
+        Track track = createTrack(trackId);
+
+        TrackPoint[] trackPoints = new TrackPoint[numPoints];
+        for (int i = 0; i < numPoints; i++) {
+            trackPoints[i] = createTrackPoint(i);
+        }
+
+        return new Pair<>(track, trackPoints);
+    }
+
+    public static Track createTrackAndInsert(ContentProviderUtils contentProviderUtils, Track.Id trackId, int numPoints) {
+        Pair<Track, TrackPoint[]> pair = createTrack(trackId, numPoints);
+
+        insertTrackWithLocations(contentProviderUtils, pair.first, pair.second);
+
+        return pair.first;
+    }
+
+    /**
+     * Creates a location.
+     *
+     * @param i the index for the TrackPoint.
+     */
+    public static TrackPoint createTrackPoint(int i) {
+        TrackPoint trackPoint = new TrackPoint();
+        trackPoint.setLatitude(INITIAL_LATITUDE + (double) i / 10000.0);
+        trackPoint.setLongitude(INITIAL_LONGITUDE - (double) i / 10000.0);
+        trackPoint.setAccuracy((float) i / 100.0f);
+        trackPoint.setAltitude(i * ALTITUDE_INTERVAL);
+        trackPoint.setTime(i + 1);
+        trackPoint.setSpeed(5f + (i / 10));
+
+        trackPoint.setHeartRate_bpm(100f + i);
+        trackPoint.setCyclingCadence_rpm(300f + i);
+        trackPoint.setPower(400f + i);
+        trackPoint.setElevationGain(500f + i);
+        return trackPoint;
+    }
+
+    /**
+     * Inserts a track with locations into the database.
+     *
+     * @param track       track to be inserted
+     * @param trackPoints trackPoints to be inserted
+     */
+    public static void insertTrackWithLocations(ContentProviderUtils contentProviderUtils, Track track, TrackPoint[] trackPoints) {
+        contentProviderUtils.insertTrack(track);
+        contentProviderUtils.bulkInsertTrackPoint(trackPoints, track.getId());
+    }
+
+    /**
+     * Creates a Waypoint with a photo.
+     *
+     * @param context  The context.
+     * @param trackId  The track id.
+     * @param location The location.
+     * @return the Waypoint created.
+     */
+    public static Marker createWaypointWithPhoto(Context context, Track.Id trackId, Location location) throws IOException {
+        File dstFile = new File(FileUtils.getImageUrl(context, trackId));
+        dstFile.createNewFile();
+        Uri photoUri = FileUtils.getUriForFile(context, dstFile);
+        String photoUrl = photoUri.toString();
+
+        return new Marker("Waypoint name", "Waypoint description", "Waypoint category", "", trackId, 0.0, 0, location, photoUrl);
+    }
+}
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package de.dennisguse.opentracks.content.provider;
+
+import android.content.ContentUris;
+import android.content.Context;
+import android.net.Uri;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import de.dennisguse.opentracks.content.data.MarkerColumns;
+import de.dennisguse.opentracks.content.data.TrackPointsColumns;
+import de.dennisguse.opentracks.content.data.TracksColumns;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Tests {@link CustomContentProvider}.
+ *
+ * @author Youtao Liu
+ */
+public class CustomContentProviderTest {
+
+    private CustomContentProvider customContentProvider;
+    private final Context context = ApplicationProvider.getApplicationContext();
+
+    @Before
+    public void setUp() {
+        customContentProvider = new CustomContentProvider() {
+        };
+    }
+
+    /**
+     * Tests {@link CustomContentProvider#onCreate(android.content.Context)}.
+     */
+    @Test
+    public void testOnCreate() {
+        assertTrue(customContentProvider.onCreate(context));
+    }
+
+    /**
+     * Tests {@link CustomContentProvider#getType(Uri)}.
+     */
+    @Test
+    public void testGetType() {
+        assertEquals(TracksColumns.CONTENT_TYPE, customContentProvider.getType(TracksColumns.CONTENT_URI));
+        assertEquals(TracksColumns.CONTENT_ITEMTYPE, customContentProvider.getType(ContentUris.appendId(TracksColumns.CONTENT_URI.buildUpon(), 1).build()));
+
+        assertEquals(TrackPointsColumns.CONTENT_TYPE, customContentProvider.getType(TrackPointsColumns.CONTENT_URI_BY_ID));
+        assertEquals(TrackPointsColumns.CONTENT_ITEMTYPE, customContentProvider.getType(ContentUris.appendId(TrackPointsColumns.CONTENT_URI_BY_TRACKID.buildUpon(), 1).build()));
+
+        assertEquals(MarkerColumns.CONTENT_TYPE, customContentProvider.getType(MarkerColumns.CONTENT_URI));
+        assertEquals(MarkerColumns.CONTENT_ITEMTYPE, customContentProvider.getType(ContentUris.appendId(MarkerColumns.CONTENT_URI.buildUpon(), 1).build()));
+    }
+}
--- a/Show More
+++ b/Show More