diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/QuestsModule.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/QuestsModule.kt index dbf1046c422..93878b23ecb 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/QuestsModule.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/QuestsModule.kt @@ -167,6 +167,7 @@ import de.westnordost.streetcomplete.quests.religion.AddReligionToWaysideShrine import de.westnordost.streetcomplete.quests.road_name.AddRoadName import de.westnordost.streetcomplete.quests.road_name.RoadNameSuggestionsSource import de.westnordost.streetcomplete.quests.roof_colour.AddRoofColour +import de.westnordost.streetcomplete.quests.roof_material.AddRoofMaterial import de.westnordost.streetcomplete.quests.roof_shape.AddRoofShape import de.westnordost.streetcomplete.quests.sanitary_dump_station.AddSanitaryDumpStation import de.westnordost.streetcomplete.quests.seating.AddOutdoorSeatingType @@ -612,6 +613,7 @@ fun getQuestTypeList( EE_QUEST_OFFSET + 0 to AddBenchMaterial(), EE_QUEST_OFFSET + 27 to AddBuildingColour(), EE_QUEST_OFFSET + 24 to AddRoofColour(), + EE_QUEST_OFFSET + 48 to AddRoofMaterial(), EE_QUEST_OFFSET + 1 to AddContactPhone(), EE_QUEST_OFFSET + 2 to AddContactWebsite(), EE_QUEST_OFFSET + 4 to AddCuisine(), diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/roof_material/AddRoofMaterial.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/roof_material/AddRoofMaterial.kt new file mode 100644 index 00000000000..29f6387de33 --- /dev/null +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/roof_material/AddRoofMaterial.kt @@ -0,0 +1,37 @@ +package de.westnordost.streetcomplete.quests.roof_material + +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.BUILDING +import de.westnordost.streetcomplete.osm.Tags + +class AddRoofMaterial : OsmFilterQuestType() { + + override val elementFilter = """ + ways, relations with + roof:shape + and !roof:material + and building !~ no|construction + and location != underground + and ruins != yes + """ + override val changesetComment = "Specify roof material" + override val wikiLink = "Key:roof:material" + override val icon = R.drawable.ic_quest_roof_material + override val achievements = listOf(BUILDING) + override val defaultDisabledMessage = R.string.default_disabled_msg_roofMaterial + + override fun getTitle(tags: Map) = R.string.quest_roofMaterial_title + + override fun createForm() = AddRoofMaterialForm() + + override fun applyAnswerTo( + answer: RoofMaterial, + tags: Tags, + geometry: ElementGeometry, + timestampEdited: Long, + ) { + tags["roof:material"] = answer.osmValue + } +} diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/roof_material/AddRoofMaterialForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/roof_material/AddRoofMaterialForm.kt new file mode 100644 index 00000000000..7b838b81a94 --- /dev/null +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/roof_material/AddRoofMaterialForm.kt @@ -0,0 +1,21 @@ +package de.westnordost.streetcomplete.quests.roof_material + +import android.os.Bundle +import de.westnordost.streetcomplete.R +import de.westnordost.streetcomplete.quests.AImageListQuestForm + +class AddRoofMaterialForm : AImageListQuestForm() { + + override val items = RoofMaterial.entries.map { it.asItem() } + + override val itemsPerRow = 3 + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + imageSelector.cellLayoutId = R.layout.cell_labeled_icon_select + } + + override fun onClickOk(selectedItems: List) { + applyAnswer(selectedItems.single()) + } +} diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/roof_material/RoofMaterial.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/roof_material/RoofMaterial.kt new file mode 100644 index 00000000000..42fdd55ae19 --- /dev/null +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/roof_material/RoofMaterial.kt @@ -0,0 +1,133 @@ +package de.westnordost.streetcomplete.quests.roof_material + +import androidx.annotation.DrawableRes +import androidx.annotation.StringRes +import de.westnordost.streetcomplete.R +import de.westnordost.streetcomplete.view.image_select.DisplayItem +import de.westnordost.streetcomplete.view.image_select.Item + +enum class RoofMaterial( + val osmValue: String, + @DrawableRes val imageResId: Int, + @StringRes val titleResId: Int, +) { + ROOF_TILES( + osmValue = "roof_tiles", + imageResId = R.drawable.roof_material_roof_tiles, + titleResId = R.string.quest_roof_material_value_roof_tiles + ), + METAL_SHEET( + osmValue = "metal_sheet", + imageResId = R.drawable.roof_material_metal_sheet, + titleResId = R.string.quest_roof_material_value_metal_sheet + ), + CONCRETE( + osmValue = "concrete", + imageResId = R.drawable.roof_material_concrete, + titleResId = R.string.quest_roof_material_value_concrete + ), + TAR_PAPER( + osmValue = "tar_paper", + imageResId = R.drawable.roof_material_tar_paper, + titleResId = R.string.quest_roof_material_value_tar_paper + ), + ETERNIT( + osmValue = "eternit", + imageResId = R.drawable.roof_material_eternit, + titleResId = R.string.quest_roof_material_value_eternit + ), + SLATE( + osmValue = "slate", + imageResId = R.drawable.roof_material_slate, + titleResId = R.string.quest_roof_material_value_slate + ), + GLASS( + osmValue = "glass", + imageResId = R.drawable.roof_material_glass, + titleResId = R.string.quest_roof_material_value_glass + ), + ACRYLIC_GLASS( + osmValue = "acrylic_glass", + imageResId = R.drawable.roof_material_acrylic_glass, + titleResId = R.string.quest_roof_material_value_acrylic_glass + ), + TIN( + osmValue = "tin", + imageResId = R.drawable.roof_material_tin, + titleResId = R.string.quest_roof_material_value_tin + ), + GRASS( + osmValue = "grass", + imageResId = R.drawable.roof_material_grass, + titleResId = R.string.quest_roof_material_value_grass + ), + COPPER( + osmValue = "copper", + imageResId = R.drawable.roof_material_copper, + titleResId = R.string.quest_roof_material_value_copper + ), + THATCH( + osmValue = "thatch", + imageResId = R.drawable.roof_material_thatch, + titleResId = R.string.quest_roof_material_value_thatch + ), + GRAVEL( + osmValue = "gravel", + imageResId = R.drawable.roof_material_gravel, + titleResId = R.string.quest_roof_material_value_gravel + ), + STONE( + osmValue = "stone", + imageResId = R.drawable.roof_material_stone, + titleResId = R.string.quest_roof_material_value_stone + ), + WOOD( + osmValue = "wood", + imageResId = R.drawable.roof_material_wood, + titleResId = R.string.quest_roof_material_value_wood + ), + PLASTIC( + osmValue = "plastic", + imageResId = R.drawable.roof_material_plastic, + titleResId = R.string.quest_roof_material_value_plastic + ), + ASPHALT( + osmValue = "asphalt", + imageResId = R.drawable.roof_material_asphalt, + titleResId = R.string.quest_roof_material_value_asphalt + ), + ASPHALT_SHINGLE( + osmValue = "asphalt_shingle", + imageResId = R.drawable.roof_material_asphalt_shingle, + titleResId = R.string.quest_roof_material_value_asphalt_shingle + ), + ZINC( + osmValue = "zinc", + imageResId = R.drawable.roof_material_zinc, + titleResId = R.string.quest_roof_material_value_zinc + ), + SANDSTONE( + osmValue = "sandstone", + imageResId = R.drawable.roof_material_sandstone, + titleResId = R.string.quest_roof_material_value_sandstone + ), + BAMBOO( + osmValue = "bamboo", + imageResId = R.drawable.roof_material_bamboo, + titleResId = R.string.quest_roof_material_value_bamboo + ), + PALM_LEAVES( + osmValue = "palm_leaves", + imageResId = R.drawable.roof_material_palm_leaves, + titleResId = R.string.quest_roof_material_value_palm_leaves + ), + SOLAR_PANELS( + osmValue = "solar_panels", + imageResId = R.drawable.roof_material_solar_panels, + titleResId = R.string.quest_roof_material_value_solar_panels + ), +} + +fun Collection.toItems() = map { it.asItem() } + +fun RoofMaterial.asItem(): DisplayItem = Item(this, imageResId, titleResId) diff --git a/app/src/main/res/drawable-hdpi/roof_material_acrylic_glass.jpg b/app/src/main/res/drawable-hdpi/roof_material_acrylic_glass.jpg new file mode 100644 index 00000000000..681c6266073 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/roof_material_acrylic_glass.jpg differ diff --git a/app/src/main/res/drawable-hdpi/roof_material_asphalt.jpg b/app/src/main/res/drawable-hdpi/roof_material_asphalt.jpg new file mode 100644 index 00000000000..28479886081 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/roof_material_asphalt.jpg differ diff --git a/app/src/main/res/drawable-hdpi/roof_material_asphalt_shingle.jpg b/app/src/main/res/drawable-hdpi/roof_material_asphalt_shingle.jpg new file mode 100644 index 00000000000..cd3fd21f733 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/roof_material_asphalt_shingle.jpg differ diff --git a/app/src/main/res/drawable-hdpi/roof_material_bamboo.jpg b/app/src/main/res/drawable-hdpi/roof_material_bamboo.jpg new file mode 100644 index 00000000000..7ecf48b5939 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/roof_material_bamboo.jpg differ diff --git a/app/src/main/res/drawable-hdpi/roof_material_concrete.jpg b/app/src/main/res/drawable-hdpi/roof_material_concrete.jpg new file mode 100644 index 00000000000..ef11e0ae741 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/roof_material_concrete.jpg differ diff --git a/app/src/main/res/drawable-hdpi/roof_material_copper.jpg b/app/src/main/res/drawable-hdpi/roof_material_copper.jpg new file mode 100644 index 00000000000..fec0401e092 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/roof_material_copper.jpg differ diff --git a/app/src/main/res/drawable-hdpi/roof_material_eternit.jpg b/app/src/main/res/drawable-hdpi/roof_material_eternit.jpg new file mode 100644 index 00000000000..6ba94667353 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/roof_material_eternit.jpg differ diff --git a/app/src/main/res/drawable-hdpi/roof_material_glass.jpg b/app/src/main/res/drawable-hdpi/roof_material_glass.jpg new file mode 100644 index 00000000000..c27a88fdd00 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/roof_material_glass.jpg differ diff --git a/app/src/main/res/drawable-hdpi/roof_material_grass.jpg b/app/src/main/res/drawable-hdpi/roof_material_grass.jpg new file mode 100644 index 00000000000..43abb79a50e Binary files /dev/null and b/app/src/main/res/drawable-hdpi/roof_material_grass.jpg differ diff --git a/app/src/main/res/drawable-hdpi/roof_material_gravel.jpg b/app/src/main/res/drawable-hdpi/roof_material_gravel.jpg new file mode 100644 index 00000000000..1e9721071ae Binary files /dev/null and b/app/src/main/res/drawable-hdpi/roof_material_gravel.jpg differ diff --git a/app/src/main/res/drawable-hdpi/roof_material_metal_sheet.jpg b/app/src/main/res/drawable-hdpi/roof_material_metal_sheet.jpg new file mode 100644 index 00000000000..1ec923e6eb8 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/roof_material_metal_sheet.jpg differ diff --git a/app/src/main/res/drawable-hdpi/roof_material_palm_leaves.jpg b/app/src/main/res/drawable-hdpi/roof_material_palm_leaves.jpg new file mode 100644 index 00000000000..0eee63c5b7a Binary files /dev/null and b/app/src/main/res/drawable-hdpi/roof_material_palm_leaves.jpg differ diff --git a/app/src/main/res/drawable-hdpi/roof_material_plastic.jpg b/app/src/main/res/drawable-hdpi/roof_material_plastic.jpg new file mode 100644 index 00000000000..8d26a2e7bea Binary files /dev/null and b/app/src/main/res/drawable-hdpi/roof_material_plastic.jpg differ diff --git a/app/src/main/res/drawable-hdpi/roof_material_roof_tiles.jpg b/app/src/main/res/drawable-hdpi/roof_material_roof_tiles.jpg new file mode 100644 index 00000000000..dfda960583a Binary files /dev/null and b/app/src/main/res/drawable-hdpi/roof_material_roof_tiles.jpg differ diff --git a/app/src/main/res/drawable-hdpi/roof_material_sandstone.jpg b/app/src/main/res/drawable-hdpi/roof_material_sandstone.jpg new file mode 100644 index 00000000000..e723bb5953a Binary files /dev/null and b/app/src/main/res/drawable-hdpi/roof_material_sandstone.jpg differ diff --git a/app/src/main/res/drawable-hdpi/roof_material_slate.jpg b/app/src/main/res/drawable-hdpi/roof_material_slate.jpg new file mode 100644 index 00000000000..678f6267f17 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/roof_material_slate.jpg differ diff --git a/app/src/main/res/drawable-hdpi/roof_material_solar_panels.jpg b/app/src/main/res/drawable-hdpi/roof_material_solar_panels.jpg new file mode 100644 index 00000000000..ba0578c34d8 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/roof_material_solar_panels.jpg differ diff --git a/app/src/main/res/drawable-hdpi/roof_material_stone.jpg b/app/src/main/res/drawable-hdpi/roof_material_stone.jpg new file mode 100644 index 00000000000..df6c306f781 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/roof_material_stone.jpg differ diff --git a/app/src/main/res/drawable-hdpi/roof_material_tar_paper.jpg b/app/src/main/res/drawable-hdpi/roof_material_tar_paper.jpg new file mode 100644 index 00000000000..75afe1c1612 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/roof_material_tar_paper.jpg differ diff --git a/app/src/main/res/drawable-hdpi/roof_material_thatch.jpg b/app/src/main/res/drawable-hdpi/roof_material_thatch.jpg new file mode 100644 index 00000000000..5755231fbdf Binary files /dev/null and b/app/src/main/res/drawable-hdpi/roof_material_thatch.jpg differ diff --git a/app/src/main/res/drawable-hdpi/roof_material_tin.jpg b/app/src/main/res/drawable-hdpi/roof_material_tin.jpg new file mode 100644 index 00000000000..11690ab3bd0 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/roof_material_tin.jpg differ diff --git a/app/src/main/res/drawable-hdpi/roof_material_wood.jpg b/app/src/main/res/drawable-hdpi/roof_material_wood.jpg new file mode 100644 index 00000000000..dbb85e6f8db Binary files /dev/null and b/app/src/main/res/drawable-hdpi/roof_material_wood.jpg differ diff --git a/app/src/main/res/drawable-hdpi/roof_material_zinc.jpg b/app/src/main/res/drawable-hdpi/roof_material_zinc.jpg new file mode 100644 index 00000000000..1634347d589 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/roof_material_zinc.jpg differ diff --git a/app/src/main/res/drawable-mdpi/roof_material_acrylic_glass.jpg b/app/src/main/res/drawable-mdpi/roof_material_acrylic_glass.jpg new file mode 100644 index 00000000000..11e0f9aa8fe Binary files /dev/null and b/app/src/main/res/drawable-mdpi/roof_material_acrylic_glass.jpg differ diff --git a/app/src/main/res/drawable-mdpi/roof_material_asphalt.jpg b/app/src/main/res/drawable-mdpi/roof_material_asphalt.jpg new file mode 100644 index 00000000000..40da9b1398e Binary files /dev/null and b/app/src/main/res/drawable-mdpi/roof_material_asphalt.jpg differ diff --git a/app/src/main/res/drawable-mdpi/roof_material_asphalt_shingle.jpg b/app/src/main/res/drawable-mdpi/roof_material_asphalt_shingle.jpg new file mode 100644 index 00000000000..2f8cac116c2 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/roof_material_asphalt_shingle.jpg differ diff --git a/app/src/main/res/drawable-mdpi/roof_material_bamboo.jpg b/app/src/main/res/drawable-mdpi/roof_material_bamboo.jpg new file mode 100644 index 00000000000..4b6472a8153 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/roof_material_bamboo.jpg differ diff --git a/app/src/main/res/drawable-mdpi/roof_material_concrete.jpg b/app/src/main/res/drawable-mdpi/roof_material_concrete.jpg new file mode 100644 index 00000000000..388d8e0ff7f Binary files /dev/null and b/app/src/main/res/drawable-mdpi/roof_material_concrete.jpg differ diff --git a/app/src/main/res/drawable-mdpi/roof_material_copper.jpg b/app/src/main/res/drawable-mdpi/roof_material_copper.jpg new file mode 100644 index 00000000000..1241e0a9c97 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/roof_material_copper.jpg differ diff --git a/app/src/main/res/drawable-mdpi/roof_material_eternit.jpg b/app/src/main/res/drawable-mdpi/roof_material_eternit.jpg new file mode 100644 index 00000000000..c685dc6cd1c Binary files /dev/null and b/app/src/main/res/drawable-mdpi/roof_material_eternit.jpg differ diff --git a/app/src/main/res/drawable-mdpi/roof_material_glass.jpg b/app/src/main/res/drawable-mdpi/roof_material_glass.jpg new file mode 100644 index 00000000000..882287f43c6 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/roof_material_glass.jpg differ diff --git a/app/src/main/res/drawable-mdpi/roof_material_grass.jpg b/app/src/main/res/drawable-mdpi/roof_material_grass.jpg new file mode 100644 index 00000000000..384c9dbd3d0 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/roof_material_grass.jpg differ diff --git a/app/src/main/res/drawable-mdpi/roof_material_gravel.jpg b/app/src/main/res/drawable-mdpi/roof_material_gravel.jpg new file mode 100644 index 00000000000..ecd2d71e36d Binary files /dev/null and b/app/src/main/res/drawable-mdpi/roof_material_gravel.jpg differ diff --git a/app/src/main/res/drawable-mdpi/roof_material_metal_sheet.jpg b/app/src/main/res/drawable-mdpi/roof_material_metal_sheet.jpg new file mode 100644 index 00000000000..09f3bf1e753 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/roof_material_metal_sheet.jpg differ diff --git a/app/src/main/res/drawable-mdpi/roof_material_palm_leaves.jpg b/app/src/main/res/drawable-mdpi/roof_material_palm_leaves.jpg new file mode 100644 index 00000000000..33cc2363d76 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/roof_material_palm_leaves.jpg differ diff --git a/app/src/main/res/drawable-mdpi/roof_material_plastic.jpg b/app/src/main/res/drawable-mdpi/roof_material_plastic.jpg new file mode 100644 index 00000000000..a760f75124b Binary files /dev/null and b/app/src/main/res/drawable-mdpi/roof_material_plastic.jpg differ diff --git a/app/src/main/res/drawable-mdpi/roof_material_roof_tiles.jpg b/app/src/main/res/drawable-mdpi/roof_material_roof_tiles.jpg new file mode 100644 index 00000000000..1ff8f708664 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/roof_material_roof_tiles.jpg differ diff --git a/app/src/main/res/drawable-mdpi/roof_material_sandstone.jpg b/app/src/main/res/drawable-mdpi/roof_material_sandstone.jpg new file mode 100644 index 00000000000..6ba8223519c Binary files /dev/null and b/app/src/main/res/drawable-mdpi/roof_material_sandstone.jpg differ diff --git a/app/src/main/res/drawable-mdpi/roof_material_slate.jpg b/app/src/main/res/drawable-mdpi/roof_material_slate.jpg new file mode 100644 index 00000000000..efa31d8c56a Binary files /dev/null and b/app/src/main/res/drawable-mdpi/roof_material_slate.jpg differ diff --git a/app/src/main/res/drawable-mdpi/roof_material_solar_panels.jpg b/app/src/main/res/drawable-mdpi/roof_material_solar_panels.jpg new file mode 100644 index 00000000000..d46717de9dd Binary files /dev/null and b/app/src/main/res/drawable-mdpi/roof_material_solar_panels.jpg differ diff --git a/app/src/main/res/drawable-mdpi/roof_material_stone.jpg b/app/src/main/res/drawable-mdpi/roof_material_stone.jpg new file mode 100644 index 00000000000..778704d6218 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/roof_material_stone.jpg differ diff --git a/app/src/main/res/drawable-mdpi/roof_material_tar_paper.jpg b/app/src/main/res/drawable-mdpi/roof_material_tar_paper.jpg new file mode 100644 index 00000000000..af5fdb78d06 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/roof_material_tar_paper.jpg differ diff --git a/app/src/main/res/drawable-mdpi/roof_material_thatch.jpg b/app/src/main/res/drawable-mdpi/roof_material_thatch.jpg new file mode 100644 index 00000000000..6b1bed485ba Binary files /dev/null and b/app/src/main/res/drawable-mdpi/roof_material_thatch.jpg differ diff --git a/app/src/main/res/drawable-mdpi/roof_material_tin.jpg b/app/src/main/res/drawable-mdpi/roof_material_tin.jpg new file mode 100644 index 00000000000..6102b592104 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/roof_material_tin.jpg differ diff --git a/app/src/main/res/drawable-mdpi/roof_material_wood.jpg b/app/src/main/res/drawable-mdpi/roof_material_wood.jpg new file mode 100644 index 00000000000..9354b92382c Binary files /dev/null and b/app/src/main/res/drawable-mdpi/roof_material_wood.jpg differ diff --git a/app/src/main/res/drawable-mdpi/roof_material_zinc.jpg b/app/src/main/res/drawable-mdpi/roof_material_zinc.jpg new file mode 100644 index 00000000000..ea2c5c8197c Binary files /dev/null and b/app/src/main/res/drawable-mdpi/roof_material_zinc.jpg differ diff --git a/app/src/main/res/drawable-xhdpi/roof_material_acrylic_glass.jpg b/app/src/main/res/drawable-xhdpi/roof_material_acrylic_glass.jpg new file mode 100644 index 00000000000..b44a2270c98 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/roof_material_acrylic_glass.jpg differ diff --git a/app/src/main/res/drawable-xhdpi/roof_material_asphalt.jpg b/app/src/main/res/drawable-xhdpi/roof_material_asphalt.jpg new file mode 100644 index 00000000000..d118eba4d25 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/roof_material_asphalt.jpg differ diff --git a/app/src/main/res/drawable-xhdpi/roof_material_asphalt_shingle.jpg b/app/src/main/res/drawable-xhdpi/roof_material_asphalt_shingle.jpg new file mode 100644 index 00000000000..dd873d0590e Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/roof_material_asphalt_shingle.jpg differ diff --git a/app/src/main/res/drawable-xhdpi/roof_material_bamboo.jpg b/app/src/main/res/drawable-xhdpi/roof_material_bamboo.jpg new file mode 100644 index 00000000000..a721a8d5aff Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/roof_material_bamboo.jpg differ diff --git a/app/src/main/res/drawable-xhdpi/roof_material_concrete.jpg b/app/src/main/res/drawable-xhdpi/roof_material_concrete.jpg new file mode 100644 index 00000000000..04f4676cfa0 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/roof_material_concrete.jpg differ diff --git a/app/src/main/res/drawable-xhdpi/roof_material_copper.jpg b/app/src/main/res/drawable-xhdpi/roof_material_copper.jpg new file mode 100644 index 00000000000..b2c76ca1041 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/roof_material_copper.jpg differ diff --git a/app/src/main/res/drawable-xhdpi/roof_material_eternit.jpg b/app/src/main/res/drawable-xhdpi/roof_material_eternit.jpg new file mode 100644 index 00000000000..dd0cc1e1d7e Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/roof_material_eternit.jpg differ diff --git a/app/src/main/res/drawable-xhdpi/roof_material_glass.jpg b/app/src/main/res/drawable-xhdpi/roof_material_glass.jpg new file mode 100644 index 00000000000..d86ab0df199 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/roof_material_glass.jpg differ diff --git a/app/src/main/res/drawable-xhdpi/roof_material_grass.jpg b/app/src/main/res/drawable-xhdpi/roof_material_grass.jpg new file mode 100644 index 00000000000..86487c6e79b Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/roof_material_grass.jpg differ diff --git a/app/src/main/res/drawable-xhdpi/roof_material_gravel.jpg b/app/src/main/res/drawable-xhdpi/roof_material_gravel.jpg new file mode 100644 index 00000000000..3d5502a011a Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/roof_material_gravel.jpg differ diff --git a/app/src/main/res/drawable-xhdpi/roof_material_metal_sheet.jpg b/app/src/main/res/drawable-xhdpi/roof_material_metal_sheet.jpg new file mode 100644 index 00000000000..6390a2d1e21 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/roof_material_metal_sheet.jpg differ diff --git a/app/src/main/res/drawable-xhdpi/roof_material_palm_leaves.jpg b/app/src/main/res/drawable-xhdpi/roof_material_palm_leaves.jpg new file mode 100644 index 00000000000..bdbb0004d4f Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/roof_material_palm_leaves.jpg differ diff --git a/app/src/main/res/drawable-xhdpi/roof_material_plastic.jpg b/app/src/main/res/drawable-xhdpi/roof_material_plastic.jpg new file mode 100644 index 00000000000..00244930d2d Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/roof_material_plastic.jpg differ diff --git a/app/src/main/res/drawable-xhdpi/roof_material_roof_tiles.jpg b/app/src/main/res/drawable-xhdpi/roof_material_roof_tiles.jpg new file mode 100644 index 00000000000..e002b249362 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/roof_material_roof_tiles.jpg differ diff --git a/app/src/main/res/drawable-xhdpi/roof_material_sandstone.jpg b/app/src/main/res/drawable-xhdpi/roof_material_sandstone.jpg new file mode 100644 index 00000000000..7bf5ca81979 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/roof_material_sandstone.jpg differ diff --git a/app/src/main/res/drawable-xhdpi/roof_material_slate.jpg b/app/src/main/res/drawable-xhdpi/roof_material_slate.jpg new file mode 100644 index 00000000000..b452054df73 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/roof_material_slate.jpg differ diff --git a/app/src/main/res/drawable-xhdpi/roof_material_solar_panels.jpg b/app/src/main/res/drawable-xhdpi/roof_material_solar_panels.jpg new file mode 100644 index 00000000000..d840ea97598 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/roof_material_solar_panels.jpg differ diff --git a/app/src/main/res/drawable-xhdpi/roof_material_stone.jpg b/app/src/main/res/drawable-xhdpi/roof_material_stone.jpg new file mode 100644 index 00000000000..c15ace25eff Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/roof_material_stone.jpg differ diff --git a/app/src/main/res/drawable-xhdpi/roof_material_tar_paper.jpg b/app/src/main/res/drawable-xhdpi/roof_material_tar_paper.jpg new file mode 100644 index 00000000000..00cdca1bf60 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/roof_material_tar_paper.jpg differ diff --git a/app/src/main/res/drawable-xhdpi/roof_material_thatch.jpg b/app/src/main/res/drawable-xhdpi/roof_material_thatch.jpg new file mode 100644 index 00000000000..fdfce6cfed7 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/roof_material_thatch.jpg differ diff --git a/app/src/main/res/drawable-xhdpi/roof_material_tin.jpg b/app/src/main/res/drawable-xhdpi/roof_material_tin.jpg new file mode 100644 index 00000000000..bbdfb6ce4d8 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/roof_material_tin.jpg differ diff --git a/app/src/main/res/drawable-xhdpi/roof_material_wood.jpg b/app/src/main/res/drawable-xhdpi/roof_material_wood.jpg new file mode 100644 index 00000000000..fb787d3d11d Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/roof_material_wood.jpg differ diff --git a/app/src/main/res/drawable-xhdpi/roof_material_zinc.jpg b/app/src/main/res/drawable-xhdpi/roof_material_zinc.jpg new file mode 100644 index 00000000000..24132553118 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/roof_material_zinc.jpg differ diff --git a/app/src/main/res/drawable-xxhdpi/roof_material_acrylic_glass.jpg b/app/src/main/res/drawable-xxhdpi/roof_material_acrylic_glass.jpg new file mode 100644 index 00000000000..5de529c8620 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/roof_material_acrylic_glass.jpg differ diff --git a/app/src/main/res/drawable-xxhdpi/roof_material_asphalt.jpg b/app/src/main/res/drawable-xxhdpi/roof_material_asphalt.jpg new file mode 100644 index 00000000000..fa6d4c381c2 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/roof_material_asphalt.jpg differ diff --git a/app/src/main/res/drawable-xxhdpi/roof_material_asphalt_shingle.jpg b/app/src/main/res/drawable-xxhdpi/roof_material_asphalt_shingle.jpg new file mode 100644 index 00000000000..268b573a9e7 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/roof_material_asphalt_shingle.jpg differ diff --git a/app/src/main/res/drawable-xxhdpi/roof_material_bamboo.jpg b/app/src/main/res/drawable-xxhdpi/roof_material_bamboo.jpg new file mode 100644 index 00000000000..6fbf3764b5e Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/roof_material_bamboo.jpg differ diff --git a/app/src/main/res/drawable-xxhdpi/roof_material_concrete.jpg b/app/src/main/res/drawable-xxhdpi/roof_material_concrete.jpg new file mode 100644 index 00000000000..d0740d9d881 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/roof_material_concrete.jpg differ diff --git a/app/src/main/res/drawable-xxhdpi/roof_material_copper.jpg b/app/src/main/res/drawable-xxhdpi/roof_material_copper.jpg new file mode 100644 index 00000000000..decf16a20dd Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/roof_material_copper.jpg differ diff --git a/app/src/main/res/drawable-xxhdpi/roof_material_eternit.jpg b/app/src/main/res/drawable-xxhdpi/roof_material_eternit.jpg new file mode 100644 index 00000000000..a94cb9a9e0e Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/roof_material_eternit.jpg differ diff --git a/app/src/main/res/drawable-xxhdpi/roof_material_glass.jpg b/app/src/main/res/drawable-xxhdpi/roof_material_glass.jpg new file mode 100644 index 00000000000..e26414f943c Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/roof_material_glass.jpg differ diff --git a/app/src/main/res/drawable-xxhdpi/roof_material_grass.jpg b/app/src/main/res/drawable-xxhdpi/roof_material_grass.jpg new file mode 100644 index 00000000000..627d5fcaef5 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/roof_material_grass.jpg differ diff --git a/app/src/main/res/drawable-xxhdpi/roof_material_gravel.jpg b/app/src/main/res/drawable-xxhdpi/roof_material_gravel.jpg new file mode 100644 index 00000000000..1a7535ba14d Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/roof_material_gravel.jpg differ diff --git a/app/src/main/res/drawable-xxhdpi/roof_material_metal_sheet.jpg b/app/src/main/res/drawable-xxhdpi/roof_material_metal_sheet.jpg new file mode 100644 index 00000000000..58b5f69bc3e Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/roof_material_metal_sheet.jpg differ diff --git a/app/src/main/res/drawable-xxhdpi/roof_material_palm_leaves.jpg b/app/src/main/res/drawable-xxhdpi/roof_material_palm_leaves.jpg new file mode 100644 index 00000000000..4fd7ab25cdb Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/roof_material_palm_leaves.jpg differ diff --git a/app/src/main/res/drawable-xxhdpi/roof_material_plastic.jpg b/app/src/main/res/drawable-xxhdpi/roof_material_plastic.jpg new file mode 100644 index 00000000000..fe7457778de Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/roof_material_plastic.jpg differ diff --git a/app/src/main/res/drawable-xxhdpi/roof_material_roof_tiles.jpg b/app/src/main/res/drawable-xxhdpi/roof_material_roof_tiles.jpg new file mode 100644 index 00000000000..fe240b81ea3 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/roof_material_roof_tiles.jpg differ diff --git a/app/src/main/res/drawable-xxhdpi/roof_material_sandstone.jpg b/app/src/main/res/drawable-xxhdpi/roof_material_sandstone.jpg new file mode 100644 index 00000000000..6fae26628c8 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/roof_material_sandstone.jpg differ diff --git a/app/src/main/res/drawable-xxhdpi/roof_material_slate.jpg b/app/src/main/res/drawable-xxhdpi/roof_material_slate.jpg new file mode 100644 index 00000000000..d9945843292 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/roof_material_slate.jpg differ diff --git a/app/src/main/res/drawable-xxhdpi/roof_material_solar_panels.jpg b/app/src/main/res/drawable-xxhdpi/roof_material_solar_panels.jpg new file mode 100644 index 00000000000..362a242f5dd Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/roof_material_solar_panels.jpg differ diff --git a/app/src/main/res/drawable-xxhdpi/roof_material_stone.jpg b/app/src/main/res/drawable-xxhdpi/roof_material_stone.jpg new file mode 100644 index 00000000000..4ce82d60f43 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/roof_material_stone.jpg differ diff --git a/app/src/main/res/drawable-xxhdpi/roof_material_tar_paper.jpg b/app/src/main/res/drawable-xxhdpi/roof_material_tar_paper.jpg new file mode 100644 index 00000000000..6f69da49e08 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/roof_material_tar_paper.jpg differ diff --git a/app/src/main/res/drawable-xxhdpi/roof_material_thatch.jpg b/app/src/main/res/drawable-xxhdpi/roof_material_thatch.jpg new file mode 100644 index 00000000000..abf15c34262 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/roof_material_thatch.jpg differ diff --git a/app/src/main/res/drawable-xxhdpi/roof_material_tin.jpg b/app/src/main/res/drawable-xxhdpi/roof_material_tin.jpg new file mode 100644 index 00000000000..7c7e44565e9 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/roof_material_tin.jpg differ diff --git a/app/src/main/res/drawable-xxhdpi/roof_material_wood.jpg b/app/src/main/res/drawable-xxhdpi/roof_material_wood.jpg new file mode 100644 index 00000000000..cfe9239179d Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/roof_material_wood.jpg differ diff --git a/app/src/main/res/drawable-xxhdpi/roof_material_zinc.jpg b/app/src/main/res/drawable-xxhdpi/roof_material_zinc.jpg new file mode 100644 index 00000000000..266b248362d Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/roof_material_zinc.jpg differ diff --git a/app/src/main/res/drawable/ic_quest_roof_material.xml b/app/src/main/res/drawable/ic_quest_roof_material.xml new file mode 100644 index 00000000000..c326e12fc2c --- /dev/null +++ b/app/src/main/res/drawable/ic_quest_roof_material.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/app/src/main/res/values/strings_ee.xml b/app/src/main/res/values/strings_ee.xml index 8d6e455c27c..eb96f5540c4 100644 --- a/app/src/main/res/values/strings_ee.xml +++ b/app/src/main/res/values/strings_ee.xml @@ -671,4 +671,30 @@ Out of the box SCEE is configured to behave very similar to StreetComplete. Close + + "What overall material does this building’s roof have?" + This quest type is disabled by default because roof materials are often not easily visible from the street. This quest type is also quite time-consuming; in most cases it is easier and more efficient to map this from aerial imagery at home. + Roof tiles + Concrete + Tar paper + Eternit + Glass + Acrylic glass + Metal sheet + Slate + Tin + Grass + Copper + Thatch + Gravel + Stone + Wood + Plastic + Asphalt + Asphalt shingle + Zinc + Sandstone + Bamboo + Palm leaves + Solar panels