animations working on android and iOS. WT banner on iOS StartScreen fixed.

Author: patjackson52

app/src/main/AndroidManifest.xml

@@ -15,7 +15,7 @@
         <activity
             android:name="com.willowtreeapps.namegame.MainActivity"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.TransparentTheme">
+            android:theme="@style/AppTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/java/com/willowtreeapps/namegame/store/QuestionFragment.kt

@@ -1,10 +1,9 @@
 package com.willowtreeapps.namegame.store
 
-import android.animation.Animator
-import android.animation.AnimatorListenerAdapter
 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
@@ -22,6 +21,10 @@ 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.*
@@ -36,7 +39,6 @@ class QuestionFragment : Fragment(), CoroutineScope, QuestionView, MainActivity.
 
     private var restoreX: Float? = null
     private var restoreY: Float? = null
-    @ColorRes
     var lastCorrectBtn: Button? = null
     private var lastSelectedBtn: Button? = null
 
@@ -114,11 +116,7 @@ class QuestionFragment : Fragment(), CoroutineScope, QuestionView, MainActivity.
             upSet.playTogether(animScaleX, animScaleY)
             upSet.interpolator = BounceInterpolator()
             upSet.duration = 500
-            upSet.addListener(object : AnimatorListenerAdapter() {
-                override fun onAnimationEnd(animation: Animator?) {
-                    after()
-                }
-            })
+            upSet.onComplete { after() }
             upSet.start()
         } else {
             after()
@@ -189,26 +187,31 @@ class QuestionFragment : Fragment(), CoroutineScope, QuestionView, MainActivity.
     }
 
     private fun fadeNextButton(after: () -> Unit) {
-        btn_next.animate().alpha(0f).setListener(object : AnimatorListenerAdapter() {
-            override fun onAnimationEnd(animation: Animator?) {
-                btn_next.visibility = View.GONE
-                after()
-                btn_next.animate().setListener(null)
-            }
-        })
+        btn_next.animate().alpha(0f).withEndAction {
+            btn_next.visibility = View.GONE
+            after()
+        }
     }
 
     private fun setProfileAndFadeIn(viewState: QuestionViewState) {
         with(viewState) {
             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
+                        }
+                    })
                     .into(imageView)
             button1.text = button1Text
             button2.text = button2Text
             button3.text = button3Text
             button4.text = button4Text
-            showButtons()
         }
     }
 
@@ -217,7 +220,7 @@ class QuestionFragment : Fragment(), CoroutineScope, QuestionView, MainActivity.
             txt_timer.scaleX = 0f
             txt_timer.scaleY = 0f
             txt_timer.alpha = 1f
-            txt_timer.text = viewState.questionTime.toString()
+            txt_timer.text = viewState.timerText.toString()
             txt_timer.animate()
                     .scaleX(1f)
                     .scaleY(1f)
@@ -238,7 +241,8 @@ class QuestionFragment : Fragment(), CoroutineScope, QuestionView, MainActivity.
         activity?.runOnUiThread {
             txt_timer.scaleX = 0f
             txt_timer.scaleY = 0f
-            txt_timer.text = "TIMES UP!!"
+            txt_timer.text = viewState.timerText
+            val restoreColor = txt_timer.currentTextColor
             txt_timer.setTextColor(ResourcesCompat.getColor(context?.resources!!, R.color.red, null))
             txt_timer.animate()
                     .scaleX(1f)
@@ -248,6 +252,7 @@ class QuestionFragment : Fragment(), CoroutineScope, QuestionView, MainActivity.
                     .withEndAction {
                         showWrongAnswer(viewState, isEndGame)
                         txt_timer.animate().alpha(0f)
+                                .withEndAction { txt_timer.setTextColor(restoreColor)  }
                     }
 
         }

app/src/main/java/com/willowtreeapps/namegame/store/StartFragment.kt

@@ -53,4 +53,10 @@ class StartFragment : Fragment(), CoroutineScope, StartView {
             loading_spinner.visibility = View.VISIBLE
         }
     }
+
+    override fun showError(msg: String) {
+        activity?.runOnUiThread {
+            txt_error.text = msg
+        }
+    }
 }

app/src/main/res/layout/fragment_start.xml

@@ -34,8 +34,8 @@
         app:srcCompat="@drawable/willowtree_banner" />
 
     <TextView
-        style="@style/Title"
         android:id="@+id/textView"
+        style="@style/Title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="248dp"
@@ -58,6 +58,17 @@
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.53" />
+        app:layout_constraintVertical_bias="0.86" />
+
+    <TextView
+        android:id="@+id/txt_error"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:text="TextView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/btn_start" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/test/java/com/willowtreeapps/namegame/ReducersTest.kt

@@ -13,7 +13,7 @@ class ReducersTest {
     @Test
     fun `take random N items`() {
         val list = listOf(1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 1, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1)
-        val randomList = list.takeRandomDistint(10)
+        val randomList = list.takeRandomDistinct(10)
         assert(randomList.size == 10)
         assert(randomList.distinctBy { it }.size == 10)
     }
@@ -22,7 +22,7 @@ class ReducersTest {
     fun `throw exception on N greater than size`() {
         val list = listOf(1, 2)
         val value = try {
-            list.takeRandomDistint(3)
+            list.takeRandomDistinct(3)
         } catch (e: Exception) {
             e
         }

build.gradle

@@ -5,11 +5,12 @@ buildscript {
     repositories {
         google()
         jcenter()
+        maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
         maven { url "https://kotlin.bintray.com/kotlinx" }
         maven { url 'https://dl.bintray.com/jetbrains/kotlin-native-dependencies' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0-alpha09'
+        classpath 'com.android.tools.build:gradle:3.5.0-alpha10'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlinVersion"
         // NOTE: Do not place your application dependencies here; they belong
@@ -23,6 +24,7 @@ allprojects {
         jcenter()
         mavenCentral()
         maven { url "https://jitpack.io" }
+        maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
         maven { url "https://kotlin.bintray.com/kotlinx" }
         maven { url "https://dl.bintray.com/kotlin/ktor" }
         maven { url "https://dl.bintray.com/soywiz/soywiz" }

common/build.gradle

@@ -1,3 +1,6 @@
+//plugins {
+//      id("org.jetbrains.kotlin.native.cocoapods")
+//}
 repositories {
     maven { url "https://dl.bintray.com/soywiz/soywiz" }
 }
@@ -8,7 +11,10 @@ apply plugin: 'kotlinx-serialization'
 
 
 
+
+
 kotlin {
+
     android {
         compilations.all {
             tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) { task ->

common/src/commonMain/kotlin/com/beyondeye/reduks/builders.kt

@@ -61,13 +61,16 @@ class SelectorSubscriberBuilder<S : Any>(val store: Store<S>) {
 }
 
 /**
- * Helper function that creates a DSL for subscribing to changes in specific state fields and actions to take
+ * Helper function that creates a DSL for subscribing to changes in specific state fields and actions to take.
+ * Inside the lambda there is access to the current state through the var `state`
+ *
  * ex:
  *      SelectorSubscriberFn {
  *          withSingleField({it.foo}, { actionWhenFooChanges() }
  *
  *          withAnyChange {
  *              //called whenever any change happens to state
+ *              view.setMessage(state.barMsg) //state is current state
  *          }
  *      }
  */

common/src/commonMain/kotlin/com/willowtreeapps/common/AppState.kt

@@ -18,6 +18,9 @@ data class AppState(val isLoadingProfiles: Boolean = false,
 
     fun Question.profile(): Profile = profiles.find { ProfileId(it.id) == this.profileId }!!
 
+    val timerText: String
+        get() = if (questionClock >= 0) questionClock.toString() else "TIME'S UP!!"
+
     val currentQuestion: Question?
         get() = if (questions.size > currentQuestionIndex)
             questions[currentQuestionIndex]

common/src/commonMain/kotlin/com/willowtreeapps/common/Reducers.kt

@@ -21,7 +21,7 @@ val reducer = ReducerFn<AppState> { state, action ->
         }
         is FetchingProfilesFailedAction -> state.copy(isLoadingProfiles = false, errorLoadingProfiles = true, errorMsg = action.message)
         is NamePickedAction -> {
-            val status = if (state.currentQuestionProfile()?.matches(action.name) == true) {
+            val status = if (state.currentQuestionProfile().matches(action.name)) {
                 Question.Status.CORRECT
             } else {
                 Question.Status.INCORRECT
@@ -40,17 +40,17 @@ val reducer = ReducerFn<AppState> { state, action ->
             val status = Question.Status.TIMES_UP
             val newQuestions = state.questions.toMutableList()
             newQuestions[state.currentQuestionIndex] = newQuestions[state.currentQuestionIndex].copy(answerName = "", status = status)
-            state.copy(questions = newQuestions, waitingForNextQuestion = true)
+            state.copy(questions = newQuestions, waitingForNextQuestion = true, questionClock = -1)
         }
 
         else -> throw AssertionError("Action ${action::class.simpleName} not handled")
     }
 }
 
 fun generateRounds(profiles: List<Profile>, n: Int): List<Question> =
-        profiles.takeRandomDistint(n)
+        profiles.takeRandomDistinct(n)
                 .map {
-                    val choiceList = profiles.takeRandomDistint(3).toMutableList()
+                    val choiceList = profiles.takeRandomDistinct(3).toMutableList()
                     choiceList.add(abs(random.nextInt() % 4), it)
 
                     Question(profileId = ProfileId(it.id), choices = choiceList
@@ -61,12 +61,12 @@ fun generateRounds(profiles: List<Profile>, n: Int): List<Question> =
 private val random = Random(TimeUtil.systemTimeMs())
 
 /**
- * Take N distict elements from the list.  Distict is determined by a comparasion of objects in the
+ * Take N distict elements from the list.  Distinct is determined by a comparision of objects in the
  * list.
  * @throws IllegalStateException when n > number of distict elements.
  * @return New immutable list containing N random elements from the given List.
  */
-fun <T> List<T>.takeRandomDistint(n: Int): List<T> {
+fun <T> List<T>.takeRandomDistinct(n: Int): List<T> {
     val newList = mutableListOf<T>()
     val uniqueItems = this.distinctBy { it }
     if (uniqueItems.size < n) {
@@ -87,3 +87,4 @@ fun <T> List<T>.takeRandomDistint(n: Int): List<T> {
 
 fun <T> List<T>.takeRandom(): T =
         this[random.nextInt(this.size - 1)]
+