Added missing assets to for tools in ASB and polishing.

app/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":14,"versionName":"1.5.2","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":21,"versionName":"2.0.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release","dirName":""},"path":"app-release.apk","properties":{}}]

app/src/main/java/com/gatheringhallstudios/mhworlddatabase/assets/AssetLoader.kt

@@ -72,7 +72,7 @@ object AssetLoader {
 
     fun loadIconFor(tool: ToolBase): Drawable? {
         return ctx.getVectorDrawable(when (tool.tool_type) {
-            ToolType.MANTLE -> "Mantle"
+            ToolType.MANTLE -> "ToolMantle"
             ToolType.BOOSTER -> "Booster"
         }, tool.icon_color)
     }

app/src/main/java/com/gatheringhallstudios/mhworlddatabase/features/tools/detail/ToolDetailFragment.kt

@@ -3,13 +3,13 @@ package com.gatheringhallstudios.mhworlddatabase.features.tools.detail
 import android.app.Application
 import android.os.Bundle
 import android.view.*
-import androidx.appcompat.content.res.AppCompatResources
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
 import com.gatheringhallstudios.mhworlddatabase.AppSettings
 import com.gatheringhallstudios.mhworlddatabase.R
+import com.gatheringhallstudios.mhworlddatabase.assets.AssetLoader
 import com.gatheringhallstudios.mhworlddatabase.assets.SlotEmptyRegistry
 import com.gatheringhallstudios.mhworlddatabase.data.MHWDatabase
 import com.gatheringhallstudios.mhworlddatabase.data.models.Tool
@@ -49,7 +49,7 @@ class ToolDetailFragment : androidx.fragment.app.Fragment() {
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        val toolId = arguments!!.getInt(ARG_TOOL_ID)
+        val toolId = requireArguments().getInt(ARG_TOOL_ID)
         viewModel.loadTool(toolId, AppSettings.dataLocale)
         viewModel.tool.observe(viewLifecycleOwner, Observer(::populateTool))
     }
@@ -58,7 +58,7 @@ class ToolDetailFragment : androidx.fragment.app.Fragment() {
         inflater.inflate(R.menu.main_bookmarkable, menu)
         val itemData = viewModel.tool.value
         if (itemData != null && BookmarksFeature.isBookmarked(itemData)) {
-            menu.findItem(R.id.action_toggle_bookmark).icon = (context!!.getDrawableCompat(R.drawable.ic_sys_bookmark_on))
+            menu.findItem(R.id.action_toggle_bookmark).icon = (requireContext().getDrawableCompat(R.drawable.ic_sys_bookmark_on))
         }
     }
 
@@ -68,31 +68,31 @@ class ToolDetailFragment : androidx.fragment.app.Fragment() {
         super.onOptionsItemSelected(item)
         return if (id == R.id.action_toggle_bookmark) {
             BookmarksFeature.toggleBookmark(viewModel.tool.value)
-            activity!!.invalidateOptionsMenu()
+            requireActivity().invalidateOptionsMenu()
             true
         } else false
     }
 
     private fun populateTool(toolData: Tool?) {
-        if (toolData == null) return;
+        if (toolData == null) return
         setActivityTitle(toolData.name)
 
         //Rerender the menu bar because we are 100% sure we have the tool data now
-        activity!!.invalidateOptionsMenu()
+        requireActivity().invalidateOptionsMenu()
 
         tool_header.setTitleText(toolData.name)
         tool_header.setSubtitleText(when (toolData.tool_type) {
-            ToolType.MANTLE -> context!!.getString(R.string.tool_mantle)
-            ToolType.BOOSTER -> context!!.getString(R.string.tool_booster)
+            ToolType.MANTLE -> requireContext().getString(R.string.tool_mantle)
+            ToolType.BOOSTER -> requireContext().getString(R.string.tool_booster)
         })
-        tool_header.setIconDrawable(AppCompatResources.getDrawable(context!!, R.drawable.ic_question_mark))
+        tool_header.setIconDrawable(AssetLoader.loadIconFor(toolData))
 
         effect_duration_value.text = if (toolData.duration_upgraded != null) String.format("%d (%d)",
                 toolData.duration, toolData.duration_upgraded) else toolData.duration.toString()
         recharge_time_value.text = toolData.recharge.toString()
 
         val slotImages = toolData.slots.map {
-            this.context!!.getDrawableCompat(SlotEmptyRegistry(it))
+            this.requireContext().getDrawableCompat(SlotEmptyRegistry(it))
         }
         slot1.setImageDrawable(slotImages[0])
         slot2.setImageDrawable(slotImages[1])

app/src/main/java/com/gatheringhallstudios/mhworlddatabase/features/workshop/UserEquipmentCard.kt

@@ -94,6 +94,8 @@ class UserEquipmentCard(private val card: ExpandableCardView) {
         val header = card.card_header
         header.equipment_name.text = tool.name
         header.equipment_icon.setImageDrawable(AssetLoader.loadIconFor(tool))
+        header.defense_value.visibility = View.INVISIBLE
+        header.icon_defense.visibility = View.INVISIBLE
         header.rarity_string.text = when (tool.tool_type) {
             ToolType.MANTLE -> getString(R.string.tool_mantle)
             ToolType.BOOSTER -> getString(R.string.tool_booster)
@@ -421,7 +423,7 @@ class UserEquipmentCard(private val card: ExpandableCardView) {
     }
 
     fun bindEmptyTool() {
-        setEmptyView(R.string.user_equipment_set_no_equipment, R.drawable.ic_equipment_charm_empty)
+        setEmptyView(R.string.user_equipment_set_no_equipment, R.drawable.ic_equipment_mantle_empty)
     }
 
     fun populateSkills(skills: List<SkillLevel>) {

app/src/main/java/com/gatheringhallstudios/mhworlddatabase/features/workshop/detail/WorkshopSummaryFragment.kt

@@ -33,7 +33,7 @@ import kotlinx.android.synthetic.main.listitem_weapon.view.slot3
 
 class WorkshopSummaryFragment : androidx.fragment.app.Fragment() {
     private val viewModel: UserEquipmentSetViewModel by lazy {
-        ViewModelProviders.of(activity!!).get(UserEquipmentSetViewModel::class.java)
+        ViewModelProviders.of(requireActivity()).get(UserEquipmentSetViewModel::class.java)
     }
 
     override fun onCreateView(inflater: LayoutInflater, parent: ViewGroup?, savedInstanceState: Bundle?): View? {
@@ -54,7 +54,7 @@ class WorkshopSummaryFragment : androidx.fragment.app.Fragment() {
         armor_set_set_bonus_list.removeAllViews()
         weapon_list.removeAllViews()
 
-        armor_set_header.setIconDrawable(context!!.getVectorDrawable("ArmorChest", "rare${userEquipmentSet.maxRarity}"))
+        armor_set_header.setIconDrawable(requireContext().getVectorDrawable("ArmorChest", "rare${userEquipmentSet.maxRarity}"))
 
         armor_set_header.setTitleText(userEquipmentSet.name)
         armor_set_defense_value.text = getString(
@@ -71,6 +71,7 @@ class WorkshopSummaryFragment : androidx.fragment.app.Fragment() {
 
         populateWeapon(userEquipmentSet.equipment.filter { it.type() == DataType.WEAPON }, showTrueAttackValues)
         populateArmorSetPieces(userEquipmentSet.equipment.filter { it.type() == DataType.ARMOR }.sortedWith(compareBy { (it as UserArmorPiece).armor.armor.armor_type }))
+        populateCharm(userEquipmentSet.equipment.filter { it.type() == DataType.CHARM})
         populateTools(userEquipmentSet.equipment.filter { it.type() == DataType.TOOL }.sortedBy { (it as UserTool).orderId })
         populateArmorSkills(userEquipmentSet.skills)
         populateArmorSetBonuses(userEquipmentSet.setBonuses)
@@ -136,7 +137,7 @@ class WorkshopSummaryFragment : androidx.fragment.app.Fragment() {
                     R.drawable.ic_ui_affinity,
                     affinityValue)
 
-            affinityView.labelView.setTextColor(ContextCompat.getColor(context!!, when {
+            affinityView.labelView.setTextColor(ContextCompat.getColor(requireContext(), when {
                 weapon.affinity > 0 -> R.color.textColorGreen
                 else -> R.color.textColorRed
             }))
@@ -153,7 +154,7 @@ class WorkshopSummaryFragment : androidx.fragment.app.Fragment() {
                     defenseValue
             )
 
-            defenseView.labelView.setTextColor(ContextCompat.getColor(context!!, when {
+            defenseView.labelView.setTextColor(ContextCompat.getColor(requireContext(), when {
                 weapon.defense > 0 -> R.color.textColorGreen
                 else -> R.color.textColorRed
             }))
@@ -237,6 +238,29 @@ class WorkshopSummaryFragment : androidx.fragment.app.Fragment() {
         }
     }
 
+    private fun populateCharm(userCharms: List<UserEquipment>) {
+        if (userCharms.isNullOrEmpty()) return // Do nothing
+
+        val charm = (userCharms.first() as UserCharm).charm
+        val view = layoutInflater.inflate(R.layout.listitem_armorset_armor, armor_set_piece_list, false)
+
+        view.armor_name.text = charm.charm.name
+        view.armor_icon.setImageDrawable(AssetLoader.loadIconFor(charm.charm))
+
+        view.icon_defense.visibility = View.INVISIBLE
+        view.defense_value.visibility = View.INVISIBLE
+        view.icon_slots.visibility = View.INVISIBLE
+        view.slot1.visibility = View.INVISIBLE
+        view.slot2.visibility = View.INVISIBLE
+        view.slot3.visibility = View.INVISIBLE
+
+        view.setOnClickListener {
+            getRouter().navigateCharmDetail(charm.charm.id)
+        }
+
+        armor_set_piece_list.addView(view)
+    }
+
     private fun populateTools(tools: List<UserEquipment>) {
         //Append to the bottom of the armor piece list, so do nothing if we have none
         if (tools.isNullOrEmpty()) return

app/src/main/res/drawable-anydpi/ic_equipment_armor_set_empty.xml

@@ -4,7 +4,7 @@
     android:viewportWidth="512"
     android:viewportHeight="512">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="#C2BFBF"
         android:fillType="evenOdd"
         android:pathData="M378.52 428H133.48v-39.67l86.48-16.53L256 388.33l36.04-16.53 86.48 16.53V428zm-104.5-72.72v16.52L256 378.42l-18.02-6.62v-16.52l18.02-9.92 18.02 9.92zm-201.8-66.12h54.05v56.2H90.24l-18.02-13.22v-42.98zm349.55 56.2h-36.04v-56.2h54.05v42.98l-18.01 13.22zm-72.07-13.22H162.3v-42.98h187.4v42.98zm-216.22-42.98h14.41v28.1h-14.41v-28.1zm245.04 28.1h-14.41v-28.1h14.41v28.1zm-306.3-97.51h54.05v56.2H72.22v-56.2zm367.56 56.2h-54.05v-56.2h54.05v56.2zM207 209.82l49.01-3.3 49 3.3 30.28 26.44h14.41v13.23l-32.43 26.44H194.74L162.3 249.5v-13.23h14.41l30.27-26.44zm-51.9-16.53h25.23v29.75H155.1V193.3zm201.81 29.75h-25.22V193.3h25.22v29.75zM72.22 193.3h54.05v13.22H72.22V193.3zm367.56 13.22h-54.05V193.3h54.05v13.22zm-216.21-95.86h64.86v40.48l25.23 10.5 7.2-8h14.42v26.44l-18.02 13.22H194.74l-18.02-13.22v-26.45h14.41l7.21 8 25.23-10.5v-40.47zm-118.92 56.2l18.02 13.22H86.63V137.1h18.02v29.75zm320.72 13.22h-36.04l18.02-13.22V137.1h18.02v42.97zm-46.85-13.22h-14.41l-61.26-56.2V84.22h72.07l18.02 13.22v52.89l-14.42 16.53zm-275.67-45.97v-27.9L131.77 68h93.6v26.45h61.26V68h93.6l28.92 25.86v27.03h32.43v56.2H456v163.26l-24.64 18.08-9.6 3.15h-27.02v82.64H117.26v-82.64H84.92L56 340.35V177.08h14.42V120.9h32.43zm106.3-10.23V84.22h-72.07l-18.02 13.22v52.89l14.42 16.53h14.41l61.26-56.2z"/>
 </vector>

app/src/main/res/drawable-anydpi/ic_equipment_charm_empty.xml

@@ -2,10 +2,9 @@
     android:width="72dp"
     android:height="72dp"
     android:viewportWidth="512"
-    android:viewportHeight="512"
-    android:tint="@color/icon_gray">
+    android:viewportHeight="512">
     <path
-        android:fillColor="#E2E2E2"
+        android:fillColor="#C2BFBF"
         android:fillType="evenOdd"
         android:pathData="M161.29 151.72V84.09a27.87 27.87 0 0 1 27.87-27.87h232.6a27.87 27.87 0 0 1 27.88 27.87V272.3a27.87 27.87 0 0 1-27.88 27.88h-75.04a27.87 27.87 0 0 1-27.87-27.88V159.38h-74.82a19.47 19.47 0 0 1 2.79 10.07v27.52a104.1 104.1 0 0 1 55.83 92.25c0 56.9-45.68 103.14-102.39 104.1l62.36 60.62 0.97-68.61h71.93v14.13l-55.6 55.72H117.15l-55.43-55.43v-13.56h72.05l0.96 68.08 62.69-60.94c-57.07-0.56-103.15-46.96-103.15-104.11a104.1 104.1 0 0 1 55.73-92.2v-27.57c0-7.85 4.62-14.62 11.29-17.73zm213.3-20.22c0-7.61-3.05-14.5-8-19.54h27.3v132.48h-19.3V131.5zM198.84 408.3l36.2 35.2h-72.4l36.2-35.2zm-76.64-10.53l0.65 46.51-47.17-47.17 46.52 0.66zm158.76-140.75c-7.88-8.56-17.2-12.95-27.93-12.95a25.25 25.25 0 0 0-17 6.28c-3.56 3.03-6.18 6.39-10.38 12.7l-1.75 2.63c-4.17 6.25-6.82 9.55-10.19 12.25-4.13 3.31-8.85 5-14.98 5-6.13 0-10.9-1.7-15.17-5.03-3.46-2.7-6.08-5.82-10.8-12.37l-0.97-1.35c-4.97-6.9-7.76-10.25-11.74-13.46a29.2 29.2 0 0 0-19.01-6.65c-8.82 0-16.38 2.5-22.67 7.37a88.8 88.8 0 0 1 31.6-36.26l96.86-0.08a88.79 88.79 0 0 1 34.13 41.92zm6 29.23a90.01 90.01 0 0 1 0.05 2.97c0 48.86-39.65 88.47-88.55 88.47s-88.55-39.61-88.55-88.47c0-1.81 0.06-3.6 0.17-5.39 5.7-20.4 15.92-29.98 30.96-29.98 5.12 0 9.15 1.5 12.88 4.5 3.07 2.47 5.47 5.34 9.93 11.55l0.98 1.35c5.24 7.28 8.3 10.91 12.7 14.35 5.97 4.67 12.86 7.11 21.2 7.11 8.37 0 15.24-2.46 21.1-7.14 4.37-3.5 7.52-7.43 12.2-14.47 0.35-0.5 1.53-2.3 1.76-2.63 7.36-11.05 11.55-14.62 19.24-14.62 13.94 0 25.26 10.43 33.93 32.4zm-127.13 3.5c-2.81 9.2-5.64 15.21-8.48 18.05-2.85 2.85-8.84 5.65-17.98 8.4 9.29 3.62 15.28 6.78 17.98 9.47 2.7 2.7 5.52 8.37 8.48 17 2.73-8.42 5.56-14.08 8.47-17 2.91-2.9 8.91-6.07 18-9.47-9.05-2.64-15.05-5.44-18-8.4-2.96-2.95-5.78-8.97-8.47-18.06zM275.16 396.9l46.95-0.66-47.6 47.61 0.65-46.95zm-105.6-231.36h57.7a3.91 3.91 0 0 1 3.91 3.9v32.28a3.91 3.91 0 0 1-3.91 3.91h-57.7a3.91 3.91 0 0 1-3.91-3.9v-32.28a3.91 3.91 0 0 1 3.9-3.91zm36.8-44.55c1.86-1.11 4.01-1.71 6.23-1.71h4.89v24.94l-0.75 0.82-18.54-15.9 8.16-8.15zm-4.97-8.87l-24.45 24.45v-30.7h24.45v6.25zm10.22-15.8V71.85h18.58v24.45h-18.58zm28.36 0V71.85h18.59v24.45h-18.59zm28.36 0V71.85h18.59v24.45h-18.59zm28.37 0V71.85h18.58v24.45H296.7zm28.36 0V71.85h18.58v24.45h-18.58zm28.36 0V71.85H372v24.45h-18.58zm28.36 0V71.85h17.6v24.45h-17.6zm27.76 9.56h24.45v14.67h-24.45v-14.67zm0 24.45h24.45v16.62h-24.45v-16.62zm0 26.4h24.45v16.63h-24.45v-16.63zm0 26.4h24.45v16.64h-24.45v-16.63zm0 26.42h24.45v14.67h-24.45v-14.67zm0 24.45h24.45v16.62h-24.45V234zm-11.13 26.09v24.45h-27.39v-24.45h27.39zm-39.46-9.47H334.5v-17.6h24.45v17.6zm0-27.38H334.5v-17.6h24.45v17.6zm0-27.39H334.5v-15.64h24.45v15.64zm0-25.42H334.5V153.8h24.45v16.63zm0-26.41h-24.11v-24.74h11.88c6.75 0 12.23 5.47 12.23 12.22v12.52zm-33.9-24.74v24.45H310.4v-24.45h14.67zm-24.44 0v24.45h-16.63v-24.45h16.63zm-26.4 0v24.45h-18.59v-24.45h18.58zm-28.37 0v24.45h-18.58v-24.45h18.58zm-38.4 30.67l-30.13 0.08 13.94-13.95 16.18 13.87zM334.5 260.4h26.74v24.14h-14.52a12.22 12.22 0 0 1-12.22-12.23v-11.9zm73.69 24.14V260.4h25.8v11.91c0 6.75-5.48 12.23-12.23 12.23H408.2zm25.8-188.44h-24.82V71.86h12.6c6.74 0 12.22 5.48 12.22 12.23v12zM201.83 71.86V96.1h-24.9V84.09c0-6.75 5.48-12.23 12.23-12.23h12.67z"/>
 </vector>

app/src/main/res/drawable-anydpi/ic_equipment_chest_empty.xml

@@ -4,7 +4,7 @@
     android:viewportWidth="512"
     android:viewportHeight="512">
     <path
-        android:fillColor="#E2E2E2"
+        android:fillColor="#C2BFBF"
         android:fillType="evenOdd"
         android:pathData="M416.25 438.32H95.75v-35h320.5v35zm-33.26-72.93c26.57 0 27.21 26.22 27.21 26.26H101.8s0.62-26.26 27.21-26.26H383zM141.1 353.73v-43.76c-6.44-16.93-24.2-17.5-24.2-17.5v-23.34h27.22c13.37 0 21.15-17.48 21.16-17.5h181.42c0.02 0.05 7.8 17.5 21.16 17.5h27.21v23.33s-17.75 0.58-24.19 17.5v43.77H141.1zm130-11.67v-23.34h-30.23v23.34h30.24zm-51.4-23.34h-24.18v23.34h24.19v-23.34zm-45.35 0h-24.18v23.34h24.18v-23.34zm142.11 23.34v-23.34h-24.19v23.34h24.2zm45.35 0v-23.34h-24.18v23.34h24.18zm-220.71-84.6h-24.2v-35l24.2 11.66v23.34zm253.97 0H370.9v-23.34l24.2-11.67v35zm-99.77-134.2v49.6h63.49c18.39 19.93 36.28 17.5 36.28 17.5v17.5c-48.1 0-48.37 26.22-48.37 26.26H165.29s-0.24-26.25-48.37-26.25v-17.5s17.9 2.42 36.28-17.51h63.5v-49.6h78.6zm-220.72 49.6V99.93c3.2-15.48 27.17-26.24 27.2-26.25h75.6v49.59l-51.4 49.59h-51.4zM410.2 73.68c0.07 0.03 24 10.78 27.21 26.25v72.93h-51.4l-51.4-49.6V73.69h75.6zm-293.28 64.17h-24.2v23.34h24.2v-23.34zm302.35 23.34v-23.34h-24.19v23.34h24.2zM116.92 99.93h-24.2v23.34h24.2V99.93zm226.66 55.46l-27.07-24.57v-74.6h97.74l3.8 1.72c16.44 7.62 31.89 19.15 36.6 36.47a43.01 43.01 0 0 1 0.44 1.74l0.42 2v92.18h-42.33v118.85l-17.1 0.73c-2.74 0.3-5.45 1.61-7.02 3.81L389 348.25c11.96 1.6 22.15 6.83 29 15.23 5.2 6.39 8.37 14.2 9.72 22.17l6.63 0.2v69.94H77.65v-69.94h6.6c3-18.46 17.18-34.6 37.2-37.4 0.68-0.1 1.55-0.2 1.55-0.2v-34.43c-1.53-2.27-4.18-3.56-7.07-3.91l-17.11-0.73V190.33H56.49V98.16l0.42-2C60.9 78.36 78.06 65.5 93.4 58.18l4.35-1.98h97.74v74.6l-27.07 24.58h30.17V105.8h114.82v49.6h30.17z"/>
 </vector>

app/src/main/res/drawable-anydpi/ic_equipment_head_empty.xml

@@ -2,10 +2,9 @@
     android:width="72dp"
     android:height="72dp"
     android:viewportWidth="512"
-    android:viewportHeight="512"
-    android:tint="@color/icon_gray">
+    android:viewportHeight="512">
     <path
-        android:fillColor="#E2E2E2"
+        android:fillColor="#C2BFBF"
         android:fillType="evenOdd"
         android:pathData="M141.38 384.4l36.24-8.7V352.3l-1.38-0.54c-29.61-11.72-55.78-31.75-71.12-59.05-10.19-18.14-14.96-38.82-15.08-59.43L90 215.41h175.44a92.4 92.4 0 0 1 1.99-11.79H124.7l-5.37-5.2-0.19-0.18c-17.14-17.2-22.43-44.63-7.8-66.34 6.53-9.7 15.87-17.4 25.86-23.66l4.78-2.97h12.24l1.55-2.8c11.22-20.05 29.57-36.64 52.04-44.54a56.71 56.71 0 0 1 4.05-1.28l2.5-0.65h110.29c22.01 5.18 42.6 15.9 58.33 31.5 15.15 15.05 26.88 33.64 32.42 53.86l5.84 21.84s-6.91 10.76-8.5 14.53H416v85.32l-75.5 72.46v42.46l27.18 11.6v63.3h-226.3V384.4zm55.12 6.45h127.08l27.23 11.6v34.8h-15.13v-23.2h-20.04v23.2h-18.16v-23.2h-28.36v23.2h-27.24v-23.2h-24.2v23.2h-18.16v-23.2h-21.18v23.2H160.2v-37.7l36.3-8.7zm127.08-49.3v37.7H196.5v-14.5c28.9 0 51.4-23.17 51.44-23.2h75.64zm-99.85 0H196.5s-87.75-21.06-87.75-107.3h175.5s-6.64-58 42.36-58c0 0 20.9-0.13 31 16.85 7.72 13.12 5.26 29.58-6 40.09-7.5 7-19.9 13.11-40.13 12.66l-87.75 95.7zm37.82-11.6s32.83-55.34 81.7-72.5c0 0 31.38-8.36 31.77-26.1v-34.8h24.2v60.9l-75.64 72.5h-62.03zm82.17-118.9l-17.11-16.4-17.12 16.4 17.12 16.4 17.11-16.4zm-71.58-23.2H132.96s-34.63-33.05 15.13-63.8h187.6s44.04 10.45 63.54 34.8c0 0 3.57 26.77-24.21 26.1 0 0-51.27-59.15-102.88 2.9zm127.09-40.6c-33.47-35.56-75.6-34.8-75.65-34.8H172.29c16.8-30.5 45.35-37.7 45.39-37.7h105.9c60.3 14.08 75.65 72.5 75.65 72.5z"/>
 </vector>

app/src/main/res/drawable-anydpi/ic_equipment_leg_empty.xml

@@ -2,10 +2,9 @@
     android:width="72dp"
     android:height="72dp"
     android:viewportWidth="512"
-    android:viewportHeight="512"
-    android:tint="@color/icon_gray">
+    android:viewportHeight="512">
     <path
-        android:fillColor="#E2E2E2"
+        android:fillColor="#C2BFBF"
         android:fillType="evenOdd"
         android:pathData="M242.1 333.15h18.54c6.17 0 6.17 9.15 6.17 15.28v87.56h-24.7V333.15zM229.76 436h-64.84V280.32h64.84V436zm185.28-142.7l21.61 29.2v74.59c0 31.71-30.83 38.9-30.88 38.91H347.1v-58.37c1.85-22.1 43.23-45.4 43.23-45.4V293.3h24.7zM331.65 436h-49.4v-94.05s-0.63-20.04-18.53-22.7h-21.61v-38.92H371.8v42.16s-33.57 16.18-40.15 42.16V436zm-179.1-9.73H90.82l-15.45-9.72v-18.1h40.14v-15.1H75.36v-17.08h40.14v-17.83H75.36V332.4h40.14v-16.28H75.36V293.3l52.5-12.98 24.7 12.98v132.96zm52.5-35.67h-15.44v29.19h15.44v-29.19zm0-42.16h-15.44v29.19h15.44v-29.2zm0-42.16h-15.44v29.19h15.44v-29.2zm37.06-120H371.8v68.1H242.1v-68.1zm0-12.97v-55.13H371.8v55.13H242.1zm115.8-42.16h-23.17v16.22h23.16v-16.22zm-76.3 0h-27.15v16.22h27.15v-16.22zm40.63 0H294.1v16.22h28.13v-16.22zm-92.49-55.13h154.4v29.18h-154.4V76.01zm194.32 197.87l31.06 41.94v81.3c-0.07 16.81-7.28 33.46-19.57 44.2a62.47 62.47 0 0 1-25.44 13.55l-2.25 0.54H146.42v-9.73H85.7l-28.83-18.15V277.92l73.27-18.1 16.28 8.55v-7.46h77.2V124.6h-12.35V56.6h191.36v68.02h-12.35v149.27h33.79z"/>
 </vector>

app/src/main/res/drawable-anydpi/ic_equipment_mantle_empty.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="72dp"
+    android:height="72dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#C2BFBF"
+        android:fillType="evenOdd"
+        android:pathData="M364.5 298.13l-64.22-92.04l83.8-66.02l-105.49-80.43H125.56V224.4c-13.43 15.94-20.4 31.73-20.4 47.65c0 16.26 3.24 29.54 10.24 39.32L56.63 452.6h398.74c-49.32-59.37-86.17-104.32-110.55-134.83l19.68-19.64zm-223.75-89.5h14.96V91.29H188v117.34h32.44V74.83h-79.69v133.8zm132.48-133.8h-43.3v133.8h42.57l87.2-68.7l-86.47-65.1zm18.25 145.2H150.94c-20.4 18.6-30.6 35.95-30.6 52.01c0 17.59 4.3 29.61 12.87 36.07l17.59 21.5l41.15-37.66l41.37 38.2l39.51-38.56l38.35 38.33l13.28-13.3l20.29-20.24l-53.27-76.36zM79.4 437.4h341.34c-33.7-42.37-62.6-78.62-86.66-108.74l-23 22.65l-38.39-38.37l-39.1 38.14l-41.7-38.5l-42.64 39.03l-22.7-27.52L79.4 437.4z"/>
+</vector>