#15: Update Styling for PCF

Entreco · Nov 24, 2018 · e8b6f6d · e8b6f6d
1 parent 1f6e8a1
commit e8b6f6d
Show file tree

Hide file tree

Showing 16 changed files with 74 additions and 29 deletions.
diff --git 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
@@ -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/...tsScorecard/app/src/main/java/nl/entreco/dartsscorecard/play/live/LiveStatPageAnimator.kt b/...tsScorecard/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
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <gradient
+                android:angle="-270"
+                android:endColor="?attr/grad_score_finish_stop"
+                android:startColor="?attr/grad_score_finish_start" />
+        </shape>
+    </item>
+    <item android:drawable="@drawable/highlight" />
+    <item>
+        <shape>
+            <stroke
+                android:width="1px"
+                android:color="?attr/scoreBorderColor" />
+        </shape>
+    </item>
+</layer-list>
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
@@ -18,6 +18,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:background="@drawable/score_name"
             android:orientation="horizontal"
             tools:showIn="@layout/play_01_score">
 

diff --git a/android/DartsScorecard/app/src/main/res/values/attrs.xml b/android/DartsScorecard/app/src/main/res/values/attrs.xml
@@ -17,6 +17,7 @@
     <attr name="statBorderColor" format="color" />
     <attr name="colorOneEighty" format="color" />
     <attr name="colorNineDart" format="color" />
+    <attr name="colorFinishDart" format="color" />
     <attr name="colorEditProfile" format="color" />
     <attr name="grad_score_header_start" format="color" />
     <attr name="grad_score_header_stop" format="color" />
@@ -30,6 +31,8 @@
     <attr name="grad_score_pts_stop" format="color" />
     <attr name="grad_score_hint_start" format="color" />
     <attr name="grad_score_hint_stop" format="color" />
+    <attr name="grad_score_finish_start" format="color" />
+    <attr name="grad_score_finish_stop" format="color" />
     <attr name="grad_score_nine_start" format="color" />
     <attr name="grad_score_nine_stop" format="color" />
     <attr name="grad_current_start" format="color" />
@@ -40,7 +43,7 @@
     <attr name="grad_score_starter_stop" format="color" />
 
     <!-- Input View -->
-    <attr name="inputToggle" format="color" />
+    <attr name="inputScoredText" format="color" />
 
     <!-- ProfileHeaderBehavior -->
     <declare-styleable name="ProfileHeaderBehavior" >

diff --git 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 @@
         <item name="statBorderColor">@android:color/transparent</item>
         <item name="colorOneEighty">@color/bdo_gray_light</item>
         <item name="colorNineDart">@color/black</item>
+        <item name="colorFinishDart">@color/black</item>
         <item name="launchText">@color/black</item>
         <item name="nameText">@color/white</item>
         <item name="scoreText">@color/white</item>
         <item name="ptsText">@color/black</item>
         <item name="scoreBorderColor">#00ffffff</item>
         <item name="scoreBorderAlpha">0.2</item>
-        <item name="inputToggle">@color/bdo_yellow_accent</item>
+        <item name="inputScoredText">@color/black</item>
         <item name="grad_score_header_start">@color/bdo_yellow_light</item>
         <item name="grad_score_header_stop">@color/bdo_yellow_dark</item>
         <item name="grad_score_footer_start">@color/bdo_yellow_light</item>
@@ -40,6 +41,8 @@
         <item name="grad_score_hint_stop">@color/bdo_red_light</item>
         <item name="grad_score_nine_start">#FFD71B</item>
         <item name="grad_score_nine_stop">#FCC804</item>
+        <item name="grad_score_finish_start">@color/bdo_yellow_light</item>
+        <item name="grad_score_finish_stop">@color/bdo_yellow_dark</item>
         <item name="grad_current_start">@color/bdo_red_light</item>
         <item name="grad_current_stop">@color/bdo_red_dark</item>
         <item name="grad_launch_btn_start">@color/bdo_yellow_light</item>

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
@@ -20,13 +20,14 @@
         <item name="statBorderColor">@color/bdo_2018_gray_alpha</item>
         <item name="colorOneEighty">@color/bdo_2018_red</item>
         <item name="colorNineDart">@color/bdo_2018_white_start</item>
+        <item name="colorFinishDart">@color/white</item>
         <item name="launchText">@color/bdo_2018_white_start</item>
         <item name="nameText">@color/black</item>
         <item name="scoreText">@color/white</item>
         <item name="ptsText">@color/white</item>
         <item name="scoreBorderColor">@color/bdo_2018_gray_light</item>
         <item name="scoreBorderAlpha">1.0</item>
-        <item name="inputToggle">@color/bdo_2018_red</item>
+        <item name="inputScoredText">@color/white</item>
         <item name="grad_score_header_start">@color/bdo_2018_gray_light</item>
         <item name="grad_score_header_stop">@color/bdo_2018_gray_light</item>
         <item name="grad_score_footer_start">@color/bdo_2018_gray_dark</item>
@@ -41,6 +42,8 @@
         <item name="grad_score_hint_stop">@color/bdo_2018_red</item>
         <item name="grad_score_nine_start">@color/bdo_2018_gray_light</item>
         <item name="grad_score_nine_stop">@color/bdo_2018_gray_light</item>
+        <item name="grad_score_finish_start">@color/bdo_2018_red</item>
+        <item name="grad_score_finish_stop">@color/bdo_2018_red</item>
         <item name="grad_current_start">@color/bdo_2018_red</item>
         <item name="grad_current_stop">@color/bdo_2018_red</item>
         <item name="grad_launch_btn_start">@color/bdo_2018_gray_dark</item>

diff --git 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 @@
     </style>
 
     <style name="Input.Next">
-        <item name="android:textColor">?attr/ptsText</item>
+        <item name="android:textColor">?attr/inputScoredText</item>
         <item name="android:gravity">start</item>
         <item name="android:paddingStart">@dimen/large</item>
         <item name="android:paddingEnd">@dimen/large</item>
     </style>
 
     <style name="Input.Sub">
-        <item name="android:textColor">?attr/ptsText</item>
+        <item name="android:textColor">?attr/inputScoredText</item>
         <item name="android:textSize">12sp</item>
         <item name="android:gravity">start|bottom</item>
         <item name="android:paddingStart">@dimen/large</item>
@@ -98,7 +98,7 @@
         <item name="android:paddingEnd">@dimen/def</item>
         <item name="android:textSize">28sp</item>
         <item name="android:gravity">end</item>
-        <item name="android:textColor">?attr/ptsText</item>
+        <item name="android:textColor">?attr/inputScoredText</item>
     </style>
 
     <style name="Input.Score.No">

diff --git a/android/DartsScorecard/app/src/main/res/values/styles_pcf_2018.xml b/android/DartsScorecard/app/src/main/res/values/styles_pcf_2018.xml
@@ -9,39 +9,43 @@
     <color name="pcf_dark_gray">#747B77</color>
     <color name="pcf_light_green">#F2FAF1</color>
     <color name="pcf_dark_green">#E6F5E6</color>
+    <color name="pcf_yellow">#EFD103</color>
 
     <style name="Pcf" parent="AppTheme">
         <item name="colorPrimary">@color/pcf_green</item>
         <item name="colorPrimaryDark">@color/pcf_primaryDark</item>
         <item name="colorEditProfile">@color/pcf_primaryDark</item>
-        <item name="gradient_angle">135</item>
+        <item name="gradient_angle">225</item>
         <item name="match_description">@string/pcf_match</item>
         <item name="colorAccent">@color/pcf_green</item>
         <item name="highlightColor">@android:color/transparent</item>
         <item name="statBorderColor">@color/pcf_black</item>
         <item name="colorOneEighty">@color/bdo_gray_light</item>
         <item name="colorNineDart">@color/black</item>
+        <item name="colorFinishDart">@color/white</item>
         <item name="launchText">@color/pcf_light_green</item>
         <item name="nameText">@color/white</item>
         <item name="scoreText">@color/white</item>
         <item name="ptsText">@color/black</item>
-        <item name="scoreBorderColor">@color/pcf_black</item>
+        <item name="scoreBorderColor">@android:color/transparent</item>
         <item name="scoreBorderAlpha">0.2</item>
-        <item name="inputToggle">@color/bdo_yellow_accent</item>
+        <item name="inputScoredText">@color/white</item>
         <item name="grad_score_header_start">@color/pcf_black</item>
         <item name="grad_score_header_stop">@color/pcf_black</item>
         <item name="grad_score_footer_start">@color/pcf_black</item>
         <item name="grad_score_footer_stop">@color/pcf_black</item>
         <item name="grad_score_name_start">@color/pcf_light_gray</item>
         <item name="grad_score_name_stop">@color/pcf_dark_gray</item>
-        <item name="grad_score_start">@color/pcf_light_gray</item>
-        <item name="grad_score_stop">@color/pcf_dark_gray</item>
+        <item name="grad_score_start">@android:color/transparent</item>
+        <item name="grad_score_stop">@android:color/transparent</item>
         <item name="grad_score_pts_start">@color/pcf_light_green</item>
         <item name="grad_score_pts_stop">@color/pcf_dark_green</item>
         <item name="grad_score_hint_start">@color/pcf_green</item>
         <item name="grad_score_hint_stop">@color/pcf_green</item>
-        <item name="grad_score_nine_start">@color/pcf_green</item>
-        <item name="grad_score_nine_stop">@color/pcf_green</item>
+        <item name="grad_score_nine_start">@color/pcf_yellow</item>
+        <item name="grad_score_nine_stop">@color/pcf_yellow</item>
+        <item name="grad_score_finish_start">@color/pcf_green</item>
+        <item name="grad_score_finish_stop">@color/pcf_green</item>
         <item name="grad_current_start">@color/pcf_green</item>
         <item name="grad_current_stop">@color/pcf_green</item>
         <item name="grad_launch_btn_start">@color/pcf_green</item>

diff --git a/android/DartsScorecard/app/src/main/res/values/styles_pdc.xml b/android/DartsScorecard/app/src/main/res/values/styles_pdc.xml
@@ -21,13 +21,14 @@
         <item name="statBorderColor">@color/pdc_black_light</item>
         <item name="colorOneEighty">@color/pdc_green_dark</item>
         <item name="colorNineDart">@color/black</item>
+        <item name="colorFinishDart">@color/white</item>
         <item name="launchText">@color/white</item>
         <item name="nameText">@color/black</item>
         <item name="scoreText">@color/white</item>
         <item name="ptsText">@color/white</item>
         <item name="scoreBorderColor">#333333</item>
         <item name="scoreBorderAlpha">.2</item>
-        <item name="inputToggle">@color/pdc_red_dark</item>
+        <item name="inputScoredText">@color/white</item>
         <item name="grad_score_header_start">@color/pdc_black_light</item>
         <item name="grad_score_header_stop">@color/pdc_black_dark</item>
         <item name="grad_score_footer_start">@color/pdc_black_light</item>
@@ -42,6 +43,8 @@
         <item name="grad_score_hint_stop">@color/pdc_green_dark</item>
         <item name="grad_score_nine_start">#FFD71B</item>
         <item name="grad_score_nine_stop">#FCC804</item>
+        <item name="grad_score_finish_start">@color/pdc_green_light</item>
+        <item name="grad_score_finish_stop">@color/pdc_green_dark</item>
         <item name="grad_current_start">@color/pdc_green_light</item>
         <item name="grad_current_stop">@color/pdc_green_dark</item>
         <item name="grad_launch_btn_start">@color/pdc_green_light</item>

diff --git a/android/DartsScorecard/app/src/main/res/values/styles_pdc_2018.xml b/android/DartsScorecard/app/src/main/res/values/styles_pdc_2018.xml
@@ -22,13 +22,14 @@
         <item name="statBorderColor">@android:color/transparent</item>
         <item name="colorOneEighty">@color/pdc_2018_yellow</item>
         <item name="colorNineDart">@color/black</item>
+        <item name="colorFinishDart">@color/white</item>
         <item name="launchText">@color/white</item>
         <item name="nameText">@color/black</item>
         <item name="scoreText">@color/white</item>
         <item name="ptsText">@color/white</item>
         <item name="scoreBorderColor">@android:color/transparent</item>
         <item name="scoreBorderAlpha">.1</item>
-        <item name="inputToggle">@color/pdc_2018_green_dark</item>
+        <item name="inputScoredText">@color/white</item>
         <item name="grad_score_header_start">@color/pdc_2018_black_light</item>
         <item name="grad_score_header_stop">@color/pdc_2018_black_dark</item>
         <item name="grad_score_footer_start">@color/pdc_2018_black_light</item>
@@ -43,6 +44,8 @@
         <item name="grad_score_hint_stop">@color/pdc_2018_red_light</item>
         <item name="grad_score_nine_start">#FFD71B</item>
         <item name="grad_score_nine_stop">#FCC804</item>
+        <item name="grad_score_finish_start">@color/pdc_2018_red_light</item>
+        <item name="grad_score_finish_stop">@color/pdc_2018_red_light</item>
         <item name="grad_current_start">@color/pdc_2018_red_light</item>
         <item name="grad_current_stop">@color/pdc_2018_red_light</item>
         <item name="grad_launch_btn_start">@color/pdc_2018_green_light</item>

diff --git a/android/DartsScorecard/app/src/main/res/values/styles_score.xml b/android/DartsScorecard/app/src/main/res/values/styles_score.xml
@@ -20,7 +20,6 @@
         <item name="android:ellipsize">marquee</item>
         <item name="android:padding">@dimen/xsmall</item>
         <item name="android:gravity">start</item>
-        <item name="android:background">@drawable/score_name</item>
         <item name="android:textColor">?attr/nameText</item>
     </style>
 
@@ -57,8 +56,8 @@
         <item name="android:paddingStart">@dimen/def</item>
         <item name="android:paddingEnd">@dimen/def</item>
         <item name="android:gravity">end</item>
-        <item name="android:background">@drawable/score_hint</item>
-        <item name="android:textColor">?attr/scoreText</item>
+        <item name="android:background">@drawable/score_finish</item>
+        <item name="android:textColor">?attr/colorFinishDart</item>
     </style>
 
     <style name="Score.Nine">

diff --git a/android/DartsScorecard/app/src/main/res/values/styles_setup.xml b/android/DartsScorecard/app/src/main/res/values/styles_setup.xml
@@ -47,14 +47,14 @@
 
     <style name="Setup.Entry.Value">
         <item name="android:background">@drawable/score_pts</item>
-        <item name="android:textColor">?attr/header_text_color</item>
+        <item name="android:textColor">?attr/ptsText</item>
         <item name="android:padding">@dimen/def</item>
         <item name="android:gravity">center</item>
     </style>
 
     <style name="Setup.Entry.Spinner">
         <item name="android:background">@drawable/score_spinner</item>
-        <item name="android:textColor">?attr/header_text_color</item>
+        <item name="android:textColor">?attr/ptsText</item>
         <item name="android:padding">@dimen/def</item>
         <item name="android:gravity">center</item>
     </style>

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
@@ -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/.../app/src/test/java/nl/entreco/dartsscorecard/play/live/LiveStatPageAnimatorHandlerTest.kt b/.../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() {