Merge pull request #85 from mantas84/migrate-androidx

jrvansuita · web-flow · commit 367c19330cb0 · 2020-04-26T14:28:52.000-03:00
migrate to androidX
diff --git a/app/build.gradle b/app/build.gradle
@@ -22,9 +22,8 @@ android {
 }
 
 dependencies {
-    implementation "com.android.support:appcompat-v7:$supportLibVersion"
-    implementation "com.android.support:design:$supportLibVersion"
-
+    implementation "androidx.appcompat:appcompat:$appcompatLibVersion"
+    implementation "com.google.android.material:material:$materialLibVersion"
     implementation "com.jakewharton:butterknife:$butterKnifeVersion"
 
     implementation project(':library')
diff --git a/app/src/main/java/com/vansuita/materialabout/sample/act/ActivitySample.java b/app/src/main/java/com/vansuita/materialabout/sample/act/ActivitySample.java
@@ -1,7 +1,7 @@
 package com.vansuita.materialabout.sample.act;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.vansuita.materialabout.sample.R;
 import com.vansuita.materialabout.sample.helper.SampleHelper;
diff --git a/app/src/main/java/com/vansuita/materialabout/sample/act/FragmentActivitySample.java b/app/src/main/java/com/vansuita/materialabout/sample/act/FragmentActivitySample.java
@@ -1,9 +1,9 @@
 package com.vansuita.materialabout.sample.act;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/res/layout/sample_view.xml b/app/src/main/res/layout/sample_view.xml
@@ -8,21 +8,21 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <android.support.v7.widget.AppCompatButton
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/dark"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="0.33"
             android:text="@string/dark_theme" />
 
-        <android.support.v7.widget.AppCompatButton
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/light"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="0.33"
             android:text="@string/light_theme" />
 
-        <android.support.v7.widget.AppCompatButton
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/custom"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
     }
 }
@@ -20,11 +20,13 @@ allprojects {
 }
 
 ext {
-    compileSdkVersion = 27
+    compileSdkVersion = 28
     buildToolsVersion = '28.0.0'
     targetSdkVersion = compileSdkVersion
 
-    supportLibVersion = '27.1.1'
+    appcompatLibVersion = '1.1.0'
+    cardViewLibVersion = '1.0.0'
+    materialLibVersion = '1.0.0'
     iconHandlerVersion = 'v2.0.0'
     butterKnifeVersion = '8.8.1'
 }
diff --git a/gradle.properties b/gradle.properties
@@ -9,6 +9,8 @@
 
 # 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.
diff --git a/library/build.gradle b/library/build.gradle
@@ -20,7 +20,7 @@ android {
 }
 
 dependencies {
-    implementation "com.android.support:appcompat-v7:$supportLibVersion"
-    implementation "com.android.support:cardview-v7:$supportLibVersion"
+    implementation "androidx.appcompat:appcompat:$appcompatLibVersion"
+    implementation "androidx.cardview:cardview:$cardViewLibVersion"
     implementation "com.github.jrvansuita:IconHandler:$iconHandlerVersion"
 }
diff --git a/library/src/main/java/com/vansuita/materialabout/builder/AboutBuilder.java b/library/src/main/java/com/vansuita/materialabout/builder/AboutBuilder.java
@@ -7,9 +7,11 @@
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.View;
 
+import androidx.cardview.widget.CardView;
+
 import com.vansuita.materialabout.R;
 import com.vansuita.materialabout.util.ColorUtil;
 import com.vansuita.materialabout.util.IconUtil;
@@ -1964,7 +1966,7 @@ public AboutBuilder addDonateAction(Intent intent) {
     }
 
     /**
-     * Wraps the content in a {@link android.support.v7.widget.CardView}
+     * Wraps the content in a {@link CardView}
      *
      * @param showAsCard true if show in a CardView
      * @return the same {@link AboutBuilder} instance
diff --git a/library/src/main/java/com/vansuita/materialabout/util/ColorUtil.java b/library/src/main/java/com/vansuita/materialabout/util/ColorUtil.java
@@ -2,8 +2,8 @@
 
 import android.content.Context;
 import android.content.res.Resources;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 
 
 /**
diff --git a/library/src/main/java/com/vansuita/materialabout/util/IconUtil.java b/library/src/main/java/com/vansuita/materialabout/util/IconUtil.java
@@ -5,10 +5,10 @@
 import android.graphics.BitmapFactory;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
 
 /**
  * Static utilities.
diff --git a/library/src/main/java/com/vansuita/materialabout/util/IntentUtil.java b/library/src/main/java/com/vansuita/materialabout/util/IntentUtil.java
@@ -5,7 +5,7 @@
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.provider.ContactsContract;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.View;
 
 import com.vansuita.materialabout.R;
diff --git a/library/src/main/java/com/vansuita/materialabout/util/RippleUtil.java b/library/src/main/java/com/vansuita/materialabout/util/RippleUtil.java
@@ -11,7 +11,7 @@
 import android.graphics.drawable.StateListDrawable;
 import android.graphics.drawable.shapes.RoundRectShape;
 import android.os.Build;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.StateSet;
 import android.view.View;
 
diff --git a/library/src/main/java/com/vansuita/materialabout/util/VisibleUtil.java b/library/src/main/java/com/vansuita/materialabout/util/VisibleUtil.java
@@ -1,6 +1,6 @@
 package com.vansuita.materialabout.util;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 
 /**
diff --git a/library/src/main/java/com/vansuita/materialabout/views/AboutView.java b/library/src/main/java/com/vansuita/materialabout/views/AboutView.java
@@ -8,9 +8,9 @@
 import android.graphics.drawable.GradientDrawable;
 import android.graphics.drawable.LayerDrawable;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.CardView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.cardview.widget.CardView;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/library/src/main/java/com/vansuita/materialabout/views/CircleImageView.java b/library/src/main/java/com/vansuita/materialabout/views/CircleImageView.java
@@ -10,13 +10,13 @@
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
 import android.net.Uri;
-import android.support.annotation.ColorInt;
-import android.support.annotation.DimenRes;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.annotation.ColorInt;
+import androidx.annotation.DimenRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.widget.AppCompatImageView;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.ViewGroup;
diff --git a/library/src/main/java/com/vansuita/materialabout/views/Corner.java b/library/src/main/java/com/vansuita/materialabout/views/Corner.java
@@ -1,6 +1,6 @@
 package com.vansuita.materialabout.views;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/library/src/main/java/com/vansuita/materialabout/views/RoundedDrawable.java b/library/src/main/java/com/vansuita/materialabout/views/RoundedDrawable.java
@@ -32,9 +32,9 @@
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.Log;
 import android.widget.ImageView.ScaleType;
 
diff --git a/library/src/main/res/layout/xab_about_layout_card.xml b/library/src/main/res/layout/xab_about_layout_card.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/card_holder"
     style="@style/Card"
     android:layout_margin="10dp"
@@ -129,4 +129,4 @@
     </FrameLayout>
 
 
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ buildscript {`
`6`	`6`	`google()`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:3.0.1'`
	`9`	`+ classpath 'com.android.tools.build:gradle:3.2.0'`
`10`	`10`	`classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'`
`11`	`11`	`}`
`12`	`12`	`}`
`@@ -20,11 +20,13 @@ allprojects {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`ext {`
`23`		`- compileSdkVersion = 27`
	`23`	`+ compileSdkVersion = 28`
`24`	`24`	`buildToolsVersion = '28.0.0'`
`25`	`25`	`targetSdkVersion = compileSdkVersion`
`26`	`26`
`27`		`- supportLibVersion = '27.1.1'`
	`27`	`+ appcompatLibVersion = '1.1.0'`
	`28`	`+ cardViewLibVersion = '1.0.0'`
	`29`	`+ materialLibVersion = '1.0.0'`
`28`	`30`	`iconHandlerVersion = 'v2.0.0'`
`29`	`31`	`butterKnifeVersion = '8.8.1'`
`30`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ android {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`dependencies {`
`23`		`- implementation "com.android.support:appcompat-v7:$supportLibVersion"`
`24`		`- implementation "com.android.support:cardview-v7:$supportLibVersion"`
	`23`	`+ implementation "androidx.appcompat:appcompat:$appcompatLibVersion"`
	`24`	`+ implementation "androidx.cardview:cardview:$cardViewLibVersion"`
`25`	`25`	`implementation "com.github.jrvansuita:IconHandler:$iconHandlerVersion"`
`26`	`26`	`}`