Merge pull request #247 from hackware1993/androidx

hackware1993 · web-flow · commit 202bbe2e1509 · 2020-09-29T14:26:10.000+08:00
adapt androidx
diff --git a/app/build.gradle b/app/build.gradle
@@ -19,6 +19,5 @@ android {
 dependencies {
   implementation fileTree(dir: 'libs', include: ['*.jar'])
   implementation project(':magicindicator')
-  testImplementation 'junit:junit:4.12'
-  implementation 'com.android.support:appcompat-v7:28.0.0'
+  implementation 'androidx.appcompat:appcompat:1.2.0'
 }
diff --git a/app/src/main/java/net/lucode/hackware/magicindicatordemo/example/BadgeTabExampleActivity.java b/app/src/main/java/net/lucode/hackware/magicindicatordemo/example/BadgeTabExampleActivity.java
@@ -4,8 +4,6 @@
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.animation.AccelerateInterpolator;
@@ -14,6 +12,9 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.viewpager.widget.ViewPager;
+
 import net.lucode.hackware.magicindicator.MagicIndicator;
 import net.lucode.hackware.magicindicator.ViewPagerHelper;
 import net.lucode.hackware.magicindicator.buildins.UIUtil;
diff --git a/app/src/main/java/net/lucode/hackware/magicindicatordemo/example/CustomNavigatorExampleActivity.java b/app/src/main/java/net/lucode/hackware/magicindicatordemo/example/CustomNavigatorExampleActivity.java
@@ -2,8 +2,9 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.viewpager.widget.ViewPager;
 
 import net.lucode.hackware.magicindicator.MagicIndicator;
 import net.lucode.hackware.magicindicator.ViewPagerHelper;
diff --git a/app/src/main/java/net/lucode/hackware/magicindicatordemo/example/DynamicTabExampleActivity.java b/app/src/main/java/net/lucode/hackware/magicindicatordemo/example/DynamicTabExampleActivity.java
@@ -3,11 +3,12 @@
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.viewpager.widget.ViewPager;
+
 import net.lucode.hackware.magicindicator.MagicIndicator;
 import net.lucode.hackware.magicindicator.ViewPagerHelper;
 import net.lucode.hackware.magicindicator.buildins.commonnavigator.CommonNavigator;
diff --git a/app/src/main/java/net/lucode/hackware/magicindicatordemo/example/ExampleMainActivity.java b/app/src/main/java/net/lucode/hackware/magicindicatordemo/example/ExampleMainActivity.java
@@ -2,9 +2,10 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import net.lucode.hackware.magicindicatordemo.R;
 
 public class ExampleMainActivity extends AppCompatActivity {
diff --git a/app/src/main/java/net/lucode/hackware/magicindicatordemo/example/ExamplePagerAdapter.java b/app/src/main/java/net/lucode/hackware/magicindicatordemo/example/ExamplePagerAdapter.java
@@ -1,12 +1,13 @@
 package net.lucode.hackware.magicindicatordemo.example;
 
 import android.graphics.Color;
-import android.support.v4.view.PagerAdapter;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.viewpager.widget.PagerAdapter;
+
 import java.util.List;
 
 /**
diff --git a/app/src/main/java/net/lucode/hackware/magicindicatordemo/example/FixedTabExampleActivity.java b/app/src/main/java/net/lucode/hackware/magicindicatordemo/example/FixedTabExampleActivity.java
@@ -4,14 +4,15 @@
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.DecelerateInterpolator;
 import android.view.animation.OvershootInterpolator;
 import android.widget.LinearLayout;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.viewpager.widget.ViewPager;
+
 import net.lucode.hackware.magicindicator.FragmentContainerHelper;
 import net.lucode.hackware.magicindicator.MagicIndicator;
 import net.lucode.hackware.magicindicator.ViewPagerHelper;
diff --git a/app/src/main/java/net/lucode/hackware/magicindicatordemo/example/FragmentContainerExampleActivity.java b/app/src/main/java/net/lucode/hackware/magicindicatordemo/example/FragmentContainerExampleActivity.java
@@ -3,12 +3,13 @@
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
 import net.lucode.hackware.magicindicator.FragmentContainerHelper;
 import net.lucode.hackware.magicindicator.MagicIndicator;
 import net.lucode.hackware.magicindicator.buildins.UIUtil;
diff --git a/app/src/main/java/net/lucode/hackware/magicindicatordemo/example/LoadCustomLayoutExampleActivity.java b/app/src/main/java/net/lucode/hackware/magicindicatordemo/example/LoadCustomLayoutExampleActivity.java
@@ -3,13 +3,14 @@
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.viewpager.widget.ViewPager;
+
 import net.lucode.hackware.magicindicator.MagicIndicator;
 import net.lucode.hackware.magicindicator.ViewPagerHelper;
 import net.lucode.hackware.magicindicator.buildins.commonnavigator.CommonNavigator;
diff --git a/app/src/main/java/net/lucode/hackware/magicindicatordemo/example/NoTabOnlyIndicatorExampleActivity.java b/app/src/main/java/net/lucode/hackware/magicindicatordemo/example/NoTabOnlyIndicatorExampleActivity.java
@@ -3,8 +3,9 @@
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.viewpager.widget.ViewPager;
 
 import net.lucode.hackware.magicindicator.MagicIndicator;
 import net.lucode.hackware.magicindicator.ViewPagerHelper;
diff --git a/app/src/main/java/net/lucode/hackware/magicindicatordemo/example/ScrollableTabExampleActivity.java b/app/src/main/java/net/lucode/hackware/magicindicatordemo/example/ScrollableTabExampleActivity.java
@@ -3,12 +3,13 @@
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.DecelerateInterpolator;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.viewpager.widget.ViewPager;
+
 import net.lucode.hackware.magicindicator.MagicIndicator;
 import net.lucode.hackware.magicindicator.ViewPagerHelper;
 import net.lucode.hackware.magicindicator.buildins.UIUtil;
diff --git a/app/src/main/java/net/lucode/hackware/magicindicatordemo/example/TestFragment.java b/app/src/main/java/net/lucode/hackware/magicindicatordemo/example/TestFragment.java
@@ -1,13 +1,14 @@
 package net.lucode.hackware.magicindicatordemo.example;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
 import net.lucode.hackware.magicindicatordemo.R;
 
 /**
diff --git a/app/src/main/res/layout/activity_badge_tab_example_layout.xml b/app/src/main/res/layout/activity_badge_tab_example_layout.xml
@@ -56,7 +56,7 @@
 
     </LinearLayout>
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/view_pager"
         android:layout_width="match_parent"
         android:layout_height="0dp"
diff --git a/app/src/main/res/layout/activity_custom_navigator_example_layout.xml b/app/src/main/res/layout/activity_custom_navigator_example_layout.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     tools:context="net.lucode.hackware.magicindicatordemo.example.CustomNavigatorExampleActivity">
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/view_pager"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
diff --git a/app/src/main/res/layout/activity_dynamic_tab_example_layout.xml b/app/src/main/res/layout/activity_dynamic_tab_example_layout.xml
@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/common_navigator_height" />
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/view_pager"
         android:layout_width="match_parent"
         android:layout_height="0dp"
diff --git a/app/src/main/res/layout/activity_fixed_tab_example_layout.xml b/app/src/main/res/layout/activity_fixed_tab_example_layout.xml
@@ -56,7 +56,7 @@
 
     </LinearLayout>
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/view_pager"
         android:layout_width="match_parent"
         android:layout_height="0dp"
diff --git a/app/src/main/res/layout/activity_load_custom_layout_example.xml b/app/src/main/res/layout/activity_load_custom_layout_example.xml
@@ -6,7 +6,7 @@
     android:orientation="vertical"
     tools:context="net.lucode.hackware.magicindicatordemo.example.LoadCustomLayoutExampleActivity">
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/view_pager"
         android:layout_width="match_parent"
         android:layout_height="0dp"
diff --git a/app/src/main/res/layout/activity_no_tab_only_indicator_example_layout.xml b/app/src/main/res/layout/activity_no_tab_only_indicator_example_layout.xml
@@ -18,7 +18,7 @@
         android:layout_height="@dimen/small_navigator_height"
         android:layout_marginTop="@dimen/navigator_margin_top_large" />
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/view_pager"
         android:layout_width="match_parent"
         android:layout_height="0dp"
diff --git a/app/src/main/res/layout/activity_scrollable_indicator_example_layout.xml b/app/src/main/res/layout/activity_scrollable_indicator_example_layout.xml
@@ -73,7 +73,7 @@
 
     </ScrollView>
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/view_pager"
         android:layout_width="match_parent"
         android:layout_height="100dp" />
diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.1'
+    classpath 'com.android.tools.build:gradle:3.6.4'
 
     // NOTE: Do not place your application dependencies here; they belong
     // in the individual module build.gradle files
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/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Feb 25 09:57:26 CST 2019
+#Tue Sep 29 13:32:52 CST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/magicindicator/build.gradle b/magicindicator/build.gradle
@@ -17,5 +17,5 @@ android {
 
 dependencies {
   implementation fileTree(dir: 'libs', include: ['*.jar'])
-  implementation 'com.android.support:appcompat-v7:28.0.0'
+  implementation 'androidx.viewpager:viewpager:1.0.0'
 }
diff --git a/magicindicator/src/main/java/net/lucode/hackware/magicindicator/ViewPagerHelper.java b/magicindicator/src/main/java/net/lucode/hackware/magicindicator/ViewPagerHelper.java
@@ -1,6 +1,6 @@
 package net.lucode.hackware.magicindicator;
 
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 
 /**
  * 简化和ViewPager绑定

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,5 @@ android {`
`19`	`19`	`dependencies {`
`20`	`20`	`implementation fileTree(dir: 'libs', include: ['*.jar'])`
`21`	`21`	`implementation project(':magicindicator')`
`22`		`- testImplementation 'junit:junit:4.12'`
`23`		`- implementation 'com.android.support:appcompat-v7:28.0.0'`
	`22`	`+ implementation 'androidx.appcompat:appcompat:1.2.0'`
`24`	`23`	`}`