Merge branch 'androidx'

Dimezis · Nov 2, 2020 · 0c76771 · 0c76771
2 parents 131d3db + b4720ff
commit 0c76771
Show file tree

Hide file tree

Showing 20 changed files with 48 additions and 47 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -26,10 +26,10 @@ ext {
 }
 
 dependencies {
-    implementation "com.android.support:appcompat-v7:$supportLib"
-    implementation "com.android.support:cardview-v7:$supportLib"
-    implementation "com.android.support:design:$supportLib"
-    implementation "com.android.support:recyclerview-v7:$supportLib"
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
 
     implementation project(':library')
     implementation project(':supportrenderscriptblur')

diff --git a/app/src/main/java/com/eightbitlab/blurview_sample/BaseFragment.java b/app/src/main/java/com/eightbitlab/blurview_sample/BaseFragment.java
@@ -1,10 +1,10 @@
 package com.eightbitlab.blurview_sample;
 
 import android.os.Bundle;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/app/src/main/java/com/eightbitlab/blurview_sample/ExampleListAdapter.java b/app/src/main/java/com/eightbitlab/blurview_sample/ExampleListAdapter.java
@@ -1,8 +1,8 @@
 package com.eightbitlab.blurview_sample;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+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/eightbitlab/blurview_sample/ListFragment.java b/app/src/main/java/com/eightbitlab/blurview_sample/ListFragment.java
@@ -1,9 +1,9 @@
 package com.eightbitlab.blurview_sample;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 public class ListFragment extends BaseFragment {

diff --git a/app/src/main/java/com/eightbitlab/blurview_sample/MainActivity.java b/app/src/main/java/com/eightbitlab/blurview_sample/MainActivity.java
@@ -2,17 +2,17 @@
 
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
 import android.view.ViewGroup;
 import android.widget.SeekBar;
 
 import com.eightbitlab.supportrenderscriptblur.SupportRenderScriptBlur;
+import com.google.android.material.tabs.TabLayout;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.viewpager.widget.ViewPager;
 import eightbitlab.com.blurview.BlurView;
 
 public class MainActivity extends AppCompatActivity {

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent"
     tools:context="com.eightbitlab.blurview_sample.MainActivity">
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/viewPager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
@@ -52,7 +52,7 @@
         app:blurOverlayColor="@color/colorOverlay"
         tools:targetApi="lollipop">
 
-        <android.support.design.widget.TabLayout
+        <com.google.android.material.tabs.TabLayout
             android:id="@+id/tabLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/bottom_tab_height"

diff --git a/app/src/main/res/layout/fragment_list.xml b/app/src/main/res/layout/fragment_list.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/recyclerView"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipToPadding="false"
     android:paddingBottom="@dimen/bottom_tab_height">
 
-</android.support.v7.widget.RecyclerView>
+</androidx.recyclerview.widget.RecyclerView>
diff --git a/app/src/main/res/layout/list_item.xml b/app/src/main/res/layout/list_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView
+<androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="match_parent"
@@ -52,4 +52,4 @@
 
     </LinearLayout>
 
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>
diff --git a/gradle.properties b/gradle.properties
@@ -15,4 +15,5 @@
 # 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
+# org.gradle.parallel=true
+android.useAndroidX=true
diff --git a/library/build.gradle b/library/build.gradle
@@ -41,8 +41,8 @@ configurations {
 }
 
 dependencies {
-    implementation 'com.android.support:support-annotations:28.0.0'
-    javadocDeps 'com.android.support:support-annotations:28.0.0'
+    implementation 'androidx.annotation:annotation:1.1.0'
+    javadocDeps 'androidx.annotation:annotation:1.1.0'
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.2'
     testImplementation("org.junit.jupiter:junit-jupiter-params:5.4.2")

diff --git a/library/src/main/java/eightbitlab/com/blurview/BlockingBlurController.java b/library/src/main/java/eightbitlab/com/blurview/BlockingBlurController.java
@@ -5,9 +5,9 @@
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;

diff --git a/library/src/main/java/eightbitlab/com/blurview/BlurAlgorithm.java b/library/src/main/java/eightbitlab/com/blurview/BlurAlgorithm.java
@@ -1,7 +1,7 @@
 package eightbitlab.com.blurview;
 
 import android.graphics.Bitmap;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 public interface BlurAlgorithm {
     /**

diff --git a/library/src/main/java/eightbitlab/com/blurview/BlurView.java b/library/src/main/java/eightbitlab/com/blurview/BlurView.java
@@ -3,8 +3,8 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.ViewGroup;

diff --git a/library/src/main/java/eightbitlab/com/blurview/BlurViewFacade.java b/library/src/main/java/eightbitlab/com/blurview/BlurViewFacade.java
@@ -1,8 +1,8 @@
 package eightbitlab.com.blurview;
 
 import android.graphics.drawable.Drawable;
-import android.support.annotation.ColorInt;
-import android.support.annotation.Nullable;
+import androidx.annotation.ColorInt;
+import androidx.annotation.Nullable;
 
 public interface BlurViewFacade {
 

diff --git a/library/src/main/java/eightbitlab/com/blurview/NoOpBlurAlgorithm.java b/library/src/main/java/eightbitlab/com/blurview/NoOpBlurAlgorithm.java
@@ -1,7 +1,7 @@
 package eightbitlab.com.blurview;
 
 import android.graphics.Bitmap;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 class NoOpBlurAlgorithm implements BlurAlgorithm {
     @Override

diff --git a/library/src/main/java/eightbitlab/com/blurview/NoOpController.java b/library/src/main/java/eightbitlab/com/blurview/NoOpController.java
@@ -2,7 +2,7 @@
 
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 //Used in edit mode and in case if no BlurController was set
 class NoOpController implements BlurController {

diff --git a/library/src/main/java/eightbitlab/com/blurview/RenderScriptBlur.java b/library/src/main/java/eightbitlab/com/blurview/RenderScriptBlur.java
@@ -7,8 +7,8 @@
 import android.renderscript.Element;
 import android.renderscript.RenderScript;
 import android.renderscript.ScriptIntrinsicBlur;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 
 /**
  * Blur using RenderScript, processed on GPU.

diff --git a/library/src/test/java/eightbitlab/com/blurview/SizeScalerTest.java b/library/src/test/java/eightbitlab/com/blurview/SizeScalerTest.java
@@ -1,6 +1,6 @@
 package eightbitlab.com.blurview;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;

diff --git a/supportrenderscriptblur/build.gradle b/supportrenderscriptblur/build.gradle
@@ -18,7 +18,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
     compileOnly project(':library')
 }
 

diff --git a/...ptblur/src/main/java/com/eightbitlab/supportrenderscriptblur/SupportRenderScriptBlur.java b/...ptblur/src/main/java/com/eightbitlab/supportrenderscriptblur/SupportRenderScriptBlur.java
@@ -2,11 +2,11 @@
 
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.support.annotation.NonNull;
-import android.support.v8.renderscript.Allocation;
-import android.support.v8.renderscript.Element;
-import android.support.v8.renderscript.RenderScript;
-import android.support.v8.renderscript.ScriptIntrinsicBlur;
+import androidx.annotation.NonNull;
+import androidx.renderscript.Allocation;
+import androidx.renderscript.Element;
+import androidx.renderscript.RenderScript;
+import androidx.renderscript.ScriptIntrinsicBlur;
 
 import eightbitlab.com.blurview.BlurAlgorithm;