clean up and add tests

patjackson52 · patjackson52 · commit 7471d82837eb · 2019-04-05T14:55:33.000-04:00
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -15,6 +15,7 @@
         <activity
             android:name="com.willowtreeapps.namegame.MainActivity"
             android:label="@string/app_name"
+            android:screenOrientation="portrait"
             android:theme="@style/AppTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/willowtreeapps/namegame/Utils.kt b/app/src/main/java/com/willowtreeapps/namegame/Utils.kt
@@ -4,6 +4,11 @@ import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
 import android.animation.AnimatorSet
 import android.content.res.Resources
+import android.graphics.drawable.Drawable
+import com.bumptech.glide.load.DataSource
+import com.bumptech.glide.load.engine.GlideException
+import com.bumptech.glide.request.RequestListener
+import com.bumptech.glide.request.target.Target
 
 val Int.dp: Int
     get() = (this / Resources.getSystem().displayMetrics.density).toInt()
@@ -19,4 +24,20 @@ fun AnimatorSet.onComplete(after: () -> Unit) {
                 after()
             }
         })
-    }
+    }
+
+/*
+ * Convenience function for executing lambda after the image is displayed
+ */
+fun <T: Any> GlideRequest<T>.onComplete(after: () -> Unit): GlideRequest<T> {
+    return this.listener(object : RequestListener<T> {
+        override fun onLoadFailed(e: GlideException?, model: Any?, target: Target<T>?, isFirstResource: Boolean): Boolean {
+            return true
+        }
+        override fun onResourceReady(resource: T?, model: Any?, target: Target<T>?, dataSource: DataSource?, isFirstResource: Boolean): Boolean {
+            after()
+            return false
+        }
+
+    })
+}
diff --git a/app/src/main/java/com/willowtreeapps/namegame/store/QuestionFragment.kt b/app/src/main/java/com/willowtreeapps/namegame/store/QuestionFragment.kt
@@ -3,7 +3,6 @@ package com.willowtreeapps.namegame.store
 import android.animation.AnimatorSet
 import android.animation.ObjectAnimator
 import android.graphics.Color
-import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -18,13 +17,8 @@ import nl.dionsegijn.konfetti.models.Shape
 import nl.dionsegijn.konfetti.models.Size
 import kotlin.coroutines.CoroutineContext
 import android.widget.Button
-import androidx.annotation.ColorRes
 import androidx.core.content.res.ResourcesCompat
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator
-import com.bumptech.glide.load.DataSource
-import com.bumptech.glide.load.engine.GlideException
-import com.bumptech.glide.request.RequestListener
-import com.bumptech.glide.request.target.Target
 import com.willowtreeapps.common.ui.QuestionPresenter
 import com.willowtreeapps.namegame.*
 import kotlinx.coroutines.*
@@ -39,7 +33,7 @@ class QuestionFragment : Fragment(), CoroutineScope, QuestionView, MainActivity.
 
     private var restoreX: Float? = null
     private var restoreY: Float? = null
-    var lastCorrectBtn: Button? = null
+    private var lastCorrectBtn: Button? = null
     private var lastSelectedBtn: Button? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
@@ -198,15 +192,11 @@ class QuestionFragment : Fragment(), CoroutineScope, QuestionView, MainActivity.
             txt_results.text = title
             GlideApp.with(this@QuestionFragment).load(profileImageUrl)
                     .transition(DrawableTransitionOptions.withCrossFade())
-                    .listener(object : RequestListener<Drawable> {
-                        override fun onLoadFailed(e: GlideException?, model: Any?, target: Target<Drawable>?, isFirstResource: Boolean): Boolean {
-                            return true
-                        }
-                        override fun onResourceReady(resource: Drawable?, model: Any?, target: Target<Drawable>?, dataSource: DataSource?, isFirstResource: Boolean): Boolean {
-                            showButtons()
-                            return false
-                        }
-                    })
+                    .onComplete {
+                        showButtons()
+                        txt_timer.visibility = View.VISIBLE
+                        presenter.profileImageIsVisible()
+                    }
                     .into(imageView)
             button1.text = button1Text
             button2.text = button2Text
@@ -220,7 +210,7 @@ class QuestionFragment : Fragment(), CoroutineScope, QuestionView, MainActivity.
             txt_timer.scaleX = 0f
             txt_timer.scaleY = 0f
             txt_timer.alpha = 1f
-            txt_timer.text = viewState.timerText.toString()
+            txt_timer.text = viewState.timerText
             txt_timer.animate()
                     .scaleX(1f)
                     .scaleY(1f)
@@ -252,7 +242,9 @@ class QuestionFragment : Fragment(), CoroutineScope, QuestionView, MainActivity.
                     .withEndAction {
                         showWrongAnswer(viewState, isEndGame)
                         txt_timer.animate().alpha(0f)
-                                .withEndAction { txt_timer.setTextColor(restoreColor)  }
+                                .withEndAction {
+                                    txt_timer.visibility = View.VISIBLE
+                                    txt_timer.setTextColor(restoreColor) }
                     }
 
         }
diff --git a/app/src/main/res/layout/fragment_start.xml b/app/src/main/res/layout/fragment_start.xml
@@ -58,7 +58,7 @@
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.86" />
+        app:layout_constraintVertical_bias="0.9" />
 
     <TextView
         android:id="@+id/txt_error"
diff --git a/app/src/test/java/com/willowtreeapps/namegame/ReducersTest.kt b/app/src/test/java/com/willowtreeapps/namegame/ReducersTest.kt
@@ -98,6 +98,32 @@ class ReducersTest {
         assertEquals(Question.Status.INCORRECT, final.currentQuestion?.status)
     }
 
+    @Test
+    fun `mark current round as TIMES when time is up`() {
+        val initial = generateInitialTestState()
+
+        val final = reducer(initial, Actions.TimesUpAction())
+
+        assertEquals(Question.Status.TIMES_UP, final.currentQuestion?.status)
+    }
+
+    @Test
+    fun `decrement timer`() {
+        val initial = generateInitialTestState()
+
+        val final = reducer(initial, Actions.DecrementCountDownAction())
+
+        assertEquals(initial.questionClock - 1, final.questionClock)
+    }
+
+    @Test
+    fun `start question timer with initial value`() {
+        val initial = generateInitialTestState()
+
+        val final = reducer(initial, Actions.StartQuestionTimerAction(10))
+
+        assertEquals(10, final.questionClock)
+    }
 
     private fun generateInitialTestState(): AppState {
         val initialState = reducer(AppState(), Actions.FetchingProfilesSuccessAction(MockRepositoryFactory.getValidResponse()))
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/Actions.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/Actions.kt
@@ -5,8 +5,6 @@ import com.willowtreeapps.common.repo.Profile
 
 sealed class Actions : Action {
 
-    class GameStartedAction()
-
     class FetchingProfilesStartedAction
     class FetchingProfilesSuccessAction(val profiles: List<Profile>)
     class FetchingProfilesFailedAction(val message: String)
@@ -21,14 +19,6 @@ sealed class Actions : Action {
     class ResetGameStateAction
 
     class StartQuestionTimerAction(val initialValue: Int)
-
-    class StartTimerAction(val name: String,
-                           val intervalMs: Long,
-                           val initialValue: Int = 5,
-                           val work: () -> Unit)
-
-    class StopTimerAction
-
     class DecrementCountDownAction
     class TimesUpAction
 
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/GameEngine.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/GameEngine.kt
@@ -5,7 +5,6 @@ import com.beyondeye.reduks.middlewares.applyMiddleware
 import com.beyondeye.reduks.middlewares.thunkMiddleware
 import com.willowtreeapps.common.middleware.NavigationMiddleware
 import com.willowtreeapps.common.middleware.Navigator
-import com.willowtreeapps.common.middleware.TimerMiddleware
 import com.willowtreeapps.common.middleware.ViewEffectsMiddleware
 import com.willowtreeapps.common.util.VibrateUtil
 import kotlin.coroutines.CoroutineContext
@@ -15,16 +14,14 @@ class GameEngine(navigator: Navigator, application: Any = Any(),
                  uiContext: CoroutineContext) {
     private val navigationMiddleware = NavigationMiddleware(navigator)
     private val viewEffectsMiddleware = ViewEffectsMiddleware()
-    private val timerMiddleware = TimerMiddleware(uiContext)
     private val presenterFactory by lazy { PresenterFactory(this, networkContext) }
     val vibrateUtil = VibrateUtil(application)
 
     val appStore by lazy {
         SimpleStore(AppState.INITIAL_STATE, reducer)
                 .applyMiddleware(::thunkMiddleware,
                         viewEffectsMiddleware::dispatch,
-                        navigationMiddleware::dispatch,
-                        timerMiddleware::dispatch)
+                        navigationMiddleware::dispatch)
     }
 
     fun attachView(view: View): Presenter<out View?> = presenterFactory.attachView(view)
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/NetworkThunks.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/NetworkThunks.kt
@@ -26,7 +26,6 @@ class NetworkThunks(private val networkContext: CoroutineContext,
             if (result.isSuccessful) {
                 Logger.d("Success")
                 store.dispatch(Actions.FetchingProfilesSuccessAction(result.response!!))
-                store.dispatch(timerThunks.startCountDownTimer(5))
             } else {
                 Logger.d("Failure")
                 store.dispatch(Actions.FetchingProfilesFailedAction(result.message!!))
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/Reducers.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/Reducers.kt
@@ -33,7 +33,6 @@ val reducer = ReducerFn<AppState> { state, action ->
         is NextQuestionAction -> state.copy(waitingForNextQuestion = false, currentQuestionIndex = state.currentQuestionIndex + 1)
         is GameCompleteAction -> state.copy(waitingForResultsTap = true, waitingForNextQuestion = false, currentQuestionIndex = state.currentQuestionIndex + 1)
         is StartOverAction, is ResetGameStateAction -> AppState.INITIAL_STATE
-        is StartTimerAction -> state.copy(questionClock = action.initialValue)
         is StartQuestionTimerAction -> state.copy(questionClock = action.initialValue)
         is DecrementCountDownAction -> state.copy(questionClock = state.questionClock - 1)
         is TimesUpAction -> {
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/TimerThunks.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/TimerThunks.kt
@@ -8,7 +8,7 @@ import kotlin.coroutines.CoroutineContext
 
 class TimerThunks(private val networkContext: CoroutineContext, val store: Store<AppState>) : CoroutineScope {
     override val coroutineContext = networkContext + Job()
-    var timerJob: Job? = null
+    private var timerJob: Job? = null
 
     /**
      * Starts a countdown timer that executes every X ms as specified by the action.
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/middleware/TimerMiddleware.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/middleware/TimerMiddleware.kt
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/GameResultsPresenter.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/GameResultsPresenter.kt
@@ -6,18 +6,12 @@ import com.beyondeye.reduks.StoreSubscriberFn
 import com.willowtreeapps.common.Actions
 import com.willowtreeapps.common.AppState
 import com.willowtreeapps.common.Presenter
-import com.willowtreeapps.common.boundary.toGameResultsViewState
-
 
 class GameResultsPresenter(val store: Store<AppState>) : Presenter<GameResultsView>() {
     override fun makeSubscriber(): StoreSubscriber<AppState> {
         return StoreSubscriberFn {  }
     }
 
-    override fun onStateChange(state: AppState) {
-        view?.showResults(state.toGameResultsViewState())
-    }
-
     fun startOverTapped() {
         store.dispatch(Actions.StartOverAction())
     }
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/PresenterFactory.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/PresenterFactory.kt
@@ -2,7 +2,6 @@ package com.willowtreeapps.common
 
 import com.beyondeye.reduks.*
 import com.willowtreeapps.common.ui.*
-import kotlinx.coroutines.CoroutineScope
 import kotlin.coroutines.CoroutineContext
 
 /**
@@ -99,5 +98,8 @@ abstract class Presenter<T : View?> {
     }
 
     abstract fun makeSubscriber(): StoreSubscriber<AppState>
-    abstract fun onStateChange(state: AppState)
+
+    fun onStateChange(state: AppState) {
+        subscriber?.onStateChange()
+    }
 }
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/QuestionPresenter.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/QuestionPresenter.kt
@@ -37,23 +37,17 @@ class QuestionPresenter(
         }
     }
 
-
-    override fun onStateChange(state: AppState) {
-        subscriber?.onStateChange()
-    }
-
     fun namePicked(name: String) {
         store.dispatch(Actions.NamePickedAction(name))
         store.dispatch(timerThunks.stopTimer())
     }
 
     fun nextTapped() {
         store.dispatch(Actions.NextQuestionAction())
+    }
+
+    fun profileImageIsVisible() {
         store.dispatch(timerThunks.startCountDownTimer(5))
-//        store.dispatch(Actions.StartTimerAction("questionCounter", 1000, 5) {
-//            Logger.d("timer action function")
-//            store.dispatch(Actions.DecrementCountDownAction())
-//        })
     }
 
     fun endGameTapped() {
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/StartPresenter.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/StartPresenter.kt
@@ -27,10 +27,6 @@ class StartPresenter(val store: Store<AppState>,
         }
     }
 
-    override fun onStateChange(state: AppState) {
-        subscriber?.onStateChange()
-    }
-
     fun startGame() {
         store.dispatch(Actions.ResetGameStateAction())
         store.dispatch(networkThunks.fetchProfiles())
diff --git a/iOS/NameGame/NameGame/Base.lproj/Main.storyboard b/iOS/NameGame/NameGame/Base.lproj/Main.storyboard
diff --git a/iOS/NameGame/NameGame/QuestionViewController.swift b/iOS/NameGame/NameGame/QuestionViewController.swift
