Bump version to 0.4.0

Author: edipo2s

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

@@ -31,7 +31,6 @@ import com.ediposouza.teslesgendstracker.interactor.PublicInteractor
 import com.ediposouza.teslesgendstracker.ui.base.BaseActivity
 import com.ediposouza.teslesgendstracker.ui.base.CmdShowSnackbarMsg
 import com.ediposouza.teslesgendstracker.ui.cards.CardActivity
-import com.ediposouza.teslesgendstracker.ui.decks.widget.DeckList
 import com.ediposouza.teslesgendstracker.ui.util.CircleTransform
 import com.ediposouza.teslesgendstracker.ui.util.KeyboardUtil
 import com.ediposouza.teslesgendstracker.util.*
@@ -455,19 +454,23 @@ class DeckActivity : BaseActivity() {
                 val updateTime = deckUpdate.date.toLocalTime().format(DateTimeFormatter.ofPattern(TIME_PATTERN))
                 deck_update_title.text = context.getString(R.string.deck_details_last_update_format, updateDate, updateTime)
                 PublicInteractor.getCards(null, cls.attr1, cls.attr2, CardAttribute.DUAL, CardAttribute.NEUTRAL) { cards ->
-                    with(deck_update_changes) {
-                        val onItemClick = { view: View, card: Card -> showExpandedCard(context, card, view) }
-                        adapter = DeckList.DeckListAdapter({ }, onItemClick, { _, _ -> true }).apply {
-                            updateMode = true
-                            showDeck(deckUpdate.changes.map {
-                                val cardQtd = it
-                                CardSlot(cards.find { it.shortName == cardQtd.key }!!, it.value)
-                            })
-                        }
-                        layoutManager = LinearLayoutManager(context)
-                        setHasFixedSize(true)
-                    }
+                    configUpdateCardsChanges(cards, deckUpdate)
+                }
+            }
+        }
+
+        private fun DeckUpdateViewHolder.configUpdateCardsChanges(cards: List<Card>, deckUpdate: DeckUpdate) {
+            with(itemView.deck_update_changes) {
+                val onItemClick = { view: View, card: Card -> showExpandedCard(context, card, view) }
+                adapter = com.ediposouza.teslesgendstracker.ui.decks.widget.DeckList.DeckListAdapter({ }, onItemClick, { _, _ -> true }).apply {
+                    updateMode = true
+                    showDeck(deckUpdate.changes.map {
+                        val cardQtd = it
+                        com.ediposouza.teslesgendstracker.data.CardSlot(cards.find { it.shortName == cardQtd.key }!!, it.value)
+                    })
                 }
+                layoutManager = android.support.v7.widget.LinearLayoutManager(context)
+                setHasFixedSize(true)
             }
         }
 

app/src/release/java/com/ediposouza/teslesgendstracker/util/MetricsManager.kt

@@ -62,7 +62,7 @@ object MetricsManager : MetricsConstants() {
                     putString(action.PARAM_PATCH, action.patch)
                     putString(action.PARAM_PRIVATE, action.private.toString())
                 }
-                is MetricAction.ACTION_NEW_DECK_UPDATE -> {
+                is MetricAction.ACTION_DECK_UPDATE -> {
                     putString(action.PARAM_TYPE, action.type)
                     putString(action.PARAM_PATCH, action.patch)
                     putString(action.PARAM_PRIVATE, action.private.toString())
@@ -79,9 +79,10 @@ object MetricsManager : MetricsConstants() {
                     putString(action.PARAM_SEASON, action.season?.uuid ?: MetricAction.ALL)
                 is MetricAction.ACTION_MATCH_STATISTICS_CLASS ->
                     putString(action.PARAM_CLASS, action.cls.name)
-                is MetricAction.ACTION_NEW_MATCH_START_WITH ->
+                is MetricAction.ACTION_NEW_MATCH_START_WITH -> {
                     putString(action.PARAM_DECK, action.deck?.cls?.name ?: action.PARAM_DECK_VALUE_OTHER)
-                putBoolean(action.PARAM_FROM_ARENA, fromArena)
+                    putBoolean(action.PARAM_FROM_ARENA, action.fromArena)
+                }
                 is MetricAction.ACTION_NEW_MATCH_SAVE -> {
                     putString(action.PARAM_MY_CLS, action.myDeckCls.name)
                     putString(action.PARAM_MY_TYPE, action.myDeckType.name)

build.gradle

@@ -2,11 +2,11 @@
 
 buildscript {
     ext {
-        appVersionName = "0.3.3"
-        appVersionCode = 10
+        appVersionName = "0.4.0"
+        appVersionCode = 11
 
         kotlin_version = "1.1.0-beta-38"
-        prepareToRelease = false
+        prepareToRelease = true
     }
 
     repositories {

gradle.properties

@@ -21,4 +21,4 @@ android.enableBuildCache=true
 kotlin.incremental=true
 
 propsFile=../../AppsByEdipo.properties
-FirebaseServiceAccountFilePath=tes-legends-assistant-firebase-crashreporting-9kkud-bb17797192.json
+FirebaseServiceAccountFilePath=/Users/EdipoSouza/.gradle/tes-legends-assistant-firebase-crashreporting-9kkud-bb17797192.json