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 c4092a9dc0d..571697c8e1e 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/QuestsModule.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/QuestsModule.kt @@ -173,6 +173,7 @@ import de.westnordost.streetcomplete.quests.religion.AddReligionToWaysideShrine import de.westnordost.streetcomplete.quests.road_name.AddRoadName import de.westnordost.streetcomplete.quests.roof_colour.AddRoofColour import de.westnordost.streetcomplete.quests.roof_orientation.AddRoofOrientation +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 @@ -616,6 +617,7 @@ fun getQuestTypeList( EE_QUEST_OFFSET + 49 to AddBuildingMaterial(), EE_QUEST_OFFSET + 24 to AddRoofColour(), EE_QUEST_OFFSET + 56 to AddRoofOrientation(), + EE_QUEST_OFFSET + 58 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..d7fcc0df6a2 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..205697b285c 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..d6ab83af145 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..2eb41366f3a 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..76317e5dd10 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..ab57af1b20b 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..3da6ae64b10 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..a43e24e5b64 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..34892d17e19 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..79a7c9bd9d5 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..0d2dfe82f78 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..69ff100cd0c 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..5ac41ef8a65 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..706e3d283c3 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..1a2f91b8145 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..ed0865ac4d1 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..b0925c40872 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..7973e94f3ca 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..17166541d7e 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..a9621c8a333 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..b33535b7a02 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..bc1c3f3eeaf 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..ad57e52ac67 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..00fc1b191e0 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..0d19b56449e 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..75413c31c00 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..4efa6a2ddbe 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..1f5d6bf83ab 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..011fc30db0b 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..c7e848c9f73 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..1a483866d81 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..5005d63693f 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..88e93cc923f 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..5b7de0c9840 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..67cd14e2dea 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..e1927c4eb8e 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..c387363e170 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..01303feaadc 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..3e9bb0a0e07 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..758cacaa83f 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..f19bf05bcfd 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..a361bc4c64a 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..81a52d4f1a9 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..28bbba6a6cb 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..f5b38dbd402 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..b1ca0683ff6 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..fde4a935ffb 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..7cd99c13b9a 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..6c89fc2ab01 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..c267f59fb21 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..7991818acd8 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..c31dd8f8981 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..4b0a931622f 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..eb24decafd1 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..8d63d712596 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..76c47da989b 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..f6fbc2a2d6d 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..00298991891 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..a64cea87e4b 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..3dfd0682d34 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..1802c091c99 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..fe67c014a5e 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..96dcc788197 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..0b3914a5607 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..b10b955773b 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..04e92913503 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..89937002324 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..39800f02dde 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..8d5efdf4bf0 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..82bbb0dfc77 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..09aa6a89c6b 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..d73eb18e0b8 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..afe31dda174 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..2b7d8e2a47f 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..057deb53955 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..e2e34145830 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..7fa7698f793 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..8ee84656d85 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..21ddb9aa60f 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..ae1653447ca 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..ffacee70d91 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..90edad2c57f 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..352aad6219d 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..da9f16b2a87 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..0f855a9f0c9 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..ae1f3a17dec 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..d840b80c53a 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..511e8e52b10 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..5b0865ab117 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..700a921f059 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..f69fd09a11c 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..56c5c20d343 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 9a2b5d243a1..36fdeb67f25 100644 --- a/app/src/main/res/values/strings_ee.xml +++ b/app/src/main/res/values/strings_ee.xml @@ -804,4 +804,30 @@ Out of the box SCEE is configured to behave very similar to StreetComplete.Bamboo Adobe + + "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