From 4900027e988c9638199a51f68bebabad10ab984e Mon Sep 17 00:00:00 2001 From: Leo Forney Date: Fri, 1 Feb 2019 19:44:25 -0600 Subject: [PATCH] Migrate to AndroidX --- .idea/caches/build_file_checksums.ser | Bin 584 -> 584 bytes .idea/caches/gradle_models.ser | Bin 204172 -> 0 bytes app/build.gradle | 6 +++--- .../java/com/mancj/example/MainActivity.java | 8 ++++---- .../example/custom/CustomAdapterActivity.java | 2 +- .../custom/CustomSuggestionsAdapter.java | 2 +- .../res/layout/activity_custom_adapter.xml | 4 ++-- app/src/main/res/layout/activity_main.xml | 6 +++--- app/src/main/res/layout/app_bar_main.xml | 4 ++-- gradle.properties | 4 +++- library/build.gradle | 6 +++--- .../materialsearchbar/MaterialSearchBar.java | 10 +++++----- .../adapter/DefaultSuggestionsAdapter.java | 2 +- .../adapter/SuggestionsAdapter.java | 2 +- library/src/main/res/layout/searchbar.xml | 6 +++--- 15 files changed, 32 insertions(+), 30 deletions(-) delete mode 100644 .idea/caches/gradle_models.ser diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index d032de4195cada2930aba154479d3026d7efecc0..5a854da26618de18c03bed16ebd6705c11e8d24a 100644 GIT binary patch delta 228 zcmX@Xa)M>T43^dR&lFFb;~yZ9SWpm?RGOKSqL*Hjn39uPTExH2z_zyOYkOxc* z3>5_o3=9HSTT(ba9+2u$e)U{FM8#96gh9>ODkiizwWv78CpA9?syk-#K}KnfE3!Q| z`x!Q|ylmi{@#cq9T?qq!acW6PW?p(R%$7oiItI4Me2ik8A~~5!MTtd~F_RUU#Dp~t zbKEMB@yIN)*0=h6tLaz?0}n`ivNfZw@GoJm50h;saviss$hdCWS*{WWL6CKVNg;eH SI}dbS(EDkzh3(|An-u_D8&${v delta 236 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

A}z3!eJRRW=7DC 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 K*a;T*PyaXNgVxdj 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" /> - +