Skip to content

Commit

Permalink
[WIP] Add Boat Rental Quest
Browse files Browse the repository at this point in the history 
Resolves streetcomplete#5426.

Known issues - feedback required:
* Order in QuestModule
* Is this a RARE achievement (only 5.3k boat_rentals tagged today)
* Answer SVGs range from 0 to 100 in my view as to their fit (I love the floaty duckboat for "pedalboard" ;-)) Wouldn't CC0 images from wikidata the better idea?
  • Loading branch information
@kmpoppe
kmpoppe committed Jul 14, 2024
1 parent 406bc57 commit 1745590
Show file tree
Hide file tree
Showing 26 changed files with 382 additions and 0 deletions.
3 changes: 3 additions & 0 deletions app/src/main/java/de/westnordost/streetcomplete/quests/QuestsModule.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import de.westnordost.streetcomplete.quests.bike_rental_type.AddBikeRentalType
import de.westnordost.streetcomplete.quests.bike_shop.AddBikeRepairAvailability
import de.westnordost.streetcomplete.quests.bike_shop.AddSecondHandBicycleAvailability
import de.westnordost.streetcomplete.quests.board_type.AddBoardType
import de.westnordost.streetcomplete.quests.boat_rental.AddBoatRental
import de.westnordost.streetcomplete.quests.bollard_type.AddBollardType
import de.westnordost.streetcomplete.quests.bridge_structure.AddBridgeStructure
import de.westnordost.streetcomplete.quests.building_entrance.AddEntrance
Expand Down Expand Up @@ -427,6 +428,8 @@ fun questTypeRegistry(

/* ↓ 3.quests that may need some exploration / walking around --------------------------- */

170 to AddBoatRental(),

// ferry: usually visible from looking at the boat, but not always...
101 to AddFerryAccessPedestrian(),
102 to AddFerryAccessMotorVehicle(),
Expand Down
36 changes: 36 additions & 0 deletions app/src/main/java/de/westnordost/streetcomplete/quests/boat_rental/AddBoatRental.kt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package de.westnordost.streetcomplete.quests.boat_rental

import de.westnordost.streetcomplete.R
import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry
import de.westnordost.streetcomplete.data.osm.osmquests.OsmFilterQuestType
import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.OUTDOORS
import de.westnordost.streetcomplete.data.user.achievements.EditTypeAchievement.RARE
import de.westnordost.streetcomplete.osm.Tags

class AddBoatRental : OsmFilterQuestType<List<BoatRental>>() {

override val elementFilter = """
nodes, ways with
(
amenity = boat_rental
)
and ${ALL_RENTALS.joinToString(" and ") { "!$it" }}
"""
override val changesetComment = "Specify boat types for rental"
override val wikiLink = "Tag:amenity=boat_rental"
override val icon = R.drawable.ic_quest_boat_rental
override val achievements = listOf(OUTDOORS, RARE)

override fun getTitle(tags: Map<String, String>) = R.string.quest_boat_rental_title

override fun createForm() = AddBoatRentalForm()

override fun applyAnswerTo(answer: List<BoatRental>, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {
answer.forEach{ tags[it.osmValue] = "yes" }
}
}

private val ALL_RENTALS =
setOf("canoe_rental", "kayak_rental", "pedalboard_rental",
"motorboat_rental", "standup_paddleboard_rental", "sailboat_rental",
"jetski_rental", "houseboat_rental", "dinghy_rental")
23 changes: 23 additions & 0 deletions app/src/main/java/de/westnordost/streetcomplete/quests/boat_rental/AddBoatRentalForm.kt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package de.westnordost.streetcomplete.quests.boat_rental

import android.os.Bundle
import de.westnordost.streetcomplete.R
import de.westnordost.streetcomplete.quests.AImageListQuestForm

class AddBoatRentalForm : AImageListQuestForm<BoatRental, List<BoatRental>>() {

override val items = BoatRental.entries.map { it.asItem() }
override val itemsPerRow = 3

override val maxSelectableItems = -1
override val moveFavoritesToFront = false

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
imageSelector.cellLayoutId = R.layout.cell_icon_select_with_label_below
}

override fun onClickOk(selectedItems: List<BoatRental>) {
applyAnswer(selectedItems)
}
}
14 changes: 14 additions & 0 deletions app/src/main/java/de/westnordost/streetcomplete/quests/boat_rental/BoatRental.kt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package de.westnordost.streetcomplete.quests.boat_rental

// sorted by taginfo usages as per July 2024
enum class BoatRental(val osmValue: String) {
CANOE("canoe_rental"),
KAYAK("kayak_rental"),
PEDALBOARD("pedalboard_rental"),
MOTORBOAT("motorboat_rental"),
PADDLEBOARD("standup_paddleboard_rental"),
SAILBOAT("sailboat_rental"),
JETSKI("jetski_rental"),
HOUSEBOAT("houseboat_rental"),
DINGHY("dinghy_rental"),
}
38 changes: 38 additions & 0 deletions app/src/main/java/de/westnordost/streetcomplete/quests/boat_rental/BoatRentalItem.kt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package de.westnordost.streetcomplete.quests.boat_rental

import de.westnordost.streetcomplete.R
import de.westnordost.streetcomplete.quests.boat_rental.BoatRental.MOTORBOAT
import de.westnordost.streetcomplete.quests.boat_rental.BoatRental.HOUSEBOAT
import de.westnordost.streetcomplete.quests.boat_rental.BoatRental.PEDALBOARD
import de.westnordost.streetcomplete.quests.boat_rental.BoatRental.JETSKI
import de.westnordost.streetcomplete.quests.boat_rental.BoatRental.SAILBOAT
import de.westnordost.streetcomplete.quests.boat_rental.BoatRental.DINGHY
import de.westnordost.streetcomplete.quests.boat_rental.BoatRental.KAYAK
import de.westnordost.streetcomplete.quests.boat_rental.BoatRental.CANOE
import de.westnordost.streetcomplete.quests.boat_rental.BoatRental.PADDLEBOARD
import de.westnordost.streetcomplete.view.image_select.Item

fun BoatRental.asItem() = Item(this, iconResId, titleResId)

private val BoatRental.titleResId: Int get() = when (this) {
CANOE -> R.string.quest_boat_rental_canoe
KAYAK -> R.string.quest_boat_rental_kayak
PEDALBOARD -> R.string.quest_boat_rental_pedalboard
MOTORBOAT -> R.string.quest_boat_rental_motorboat
PADDLEBOARD -> R.string.quest_boat_rental_paddleboard
SAILBOAT -> R.string.quest_boat_rental_sailboat
JETSKI -> R.string.quest_boat_rental_jetski
HOUSEBOAT -> R.string.quest_boat_rental_houseboat
DINGHY -> R.string.quest_boat_rental_dinghy
}
private val BoatRental.iconResId: Int get() = when (this) {
CANOE -> R.drawable.ic_boat_rental_canoe
KAYAK -> R.drawable.ic_boat_rental_kayak
PEDALBOARD -> R.drawable.ic_boat_rental_pedalboard
MOTORBOAT -> R.drawable.ic_boat_rental_motorboat
PADDLEBOARD -> R.drawable.ic_boat_rental_standup_paddleboard
SAILBOAT -> R.drawable.ic_boat_rental_sailboat
JETSKI -> R.drawable.ic_boat_rental_jetski
HOUSEBOAT -> R.drawable.ic_boat_rental_houseboat
DINGHY -> R.drawable.ic_boat_rental_dinghy
}
15 changes: 15 additions & 0 deletions app/src/main/res/drawable/ic_boat_rental_canoe.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="128dp" android:viewportHeight="512" android:viewportWidth="512" android:width="128dp">

<path android:fillColor="#FF000000" android:pathData="m276.25,188.51 l-97.88,97.82h-91.73c-28.07,-0.7 -53.87,-15.6 -68.48,-39.59 -14.61,-23.98 -16.05,-53.74 -3.8,-79.01 12.25,-25.27 36.49,-42.59 64.36,-45.98 1.67,-0.17 3.31,0.46 4.43,1.71s1.58,2.95 1.23,4.59c-0.72,3.33 -1.07,6.73 -1.05,10.13 0.01,13.4 5.34,26.25 14.82,35.72 9.48,9.47 22.32,14.8 35.72,14.82z"/>

<group>

<clip-path android:pathData="m222,121h285.9v166h-285.9z"/>

<path android:fillColor="#FF000000" android:pathData="m507.9,203.78c-0.03,21.9 -8.74,42.88 -24.23,58.36 -15.49,15.48 -36.48,24.18 -58.38,24.19h-202.36l97.77,-97.82h57.41c13.4,-0.01 26.25,-5.34 35.72,-14.82 9.48,-9.48 14.81,-22.32 14.82,-35.72 -0,-3.4 -0.36,-6.8 -1.05,-10.13 -0.27,-1.6 0.22,-3.23 1.32,-4.42 1.1,-1.19 2.68,-1.8 4.29,-1.67 20.44,1.89 39.43,11.35 53.25,26.53 13.82,15.18 21.46,34.97 21.43,55.5z"/>

</group>

<path android:fillColor="#FF000000" android:pathData="m389.93,104.49 l-220,220 -5.25,32.43c-0.93,6.41 -3.87,12.37 -8.4,17l-33.59,33.59c-7.81,7.29 -18.85,9.98 -29.14,7.1 -10.28,-2.88 -18.32,-10.92 -21.2,-21.2 -2.88,-10.28 -0.19,-21.33 7.1,-29.14l33.59,-33.64c4.61,-4.6 10.57,-7.61 17,-8.61l32.38,-4.93 220.1,-220c2.05,-2.04 5.36,-2.04 7.4,0 2.03,2.05 2.03,5.35 0,7.4z"/>

</vector>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/ic_boat_rental_dinghy.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="128dp" android:viewportHeight="512" android:viewportWidth="512" android:width="128dp">

<path android:fillColor="#000000" android:pathData="m487.36,117.77c0,-0.17 -0.08,-0.33 -0.11,-0.5 -0.13,-0.66 -0.33,-1.3 -0.6,-1.92 -0.85,-2.58 -2.97,-4.54 -5.61,-5.19 -5.72,-0.98 -11.58,-0.71 -17.18,0.79 -5.03,1.18 -9.92,2.89 -14.59,5.09 -1.76,1.02 -3.09,2.62 -3.78,4.53 -0.62,1.29 -0.89,2.72 -0.79,4.14 0.13,2.2 0.07,4.38 0.16,6.57 -49.13,33.94 -105.95,55.06 -165.31,61.46l6.07,-11.7v0c8.64,-15.01 16.49,-30.45 23.51,-46.28 2.89,-5.76 3.74,-12.32 2.43,-18.62 -1.31,-6.3 -4.72,-11.98 -9.66,-16.1 -4.86,-3.04 -10.69,-4.1 -16.31,-2.95 -5.62,1.14 -10.57,4.41 -13.85,9.11 -9.62,13.4 -17.86,27.75 -24.58,42.82 -8.31,15.54 -16.48,31.16 -24.5,46.85 -0.4,0.79 -0.79,1.57 -1.17,2.36l-0,-0c-50.23,5.05 -100.86,4.86 -151.05,-0.57 -1.51,-8 -2.61,-16.08 -3.3,-24.19 -0.13,-1.52 -0.65,-2.98 -1.51,-4.24 -0.93,-2.49 -3.01,-4.38 -5.57,-5.06 -10.88,-2.82 -22.38,-2.09 -32.82,2.09 -2.19,0.69 -4.06,2.13 -5.29,4.07 -0.81,1.54 -1.16,3.29 -1.02,5.02 -0.19,0.51 -0.34,1.04 -0.43,1.57 -2.98,43.3 9.32,86.27 34.76,121.43 0.43,0.53 0.91,1.01 1.43,1.45 1.18,1.86 3.13,3.09 5.3,3.35 30.35,5.12 61.06,7.78 91.84,7.95 -6.69,5.07 -12.6,11.09 -17.56,17.88 -9.17,13.72 -16.49,28.6 -21.75,44.25 -0.79,3.45 0.11,7.06 2.41,9.73 15.95,12.51 33.98,22.13 53.25,28.4 1.92,1.85 4.57,2.72 7.21,2.38 2.64,-0.35 4.98,-1.88 6.36,-4.15 8.8,-14.5 16.38,-29.7 22.64,-45.46 5.01,-12.59 11.44,-28.13 5.38,-40.77l4.06,-7.93c0.31,0.04 0.53,0.19 0.84,0.2 66.23,2.66 132.56,-0.43 198.25,-9.26 1.3,0.15 2.63,-0.04 3.84,-0.55 8.3,-1.14 16.6,-2.36 24.88,-3.65 1.07,-0.16 2.09,-0.53 3.02,-1.08 2.87,-0.09 5.48,-1.67 6.89,-4.16 32.79,-53.58 44.81,-117.32 33.78,-179.16zM430.06,239.54c-62.03,16.11 -125.59,25.68 -189.61,28.56 3.23,-6.22 6.46,-12.45 9.69,-18.69h-0c65.38,-3.38 129.54,-18.98 189.16,-46 -2.36,12.22 -5.44,24.28 -9.23,36.13zM444.92,152.33c-0.31,12.35 -1.34,24.68 -3.09,36.92 -58.16,27.6 -121.06,43.84 -185.31,47.85l3.11,-5.98 10.15,-19.52c62.38,-4.99 122.55,-25.35 175.15,-59.26zM212.23,216.8c-3.88,7.75 -7.77,15.49 -11.58,23.28 -40.07,0 -80.18,-0.43 -120.09,-4.27 -2.36,-6.6 -4.35,-13.3 -6.13,-20.07h-0c45.8,4.71 91.94,5.06 137.81,1.05zM187.08,268.34c-31.21,1.23 -62.47,0.34 -93.57,-2.66 -2.96,-5.77 -5.7,-11.66 -8.22,-17.66 36.41,3.26 72.99,3.82 109.55,3.86 -2.61,5.46 -5.16,10.98 -7.76,16.47zM38.07,181.28c1.33,-0.34 2.68,-0.59 4.05,-0.79 2.68,-0.26 5.38,-0.28 8.06,-0.07 3.97,38.31 16.23,75.3 35.94,108.39 -5.88,-0.79 -11.75,-1.52 -17.6,-2.49 -21.46,-30.7 -32.16,-67.63 -30.44,-105.04zM108.45,291.23c-0.05,-0.09 -0.08,-0.17 -0.14,-0.26 -2.82,-4.22 -5.51,-8.54 -8.06,-12.9 27,2.34 54.1,3.1 81.18,2.25 -2,4.26 -4.04,8.5 -6.02,12.77l0,-0c-22.34,0.74 -44.7,0.12 -66.97,-1.86zM195.05,343.7c-2.11,6.75 -4.72,13.38 -7.45,19.93l-0,-0c-4.42,10.27 -9.46,20.26 -15.1,29.91 -7.06,-2.34 -13.91,-5.28 -20.47,-8.78 -4.08,-2.14 -8.06,-4.45 -11.95,-6.93 -2,-1.28 -3.97,-2.61 -5.91,-3.98l-0.68,-0.49h-0c4.29,-11.88 9.97,-23.21 16.93,-33.75 6.58,-9.79 16.08,-17.26 27.15,-21.35 0.11,0 0.19,-0.13 0.3,-0.16h-0c3.23,0.39 6.31,-1.46 7.47,-4.5 15.74,-34.33 32.16,-68.34 49.23,-102.04 8.55,-16.84 17.27,-33.59 26.15,-50.25 4.72,-8.89 9.51,-17.75 14.35,-26.58 2.92,-5.34 7.01,-17.07 13.1,-19.73 11.64,-5.1 2.64,17.66 1.03,20.88 -4.34,8.7 -8.96,17.27 -13.44,25.91 -8.96,17.27 -17.92,34.54 -26.89,51.81 -17.82,34.27 -35.63,68.54 -53.43,102.82 -1.96,1.5 -3.17,3.77 -3.33,6.24 -0.16,2.46 0.75,4.88 2.5,6.61 3.75,3.83 1.81,9.97 0.41,14.44zM224.87,298.15 L234.17,280.23h-0c64.59,-2.54 128.75,-11.72 191.46,-27.39 -4.66,12.5 -10.13,24.69 -16.37,36.49 -61.13,7.98 -122.8,10.93 -184.42,8.81zM440.05,285 L440.04,285c-0.36,-0 -0.71,0.02 -1.06,0.06 -2.8,0.44 -5.61,0.79 -8.42,1.23 23.23,-48.77 34.21,-102.47 31.97,-156.44 2.8,-0.94 5.67,-1.68 8.57,-2.21 8.15,54.47 -2.83,110.08 -31.08,157.36z"/>

</vector>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_boat_rental_houseboat.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="128dp" android:viewportHeight="512" android:viewportWidth="512" android:width="128dp">

<path android:fillColor="#000000" android:pathData="m320.29,224.82h115.32l-31.28,-75.06c-8.66,-19.43 -31.98,-17.77 -31.98,-17.77h-229.62s-23.31,-1.66 -31.97,17.77l-31.28,75.06zM375.81,153.77 L376.24,153.73h0.34c0.55,-0.04 14.26,-0.57 18.88,9.76l19.85,47.75h-67.68l-23.84,-57.47zM260.59,160.25c0,-3.57 2.88,-6.48 6.45,-6.48h28.72c3.58,0 6.46,2.92 6.46,6.48v44.44c0,3.57 -2.88,6.54 -6.46,6.54h-28.72c-3.57,0 -6.45,-2.96 -6.45,-6.54zM200.78,160.25c0,-3.57 2.88,-6.48 6.46,-6.48h28.63c3.58,0 6.46,2.92 6.46,6.48v44.44c0,3.57 -2.88,6.54 -6.46,6.54h-28.63c-3.58,0 -6.46,-2.96 -6.46,-6.54zM140.89,160.25c0,-3.57 2.88,-6.48 6.45,-6.48h28.73c3.57,0 6.45,2.92 6.45,6.48v44.44c0,3.57 -2.88,6.54 -6.45,6.54h-28.73c-3.57,0 -6.45,-2.96 -6.45,-6.54z"/>

<path android:fillColor="#000000" android:pathData="m433.45,337.09c-8.01,0 -15.72,1.88 -22.5,5.04 -6.66,3.01 -14.07,4.79 -21.85,4.8 -7.75,-0 -15.19,-1.79 -21.81,-4.8 -6.86,-3.17 -14.52,-5.04 -22.55,-5.04h-0.02c-8.06,0 -15.68,1.88 -22.57,5.04 -6.59,3.01 -14.08,4.8 -21.79,4.8 -7.76,0 -15.22,-1.79 -21.84,-4.8 -6.76,-3.17 -14.47,-5.04 -22.5,-5.04h-0.02,-0.04c-8.02,0 -15.73,1.88 -22.5,5.04 -6.63,3.01 -14.09,4.8 -21.84,4.8 -7.72,0 -15.21,-1.79 -21.79,-4.8 -6.9,-3.17 -14.52,-5.04 -22.57,-5.04h-0.02,-0.02c-8.02,0 -15.68,1.88 -22.54,5.04 -6.61,3.01 -14.07,4.79 -21.81,4.8 -7.79,-0 -15.19,-1.79 -21.85,-4.8 -6.77,-3.17 -14.48,-5.04 -22.5,-5.04s-15.68,1.88 -22.54,5.04c-6.59,3.01 -14.04,4.8 -21.81,4.8v33.11c7.76,0 15.22,-1.75 21.81,-4.8 6.85,-3.18 14.52,-5.04 22.54,-5.04s15.73,1.88 22.5,5.04c6.66,3.04 14.05,4.79 21.82,4.8h0.03,0.04c7.71,0 15.16,-1.75 21.89,-4.8 6.81,-3.18 14.47,-5.04 22.44,-5.04 7.96,0 15.68,1.88 22.43,5.04 6.73,3.05 14.14,4.8 21.94,4.8h0.01,0.01c7.76,0 15.25,-1.75 21.84,-4.8 6.84,-3.17 14.51,-5.04 22.51,-5.04 8,0 15.65,1.88 22.5,5.04 6.59,3.05 14.09,4.8 21.84,4.8h0.02,0c7.8,0 15.22,-1.75 21.94,-4.8 6.76,-3.18 14.47,-5.04 22.43,-5.04s15.64,1.88 22.44,5.04c6.73,3.05 14.17,4.8 21.89,4.8h0.04,0.04c7.77,-0.02 15.16,-1.76 21.82,-4.8 6.77,-3.17 14.48,-5.04 22.5,-5.04 8.02,0 15.69,1.88 22.55,5.04 6.59,3.05 14.04,4.8 21.8,4.8v-33.11c-7.76,0 -15.22,-1.79 -21.8,-4.8 -6.87,-3.17 -14.54,-5.04 -22.56,-5.04z"/>

<path android:fillColor="#000000" android:pathData="m104.56,312.34 l0.26,0.13c3.79,1.52 7.75,1.91 11.65,2.79 2.14,0.21 4.22,0.68 6.4,0.69h0.03,0.02c7.71,0 15.16,-1.74 21.88,-4.74 6.82,-3.18 14.49,-5.06 22.45,-5.06s15.68,1.88 22.44,5.06c6.72,3.01 14.13,4.74 21.93,4.74h0,0c7.76,0 15.25,-1.74 21.85,-4.74 6.85,-3.18 14.51,-5.05 22.52,-5.05 8,0 15.66,1.88 22.51,5.05 6.59,3.01 14.09,4.74 21.84,4.74h0.01c7.8,0 15.21,-1.74 21.94,-4.74 6.76,-3.18 14.48,-5.06 22.44,-5.06s15.65,1.88 22.45,5.06c6.72,3.01 14.17,4.74 21.89,4.74h0.02,0.03c2.19,-0.01 4.27,-0.48 6.41,-0.69 3.88,-0.87 7.84,-1.27 11.63,-2.79l0.26,-0.13c28.18,-11.54 52.53,-40.2 67.7,-61.56l7.57,-13.03h-453.43l7.58,13.03c15.16,21.35 39.51,50.02 67.69,61.56z"/>

</vector>
25 changes: 25 additions & 0 deletions app/src/main/res/drawable/ic_boat_rental_jetski.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="128dp" android:viewportHeight="512" android:viewportWidth="512" android:width="128dp">

<path android:fillColor="#FF000000" android:pathData="m78.04,194.49c2.11,-2.18 3.17,-5.15 2.91,-8.17 -0.25,-3.02 -1.79,-5.78 -4.23,-7.57l-1.36,-1.05v0c-2.99,-2.23 -5.34,-5.21 -6.79,-8.64 -1.46,-3.43 -1.98,-7.19 -1.5,-10.89 0.75,-5.53 3.68,-10.53 8.13,-13.9 4.45,-3.37 10.06,-4.82 15.59,-4.05l145.21,20.99h0c7.61,1.08 15.38,0.38 22.67,-2.05 3.73,-1.21 7.45,-2.52 11.13,-3.94v0c-2.25,-9.06 -6.93,-17.34 -13.54,-23.93 -1.35,-1.47 -3.25,-2.32 -5.25,-2.36h-5.51c-3.07,-0.01 -6.07,-0.95 -8.59,-2.71 -2.52,-1.75 -4.45,-4.23 -5.53,-7.11h-18.16c-2.9,0 -5.25,-2.35 -5.25,-5.25 0,-2.9 2.35,-5.25 5.25,-5.25h18.06c1.07,-2.9 3.02,-5.41 5.56,-7.17 2.54,-1.77 5.57,-2.71 8.66,-2.7h20.15c10.43,-0.01 20.46,4.04 27.97,11.28l23.46,22.62 0,0c11.56,-5.05 24.41,-6.32 36.73,-3.62 34.22,7.71 75.36,24.61 108,38.68h-115.93c-2.9,0 -5.25,2.35 -5.25,5.25 0,2.9 2.35,5.25 5.25,5.25h134.35c5.71,4.28 10.8,9.33 15.11,15.01 2.23,2.89 4.25,5.95 6.04,9.13h-430.86z"/>

<group>

<clip-path android:pathData="m4.09,212h503.81v77h-503.81z"/>

<path android:fillColor="#FF000000" android:pathData="m506.8,221.15c-13.73,18.27 -31.03,33.55 -50.85,44.92 -5.28,3.02 -10.71,5.75 -16.27,8.19 -12.15,-12.69 -29.29,-19.35 -46.82,-18.19 -17.53,1.15 -33.65,10 -44.03,24.18 -0.92,1.29 -1.98,2.49 -3.15,3.57l-37.78,0.89v0c-1.54,-1.32 -2.91,-2.82 -4.09,-4.46 -11.21,-15.21 -28.97,-24.18 -47.86,-24.18 -18.89,0 -36.65,8.97 -47.86,24.18 -2.01,2.73 -4.5,5.08 -7.35,6.93l-29.23,0.52c-3.37,-1.91 -6.28,-4.52 -8.55,-7.66 -11.2,-15.27 -29.01,-24.28 -47.94,-24.28 -18.94,0 -36.74,9.02 -47.94,24.28 -2.61,3.55 -6,6.44 -9.92,8.45 -6.86,-1.74 -13.05,-5.45 -17.82,-10.68 -4.77,-5.22 -7.89,-11.73 -9,-18.72h-3.15c-6.14,0 -12.03,-2.45 -16.36,-6.8 -4.34,-4.35 -6.75,-10.25 -6.73,-16.4 0.02,-6.14 2.46,-12.03 6.81,-16.37 4.35,-4.34 10.24,-6.78 16.38,-6.78h475.37c1.98,0.01 3.78,1.12 4.67,2.89 0.89,1.79 0.68,3.92 -0.52,5.51z"/>

</group>

<group>

<clip-path android:pathData="m4.09,266h503.81v47h-503.81z"/>

<path android:fillColor="#FF000000" android:pathData="m44.55,312.68c-15.56,0.13 -30.23,-7.21 -39.47,-19.73 -1.68,-2.34 -1.16,-5.59 1.16,-7.3 1.12,-0.83 2.52,-1.18 3.9,-0.97 1.38,0.21 2.62,0.95 3.45,2.07 7.25,9.86 18.75,15.68 30.99,15.68s23.74,-5.82 30.99,-15.68c9.18,-12.65 23.89,-20.1 39.52,-20.05 15.59,-0.07 30.26,7.37 39.41,20 7.24,9.92 18.79,15.77 31.07,15.75 12.26,0.06 23.79,-5.8 30.97,-15.75 9.19,-12.6 23.87,-20.03 39.47,-20 15.52,-0.07 30.15,7.3 39.31,19.84 7.25,9.86 18.76,15.68 30.99,15.68s23.74,-5.82 30.99,-15.68c9.23,-12.48 23.84,-19.84 39.36,-19.84 15.52,0 30.13,7.36 39.36,19.84 7.25,9.81 18.73,15.6 30.94,15.6 12.21,0 23.68,-5.79 30.94,-15.6 1.77,-2.49 5.22,-3.08 7.71,-1.31 2.49,1.77 3.08,5.22 1.31,7.71 -9.25,12.46 -23.84,19.81 -39.36,19.81s-30.11,-7.35 -39.36,-19.81c-7.25,-9.84 -18.75,-15.64 -30.97,-15.64s-23.71,5.8 -30.97,15.64c-9.22,12.5 -23.83,19.88 -39.36,19.88s-30.14,-7.38 -39.36,-19.88c-7.3,-10.1 -19.08,-15.99 -31.54,-15.75 -12.27,-0.04 -23.81,5.82 -31.02,15.75 -9.22,12.5 -23.83,19.88 -39.36,19.88s-30.14,-7.38 -39.36,-19.88c-7.2,-9.94 -18.75,-15.8 -31.02,-15.75 -12.27,-0.04 -23.81,5.82 -31.02,15.75 -9.28,12.57 -24.05,19.92 -39.68,19.73z"/>

</group>

<path android:fillColor="#FF000000" android:pathData="m185.57,362.95c-15.6,0.07 -30.29,-7.37 -39.47,-20 -7.2,-9.93 -18.75,-15.8 -31.02,-15.74 -12.27,-0.04 -23.81,5.81 -31.02,15.74 -0.82,1.13 -2.05,1.89 -3.43,2.11 -1.38,0.21 -2.79,-0.13 -3.91,-0.95 -2.3,-1.68 -2.84,-4.9 -1.21,-7.24 9.19,-12.67 23.91,-20.15 39.57,-20.1 15.59,-0.07 30.26,7.37 39.41,20 7.24,9.92 18.79,15.77 31.07,15.74 12.26,0.06 23.79,-5.8 30.97,-15.74 9.18,-12.62 23.85,-20.07 39.47,-20.05 15.52,-0.08 30.15,7.3 39.31,19.84 7.25,9.86 18.76,15.68 30.99,15.68s23.74,-5.82 30.99,-15.68c9.23,-12.48 23.84,-19.84 39.36,-19.84 15.52,0 30.13,7.36 39.36,19.84l0.47,0.73c0.71,1.23 0.89,2.69 0.51,4.05s-1.3,2.52 -2.55,3.19c-2.36,1.16 -5.2,0.39 -6.66,-1.78 -7.27,-9.82 -18.75,-15.6 -30.96,-15.6 -12.22,0 -23.7,5.79 -30.97,15.6 -9.22,12.5 -23.83,19.88 -39.36,19.88s-30.14,-7.38 -39.36,-19.88c-7.18,-9.94 -18.71,-15.8 -30.97,-15.75 -12.27,-0.04 -23.81,5.82 -31.02,15.75 -9.14,12.74 -23.89,20.27 -39.57,20.2z"/>

<path android:fillColor="#FF000000" android:pathData="m185.57,413.23c-15.6,0.07 -30.29,-7.37 -39.47,-20l4.2,-3.15 4.36,-2.94v-0c7.24,9.84 18.72,15.65 30.94,15.65 12.21,0 23.69,-5.81 30.94,-15.65 9.15,-12.67 23.83,-20.17 39.47,-20.15 15.52,-0.07 30.15,7.3 39.31,19.84 7.25,9.86 18.76,15.68 30.99,15.68s23.74,-5.82 30.99,-15.68c0.83,-1.12 2.07,-1.87 3.45,-2.07 1.38,-0.21 2.78,0.14 3.9,0.97 1.23,0.75 2.09,1.98 2.39,3.39 0.3,1.41 0,2.88 -0.81,4.07 -9.22,12.5 -23.83,19.88 -39.36,19.88s-30.14,-7.38 -39.36,-19.88c-7.18,-9.94 -18.71,-15.8 -30.97,-15.75 -12.27,-0.04 -23.81,5.82 -31.02,15.75 -9.25,12.79 -24.15,20.27 -39.94,20.05z"/>

</vector>
Loading

0 comments on commit 1745590

Please sign in to comment.