Skip to content

Commit

Permalink
add icon for toilet fee (and change icon for parking fee) (fixes #843)
Browse files Browse the repository at this point in the history
  • Loading branch information
@westnordost
westnordost committed Feb 8, 2018
1 parent ff5e226 commit 598c173
Show file tree
Hide file tree
Showing 4 changed files with 700 additions and 55 deletions.
2 changes: 1 addition & 1 deletion app/src/main/java/de/westnordost/streetcomplete/quests/toilets_fee/AddToiletsFee.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public void applyAnswerTo(Bundle answer, StringMapChangesBuilder changes)
}

@Override public String getCommitMessage() { return "Add toilets fee"; }
@Override public int getIcon() { return R.drawable.ic_quest_toilets; }
@Override public int getIcon() { return R.drawable.ic_quest_toilet_fee; }
@Override public int getTitle(@NonNull Map<String, String> tags)
{
return R.string.quest_toiletsFee_title;
Expand Down
60 changes: 39 additions & 21 deletions app/src/main/res/drawable/ic_quest_parking_fee.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,39 +5,57 @@
android:viewportHeight="128.0">
<path
android:pathData="M119.44,95.99C101.76,126.6 62.62,137.09 32.01,119.42 1.4,101.74 -9.09,62.6 8.58,31.99 26.26,1.38 65.4,-9.11 96.01,8.56 126.62,26.24 137.11,65.38 119.44,95.99"
android:fillColor="#ffdd55"/>
android:fillAlpha="1"
android:fillColor="#ffdd55"
android:strokeWidth="0.2"/>
<path
android:pathData="M35.91,27.99L90.96,27.99A8.47,8.47 0,0 1,99.44 36.46L99.44,99.52A8.47,8.47 0,0 1,90.96 107.99L35.91,107.99A8.47,8.47 0,0 1,27.44 99.52L27.44,36.46A8.47,8.47 0,0 1,35.91 27.99z"
android:strokeColor="#000"
android:strokeLineCap="butt"
android:fillAlpha="1"
android:strokeColor="#000000"
android:fillColor="#00000000"
android:strokeWidth="8"
android:strokeLineJoin="miter"
android:strokeAlpha="0.2"/>
<path
android:pathData="M35.91,23.99L90.96,23.99A8.47,8.47 0,0 1,99.44 32.46L99.44,95.52A8.47,8.47 0,0 1,90.96 103.99L35.91,103.99A8.47,8.47 0,0 1,27.44 95.52L27.44,32.46A8.47,8.47 0,0 1,35.91 23.99z"
android:strokeLineCap="butt"
android:fillAlpha="1"
android:strokeColor="#ffffff"
android:fillColor="#495aad"
android:strokeWidth="8"/>
android:strokeWidth="8"
android:strokeLineJoin="miter"
android:strokeAlpha="0.98994978"/>
<path
android:pathData="m51.44,83.99 l0,-40 12,0c0,0 12,-0 12,12 0,12 -12,12 -12,12l-12,-0"
android:strokeColor="#fff"
android:strokeLineCap="square"
android:strokeWidth="8"/>
android:fillType="evenOdd"
android:strokeColor="#ffffff"
android:fillColor="#00000000"
android:strokeWidth="8"
android:strokeLineJoin="miter"
android:strokeAlpha="1"/>
<path
android:pathData="m93.15,60.22c-11.6,17.1 -27.38,31.57 -46.15,42.21 7.53,6.82 15.07,13.75 22.6,20.68 18.77,-10.64 34.55,-25.11 46.15,-42.21 -7.53,-6.93 -15.06,-13.75 -22.6,-20.68z"
android:pathData="m81.98,70.16a24,24 0,0 0,-24 24,24 24,0 0,0 24,24 24,24 0,0 0,24 -24,24 24,0 0,0 -24,-24z"
android:strokeLineCap="round"
android:fillAlpha="0.2"
android:fillColor="#000000"/>
<path
android:pathData="M69.59,119.11C62.06,112.18 54.53,105.24 46.99,98.43 65.77,87.79 81.55,73.32 93.15,56.22c7.53,6.93 15.07,13.75 22.6,20.69 -11.6,17.1 -27.38,31.57 -46.15,42.21"
android:fillColor="#83bf4f"/>
<path
android:pathData="m67.68,114.57c-5.02,-4.54 -10.04,-9.21 -15.07,-13.75 0.36,-0.24 0.6,-0.36 0.96,-0.6 0.96,-0.6 1.2,-1.67 0.36,-2.51 -0.24,-0.24 -0.48,-0.48 -0.72,-0.72 15.18,-9.33 28.34,-21.28 38.62,-35.15 0.24,0.24 0.48,0.48 0.72,0.72 0.84,0.72 2.03,0.6 2.75,-0.24 0.24,-0.24 0.36,-0.6 0.6,-0.84 5.02,4.54 10.04,9.21 15.07,13.75 -0.24,0.24 -0.36,0.6 -0.6,0.84 -0.72,0.96 -0.6,2.27 0.24,3.11 0.24,0.24 0.48,0.48 0.72,0.72 -10.28,13.75 -23.44,25.71 -38.62,35.03 -0.24,-0.24 -0.48,-0.48 -0.72,-0.72 -0.84,-0.72 -2.27,-0.84 -3.35,-0.24 -0.36,0.24 -0.6,0.36 -0.96,0.6M55.84,100.94c4.07,3.71 8.13,7.41 12.32,11.24 1.55,-0.48 3.35,-0.36 4.78,0.36 13.87,-8.85 25.95,-19.85 35.63,-32.64 -0.84,-1.32 -0.96,-2.99 -0.36,-4.42 -4.07,-3.71 -8.13,-7.41 -12.32,-11.24 -1.08,0.96 -2.63,1.08 -3.95,0.36 -9.68,12.91 -21.76,23.91 -35.63,32.76 0.72,1.2 0.6,2.63 -0.48,3.59"
android:fillColor="#699635"/>
<path
android:pathData="m66.72,98.43c1.32,-0.48 2.75,-0.36 3.71,0.48 -0.6,0.48 -1.32,0.96 -1.91,1.43 -0.24,-0.24 -0.84,-0.24 -1.08,0 -0.36,0.24 -0.48,0.6 -0.12,0.84 0.24,0.24 0.84,0.24 1.2,0 1.43,-0.96 3.47,-1.08 4.54,0 0.84,0.84 0.96,2.03 0.12,2.99 0.24,0.24 0.48,0.36 0.72,0.6 -0.6,0.36 -1.2,0.84 -1.79,1.2 -0.24,-0.24 -0.48,-0.48 -0.72,-0.6 -1.32,0.36 -2.75,0.24 -3.59,-0.6 0.72,-0.48 1.32,-0.84 2.03,-1.32 0.24,0.24 0.84,0.24 1.2,0 0.36,-0.24 0.36,-0.6 0.12,-0.84 -0.24,-0.24 -0.72,-0.24 -1.08,0 -0.84,0.6 -1.91,0.84 -2.87,0.72 -0.72,-0.12 -1.32,-0.36 -1.79,-0.72 -0.84,-0.84 -0.84,-1.91 -0.12,-2.87 -0.24,-0.12 -0.36,-0.36 -0.6,-0.6 0.6,-0.36 1.2,-0.84 1.79,-1.2 -0.12,0.12 0.12,0.24 0.24,0.48"
android:fillColor="#699635"/>
<path
android:pathData="m94.46,72.84c1.08,-0.72 2.39,-0.72 3.23,0.12 -0.48,0.6 -0.96,1.2 -1.43,1.79 -0.24,-0.24 -0.72,-0.24 -0.96,0.12 -0.24,0.36 -0.24,0.84 0,1.08 0.24,0.24 0.72,0.24 0.96,-0.12 1.08,-1.32 2.87,-1.55 3.95,-0.6 0.84,0.84 1.08,2.15 0.6,3.35 0.24,0.24 0.48,0.36 0.72,0.6 -0.48,0.6 -0.84,1.08 -1.32,1.67 -0.24,-0.24 -0.48,-0.48 -0.72,-0.6 -1.08,0.6 -2.27,0.6 -3.11,-0.24 0.48,-0.6 1.08,-1.2 1.55,-1.79 0.24,0.24 0.72,0.24 0.96,-0.12 0.24,-0.36 0.24,-0.84 0,-1.08 -0.24,-0.24 -0.72,-0.24 -0.96,0.12 -0.6,0.72 -1.55,1.2 -2.39,1.2 -0.6,0 -1.2,-0.24 -1.67,-0.6 -0.84,-0.84 -1.08,-2.03 -0.6,-3.23 -0.24,-0.12 -0.36,-0.36 -0.6,-0.6 0.48,-0.48 0.96,-1.08 1.32,-1.67 0,0.24 0.24,0.36 0.48,0.6"
android:fillColor="#699635"/>
android:strokeColor="#000000"
android:fillColor="#00000000"
android:strokeWidth="4"
android:strokeLineJoin="round"
android:strokeAlpha="0.2"/>
<path
android:pathData="m90.87,96.28c-3.83,3.47 -10.28,3.35 -13.99,0 -3.71,-3.47 -3.47,-8.85 0.36,-12.32 3.83,-3.47 9.8,-3.83 13.51,-0.36 3.83,3.35 3.95,9.21 0.12,12.67"
android:fillColor="#699635"/>
android:pathData="M81.98,90.16m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"
android:strokeLineCap="round"
android:fillAlpha="1"
android:strokeColor="#a6a6a6"
android:fillColor="#dbdbdb"
android:strokeWidth="4"
android:strokeLineJoin="round"
android:strokeAlpha="1"/>
<path
android:pathData="m78.98,73.16v2.91c-1.53,0.35 -2.85,0.99 -3.95,1.92 -1.97,1.66 -2.95,3.81 -2.95,6.47 0,1.89 0.44,3.4 1.31,4.53 0.88,1.14 1.98,1.98 3.33,2.53 1.35,0.54 3.05,1.03 5.09,1.45 1.58,0.35 2.79,0.71 3.61,1.08 0.83,0.36 1.25,1.05 1.25,2.05 0,1.04 -0.44,1.8 -1.31,2.27 -0.88,0.46 -1.89,0.69 -3.03,0.69 -3.11,0 -5.04,-1.3 -5.77,-3.91l-5.95,1.41c0.58,2.55 1.89,4.46 3.92,5.73 1.32,0.82 2.81,1.37 4.45,1.66v3.22h6v-3.25c1.93,-0.34 3.55,-0.99 4.83,-1.98 2.26,-1.77 3.39,-4.07 3.39,-6.91 0,-2.78 -1.19,-4.96 -3.58,-6.53 -0.85,-0.58 -1.75,-1.01 -2.69,-1.27 -0.93,-0.26 -2.44,-0.63 -4.55,-1.09 -2.69,-0.45 -4.03,-1.37 -4.03,-2.77 0,-1.75 1.28,-2.63 3.84,-2.63 2.42,0 4.02,1.09 4.8,3.27l5.44,-1.78C91.23,78.75 88.75,76.68 84.98,76v-2.85z"
android:fillAlpha="1"
android:strokeColor="#00000000"
android:fillColor="#a6a6a6"/>
</vector>
126 changes: 126 additions & 0 deletions app/src/main/res/drawable/ic_quest_toilet_fee.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="128dp"
android:height="128dp"
android:viewportWidth="128.0"
android:viewportHeight="128.0">
<path
android:pathData="m128,64c0,35.35 -28.65,64 -64,64 -35.35,0 -64,-28.65 -64,-64C0,28.65 28.65,-0 64,-0c35.35,0 64,28.65 64,64"
android:fillAlpha="1"
android:fillColor="#9bbe55"
android:strokeWidth="0.2"/>
<path
android:pathData="m28.77,46.08c-4.27,0 -7.7,2.59 -9.85,5.56 -2.15,2.97 -3.45,6.46 -4.41,9.85 -1.92,6.77 -2.3,13.34 -2.3,13.34 -0.4,5.38 7.71,5.89 7.98,0.5 0,0 0.4,-5.94 2.02,-11.66 0.91,-2.85 1.99,-5.64 3.63,-7.86l-3.64,47.28c-0.08,5.41 8.08,5.41 8,0l2,-24h4l2,24c-0.08,5.41 8.08,5.41 8,0L42.57,55.81c1.75,2.37 2.93,5.44 3.63,7.86 1.62,5.73 2.02,11.66 2.02,11.66 0.28,5.39 8.39,4.88 7.98,-0.5 0,0 -0.39,-6.56 -2.3,-13.34 -0.96,-3.39 -2.27,-6.88 -4.41,-9.85 -2.15,-2.97 -5.58,-5.56 -9.85,-5.56 -3.69,1.38 -7.31,1.29 -10.86,0z"
android:strokeLineCap="round"
android:fillAlpha="0.2"
android:fillType="evenOdd"
android:strokeColor="#00000000"
android:fillColor="#000000"
android:strokeWidth="8"
android:strokeLineJoin="miter"
android:strokeAlpha="1"/>
<path
android:pathData="m33.96,27.08c-4.44,0 -8.03,3.6 -8.03,8.03 0,4.44 3.6,8.03 8.03,8.03 4.44,0 8.03,-3.6 8.03,-8.03 0,-4.44 -3.6,-8.03 -8.03,-8.03z"
android:fillAlpha="0.2"
android:fillType="nonZero"
android:strokeColor="#00000000"
android:fillColor="#000000"
android:strokeWidth="5.13517237"
android:strokeAlpha="1"/>
<path
android:pathData="m90.2,46.08c-2.83,0 -5.15,2.42 -6.87,3.98 -4.58,3.77 -4.81,10.96 -9.63,14.36 -4.56,2.93 -0.02,9.73 4.44,6.66 5.16,-3.62 5.85,-9.74 9.6,-14.07 0.16,11.06 -9.36,20.46 -9.54,30.07 0,2.21 1.79,4 4,4h2.92l-0.92,12c-0.08,5.41 8.08,5.41 8,0v-12h4v12c-0.08,5.41 8.08,5.41 8,0l-0.92,-12h2.92c2.21,-0 4,-1.79 4,-4 -1.45,-11.04 -8.74,-20.1 -9.55,-30.13 3.96,4.45 5.2,11.19 9.45,14.13 4.46,3.08 8.99,-3.72 4.44,-6.66 -4.79,-4.2 -5.12,-10.41 -9.46,-14.38 -1.73,-1.56 -4.04,-3.96 -6.88,-3.96 -3.66,1.79 -5.77,0.78 -8,0z"
android:strokeLineCap="round"
android:fillAlpha="0.2"
android:fillType="evenOdd"
android:strokeColor="#00000000"
android:fillColor="#000000"
android:strokeWidth="8"
android:strokeLineJoin="miter"
android:strokeAlpha="1"/>
<path
android:pathData="m94.2,27.08c-4.44,0 -8.03,3.6 -8.03,8.03 0,4.44 3.6,8.03 8.03,8.03 4.44,0 8.03,-3.6 8.03,-8.03 0,-4.44 -3.6,-8.03 -8.03,-8.03z"
android:fillAlpha="0.2"
android:fillType="nonZero"
android:strokeColor="#00000000"
android:fillColor="#000000"
android:strokeWidth="5.13517237"
android:strokeAlpha="1"/>
<path
android:pathData="m64.16,8.04a3,3 0,0 0,-2.96 3.04v112a3,3 0,1 0,6 0v-112A3,3 0,0 0,64.16 8.04Z"
android:strokeLineCap="round"
android:fillAlpha="0.2"
android:fillType="evenOdd"
android:strokeColor="#00000000"
android:fillColor="#000000"
android:strokeWidth="6"
android:strokeLineJoin="miter"
android:strokeAlpha="1"/>
<path
android:pathData="m28.82,42.1c-4.27,0 -7.7,2.59 -9.85,5.56 -2.15,2.97 -3.45,6.46 -4.41,9.85 -1.92,6.77 -2.3,13.34 -2.3,13.34 -0.4,5.38 7.71,5.89 7.98,0.5 0,0 0.4,-5.94 2.02,-11.66 0.91,-2.85 1.99,-5.64 3.63,-7.86L22.25,99.1c-0.08,5.41 8.08,5.41 8,0l2,-24h4l2,24c-0.08,5.41 8.08,5.41 8,0L42.61,51.82c1.75,2.37 2.93,5.44 3.63,7.86 1.62,5.73 2.02,11.66 2.02,11.66 0.28,5.39 8.39,4.88 7.98,-0.5 0,0 -0.39,-6.56 -2.3,-13.34 -0.96,-3.39 -2.27,-6.88 -4.41,-9.85 -2.15,-2.97 -5.58,-5.56 -9.85,-5.56 -3.69,1.38 -7.31,1.29 -10.86,0z"
android:strokeLineCap="round"
android:fillAlpha="1"
android:fillType="evenOdd"
android:strokeColor="#00000000"
android:fillColor="#ffffff"
android:strokeWidth="8"
android:strokeLineJoin="miter"
android:strokeAlpha="1"/>
<path
android:pathData="m34.01,23.1c-4.44,0 -8.03,3.6 -8.03,8.03 0,4.44 3.6,8.03 8.03,8.03 4.44,0 8.03,-3.6 8.03,-8.03 0,-4.44 -3.6,-8.03 -8.03,-8.03z"
android:fillAlpha="1"
android:fillType="nonZero"
android:strokeColor="#00000000"
android:fillColor="#ffffff"
android:strokeWidth="5.13517237"
android:strokeAlpha="1"/>
<path
android:pathData="m90.25,42.1c-2.83,0 -5.15,2.42 -6.87,3.98 -4.58,3.77 -4.81,10.96 -9.63,14.36 -4.56,2.93 -0.02,9.73 4.44,6.66 5.16,-3.62 5.85,-9.74 9.6,-14.07 0.16,11.06 -9.36,20.46 -9.54,30.07 0,2.21 1.79,4 4,4h2.92l-0.92,12c-0.08,5.41 8.08,5.41 8,0v-12h4v12c-0.08,5.41 8.08,5.41 8,0l-0.92,-12h2.92c2.21,-0 4,-1.79 4,-4 -1.45,-11.04 -8.74,-20.1 -9.55,-30.13 3.96,4.45 5.2,11.19 9.45,14.13 4.46,3.08 8.99,-3.72 4.44,-6.66 -4.79,-4.2 -5.12,-10.41 -9.46,-14.38 -1.73,-1.56 -4.04,-3.96 -6.88,-3.96 -3.66,1.79 -5.77,0.78 -8,0z"
android:strokeLineCap="round"
android:fillAlpha="1"
android:fillType="evenOdd"
android:strokeColor="#00000000"
android:fillColor="#ffffff"
android:strokeWidth="8"
android:strokeLineJoin="miter"
android:strokeAlpha="1"/>
<path
android:pathData="m94.25,23.1c-4.44,0 -8.03,3.6 -8.03,8.03 0,4.44 3.6,8.03 8.03,8.03 4.44,0 8.03,-3.6 8.03,-8.03 0,-4.44 -3.6,-8.03 -8.03,-8.03z"
android:fillAlpha="1"
android:fillType="nonZero"
android:strokeColor="#00000000"
android:fillColor="#ffffff"
android:strokeWidth="5.13517237"
android:strokeAlpha="1"/>
<path
android:pathData="M64.2,4.05A3,3 0,0 0,61.25 7.1v112a3,3 0,1 0,6 0v-112A3,3 0,0 0,64.2 4.05Z"
android:strokeLineCap="round"
android:fillAlpha="1"
android:fillType="evenOdd"
android:strokeColor="#00000000"
android:fillColor="#ffffff"
android:strokeWidth="6"
android:strokeLineJoin="miter"
android:strokeAlpha="1"/>
<path
android:pathData="m82.13,70.25a24,24 0,0 0,-24 24,24 24,0 0,0 24,24 24,24 0,0 0,24 -24,24 24,0 0,0 -24,-24z"
android:strokeLineCap="round"
android:fillAlpha="0.2"
android:strokeColor="#000000"
android:fillColor="#00000000"
android:strokeWidth="4"
android:strokeLineJoin="round"
android:strokeAlpha="0.2"/>
<path
android:pathData="M82.13,90.25m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"
android:strokeLineCap="round"
android:fillAlpha="1"
android:strokeColor="#a6a6a6"
android:fillColor="#dbdbdb"
android:strokeWidth="4"
android:strokeLineJoin="round"
android:strokeAlpha="1"/>
<path
android:pathData="m79.13,72v4.16c-1.53,0.35 -2.85,0.99 -3.95,1.92 -1.97,1.66 -2.95,3.81 -2.95,6.47 0,1.89 0.44,3.4 1.31,4.53 0.88,1.14 1.98,1.98 3.33,2.53 1.35,0.54 3.05,1.03 5.09,1.45 1.58,0.35 2.79,0.71 3.61,1.08 0.83,0.36 1.25,1.05 1.25,2.05 0,1.04 -0.44,1.8 -1.31,2.27 -0.88,0.46 -1.89,0.69 -3.03,0.69 -3.11,0 -5.04,-1.3 -5.77,-3.91L70.75,96.64c0.58,2.55 1.89,4.46 3.92,5.73 1.32,0.82 2.81,1.37 4.45,1.66v3.22h6V104c1.93,-0.34 3.55,-0.99 4.83,-1.98 2.26,-1.77 3.39,-4.07 3.39,-6.91 0,-2.78 -1.19,-4.96 -3.58,-6.53 -0.85,-0.58 -1.75,-1.01 -2.69,-1.27 -0.93,-0.26 -2.44,-0.63 -4.55,-1.09C79.84,85.77 78.5,84.85 78.5,83.45c0,-1.75 1.28,-2.63 3.84,-2.63 2.42,0 4.02,1.09 4.8,3.27l5.44,-1.78C91.37,78.85 88.89,76.78 85.13,76.1V72Z"
android:fillAlpha="1"
android:strokeColor="#00000000"
android:fillColor="#a6a6a6"/>
</vector>
Loading

3 comments on commit 598c173

@rugk
Copy link
Contributor

@rugk rugk commented on 598c173 Feb 9, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, a grey coin?
grafik

Maybe you could at least make the $ yellow, but I see, you already have much yellow in the icons.

@westnordost
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you usually pay the parking vending machines with gold coins? :-P

@rugk
Copy link
Contributor

@rugk rugk commented on 598c173 Feb 9, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well… mhh, it does not really matter.

Please sign in to comment.