Skip to content

Commit 712e81a

Browse files
ogaclejapanogaclejapan
committed
Migrate to androidx
1 parent 2a2141d commit 712e81a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+185
-1302
lines changed

‎CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Version 2.0.0
2+
3+
* Migrate to androidx 1.0.0
4+
* Remove util-v13 library
5+
16
# Version 1.7.0
27

38
* Update support library version to 28.0.0

‎README.md

+13-4
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,15 @@ _(For a working implementation of this project see the demo/ folder.)_
2626
Add the dependency to your build.gradle.
2727

2828
```
29+
// For androidx (1.0.0)
30+
dependencies {
31+
compile 'com.ogaclejapan.smarttablayout:library:2.0.0@aar'
32+
33+
//Optional: see how to use the utility.
34+
compile 'com.ogaclejapan.smarttablayout:utils-v4:2.0.0@aar'
35+
}
36+
37+
// For legacy android support library (28.0.0)
2938
dependencies {
3039
compile 'com.ogaclejapan.smarttablayout:library:1.7.0@aar'
3140
@@ -73,7 +82,7 @@ This should usually be placed above the ViewPager it represents.
7382
app:stl_drawDecorationAfterTab="false"
7483
/>
7584

76-
<android.support.v4.view.ViewPager
85+
<androidx.viewpager.widget.ViewPager
7786
android:id="@+id/viewpager"
7887
android:layout_width="match_parent"
7988
android:layout_height="match_parent"
@@ -198,8 +207,8 @@ public class SmartTabLayout extends HorizontalScrollView {
198207

199208
Utility has two types available to suit the Android support library.
200209

201-
* utils-v4 library contains the PagerAdapter implementation class for _android.support.v4.app.Fragment_
202-
* utils-v13 library contains the PagerAdapter implementation class for _android.app.Fragment_
210+
* utils-v4 library contains the PagerAdapter implementation class for _androidx.fragment.app.Fragment_
211+
* (Deprecated) utils-v13 library contains the PagerAdapter implementation class for _android.app.Fragment_
203212

204213
The two libraries have different Android support libraries that depend,
205214
but implemented functionality is the same.
@@ -257,7 +266,7 @@ public void onPageSelected(int position) {
257266

258267
```
259268

260-
*__Notes:__ If using fragment inside a ViewPager, Must be use [Fragment#getChildFragmentManager()](http://developer.android.com/reference/android/support/v4/app/Fragment.html#getChildFragmentManager).*
269+
*__Notes:__ If using fragment inside a ViewPager, Must be use [Fragment#getChildFragmentManager()](https://developer.android.com/reference/androidx/fragment/app/Fragment.html#getChildFragmentManager).*
261270

262271

263272
# Looking for iOS ?

‎demo/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ android {
3737
dependencies {
3838
implementation project(':library')
3939
implementation project(':utils-v4')
40-
implementation "com.android.support:appcompat-v7:${ANDROID_SUPPORT_VERSION}"
40+
implementation "androidx.appcompat:appcompat:${ANDROIDX_APPCOMPAT_VERSION}"
4141
}

‎demo/src/androidTest/java/com/ogaclejapan/smarttablayout/demo/ApplicationTest.java

-13
This file was deleted.

‎demo/src/main/java/com/ogaclejapan/smarttablayout/demo/Demo.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
import android.content.Context;
44
import android.content.res.Resources;
5-
import android.support.v4.view.PagerAdapter;
65
import android.view.LayoutInflater;
76
import android.view.View;
87
import android.view.ViewGroup;
98
import android.widget.ImageView;
109

1110
import com.ogaclejapan.smarttablayout.SmartTabLayout;
1211

12+
import androidx.viewpager.widget.PagerAdapter;
13+
1314
public enum Demo {
1415

1516
BASIC(R.string.demo_title_basic, R.layout.demo_basic),

‎demo/src/main/java/com/ogaclejapan/smarttablayout/demo/DemoActivity.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
import android.content.Context;
44
import android.content.Intent;
55
import android.os.Bundle;
6-
import android.support.v4.view.ViewPager;
7-
import android.support.v7.app.AppCompatActivity;
8-
import android.support.v7.widget.Toolbar;
96
import android.view.LayoutInflater;
107
import android.view.ViewGroup;
118

@@ -14,6 +11,10 @@
1411
import com.ogaclejapan.smarttablayout.utils.v4.FragmentPagerItemAdapter;
1512
import com.ogaclejapan.smarttablayout.utils.v4.FragmentPagerItems;
1613

14+
import androidx.appcompat.app.AppCompatActivity;
15+
import androidx.appcompat.widget.Toolbar;
16+
import androidx.viewpager.widget.ViewPager;
17+
1718
public class DemoActivity extends AppCompatActivity {
1819

1920
private static final String KEY_DEMO = "demo";

‎demo/src/main/java/com/ogaclejapan/smarttablayout/demo/DemoFragment.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
package com.ogaclejapan.smarttablayout.demo;
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

119
import com.ogaclejapan.smarttablayout.utils.v4.FragmentPagerItem;
1210

11+
import androidx.annotation.Nullable;
12+
import androidx.fragment.app.Fragment;
13+
1314
public class DemoFragment extends Fragment {
1415

1516
@Override

‎demo/src/main/java/com/ogaclejapan/smarttablayout/demo/DemoLikeMediumActivity.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
import android.content.Context;
44
import android.content.Intent;
55
import android.os.Bundle;
6-
import android.support.v4.view.ViewPager;
7-
import android.support.v7.app.AppCompatActivity;
8-
import android.support.v7.widget.Toolbar;
96
import android.view.LayoutInflater;
107
import android.view.ViewGroup;
118

@@ -14,6 +11,10 @@
1411
import com.ogaclejapan.smarttablayout.utils.v4.FragmentPagerItemAdapter;
1512
import com.ogaclejapan.smarttablayout.utils.v4.FragmentPagerItems;
1613

14+
import androidx.appcompat.app.AppCompatActivity;
15+
import androidx.appcompat.widget.Toolbar;
16+
import androidx.viewpager.widget.ViewPager;
17+
1718
public class DemoLikeMediumActivity extends AppCompatActivity {
1819

1920
private static final String KEY_DEMO = "demo";

‎demo/src/main/java/com/ogaclejapan/smarttablayout/demo/DemoRtlActivity.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
import android.content.Context;
44
import android.content.Intent;
55
import android.os.Bundle;
6-
import android.support.v4.view.ViewPager;
7-
import android.support.v7.app.AppCompatActivity;
8-
import android.support.v7.widget.Toolbar;
96
import android.view.LayoutInflater;
107
import android.view.ViewGroup;
118

@@ -14,6 +11,10 @@
1411
import com.ogaclejapan.smarttablayout.utils.v4.FragmentPagerItemAdapter;
1512
import com.ogaclejapan.smarttablayout.utils.v4.FragmentPagerItems;
1613

14+
import androidx.appcompat.app.AppCompatActivity;
15+
import androidx.appcompat.widget.Toolbar;
16+
import androidx.viewpager.widget.ViewPager;
17+
1718
public class DemoRtlActivity extends AppCompatActivity {
1819

1920
private static final String KEY_DEMO = "demo";

‎demo/src/main/java/com/ogaclejapan/smarttablayout/demo/DemoTabWithNotificationMarkActivity.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
import android.content.Intent;
55
import android.content.res.Resources;
66
import android.os.Bundle;
7-
import android.support.v4.view.PagerAdapter;
8-
import android.support.v4.view.ViewPager;
9-
import android.support.v7.app.AppCompatActivity;
10-
import android.support.v7.widget.Toolbar;
117
import android.view.LayoutInflater;
128
import android.view.View;
139
import android.view.ViewGroup;
@@ -20,6 +16,11 @@
2016

2117
import java.util.Random;
2218

19+
import androidx.appcompat.app.AppCompatActivity;
20+
import androidx.appcompat.widget.Toolbar;
21+
import androidx.viewpager.widget.PagerAdapter;
22+
import androidx.viewpager.widget.ViewPager;
23+
2324
public class DemoTabWithNotificationMarkActivity extends AppCompatActivity implements
2425
SmartTabLayout.TabProvider {
2526

‎demo/src/main/java/com/ogaclejapan/smarttablayout/demo/MainActivity.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import android.content.Intent;
44
import android.net.Uri;
55
import android.os.Bundle;
6-
import android.support.v7.app.AppCompatActivity;
76
import android.view.Menu;
87
import android.view.MenuItem;
98
import android.view.View;
@@ -12,6 +11,8 @@
1211
import android.widget.ArrayAdapter;
1312
import android.widget.ListView;
1413

14+
import androidx.appcompat.app.AppCompatActivity;
15+
1516
public class MainActivity extends AppCompatActivity implements AbsListView.OnItemClickListener {
1617

1718
@Override

‎demo/src/main/java/com/ogaclejapan/smarttablayout/demo/TintableImageView.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
import android.content.Context;
44
import android.content.res.ColorStateList;
55
import android.content.res.TypedArray;
6-
import android.support.v7.widget.AppCompatImageView;
76
import android.util.AttributeSet;
87

8+
import androidx.appcompat.widget.AppCompatImageView;
9+
910
/**
1011
* https://gist.github.com/tylerchesley/5d15d859be4f3ce31213
1112
*/

‎demo/src/main/res/layout/activity_demo.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
android:background="@color/primary"
1414
>
1515

16-
<android.support.v7.widget.Toolbar
16+
<androidx.appcompat.widget.Toolbar
1717
android:id="@id/toolbar"
1818
android:layout_width="match_parent"
1919
android:layout_height="wrap_content"
@@ -22,7 +22,7 @@
2222
app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
2323
>
2424

25-
</android.support.v7.widget.Toolbar>
25+
</androidx.appcompat.widget.Toolbar>
2626

2727
<FrameLayout
2828
android:id="@id/tab"
@@ -32,7 +32,7 @@
3232

3333
</LinearLayout>
3434

35-
<android.support.v4.view.ViewPager
35+
<androidx.viewpager.widget.ViewPager
3636
android:id="@id/viewpager"
3737
android:layout_width="match_parent"
3838
android:layout_height="match_parent"

‎demo/src/main/res/layout/activity_demo_tab_with_notification_mark.xml

+3-5
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,14 @@
1313
android:background="@color/primary"
1414
>
1515

16-
<android.support.v7.widget.Toolbar
16+
<androidx.appcompat.widget.Toolbar
1717
android:id="@id/toolbar"
1818
android:layout_width="match_parent"
1919
android:layout_height="wrap_content"
2020
android:minHeight="?attr/actionBarSize"
2121
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
2222
app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
23-
>
24-
25-
</android.support.v7.widget.Toolbar>
23+
/>
2624

2725
<FrameLayout
2826
android:id="@id/tab"
@@ -32,7 +30,7 @@
3230

3331
</LinearLayout>
3432

35-
<android.support.v4.view.ViewPager
33+
<androidx.viewpager.widget.ViewPager
3634
android:id="@id/viewpager"
3735
android:layout_width="match_parent"
3836
android:layout_height="match_parent"

‎demo/src/main/res/layout/activity_like_a_medium.xml

+3-5
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,15 @@
1313
android:layout_height="wrap_content"
1414
>
1515

16-
<android.support.v7.widget.Toolbar
16+
<androidx.appcompat.widget.Toolbar
1717
android:id="@id/toolbar"
1818
android:layout_width="match_parent"
1919
android:layout_height="wrap_content"
2020
android:background="@color/transparent"
2121
android:minHeight="?attr/actionBarSize"
2222
app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
2323
app:theme="@style/ThemeOverlay.AppCompat.Light"
24-
>
25-
26-
</android.support.v7.widget.Toolbar>
24+
/>
2725

2826
<FrameLayout
2927
android:id="@id/tab"
@@ -33,7 +31,7 @@
3331

3432
</LinearLayout>
3533

36-
<android.support.v4.view.ViewPager
34+
<androidx.viewpager.widget.ViewPager
3735
android:id="@id/viewpager"
3836
android:layout_width="match_parent"
3937
android:layout_height="match_parent"

‎demo/src/main/res/layout/activity_rtl.xml

+3-5
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,14 @@
1414
android:background="@color/primary"
1515
>
1616

17-
<android.support.v7.widget.Toolbar
17+
<androidx.appcompat.widget.Toolbar
1818
android:id="@id/toolbar"
1919
android:layout_width="match_parent"
2020
android:layout_height="wrap_content"
2121
android:minHeight="?attr/actionBarSize"
2222
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
2323
app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
24-
>
25-
26-
</android.support.v7.widget.Toolbar>
24+
/>
2725

2826
<FrameLayout
2927
android:id="@id/tab"
@@ -33,7 +31,7 @@
3331

3432
</LinearLayout>
3533

36-
<android.support.v4.view.ViewPager
34+
<androidx.viewpager.widget.ViewPager
3735
android:id="@id/viewpager"
3836
android:layout_width="match_parent"
3937
android:layout_height="match_parent"

‎demo/src/main/res/layout/custom_tab_icon_and_text.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
android:background="?attr/selectableItemBackground"
88
>
99

10-
<android.support.v4.widget.Space
10+
<Space
1111
android:id="@+id/center_anchor"
1212
android:layout_width="0dp"
1313
android:layout_height="0dp"

‎gradle.properties

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
VERSION_NAME=1.7.0
2-
VERSION_CODE=17
1+
android.useAndroidX=true
2+
3+
VERSION_NAME=2.0.0
4+
VERSION_CODE=18
35
COMPILE_SDK_VERSION=28
4-
ANDROID_SUPPORT_VERSION=28.0.0
6+
ANDROIDX_APPCOMPAT_VERSION=1.0.2
7+
ANDROIDX_BASE_VERSION=1.0.0
58

69
GROUP=com.ogaclejapan.smarttablayout
710
ARTIFACT_NAME=SmartTabLayout

‎library/build.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ android {
2222
}
2323

2424
dependencies {
25-
implementation "com.android.support:support-v4:${ANDROID_SUPPORT_VERSION}"
25+
implementation "androidx.viewpager:viewpager:${ANDROIDX_BASE_VERSION}"
26+
implementation "androidx.fragment:fragment:${ANDROIDX_BASE_VERSION}"
2627
}
2728

2829
license {

0 commit comments

Comments
 (0)