viewpager2 support

README.md

@@ -48,7 +48,7 @@ Thanks to [Igor](https://dribbble.com/motionigor) for sharing this awesome anima
         app:atl_tabs="@xml/tabs"/>
 ```
 * Setup with viewpager or listen change on tab click.
-```kotlin
+```kot  lin
 atl.setupViewPager(viewpager)
 atl.setTabChangeListener(object : AnimatedTabLayout.OnChangeListener {
     override fun onChanged(position: Int) {

app/build.gradle

@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 32
     defaultConfig {
         applicationId "com.iammert.animatedtablayout"
         minSdkVersion 15
-        targetSdkVersion 29
+        targetSdkVersion 32
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
         release {
@@ -21,13 +21,15 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.1.0'
-    implementation 'com.google.android.material:material:1.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation project(':library')
 }

app/src/main/AndroidManifest.xml

@@ -9,7 +9,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

build.gradle

@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.41'
+    ext.kotlin_version = '1.7.10'
 
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.android.tools.build:gradle:7.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

gradle.properties

@@ -6,6 +6,8 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip

library/build.gradle

@@ -2,15 +2,13 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 32
 
 
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 29
-        versionCode 1
-        versionName "1.0"
+        targetSdkVersion 32
 
     }
 
@@ -26,9 +24,11 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.1.0'
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 repositories {

library/src/main/java/com/iammert/library/AnimatedTabItemView.kt

@@ -99,7 +99,7 @@ class AnimatedTabItemView : LinearLayout {
     override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
         super.onSizeChanged(w, h, oldw, oldh)
         path?.reset()
-        path?.addRoundRect(rectF, radius, radius, Path.Direction.CCW)
+        path?.addRoundRect(rectF!!, radius, radius, Path.Direction.CCW)
     }
 
     fun setFromColor(fromColor: Int) {

library/src/main/java/com/iammert/library/AnimatedTabLayout.kt

@@ -2,17 +2,17 @@ package com.iammert.library
 
 import android.content.Context
 import android.os.Build
-import android.os.Handler
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.FrameLayout
 import android.widget.LinearLayout
 import androidx.annotation.RequiresApi
 import androidx.viewpager.widget.ViewPager
+import androidx.viewpager2.widget.ViewPager2
 
 class AnimatedTabLayout : FrameLayout {
 
-    interface OnChangeListener{
+    interface OnChangeListener {
         fun onChanged(position: Int)
     }
 
@@ -22,7 +22,8 @@ class AnimatedTabLayout : FrameLayout {
 
     lateinit var selectedTab: AnimatedTabItemContainer
 
-    lateinit var viewPager: ViewPager
+    private var viewPager: ViewPager? = null
+    private var viewPager2: ViewPager2? = null
 
     private var onChangeListener: OnChangeListener? = null
 
@@ -34,18 +35,32 @@ class AnimatedTabLayout : FrameLayout {
         init(context, attrs, 0, 0)
     }
 
-    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
+        context,
+        attrs,
+        defStyleAttr
+    ) {
         init(context, attrs, defStyleAttr, 0)
     }
 
     @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
-    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {
+    constructor(
+        context: Context,
+        attrs: AttributeSet?,
+        defStyleAttr: Int,
+        defStyleRes: Int
+    ) : super(context, attrs, defStyleAttr, defStyleRes) {
         init(context, attrs, defStyleAttr, defStyleRes)
     }
 
 
     private fun init(context: Context?, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) {
-        val typedArray = context?.theme?.obtainStyledAttributes(attrs, R.styleable.AnimatedTabLayout, defStyleAttr, defStyleRes)
+        val typedArray = context?.theme?.obtainStyledAttributes(
+            attrs,
+            R.styleable.AnimatedTabLayout,
+            defStyleAttr,
+            defStyleRes
+        )
         val tabXmlResource = typedArray?.getResourceId(R.styleable.AnimatedTabLayout_atl_tabs, 0)
 
         tabs = AnimatedTabResourceParser(context, tabXmlResource!!).parse()
@@ -59,35 +74,57 @@ class AnimatedTabLayout : FrameLayout {
             tab.setOnClickListener {
                 val selectedIndex = tabs.indexOf(tab)
                 onPageChangeListener.onPageSelected(selectedIndex)
-                viewPager.currentItem = selectedIndex
+                onPageChangeListenerPager2.onPageSelected(selectedIndex)
+                viewPager?.currentItem = selectedIndex
+                viewPager2?.currentItem = selectedIndex
             }
         }
     }
 
-    fun setTabChangeListener(onChangeListener: OnChangeListener?){
+    fun setTabChangeListener(onChangeListener: OnChangeListener?) {
         this.onChangeListener = onChangeListener
     }
 
     fun setupViewPager(viewPager: ViewPager) {
         this.viewPager = viewPager
-        this.viewPager.addOnPageChangeListener(onPageChangeListener)
+        this.viewPager?.addOnPageChangeListener(onPageChangeListener)
         selectedTab = tabs[viewPager.currentItem]
         selectedTab.expand()
     }
 
-    private var onPageChangeListener: ViewPager.OnPageChangeListener = object : ViewPager.SimpleOnPageChangeListener() {
-        override fun onPageSelected(position: Int) {
-            super.onPageSelected(position)
-            if (tabs[position] == selectedTab) {
-                return
+    fun setupViewPager(viewPager: ViewPager2) {
+        this.viewPager2 = viewPager
+        this.viewPager2?.registerOnPageChangeCallback(onPageChangeListenerPager2)
+        selectedTab = tabs[viewPager.currentItem]
+        selectedTab.expand()
+    }
+
+    private var onPageChangeListenerPager2: ViewPager2.OnPageChangeCallback =
+        object : ViewPager2.OnPageChangeCallback() {
+            override fun onPageSelected(position: Int) {
+                super.onPageSelected(position)
+                initSelectedTab(position)
+            }
+        }
+
+    private var onPageChangeListener: ViewPager.OnPageChangeListener =
+        object : ViewPager.SimpleOnPageChangeListener() {
+            override fun onPageSelected(position: Int) {
+                super.onPageSelected(position)
+                initSelectedTab(position)
             }
-            selectedTab.collapse()
-            selectedTab = tabs[position]
-            selectedTab.expand()
+        }
 
-            [email protected]?.onChanged(position)
+    private fun initSelectedTab(position: Int) {
+        if (tabs[position] == selectedTab) {
+            return
         }
-    }
+        selectedTab.collapse()
+        selectedTab = tabs[position]
+        selectedTab.expand()
+
+        [email protected]?.onChanged(position)
 
+    }
 }