diff --git a/app/build.gradle b/app/build.gradle index 9e7a956..2481891 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,7 +9,7 @@ android { targetSdkVersion 28 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { release { @@ -21,14 +21,14 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) - implementation 'com.android.support:appcompat-v7:28.0.0-rc01' - implementation 'com.android.support:design:28.0.0-rc01' - implementation 'com.android.support.constraint:constraint-layout:1.1.2' + implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'com.google.android.material:material:1.1.0-alpha08' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' testImplementation 'junit:junit:4.12' implementation project(':library') - implementation 'com.github.bumptech.glide:glide:4.0.0' + implementation 'com.github.bumptech.glide:glide:4.9.0' } diff --git a/app/src/androidTest/java/com/tylersuehr/chipexample/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/tylersuehr/chipexample/ExampleInstrumentedTest.java index fdbd862..449762c 100644 --- a/app/src/androidTest/java/com/tylersuehr/chipexample/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/tylersuehr/chipexample/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package com.tylersuehr.chipexample; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/app/src/main/java/com/tylersuehr/chipexample/ContactChip.java b/app/src/main/java/com/tylersuehr/chipexample/ContactChip.java index f3f5ea1..bf42c67 100644 --- a/app/src/main/java/com/tylersuehr/chipexample/ContactChip.java +++ b/app/src/main/java/com/tylersuehr/chipexample/ContactChip.java @@ -1,8 +1,8 @@ package com.tylersuehr.chipexample; import android.graphics.drawable.Drawable; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.tylersuehr.chips.Chip; /** diff --git a/app/src/main/java/com/tylersuehr/chipexample/ContactLoadingActivity.java b/app/src/main/java/com/tylersuehr/chipexample/ContactLoadingActivity.java index 77d1696..de7a7ca 100644 --- a/app/src/main/java/com/tylersuehr/chipexample/ContactLoadingActivity.java +++ b/app/src/main/java/com/tylersuehr/chipexample/ContactLoadingActivity.java @@ -6,13 +6,13 @@ import android.os.Build; import android.os.Bundle; import android.provider.ContactsContract; -import android.support.annotation.NonNull; -import android.support.v4.app.ActivityCompat; -import android.support.v4.app.LoaderManager; -import android.support.v4.content.ContextCompat; -import android.support.v4.content.CursorLoader; -import android.support.v4.content.Loader; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import androidx.core.app.ActivityCompat; +import androidx.loader.app.LoaderManager; +import androidx.core.content.ContextCompat; +import androidx.loader.content.CursorLoader; +import androidx.loader.content.Loader; +import androidx.appcompat.app.AppCompatActivity; import android.widget.Toast; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/tylersuehr/chipexample/ContactOnChipAdapter.java b/app/src/main/java/com/tylersuehr/chipexample/ContactOnChipAdapter.java index 0e63b3b..341c167 100644 --- a/app/src/main/java/com/tylersuehr/chipexample/ContactOnChipAdapter.java +++ b/app/src/main/java/com/tylersuehr/chipexample/ContactOnChipAdapter.java @@ -1,6 +1,6 @@ package com.tylersuehr.chipexample; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/tylersuehr/chipexample/ExampleChipsActivity.java b/app/src/main/java/com/tylersuehr/chipexample/ExampleChipsActivity.java index e5b3709..16271c0 100644 --- a/app/src/main/java/com/tylersuehr/chipexample/ExampleChipsActivity.java +++ b/app/src/main/java/com/tylersuehr/chipexample/ExampleChipsActivity.java @@ -1,11 +1,8 @@ package com.tylersuehr.chipexample; -import android.content.Intent; import android.os.Bundle; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; -import android.view.Menu; -import android.view.MenuItem; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import com.tylersuehr.chips.ChipsInputLayout; import java.util.List; diff --git a/app/src/main/java/com/tylersuehr/chipexample/MainActivity.java b/app/src/main/java/com/tylersuehr/chipexample/MainActivity.java index 41e9301..2627849 100644 --- a/app/src/main/java/com/tylersuehr/chipexample/MainActivity.java +++ b/app/src/main/java/com/tylersuehr/chipexample/MainActivity.java @@ -1,8 +1,8 @@ package com.tylersuehr.chipexample; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.widget.Toolbar; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.Toolbar; import com.tylersuehr.chips.ChipsInputLayout; diff --git a/app/src/main/res/layout/activity_example_chips.xml b/app/src/main/res/layout/activity_example_chips.xml index b0b4d10..f397122 100644 --- a/app/src/main/res/layout/activity_example_chips.xml +++ b/app/src/main/res/layout/activity_example_chips.xml @@ -6,16 +6,16 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> - - - + - - - - + - - \ No newline at end of file + \ No newline at end of file diff --git a/library/src/main/res/layout/chip_view_detailed.xml b/library/src/main/res/layout/chip_view_detailed.xml index c39a1a5..1f08d35 100644 --- a/library/src/main/res/layout/chip_view_detailed.xml +++ b/library/src/main/res/layout/chip_view_detailed.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/library/src/main/res/layout/chip_view_filterable.xml b/library/src/main/res/layout/chip_view_filterable.xml index 4fc19b6..b228e54 100644 --- a/library/src/main/res/layout/chip_view_filterable.xml +++ b/library/src/main/res/layout/chip_view_filterable.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/library/src/main/res/layout/chips_input_view.xml b/library/src/main/res/layout/chips_input_view.xml index bfaa0d2..579cf8e 100644 --- a/library/src/main/res/layout/chips_input_view.xml +++ b/library/src/main/res/layout/chips_input_view.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:scrollbars="vertical"> -