#14: Ads in MainStats & Showing first to 16 (legs)

Entreco · Nov 19, 2018 · e910097 · e910097
1 parent 3a7985b
commit e910097
Show file tree

Hide file tree

Showing 14 changed files with 79 additions and 8 deletions.
diff --git a/android/DartsScorecard/app/src/debug/res/values/keys.xml b/android/DartsScorecard/app/src/debug/res/values/keys.xml
@@ -5,4 +5,5 @@
     <string name="setup_ad_unit_id" translatable="false">ca-app-pub-3940256099942544/6300978111</string>
     <string name="stats_ad_unit_id" translatable="false">ca-app-pub-3940256099942544/6300978111</string>
     <string name="setup_interstitial_unit_id" translatable="false">ca-app-pub-3940256099942544/1033173712</string>
+    <string name="main_stats_unit_id" translatable="false">ca-app-pub-3940256099942544/1033173712</string>
 </resources>
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
@@ -5,11 +5,13 @@ import android.support.v4.view.ViewPager
 import android.view.View
 import android.view.ViewPropertyAnimator
 import android.view.ViewTreeObserver
+import com.google.android.gms.ads.AdView
 import kotlinx.android.synthetic.main.activity_play_01.view.*
 import kotlinx.android.synthetic.main.play_01_score.view.*
 import nl.entreco.dartsscorecard.base.widget.MaxHeightRecyclerView
 import nl.entreco.dartsscorecard.databinding.ActivityPlay01Binding
 import nl.entreco.dartsscorecard.play.live.LiveStatSlideAnimator
+import nl.entreco.dartsscorecard.play.live.LiveStatViewModel
 import kotlin.math.max
 import kotlin.math.sqrt
 

diff --git a/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/play/Play01ViewModel.kt b/android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/play/Play01ViewModel.kt
@@ -88,6 +88,7 @@ class Play01ViewModel @Inject constructor(private val playGameUsecase: Play01Use
     private fun onGameOk(request: Play01Request, response: Play01Response?,
                          revancheResponse: RevancheResponse?) {
         this.request = request
+        this.masterCaller.play(MasterCallerRequest(start = true))
         this.game = response?.game ?: revancheResponse!!.game
         this.teams = response?.teams ?: revancheResponse!!.teams
         val teamIds = response?.teamIds ?: revancheResponse!!.teamIds

diff --git a/...DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/play/live/LiveStatViewModel.kt b/...DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/play/live/LiveStatViewModel.kt
@@ -2,6 +2,7 @@ package nl.entreco.dartsscorecard.play.live
 
 import android.databinding.ObservableArrayMap
 import android.databinding.ObservableInt
+import nl.entreco.dartsscorecard.ad.AdViewModel
 import nl.entreco.dartsscorecard.archive.ArchiveServiceLauncher
 import nl.entreco.dartsscorecard.base.BaseViewModel
 import nl.entreco.dartsscorecard.play.score.GameLoadedNotifier

diff --git a/...d/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/play/score/ScoreViewModel.kt b/...d/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/play/score/ScoreViewModel.kt
@@ -1,8 +1,10 @@
 package nl.entreco.dartsscorecard.play.score
 
 import android.databinding.ObservableArrayList
+import android.databinding.ObservableBoolean
 import android.databinding.ObservableField
 import android.databinding.ObservableInt
+import nl.entreco.dartsscorecard.ad.AdViewModel
 import nl.entreco.dartsscorecard.base.BaseViewModel
 import nl.entreco.domain.model.Next
 import nl.entreco.domain.model.Score
@@ -23,7 +25,9 @@ class ScoreViewModel @Inject constructor(
         private val fetchMatchDescriptionUsecase: FetchMatchDescriptionUsecase) : BaseViewModel(), GameLoadedNotifier<ScoreSettings>, ScoreListener, PlayerListener {
 
     val description = ObservableField<String>("")
+    val firstTo = ObservableInt(0)
     val numSets = ObservableInt(0)
+    val showSets = ObservableBoolean(true)
     val teams = ObservableArrayList<Team>()
     val currentTeam = ObservableInt()
     val scores = ObservableArrayList<Score>()
@@ -38,6 +42,8 @@ class ScoreViewModel @Inject constructor(
         this.teams.clear()
         this.teams.addAll(teams)
         this.numSets.set(info.numSets)
+        this.showSets.set(info.numSets > 1)
+        this.firstTo.set(if(info.numSets > 1) info.numSets else info.numLegs)
         this.fetchMatchDescriptionUsecase.go({ response -> description.set(response.description.description) }, { /* TODO: Set default value */})
     }
 

diff --git a/...rtsScorecard/app/src/main/java/nl/entreco/dartsscorecard/play/score/TeamScoreViewModel.kt b/...rtsScorecard/app/src/main/java/nl/entreco/dartsscorecard/play/score/TeamScoreViewModel.kt
@@ -25,6 +25,7 @@ class TeamScoreViewModel(val team: Team, startScore: Score,
                          starter: Boolean) : BaseViewModel(), TeamScoreListener {
 
     val finish = ObservableField<String>("")
+    val showSets = ObservableBoolean(startScore.settings.numSets > 1)
     val nineDarter = ObservableBoolean(false)
     val started = ObservableBoolean(starter)
     val scored = ObservableInt(0)

diff --git a/android/DartsScorecard/app/src/main/res/layout/include_main_ad.xml b/android/DartsScorecard/app/src/main/res/layout/include_main_ad.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:ads="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:showIn="@layout/play_01_score">
+
+    <data>
+
+        <variable
+            name="viewModel"
+            type="nl.entreco.dartsscorecard.ad.AdViewModel" />
+    </data>
+
+    <LinearLayout
+        android:id="@+id/adContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:visibility="gone"
+        tools:visibility="visible"
+        android:layout_marginTop="@dimen/small"
+        app:showAd="@{viewModel.showAd}">
+
+        <TextView
+            style="@style/Setup.Hdr"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/large"
+            android:background="@drawable/score_header"
+            android:orientation="horizontal"
+            android:padding="@dimen/xsmall"
+            android:text="@string/sponsored_by" />
+
+        <!-- Ad -->
+        <com.google.android.gms.ads.AdView
+            android:id="@+id/ad"
+            style="@style/Setup.Ad"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            ads:adSize="SMART_BANNER"
+            ads:adUnitId="@string/main_stats_unit_id"
+            app:viewModel="@{viewModel}" />
+
+        <!-- Footer -->
+        <TextView style="@style/Setup.Ftr" />
+    </LinearLayout>
+</layout>
diff --git a/android/DartsScorecard/app/src/main/res/layout/include_setup_ad.xml b/android/DartsScorecard/app/src/main/res/layout/include_setup_ad.xml
@@ -6,7 +6,6 @@
     tools:showIn="@layout/activity_setup_01">
 
     <data>
-
         <variable
             name="viewModel"
             type="nl.entreco.dartsscorecard.ad.AdViewModel" />

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
@@ -112,6 +112,15 @@
                 android:text="@string/version"
                 android:textColor="#aaffffff" />
 
+            <!-- Ad -->
+            <!--<include-->
+                <!--android:id="@+id/include_ad"-->
+                <!--layout="@layout/include_main_ad"-->
+                <!--android:layout_width="match_parent"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_below="@id/version"-->
+                <!--app:viewModel="@{viewModel.adViewModel}" />-->
+
         </RelativeLayout>
     </android.support.v4.widget.NestedScrollView>
 </layout>
diff --git a/android/DartsScorecard/app/src/main/res/layout/play_01_score.xml b/android/DartsScorecard/app/src/main/res/layout/play_01_score.xml
@@ -35,15 +35,16 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="@dimen/score_name_w"
-                android:text="@{@string/first_to(viewModel.numSets)}" />
+                android:text="@{@string/first_to(viewModel.firstTo)}" />
 
             <TextView
                 style="@style/Score.Hdr"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="@dimen/score_leg_w"
                 android:gravity="center"
-                android:text="@string/set" />
+                android:text="@string/set"
+                app:showIf="@{viewModel.showSets}" />
 
             <TextView
                 style="@style/Score.Hdr"
@@ -91,5 +92,6 @@
                 app:description="@{viewModel.description}" />
 
         </LinearLayout>
+
     </LinearLayout>
 </layout>
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
@@ -62,6 +62,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="@dimen/score_leg_w"
                 app:score="@{viewModel.score.set}"
+                app:showIf="@{viewModel.showSets}"
                 tools:text="1" />
 
             <nl.entreco.dartsscorecard.base.widget.CounterTextView

diff --git a/android/DartsScorecard/app/src/main/res/values/keys.xml b/android/DartsScorecard/app/src/main/res/values/keys.xml
@@ -5,4 +5,5 @@
     <string name="setup_ad_unit_id" translatable="false">ca-app-pub-3793327349392749/2238054293</string>
     <string name="stats_ad_unit_id" translatable="false">ca-app-pub-3793327349392749/3337437992</string>
     <string name="setup_interstitial_unit_id" translatable="false">ca-app-pub-3793327349392749/9019610403</string>
+    <string name="main_stats_unit_id" translatable="false">ca-app-pub-3793327349392749/2121840152</string>
 </resources>
diff --git a/...ecard/app/src/test/java/nl/entreco/dartsscorecard/play/Play01ViewModelMasterCallerTest.kt b/...ecard/app/src/test/java/nl/entreco/dartsscorecard/play/Play01ViewModelMasterCallerTest.kt
@@ -2,10 +2,7 @@ package nl.entreco.dartsscorecard.play
 
 import android.view.Menu
 import android.view.MenuItem
-import com.nhaarman.mockito_kotlin.any
-import com.nhaarman.mockito_kotlin.argumentCaptor
-import com.nhaarman.mockito_kotlin.verify
-import com.nhaarman.mockito_kotlin.whenever
+import com.nhaarman.mockito_kotlin.*
 import nl.entreco.dartsscorecard.R
 import nl.entreco.dartsscorecard.ad.AdViewModel
 import nl.entreco.dartsscorecard.base.DialogHelper
@@ -113,6 +110,8 @@ class Play01ViewModelMasterCallerTest {
         whenever(mockGame.next).thenReturn(Next(State.NORMAL, Team(arrayOf(player)), 0, player, score))
         verify(mockPlayGameUsecase).loadGameAndStart(any(), doneCaptor.capture(), any())
         doneCaptor.firstValue.invoke(Play01Response(mockGame, ScoreSettings(501, 1, 1, 0), emptyArray(), "1"))
+        verify(mockMasterCaller).play(any())
+        reset(mockMasterCaller)
     }
 
     private fun whenSubmittingTurn(turn: Turn) {

diff --git a/android/DartsScorecard/scripts/dependencies.gradle b/android/DartsScorecard/scripts/dependencies.gradle
@@ -35,7 +35,7 @@ ext.versionName = { ->
 
 ext {
     kotlinVersion = '1.2.61'
-    gradleVersion = '3.2.0-beta05'
+    gradleVersion = '3.2.1'
     gmsVersion = '4.0.1'
     dexCountVersion = '0.8.2'
     detektVersion = '1.0.0.RC7'