Add CardAttribute UNKNOWN value

Author: edipo2s

app/src/main/kotlin/com/ediposouza/teslesgendstracker/data/Card.kt

@@ -62,7 +62,18 @@ enum class CardAttribute(@DrawableRes val imageRes: Int, val isBasic: Boolean =
     AGILITY(R.drawable.attr_agility),
     ENDURANCE(R.drawable.attr_endurance),
     NEUTRAL(R.drawable.attr_neutral, false),
-    DUAL(R.drawable.attr_dual, false)
+    DUAL(R.drawable.attr_dual, false),
+    UNKNOWN(R.drawable.attr_neutral, false);
+
+    companion object {
+
+        fun of(value: String): CardAttribute {
+            val name = value.trim().toUpperCase().replace(" ", "_")
+            return if (values().map { it.name }.contains(name)) valueOf(name) else UNKNOWN
+        }
+
+    }
+
 
 }
 

app/src/main/kotlin/com/ediposouza/teslesgendstracker/interactor/FirebaseParsers.kt

@@ -44,8 +44,8 @@ abstract class FirebaseParsers {
             var clsAttr1 = attr
             var clsAttr2 = attr
             if (attr == CardAttribute.DUAL) {
-                clsAttr1 = CardAttribute.valueOf(attr1.trim().toUpperCase())
-                clsAttr2 = CardAttribute.valueOf(attr2.trim().toUpperCase())
+                clsAttr1 = CardAttribute.of(attr1.trim().toUpperCase())
+                clsAttr2 = CardAttribute.of(attr2.trim().toUpperCase())
             }
             return Card(name, shortName, set, attr, clsAttr1, clsAttr2, CardRarity.of(rarity), unique,
                     cost.toIntSafely(), attack.toIntSafely(), health.toIntSafely(),

app/src/main/kotlin/com/ediposouza/teslesgendstracker/interactor/PublicInteractor.kt

@@ -51,7 +51,7 @@ object PublicInteractor : BaseInteractor() {
 
                     override fun onDataChange(ds: DataSnapshot) {
                         val cards = ds.children.map {
-                            val attr = CardAttribute.valueOf(it.key.toUpperCase())
+                            val attr = CardAttribute.of(it.key.toUpperCase())
                             it.children.map {
                                 it.getValue(FirebaseParsers.CardParser::class.java)?.toCard(it.key, set, attr)
                             }.filterNotNull()
@@ -141,7 +141,7 @@ object PublicInteractor : BaseInteractor() {
 
                     override fun onDataChange(ds: DataSnapshot) {
                         val cards = ds.children.map {
-                            val attr = CardAttribute.valueOf(it.key.toUpperCase())
+                            val attr = CardAttribute.of(it.key.toUpperCase())
                             it.children.map {
                                 it.getValue(FirebaseParsers.CardParser::class.java)?.toCard(it.key, set, attr)
                             }.filterNotNull()
@@ -244,7 +244,7 @@ object PublicInteractor : BaseInteractor() {
                                 unknownSetTitle = spoilerTitle
                             }
                             val cards = ds.children.map {
-                                val attr = CardAttribute.valueOf(it.key.toUpperCase())
+                                val attr = CardAttribute.of(it.key.toUpperCase())
                                 it.children.map {
                                     it.getValue(FirebaseParsers.CardParser::class.java)?.toCard(it.key, set, attr)
                                 }.filterNotNull()

app/src/main/kotlin/com/ediposouza/teslesgendstracker/ui/arena/widget/ArenaDraftCards.kt

@@ -209,9 +209,9 @@ class ArenaDraftCards(ctx: Context?, attrs: AttributeSet?, defStyleAttr: Int) :
             CardArenaTierPlusType.COST -> getExtraPointsForIntValue(arenaTierPlus, draftedCard.cost)
             CardArenaTierPlusType.HEALTH -> getExtraPointsForIntValue(arenaTierPlus, draftedCard.health)
             CardArenaTierPlusType.ATTR -> extraPoints.takeIf {
-                !reverseCalc && (draftedCard.attr == CardAttribute.valueOf(arenaTierPlus.value.toUpperCase()) ||
-                        draftedCard.dualAttr1 == CardAttribute.valueOf(arenaTierPlus.value.toUpperCase()) ||
-                        draftedCard.dualAttr2 == CardAttribute.valueOf(arenaTierPlus.value.toUpperCase()))
+                !reverseCalc && (draftedCard.attr == CardAttribute.of(arenaTierPlus.value.toUpperCase()) ||
+                        draftedCard.dualAttr1 == CardAttribute.of(arenaTierPlus.value.toUpperCase()) ||
+                        draftedCard.dualAttr2 == CardAttribute.of(arenaTierPlus.value.toUpperCase()))
             } ?: 0
             CardArenaTierPlusType.KEYWORD -> extraPoints.takeIf {
                 draftedCard.keywords.filter { it.name == arenaTierPlus.value.toUpperCase() }.isNotEmpty()

app/src/main/kotlin/com/ediposouza/teslesgendstracker/ui/cards/widget/CollectionStatistics.kt

@@ -118,6 +118,7 @@ class CollectionStatistics(ctx: Context?, attrs: AttributeSet?, defStyleAttr: In
         CardAttribute.ENDURANCE -> rootView.rarity_statistics_endurance
         CardAttribute.NEUTRAL -> rootView.rarity_statistics_neutral
         CardAttribute.DUAL -> rootView.rarity_statistics_dual
+        CardAttribute.UNKNOWN -> rootView.rarity_statistics_neutral
     }
 
 }

app/src/main/kotlin/com/ediposouza/teslesgendstracker/ui/decks/DecksFragment.kt

@@ -312,7 +312,7 @@ class DecksFragment : BaseFragment(), SearchView.OnQueryTextListener {
                         val deckCls = it.select(".deck_head_image_attributes").map {
                             val cardCls1 = it.child(0).attr("alt").toUpperCase()
                             val cardCls2 = it.child(1).attr("alt").toUpperCase()
-                            DeckClass.getClass(CardAttribute.valueOf(cardCls1), CardAttribute.valueOf(cardCls2))
+                            DeckClass.getClass(CardAttribute.of(cardCls1), CardAttribute.of(cardCls2))
                         }.first()
                         val deckType = DeckType.of(with(it.select(".panel-body .center").first().text()) {
                             substring(indexOfLast { it == ' ' } + 1).replace("-", "")

app/src/main/kotlin/com/ediposouza/teslesgendstracker/ui/seasons/PatchActivity.kt

@@ -180,7 +180,7 @@ class PatchActivity : BaseActivity() {
                 patch_card_old_image.loadFromPatch(patchChange, patchUuid, false)
                 patch_card_new_image.loadFromPatch(patchChange, nextPatchUuid, true)
                 val set = CardSet.of(patchChange.set)
-                val attr = CardAttribute.valueOf(patchChange.attr.toUpperCase())
+                val attr = CardAttribute.of(patchChange.attr.toUpperCase())
                 PublicInteractor.getCard(set, attr, patchChange.shortName) { card ->
                     patch_card_old_image.setOnClickListener { itemClick(patch_card_old_image, card) }
                     patch_card_new_image.setOnClickListener { itemClick(patch_card_new_image, card) }

app/src/main/kotlin/com/ediposouza/teslesgendstracker/ui/seasons/SeasonsFragment.kt

@@ -134,7 +134,7 @@ class SeasonsFragment : BaseFragment() {
                 season_patches_recycler_view.adapter = PatchAdapter(seasonPatches, onPatchClick)
                 doAsync {
                     if (season.rewardCardShortname != null) {
-                        val rewardAttr = CardAttribute.valueOf(season.rewardCardAttr.toUpperCase())
+                        val rewardAttr = CardAttribute.of(season.rewardCardAttr.toUpperCase())
                         PublicInteractor.getCard(CardSet.CORE, rewardAttr, season.rewardCardShortname) { card ->
                             context.runOnUiThread {
                                 season_card_reward.loadFromCard(card)