Support android X

MasayukiSuda · MasayukiSuda · commit dfe8bfa4d676 · 2019-01-10T15:55:51.000+09:00
diff --git a/gradle.properties b/gradle.properties
@@ -7,4 +7,6 @@ USER_ID=masayukisuda
 GROUP=com.daasuu
 ARTIFACT_NAME=FPSAnimator
 ARTIFACT_DESCRIPTION=A simple but powerful tweening / SpriteSheet / ParabolicMotion / animation library for Android TextureView.
-SITE_URL=https://github.com/MasayukiSuda/FPSAnimator
+SITE_URL=https://github.com/MasayukiSuda/FPSAnimator
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/library/build.gradle b/library/build.gradle
@@ -24,7 +24,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
 }
 
 publish {
diff --git a/library/src/main/java/com/daasuu/library/Container.java b/library/src/main/java/com/daasuu/library/Container.java
@@ -3,7 +3,7 @@
 
 import android.graphics.Canvas;
 import android.graphics.Paint;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.daasuu.library.drawer.BaseDrawer;
 
diff --git a/library/src/main/java/com/daasuu/library/DisplayBase.java b/library/src/main/java/com/daasuu/library/DisplayBase.java
@@ -1,7 +1,7 @@
 package com.daasuu.library;
 
 import android.graphics.Canvas;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.daasuu.library.animator.ParabolicAnimator;
 import com.daasuu.library.animator.TweenAnimator;
diff --git a/library/src/main/java/com/daasuu/library/DisplayObject.java b/library/src/main/java/com/daasuu/library/DisplayObject.java
@@ -1,7 +1,7 @@
 package com.daasuu.library;
 
 import android.graphics.Canvas;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.daasuu.library.util.Util;
 
diff --git a/library/src/main/java/com/daasuu/library/FPSSurfaceView.java b/library/src/main/java/com/daasuu/library/FPSSurfaceView.java
@@ -6,7 +6,7 @@
 import android.graphics.Color;
 import android.graphics.PixelFormat;
 import android.graphics.PorterDuff;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
diff --git a/library/src/main/java/com/daasuu/library/FPSTextureView.java b/library/src/main/java/com/daasuu/library/FPSTextureView.java
@@ -6,7 +6,7 @@
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.SurfaceTexture;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.TextureView;
 
diff --git a/library/src/main/java/com/daasuu/library/animator/ParabolicAnimator.java b/library/src/main/java/com/daasuu/library/animator/ParabolicAnimator.java
@@ -1,7 +1,7 @@
 package com.daasuu.library.animator;
 
 import android.graphics.Canvas;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.daasuu.library.Animator;
 import com.daasuu.library.AnimParameter;
diff --git a/library/src/main/java/com/daasuu/library/drawer/BitmapDrawer.java b/library/src/main/java/com/daasuu/library/drawer/BitmapDrawer.java
@@ -6,7 +6,7 @@
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.RectF;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.daasuu.library.util.Util;
 
diff --git a/library/src/main/java/com/daasuu/library/drawer/CircleDrawer.java b/library/src/main/java/com/daasuu/library/drawer/CircleDrawer.java
@@ -2,7 +2,7 @@
 
 import android.graphics.Canvas;
 import android.graphics.Paint;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Draw the specified circle using the specified paint. If radius is less 0,
diff --git a/library/src/main/java/com/daasuu/library/drawer/RectDrawer.java b/library/src/main/java/com/daasuu/library/drawer/RectDrawer.java
@@ -2,7 +2,7 @@
 
 import android.graphics.Canvas;
 import android.graphics.Paint;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Draw the specified Rect using the specified paint. The rectangle will
diff --git a/library/src/main/java/com/daasuu/library/drawer/SpriteSheetDrawer.java b/library/src/main/java/com/daasuu/library/drawer/SpriteSheetDrawer.java
@@ -5,7 +5,7 @@
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Rect;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.daasuu.library.callback.AnimCallBack;
 import com.daasuu.library.constant.Constant;
diff --git a/library/src/main/java/com/daasuu/library/drawer/TextDrawer.java b/library/src/main/java/com/daasuu/library/drawer/TextDrawer.java
@@ -2,7 +2,7 @@
 
 import android.graphics.Canvas;
 import android.graphics.Paint;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Class for drawing Text on canvas.
diff --git a/library/src/main/java/com/daasuu/library/easing/EaseProvider.java b/library/src/main/java/com/daasuu/library/easing/EaseProvider.java
@@ -1,6 +1,6 @@
 package com.daasuu.library.easing;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * The Ease class provides a collection of ease functions. It does not use the standard 4 param
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -23,6 +23,6 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':library')
 
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
+    implementation 'com.google.android.material:material:1.1.0-alpha02'
 }
diff --git a/sample/src/main/java/com/daasuu/FPSAnimator/AnimationPauseSampleActivity.java b/sample/src/main/java/com/daasuu/FPSAnimator/AnimationPauseSampleActivity.java
@@ -6,8 +6,8 @@
 import android.graphics.BitmapFactory;
 import android.graphics.Paint;
 import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 
diff --git a/sample/src/main/java/com/daasuu/FPSAnimator/ArcSampleActivity.java b/sample/src/main/java/com/daasuu/FPSAnimator/ArcSampleActivity.java
@@ -5,7 +5,7 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.daasuu.library.DisplayObject;
 import com.daasuu.library.FPSTextureView;
diff --git a/sample/src/main/java/com/daasuu/FPSAnimator/ContainerSampleActivity.java b/sample/src/main/java/com/daasuu/FPSAnimator/ContainerSampleActivity.java
@@ -5,25 +5,22 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Paint;
-import android.support.design.widget.Snackbar;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
+
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
-import android.util.Log;
 
 import com.daasuu.FPSAnimator.util.UIUtil;
 import com.daasuu.library.Container;
 import com.daasuu.library.DisplayObject;
 import com.daasuu.library.FPSTextureView;
-import com.daasuu.library.callback.AnimCallBack;
 import com.daasuu.library.drawer.BitmapDrawer;
 import com.daasuu.library.drawer.SpriteSheetDrawer;
 import com.daasuu.library.drawer.TextDrawer;
 import com.daasuu.library.easing.Ease;
 import com.daasuu.library.util.Util;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class ContainerSampleActivity extends AppCompatActivity {
diff --git a/sample/src/main/java/com/daasuu/FPSAnimator/CustomDrawerSampleActivity.java b/sample/src/main/java/com/daasuu/FPSAnimator/CustomDrawerSampleActivity.java
@@ -5,8 +5,8 @@
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.SweepGradient;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 
 import com.daasuu.FPSAnimator.util.UIUtil;
@@ -15,8 +15,6 @@
 import com.daasuu.library.drawer.CircleDrawer;
 import com.daasuu.library.drawer.CustomDrawer;
 import com.daasuu.library.drawer.RectDrawer;
-import com.daasuu.library.easing.Ease;
-import com.daasuu.library.util.Util;
 
 public class CustomDrawerSampleActivity extends AppCompatActivity {
 
diff --git a/sample/src/main/java/com/daasuu/FPSAnimator/EasingSampleActivity.java b/sample/src/main/java/com/daasuu/FPSAnimator/EasingSampleActivity.java
@@ -5,8 +5,8 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Paint;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 
 import com.daasuu.FPSAnimator.util.UIUtil;
diff --git a/sample/src/main/java/com/daasuu/FPSAnimator/FPSSurfaceViewSampleActivity.java b/sample/src/main/java/com/daasuu/FPSAnimator/FPSSurfaceViewSampleActivity.java
@@ -5,9 +5,9 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Paint;
-import android.support.design.widget.Snackbar;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 
 import com.daasuu.FPSAnimator.util.UIUtil;
diff --git a/sample/src/main/java/com/daasuu/FPSAnimator/MainActivity.java b/sample/src/main/java/com/daasuu/FPSAnimator/MainActivity.java
@@ -1,7 +1,7 @@
 package com.daasuu.FPSAnimator;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 
diff --git a/sample/src/main/java/com/daasuu/FPSAnimator/ParabolicMotionSampleActivity.java b/sample/src/main/java/com/daasuu/FPSAnimator/ParabolicMotionSampleActivity.java
@@ -6,8 +6,8 @@
 import android.graphics.BitmapFactory;
 import android.graphics.Paint;
 import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.daasuu.library.Container;
 import com.daasuu.library.DisplayObject;
diff --git a/sample/src/main/java/com/daasuu/FPSAnimator/SpriteSheetSampleActivity.java b/sample/src/main/java/com/daasuu/FPSAnimator/SpriteSheetSampleActivity.java
@@ -5,16 +5,15 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
-import android.os.Handler;
-import android.support.v7.app.AppCompatActivity;
+
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.daasuu.FPSAnimator.util.UIUtil;
 import com.daasuu.library.Container;
 import com.daasuu.library.DisplayObject;
 import com.daasuu.library.FPSTextureView;
 import com.daasuu.library.callback.AnimCallBack;
 import com.daasuu.library.drawer.SpriteSheetDrawer;
-import com.daasuu.library.spritesheet.SpriteSheet;
 import com.daasuu.library.util.Util;
 
 import java.util.ArrayList;
diff --git a/sample/src/main/java/com/daasuu/FPSAnimator/TweenSampleActivity.java b/sample/src/main/java/com/daasuu/FPSAnimator/TweenSampleActivity.java
@@ -6,9 +6,9 @@
 import android.graphics.BitmapFactory;
 import android.graphics.Paint;
 import android.os.Bundle;
-import android.support.design.widget.Snackbar;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.daasuu.FPSAnimator.util.UIUtil;
 import com.daasuu.library.DisplayObject;

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ android {`
`24`	`24`
`25`	`25`	`dependencies {`
`26`	`26`	`implementation fileTree(dir: 'libs', include: ['*.jar'])`
`27`		`- implementation 'com.android.support:appcompat-v7:28.0.0'`
	`27`	`+ implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`publish {`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,6 @@ dependencies {`
`23`	`23`	`implementation fileTree(dir: 'libs', include: ['*.jar'])`
`24`	`24`	`implementation project(':library')`
`25`	`25`
`26`		`- implementation 'com.android.support:appcompat-v7:28.0.0'`
`27`		`- implementation 'com.android.support:design:28.0.0'`
	`26`	`+ implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'`
	`27`	`+ implementation 'com.google.android.material:material:1.1.0-alpha02'`
`28`	`28`	`}`