updated to androidx

tirgei · Oct 25, 2018 · 04b0a64 · 04b0a64
1 parent b4732cc
commit 04b0a64
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 14 deletions.
diff --git a/app/src/main/java/com/gelostech/viewpager/MainActivity.kt b/app/src/main/java/com/gelostech/viewpager/MainActivity.kt
@@ -1,11 +1,11 @@
 package com.gelostech.viewpager
 
-import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
-import android.support.design.widget.TabLayout
+import androidx.appcompat.app.AppCompatActivity
 import com.gelostech.viewpager.fragments.FragmentOne
 import com.gelostech.viewpager.fragments.FragmentThree
 import com.gelostech.viewpager.fragments.FragmentTwo
+import com.google.android.material.tabs.TabLayout
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : AppCompatActivity() {

diff --git a/app/src/main/java/com/gelostech/viewpager/PagerAdapter.java b/app/src/main/java/com/gelostech/viewpager/PagerAdapter.java
@@ -1,14 +1,15 @@
 package com.gelostech.viewpager;
 
 import android.content.Context;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+
 /**
  * Created by Monroe on 7/13/2016.
  */
@@ -20,7 +21,7 @@ public class PagerAdapter extends FragmentPagerAdapter {
 
 
 
-    public PagerAdapter(FragmentManager fm,Context context) {
+    public PagerAdapter(FragmentManager fm, Context context) {
         super(fm);
         this.context = context;
     }

diff --git a/app/src/main/java/com/gelostech/viewpager/fragments/FragmentOne.kt b/app/src/main/java/com/gelostech/viewpager/fragments/FragmentOne.kt
@@ -2,10 +2,10 @@ package com.gelostech.viewpager.fragments
 
 
 import android.os.Bundle
-import android.support.v4.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.Fragment
 
 import com.gelostech.viewpager.R
 

diff --git a/app/src/main/java/com/gelostech/viewpager/fragments/FragmentThree.kt b/app/src/main/java/com/gelostech/viewpager/fragments/FragmentThree.kt
@@ -2,10 +2,10 @@ package com.gelostech.viewpager.fragments
 
 
 import android.os.Bundle
-import android.support.v4.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.Fragment
 
 import com.gelostech.viewpager.R
 

diff --git a/app/src/main/java/com/gelostech/viewpager/fragments/FragmentTwo.kt b/app/src/main/java/com/gelostech/viewpager/fragments/FragmentTwo.kt
@@ -2,10 +2,10 @@ package com.gelostech.viewpager.fragments
 
 
 import android.os.Bundle
-import android.support.v4.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.Fragment
 
 import com.gelostech.viewpager.R
 

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -6,26 +6,26 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
             app:layout_scrollFlags="scroll|enterAlways" />
 
-        <android.support.design.widget.TabLayout
+        <com.google.android.material.tabs.TabLayout
             android:id="@+id/tabs"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:tabGravity="fill"
             app:tabMode="fixed" />
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <com.gelostech.nonswipableviewpager.NonSwipeableViewPager
         android:id="@+id/viewpager"

diff --git a/gradle.properties b/gradle.properties
@@ -7,6 +7,8 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx1536m
+android.useAndroidX=true
+android.enableJetifier=true
 # 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

diff --git a/...ableviewpager/src/main/java/com/gelostech/nonswipableviewpager/NonSwipeableViewPager.java b/...ableviewpager/src/main/java/com/gelostech/nonswipableviewpager/NonSwipeableViewPager.java
@@ -1,14 +1,15 @@
 package com.gelostech.nonswipableviewpager;
 
 import android.content.Context;
-import android.support.v4.view.ViewPager;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.animation.DecelerateInterpolator;
 import android.widget.Scroller;
 
 import java.lang.reflect.Field;
 
+import androidx.viewpager.widget.ViewPager;
+
 public class NonSwipeableViewPager extends ViewPager {
 
     public NonSwipeableViewPager(Context context) {