Skip to content

Commit b60c54b

Browse files
committed
Merge branch 'release/v0.5.0'
2 parents 96627a4 + c552487 commit b60c54b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+564
-52
lines changed

app/build.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,11 @@ android {
6868
}
6969

7070
ext {
71-
anko_version = "0.9.1a"
72-
icePickVersion = "3.2.+"
71+
anko_version = "0.9.1"
7372
okIOVersion = "1.11.+"
7473
okHttpVersion = "3.6.+"
7574
playServicesVersion = prepareToRelease ? "10.2.0" : "9.8.0"
76-
supportLibraryVersion = "25.2.0"
75+
supportLibraryVersion = "25.3.0"
7776
threetenabpVersion = "1.0.+"
7877

7978
testMockitoVersion = "2.7.+"
@@ -141,7 +140,7 @@ dependencies {
141140
compile "com.github.miguelbcr:TableFixHeaders-Wrapper:0.2.0"
142141
compile "com.timehop.stickyheadersrecyclerview:library:0.4.3"
143142
compile "com.kyleduo.switchbutton:library:1.4.4"
144-
compile "jp.wasabeef:recyclerview-animators:2.2.4"
143+
compile "jp.wasabeef:recyclerview-animators:2.2.5"
145144
compile "org.jsoup:jsoup:1.10.1"
146145

147146
testCompile "junit:junit:4.12"
33.9 KB
Loading
34.7 KB
Loading
36.6 KB
Loading
28.4 KB
Loading
33.2 KB
Loading
25.6 KB
Loading
27.3 KB
Loading

app/src/main/kotlin/com/ediposouza/teslesgendstracker/App.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ class App : MultiDexApplication() {
5252
reference.child(BaseInteractor.NODE_CARDS).keepSynced(sync)
5353
reference.child(BaseInteractor.NODE_PATCHES).keepSynced(sync)
5454
reference.child(BaseInteractor.NODE_SEASONS).keepSynced(sync)
55+
reference.child(BaseInteractor.NODE_SPOILER).keepSynced(sync)
5556
reference.child(BaseInteractor.NODE_NEWS).keepSynced(sync)
5657
}
5758
}

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

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ enum class CardSet(val db: String) {
3333
MADHOUSE("madhouse"),
3434
UNKNOWN(TEXT_UNKNOWN);
3535

36+
var unknownSetName = ""
37+
38+
override fun toString(): String {
39+
return name.takeIf { this != UNKNOWN } ?: unknownSetName
40+
}
41+
3642
companion object {
3743

3844
fun of(value: String): CardSet {
@@ -293,7 +299,26 @@ data class CardMissing(
293299
val rarity: CardRarity,
294300
val qtd: Int
295301

296-
)
302+
) : Parcelable {
303+
304+
companion object {
305+
@JvmField val CREATOR: Parcelable.Creator<CardMissing> = object : Parcelable.Creator<CardMissing> {
306+
override fun createFromParcel(source: Parcel): CardMissing = CardMissing(source)
307+
override fun newArray(size: Int): Array<CardMissing?> = arrayOfNulls(size)
308+
}
309+
}
310+
311+
constructor(source: Parcel) : this(source.readString(), CardRarity.values()[source.readInt()], source.readInt())
312+
313+
override fun writeToParcel(dest: Parcel?, flags: Int) {
314+
dest?.writeString(shortName)
315+
dest?.writeInt(rarity.ordinal)
316+
dest?.writeInt(qtd)
317+
}
318+
319+
override fun describeContents(): Int = 0
320+
321+
}
297322

298323
data class CardStatistic(
299324

@@ -368,10 +393,9 @@ data class Card(
368393
}
369394

370395
private const val CARD_PATH = "Cards"
371-
private const val CARD_BACK = "card_back.webp"
372396

373397
fun getDefaultCardImage(context: Context): Bitmap {
374-
return BitmapFactory.decodeStream(context.resources.assets.open(CARD_BACK))
398+
return BitmapFactory.decodeResource(context.resources, R.drawable.card_back)
375399
}
376400

377401
fun loadCardImageInto(view: ImageView, cardSet: String, cardAttr: String,
@@ -430,6 +454,7 @@ data class Card(
430454
val setName = cardSet.toLowerCase().capitalize()
431455
val attrName = cardAttr.toLowerCase().capitalize()
432456
val imagePath = "$CARD_PATH/$setName/$attrName/$cardShortName.webp"
457+
Timber.d(imagePath)
433458
return imagePath
434459
}
435460

@@ -461,12 +486,12 @@ data class Card(
461486
override fun describeContents() = 0
462487

463488
fun loadCardImageInto(view: ImageView, transform: ((Bitmap) -> Bitmap)? = null) {
464-
Card.loadCardImageInto(view, set.name, attr.name, shortName, transform)
489+
Card.loadCardImageInto(view, set.toString(), attr.name, shortName, transform)
465490
}
466491

467492
fun patchVersion(context: Context, patchUuid: String, onGetCard: (Card) -> Unit) {
468493
var patchShortName = "${shortName}_$patchUuid"
469-
loadCardImageInto(context, set.name, attr.name, patchShortName) { patchImageFound ->
494+
loadCardImageInto(context, set.toString(), attr.name, patchShortName) { patchImageFound ->
470495
if (!patchImageFound) {
471496
patchShortName = shortName
472497
}

0 commit comments

Comments
 (0)