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

Migration to AndroidX
Omega-R · Jan 11, 2019 · 918ff93 · 918ff93
2 parents 8ce7415 + 592525b
commit 918ff93
Show file tree

Hide file tree

Showing 56 changed files with 138 additions and 151 deletions.
diff --git 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,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

diff --git a/app/src/androidTest/java/com/omega_r/omegarecyclerview/ExampleInstrumentedTest.java b/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;

diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/ListAdapterExample/ListAdapterActivity.java b/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;

diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/MainActivity.java b/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;

diff --git a/.../main/java/com/omega_r/omegarecyclerview/expandable_example/ChooseExpandableActivity.java b/.../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;

diff --git a/...c/main/java/com/omega_r/omegarecyclerview/expandable_example/core/ExpandableActivity.java b/...c/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;
 

diff --git a/...rc/main/java/com/omega_r/omegarecyclerview/expandable_example/core/ExpandableAdapter.java b/...rc/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> {

diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/core/SimpleData.java b/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;
 

diff --git a/...com/omega_r/omegarecyclerview/expandable_example/support_sticky/DefaultStickyAdapter.java b/...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;

diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/pagination_example/Image.java b/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;
 

diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/pagination_example/ImageAdapter.java b/app/src/main/java/com/omega_r/omegarecyclerview/pagination_example/ImageAdapter.java
@@ -1,6 +1,6 @@
 package com.omega_r.omegarecyclerview.pagination_example;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/pagination_example/PaginationActivity.java b/app/src/main/java/com/omega_r/omegarecyclerview/pagination_example/PaginationActivity.java
@@ -2,7 +2,7 @@
 
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.omega_r.libs.omegarecyclerview.OmegaRecyclerView;
 import com.omega_r.libs.omegarecyclerview.pagination.OnPageRequestListener;

diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/sections_example/SectionsActivity.java b/app/src/main/java/com/omega_r/omegarecyclerview/sections_example/SectionsActivity.java
@@ -1,6 +1,6 @@
 package com.omega_r.omegarecyclerview.sections_example;
 
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Toast;

diff --git a/...c/main/java/com/omega_r/omegarecyclerview/sticky_header_example/StickyHeaderActivity.java b/...c/main/java/com/omega_r/omegarecyclerview/sticky_header_example/StickyHeaderActivity.java
@@ -1,6 +1,6 @@
 package com.omega_r.omegarecyclerview.sticky_header_example;
 
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 
 import com.omega_r.libs.omegarecyclerview.OmegaRecyclerView;

diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/swipe_menu_example/SwipeMenuActivity.java b/app/src/main/java/com/omega_r/omegarecyclerview/swipe_menu_example/SwipeMenuActivity.java
@@ -1,14 +1,11 @@
 package com.omega_r.omegarecyclerview.swipe_menu_example;
 
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
 
 import com.omega_r.libs.omegarecyclerview.OmegaRecyclerView;
 import com.omega_r.omegarecyclerview.R;
 
-import java.util.List;
-
 import omega.com.annotations.OmegaActivity;
 
 @OmegaActivity

diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/viewpager/ViewPagerActivity.java b/app/src/main/java/com/omega_r/omegarecyclerview/viewpager/ViewPagerActivity.java
@@ -2,9 +2,9 @@
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/build.gradle b/build.gradle
@@ -30,8 +30,7 @@ task clean(type: Delete) {
 
 ext {
     buildToolsVersion = "28.0.3"
-    supportLibVersion = "28.0.0"
     espressoVersion = "3.0.1"
     junitVersion = "4.12"
-    omegaIntentBuilder = "1.1.2"
+    omegaIntentBuilder = "1.1.5"
 }
diff --git a/gradle.properties b/gradle.properties
@@ -9,6 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.

diff --git a/omegarecyclerviewlibs/build.gradle b/omegarecyclerviewlibs/build.gradle
@@ -12,7 +12,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
     buildTypes {
@@ -25,7 +25,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "com.android.support:appcompat-v7:$rootProject.supportLibVersion"
-    implementation "com.android.support:design:$rootProject.supportLibVersion"
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
+    implementation 'com.google.android.material:material:1.1.0-alpha02'
 
 }
diff --git a/...pport/v7/widget/ExpandedRecyclerView.java → ...clerview/widget/ExpandedRecyclerView.java b/...pport/v7/widget/ExpandedRecyclerView.java → ...clerview/widget/ExpandedRecyclerView.java
@@ -1,11 +1,12 @@
-package android.support.v7.widget;
+package androidx.recyclerview.widget;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 public class ExpandedRecyclerView extends RecyclerView {
     public static final int STEP_START = 1;
     public static final int STEP_LAYOUT = 2;

diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/BaseArrayAdapter.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/BaseArrayAdapter.java
@@ -1,7 +1,7 @@
 package com.omega_r.libs.omegarecyclerview;
 
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 
 import java.util.Arrays;
 

diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/BaseListAdapter.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/BaseListAdapter.java
@@ -1,11 +1,10 @@
 package com.omega_r.libs.omegarecyclerview;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.view.ViewGroup;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 

diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/ClickViewHolder.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/ClickViewHolder.java
@@ -1,6 +1,6 @@
 package com.omega_r.libs.omegarecyclerview;
 
-import android.support.annotation.LayoutRes;
+import androidx.annotation.LayoutRes;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/...arecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java b/...arecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java
@@ -7,16 +7,16 @@
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
-import android.support.annotation.IdRes;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.ExpandedRecyclerView;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.annotation.IdRes;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.ExpandedRecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;

diff --git a/...com/omega_r/libs/omegarecyclerview/expandable_recycler_view/ChildClippingFrameLayout.java b/...com/omega_r/libs/omegarecyclerview/expandable_recycler_view/ChildClippingFrameLayout.java
@@ -4,9 +4,9 @@
 import android.graphics.Canvas;
 import android.graphics.Path;
 import android.graphics.RectF;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;

diff --git a/...a_r/libs/omegarecyclerview/expandable_recycler_view/ExpandableStickyHeaderDecoration.java b/...a_r/libs/omegarecyclerview/expandable_recycler_view/ExpandableStickyHeaderDecoration.java
@@ -2,10 +2,10 @@
 
 import android.graphics.Canvas;
 import android.graphics.Rect;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.util.Pair;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.util.Pair;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.SparseArray;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/.../omega_r/libs/omegarecyclerview/expandable_recycler_view/OmegaExpandableRecyclerView.java b/.../omega_r/libs/omegarecyclerview/expandable_recycler_view/OmegaExpandableRecyclerView.java
@@ -9,14 +9,14 @@
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.os.SystemClock;
-import android.support.annotation.CallSuper;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.IntDef;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.CallSuper;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.IntDef;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.LayoutInflater;

diff --git a/...om/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/AnimationHelper.java b/...om/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/AnimationHelper.java
@@ -1,8 +1,8 @@
 package com.omega_r.libs.omegarecyclerview.expandable_recycler_view.animation;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.OmegaExpandableRecyclerView;
 

diff --git a/...a_r/libs/omegarecyclerview/expandable_recycler_view/animation/ExpandableItemAnimator.java b/...a_r/libs/omegarecyclerview/expandable_recycler_view/animation/ExpandableItemAnimator.java
@@ -2,12 +2,12 @@
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.ViewHolder;
-import android.support.v7.widget.SimpleItemAnimator;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
+import androidx.recyclerview.widget.SimpleItemAnimator;
 import android.view.View;
 import android.view.ViewPropertyAnimator;
 

diff --git a/...clerview/expandable_recycler_view/animation/standard_animations/DropDownItemAnimator.java b/...clerview/expandable_recycler_view/animation/standard_animations/DropDownItemAnimator.java
@@ -3,7 +3,7 @@
 import android.animation.ValueAnimator;
 import android.annotation.TargetApi;
 import android.os.Build;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewPropertyAnimator;
 

diff --git a/.../com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/ExpandableViewData.java b/.../com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/ExpandableViewData.java
@@ -1,8 +1,8 @@
 package com.omega_r.libs.omegarecyclerview.expandable_recycler_view.data;
 
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.Arrays;
 import java.util.List;