diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index d032de4..5a854da 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser deleted file mode 100644 index db91d79..0000000 Binary files a/.idea/caches/gradle_models.ser and /dev/null differ diff --git a/app/build.gradle b/app/build.gradle index b7eb1a6..49ea73d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,7 +25,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation project(':library') testImplementation 'junit:junit:4.12' - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support:design:28.0.0' - implementation 'com.android.support:support-v4:28.0.0' + implementation 'androidx.appcompat:appcompat:1.0.0-alpha1' + implementation 'com.google.android.material:material:1.0.0-alpha1' + implementation 'androidx.legacy:legacy-support-v4:1.0.0-alpha1' } diff --git a/app/src/main/java/com/mancj/example/MainActivity.java b/app/src/main/java/com/mancj/example/MainActivity.java index 1f2e601..b2b1ef8 100644 --- a/app/src/main/java/com/mancj/example/MainActivity.java +++ b/app/src/main/java/com/mancj/example/MainActivity.java @@ -1,10 +1,10 @@ package com.mancj.example; import android.os.Bundle; -import android.support.design.widget.NavigationView; -import android.support.v4.view.GravityCompat; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.AppCompatActivity; +import com.google.android.material.navigation.NavigationView; +import androidx.core.view.GravityCompat; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.appcompat.app.AppCompatActivity; import android.text.Editable; import android.text.TextWatcher; import android.util.Log; diff --git a/app/src/main/java/com/mancj/example/custom/CustomAdapterActivity.java b/app/src/main/java/com/mancj/example/custom/CustomAdapterActivity.java index b11ee97..d8fc30d 100644 --- a/app/src/main/java/com/mancj/example/custom/CustomAdapterActivity.java +++ b/app/src/main/java/com/mancj/example/custom/CustomAdapterActivity.java @@ -1,7 +1,7 @@ package com.mancj.example.custom; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.text.Editable; import android.text.TextWatcher; import android.util.Log; diff --git a/app/src/main/java/com/mancj/example/custom/CustomSuggestionsAdapter.java b/app/src/main/java/com/mancj/example/custom/CustomSuggestionsAdapter.java index 837481b..f13075a 100644 --- a/app/src/main/java/com/mancj/example/custom/CustomSuggestionsAdapter.java +++ b/app/src/main/java/com/mancj/example/custom/CustomSuggestionsAdapter.java @@ -1,6 +1,6 @@ package com.mancj.example.custom; -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/res/layout/activity_custom_adapter.xml b/app/src/main/res/layout/activity_custom_adapter.xml index 6f306eb..9e6e95c 100644 --- a/app/src/main/res/layout/activity_custom_adapter.xml +++ b/app/src/main/res/layout/activity_custom_adapter.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index a61d8a6..8e69e22 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - - - + diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml index 47d293e..0988125 100644 --- a/app/src/main/res/layout/app_bar_main.xml +++ b/app/src/main/res/layout/app_bar_main.xml @@ -1,5 +1,5 @@ - - + diff --git a/gradle.properties b/gradle.properties index 1d3591c..915f0e6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,6 @@ # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true \ No newline at end of file +# org.gradle.parallel=true +android.enableJetifier=true +android.useAndroidX=true \ No newline at end of file diff --git a/library/build.gradle b/library/build.gradle index c9679e7..82c40a8 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -23,9 +23,9 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) testImplementation 'junit:junit:4.12' - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support:recyclerview-v7:28.0.0' - implementation 'com.android.support:cardview-v7:28.0.0' + implementation 'androidx.appcompat:appcompat:1.0.0-alpha1' + implementation 'androidx.recyclerview:recyclerview:1.0.0-alpha1' + implementation 'androidx.cardview:cardview:1.0.0-alpha1' } // build a jar with source files diff --git a/library/src/main/java/com/mancj/materialsearchbar/MaterialSearchBar.java b/library/src/main/java/com/mancj/materialsearchbar/MaterialSearchBar.java index 988724c..f87b021 100644 --- a/library/src/main/java/com/mancj/materialsearchbar/MaterialSearchBar.java +++ b/library/src/main/java/com/mancj/materialsearchbar/MaterialSearchBar.java @@ -10,11 +10,11 @@ import android.os.Build; import android.os.Parcel; import android.os.Parcelable; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.CardView; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.PopupMenu; -import android.support.v7.widget.RecyclerView; +import androidx.core.content.ContextCompat; +import androidx.cardview.widget.CardView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.appcompat.widget.PopupMenu; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextWatcher; import android.util.AttributeSet; import android.util.Log; diff --git a/library/src/main/java/com/mancj/materialsearchbar/adapter/DefaultSuggestionsAdapter.java b/library/src/main/java/com/mancj/materialsearchbar/adapter/DefaultSuggestionsAdapter.java index ab6be75..5e91a4d 100644 --- a/library/src/main/java/com/mancj/materialsearchbar/adapter/DefaultSuggestionsAdapter.java +++ b/library/src/main/java/com/mancj/materialsearchbar/adapter/DefaultSuggestionsAdapter.java @@ -1,6 +1,6 @@ package com.mancj.materialsearchbar.adapter; -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/library/src/main/java/com/mancj/materialsearchbar/adapter/SuggestionsAdapter.java b/library/src/main/java/com/mancj/materialsearchbar/adapter/SuggestionsAdapter.java index 7782bb3..4076172 100644 --- a/library/src/main/java/com/mancj/materialsearchbar/adapter/SuggestionsAdapter.java +++ b/library/src/main/java/com/mancj/materialsearchbar/adapter/SuggestionsAdapter.java @@ -1,6 +1,6 @@ package com.mancj.materialsearchbar.adapter; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.widget.Adapter; diff --git a/library/src/main/res/layout/searchbar.xml b/library/src/main/res/layout/searchbar.xml index 3c2663e..c8a97e5 100644 --- a/library/src/main/res/layout/searchbar.xml +++ b/library/src/main/res/layout/searchbar.xml @@ -4,7 +4,7 @@ tools:ignore="ContentDescription" xmlns:tools="http://schemas.android.com/tools"> - - @@ -157,5 +157,5 @@ android:layout_marginEnd="48dp" /> - +