Merge pull request #13 from algolia/feature/update-coroutines-and-dependencies

Feature/update coroutines and dependencies

Author: PLNech

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0-alpha08'
+        classpath 'com.android.tools.build:gradle:3.3.0-alpha11'
         classpath "com.github.ben-manes:gradle-versions-plugin:$benManes"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlins"
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$bintray"

dependency.gradle

@@ -1,6 +1,6 @@
 ext.with {
     sdkCompile = 28
-    sdkMin = 23
+    sdkMin = 14
     sdkTarget = 28
 
     versioningName = '1.0'
@@ -10,15 +10,15 @@ ext.with {
     jvm = '1.8'
 
     appcompat = '28.0.0-rc02'
-    design = '28.0.0-rc01'
+    design = '28.0.0-rc02'
     constraintLayout = '1.1.2'
     espresso = '3.0.2'
 
     archRuntime = '1.1.1'
     archCompiler = '1.1.1'
 
-    kotlins = '1.2.61'
-    coroutines = '0.25.0'
+    kotlins = '1.2.70'
+    coroutines = '0.26.1'
 
     bintray = '1.8.4'
     maven = '2.1'

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip

ui/build.gradle

@@ -45,3 +45,9 @@ dependencies {
     testImplementation dependency_jvm.kotlin_test
     testImplementation dependency_jvm.kotlin_test_junit
 }
+
+kotlin {
+    experimental {
+        coroutines "enable"
+    }
+}

ui/src/main/kotlin/com/algolia/instantsearch/voice/ui/RippleView.kt

@@ -3,12 +3,13 @@ package com.algolia.instantsearch.voice.ui
 import android.animation.AnimatorSet
 import android.content.Context
 import android.graphics.Canvas
+import android.os.Looper
 import android.util.AttributeSet
 import android.view.View
-import kotlinx.coroutines.experimental.Job
+import kotlinx.coroutines.experimental.*
+import kotlinx.coroutines.experimental.android.Main
 import kotlinx.coroutines.experimental.android.UI
-import kotlinx.coroutines.experimental.delay
-import kotlinx.coroutines.experimental.launch
+import kotlinx.coroutines.experimental.android.awaitFrame
 
 /** A View displaying a ripple effect. */
 class RippleView : View {
@@ -39,7 +40,8 @@ class RippleView : View {
     private var radius: Float = 0f
     private var size: Int = 0
 
-    private lateinit var jobAnimation: Job
+    private var jobAnimation: Job? = null
+    private var jobFps : Job? = null
 
     private var state = State.None
         set(value) {
@@ -51,14 +53,33 @@ class RippleView : View {
                     jobAnimation = animation()
                 }
                 State.Stopped -> try {
-                    jobAnimation.cancel()
+                    jobAnimation?.cancel()
+                    jobAnimation = null
                 } catch (e: UninitializedPropertyAccessException) {
                     // cancel() was called before start()
                 }
                 State.None -> Unit
             }
         }
 
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        jobFps = GlobalScope.launch(Dispatchers.Main) {
+            while (isActive) {
+                awaitFrame()
+                invalidate()
+            }
+        }
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        jobFps?.cancel()
+        jobFps = null
+        jobAnimation?.cancel()
+        jobAnimation = null
+    }
+
     private fun init(attrs: AttributeSet) {
         context.obtainStyledAttributes(attrs, R.styleable.RippleView, 0, 0).also {
             val drawable = it.getDrawable(R.styleable.RippleView_drawable)
@@ -70,18 +91,10 @@ class RippleView : View {
 
             circles = (0 until circleCount).map { DrawableSprite(drawable, size, Opacity.p0) }
         }.recycle()
-        launch(UI) {
-            // This coroutine refreshes the view at 60 fps
-            while (isActive) {
-                UI.awaitFrame()
-                invalidate()
-            }
-        }
     }
 
     /** This coroutine generates an animation at each [interval][circleCount]. */
-    private fun animation(): Job = launch(UI) {
-
+    private fun animation(): Job = GlobalScope.launch(Dispatchers.Main) {
         var index = 0
         while (isActive) {
             animations[index] = circles[index].circleAnimation().also { it.start() }