From 756433648af92b17e319c01b85f815b24766c114 Mon Sep 17 00:00:00 2001
From: Tobias Zwick <newton@westnordost.de>
Date: Thu, 18 Nov 2021 00:37:40 +0100
Subject: [PATCH] better fitting icon for bicycle barrier quest

---
 .../AddBicycleBarrierType.kt                  |  2 +-
 .../res/drawable/ic_quest_bicycle_barrier.xml | 31 ------------------
 .../res/drawable/ic_quest_no_bicycles.xml     | 32 +++++++++++++++++++
 res/graphics/authors.txt                      |  1 +
 res/graphics/quest icons/bicycle_barrier.svg  | 10 ------
 res/graphics/quest icons/no_bicycles.svg      | 11 +++++++
 6 files changed, 45 insertions(+), 42 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_quest_bicycle_barrier.xml
 create mode 100644 app/src/main/res/drawable/ic_quest_no_bicycles.xml
 delete mode 100644 res/graphics/quest icons/bicycle_barrier.svg
 create mode 100644 res/graphics/quest icons/no_bicycles.svg

diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/barrier_bicycle_barrier_type/AddBicycleBarrierType.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/barrier_bicycle_barrier_type/AddBicycleBarrierType.kt
index 3a5f84a532..215f9be662 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/quests/barrier_bicycle_barrier_type/AddBicycleBarrierType.kt
+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/barrier_bicycle_barrier_type/AddBicycleBarrierType.kt
@@ -12,7 +12,7 @@ class AddBicycleBarrierType : OsmFilterQuestType<BicycleBarrierType>() {
     override val elementFilter = "nodes with barrier = cycle_barrier and !cycle_barrier"
     override val commitMessage = "Add specific cycle barrier type"
     override val wikiLink = "Key:cycle_barrier"
-    override val icon = R.drawable.ic_quest_bicycle_barrier
+    override val icon = R.drawable.ic_quest_no_bicycles
     override val isDeleteElementEnabled = true
 
     override val questTypeAchievements = listOf(BLIND, WHEELCHAIR, BICYCLIST)
diff --git a/app/src/main/res/drawable/ic_quest_bicycle_barrier.xml b/app/src/main/res/drawable/ic_quest_bicycle_barrier.xml
deleted file mode 100644
index a7d34b74f3..0000000000
--- a/app/src/main/res/drawable/ic_quest_bicycle_barrier.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
-    android:viewportWidth="128"
-    android:viewportHeight="128">
-  <path
-      android:pathData="m128,64a64,64 0,0 1,-64 64,64 64,0 0,1 -64,-64 64,64 0,0 1,64 -64,64 64,0 0,1 64,64"
-      android:fillColor="#ca72e2"/>
-  <path
-      android:pathData="m31.992,32.08v87.273a64,64 0,0 0,16 6.529v-93.803z"
-      android:fillColor="#666"/>
-  <path
-      android:pathData="m79.992,32.08v93.84a64,64 0,0 0,16 -6.582v-87.258z"
-      android:fillColor="#666"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="m23.992,44.08c-4.456,0 -8.043,3.587 -8.043,8.043v31.914c0,4.456 3.587,8.043 8.043,8.043h79.914c4.456,0 8.043,-3.587 8.043,-8.043v-31.914c0,-4.456 -3.587,-8.043 -8.043,-8.043z"
-      android:fillAlpha="0.2"/>
-  <path
-      android:pathData="m24.036,40.08h79.913c4.456,0 8.043,3.587 8.043,8.043v31.913c0,4.456 -3.587,8.043 -8.043,8.043h-79.913c-4.456,0 -8.043,-3.587 -8.043,-8.043v-31.913c0,-4.456 3.587,-8.043 8.043,-8.043z"
-      android:fillColor="#fff"/>
-  <path
-      android:pathData="m23.992,40.08c-3.817,0 -6.987,2.648 -7.795,6.213l28.746,41.787h14.143l-32.332,-48zM40.611,40.08 L72.943,88.08h14.143l-32.332,-48zM68.611,40.08 L100.943,88.08h3.049c3.693,0 6.776,-2.48 7.705,-5.869l-28.943,-42.131zM96.611,40.08 L111.992,62.08v-14c0,-4.432 -3.568,-8 -8,-8zM15.992,66.08v14c0,4.432 3.568,8 8,8h7.094z"
-      android:fillColor="#c84747"/>
-  <path
-      android:pathData="m24.03,40.08h79.924c4.453,0 8.038,3.585 8.038,8.038v31.924c0,4.453 -3.585,8.038 -8.038,8.038h-79.924c-4.453,0 -8.038,-3.585 -8.038,-8.038v-31.924c0,-4.453 3.585,-8.038 8.038,-8.038z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="4"
-      android:strokeColor="#555"
-      android:strokeLineCap="round"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_quest_no_bicycles.xml b/app/src/main/res/drawable/ic_quest_no_bicycles.xml
new file mode 100644
index 0000000000..30b8c77507
--- /dev/null
+++ b/app/src/main/res/drawable/ic_quest_no_bicycles.xml
@@ -0,0 +1,32 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="128"
+    android:viewportHeight="128">
+  <path
+      android:pathData="m128,64c0,35.346 -28.654,64 -64,64s-64,-28.654 -64,-64 28.654,-64 64,-64 64,28.654 64,64"
+      android:fillColor="#ca72e2"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m66,12c-29.742,0 -54,24.258 -54,54s24.258,54 54,54 54,-24.258 54,-54 -24.258,-54 -54,-54zM66,25.746c8.616,0 16.575,2.681 23.106,7.25l-56.107,56.107c-4.569,-6.531 -7.252,-14.488 -7.252,-23.104 0,-22.313 17.94,-40.254 40.254,-40.254zM99.002,42.896c4.568,6.531 7.252,14.488 7.252,23.104 0,22.313 -17.94,40.254 -40.254,40.254 -8.616,0 -16.573,-2.684 -23.104,-7.252z"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="m64.551,7.26c-29.742,0 -54,24.258 -54,54 0,12.936 4.24,23.254 11.873,32.571l9.561,-9.032c-4.568,-6.531 -7.687,-14.923 -7.687,-23.539 0,-22.313 17.94,-40.254 40.254,-40.254 7.973,0 17.285,4.236 23.811,8.488l10.133,-10.184c-9.285,-7.531 -21.104,-12.051 -33.943,-12.051z"
+      android:fillColor="#c84747"/>
+  <path
+      android:pathData="m45.716,67.914a18.317,18.317 46.684,0 1,-22.805 12.287,18.317 18.317,46.684 0,1 -12.287,-22.805 18.317,18.317 46.684,0 1,22.805 -12.287,18.317 18.317,46.684 0,1 12.287,22.805m57.181,17.134a18.317,18.317 46.684,0 1,-22.805 12.287,18.317 18.317,46.684 0,1 -12.287,-22.805 18.317,18.317 46.684,0 1,22.805 -12.287,18.317 18.317,46.684 0,1 12.287,22.805m-56.871,-46.498 l14.105,33.574 25.345,7.596 -9.354,-32.15 -30.097,-9.02m31.995,2.684 l7.725,2.298m-25.614,28.592 l17.89,-30.891m-49.571,21.396 l24.983,-35.35 12.673,3.798"
+      android:strokeAlpha="0.2"
+      android:strokeLineJoin="round"
+      android:strokeWidth="6"
+      android:strokeColor="#000"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="m45.715,63.458a18.317,18.317 46.684,0 1,-22.805 12.287,18.317 18.317,46.684 0,1 -12.287,-22.805 18.317,18.317 46.684,0 1,22.805 -12.287,18.317 18.317,46.684 0,1 12.287,22.805m57.181,17.134a18.317,18.317 46.684,0 1,-22.805 12.287,18.317 18.317,46.684 0,1 -12.287,-22.805 18.317,18.317 46.684,0 1,22.805 -12.287,18.317 18.317,46.684 0,1 12.287,22.805m-56.871,-46.498 l14.105,33.574 25.345,7.596 -9.354,-32.15 -30.097,-9.02m31.995,2.684 l7.725,2.298m-25.614,28.592 l17.89,-30.891m-49.571,21.396 l24.983,-35.35 12.673,3.798"
+      android:strokeLineJoin="round"
+      android:strokeWidth="6"
+      android:strokeColor="#fff"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="m22.424,93.831c9.84,13.425 25.72,22.169 43.576,22.169 29.742,0 54,-24.258 54,-54 0,-16.928 -9.251,-32.775 -21.505,-42.689zM99.002,38.896c4.568,6.531 7.252,14.488 7.252,23.104 0,22.313 -17.94,40.254 -40.254,40.254 -8.616,0 -16.573,-2.684 -23.104,-7.252z"
+      android:fillColor="#c84747"/>
+</vector>
diff --git a/res/graphics/authors.txt b/res/graphics/authors.txt
index b375734fcf..f4129dd1df 100644
--- a/res/graphics/authors.txt
+++ b/res/graphics/authors.txt
@@ -253,6 +253,7 @@ quest icons/
     motorcycle_parking_capacity.svg
     motorcycle_parking_cover.svg
     museum.svg
+    no_bicycle.svg
     no_pedestrians.svg
     note_create.svg
     notes.svg
diff --git a/res/graphics/quest icons/bicycle_barrier.svg b/res/graphics/quest icons/bicycle_barrier.svg
deleted file mode 100644
index be337f67dd..0000000000
--- a/res/graphics/quest icons/bicycle_barrier.svg	
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg">
- <path class="st0" d="m128 64a64 64 0 0 1-64 64 64 64 0 0 1-64-64 64 64 0 0 1 64-64 64 64 0 0 1 64 64" fill="#ca72e2"/>
- <path d="m31.992 32.08v87.273a64 64 0 0 0 16 6.5293v-93.803z" fill="#666"/>
- <path d="m79.992 32.08v93.84a64 64 0 0 0 16-6.582v-87.258z" fill="#666"/>
- <path d="m23.992 44.08c-4.456 0-8.0429 3.587-8.0429 8.043v31.914c0 4.456 3.5869 8.043 8.0429 8.043h79.914c4.456 0 8.043-3.587 8.043-8.043v-31.914c0-4.456-3.587-8.043-8.043-8.043z" fill-opacity=".2"/>
- <path d="m24.036 40.08h79.913c4.456 0 8.0433 3.5873 8.0433 8.0433v31.913c0 4.456-3.5873 8.0433-8.0433 8.0433h-79.913c-4.456 0-8.0433-3.5873-8.0433-8.0433v-31.913c0-4.456 3.5873-8.0433 8.0433-8.0433z" fill="#fff" style="paint-order:normal"/>
- <path d="m23.992 40.08c-3.8167 0-6.9867 2.6476-7.7949 6.2129l28.746 41.787h14.143l-32.332-48zm16.619 0 32.332 48h14.143l-32.332-48zm28 0 32.332 48h3.0488c3.6926 0 6.7759-2.4795 7.7051-5.8691l-28.943-42.131zm28 0 15.381 22v-14c0-4.432-3.568-8-8-8zm-80.619 26v14c0 4.432 3.568 8 8 8h7.0938z" fill="#c84747" style="paint-order:normal"/>
- <path d="m24.03 40.08h79.924c4.4531 0 8.038 3.5849 8.038 8.038v31.924c0 4.453-3.5849 8.038-8.038 8.038h-79.924c-4.4531 0-8.038-3.5849-8.038-8.038v-31.924c0-4.453 3.5849-8.038 8.038-8.038z" fill="none" stroke="#555" stroke-linecap="round" stroke-linejoin="round" stroke-width="4" style="paint-order:stroke markers fill"/>
-</svg>
diff --git a/res/graphics/quest icons/no_bicycles.svg b/res/graphics/quest icons/no_bicycles.svg
new file mode 100644
index 0000000000..d050a38671
--- /dev/null
+++ b/res/graphics/quest icons/no_bicycles.svg	
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg">
+ <path d="m128 64c0 35.346-28.654 64-64 64s-64-28.654-64-64 28.654-64 64-64 64 28.654 64 64" fill="#ca72e2" stroke-width=".2"/>
+ <path d="m66 12c-29.742 0-54 24.258-54 54s24.258 54 54 54 54-24.258 54-54-24.258-54-54-54zm0 13.746c8.616 0 16.575 2.6812 23.106 7.25l-56.107 56.107c-4.5688-6.5309-7.252-14.488-7.252-23.104 0-22.313 17.94-40.254 40.254-40.254zm33.002 17.15c4.5681 6.5306 7.2519 14.488 7.2519 23.104 0 22.313-17.94 40.254-40.254 40.254-8.6155 0-16.573-2.6837-23.104-7.252z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill-opacity=".2" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+ <path d="m64.551 7.2605c-29.742 0-54 24.258-54 54 0 12.936 4.2397 23.254 11.873 32.571l9.5608-9.0319c-4.5683-6.5307-7.6873-14.923-7.6873-23.539 0-22.313 17.94-40.254 40.254-40.254 7.9728 0 17.285 4.2358 23.811 8.4883l10.133-10.184c-9.285-7.5309-21.104-12.051-33.943-12.051z" fill="#c84747" shape-rendering="auto" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+ <g transform="matrix(1.0123 .029761 -.029761 1.0123 2.2672 2.7724)" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="5.9243">
+  <path d="m44.774 63.034a18.087 18.087 0 0 1-22.152 12.789 18.087 18.087 0 0 1-12.789-22.152 18.087 18.087 0 0 1 22.152-12.789 18.087 18.087 0 0 1 12.789 22.152m56.935 15.252a18.087 18.087 0 0 1-22.152 12.789 18.087 18.087 0 0 1-12.789-22.152 18.087 18.087 0 0 1 22.152-12.789 18.087 18.087 0 0 1 12.789 22.152m-57.481-44.243 14.896 32.728 25.236 6.7619-10.165-31.461-29.967-8.0295m31.657 1.7207 7.691 2.0439m-24.451 28.963 16.761-31.008m-48.306 22.556 23.632-35.615 12.618 3.3809" stroke="#000" stroke-opacity=".2" style="paint-order:normal"/>
+  <path d="m44.644 58.636a18.087 18.087 0 0 1-22.152 12.789 18.087 18.087 0 0 1-12.789-22.152 18.087 18.087 0 0 1 22.152-12.789 18.087 18.087 0 0 1 12.789 22.152m56.935 15.252a18.087 18.087 0 0 1-22.152 12.789 18.087 18.087 0 0 1-12.789-22.152 18.087 18.087 0 0 1 22.152-12.789 18.087 18.087 0 0 1 12.789 22.152m-57.481-44.243 14.896 32.728 25.236 6.7619-10.165-31.461-29.967-8.0295m31.657 1.7207 7.691 2.0439m-24.451 28.963 16.761-31.008m-48.306 22.556 23.632-35.615 12.618 3.3809" stroke="#fff" style="paint-order:normal"/>
+ </g>
+ <path d="m22.424 93.831c9.8401 13.425 25.72 22.169 43.576 22.169 29.742 0 54-24.258 54-54 0-16.928-9.251-32.775-21.505-42.689zm76.578-54.935c4.5683 6.5307 7.2519 14.488 7.2519 23.104 0 22.313-17.94 40.254-40.254 40.254-8.6156 0-16.573-2.6836-23.104-7.252z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#c84747" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+</svg>