Add icons

app/src/main/java/de/westnordost/streetcomplete/quests/lgbtq/LGBTQAccess.kt

@@ -28,7 +28,7 @@ val LGTBQAccess.titleResId: Int get() = when (this) {
 // TOOD: populate icons
 val LGTBQAccess.iconResId: Int get() = when (this) {
     LGTBQAccess.NO -> R.drawable.surface_asphalt
-    LGTBQAccess.WELCOME -> R.drawable.surface_asphalt
+    LGTBQAccess.WELCOME -> R.drawable.lgbtq_welcome
     LGTBQAccess.PRIMARY -> R.drawable.surface_asphalt
     LGTBQAccess.ONLY -> R.drawable.surface_asphalt
     LGTBQAccess.UNKNOWN -> R.drawable.surface_asphalt

app/src/main/java/de/westnordost/streetcomplete/quests/lgbtq/LGBTQAccessForm.kt

@@ -26,7 +26,7 @@ class LGBTQAccessForm : AImageListQuestForm<LGTBQAccess, LGBTQAccessAnswer>() {
     override fun onClickOk(selectedItems: List<LGTBQAccess>) {
         val value = selectedItems.single()
         if (value.osmValue == null) {
-            hideOsmQuestController.tempHide(questKey as OsmQuestKey)
+            hideOsmQuestController.hide(questKey as OsmQuestKey)
             return
         }
         applyAnswer(LGBTQAccessAnswer(value))

app/src/main/java/de/westnordost/streetcomplete/quests/lgbtq/LGBTQAccessQuest.kt

@@ -27,8 +27,7 @@ class LGBTQAccessQuest : OsmFilterQuestType<LGBTQAccessAnswer>() {
 
     override val changesetComment = "Survey lgbtq access"
     override val wikiLink = "Key:lgbtq"
-    // TODO: replace me
-    override val icon = R.drawable.ic_quest_shop
+    override val icon = R.drawable.ic_quest_lgbtq
     override val achievements = listOf(EditTypeAchievement.CITIZEN)
 
     override fun getTitle(tags: Map<String, String>) = R.string.quest_lgbtq_access

app/src/main/java/de/westnordost/streetcomplete/quests/lgbtq/LGBTQGenderSpecializationQuest.kt

@@ -17,8 +17,7 @@ class LGBTQGenderSpecializationQuest : OsmFilterQuestType<LGBTQGenderSpecializat
 
     override val changesetComment = "Survey lgbtq specificity"
     override val wikiLink = "Key:lgbtq"
-    // TODO: replace me
-    override val icon = R.drawable.ic_quest_shop
+    override val icon = R.drawable.ic_quest_gender
     override val achievements = listOf(EditTypeAchievement.CITIZEN)
 
     override fun getTitle(tags: Map<String, String>) = R.string.quest_lgbtq_gender_specialization

app/src/main/java/de/westnordost/streetcomplete/quests/lgbtq/LGBTQTransgenderSpecializationQuest.kt

@@ -19,8 +19,7 @@ class LGBTQTransgenderSpecializationQuest : OsmFilterQuestType<LGBTQTransgenderS
 
     override val changesetComment = "Survey lgbtq transgender specialization"
     override val wikiLink = "Key:lgbtq"
-    // TODO: replace me
-    override val icon = R.drawable.ic_quest_shop
+    override val icon = R.drawable.ic_quest_trans
     override val achievements = listOf(EditTypeAchievement.CITIZEN)
 
     override fun getTitle(tags: Map<String, String>) = R.string.quest_lgbtq_transgender_specialization

app/src/main/res/drawable/ic_quest_gender.xml

@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="33.9"
+    android:viewportHeight="33.9">
+  <path
+      android:pathData="m33.9,16.9a16.9,16.9 0,0 1,-16.9 16.9,16.9 16.9,0 0,1 -17,-16.9 16.9,16.9 0,0 1,16.8 -17,16.9 16.9,0 0,1 17,16.8z"
+      android:fillColor="#e9a76f"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m28,6.59c-1.62,0.155 -3.25,0.303 -4.87,0.46 -0.304,0.172 -0.34,0.681 -0.082,1.14 0.258,0.456 0.714,0.688 1.02,0.518l1.9,-0.179 -1.52,3.09c-0.621,-0.209 -1.28,-0.326 -1.97,-0.331 -2.17,-0.015 -4.09,1.07 -5.25,2.73l-1.13,1.8 -1.13,-1.8 -0.001,0.001c-1.16,-1.66 -3.08,-2.74 -5.25,-2.73 -3.49,0.024 -6.32,2.88 -6.3,6.37 0.014,3.11 2.3,5.71 5.27,6.22v1.54h-2.09v0.001c-0.002,-0 -0.004,-0 -0.006,-0.001 -0.454,0.004 -0.821,0.457 -0.819,1.01 0.002,0.555 0.371,1 0.824,1h2.09l0.001,2.25c0.003,0.556 0.451,1 1,1 0.552,-0.001 0.996,-0.452 0.998,-1.01 0.001,-0.75 0.001,-1.5 0.001,-2.25h2.1c0.524,-0.001 0.822,-0.543 0.822,-1.02 -0.004,-0.553 -0.372,-0.998 -0.824,-0.998v-0.001h-2.09v-1.51c2,-0.269 3.24,-1.38 3.99,-2.3l1.42,-2.26 1.42,2.26c0.866,1.04 2.36,2.35 4.9,2.36 3.49,0.008 6.34,-2.83 6.36,-6.32 0.01,-2.11 -1.02,-3.99 -2.61,-5.15l1.54,-3.14c0.336,0.539 0.682,1.07 1.01,1.61 0.045,0.348 0.505,0.576 1.03,0.51 0.524,-0.066 0.913,-0.402 0.871,-0.75zM9.7,13.18c1.5,-0.01 2.83,0.716 3.65,1.84l1.61,2.57 -1.9,3.02c-0.812,0.906 -1.99,1.47 -3.31,1.48 -2.47,0.005 -4.46,-1.97 -4.47,-4.44 -0.011,-2.47 1.96,-4.46 4.43,-4.48zM22.4,13.18c2.47,0.017 4.44,2.01 4.43,4.48 -0.011,2.47 -2,4.44 -4.47,4.44 -1.32,-0.003 -2.5,-0.572 -3.31,-1.48l-1.9,-3.02 1.61,-2.57c0.814,-1.13 2.14,-1.85 3.65,-1.84z"
+      android:strokeAlpha="0.2"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="m28,5.53c-1.62,0.155 -3.25,0.303 -4.87,0.46 -0.304,0.172 -0.34,0.681 -0.082,1.14 0.258,0.456 0.714,0.688 1.02,0.518l1.9,-0.179 -1.52,3.09c-0.621,-0.209 -1.28,-0.326 -1.97,-0.331 -2.17,-0.015 -4.09,1.07 -5.25,2.73l-1.13,1.8 -1.13,-1.8 -0.001,0.001c-1.16,-1.66 -3.08,-2.74 -5.25,-2.73 -3.49,0.024 -6.32,2.88 -6.3,6.37 0.014,3.11 2.3,5.71 5.27,6.22v1.54h-2.09v0.001c-0.002,-0 -0.004,-0 -0.006,-0.001 -0.454,0.004 -0.821,0.457 -0.819,1.01 0.002,0.555 0.371,1 0.824,1h2.09l0.001,2.25c0.003,0.556 0.451,1 1,1 0.552,-0.001 0.996,-0.452 0.998,-1.01 0.001,-0.75 0.001,-1.5 0.001,-2.25h2.1c0.524,-0.001 0.822,-0.543 0.822,-1.02 -0.004,-0.553 -0.372,-0.998 -0.824,-0.998v-0.001h-2.09v-1.51c2,-0.269 3.24,-1.38 3.99,-2.3l1.42,-2.26 1.42,2.26c0.866,1.04 2.36,2.35 4.9,2.36 3.49,0.008 6.34,-2.83 6.36,-6.32 0.01,-2.11 -1.02,-3.99 -2.61,-5.15l1.54,-3.14c0.336,0.539 0.682,1.07 1.01,1.61 0.045,0.348 0.505,0.576 1.03,0.51 0.524,-0.066 0.913,-0.402 0.871,-0.75zM9.7,12.12c1.5,-0.01 2.83,0.716 3.65,1.84l1.61,2.57 -1.9,3.02c-0.812,0.906 -1.99,1.47 -3.31,1.48 -2.47,0.005 -4.46,-1.97 -4.47,-4.44 -0.011,-2.47 1.96,-4.46 4.43,-4.48zM22.4,12.12c2.47,0.017 4.44,2.01 4.43,4.48 -0.011,2.47 -2,4.44 -4.47,4.44 -1.32,-0.003 -2.5,-0.572 -3.31,-1.48l-1.9,-3.02 1.61,-2.57c0.814,-1.13 2.14,-1.85 3.65,-1.84z"
+      android:fillColor="#fff"/>
+</vector>

app/src/main/res/drawable/ic_quest_lgbtq.xml

@@ -0,0 +1,61 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="33.9"
+    android:viewportHeight="33.9">
+  <path
+      android:pathData="m33.9,16.9c0,9.35 -7.58,16.9 -16.9,16.9 -9.35,0 -16.9,-7.58 -16.9,-16.9 0,-9.35 7.58,-16.9 16.9,-16.9 9.35,0 16.9,7.58 16.9,16.9"
+      android:fillColor="#e9a76f"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m10.5,7.39c-3.95,2.12 -6.35,5.87 -6.36,9.91 -0.008,4.04 2.38,7.82 6.32,9.98l5.04,-6.96 6.48,5.81 6.99,-6.34c2.18,-1.8 3.3,-5.71 0.311,-8.65 -3.66,-3.6 -7.06,0.62 -7.42,0.877 -0.365,-0.817 -4.25,-4.26 -7.67,-0.49 -0.165,0.182 -0.313,0.366 -0.449,0.549l-3.25,-4.7z"
+      android:strokeAlpha="0.2"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="m5.72,10.9c-0.48,0.749 -0.797,1.47 -1.05,2.27l2.29,3.3 -2.28,3.06c0.25,0.771 0.59,1.52 1.01,2.23l3.9,-5.22z"
+      android:strokeWidth=".265"
+      android:fillColor="#f4cecd"
+      android:strokeColor="#f4cecd"/>
+  <path
+      android:pathData="m4.67,13.2c-0.127,0.352 -1.05,3.11 0.011,6.36l2.28,-3.06z"
+      android:strokeWidth=".265"
+      android:fillColor="#fff"
+      android:strokeColor="#fff"/>
+  <path
+      android:pathData="m7.03,9.16c-0.632,0.7 -0.967,1.2 -1.31,1.74l3.88,5.65 -3.9,5.21a13.5,11.7 0.945,0 0,1.29 1.77l5.18,-6.97z"
+      android:strokeWidth=".265"
+      android:fillColor="#d3e8fd"
+      android:strokeColor="#d3e8fd"/>
+  <path
+      android:pathData="m8.68,7.6c-0.701,0.473 -1.48,1.35 -1.65,1.56l5.13,7.4 -5.18,6.97c0.504,0.562 1.07,1.08 1.68,1.56l6.31,-8.47z"
+      android:strokeWidth=".265"
+      android:fillColor="#6e553a"
+      android:strokeColor="#6e553a"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m10.5,6.44c-0.617,0.306 -1.19,0.683 -1.81,1.16l6.29,9.01 -6.31,8.47c0.238,0.187 1.14,0.876 1.78,1.14 2.41,-3.19 4.73,-6.44 7.08,-9.68z"
+      android:strokeWidth=".265"
+      android:strokeColor="#000"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m12.9,13.7c-0.584,1.76 -0.086,3.44 0.734,4.69l1.31,-1.76 -2.05,-2.93z"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="m13.4,11.5c-0.725,1.18 -0.892,2.37 -0.728,3.45h18.3c0.147,-1.12 -0.034,-2.32 -0.683,-3.45z"
+      android:fillColor="#f1b014"/>
+  <path
+      android:pathData="m26,8.65c-2.22,0.094 -3.91,2.14 -4.15,2.32 -0.129,-0.09 -1.47,-2.34 -4.33,-2.28 -1.21,0.025 -2.43,0.718 -3.15,1.43 -0.513,0.511 -0.916,1.26 -1.11,1.65h17.2c-0.29,-0.578 -0.695,-1.14 -1.24,-1.68 -1.14,-1.12 -2.26,-1.49 -3.27,-1.44z"
+      android:fillColor="#c84747"/>
+  <path
+      android:pathData="m12.6,14.5c0.101,1.51 0.872,2.85 1.73,3.75h15.1c0.905,-0.964 1.54,-2.3 1.62,-3.75z"
+      android:fillColor="#fd5"/>
+  <path
+      android:pathData="m13.5,17.2c0.395,0.633 0.871,1.17 1.34,1.55l1.79,1.6h10.5l1.77,-1.6c0.504,-0.416 0.946,-0.948 1.3,-1.55z"
+      android:fillColor="#5cae32"/>
+  <path
+      android:pathData="m18.7,22.2 l3.24,2.9 3.2,-2.9z"
+      android:fillColor="#269"/>
+  <path
+      android:pathData="m16.1,19.9 l3.13,2.81h5.35l3.1,-2.81z"
+      android:fillColor="#3b88c3"/>
+</vector>

app/src/main/res/drawable/ic_quest_trans.xml

@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="33.9"
+    android:viewportHeight="33.9">
+  <path
+      android:pathData="m33.9,16.9c0,9.35 -7.58,16.9 -16.9,16.9 -9.35,0 -16.9,-7.58 -16.9,-16.9 0,-9.35 7.58,-16.9 16.9,-16.9 9.35,0 16.9,7.58 16.9,16.9"
+      android:fillColor="#e9a76f"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m21.1,5.83c-0.352,0.034 -0.596,0.497 -0.546,1.03 0.05,0.537 0.376,0.946 0.728,0.914 0.613,0.134 1.86,0.454 2.64,0.645l-3.4,3.41c-1,-0.717 -2.23,-1.14 -3.55,-1.13 -1.29,0.009 -2.49,0.427 -3.47,1.13l-0.669,-0.669 0.887,-0.887 -0.002,-0.002c0.185,-0.171 0.29,-0.411 0.29,-0.662l0,-0.008c-0.005,-0.5 -0.413,-0.901 -0.913,-0.898 -0.249,0.002 -0.487,0.107 -0.656,0.29l-0.889,0.886 -1.47,-1.47 1.94,-0.463c0.358,0.065 0.729,-0.316 0.83,-0.854 0.101,-0.537 -0.106,-1.03 -0.463,-1.1 -1.65,0.392 -3.31,0.789 -4.96,1.18l-1.19,4.99c0.075,0.358 0.573,0.558 1.11,0.447 0.539,-0.111 0.916,-0.491 0.843,-0.849l-0.001,-0.006 0.458,-1.93 1.48,1.48 -0.904,0.904 0.001,0.001c-0.185,0.172 -0.29,0.414 -0.289,0.667 0.002,0.5 0.408,0.903 0.908,0.902 0.251,-0.001 0.489,-0.106 0.66,-0.29l0.003,0.003 0.904,-0.904 0.669,0.669c-0.714,0.999 -1.13,2.22 -1.13,3.54 0.014,2.98 2.26,5.59 4.84,5.95l0,1.35h-2.56l0,0.001c-0.002,-0 -0.004,-0 -0.007,-0 -0.556,0.004 -1,0.457 -1,1.01 0.002,0.555 0.453,1 1.01,1 0.853,0 1.71,0 2.56,0l0.001,2.25c0.003,0.556 0.552,1 1.23,1 0.675,-0.001 1.22,-0.452 1.22,-1.01 0,-0.75 0,-1.5 0,-2.25 0.854,0 1.71,-0 2.56,0 0.556,-0.001 1.01,-0.452 1.01,-1.01l-0,-0.009c-0.005,-0.553 -0.455,-0.998 -1.01,-0.998l-0,-0.001 -2.56,-0v-1.35c2.77,-0.385 4.84,-2.99 4.84,-5.98l-0,-0.004c-0,-0.847 -0.185,-2.18 -1.13,-3.5l3.44,-3.44c0.199,0.859 0.412,1.72 0.606,2.58 -0.082,0.358 0.289,0.747 0.827,0.871 0.537,0.123 1.04,-0.066 1.12,-0.422 -0.446,-1.89 -0.892,-3.78 -1.34,-5.67 -1.83,-0.446 -3.67,-0.901 -5.5,-1.34zM16.98,12.96c2.51,-0.017 3.83,2.12 3.83,3.81 -0.003,2.1 -1.69,3.79 -3.79,3.8 -2.11,0.005 -3.8,-1.68 -3.81,-3.78 -0.01,-2.11 1.67,-3.8 3.78,-3.82z"
+      android:strokeAlpha="0.2"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="m21.1,4.77c-0.352,0.034 -0.596,0.497 -0.546,1.03 0.05,0.537 0.376,0.946 0.728,0.914 0.613,0.134 1.86,0.454 2.64,0.645l-3.4,3.41c-1,-0.717 -2.23,-1.14 -3.55,-1.13 -1.29,0.009 -2.49,0.427 -3.47,1.13l-0.669,-0.669 0.887,-0.887 -0.002,-0.003c0.185,-0.171 0.29,-0.411 0.29,-0.662l0,-0.008c-0.005,-0.5 -0.413,-0.901 -0.913,-0.898 -0.249,0.002 -0.487,0.107 -0.656,0.29l-0.889,0.886 -1.47,-1.47 1.94,-0.463c0.358,0.065 0.729,-0.316 0.83,-0.854 0.101,-0.537 -0.106,-1.03 -0.463,-1.1 -1.65,0.392 -3.31,0.789 -4.96,1.18l-1.19,4.99c0.075,0.358 0.573,0.558 1.11,0.447 0.539,-0.111 0.916,-0.491 0.843,-0.849l-0.001,-0.006 0.458,-1.93 1.48,1.48 -0.904,0.904 0.001,0.001c-0.185,0.172 -0.29,0.414 -0.289,0.667 0.002,0.5 0.408,0.903 0.908,0.902 0.251,-0.001 0.489,-0.106 0.66,-0.29l0.003,0.003 0.904,-0.904 0.669,0.669c-0.714,0.999 -1.13,2.22 -1.13,3.54 0.014,2.98 2.26,5.59 4.84,5.95l0,1.35h-2.56l0,0.001c-0.002,-0 -0.004,-0 -0.007,-0 -0.556,0.004 -1,0.457 -1,1.01 0.002,0.555 0.453,1 1.01,1 0.853,0 1.71,0 2.56,0l0.001,2.25c0.003,0.556 0.552,1 1.23,1 0.675,-0.001 1.22,-0.452 1.22,-1.01 0,-0.75 0,-1.5 0,-2.25 0.854,0 1.71,-0 2.56,0 0.556,-0.001 1.01,-0.452 1.01,-1.01l-0,-0.009c-0.005,-0.553 -0.455,-0.998 -1.01,-0.998l-0,-0.001 -2.56,-0v-1.35c2.77,-0.385 4.84,-2.99 4.84,-5.98l-0,-0.004c-0,-0.847 -0.185,-2.18 -1.13,-3.5l3.44,-3.44c0.199,0.859 0.412,1.72 0.606,2.58 -0.082,0.358 0.289,0.747 0.827,0.871 0.537,0.123 1.04,-0.066 1.12,-0.422 -0.446,-1.89 -0.892,-3.78 -1.34,-5.67 -1.83,-0.446 -3.67,-0.901 -5.5,-1.34zM16.98,11.9c2.51,-0.017 3.83,2.12 3.83,3.81 -0.003,2.1 -1.69,3.79 -3.79,3.8 -2.11,0.005 -3.8,-1.68 -3.81,-3.78 -0.01,-2.11 1.67,-3.8 3.78,-3.82z"
+      android:fillColor="#269"/>
+</vector>

app/src/main/res/values/strings.xml

@@ -1114,7 +1114,7 @@ If any lanes are reserved for buses, please leave a note instead."</string>
 
     <string name="quest_lgbtq_signed">Is there signage displaying its relation to LGBTQ people?</string>
 
-    <string name="quest_lgbtq_access">What is this places relation to LGBTQ people?</string>
+    <string name="quest_lgbtq_access">What is this place’s relation to LGBTQ people?</string>
     <string name="quest_lgbtq_access_no">banned</string>
     <string name="quest_lgbtq_access_welcome">explicitly welcome</string>
     <string name="quest_lgbtq_access_primary">target audience</string>
@@ -1128,7 +1128,7 @@ If any lanes are reserved for buses, please leave a note instead."</string>
     <string name="quest_lgbtq_gender_specialization_non_binary">Non Binary People</string>
     <string name="quest_lgbtq_gender_specialization_none">All Groups</string>
 
-    <string name="quest_lgbtq_transgender_specialization">Does this venue cater to specifically to trans people?</string>
+    <string name="quest_lgbtq_transgender_specialization">Does this venue cater specifically to trans people?</string>
     <string name="quest_lgbtq_transgender_specialization_banned">Transgender people are banned</string>
 
     <string name="quest_level_title2">On which level number is this place located?</string>

res/graphics/authors.txt

@@ -332,6 +332,7 @@ quest/
     footway_surface.svg
     footway_surface_detail.svg
     fuel.svg
+    gender.svg                       Flavia Telcean, License: CC-BY-SA 4.0
     hairdresser.svg                  modified from scissors.svg by Matija Nalis (CC0 for modifications)
     housenumber.svg
     housenumber_street.svg
@@ -344,6 +345,7 @@ quest/
     laundry.svg
     leaf.svg
     level.svg
+    lgbtq.svg                        Flavia Telcean, License: CC-BY-SA 4.0, traced from https://wiki.openstreetmap.org/wiki/File:AllPeopleSticker.jpg
     mail.svg
     mail_ref.svg
     max_width.svg
@@ -432,6 +434,7 @@ quest/
     toilets_wheelchair.svg
     tractor.svg
     traffic_lights.svg
+    trans.svg                       Flavia Telcean, License: CC-BY-SA 4.0, based on https://commons.wikimedia.org/wiki/File:Gender_sign_(bold).svg
     via_ferrata_scale.svg           https://www.svgrepo.com/svg/137349/climbing (CC0) and based on way_surface.svg
     way_surface.svg
     way_surface_detail.svg          Tobias Zwick (CC-BY-SA 4.0) (based on street_surface_detail.svg), recoloured background by Flo Edelmann
@@ -712,4 +715,4 @@ overlay.svg
    map_type_topo.jpg                           modified from https://wiki.openstreetmap.org/wiki/File:Tule_Lake_USGS_topo_map.png, License: Public Domain
    map_type_street.jpg                         Map style: MapOSMatic printable style (c) MapOSMatic developers, Data source: (c) 2023 OpenStreetMap.org and contributors (http://osm.org/copyright)
    map_type_scheme.jpg                         modified from https://wiki.openstreetmap.org/wiki/File:Tadapani-28-Wanderkarte-2013-gje.jpg, License: CC-BY-SA 4.0
-   map_type_toposcope.jpg                      modified from https://wiki.openstreetmap.org/wiki/File:Melshornet03112006GunnarHeltne.jpg, License: CC-BY-SA 4.0
+   map_type_toposcope.jpg                      modified from https://wiki.openstreetmap.org/wiki/File:Melshornet03112006GunnarHeltne.jpg, License: CC-BY-SA 4.0