#27: Tweaking Beta View & Hiscores

Entreco · Dec 14, 2018 · b01fb97 · b01fb97
1 parent b09fca1
commit b01fb97
Show file tree

Hide file tree

Showing 10 changed files with 65 additions and 24 deletions.
diff --git a/...artsscorecard/hiscores/HiScoreAnimator.kt → ...reco/dartsscorecard/base/PagerAnimator.kt b/...artsscorecard/hiscores/HiScoreAnimator.kt → ...reco/dartsscorecard/base/PagerAnimator.kt
@@ -1,16 +1,19 @@
-package nl.entreco.dartsscorecard.hiscores
+package nl.entreco.dartsscorecard.base
 
 import android.view.View
-import nl.entreco.dartsscorecard.databinding.ActivityHiscoreBinding
+import android.view.ViewTreeObserver
+import androidx.viewpager.widget.ViewPager
 
-class HiScoreAnimator(val binding: ActivityHiscoreBinding) {
-    private val pager = binding.hiscorePager
-    private val prev = binding.hiscorePrev.also {
-        flyOutStart(it)
-    }
+class PagerAnimator(private val pager: ViewPager, private val prev: View, private val next: View) {
 
-    private val next = binding.hiscoreNext.also {
-        flyOutEnd(it)
+    init {
+        pager.viewTreeObserver.addOnPreDrawListener(object : ViewTreeObserver.OnPreDrawListener {
+            override fun onPreDraw(): Boolean {
+                pager.viewTreeObserver.removeOnPreDrawListener(this)
+                onPageSelected(0)
+                return true
+            }
+        })
     }
 
     fun onPageSelected(position: Int) {
@@ -39,4 +42,4 @@ class HiScoreAnimator(val binding: ActivityHiscoreBinding) {
     private fun flyInEnd(view: View) {
         view.animate().alpha(1F).translationX(0F).scaleX(1F).scaleY(1F).start()
     }
-}
+}
diff --git a/...id/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/hiscores/HiScoreActivity.kt b/...id/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/hiscores/HiScoreActivity.kt
@@ -8,6 +8,7 @@ import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.Observer
 import androidx.viewpager.widget.ViewPager
 import nl.entreco.dartsscorecard.R
+import nl.entreco.dartsscorecard.base.PagerAnimator
 import nl.entreco.dartsscorecard.base.ViewModelActivity
 import nl.entreco.dartsscorecard.databinding.ActivityHiscoreBinding
 import nl.entreco.dartsscorecard.di.hiscore.HiscoreComponent
@@ -19,12 +20,15 @@ class HiScoreActivity : ViewModelActivity() {
     private val component: HiscoreComponent by componentProvider { it.plus(HiscoreModule()) }
     private val viewModel: HiScoreViewModel by viewModelProvider { component.viewModel() }
     private val pageAdapter: HiScorePager by lazy { component.pager() }
-    private val animator: HiScoreAnimator by lazy { HiScoreAnimator(binding) }
+    private val animator: PagerAnimator by lazy {
+        PagerAnimator(binding.hiscorePager, binding.hiscorePrev, binding.hiscoreNext)
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = DataBindingUtil.setContentView(this, R.layout.activity_hiscore)
         binding.viewModel = viewModel
+        binding.animator = animator
         binding.hiscorePager.adapter = pageAdapter
         binding.hiscorePager.addOnPageChangeListener(object :
                 ViewPager.SimpleOnPageChangeListener() {

diff --git a/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/play/Play01Animator.kt b/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/play/Play01Animator.kt
@@ -3,9 +3,11 @@ package nl.entreco.dartsscorecard.play
 import android.view.View
 import android.view.ViewPropertyAnimator
 import android.view.ViewTreeObserver
+import androidx.viewpager.widget.ViewPager
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import kotlinx.android.synthetic.main.activity_play_01.view.*
 import kotlinx.android.synthetic.main.play_01_score.view.*
+import nl.entreco.dartsscorecard.base.PagerAnimator
 import nl.entreco.dartsscorecard.base.widget.MaxHeightRecyclerView
 import nl.entreco.dartsscorecard.databinding.ActivityPlay01Binding
 import nl.entreco.dartsscorecard.play.live.LiveStatSlideAnimator
@@ -20,6 +22,7 @@ class Play01Animator(binding: ActivityPlay01Binding) {
     private val pager = binding.includeMain.statPager
     private val inputSheet = binding.includeInput.inputSheet
     private val behaviour = BottomSheetBehavior.from(inputSheet)
+    private val pageAnimator = PagerAnimator(pager, binding.includeMain.statPrev, binding.includeMain.statNext)
     private val animator = Play01AnimatorHandler(binding.root, binding.includeScore.scoreSheet,
             binding.includeInput.fab, binding.includeMain.mainSheet, binding.includeMain.version,
             binding.includeInput.inputResume, pager, binding.includeScore.teamContainer, inputSheet,
@@ -29,8 +32,9 @@ class Play01Animator(binding: ActivityPlay01Binding) {
     init {
         animator.calculateHeightForScoreView()
         pager.addOnPageChangeListener(object :
-                androidx.viewpager.widget.ViewPager.SimpleOnPageChangeListener() {
+                ViewPager.SimpleOnPageChangeListener() {
             override fun onPageSelected(position: Int) {
+                pageAnimator.onPageSelected(position)
                 animator.storePositionForAnimator(position)
             }
         })

diff --git a/android/DartsScorecard/app/src/main/res/layout/activity_beta.xml b/android/DartsScorecard/app/src/main/res/layout/activity_beta.xml
@@ -38,9 +38,23 @@
             android:layout_height="match_parent"
             android:contentDescription="@string/cd_list_of_beta_features"
             android:layoutAnimation="@anim/layout_animation_from_bottom"
+            android:paddingTop="52dp"
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             tools:listitem="@layout/beta_view" />
 
+        <TextView
+            style="@style/Beta.Description"
+            android:layout_width="match_parent"
+            android:layout_height="52dp"
+            android:textStyle="normal"
+            android:textSize="12sp"
+            android:gravity="center"
+            android:lines="2"
+            android:textColor="?attr/colorPrimary"
+            android:padding="@dimen/def"
+            android:text="@string/beta_explained"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
         <LinearLayout
             android:id="@+id/sheet"
             android:layout_width="match_parent"

diff --git a/android/DartsScorecard/app/src/main/res/layout/activity_hiscore.xml b/android/DartsScorecard/app/src/main/res/layout/activity_hiscore.xml
@@ -8,6 +8,10 @@
         <variable
             name="viewModel"
             type="nl.entreco.dartsscorecard.hiscores.HiScoreViewModel" />
+
+        <variable
+            name="animator"
+            type="nl.entreco.dartsscorecard.base.PagerAnimator" />
 
     </data>
 
@@ -52,6 +56,7 @@
                 android:onClick="@{() -> viewModel.prev(hiscorePager)}"
                 android:padding="@dimen/large"
                 android:rotation="180"
+                android:contentDescription="@null"
                 android:scaleType="fitCenter"
                 android:src="@drawable/ic_arrow_start"
                 app:layout_constraintBottom_toBottomOf="@id/hiscore_description"
@@ -64,6 +69,7 @@
                 android:layout_height="0dp"
                 android:background="?android:attr/selectableItemBackgroundBorderless"
                 android:drawableTint="@color/white"
+                android:contentDescription="@null"
                 android:onClick="@{() -> viewModel.next(hiscorePager)}"
                 android:padding="@dimen/large"
                 android:scaleType="fitCenter"

diff --git a/android/DartsScorecard/app/src/main/res/layout/play_01_main.xml b/android/DartsScorecard/app/src/main/res/layout/play_01_main.xml
@@ -61,25 +61,31 @@
                 app:liveStats="@{viewModel.teamStats}" />
 
             <ImageView
-                android:layout_width="wrap_content"
+                android:id="@+id/stat_prev"
+                android:layout_width="48dp"
                 android:layout_height="@dimen/header_profile_pic_size"
                 android:layout_below="@id/title"
+                android:background="?android:attr/selectableItemBackgroundBorderless"
                 android:contentDescription="@null"
                 android:onClick="@{() -> viewModel.prev(statPager)}"
-                android:padding="@dimen/def"
+                android:padding="@dimen/large"
                 android:rotation="180"
+                android:scaleType="fitCenter"
                 android:src="@drawable/ic_arrow_start"
                 android:tint="@color/white"
                 app:showIf="@{viewModel.showPrev}" />
 
             <ImageView
-                android:layout_width="wrap_content"
+                android:id="@+id/stat_next"
+                android:layout_width="48dp"
                 android:layout_height="@dimen/header_profile_pic_size"
                 android:layout_below="@id/title"
                 android:layout_alignParentEnd="true"
+                android:background="?android:attr/selectableItemBackgroundBorderless"
                 android:contentDescription="@null"
                 android:onClick="@{() -> viewModel.next(statPager)}"
-                android:padding="@dimen/def"
+                android:padding="@dimen/large"
+                android:scaleType="fitCenter"
                 android:src="@drawable/ic_arrow_start"
                 android:tint="@color/white"
                 app:showIf="@{viewModel.showNext}" />

diff --git a/android/DartsScorecard/app/src/main/res/layout/toolbar_beta.xml b/android/DartsScorecard/app/src/main/res/layout/toolbar_beta.xml
@@ -28,11 +28,12 @@
                 android:gravity="center"
                 android:padding="@dimen/def"
                 android:shadowColor="@color/white"
-                android:shadowDx="0.2"
-                android:shadowDy="0.2"
+                android:shadowRadius="12.0"
+                android:shadowDx="0.5"
+                android:shadowDy="0.5"
                 android:text="@string/beta_header"
                 android:textAllCaps="true"
-                android:textColor="?attr/nameText"
+                android:textColor="?attr/colorPrimaryDark"
                 android:textSize="36sp"
                 app:layout_collapseMode="parallax"
                 app:layout_collapseParallaxMultiplier="0.5" />

diff --git a/android/DartsScorecard/app/src/main/res/values-nl/strings.xml b/android/DartsScorecard/app/src/main/res/values-nl/strings.xml
@@ -21,14 +21,14 @@
     <string name="title_setup">01 Match instellen</string>
     <string name="title_beta">Beta Features</string>
     <string name="title_wtf">@string/wtf</string>
-    <string name="title_hiscores">HiScores</string>
+    <string name="title_hiscores">Hiscores</string>
 
     <!-- Launch -->
     <string name="resume_x01">@string/resume</string>
     <string name="play_x01">Start new 01</string>
     <string name="profiles">Profielen beheren</string>
     <string name="hiscores">Hiscores</string>
-    <string name="beta">Beta</string>
+    <string name="beta">Nieuwe features</string>
     <string name="wtf">What the FAQ</string>
     <string name="stream_start">Start Stream</string>
     <string name="stream_stop">Stop Stream</string>
@@ -44,6 +44,8 @@
     <string name="donation_ok">THNX</string>
     <string name="votes_explained">&lt;p>Zodra deze feature &lt;b>%1$s&lt;/b> stemmen heeft, zullen we de implementatie starten.&lt;/p>&lt;p>Alle donaties &lt;b>verwijderen ook alle advertenties&lt;/b> in de app&lt;/p></string>
     <string name="beta_video">&lt;b>Bekijk de video&lt;/b></string>
+    <string name="beta_tagline">De populairste features worden als eerste ontwikkeld</string>
+    <string name="beta_explained">Laat ons weten welke features je graag in de nieuwe versie ziet. Kies \'STEM\' &amp; klik op het \u2764! We doen ons best</string>
 
     <!-- Setup -->
     <string name="select_players">Selecteer spelers</string>

diff --git a/android/DartsScorecard/app/src/main/res/values/strings.xml b/android/DartsScorecard/app/src/main/res/values/strings.xml
@@ -21,14 +21,14 @@
     <string name="title_setup">Configure 01 Game</string>
     <string name="title_beta">Beta Features</string>
     <string name="title_wtf">@string/wtf</string>
-    <string name="title_hiscores">HiScores</string>
+    <string name="title_hiscores">Hiscores</string>
 
     <!-- Launch -->
     <string name="resume_x01">@string/resume</string>
     <string name="play_x01">Start new 01</string>
     <string name="profiles">Manage Profiles</string>
     <string name="hiscores">Hiscores</string>
-    <string name="beta">Beta</string>
+    <string name="beta">New Features</string>
     <string name="wtf">What the FAQ</string>
     <string name="stream_start">Start Stream</string>
     <string name="stream_stop">Stop Stream</string>
@@ -44,6 +44,8 @@
     <string name="donation_ok">THANKS</string>
     <string name="votes_explained">&lt;p>Once this feature has &lt;b>%1$s&lt;/b> votes, development will start.&lt;/p>&lt;p>All Donations &lt;b>include removing all ads&lt;/b> from the app&lt;/p></string>
     <string name="beta_video">&lt;b>Watch the video&lt;/b></string>
+    <string name="beta_tagline">Most popular features, will be developed first</string>
+    <string name="beta_explained">Let us know which feature you would like to see next. Select \'VOTE\' &amp; click the \u2764! We\'ll do our best</string>
 
     <!-- Setup -->
     <string name="select_players">Select Players</string>

diff --git a/android/DartsScorecard/shared/src/main/res/values/strings_no_translate.xml b/android/DartsScorecard/shared/src/main/res/values/strings_no_translate.xml
@@ -51,5 +51,4 @@
 
     <!-- BETA -->
     <string name="beta_header" translatable="false">STAND UP\nIF YOU \u2764 DARTS</string>
-    <string name="beta_tagline" translatable="false">Most popular features, will be developed first</string>
 </resources>