Merge pull request #5 from irgaly/androidx

migrate to AndroidX
Kyash · Mar 15, 2021 · 4da1519 · 4da1519
2 parents 419eead + 3ecaf21
commit 4da1519
Show file tree

Hide file tree

Showing 23 changed files with 181 additions and 143 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,13 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-	compileSdkVersion 25
-	buildToolsVersion "25.0.1"
+	compileSdkVersion 30
 
 	defaultConfig {
 		applicationId "org.zakariya.stickyheadersapp"
 		minSdkVersion 19
-		targetSdkVersion 25
+		targetSdkVersion 30
 		versionCode 1
 		versionName "1.0"
 	}
@@ -20,12 +19,12 @@ android {
 }
 
 dependencies {
-	compile fileTree(dir: 'libs', include: ['*.jar'])
-	testCompile 'junit:junit:4.12'
-	compile 'com.android.support:appcompat-v7:25.0.1'
-	compile 'com.android.support:design:25.0.1'
-	compile 'com.android.support:recyclerview-v7:25.0.1'
-	compile 'com.squareup.retrofit2:retrofit:2.0.2'
-	compile 'com.squareup.retrofit2:converter-gson:2.0.2'
-	compile project(path: ':stickyheaders')
+	implementation fileTree(dir: 'libs', include: ['*.jar'])
+	testImplementation 'junit:junit:4.12'
+	implementation 'androidx.appcompat:appcompat:1.2.0'
+	implementation 'com.google.android.material:material:1.3.0'
+	implementation 'androidx.recyclerview:recyclerview:1.1.0'
+	implementation 'com.squareup.retrofit2:retrofit:2.0.2'
+	implementation 'com.squareup.retrofit2:converter-gson:2.0.2'
+	implementation project(path: ':stickyheaders')
 }
diff --git a/app/src/main/java/org/zakariya/stickyheadersapp/adapters/SelectionDemoAdapter.java b/app/src/main/java/org/zakariya/stickyheadersapp/adapters/SelectionDemoAdapter.java
@@ -1,8 +1,6 @@
 package org.zakariya.stickyheadersapp.adapters;
 
 import android.annotation.SuppressLint;
-import android.support.annotation.DrawableRes;
-import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -11,6 +9,9 @@
 import android.widget.ImageButton;
 import android.widget.TextView;
 
+import androidx.annotation.DrawableRes;
+import androidx.core.content.ContextCompat;
+
 import org.zakariya.stickyheaders.SectioningAdapter;
 import org.zakariya.stickyheadersapp.R;
 

diff --git a/app/src/main/java/org/zakariya/stickyheadersapp/adapters/SimpleDemoAdapter.java b/app/src/main/java/org/zakariya/stickyheadersapp/adapters/SimpleDemoAdapter.java
@@ -1,8 +1,6 @@
 package org.zakariya.stickyheadersapp.adapters;
 
 import android.annotation.SuppressLint;
-import android.support.annotation.DrawableRes;
-import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -11,6 +9,9 @@
 import android.widget.ImageButton;
 import android.widget.TextView;
 
+import androidx.annotation.DrawableRes;
+import androidx.core.content.ContextCompat;
+
 import org.zakariya.stickyheaders.SectioningAdapter;
 import org.zakariya.stickyheadersapp.R;
 

diff --git a/app/src/main/java/org/zakariya/stickyheadersapp/ui/AddressBookDemoActivity.java b/app/src/main/java/org/zakariya/stickyheadersapp/ui/AddressBookDemoActivity.java
@@ -1,11 +1,13 @@
 package org.zakariya.stickyheadersapp.ui;
 
 import android.os.Bundle;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AlertDialog;
 import android.util.Log;
 import android.view.View;
 
+import androidx.appcompat.app.AlertDialog;
+
+import com.google.android.material.snackbar.Snackbar;
+
 import org.zakariya.stickyheaders.StickyHeaderLayoutManager;
 import org.zakariya.stickyheadersapp.R;
 import org.zakariya.stickyheadersapp.StickyHeadersDemoApp;

diff --git a/app/src/main/java/org/zakariya/stickyheadersapp/ui/DemoActivity.java b/app/src/main/java/org/zakariya/stickyheadersapp/ui/DemoActivity.java
@@ -3,13 +3,12 @@
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.annotation.LayoutRes;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.CollapsingToolbarLayout;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+
+import androidx.annotation.LayoutRes;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.Menu;
@@ -18,6 +17,9 @@
 import android.view.View;
 import android.widget.ProgressBar;
 
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.appbar.CollapsingToolbarLayout;
+
 import org.zakariya.stickyheaders.SectioningAdapter;
 import org.zakariya.stickyheaders.StickyHeaderLayoutManager;
 import org.zakariya.stickyheadersapp.R;

diff --git a/app/src/main/java/org/zakariya/stickyheadersapp/ui/MainActivity.java b/app/src/main/java/org/zakariya/stickyheadersapp/ui/MainActivity.java
@@ -4,15 +4,16 @@
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.viewpager.widget.ViewPager;
+
 import android.transition.TransitionManager;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -22,6 +23,8 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import com.google.android.material.tabs.TabLayout;
+
 import org.zakariya.stickyheaders.SectioningAdapter;
 import org.zakariya.stickyheaders.StickyHeaderLayoutManager;
 import org.zakariya.stickyheadersapp.R;

diff --git a/app/src/main/java/org/zakariya/stickyheadersapp/ui/SectioningAdapterDemoActivity.java b/app/src/main/java/org/zakariya/stickyheadersapp/ui/SectioningAdapterDemoActivity.java
@@ -1,7 +1,8 @@
 package org.zakariya.stickyheadersapp.ui;
 
 import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
 
 import org.zakariya.stickyheadersapp.adapters.SimpleDemoAdapter;
 

diff --git a/app/src/main/java/org/zakariya/stickyheadersapp/ui/SelectionDemo.java b/app/src/main/java/org/zakariya/stickyheadersapp/ui/SelectionDemo.java
@@ -1,10 +1,10 @@
 package org.zakariya.stickyheadersapp.ui;
 
 import android.os.Bundle;
-import android.support.annotation.LayoutRes;
-import android.support.design.widget.Snackbar;
-import android.support.v4.view.GestureDetectorCompat;
-import android.support.v7.widget.RecyclerView;
+
+import androidx.annotation.LayoutRes;
+import androidx.core.view.GestureDetectorCompat;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.ActionMode;
 import android.view.GestureDetector;
@@ -14,6 +14,8 @@
 import android.view.MotionEvent;
 import android.view.View;
 
+import com.google.android.material.snackbar.Snackbar;
+
 import org.zakariya.stickyheaders.StickyHeaderLayoutManager;
 import org.zakariya.stickyheadersapp.R;
 import org.zakariya.stickyheadersapp.adapters.SelectionDemoAdapter;

diff --git a/app/src/main/res/layout/activity_demo.xml b/app/src/main/res/layout/activity_demo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
@@ -9,33 +9,33 @@
 	android:fitsSystemWindows="true"
 	tools:context="org.zakariya.stickyheadersapp.ui.DemoActivity">
 
-	<android.support.design.widget.AppBarLayout
+	<com.google.android.material.appbar.AppBarLayout
 		android:id="@+id/appBar"
 		android:layout_width="match_parent"
 		android:layout_height="@dimen/app_bar_height"
 		android:fitsSystemWindows="true"
 		android:theme="@style/AppTheme.AppBarOverlay">
 
-		<android.support.design.widget.CollapsingToolbarLayout
+		<com.google.android.material.appbar.CollapsingToolbarLayout
 			android:id="@+id/collapsingToolbarLayout"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
 			android:fitsSystemWindows="true"
 			app:contentScrim="?attr/colorPrimary"
 			app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
-			<android.support.v7.widget.Toolbar
+			<androidx.appcompat.widget.Toolbar
 				android:id="@+id/toolbar"
 				android:layout_width="match_parent"
 				android:layout_height="?attr/actionBarSize"
 				app:layout_collapseMode="pin"
 				app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
 				style="@style/ToolBarWithNavigationBack"/>
 
-		</android.support.design.widget.CollapsingToolbarLayout>
-	</android.support.design.widget.AppBarLayout>
+		</com.google.android.material.appbar.CollapsingToolbarLayout>
+	</com.google.android.material.appbar.AppBarLayout>
 
-	<android.support.v7.widget.RecyclerView
+	<androidx.recyclerview.widget.RecyclerView
 		android:id="@+id/recyclerView"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
@@ -50,4 +50,4 @@
 		android:layout_height="wrap_content"
 		android:layout_gravity="center"/>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -7,24 +7,24 @@
 	android:layout_height="wrap_content"
 	android:orientation="vertical">
 
-	<android.support.design.widget.AppBarLayout
+	<com.google.android.material.appbar.AppBarLayout
 		android:id="@+id/appbarLayout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:fitsSystemWindows="true"
 		app:elevation="0dp"
 		android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
 
-		<android.support.v7.widget.Toolbar
+		<androidx.appcompat.widget.Toolbar
 			android:id="@+id/toolbar"
 			android:layout_width="match_parent"
 			android:layout_height="?attr/actionBarSize"
 			app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
 			/>
 
-	</android.support.design.widget.AppBarLayout>
+	</com.google.android.material.appbar.AppBarLayout>
 
-	<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"
@@ -37,7 +37,7 @@
 		app:tabTextColor="@color/tabTextDefault"
 		/>
 
-	<android.support.v4.view.ViewPager
+	<androidx.viewpager.widget.ViewPager
 		android:id="@+id/viewPager"
 		android:layout_width="match_parent"
 		android:layout_height="0dp"

diff --git a/app/src/main/res/layout/activity_selection_demo.xml b/app/src/main/res/layout/activity_selection_demo.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	tools:context="org.zakariya.stickyheadersapp.ui.DemoActivity">
 
-	<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:fitsSystemWindows="true"
 		android:theme="@style/AppTheme.AppBarOverlay">
 
-		<android.support.v7.widget.Toolbar
+		<androidx.appcompat.widget.Toolbar
 			android:id="@+id/toolbar"
 			style="@style/ToolBarWithNavigationBack"
 			android:layout_width="match_parent"
 			android:layout_height="?attr/actionBarSize"
 			app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
 
-	</android.support.design.widget.AppBarLayout>
+	</com.google.android.material.appbar.AppBarLayout>
 
-	<android.support.v7.widget.RecyclerView
+	<androidx.recyclerview.widget.RecyclerView
 		android:id="@+id/recyclerView"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		app:layout_behavior="@string/appbar_scrolling_view_behavior"
 		/>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<android.support.v7.widget.RecyclerView
+<androidx.recyclerview.widget.RecyclerView
 	android:id="@+id/recyclerView"
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"

diff --git a/app/src/main/res/layout/fragment_recycler.xml b/app/src/main/res/layout/fragment_recycler.xml
@@ -5,7 +5,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<android.support.v7.widget.RecyclerView
+	<androidx.recyclerview.widget.RecyclerView
 		android:id="@+id/recyclerView"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"/>

diff --git a/build.gradle b/build.gradle
@@ -2,10 +2,11 @@
 
 buildscript {
 	repositories {
+		google()
 		jcenter()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:2.2.2'
+		classpath 'com.android.tools.build:gradle:4.1.0'
 
 		classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7'
 		classpath "com.github.dcendents:android-maven-gradle-plugin:1.4.1"
@@ -17,6 +18,7 @@ buildscript {
 
 allprojects {
 	repositories {
+		google()
 		jcenter()
 	}
 }

diff --git a/gradle.properties b/gradle.properties
@@ -16,3 +16,5 @@
 # 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
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Wed Sep 14 10:14:49 PDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip