From c2da834a8869f4a9c1d6222093868ec6b9a4df5d Mon Sep 17 00:00:00 2001 From: Laurent Date: Thu, 2 Jul 2020 09:16:22 +0200 Subject: [PATCH] Removes chip distribution animation when the hand uses wildcards --- .../pokeranalytics/android/model/realm/handhistory/Card.kt | 6 +++++- .../android/model/realm/handhistory/HandHistory.kt | 7 +++++++ .../ui/modules/handhistory/replayer/ReplayerAnimator.kt | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/Card.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/Card.kt index ca398d5e..67a9bfdb 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/Card.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/Card.kt @@ -9,7 +9,6 @@ import android.view.View import android.view.ViewGroup import androidx.appcompat.widget.AppCompatTextView import io.realm.RealmObject -import io.realm.annotations.Ignore import net.pokeranalytics.android.R import net.pokeranalytics.android.exceptions.PAIllegalStateException import net.pokeranalytics.android.model.handhistory.Street @@ -241,4 +240,9 @@ open class Card : RealmObject() { } } + val isWildCard: Boolean + get() { + return this.value == null || this.suit == null || this.suit == Suit.UNDEFINED + } + } \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/HandHistory.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/HandHistory.kt index 7eb1ab04..b8864066 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/HandHistory.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/HandHistory.kt @@ -652,4 +652,11 @@ open class HandHistory : RealmObject(), Deletable, RowRepresentable, Filterable, return max } + val usesWildcards: Boolean + get() { + val boardHasWildCard = this.cards.any { it.isWildCard } + val playerCardHasWildCard = this.playerSetups.any { it.cards.any { it.isWildCard } } + return boardHasWildCard || playerCardHasWildCard + } + } \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ReplayerAnimator.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ReplayerAnimator.kt index af49e74d..7593ac25 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ReplayerAnimator.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ReplayerAnimator.kt @@ -49,7 +49,7 @@ class ReplayerAnimator(var handHistory: HandHistory, var export: Boolean) { this.frameManager.add(FrameType.GATHER_ANIMATION, framesForChipsAnimation) } // Chip distribution animation on the Summary - if (step == Street.SUMMARY) { + if (step == Street.SUMMARY && !this.handHistory.usesWildcards) { this.frameManager.add(FrameType.DISTRIBUTION_ANIMATION, framesForChipsAnimation) } this.frameManager.add(FrameType.STATE, 1)