Skip to content

Commit f893683

Browse files
committed
Migrated to Android X.
1 parent 80a7031 commit f893683

File tree

8 files changed

+16
-14
lines changed

8 files changed

+16
-14
lines changed

app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ android {
3030

3131
dependencies {
3232
implementation fileTree(dir: 'libs', include: ['*.jar'])
33-
implementation "com.android.support:appcompat-v7:${supportLibraryVersion}"
33+
implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
3434
implementation project(':library')
3535
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
3636
}

app/src/main/java/br/com/mauker/materialsearchview/app/MainActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import android.content.Intent;
55
import android.os.Bundle;
66
import android.speech.RecognizerIntent;
7-
import android.support.v7.app.AppCompatActivity;
8-
import android.support.v7.widget.Toolbar;
7+
import androidx.appcompat.app.AppCompatActivity;
8+
import androidx.appcompat.widget.Toolbar;
99
import android.text.TextUtils;
1010
import android.view.Menu;
1111
import android.view.MenuItem;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
tools:context=".MainActivity"
77
android:background="@color/white">
88

9-
<android.support.v7.widget.Toolbar
9+
<androidx.appcompat.widget.Toolbar
1010
android:id="@+id/toolbar"
1111
android:layout_width="match_parent"
1212
android:layout_height="?attr/actionBarSize"

gradle.properties

+3-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,6 @@ org.gradle.parallel=true
2020
# Enables new incubating mode that makes Gradle selective when configuring projects.
2121
# Only relevant projects are configured which results in faster builds for large multi-projects.
2222
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:configuration_on_demand
23-
org.gradle.configureondemand=true
23+
org.gradle.configureondemand=true
24+
android.useAndroidX=true
25+
android.enableJetifier=true

library/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ android {
3333

3434
dependencies {
3535
implementation fileTree(dir: 'libs', include: ['*.jar'])
36-
implementation "com.android.support:appcompat-v7:${supportLibraryVersion}"
37-
implementation "com.android.support:design:${supportLibraryVersion}"
36+
implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
37+
implementation 'com.google.android.material:material:1.1.0-alpha02'
3838
}
3939

4040
ext {

library/src/main/java/br/com/mauker/materialsearchview/MaterialSearchView.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
import android.graphics.drawable.Drawable;
1818
import android.os.Build;
1919
import android.speech.RecognizerIntent;
20-
import android.support.annotation.DrawableRes;
21-
import android.support.v4.content.ContextCompat;
22-
import android.support.v4.view.ViewCompat;
23-
import android.support.v7.app.AppCompatDelegate;
20+
import androidx.annotation.DrawableRes;
21+
import androidx.core.content.ContextCompat;
22+
import androidx.core.view.ViewCompat;
23+
import androidx.appcompat.app.AppCompatDelegate;
2424
import android.text.Editable;
2525
import android.text.InputType;
2626
import android.text.TextUtils;

library/src/main/java/br/com/mauker/materialsearchview/db/HistoryProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import android.database.Cursor;
99
import android.database.sqlite.SQLiteDatabase;
1010
import android.net.Uri;
11-
import android.support.annotation.NonNull;
11+
import androidx.annotation.NonNull;
1212

1313
/**
1414
*

library/src/main/java/br/com/mauker/materialsearchview/utils/AnimationUtils.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import android.animation.Animator;
44
import android.animation.AnimatorListenerAdapter;
55
import android.annotation.TargetApi;
6-
import android.support.v4.view.ViewCompat;
7-
import android.support.v4.view.ViewPropertyAnimatorListener;
6+
import androidx.core.view.ViewCompat;
7+
import androidx.core.view.ViewPropertyAnimatorListener;
88
import android.view.View;
99
import android.view.ViewAnimationUtils;
1010

0 commit comments

Comments
 (0)