Drop steel, tin, copper, metal_plates (but retain generic metal)

Helium314 · Jul 11, 2024 · 2302c71 · 2302c71
1 parent 95e415d
commit 2302c71
Show file tree

Hide file tree

Showing 18 changed files with 0 additions and 24 deletions.
diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/building_material/BuildingMaterial.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/building_material/BuildingMaterial.kt
@@ -41,11 +41,6 @@ enum class BuildingMaterial(
         imageResId = R.drawable.building_material_metal,
         titleResId = R.string.quest_building_material_value_metal
     ),
-    STEEL(
-        osmValue = "steel",
-        imageResId = R.drawable.building_material_steel,
-        titleResId = R.string.quest_building_material_value_steel
-    ),
     STONE(
         osmValue = "stone",
         imageResId = R.drawable.building_material_stone,
@@ -66,11 +61,6 @@ enum class BuildingMaterial(
         imageResId = R.drawable.building_material_mud,
         titleResId = R.string.quest_building_material_value_mud
     ),
-    TIN(
-        osmValue = "tin",
-        imageResId = R.drawable.building_material_tin,
-        titleResId = R.string.quest_building_material_value_tin
-    ),
     PLASTIC(
         osmValue = "plastic",
         imageResId = R.drawable.building_material_plastic,
@@ -106,11 +96,6 @@ enum class BuildingMaterial(
         imageResId = R.drawable.building_material_marble,
         titleResId = R.string.quest_building_material_value_marble
     ),
-    COPPER(
-        osmValue = "copper",
-        imageResId = R.drawable.building_material_copper,
-        titleResId = R.string.quest_building_material_value_copper
-    ),
     SLATE(
         osmValue = "slate",
         imageResId = R.drawable.building_material_slate,
@@ -131,11 +116,6 @@ enum class BuildingMaterial(
         imageResId = R.drawable.building_material_tiles,
         titleResId = R.string.quest_building_material_value_tiles
     ),
-    METAL_PLATES(
-        osmValue = "metal_plates",
-        imageResId = R.drawable.building_material_metal_plates,
-        titleResId = R.string.quest_building_material_value_metal_plates
-    ),
     BAMBOO(
         osmValue = "bamboo",
         imageResId = R.drawable.building_material_bamboo,

diff --git a/app/src/main/res/drawable-hdpi/building_material_copper.jpg b/app/src/main/res/drawable-hdpi/building_material_copper.jpg
diff --git a/app/src/main/res/drawable-hdpi/building_material_metal_plates.jpg b/app/src/main/res/drawable-hdpi/building_material_metal_plates.jpg
diff --git a/app/src/main/res/drawable-hdpi/building_material_steel.jpg b/app/src/main/res/drawable-hdpi/building_material_steel.jpg
diff --git a/app/src/main/res/drawable-hdpi/building_material_tin.jpg b/app/src/main/res/drawable-hdpi/building_material_tin.jpg
diff --git a/app/src/main/res/drawable-mdpi/building_material_copper.jpg b/app/src/main/res/drawable-mdpi/building_material_copper.jpg
diff --git a/app/src/main/res/drawable-mdpi/building_material_metal_plates.jpg b/app/src/main/res/drawable-mdpi/building_material_metal_plates.jpg
diff --git a/app/src/main/res/drawable-mdpi/building_material_steel.jpg b/app/src/main/res/drawable-mdpi/building_material_steel.jpg
diff --git a/app/src/main/res/drawable-mdpi/building_material_tin.jpg b/app/src/main/res/drawable-mdpi/building_material_tin.jpg
diff --git a/app/src/main/res/drawable-xhdpi/building_material_copper.jpg b/app/src/main/res/drawable-xhdpi/building_material_copper.jpg
diff --git a/app/src/main/res/drawable-xhdpi/building_material_metal_plates.jpg b/app/src/main/res/drawable-xhdpi/building_material_metal_plates.jpg
diff --git a/app/src/main/res/drawable-xhdpi/building_material_steel.jpg b/app/src/main/res/drawable-xhdpi/building_material_steel.jpg
diff --git a/app/src/main/res/drawable-xhdpi/building_material_tin.jpg b/app/src/main/res/drawable-xhdpi/building_material_tin.jpg
diff --git a/app/src/main/res/drawable-xxhdpi/building_material_copper.jpg b/app/src/main/res/drawable-xxhdpi/building_material_copper.jpg
diff --git a/app/src/main/res/drawable-xxhdpi/building_material_metal_plates.jpg b/app/src/main/res/drawable-xxhdpi/building_material_metal_plates.jpg
diff --git a/app/src/main/res/drawable-xxhdpi/building_material_steel.jpg b/app/src/main/res/drawable-xxhdpi/building_material_steel.jpg
diff --git a/app/src/main/res/drawable-xxhdpi/building_material_tin.jpg b/app/src/main/res/drawable-xxhdpi/building_material_tin.jpg
diff --git a/app/src/main/res/values/strings_ee.xml b/app/src/main/res/values/strings_ee.xml
@@ -681,25 +681,21 @@ Out of the box SCEE is configured to behave very similar to StreetComplete.</str
     <string name="quest_building_material_value_wood">Wood</string>
     <string name="quest_building_material_value_concrete">Concrete</string>
     <string name="quest_building_material_value_metal">Metal</string>
-    <string name="quest_building_material_value_steel">Steel</string>
     <string name="quest_building_material_value_stone">Stone</string>
     <string name="quest_building_material_value_glass">Glass</string>
     <string name="quest_building_material_value_mirror">Mirror</string>
     <string name="quest_building_material_value_mud">Mud</string>
-    <string name="quest_building_material_value_tin">Tin</string>
     <string name="quest_building_material_value_plastic">Plastic</string>
     <string name="quest_building_material_value_timber_framing">Timber Framing</string>
     <string name="quest_building_material_value_sandstone">Sandstone</string>
     <string name="quest_building_material_value_clay">Clay</string>
     <string name="quest_building_material_value_reed">Reed</string>
     <string name="quest_building_material_value_loam">Loam</string>
     <string name="quest_building_material_value_marble">Marble</string>
-    <string name="quest_building_material_value_copper">Copper</string>
     <string name="quest_building_material_value_slate">Slate</string>
     <string name="quest_building_material_value_vinyl">Vinyl</string>
     <string name="quest_building_material_value_limestone">Limestone</string>
     <string name="quest_building_material_value_tiles">Tiles</string>
-    <string name="quest_building_material_value_metal_plates">Metal_plates</string>
     <string name="quest_building_material_value_bamboo">Bamboo</string>
     <string name="quest_building_material_value_adobe">Adobe</string>
 </resources>