diff --git a/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/play/live/LiveStatSlideAnimator.kt b/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/play/live/LiveStatSlideAnimator.kt index 46a15180..a9a0bffc 100644 --- a/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/play/live/LiveStatSlideAnimator.kt +++ b/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/play/live/LiveStatSlideAnimator.kt @@ -3,6 +3,7 @@ package nl.entreco.dartsscorecard.play.live import android.databinding.DataBindingUtil import android.view.View import android.view.ViewPropertyAnimator +import nl.entreco.dartsscorecard.R.id.stat11 import nl.entreco.dartsscorecard.databinding.WidgetListStatsBinding import kotlin.math.max @@ -15,7 +16,7 @@ class LiveStatSlideAnimator(private val view: View, private val left: View?, pri private val animator by lazy { MatchStatSlideAnimatorHandler(binding.player1, binding.player2, binding.name1, binding.name2, binding.score, binding.stat1, binding.stat2, binding.stat3, binding.stat4, binding.stat5, binding.stat6, binding.stat7, - binding.stat8, binding.stat9, binding.stat10) + binding.stat8, binding.stat9, binding.stat10, binding.stat11) } fun onSlide(slideOffset: Float) { @@ -30,7 +31,7 @@ class LiveStatSlideAnimator(private val view: View, private val left: View?, pri private val stat1: View, private val stat2: View, private val stat3: View, private val stat4: View, private val stat5: View, private val stat6: View, private val stat7: View, private val stat8: View, private val stat9: View, - private val stat10: View) { + private val stat10: View, private val stat11: View) { fun slide(slideOffset: Float) { // Fly In Players player1.animate().translationX(slideOffset * -player1.width / 3).setDuration(0).start() @@ -50,6 +51,7 @@ class LiveStatSlideAnimator(private val view: View, private val left: View?, pri animateState(stat8.animate(), 8, slideOffset) animateState(stat9.animate(), 9, slideOffset) animateState(stat10.animate(), 10, slideOffset) + animateState(stat11.animate(), 11, slideOffset) } private fun animateState(anim: ViewPropertyAnimator, index: Int, slideOffset: Float) { diff --git a/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/play/live/TeamLiveStatModel.kt b/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/play/live/TeamLiveStatModel.kt index c3a6f81e..7587745d 100644 --- a/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/play/live/TeamLiveStatModel.kt +++ b/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/play/live/TeamLiveStatModel.kt @@ -23,6 +23,7 @@ class TeamLiveStatModel(val team: Team, private val liveStats: MutableList(empty) val hCo = ObservableField(empty) val co = ObservableField(empty) + val coRatio = ObservableField(empty) val breaks = ObservableField(empty) val image = ObservableField(team.imageUrl()) @@ -61,6 +62,11 @@ class TeamLiveStatModel(val team: Team, private val liveStats: MutableList coRatio.set(empty) + else -> coRatio.set("%.2f".format(100 * aggregator / denominator.toDouble())) + } } private fun updateHighestScore() { diff --git a/android/DartsScorecard/app/src/main/res/layout/widget_list_stats.xml b/android/DartsScorecard/app/src/main/res/layout/widget_list_stats.xml index 5acf8c0f..967b8d77 100644 --- a/android/DartsScorecard/app/src/main/res/layout/widget_list_stats.xml +++ b/android/DartsScorecard/app/src/main/res/layout/widget_list_stats.xml @@ -380,6 +380,33 @@ android:layout_height="wrap_content" android:orientation="horizontal"> + + + + + + + + + Match Statistieken Breaks Made Dubbel Success + Dubbel % Hoogste Score Hoogste Out 180\'s diff --git a/android/DartsScorecard/app/src/main/res/values/strings.xml b/android/DartsScorecard/app/src/main/res/values/strings.xml index cb5046dc..c383ae86 100644 --- a/android/DartsScorecard/app/src/main/res/values/strings.xml +++ b/android/DartsScorecard/app/src/main/res/values/strings.xml @@ -86,6 +86,7 @@ Match Statistics Breaks Made Double Success + Double % Highest Score Highest Out 180\'s