Merge pull request #110 from Omega-R/feature/android-x

Migration to AndroidX

Author: anton-knyazev

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,11 +21,11 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:' + rootProject.supportLibVersion
-    implementation 'com.android.support:support-v4:' + rootProject.supportLibVersion
-    implementation 'com.android.support:design:' + rootProject.supportLibVersion
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'com.google.android.material:material:1.1.0-alpha02'
 
     implementation 'com.github.Omega-R.OmegaIntentBuilder:core:' + rootProject.omegaIntentBuilder
     implementation 'com.github.Omega-R.OmegaIntentBuilder:annotations:' + rootProject.omegaIntentBuilder

app/src/androidTest/java/com/omega_r/omegarecyclerview/ExampleInstrumentedTest.java

@@ -1,8 +1,8 @@
 package com.omega_r.omegarecyclerview;
 
 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;

app/src/main/java/com/omega_r/omegarecyclerview/ListAdapterExample/ListAdapterActivity.java

@@ -1,15 +1,14 @@
 package com.omega_r.omegarecyclerview.ListAdapterExample;
 
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.widget.Toast;
 
 import com.omega_r.libs.omegarecyclerview.BaseListAdapter;
 import com.omega_r.omegarecyclerview.R;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import omega.com.annotations.OmegaActivity;

app/src/main/java/com/omega_r/omegarecyclerview/MainActivity.java

@@ -1,7 +1,7 @@
 package com.omega_r.omegarecyclerview;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 
 import com.omega_r.libs.omegaintentbuilder.AppOmegaIntentBuilder;

app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/ChooseExpandableActivity.java

@@ -1,7 +1,7 @@
 package com.omega_r.omegarecyclerview.expandable_example;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 
 import com.omega_r.libs.omegaintentbuilder.AppOmegaIntentBuilder;

app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/core/ExpandableActivity.java

@@ -1,8 +1,8 @@
 package com.omega_r.omegarecyclerview.expandable_example.core;
 
 import android.os.Bundle;
-import android.support.annotation.LayoutRes;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.LayoutRes;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.CompoundButton;
 import android.widget.RadioButton;
 

app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/core/ExpandableAdapter.java

@@ -1,13 +1,10 @@
 package com.omega_r.omegarecyclerview.expandable_example.core;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.ViewGroup;
 import android.widget.TextView;
-import android.widget.Toast;
 
-import com.omega_r.libs.omegarecyclerview.OmegaRecyclerView;
 import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.OmegaExpandableRecyclerView;
-import com.omega_r.libs.omegarecyclerview.sticky_header.StickyHeaderAdapter;
 import com.omega_r.omegarecyclerview.R;
 
 public class ExpandableAdapter extends OmegaExpandableRecyclerView.Adapter<QuoteGlobalInfo, String> {

app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/core/SimpleData.java

@@ -1,6 +1,6 @@
 package com.omega_r.omegarecyclerview.expandable_example.core;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.data.GroupProvider;
 

app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/support_sticky/DefaultStickyAdapter.java

@@ -1,6 +1,6 @@
 package com.omega_r.omegarecyclerview.expandable_example.support_sticky;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.ViewGroup;
 import android.widget.TextView;
 import android.widget.Toast;

app/src/main/java/com/omega_r/omegarecyclerview/pagination_example/Image.java

@@ -1,6 +1,6 @@
 package com.omega_r.omegarecyclerview.pagination_example;
 
-import android.support.annotation.DrawableRes;
+import androidx.annotation.DrawableRes;
 
 import com.omega_r.omegarecyclerview.R;