feature

1. 类中引用替换为 AndroidX； 2. xml 中引用替换为 AndroidX；
Jay-Goo · Sep 18, 2019 · 4ba6ebc · 4ba6ebc
1 parent a331b21
commit 4ba6ebc
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 22 deletions.
diff --git a/app/src/main/java/com/yj/app/base/BaseActivity.java b/app/src/main/java/com/yj/app/base/BaseActivity.java
@@ -1,9 +1,11 @@
 package com.yj.app.base;
 
 import android.os.Bundle;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+
+import androidx.annotation.LayoutRes;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.jkb.fragment.rigger.annotation.Puppet;
 import com.yj.app.R;
 

diff --git a/app/src/main/java/com/yj/app/base/BaseFragment.java b/app/src/main/java/com/yj/app/base/BaseFragment.java
@@ -1,12 +1,12 @@
 package com.yj.app.base;
 
+import androidx.annotation.IdRes;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.IdRes;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/app/src/main/java/com/yj/app/test/ContainerFragment.java b/app/src/main/java/com/yj/app/test/ContainerFragment.java
@@ -1,9 +1,11 @@
 package com.yj.app.test;
 
 import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
 import android.view.animation.Animation;
 import android.widget.ImageView;
+
+import androidx.core.content.ContextCompat;
+
 import com.jkb.fragment.rigger.annotation.LazyLoad;
 import com.jkb.fragment.rigger.utils.Logger;
 import com.yj.app.R;

diff --git a/app/src/main/java/com/yj/app/test/lazyload/LazyLoadAdapter.java b/app/src/main/java/com/yj/app/test/lazyload/LazyLoadAdapter.java
@@ -1,13 +1,15 @@
 package com.yj.app.test.lazyload;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.fragment.app.FragmentManager;
 import android.content.Context;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
+
+import androidx.core.content.ContextCompat;
+
 import com.yj.app.R;
 import java.util.ArrayList;
 import java.util.List;

diff --git a/app/src/main/java/com/yj/app/test/lazyload/LazyLoadFragment.java b/app/src/main/java/com/yj/app/test/lazyload/LazyLoadFragment.java
@@ -1,9 +1,11 @@
 package com.yj.app.test.lazyload;
 
 import android.os.Bundle;
-import android.support.design.widget.TabLayout;
-import android.support.v4.view.ViewPager;
 import android.widget.Toast;
+
+import androidx.viewpager.widget.ViewPager;
+
+import com.google.android.material.tabs.TabLayout;
 import com.yj.app.R;
 import com.yj.app.base.BaseFragment;
 import java.util.Timer;

diff --git a/app/src/main/java/com/yj/app/test/replace/ReplaceFragment.java b/app/src/main/java/com/yj/app/test/replace/ReplaceFragment.java
@@ -7,9 +7,7 @@
 import com.yj.app.R;
 import com.yj.app.base.BaseFragment;
 import com.yj.app.test.ContainerFragment;
-import com.yj.app.utils.Rotate3d;
 import java.util.Random;
-import java.util.UUID;
 
 /**
  * @author JingYeoh

diff --git a/app/src/main/java/com/yj/app/test/show/ShowFragment.java b/app/src/main/java/com/yj/app/test/show/ShowFragment.java
@@ -1,7 +1,7 @@
 package com.yj.app.test.show;
 
+import androidx.fragment.app.Fragment;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.view.View;
 import android.view.View.OnClickListener;
 import com.jkb.fragment.rigger.rigger.Rigger;

diff --git a/app/src/main/java/com/yj/app/test/start/StartFragment.java b/app/src/main/java/com/yj/app/test/start/StartFragment.java
@@ -1,11 +1,13 @@
 package com.yj.app.test.start;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+
 import com.jkb.fragment.rigger.annotation.Animator;
 import com.jkb.fragment.rigger.annotation.Puppet;
 import com.jkb.fragment.rigger.rigger.Rigger;

diff --git a/app/src/main/java/com/yj/app/utils/Rotate3d.java b/app/src/main/java/com/yj/app/utils/Rotate3d.java
@@ -2,11 +2,12 @@
 
 import android.graphics.Camera;
 import android.graphics.Matrix;
-import android.support.annotation.NonNull;
 import android.view.View;
 import android.view.animation.Animation;
 import android.view.animation.Transformation;
 
+import androidx.annotation.NonNull;
+
 /**
  * @author JingYeoh
  *         <a href="mailto:yangjing9611@foxmail.com">Email me</a>

diff --git a/app/src/main/res/layout/frg_lazyload.xml b/app/src/main/res/layout/frg_lazyload.xml
@@ -5,12 +5,12 @@
   android:layout_height="match_parent"
   android:orientation="vertical">
 
-  <android.support.v4.view.ViewPager
+  <androidx.viewpager.widget.ViewPager
     android:id="@+id/fl_vp"
     android:layout_width="match_parent"
     android:layout_height="0dp"
     android:layout_weight="1"/>
-  <android.support.design.widget.TabLayout
+  <com.google.android.material.tabs.TabLayout
     android:id="@+id/fl_tab"
     android:layout_width="match_parent"
     android:layout_height="50dp"