Merge branch 'release/v1.6.3'

edipo2s · Jul 30, 2017 · d9710b7 · d9710b7
2 parents bb39938 + 36354c7
commit d9710b7
Show file tree

Hide file tree

Showing 17 changed files with 180 additions and 135 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,7 +10,7 @@ android {
     buildToolsVersion "26.0.1"
     packagingOptions.excludes = ['META-INF/services/javax.annotation.processing.Processor',
                                  'META-INF/LICENSE.txt', 'META-INF/NOTICE.txt', 'META-INF/README.txt',
-                                 'LICENSE.txt', 'NOTICE.txt', 'README.txt', '.readme']
+                                 'META-INF/MANIFEST.MF','LICENSE.txt', 'NOTICE.txt', 'README.txt', '.readme']
 
     def props = new Properties()
     props.load(file("secrets.properties").newInputStream())

diff --git a/app/src/main/assets/Cards/Core/Intelligence/ashservant_alt.webp b/app/src/main/assets/Cards/Core/Intelligence/ashservant_alt.webp
diff --git a/app/src/main/kotlin/com/ediposouza/teslesgendstracker/data/Card.kt b/app/src/main/kotlin/com/ediposouza/teslesgendstracker/data/Card.kt
@@ -414,7 +414,8 @@ data class Card(
         val tokens: List<String>,
         val lore: String,
         val loreLink: String,
-        val hasAlternativeArt: Boolean
+        val hasAlternativeArt: Boolean,
+        val alternativeArtSource: String
 
 ) : Comparable<Card>, Parcelable {
 
@@ -427,7 +428,7 @@ data class Card(
         val DUMMY = Card("", "", CardSet.CORE, CardAttribute.DUAL, CardAttribute.STRENGTH,
                 CardAttribute.WILLPOWER, CardRarity.EPIC, false, 0, 0, 0, CardType.ACTION,
                 CardRace.ARGONIAN, emptyList<CardKeyword>(), "", CardArenaTier.AVERAGE,
-                listOf(), false, "", 0, listOf(), listOf(), listOf(), "", "", false)
+                listOf(), false, "", 0, listOf(), listOf(), listOf(), "", "", false, "")
 
         const val ALT_SUFFIX = "_alt"
         const val ARTS_PATH = "Arts"
@@ -452,7 +453,7 @@ data class Card(
             mutableListOf<String>().apply { source.readStringList(this) },
             mutableListOf<String>().apply { source.readStringList(this) },
             mutableListOf<String>().apply { source.readStringList(this) }, source.readString(),
-            source.readString(), 1 == source.readInt())
+            source.readString(), 1 == source.readInt(), source.readString())
 
     override fun describeContents() = 0
 
@@ -576,6 +577,7 @@ data class Card(
         dest?.writeString(lore)
         dest?.writeString(loreLink)
         dest?.writeInt((if (hasAlternativeArt) 1 else 0))
+        dest?.writeString(alternativeArtSource)
     }
 
     override fun compareTo(other: Card): Int {

diff --git a/app/src/main/kotlin/com/ediposouza/teslesgendstracker/interactor/FirebaseParsers.kt b/app/src/main/kotlin/com/ediposouza/teslesgendstracker/interactor/FirebaseParsers.kt
@@ -39,6 +39,7 @@ abstract class FirebaseParsers {
         val lore: String = ""
         val loreLink: String = ""
         val alternativeArt: Boolean = false
+        val alternativeArtSource: String = ""
 
         fun toCard(shortName: String, set: CardSet, attr: CardAttribute): Card {
             var clsAttr1 = attr
@@ -57,7 +58,7 @@ abstract class FirebaseParsers {
                             },
                     text, CardArenaTier.of(arenaTier), getCardArenaTierPlus(), evolves, season, shout,
                     creators.split(", ").filter { it.isNotEmpty() }, generates.split(", ").filter { it.isNotEmpty() },
-                    tokens.split(", ").filter { it.isNotEmpty() }, lore, loreLink, alternativeArt)
+                    tokens.split(", ").filter { it.isNotEmpty() }, lore, loreLink, alternativeArt, alternativeArtSource)
         }
 
         private fun getCardArenaTierPlus(): List<CardArenaTierPlus?> {

diff --git a/app/src/main/kotlin/com/ediposouza/teslesgendstracker/ui/cards/CardActivity.kt b/app/src/main/kotlin/com/ediposouza/teslesgendstracker/ui/cards/CardActivity.kt
@@ -316,6 +316,11 @@ class CardActivity : BaseActivity() {
             card_reward.text = "$month/${yearMonth.year}"
             card_reward_label.visibility = View.VISIBLE
         }
+        if (card.isAlternativeArt()) {
+            card_reward.text = card.alternativeArtSource
+            card_reward_label.text = getString(R.string.card_alternative_label)
+            card_reward_label.visibility = View.VISIBLE
+        }
         card_race.text = card.race.name.toLowerCase().capitalize().replace("_", " ")
         card_race_label.visibility = View.VISIBLE.takeIf { card.type == CardType.CREATURE } ?: View.GONE
         card_race.visibility = View.VISIBLE.takeIf { card.type == CardType.CREATURE } ?: View.GONE

diff --git a/app/src/main/kotlin/com/ediposouza/teslesgendstracker/util/AppExtensions.kt b/app/src/main/kotlin/com/ediposouza/teslesgendstracker/util/AppExtensions.kt
@@ -14,7 +14,11 @@ import android.support.annotation.LayoutRes
 import android.support.design.widget.BottomSheetBehavior
 import android.support.v4.app.Fragment
 import android.support.v4.content.ContextCompat
-import android.view.*
+import android.util.DisplayMetrics
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
 import android.widget.ImageView
 import android.widget.ListPopupWindow
 import android.widget.Spinner
@@ -311,9 +315,21 @@ fun Context.getCurrentVersion(): String {
 }
 
 fun Context.hasNavigationBar(): Boolean {
-    val hasBackKey = KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_BACK);
-    val hasHomeKey = KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_HOME);
-    return (!(hasBackKey && hasHomeKey))
+    val windowManager = getSystemService(Context.WINDOW_SERVICE) as WindowManager
+    val display = windowManager.getDefaultDisplay();
+
+    val realDisplayMetrics = DisplayMetrics();
+    display.getRealMetrics(realDisplayMetrics);
+    val realHeight = realDisplayMetrics.heightPixels;
+    val realWidth = realDisplayMetrics.widthPixels;
+
+    val displayMetrics = DisplayMetrics();
+    display.getMetrics(displayMetrics);
+    val displayHeight = displayMetrics.heightPixels;
+    val displayWidth = displayMetrics.widthPixels;
+
+    val hasSoftwareKeys = (realWidth > displayWidth) || (realHeight > displayHeight);
+    return hasSoftwareKeys;
 }
 
 fun Activity.hasPermission(permission: String): Boolean {

diff --git a/app/src/main/res/raw/changelog.xml b/app/src/main/res/raw/changelog.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog bulletedList="true">
+    <changelogversion
+        versionName="1.6.3"
+        changeDate="July 30, 2017">
+        <changelogtext>[b]Feature:[/b] Added Source of Alternative Art cards in card details
+        </changelogtext>
+        <changelogtext>Update Russian translation</changelogtext>
+        <changelogtext>Add Ash Servant alternative art card</changelogtext>
+        <changelogtext>Fix expansible card info showing behind navigation bar in some devices
+        </changelogtext>
+    </changelogversion>
     <changelogversion
         versionName="1.6.2"
         changeDate="July 29, 2017">

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -119,6 +119,7 @@
     <string name="cards_sets_all">Alle</string>
 
     <string name="card_title_star_rating">Deine Bewertung</string>
+    <string name="card_alternative_label">Ursprung</string>
     <string name="card_more_info_label">Mehr Informationen</string>
     <string name="card_arena_tier_label">Arena Rang:</string>
     <string name="card_collection_qtd_label">Sammlung Qtd:</string>

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -119,6 +119,7 @@
     <string name="cards_sets_all">Todas</string>
 
     <string name="card_title_star_rating">Tu Clasificación</string>
+    <string name="card_alternative_label">Fuente</string>
     <string name="card_more_info_label">Más información</string>
     <string name="card_arena_tier_label">Nivel de arena:</string>
     <string name="card_collection_qtd_label">Colección Qtd:</string>

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -120,6 +120,7 @@
     <string name="cards_sets_all">Tutto</string>
 
     <string name="card_title_star_rating">Il tuo punteggio</string>
+    <string name="card_alternative_label">Fonte</string>
     <string name="card_more_info_label">Maggiori Informazioni</string>
     <string name="card_arena_tier_label">Livello in Arena:</string>
     <string name="card_collection_qtd_label">In collezione:</string>

diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
@@ -120,6 +120,7 @@
     <string name="cards_sets_all">Todos</string>
 
     <string name="card_title_star_rating">Sua Avaliação</string>
+    <string name="card_alternative_label">Fonte</string>
     <string name="card_more_info_label">Mais Informações</string>
     <string name="card_arena_tier_label">Arena Nível:</string>
     <string name="card_collection_qtd_label">Coleção Qtd:</string>