Skip to content

Commit 749b5e5

Browse files
aallamaallam
committed
wip: migrate from android support to androidx
1 parent 4900f1a commit 749b5e5

File tree

15 files changed

+55
-53
lines changed

15 files changed

+55
-53
lines changed

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ android {
99
targetSdkVersion sdkTarget
1010
versionCode versioningCode
1111
versionName versioningName
12-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
12+
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
1313
}
1414
buildTypes {
1515
release {

‎app/src/androidTest/java/com/algolia/instantsearch/voice/demo/MainActivityNoPermissionTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
package com.algolia.instantsearch.voice.demo;
22

33

4-
import android.support.test.filters.LargeTest;
5-
import android.support.test.rule.ActivityTestRule;
6-
import android.support.test.runner.AndroidJUnit4;
4+
import androidx.test.filters.LargeTest;
5+
import androidx.test.rule.ActivityTestRule;
6+
import androidx.test.ext.junit.runners.AndroidJUnit4;
77

88
import org.junit.Rule;
99
import org.junit.Test;
1010
import org.junit.runner.RunWith;
1111

12-
import static android.support.test.espresso.Espresso.onView;
13-
import static android.support.test.espresso.action.ViewActions.click;
14-
import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;
15-
import static android.support.test.espresso.assertion.ViewAssertions.matches;
16-
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
17-
import static android.support.test.espresso.matcher.ViewMatchers.withId;
12+
import static androidx.test.espresso.Espresso.onView;
13+
import static androidx.test.espresso.action.ViewActions.click;
14+
import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist;
15+
import static androidx.test.espresso.assertion.ViewAssertions.matches;
16+
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
17+
import static androidx.test.espresso.matcher.ViewMatchers.withId;
1818

1919
/**
2020
* Tests the behavior of the application when no permission are set.

‎app/src/androidTest/java/com/algolia/instantsearch/voice/demo/MainActivityWithPermissionTest.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
package com.algolia.instantsearch.voice.demo;
22

33
import android.Manifest;
4-
import android.support.test.espresso.matcher.ViewMatchers;
5-
import android.support.test.filters.LargeTest;
6-
import android.support.test.rule.ActivityTestRule;
7-
import android.support.test.rule.GrantPermissionRule;
8-
import android.support.test.runner.AndroidJUnit4;
4+
import androidx.test.espresso.matcher.ViewMatchers;
5+
import androidx.test.filters.LargeTest;
6+
import androidx.test.rule.ActivityTestRule;
7+
import androidx.test.rule.GrantPermissionRule;
8+
import androidx.test.ext.junit.runners.AndroidJUnit4;
99

1010
import junit.framework.AssertionFailedError;
1111

1212
import org.junit.Rule;
1313
import org.junit.Test;
1414
import org.junit.runner.RunWith;
1515

16-
import static android.support.test.espresso.Espresso.onView;
17-
import static android.support.test.espresso.action.ViewActions.click;
18-
import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;
19-
import static android.support.test.espresso.assertion.ViewAssertions.matches;
20-
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
21-
import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
22-
import static android.support.test.espresso.matcher.ViewMatchers.withId;
23-
import static android.support.test.espresso.matcher.ViewMatchers.withText;
16+
import static androidx.test.espresso.Espresso.onView;
17+
import static androidx.test.espresso.action.ViewActions.click;
18+
import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist;
19+
import static androidx.test.espresso.assertion.ViewAssertions.matches;
20+
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
21+
import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
22+
import static androidx.test.espresso.matcher.ViewMatchers.withId;
23+
import static androidx.test.espresso.matcher.ViewMatchers.withText;
2424

2525
@RunWith(AndroidJUnit4.class)
2626
@LargeTest

‎app/src/main/kotlin/com/algolia/instantsearch/voice/demo/MainActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.algolia.instantsearch.voice.demo
22

33
import android.os.Bundle
4-
import android.support.v7.app.AppCompatActivity
4+
import androidx.appcompat.app.AppCompatActivity
55
import android.view.View
66
import com.algolia.instantsearch.voice.VoiceSpeechRecognizer
77
import com.algolia.instantsearch.voice.demo.databinding.MainBinding

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.constraint.ConstraintLayout
2+
<androidx.constraintlayout.widget.ConstraintLayout
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:app="http://schemas.android.com/apk/res-auto"
55
xmlns:tools="http://schemas.android.com/tools"
@@ -20,7 +20,7 @@
2020
app:layout_constraintBottom_toTopOf="@id/buttonVoice"
2121
android:layout_height="wrap_content"/>
2222

23-
<android.support.design.button.MaterialButton
23+
<com.google.android.material.button.MaterialButton
2424
android:id="@+id/buttonVoice"
2525
app:layout_constraintStart_toStartOf="parent"
2626
app:layout_constraintEnd_toEndOf="parent"
@@ -40,7 +40,7 @@
4040
android:layout_width="0dp"
4141
android:layout_height="56dp"/>
4242

43-
<android.support.design.button.MaterialButton
43+
<com.google.android.material.button.MaterialButton
4444
android:id="@+id/buttonPermission"
4545
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
4646
app:layout_constraintEnd_toEndOf="@id/buttonVoice"
@@ -56,4 +56,4 @@
5656
android:layout_width="0dp"
5757
android:layout_height="56dp"/>
5858

59-
</android.support.constraint.ConstraintLayout>
59+
</androidx.constraintlayout.widget.ConstraintLayout>

‎gradle.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
# http://www.gradle.org/docs/current/userguide/build_environment.html
77
# Specifies the JVM arguments used for the daemon process.
88
# The setting is particularly useful for tweaking memory settings.
9+
android.enableJetifier=true
10+
android.useAndroidX=true
911
org.gradle.jvmargs=-Xmx1536m
1012
# When configured, Gradle will run in incubating parallel mode.
1113
# This option should only be used with decoupled projects. More details, visit

‎voice/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ android {
3232
versionCode versioningCode
3333
versionName versioningName
3434

35-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
35+
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
3636
vectorDrawables.useSupportLibrary = true
3737
}
3838
buildTypes {

‎voice/src/main/kotlin/com/algolia/instantsearch/voice/ui/DrawableSprite.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import android.animation.ValueAnimator
44
import android.graphics.Canvas
55
import android.graphics.Point
66
import android.graphics.drawable.Drawable
7-
import android.support.v4.view.animation.FastOutSlowInInterpolator
7+
import androidx.interpolator.view.animation.FastOutSlowInInterpolator
88

99
/** A [Sprite] implemented as a Drawable. */
1010
class DrawableSprite(

‎voice/src/main/kotlin/com/algolia/instantsearch/voice/ui/Voice.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import android.content.Intent
88
import android.content.pm.PackageManager
99
import android.net.Uri
1010
import android.provider.Settings
11-
import android.support.design.widget.BaseTransientBottomBar
12-
import android.support.design.widget.Snackbar
13-
import android.support.v4.app.ActivityCompat
14-
import android.support.v4.content.ContextCompat
11+
import com.google.android.material.snackbar.BaseTransientBottomBar
12+
import com.google.android.material.snackbar.Snackbar
13+
import androidx.core.app.ActivityCompat
14+
import androidx.core.content.ContextCompat
1515
import android.view.View
1616
import android.widget.TextView
1717
import com.algolia.instantsearch.voice.R
@@ -106,7 +106,7 @@ object Voice {
106106
override fun onDismissed(transientBottomBar: Snackbar?, event: Int) = context.openAppSettings()
107107
}).show()
108108
}
109-
(snackbar.view.findViewById(android.support.design.R.id.snackbar_text) as TextView).maxLines = 2
109+
snackbar.view.findViewById<TextView>(R.id.snackbar_text).maxLines = 2
110110
snackbar.show()
111111
}
112112
}

‎voice/src/main/kotlin/com/algolia/instantsearch/voice/ui/VoiceAndroidView.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.algolia.instantsearch.voice.ui
22

3-
import android.support.constraint.ConstraintLayout
4-
import android.support.v4.text.HtmlCompat
3+
import androidx.constraintlayout.widget.ConstraintLayout
4+
import androidx.core.text.HtmlCompat
55
import android.view.View
66
import android.widget.ImageView
77
import android.widget.TextView

0 commit comments

Comments
 (0)