Compatibility with SDK 16

q-litzler · PLNech · commit 66b9d28344fa · 2018-09-26T15:34:24.000+02:00
diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
@@ -28,12 +28,14 @@
         style="@style/Widget.MaterialComponents.Button"
         app:layout_constraintBottom_toTopOf="@id/buttonPermission"
         android:layout_marginEnd="24dp"
+        android:layout_marginRight="24dp"
         android:text="@string/button_voice"
         android:textAllCaps="false"
         android:textAppearance="?attr/textAppearanceSubtitle2"
         android:textSize="16sp"
         app:cornerRadius="6dp"
         android:layout_marginStart="24dp"
+        android:layout_marginLeft="24dp"
         app:layout_constraintVertical_chainStyle="packed"
         android:layout_width="0dp"
         android:layout_height="56dp"/>
diff --git a/dependency.gradle b/dependency.gradle
@@ -1,6 +1,6 @@
 ext.with {
     sdkCompile = 28
-    sdkMin = 14
+    sdkMin = 16
     sdkTarget = 28
 
     versioningName = '1.0'
diff --git a/ui/build.gradle b/ui/build.gradle
@@ -34,7 +34,7 @@ android {
         versionName versioningName
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
+        vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
         release {
diff --git a/ui/src/main/kotlin/com/algolia/instantsearch/voice/ui/RippleView.kt b/ui/src/main/kotlin/com/algolia/instantsearch/voice/ui/RippleView.kt
@@ -39,7 +39,7 @@ class RippleView : View {
 
         override fun run() {
             invalidate()
-            postRunnableFps(this, fps)
+            postOnAnimation(this)
         }
     }
 
@@ -51,7 +51,7 @@ class RippleView : View {
         override fun run() {
             animations[index] = circles[index].circleAnimation().also { it.start() }
             index = if (index == circles.lastIndex) 0 else index + 1
-            postRunnableAnimation(this)
+            postOnAnimationDelayed(this, delay)
         }
     }
 
@@ -68,7 +68,7 @@ class RippleView : View {
                 State.Playing -> {
                     animations.values.forEach { it.end() }
                     animations.clear()
-                    postRunnableAnimation(runnableAnimation)
+                    postOnAnimationDelayed(runnableAnimation, delay)
                 }
                 State.Stopped -> removeCallbacks(runnableAnimation)
                 State.None -> Unit
@@ -77,7 +77,7 @@ class RippleView : View {
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
-        postRunnableFps(runnableFps, fps)
+        postOnAnimation(runnableFps)
     }
 
     override fun onDetachedFromWindow() {
@@ -100,22 +100,6 @@ class RippleView : View {
         }.recycle()
     }
 
-    private fun postRunnableAnimation(runnable: Runnable) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            postOnAnimationDelayed(runnable, delay)
-        } else {
-            postDelayed(runnable, delay)
-        }
-    }
-
-    private fun postRunnableFps(runnable: Runnable, fps: Long) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            postOnAnimation(runnable)
-        } else {
-            postDelayed(runnable, fps)
-        }
-    }
-
     private fun DrawableSprite.circleAnimation(): AnimatorSet =
         AnimatorSet().also {
             it.duration = duration
diff --git a/ui/src/main/kotlin/com/algolia/instantsearch/voice/ui/VoiceMicrophone.kt b/ui/src/main/kotlin/com/algolia/instantsearch/voice/ui/VoiceMicrophone.kt
@@ -2,13 +2,17 @@ package com.algolia.instantsearch.voice.ui
 
 import android.content.Context
 import android.content.res.ColorStateList
+import android.graphics.ColorFilter
+import android.graphics.PorterDuff
+import android.graphics.PorterDuffColorFilter
 import android.support.v4.content.ContextCompat
+import android.support.v7.widget.AppCompatImageView
 import android.util.AttributeSet
 import android.widget.ImageView
 import com.algolia.instantsearch.voice.ui.R
 
 
-class VoiceMicrophone(context: Context, attrs: AttributeSet) : ImageView(context, attrs) {
+class VoiceMicrophone(context: Context, attrs: AttributeSet) : AppCompatImageView(context, attrs) {
 
     enum class State {
         Activated,
@@ -21,13 +25,14 @@ class VoiceMicrophone(context: Context, attrs: AttributeSet) : ImageView(context
     var state = State.Deactivated
         set(value) {
             field = value
-            imageTintList = ColorStateList.valueOf(when (value) {
+            drawable.colorFilter = PorterDuffColorFilter(when (value) {
                 State.Activated -> white
                 State.Deactivated -> blue
-            })
-            backgroundTintList = when (value) {
+            }, PorterDuff.Mode.SRC_IN)
+
+            background.colorFilter = when (value) {
                 State.Activated -> null
-                State.Deactivated -> ColorStateList.valueOf(white)
+                State.Deactivated -> PorterDuffColorFilter(white, PorterDuff.Mode.SRC_IN)
             }
         }
 }
diff --git a/ui/src/main/res/drawable-v21/button_negative_background_ripple.xml b/ui/src/main/res/drawable-v21/button_negative_background_ripple.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?attr/colorControlHighlight">
+
+    <item android:drawable="@drawable/button_negative_background"/>
+</ripple>
diff --git a/ui/src/main/res/drawable-v21/button_positive_background_ripple.xml b/ui/src/main/res/drawable-v21/button_positive_background_ripple.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?attr/colorControlHighlight">
+
+    <item android:drawable="@drawable/button_positive_background"/>
+</ripple>
diff --git a/ui/src/main/res/drawable-v21/microphone_background_ripple.xml b/ui/src/main/res/drawable-v21/microphone_background_ripple.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?attr/colorControlHighlight">
+
+    <item android:drawable="@drawable/microphone_background"/>
+</ripple>
diff --git a/ui/src/main/res/drawable/button_negative_background_ripple.xml b/ui/src/main/res/drawable/button_negative_background_ripple.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?attr/colorControlHighlight">
-
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@drawable/button_negative_background"/>
-</ripple>
+</selector>
diff --git a/ui/src/main/res/drawable/button_positive_background_ripple.xml b/ui/src/main/res/drawable/button_positive_background_ripple.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?attr/colorControlHighlight">
-
-    <item android:drawable="@drawable/button_positive_background"/>
-</ripple>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/button_positive_background" />
+</selector>
diff --git a/ui/src/main/res/drawable/microphone_background_ripple.xml b/ui/src/main/res/drawable/microphone_background_ripple.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?attr/colorControlHighlight">
-
-    <item android:drawable="@drawable/microphone_background"/>
-</ripple>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/microphone_background" />
+</selector>
diff --git a/ui/src/main/res/layout/voice_input.xml b/ui/src/main/res/layout/voice_input.xml
@@ -32,13 +32,13 @@
         android:elevation="4dp"
         android:scaleType="center"
         android:background="@drawable/microphone_background_ripple"
-        android:src="@drawable/ic_microphone"
+        app:srcCompat="@drawable/ic_microphone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"/>
 
-    <ImageView
+    <android.support.v7.widget.AppCompatImageView
         android:id="@+id/close"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -47,11 +47,13 @@
         app:layout_constraintVertical_bias="0"
         android:layout_marginTop="12dp"
         android:layout_marginEnd="12dp"
+        android:layout_marginRight="12dp"
+        android:layout_marginStart="12dp"
         android:foreground="?attr/selectableItemBackgroundBorderless"
         android:padding="4dp"
         android:tint="@color/white"
         app:layout_constraintHorizontal_bias="1"
-        android:src="@drawable/ic_close"
+        app:srcCompat="@drawable/ic_close"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
@@ -67,6 +69,8 @@
         app:layout_constraintEnd_toEndOf="parent"
         android:layout_marginStart="24dp"
         android:layout_marginEnd="24dp"
+        android:layout_marginRight="24dp"
+        android:layout_marginLeft="24dp"
         app:layout_constraintVertical_chainStyle="packed"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"/>
@@ -93,6 +97,7 @@
         android:layout_marginTop="8dp"
         android:lineSpacingMultiplier="1.5"
         android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
         android:textAppearance="?attr/textAppearanceSubtitle2"
         app:layout_constraintBottom_toTopOf="@id/microphone"
         app:layout_constraintEnd_toEndOf="@id/title"
diff --git a/ui/src/main/res/layout/voice_permission.xml b/ui/src/main/res/layout/voice_permission.xml
@@ -8,7 +8,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <ImageView
+    <android.support.v7.widget.AppCompatImageView
         android:id="@+id/close"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -17,11 +17,14 @@
         app:layout_constraintVertical_bias="0"
         android:layout_marginTop="12dp"
         android:layout_marginEnd="12dp"
+        android:layout_marginRight="12dp"
+        android:layout_marginStart="12dp"
+        android:layout_marginLeft="12dp"
         android:foreground="?attr/selectableItemBackgroundBorderless"
         android:padding="4dp"
         android:tint="@color/white"
         app:layout_constraintHorizontal_bias="1"
-        android:src="@drawable/ic_close"
+        app:srcCompat="@drawable/ic_close"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
@@ -36,6 +39,8 @@
         android:maxLines="3"
         app:layout_constraintVertical_chainStyle="packed"
         android:layout_marginStart="24dp"
+        android:layout_marginLeft="24dp"
+        android:layout_marginRight="24dp"
         android:layout_marginEnd="24dp"
         app:layout_constraintBottom_toTopOf="@id/subtitle"
         android:layout_width="0dp"
@@ -69,8 +74,10 @@
         android:text="@string/permission_button_allow"
         android:background="@drawable/button_positive_background_ripple"
         android:layout_marginStart="24dp"
+        android:layout_marginLeft="24dp"
         android:textSize="16sp"
         android:layout_marginEnd="24dp"
+        android:layout_marginRight="24dp"
         android:textAllCaps="false"
         android:textAppearance="?attr/textAppearanceSubtitle2"
         app:layout_constraintTop_toBottomOf="@id/guideline"
diff --git a/voice/src/main/kotlin/com/algolia/instantsearch/voice/VoiceSpeechRecognizer.kt b/voice/src/main/kotlin/com/algolia/instantsearch/voice/VoiceSpeechRecognizer.kt
@@ -53,6 +53,10 @@ class VoiceSpeechRecognizer(
     }
 
     fun destroy() {
-        speechRecognizer.destroy()
+        try {
+            speechRecognizer.destroy()
+        } catch (exception: Exception) {
+            exception.printStackTrace()
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ android {`
`34`	`34`	`versionName versioningName`
`35`	`35`
`36`	`36`	`testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"`
`37`		`-`
	`37`	`+ vectorDrawables.useSupportLibrary = true`
`38`	`38`	`}`
`39`	`39`	`buildTypes {`
`40`	`40`	`release {`