Skip to content

Commit 202bbe2

Browse files
hackware1993hackware1993
authored
Merge pull request #247 from hackware1993/androidx
adapt androidx
2 parents fa08bc3 + d89a7fb commit 202bbe2

24 files changed

+48
-37
lines changed

‎app/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,5 @@ android {
1919
dependencies {
2020
implementation fileTree(dir: 'libs', include: ['*.jar'])
2121
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'
2423
}

‎app/src/main/java/net/lucode/hackware/magicindicatordemo/example/BadgeTabExampleActivity.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
import android.graphics.Color;
55
import android.graphics.drawable.ColorDrawable;
66
import android.os.Bundle;
7-
import android.support.v4.view.ViewPager;
8-
import android.support.v7.app.AppCompatActivity;
97
import android.view.LayoutInflater;
108
import android.view.View;
119
import android.view.animation.AccelerateInterpolator;
@@ -14,6 +12,9 @@
1412
import android.widget.LinearLayout;
1513
import android.widget.TextView;
1614

15+
import androidx.appcompat.app.AppCompatActivity;
16+
import androidx.viewpager.widget.ViewPager;
17+
1718
import net.lucode.hackware.magicindicator.MagicIndicator;
1819
import net.lucode.hackware.magicindicator.ViewPagerHelper;
1920
import net.lucode.hackware.magicindicator.buildins.UIUtil;

‎app/src/main/java/net/lucode/hackware/magicindicatordemo/example/CustomNavigatorExampleActivity.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22

33
import android.graphics.Color;
44
import android.os.Bundle;
5-
import android.support.v4.view.ViewPager;
6-
import android.support.v7.app.AppCompatActivity;
5+
6+
import androidx.appcompat.app.AppCompatActivity;
7+
import androidx.viewpager.widget.ViewPager;
78

89
import net.lucode.hackware.magicindicator.MagicIndicator;
910
import net.lucode.hackware.magicindicator.ViewPagerHelper;

‎app/src/main/java/net/lucode/hackware/magicindicatordemo/example/DynamicTabExampleActivity.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
import android.content.Context;
44
import android.graphics.Color;
55
import android.os.Bundle;
6-
import android.support.v4.view.ViewPager;
7-
import android.support.v7.app.AppCompatActivity;
86
import android.view.View;
97
import android.widget.Toast;
108

9+
import androidx.appcompat.app.AppCompatActivity;
10+
import androidx.viewpager.widget.ViewPager;
11+
1112
import net.lucode.hackware.magicindicator.MagicIndicator;
1213
import net.lucode.hackware.magicindicator.ViewPagerHelper;
1314
import net.lucode.hackware.magicindicator.buildins.commonnavigator.CommonNavigator;

‎app/src/main/java/net/lucode/hackware/magicindicatordemo/example/ExampleMainActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
import android.content.Intent;
44
import android.os.Bundle;
5-
import android.support.v7.app.AppCompatActivity;
65
import android.view.View;
76

7+
import androidx.appcompat.app.AppCompatActivity;
8+
89
import net.lucode.hackware.magicindicatordemo.R;
910

1011
public class ExampleMainActivity extends AppCompatActivity {

‎app/src/main/java/net/lucode/hackware/magicindicatordemo/example/ExamplePagerAdapter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package net.lucode.hackware.magicindicatordemo.example;
22

33
import android.graphics.Color;
4-
import android.support.v4.view.PagerAdapter;
54
import android.view.Gravity;
65
import android.view.View;
76
import android.view.ViewGroup;
87
import android.widget.TextView;
98

9+
import androidx.viewpager.widget.PagerAdapter;
10+
1011
import java.util.List;
1112

1213
/**

‎app/src/main/java/net/lucode/hackware/magicindicatordemo/example/FixedTabExampleActivity.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
import android.graphics.Color;
55
import android.graphics.drawable.ColorDrawable;
66
import android.os.Bundle;
7-
import android.support.v4.view.ViewPager;
8-
import android.support.v7.app.AppCompatActivity;
97
import android.view.View;
108
import android.view.animation.AccelerateInterpolator;
119
import android.view.animation.DecelerateInterpolator;
1210
import android.view.animation.OvershootInterpolator;
1311
import android.widget.LinearLayout;
1412

13+
import androidx.appcompat.app.AppCompatActivity;
14+
import androidx.viewpager.widget.ViewPager;
15+
1516
import net.lucode.hackware.magicindicator.FragmentContainerHelper;
1617
import net.lucode.hackware.magicindicator.MagicIndicator;
1718
import net.lucode.hackware.magicindicator.ViewPagerHelper;

‎app/src/main/java/net/lucode/hackware/magicindicatordemo/example/FragmentContainerExampleActivity.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
import android.content.Context;
44
import android.graphics.Color;
55
import android.os.Bundle;
6-
import android.support.v4.app.Fragment;
7-
import android.support.v4.app.FragmentManager;
8-
import android.support.v4.app.FragmentTransaction;
9-
import android.support.v7.app.AppCompatActivity;
106
import android.view.View;
117

8+
import androidx.appcompat.app.AppCompatActivity;
9+
import androidx.fragment.app.Fragment;
10+
import androidx.fragment.app.FragmentManager;
11+
import androidx.fragment.app.FragmentTransaction;
12+
1213
import net.lucode.hackware.magicindicator.FragmentContainerHelper;
1314
import net.lucode.hackware.magicindicator.MagicIndicator;
1415
import net.lucode.hackware.magicindicator.buildins.UIUtil;

‎app/src/main/java/net/lucode/hackware/magicindicatordemo/example/LoadCustomLayoutExampleActivity.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
import android.content.Context;
44
import android.graphics.Color;
55
import android.os.Bundle;
6-
import android.support.v4.view.ViewPager;
7-
import android.support.v7.app.AppCompatActivity;
86
import android.view.LayoutInflater;
97
import android.view.View;
108
import android.widget.ImageView;
119
import android.widget.TextView;
1210

11+
import androidx.appcompat.app.AppCompatActivity;
12+
import androidx.viewpager.widget.ViewPager;
13+
1314
import net.lucode.hackware.magicindicator.MagicIndicator;
1415
import net.lucode.hackware.magicindicator.ViewPagerHelper;
1516
import net.lucode.hackware.magicindicator.buildins.commonnavigator.CommonNavigator;

‎app/src/main/java/net/lucode/hackware/magicindicatordemo/example/NoTabOnlyIndicatorExampleActivity.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
import android.content.Context;
44
import android.graphics.Color;
55
import android.os.Bundle;
6-
import android.support.v4.view.ViewPager;
7-
import android.support.v7.app.AppCompatActivity;
6+
7+
import androidx.appcompat.app.AppCompatActivity;
8+
import androidx.viewpager.widget.ViewPager;
89

910
import net.lucode.hackware.magicindicator.MagicIndicator;
1011
import net.lucode.hackware.magicindicator.ViewPagerHelper;

‎app/src/main/java/net/lucode/hackware/magicindicatordemo/example/ScrollableTabExampleActivity.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
import android.content.Context;
44
import android.graphics.Color;
55
import android.os.Bundle;
6-
import android.support.v4.view.ViewPager;
7-
import android.support.v7.app.AppCompatActivity;
86
import android.view.View;
97
import android.view.animation.AccelerateInterpolator;
108
import android.view.animation.DecelerateInterpolator;
119

10+
import androidx.appcompat.app.AppCompatActivity;
11+
import androidx.viewpager.widget.ViewPager;
12+
1213
import net.lucode.hackware.magicindicator.MagicIndicator;
1314
import net.lucode.hackware.magicindicator.ViewPagerHelper;
1415
import net.lucode.hackware.magicindicator.buildins.UIUtil;

‎app/src/main/java/net/lucode/hackware/magicindicatordemo/example/TestFragment.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package net.lucode.hackware.magicindicatordemo.example;
22

33
import android.os.Bundle;
4-
import android.support.annotation.Nullable;
5-
import android.support.v4.app.Fragment;
64
import android.view.LayoutInflater;
75
import android.view.View;
86
import android.view.ViewGroup;
97
import android.widget.TextView;
108

9+
import androidx.annotation.Nullable;
10+
import androidx.fragment.app.Fragment;
11+
1112
import net.lucode.hackware.magicindicatordemo.R;
1213

1314
/**

‎app/src/main/res/layout/activity_badge_tab_example_layout.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656

5757
</LinearLayout>
5858

59-
<android.support.v4.view.ViewPager
59+
<androidx.viewpager.widget.ViewPager
6060
android:id="@+id/view_pager"
6161
android:layout_width="match_parent"
6262
android:layout_height="0dp"

‎app/src/main/res/layout/activity_custom_navigator_example_layout.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
android:layout_height="match_parent"
66
tools:context="net.lucode.hackware.magicindicatordemo.example.CustomNavigatorExampleActivity">
77

8-
<android.support.v4.view.ViewPager
8+
<androidx.viewpager.widget.ViewPager
99
android:id="@+id/view_pager"
1010
android:layout_width="match_parent"
1111
android:layout_height="match_parent" />

‎app/src/main/res/layout/activity_dynamic_tab_example_layout.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
android:layout_width="match_parent"
1212
android:layout_height="@dimen/common_navigator_height" />
1313

14-
<android.support.v4.view.ViewPager
14+
<androidx.viewpager.widget.ViewPager
1515
android:id="@+id/view_pager"
1616
android:layout_width="match_parent"
1717
android:layout_height="0dp"

‎app/src/main/res/layout/activity_fixed_tab_example_layout.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656

5757
</LinearLayout>
5858

59-
<android.support.v4.view.ViewPager
59+
<androidx.viewpager.widget.ViewPager
6060
android:id="@+id/view_pager"
6161
android:layout_width="match_parent"
6262
android:layout_height="0dp"

‎app/src/main/res/layout/activity_load_custom_layout_example.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
android:orientation="vertical"
77
tools:context="net.lucode.hackware.magicindicatordemo.example.LoadCustomLayoutExampleActivity">
88

9-
<android.support.v4.view.ViewPager
9+
<androidx.viewpager.widget.ViewPager
1010
android:id="@+id/view_pager"
1111
android:layout_width="match_parent"
1212
android:layout_height="0dp"

‎app/src/main/res/layout/activity_no_tab_only_indicator_example_layout.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
android:layout_height="@dimen/small_navigator_height"
1919
android:layout_marginTop="@dimen/navigator_margin_top_large" />
2020

21-
<android.support.v4.view.ViewPager
21+
<androidx.viewpager.widget.ViewPager
2222
android:id="@+id/view_pager"
2323
android:layout_width="match_parent"
2424
android:layout_height="0dp"

‎app/src/main/res/layout/activity_scrollable_indicator_example_layout.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373

7474
</ScrollView>
7575

76-
<android.support.v4.view.ViewPager
76+
<androidx.viewpager.widget.ViewPager
7777
android:id="@+id/view_pager"
7878
android:layout_width="match_parent"
7979
android:layout_height="100dp" />

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ buildscript {
1313
mavenCentral()
1414
}
1515
dependencies {
16-
classpath 'com.android.tools.build:gradle:3.3.1'
16+
classpath 'com.android.tools.build:gradle:3.6.4'
1717

1818
// NOTE: Do not place your application dependencies here; they belong
1919
// in the individual module build.gradle files

‎gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@
1515
# When configured, Gradle will run in incubating parallel mode.
1616
# This option should only be used with decoupled projects. More details, visit
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
18-
# org.gradle.parallel=true
18+
# org.gradle.parallel=true
19+
android.useAndroidX=true

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Feb 25 09:57:26 CST 2019
1+
#Tue Sep 29 13:32:52 CST 2020
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

‎magicindicator/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ android {
1717

1818
dependencies {
1919
implementation fileTree(dir: 'libs', include: ['*.jar'])
20-
implementation 'com.android.support:appcompat-v7:28.0.0'
20+
implementation 'androidx.viewpager:viewpager:1.0.0'
2121
}

‎magicindicator/src/main/java/net/lucode/hackware/magicindicator/ViewPagerHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package net.lucode.hackware.magicindicator;
22

3-
import android.support.v4.view.ViewPager;
3+
import androidx.viewpager.widget.ViewPager;
44

55
/**
66
* 简化和ViewPager绑定

0 commit comments

Comments
 (0)