Merge branch 'release/v0.4.3'

Author: edipo2s

.idea/misc.xml

@@ -138,8 +138,10 @@ class DeckList(ctx: Context?, attrs: AttributeSet?, defStyleAttr: Int) :
         var attrGroup = HashMap<CardAttribute, List<CardSlot>>()
         attrGroup.putAll(cards.filter { it.card.attr.isBasic }.groupBy { it.card.attr }.toMutableMap())
         cards.filter { it.card.attr == CardAttribute.DUAL }.forEach {
-            attrGroup.put(it.card.dualAttr1, listOf(it))
-            attrGroup.put(it.card.dualAttr2, listOf(it))
+            val attr1List = attrGroup[it.card.dualAttr1] ?: listOf<CardSlot>()
+            val attr2List = attrGroup[it.card.dualAttr2] ?: listOf<CardSlot>()
+            attrGroup.put(it.card.dualAttr1, attr1List.plus(it))
+            attrGroup.put(it.card.dualAttr2, attr2List.plus(it))
         }
         decklist_class_attr1.visibility = View.VISIBLE.takeIf { attrGroup.size > 0 } ?: View.GONE
         decklist_class_attr1_qtd.visibility = View.VISIBLE.takeIf { attrGroup.size > 0 } ?: View.GONE

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

@@ -34,7 +34,7 @@ class PushNotificationService : FirebaseMessagingService() {
 
         remoteMessage.notification?.apply {
             Log.d(TAG, "Firebase Notification Message: " + body)
-            showNotification(getString(R.string.app_name), body, bundleData)
+            showNotification(getString(R.string.app_name), body ?: "", bundleData)
             return
         }
     }

app/src/main/kotlin/com/ediposouza/teslesgendstracker/ui/util/PushNotificationService.kt

@@ -2,8 +2,8 @@
 
 buildscript {
     ext {
-        appVersionName = "0.4.2"
-        appVersionCode = 13
+        appVersionName = "0.4.3"
+        appVersionCode = 14
 
         kotlin_version = "1.1.0-beta-38"
         prepareToRelease = true