From 0675c638491065d1bfcfe68d1c842d83126c278a Mon Sep 17 00:00:00 2001
From: Parth Patel <parrypatel3921@gmail.com>
Date: Tue, 25 Oct 2022 16:19:55 +0530
Subject: [PATCH] Update Source code

---
 app/build.gradle                              | 43 +++++++------------
 app/src/main/AndroidManifest.xml              |  7 +--
 .../sample/views/activities/MainActivity.java | 12 +++---
 .../adapters/TabFragmentPagerAdapter.java     |  9 ++--
 .../sample/views/fragments/BaseFragment.java  |  3 +-
 .../views/fragments/Default00Fragment.java    | 16 ++++---
 .../views/fragments/Default10Fragment.java    | 16 ++++---
 .../views/fragments/Default20Fragment.java    | 16 ++++---
 .../sample/views/fragments/Sub0xFragment.java | 15 ++++---
 .../sample/views/fragments/Sub1xFragment.java | 15 ++++---
 .../sample/views/fragments/Sub2xFragment.java | 15 ++++---
 app/src/main/res/layout/component_page.xml    | 28 +++++++-----
 .../main/res/layout/default00_fragment.xml    | 20 +++++----
 .../main/res/layout/default10_fragment.xml    | 20 +++++----
 .../main/res/layout/default20_fragment.xml    | 20 +++++----
 app/src/main/res/layout/main_activity.xml     | 27 ++++++------
 app/src/main/res/layout/sub_fragment.xml      | 20 +++++----
 app/src/main/res/values/dimens.xml            |  4 +-
 build.gradle                                  |  8 ++--
 fragmentstack/build.gradle                    | 42 ++++++++++--------
 fragmentstack/src/main/AndroidManifest.xml    |  8 ++--
 .../github/fragmentstack/FragmentStack.java   | 11 ++---
 .../io/github/fragmentstack/PageManager.java  | 10 ++---
 .../fragmentstack/PageManagerBuilder.java     |  2 +-
 .../FragmentPagerTransitionInterceptor.java   |  5 ++-
 .../views/FragmentPagerLifeCycleFragment.java |  2 +-
 gradle.properties                             |  2 +
 gradle/wrapper/gradle-wrapper.properties      |  6 +--
 settings.gradle                               | 16 ++++++-
 29 files changed, 237 insertions(+), 181 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 38f85d9..c4e7bf1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
-apply plugin: 'me.tatarka.retrolambda'
+//apply plugin: 'me.tatarka.retrolambda'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdk 32
+
     defaultConfig {
         applicationId "io.github.oniatsu.fragmentstack.sample"
-        minSdkVersion 23
-        targetSdkVersion 25
+        minSdk 21
+        targetSdk 32
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -27,16 +27,14 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    dataBinding {
-        enabled = true
+    buildFeatures{
+        viewBinding true
+        dataBinding true
     }
     lintOptions {
         abortOnError false
         checkReleaseBuilds false
     }
-    dexOptions {
-        maxProcessCount 1
-    }
 }
 //    apt {
 //        arguments {
@@ -45,24 +43,13 @@ android {
 //    }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-    compile 'com.android.support:appcompat-v7:25.1.1'
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:design:25.1.1'
-
-    compile 'io.reactivex.rxjava2:rxjava:2.0.5'
-    compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
-    compile 'com.squareup.retrofit2:retrofit:2.1.0'
-    compile 'com.annimon:stream:1.1.5'
+    implementation 'androidx.appcompat:appcompat:1.5.0'
+    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
-    compile 'com.f2prateek.dart:dart:2.0.1'
-    provided 'com.f2prateek.dart:dart-processor:2.0.1'
-    compile 'com.f2prateek.dart:henson:2.0.1'
-    provided 'com.f2prateek.dart:henson-processor:2.0.1'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
-    compile project(path: ':fragmentstack')
-//    compile 'io.github.oniatsu:fragment-pager:0.1.0'
+    implementation project(path: ':fragmentstack')
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2d05868..84bf3a1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,9 +7,10 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme"
-        >
-        <activity android:name="io.github.oniatsu.fragmentstack.sample.views.activities.MainActivity">
+        android:theme="@style/AppTheme">
+        <activity
+            android:name="io.github.oniatsu.fragmentstack.sample.views.activities.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/activities/MainActivity.java b/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/activities/MainActivity.java
index 5299316..ddfbdf1 100644
--- a/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/activities/MainActivity.java
+++ b/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/activities/MainActivity.java
@@ -1,10 +1,10 @@
 package io.github.oniatsu.fragmentstack.sample.views.activities;
 
-import android.databinding.DataBindingUtil;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AppCompatActivity;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
 
 import io.github.fragmentstack.FragmentStack;
 import io.github.fragmentstack.PageManager;
@@ -20,7 +20,8 @@ public class MainActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.main_activity);
+        binding = MainActivityBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
 
         // Set global config (Option)
         FragmentStack.globalConfig()
@@ -42,7 +43,6 @@ protected void onCreate(Bundle savedInstanceState) {
                 })
                 .setup();
 
-        binding = DataBindingUtil.setContentView(this, R.layout.main_activity);
         binding.tabViewPager.setAdapter(new TabFragmentPagerAdapter(this, getSupportFragmentManager()));
         binding.tabViewPager.setOffscreenPageLimit(3);
         binding.tabLayout.setupWithViewPager(binding.tabViewPager);
diff --git a/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/adapters/TabFragmentPagerAdapter.java b/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/adapters/TabFragmentPagerAdapter.java
index 0eb02c9..c86b085 100644
--- a/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/adapters/TabFragmentPagerAdapter.java
+++ b/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/adapters/TabFragmentPagerAdapter.java
@@ -2,9 +2,10 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
 
 import io.github.oniatsu.fragmentstack.sample.beans.PageBean;
 import io.github.oniatsu.fragmentstack.sample.views.fragments.BaseDefaultFragment;
@@ -25,7 +26,7 @@ public TabFragmentPagerAdapter(Context context, FragmentManager fragmentManager)
     public Fragment getItem(int position) {
         Bundle bundle = new Bundle();
         PageBean pageBean = new PageBean("Tab " + position, 0);
-        switch(position){
+        switch (position) {
             case 0:
                 Default00Fragment default00Fragment = new Default00Fragment();
                 bundle.putSerializable(BaseDefaultFragment.ExtraKey.pageBean.toString(), pageBean);
diff --git a/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/fragments/BaseFragment.java b/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/fragments/BaseFragment.java
index e268e02..6c1632a 100644
--- a/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/fragments/BaseFragment.java
+++ b/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/fragments/BaseFragment.java
@@ -1,9 +1,10 @@
 package io.github.oniatsu.fragmentstack.sample.views.fragments;
 
-import android.support.v4.app.FragmentTransaction;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 
+import androidx.fragment.app.FragmentTransaction;
+
 import io.github.fragmentstack.views.FragmentPagerLifeCycleFragment;
 import io.github.oniatsu.fragmentstack.sample.R;
 
diff --git a/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/fragments/Default00Fragment.java b/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/fragments/Default00Fragment.java
index fd1be05..f9421e1 100644
--- a/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/fragments/Default00Fragment.java
+++ b/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/fragments/Default00Fragment.java
@@ -1,11 +1,13 @@
 package io.github.oniatsu.fragmentstack.sample.views.fragments;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import io.github.fragmentstack.FragmentStack;
 import io.github.oniatsu.fragmentstack.sample.R;
 import io.github.oniatsu.fragmentstack.sample.beans.PageBean;
@@ -23,14 +25,16 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
     }
 
     @Override
-    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
         FragmentStack.register(this, R.id.default_fragment0_container, new Sub0xFragment());
-
         pageBean = (PageBean) getArguments().getSerializable(ExtraKey.pageBean.toString());
-        binding.setPageBean(pageBean);
+    }
 
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        binding.setPageBean(pageBean);
         binding.componentPage.button1.setOnClickListener(v -> {
             Bundle bundle = new Bundle();
             Sub0xFragment sub0xFragment = new Sub0xFragment();
diff --git a/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/fragments/Default10Fragment.java b/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/fragments/Default10Fragment.java
index 63545ae..94a3f5b 100644
--- a/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/fragments/Default10Fragment.java
+++ b/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/fragments/Default10Fragment.java
@@ -1,11 +1,13 @@
 package io.github.oniatsu.fragmentstack.sample.views.fragments;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import io.github.fragmentstack.FragmentStack;
 import io.github.oniatsu.fragmentstack.sample.R;
 import io.github.oniatsu.fragmentstack.sample.beans.PageBean;
@@ -23,14 +25,16 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
     }
 
     @Override
-    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
         FragmentStack.register(this, R.id.default_fragment1_container, new Sub1xFragment());
-
         pageBean = (PageBean) getArguments().getSerializable(ExtraKey.pageBean.toString());
-        binding.setPageBean(pageBean);
+    }
 
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        binding.setPageBean(pageBean);
         binding.componentPage.button1.setOnClickListener(v -> {
             Bundle bundle = new Bundle();
             Sub1xFragment sub1xFragment = new Sub1xFragment();
diff --git a/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/fragments/Default20Fragment.java b/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/fragments/Default20Fragment.java
index 2012b16..120ede5 100644
--- a/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/fragments/Default20Fragment.java
+++ b/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/fragments/Default20Fragment.java
@@ -1,11 +1,13 @@
 package io.github.oniatsu.fragmentstack.sample.views.fragments;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import io.github.fragmentstack.FragmentStack;
 import io.github.oniatsu.fragmentstack.sample.R;
 import io.github.oniatsu.fragmentstack.sample.beans.PageBean;
@@ -23,14 +25,16 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
     }
 
     @Override
-    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
         FragmentStack.register(this, R.id.default_fragment2_container, new Sub2xFragment());
-
         pageBean = (PageBean) getArguments().getSerializable(ExtraKey.pageBean.toString());
-        binding.setPageBean(pageBean);
+    }
 
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        binding.setPageBean(pageBean);
         binding.componentPage.button1.setOnClickListener(v -> {
             Bundle bundle = new Bundle();
             Sub2xFragment sub2xFragment = new Sub2xFragment();
diff --git a/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/fragments/Sub0xFragment.java b/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/fragments/Sub0xFragment.java
index beffe29..4bf768f 100644
--- a/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/fragments/Sub0xFragment.java
+++ b/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/fragments/Sub0xFragment.java
@@ -1,11 +1,13 @@
 package io.github.oniatsu.fragmentstack.sample.views.fragments;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import io.github.fragmentstack.FragmentStack;
 import io.github.oniatsu.fragmentstack.sample.beans.PageBean;
 import io.github.oniatsu.fragmentstack.sample.databinding.SubFragmentBinding;
@@ -22,12 +24,15 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
     }
 
     @Override
-    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
         pageBean = (PageBean) getArguments().getSerializable(ExtraKey.pageBean.toString());
-        binding.setPageBean(pageBean);
+    }
 
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        binding.setPageBean(pageBean);
         binding.componentPage.button1.setOnClickListener(v -> {
             Bundle bundle = new Bundle();
             Sub0xFragment sub0xFragment = new Sub0xFragment();
diff --git a/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/fragments/Sub1xFragment.java b/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/fragments/Sub1xFragment.java
index 8fbe02d..49cee1d 100644
--- a/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/fragments/Sub1xFragment.java
+++ b/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/fragments/Sub1xFragment.java
@@ -1,11 +1,13 @@
 package io.github.oniatsu.fragmentstack.sample.views.fragments;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import io.github.fragmentstack.FragmentStack;
 import io.github.oniatsu.fragmentstack.sample.beans.PageBean;
 import io.github.oniatsu.fragmentstack.sample.databinding.SubFragmentBinding;
@@ -22,12 +24,15 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
     }
 
     @Override
-    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
         pageBean = (PageBean) getArguments().getSerializable(ExtraKey.pageBean.toString());
-        binding.setPageBean(pageBean);
+    }
 
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        binding.setPageBean(pageBean);
         binding.componentPage.button1.setOnClickListener(v -> {
             Bundle bundle = new Bundle();
             Sub1xFragment sub0xFragment = new Sub1xFragment();
diff --git a/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/fragments/Sub2xFragment.java b/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/fragments/Sub2xFragment.java
index 4b4c87d..9503856 100644
--- a/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/fragments/Sub2xFragment.java
+++ b/app/src/main/java/io/github/oniatsu/fragmentstack/sample/views/fragments/Sub2xFragment.java
@@ -1,11 +1,13 @@
 package io.github.oniatsu.fragmentstack.sample.views.fragments;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import io.github.fragmentstack.FragmentStack;
 import io.github.oniatsu.fragmentstack.sample.beans.PageBean;
 import io.github.oniatsu.fragmentstack.sample.databinding.SubFragmentBinding;
@@ -22,12 +24,15 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
     }
 
     @Override
-    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
         pageBean = (PageBean) getArguments().getSerializable(ExtraKey.pageBean.toString());
-        binding.setPageBean(pageBean);
+    }
 
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        binding.setPageBean(pageBean);
         binding.componentPage.button1.setOnClickListener(v -> {
             Bundle bundle = new Bundle();
             Sub2xFragment sub0xFragment = new Sub2xFragment();
diff --git a/app/src/main/res/layout/component_page.xml b/app/src/main/res/layout/component_page.xml
index 1c8aaf8..d5915a1 100644
--- a/app/src/main/res/layout/component_page.xml
+++ b/app/src/main/res/layout/component_page.xml
@@ -1,24 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    >
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
     <data>
-        <variable name="pageBean" type="io.github.oniatsu.fragmentstack.sample.beans.PageBean"/>
+
+        <variable
+            name="pageBean"
+            type="io.github.oniatsu.fragmentstack.sample.beans.PageBean" />
     </data>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"
         android:background="@drawable/border"
         android:gravity="center"
+        android:orientation="vertical"
         tools:showIn="@layout/default10_fragment">
+
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
             android:gravity="center"
-            >
+            android:orientation="vertical">
+
             <TextView
                 android:id="@+id/text1"
                 android:layout_width="wrap_content"
@@ -26,19 +30,21 @@
                 android:text="@{pageBean.name}"
                 android:textSize="@dimen/common_big_text_size"
                 tools:text="Tab 0" />
+
             <TextView
                 android:id="@+id/text2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textSize="@dimen/common_big_text_size"
                 android:text="@{String.valueOf(pageBean.getPageNumberString())}"
+                android:textSize="@dimen/common_big_text_size"
                 tools:text="Page 0" />
         </LinearLayout>
+
         <Button
             android:id="@+id/button1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="@dimen/common_text_size"
-            android:text="Next" />
+            android:text="Next"
+            android:textSize="@dimen/common_text_size" />
     </LinearLayout>
 </layout>
diff --git a/app/src/main/res/layout/default00_fragment.xml b/app/src/main/res/layout/default00_fragment.xml
index a11b103..30c95a0 100644
--- a/app/src/main/res/layout/default00_fragment.xml
+++ b/app/src/main/res/layout/default00_fragment.xml
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bind="http://schemas.android.com/apk/res-auto"
-    >
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:bind="http://schemas.android.com/apk/res-auto">
+
     <data>
-        <variable name="pageBean" type="io.github.oniatsu.fragmentstack.sample.beans.PageBean"/>
+
+        <variable
+            name="pageBean"
+            type="io.github.oniatsu.fragmentstack.sample.beans.PageBean" />
     </data>
+
     <FrameLayout
         android:id="@+id/default_fragment0_container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        >
+        android:layout_height="match_parent">
+
         <include
             android:id="@+id/component_page"
             layout="@layout/component_page"
-            bind:pageBean="@{pageBean}"
-            />
+            bind:pageBean="@{pageBean}" />
     </FrameLayout>
 </layout>
diff --git a/app/src/main/res/layout/default10_fragment.xml b/app/src/main/res/layout/default10_fragment.xml
index 630a54d..8c48a78 100644
--- a/app/src/main/res/layout/default10_fragment.xml
+++ b/app/src/main/res/layout/default10_fragment.xml
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bind="http://schemas.android.com/apk/res-auto"
-    >
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:bind="http://schemas.android.com/apk/res-auto">
+
     <data>
-        <variable name="pageBean" type="io.github.oniatsu.fragmentstack.sample.beans.PageBean"/>
+
+        <variable
+            name="pageBean"
+            type="io.github.oniatsu.fragmentstack.sample.beans.PageBean" />
     </data>
+
     <FrameLayout
         android:id="@+id/default_fragment1_container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        >
+        android:layout_height="match_parent">
+
         <include
             android:id="@+id/component_page"
             layout="@layout/component_page"
-            bind:pageBean="@{pageBean}"
-            />
+            bind:pageBean="@{pageBean}" />
     </FrameLayout>
 </layout>
diff --git a/app/src/main/res/layout/default20_fragment.xml b/app/src/main/res/layout/default20_fragment.xml
index 72c4e91..f0a3678 100644
--- a/app/src/main/res/layout/default20_fragment.xml
+++ b/app/src/main/res/layout/default20_fragment.xml
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bind="http://schemas.android.com/apk/res-auto"
-    >
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:bind="http://schemas.android.com/apk/res-auto">
+
     <data>
-        <variable name="pageBean" type="io.github.oniatsu.fragmentstack.sample.beans.PageBean"/>
+
+        <variable
+            name="pageBean"
+            type="io.github.oniatsu.fragmentstack.sample.beans.PageBean" />
     </data>
+
     <FrameLayout
         android:id="@+id/default_fragment2_container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        >
+        android:layout_height="match_parent">
+
         <include
             android:id="@+id/component_page"
             layout="@layout/component_page"
-            bind:pageBean="@{pageBean}"
-            />
+            bind:pageBean="@{pageBean}" />
     </FrameLayout>
 </layout>
diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
index c8b491e..6e20c5f 100644
--- a/app/src/main/res/layout/main_activity.xml
+++ b/app/src/main/res/layout/main_activity.xml
@@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    >
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
     <data>
-        <variable name="pageBean" type="io.github.oniatsu.fragmentstack.sample.beans.PageBean"/>
+
+        <variable
+            name="pageBean"
+            type="io.github.oniatsu.fragmentstack.sample.beans.PageBean" />
     </data>
+
     <FrameLayout
         android:id="@+id/main_fragment_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical"
-            >
+            android:orientation="vertical">
             <!--<android.support.v7.widget.Toolbar-->
             <!--android:id="@+id/toolbar"-->
             <!--android:layout_height="wrap_content"-->
@@ -22,19 +25,17 @@
             <!--android:minHeight="?attr/actionBarSize"-->
             <!--android:background="?attr/colorPrimary">-->
             <!--</android.support.v7.widget.Toolbar>-->
-            <android.support.design.widget.TabLayout
+            <com.google.android.material.tabs.TabLayout
                 android:id="@+id/tab_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:tabGravity="fill"
-                />
-            <android.support.v4.view.ViewPager
+                app:tabGravity="fill" />
+
+            <androidx.viewpager.widget.ViewPager
                 android:id="@+id/tab_view_pager"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:layout_weight="1"
-                >
-            </android.support.v4.view.ViewPager>
+                android:layout_weight="1" />
         </LinearLayout>
     </FrameLayout>
 </layout>
diff --git a/app/src/main/res/layout/sub_fragment.xml b/app/src/main/res/layout/sub_fragment.xml
index b9cfff8..db7c0f0 100644
--- a/app/src/main/res/layout/sub_fragment.xml
+++ b/app/src/main/res/layout/sub_fragment.xml
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bind="http://schemas.android.com/apk/res-auto"
-    >
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:bind="http://schemas.android.com/apk/res-auto">
+
     <data>
-        <variable name="pageBean" type="io.github.oniatsu.fragmentstack.sample.beans.PageBean"/>
+
+        <variable
+            name="pageBean"
+            type="io.github.oniatsu.fragmentstack.sample.beans.PageBean" />
     </data>
+
     <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        >
+        android:layout_height="match_parent">
+
         <include
             android:id="@+id/component_page"
             layout="@layout/component_page"
-            bind:pageBean="@{pageBean}"
-            />
+            bind:pageBean="@{pageBean}" />
     </FrameLayout>
 </layout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index acfbd49..d0760f9 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -4,6 +4,6 @@
     <dimen name="activity_vertical_margin">16dp</dimen>
 
     <dimen name="common_margin">8dp</dimen>
-    <dimen name="common_text_size">42dp</dimen>
-    <dimen name="common_big_text_size">64dp</dimen>
+    <dimen name="common_text_size">42sp</dimen>
+    <dimen name="common_big_text_size">64sp</dimen>
 </resources>
diff --git a/build.gradle b/build.gradle
index b20d583..d6f81e6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,11 +3,12 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
-        classpath 'me.tatarka:gradle-retrolambda:3.5.0'
-        classpath 'com.novoda:bintray-release:0.4.0'
+        classpath 'com.android.tools.build:gradle:7.2.1'
+//        classpath 'me.tatarka:gradle-retrolambda:3.5.0'
+//        classpath 'com.novoda:bintray-release:0.8.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -17,6 +18,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 
diff --git a/fragmentstack/build.gradle b/fragmentstack/build.gradle
index 3d7cf9f..6bad9a7 100644
--- a/fragmentstack/build.gradle
+++ b/fragmentstack/build.gradle
@@ -1,44 +1,48 @@
 apply plugin: 'com.android.library'
-apply plugin: 'com.novoda.bintray-release'
+//apply plugin: 'com.novoda.bintray-release'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdk 32
 
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 25
+        minSdk 21
+        targetSdk 32
         versionCode 1
         versionName "1.0"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
     }
+
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
     lintOptions {
         abortOnError false
     }
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-    compile 'com.android.support:appcompat-v7:25.1.1'
-    testCompile 'junit:junit:4.12'
-}
+    implementation 'androidx.appcompat:appcompat:1.5.0'
+    implementation 'com.google.android.material:material:1.6.1'
 
-publish {
-    userOrg = 'oniatsu'
-    groupId = 'io.github.oniatsu'
-    artifactId = 'fragment-stack'
-    publishVersion = "0.1.0"
-    desc = 'Using fragment to page easily. And Supplying page fragment life cycles.'
-    website = 'https://github.com/oniatsu'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }
+
+//publish {
+//    userOrg = 'oniatsu'
+//    groupId = 'io.github.oniatsu'
+//    artifactId = 'fragment-stack'
+//    publishVersion = "0.1.0"
+//    desc = 'Using fragment to page easily. And Supplying page fragment life cycles.'
+//    website = 'https://github.com/oniatsu'
+//}
diff --git a/fragmentstack/src/main/AndroidManifest.xml b/fragmentstack/src/main/AndroidManifest.xml
index 12612bd..8471a5b 100644
--- a/fragmentstack/src/main/AndroidManifest.xml
+++ b/fragmentstack/src/main/AndroidManifest.xml
@@ -1,9 +1,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="io.github.oniatsu.fragmentstack">
 
-    <application android:allowBackup="true" android:label="@string/app_name"
-        android:supportsRtl="true">
-
-    </application>
+    <application
+        android:allowBackup="true"
+        android:label="@string/app_name"
+        android:supportsRtl="true" />
 
 </manifest>
diff --git a/fragmentstack/src/main/java/io/github/fragmentstack/FragmentStack.java b/fragmentstack/src/main/java/io/github/fragmentstack/FragmentStack.java
index 66a634e..c3cc780 100644
--- a/fragmentstack/src/main/java/io/github/fragmentstack/FragmentStack.java
+++ b/fragmentstack/src/main/java/io/github/fragmentstack/FragmentStack.java
@@ -1,9 +1,9 @@
 package io.github.fragmentstack;
 
-import android.support.annotation.IdRes;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.IdRes;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -22,7 +22,8 @@ public static FragmentPagerTransitionInterceptor getGlobalFragmentPagerTransitio
         return globalFragmentPagerTransitionInterceptor;
     }
 
-    private FragmentStack() {}
+    private FragmentStack() {
+    }
 
     /**
      * Call and start application global config setup.
diff --git a/fragmentstack/src/main/java/io/github/fragmentstack/PageManager.java b/fragmentstack/src/main/java/io/github/fragmentstack/PageManager.java
index c0d581a..941323c 100644
--- a/fragmentstack/src/main/java/io/github/fragmentstack/PageManager.java
+++ b/fragmentstack/src/main/java/io/github/fragmentstack/PageManager.java
@@ -1,9 +1,9 @@
 package io.github.fragmentstack;
 
-import android.support.annotation.IdRes;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
+import androidx.annotation.IdRes;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
 
 import io.github.fragmentstack.listeners.FragmentPagerTransitionInterceptor;
 import io.github.fragmentstack.views.FragmentPagerLifeCycleFragment;
@@ -179,7 +179,7 @@ public void add(Fragment newFragment) {
     /**
      * Add a new fragment page.
      *
-     * @param newFragment New fragment to be added.
+     * @param newFragment                            New fragment to be added.
      * @param eachFragmentPagerTransitionInterceptor Each transition interceptor.
      */
     public void add(Fragment newFragment, FragmentPagerTransitionInterceptor eachFragmentPagerTransitionInterceptor) {
diff --git a/fragmentstack/src/main/java/io/github/fragmentstack/PageManagerBuilder.java b/fragmentstack/src/main/java/io/github/fragmentstack/PageManagerBuilder.java
index 931c9f3..23f8b38 100644
--- a/fragmentstack/src/main/java/io/github/fragmentstack/PageManagerBuilder.java
+++ b/fragmentstack/src/main/java/io/github/fragmentstack/PageManagerBuilder.java
@@ -1,6 +1,6 @@
 package io.github.fragmentstack;
 
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import io.github.fragmentstack.listeners.FragmentPagerTransitionInterceptor;
 
diff --git a/fragmentstack/src/main/java/io/github/fragmentstack/listeners/FragmentPagerTransitionInterceptor.java b/fragmentstack/src/main/java/io/github/fragmentstack/listeners/FragmentPagerTransitionInterceptor.java
index 018e707..9881beb 100644
--- a/fragmentstack/src/main/java/io/github/fragmentstack/listeners/FragmentPagerTransitionInterceptor.java
+++ b/fragmentstack/src/main/java/io/github/fragmentstack/listeners/FragmentPagerTransitionInterceptor.java
@@ -1,6 +1,7 @@
 package io.github.fragmentstack.listeners;
 
-import android.support.v4.app.FragmentTransaction;
+
+import androidx.fragment.app.FragmentTransaction;
 
 import io.github.fragmentstack.PageManager;
 
@@ -12,7 +13,7 @@ public interface FragmentPagerTransitionInterceptor {
     /**
      * Called when fragment transaction is setting up.
      *
-     * @param pageManager Active PageManager
+     * @param pageManager         Active PageManager
      * @param fragmentTransaction Active fragmentTransaction
      */
     void onTransaction(PageManager pageManager, FragmentTransaction fragmentTransaction);
diff --git a/fragmentstack/src/main/java/io/github/fragmentstack/views/FragmentPagerLifeCycleFragment.java b/fragmentstack/src/main/java/io/github/fragmentstack/views/FragmentPagerLifeCycleFragment.java
index a6261f2..7806549 100644
--- a/fragmentstack/src/main/java/io/github/fragmentstack/views/FragmentPagerLifeCycleFragment.java
+++ b/fragmentstack/src/main/java/io/github/fragmentstack/views/FragmentPagerLifeCycleFragment.java
@@ -1,6 +1,6 @@
 package io.github.fragmentstack.views;
 
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import io.github.fragmentstack.listeners.FragmentPagerLifeCycleListener;
 
diff --git a/gradle.properties b/gradle.properties
index aac7c9b..eb56b33 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,3 +15,5 @@ org.gradle.jvmargs=-Xmx1536m
 # 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
+android.useAndroidX=true
+android.nonTransitiveRClass=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 04e285f..31a4f55 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Tue Oct 25 13:00:54 IST 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle b/settings.gradle
index b69e1bc..26b72c2 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,15 @@
-include ':app', ':fragmentstack'
+//pluginManagement {
+//    repositories {
+//        gradlePluginPortal()
+//        google()
+//        mavenCentral()
+//    }
+//}
+//dependencyResolutionManagement {
+//    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+//    repositories {
+//        google()
+//        mavenCentral()
+//    }
+//}
+include ':app', ':fragmentstack'
\ No newline at end of file