diff --git a/android/DartsScorecard/app/build.gradle b/android/DartsScorecard/app/build.gradle
index c324fcbc..098edbd4 100644
--- a/android/DartsScorecard/app/build.gradle
+++ b/android/DartsScorecard/app/build.gradle
@@ -15,7 +15,7 @@ android {
applicationId "nl.entreco.dartsscorecard"
resValue "string", "version", "${config.versionName}"
- ndk {abiFilters "armeabi", "armeabi-v7a", "x86", "mips"}
+ ndk { abiFilters "armeabi", "armeabi-v7a", "x86", "mips" }
}
buildTypes {
debug {
@@ -43,7 +43,6 @@ dependencies {
implementation project(':domain')
implementation project(':data')
-
// Annotation Processing
kapt "com.google.dagger:dagger-compiler:$daggerVersion"
kapt "android.arch.persistence.room:compiler:$room"
diff --git a/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/base/Styler.kt b/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/base/Styler.kt
index 06d32efb..13aad232 100644
--- a/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/base/Styler.kt
+++ b/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/base/Styler.kt
@@ -42,9 +42,9 @@ class Styler @Inject constructor(private val prefs: SharedPreferences, private v
private fun swap(style: Int): String {
return when (style) {
R.style.Pdc_2018 -> Style.BDO_2018.style
- R.style.Bdo_2018 -> Style.PDC.style
+ R.style.Bdo_2018 -> Style.PCF.style
+ R.style.Pcf -> Style.PDC.style
R.style.Pdc -> Style.BDO.style
- R.style.Bdo -> Style.PCF.style
else -> Style.PDC_2018.style
}
}
diff --git a/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/play/live/LiveStatPageAnimator.kt b/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/play/live/LiveStatPageAnimator.kt
index 2ba7b789..01d257a5 100644
--- a/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/play/live/LiveStatPageAnimator.kt
+++ b/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/play/live/LiveStatPageAnimator.kt
@@ -14,7 +14,7 @@ class LiveStatPageAnimator(private val size: Float) {
val statFactor = page.width - size
val animator = MatchStatPageAnimatorHandler(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, statFactor)
+ binding.stat8, binding.stat9, binding.stat10, binding.stat11, statFactor)
animator.transform(page, position)
}
@@ -23,7 +23,7 @@ class LiveStatPageAnimator(private val size: Float) {
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 statFactor: Float) {
+ private val stat10: View, private val stat11: View, private val statFactor: Float) {
// [-1. 1] range of position
fun transform(page: View, position: Float) {
@@ -52,6 +52,7 @@ class LiveStatPageAnimator(private val size: Float) {
animateStat(stat8, position, statFactor)
animateStat(stat9, position, statFactor)
animateStat(stat10, position, statFactor)
+ animateStat(stat11, position, statFactor)
}
private fun stayPut(view: View) {
diff --git a/android/DartsScorecard/app/src/main/res/drawable/score_finish.xml b/android/DartsScorecard/app/src/main/res/drawable/score_finish.xml
new file mode 100644
index 00000000..934beae3
--- /dev/null
+++ b/android/DartsScorecard/app/src/main/res/drawable/score_finish.xml
@@ -0,0 +1,19 @@
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/android/DartsScorecard/app/src/main/res/layout/team_score_view.xml b/android/DartsScorecard/app/src/main/res/layout/team_score_view.xml
index 85d33b69..c5df8c1e 100644
--- a/android/DartsScorecard/app/src/main/res/layout/team_score_view.xml
+++ b/android/DartsScorecard/app/src/main/res/layout/team_score_view.xml
@@ -18,6 +18,7 @@
diff --git a/android/DartsScorecard/app/src/main/res/values/attrs.xml b/android/DartsScorecard/app/src/main/res/values/attrs.xml
index 7f029434..0b7b50b1 100644
--- a/android/DartsScorecard/app/src/main/res/values/attrs.xml
+++ b/android/DartsScorecard/app/src/main/res/values/attrs.xml
@@ -17,6 +17,7 @@
+
@@ -30,6 +31,8 @@
+
+
@@ -40,7 +43,7 @@
-
+
diff --git a/android/DartsScorecard/app/src/main/res/values/styles_bdo.xml b/android/DartsScorecard/app/src/main/res/values/styles_bdo.xml
index faae41d8..20d33acd 100644
--- a/android/DartsScorecard/app/src/main/res/values/styles_bdo.xml
+++ b/android/DartsScorecard/app/src/main/res/values/styles_bdo.xml
@@ -19,13 +19,14 @@
- @android:color/transparent
- @color/bdo_gray_light
- @color/black
+ - @color/black
- @color/black
- @color/white
- @color/white
- @color/black
- #00ffffff
- 0.2
- - @color/bdo_yellow_accent
+ - @color/black
- @color/bdo_yellow_light
- @color/bdo_yellow_dark
- @color/bdo_yellow_light
@@ -40,6 +41,8 @@
- @color/bdo_red_light
- #FFD71B
- #FCC804
+ - @color/bdo_yellow_light
+ - @color/bdo_yellow_dark
- @color/bdo_red_light
- @color/bdo_red_dark
- @color/bdo_yellow_light
diff --git a/android/DartsScorecard/app/src/main/res/values/styles_bdo_2018.xml b/android/DartsScorecard/app/src/main/res/values/styles_bdo_2018.xml
index 36f0e211..963a9fd1 100644
--- a/android/DartsScorecard/app/src/main/res/values/styles_bdo_2018.xml
+++ b/android/DartsScorecard/app/src/main/res/values/styles_bdo_2018.xml
@@ -20,13 +20,14 @@
- @color/bdo_2018_gray_alpha
- @color/bdo_2018_red
- @color/bdo_2018_white_start
+ - @color/white
- @color/bdo_2018_white_start
- @color/black
- @color/white
- @color/white
- @color/bdo_2018_gray_light
- 1.0
- - @color/bdo_2018_red
+ - @color/white
- @color/bdo_2018_gray_light
- @color/bdo_2018_gray_light
- @color/bdo_2018_gray_dark
@@ -41,6 +42,8 @@
- @color/bdo_2018_red
- @color/bdo_2018_gray_light
- @color/bdo_2018_gray_light
+ - @color/bdo_2018_red
+ - @color/bdo_2018_red
- @color/bdo_2018_red
- @color/bdo_2018_red
- @color/bdo_2018_gray_dark
diff --git a/android/DartsScorecard/app/src/main/res/values/styles_input.xml b/android/DartsScorecard/app/src/main/res/values/styles_input.xml
index f512fb10..ca4facb2 100644
--- a/android/DartsScorecard/app/src/main/res/values/styles_input.xml
+++ b/android/DartsScorecard/app/src/main/res/values/styles_input.xml
@@ -22,14 +22,14 @@
@@ -57,8 +56,8 @@
- @dimen/def
- @dimen/def
- end
- - @drawable/score_hint
- - ?attr/scoreText
+ - @drawable/score_finish
+ - ?attr/colorFinishDart
diff --git a/android/DartsScorecard/app/src/test/java/nl/entreco/dartsscorecard/base/StylerTest.kt b/android/DartsScorecard/app/src/test/java/nl/entreco/dartsscorecard/base/StylerTest.kt
index ddfacea6..e9d232ab 100644
--- a/android/DartsScorecard/app/src/test/java/nl/entreco/dartsscorecard/base/StylerTest.kt
+++ b/android/DartsScorecard/app/src/test/java/nl/entreco/dartsscorecard/base/StylerTest.kt
@@ -68,11 +68,18 @@ class StylerTest {
assertEquals(R.style.Bdo_2018, actualStyle)
}
+ @Test
+ fun `it should swap to PCF style`() {
+ givenStyle(Styler.Style.BDO_2018.style)
+ val actualStyle = whenSwapping()
+ assertEquals(R.style.Pcf, actualStyle)
+ }
+
@Test
fun `it should swap to PDC style`() {
- givenStyle(Styler.Style.PDC.style)
+ givenStyle(Styler.Style.PCF.style)
val actualStyle = whenSwapping()
- assertEquals(R.style.Bdo, actualStyle)
+ assertEquals(R.style.Pdc, actualStyle)
}
@Test
diff --git a/android/DartsScorecard/app/src/test/java/nl/entreco/dartsscorecard/play/live/LiveStatPageAnimatorHandlerTest.kt b/android/DartsScorecard/app/src/test/java/nl/entreco/dartsscorecard/play/live/LiveStatPageAnimatorHandlerTest.kt
index 6da1a99f..864db221 100644
--- a/android/DartsScorecard/app/src/test/java/nl/entreco/dartsscorecard/play/live/LiveStatPageAnimatorHandlerTest.kt
+++ b/android/DartsScorecard/app/src/test/java/nl/entreco/dartsscorecard/play/live/LiveStatPageAnimatorHandlerTest.kt
@@ -30,7 +30,7 @@ class LiveStatPageAnimatorHandlerTest {
}
private fun givenSubject() {
- subject = LiveStatPageAnimator.MatchStatPageAnimatorHandler(mockView, mockView, mockView, mockView, mockView, mockView, mockView, mockView, mockView, mockView, mockView, mockView, mockView, mockView, mockView,100F)
+ subject = LiveStatPageAnimator.MatchStatPageAnimatorHandler(mockView, mockView, mockView, mockView, mockView, mockView, mockView, mockView, mockView, mockView, mockView, mockView, mockView, mockView, mockView, mockView, 100F)
}
private fun whenTransforming() {