Switch to AndroidX (fix cgeo#7748)

Switch to AndroidX (fix cgeo#7748) in addition to the automatic changes (and manual polish) - edit checkstyle rule: ImportOrder; add androidx group after android - it was necessary to update butterknife, use newest (10.2.0) - replace ButterKnife.findById by findViewById (findById was removed in ButterKnife) - remove unused: main\thirdparty\android\support\v4\app\FragmentListActivity.java - Then updated to the latest androidx versions.
peterh56711 · Dec 14, 2019 · b912a9f · b912a9f
1 parent 1089fab
commit b912a9f
Show file tree

Hide file tree

Showing 386 changed files with 1,174 additions and 1,295 deletions.
diff --git a/cgeo-contacts/build.gradle b/cgeo-contacts/build.gradle
@@ -53,10 +53,10 @@ dependencies {
     implementation 'org.apache.commons:commons-lang3:3.5'
 
     // Support Library AppCompat
-    implementation "com.android.support:appcompat-v7:$supportLibraryVersion"
+    implementation 'androidx.appcompat:appcompat:1.1.0'
 
     // Android annotations
-    implementation "com.android.support:support-annotations:$supportLibraryVersion"
+    implementation 'androidx.annotation:annotation:1.1.0'
 }
 
 /*

diff --git a/cgeo-contacts/src/cgeo/contacts/ContactsActivity.java b/cgeo-contacts/src/cgeo/contacts/ContactsActivity.java
@@ -11,12 +11,13 @@
 import android.os.Bundle;
 import android.provider.BaseColumns;
 import android.provider.ContactsContract;
-import android.support.annotation.NonNull;
 import android.util.Log;
 import android.util.Pair;
 import android.view.Gravity;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.ArrayList;

diff --git a/cgeo-contacts/src/cgeo/contacts/permission/PermissionHandler.java b/cgeo-contacts/src/cgeo/contacts/permission/PermissionHandler.java
@@ -10,8 +10,9 @@
 import android.net.Uri;
 import android.os.Build;
 import android.provider.Settings;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
+
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 
 public class PermissionHandler {
 

diff --git a/checkstyle.xml b/checkstyle.xml
@@ -130,7 +130,7 @@
       <property name="severity" value="info" />
     </module>
     <module name="ImportOrder">
-      <property name="groups" value="cgeo,android,java,javax,*"/>
+      <property name="groups" value="cgeo,android,androidx,java,javax,*"/>
       <property name="ordered" value="true"/>
       <property name="separated" value="true"/>
       <property name="option" value="top"/>

diff --git a/common/src/cgeo/contacts/IContacts.java b/common/src/cgeo/contacts/IContacts.java
@@ -1,6 +1,6 @@
 package cgeo.contacts;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 public interface IContacts {
     @NonNull String INTENT = "cgeo.contacts.FIND";

diff --git a/gradle.properties b/gradle.properties
@@ -15,4 +15,8 @@ org.gradle.caching=true
 
 # Avoid printing release notes after gradle version upgrades. See https://github.com/gradle/gradle/issues/5213
 org.gradle.internal.launcher.welcomeMessageEnabled=false
-systemProp.org.gradle.internal.launcher.welcomeMessageEnabled=false
+systemProp.org.gradle.internal.launcher.welcomeMessageEnabled=false
+
+# AndroidX configuration
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml
@@ -838,7 +838,7 @@
 
         <!-- fileprovider to be able to share files -->
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="@string/file_provider_authority"
             android:exported="false"
             android:grantUriPermissions="true">

diff --git a/main/build.gradle b/main/build.gradle
@@ -41,7 +41,7 @@ android {
         testFunctionalTest true
 
         // set the default test runner to be used by IDE and command line
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         // by convention, the folder name "main" is used for the APK file name. we want cgeo instead
         archivesBaseName = "cgeo"
@@ -275,7 +275,7 @@ dependencies {
     androidTestImplementation "org.assertj:assertj-core:$assertJVersion"
 
     // ButterKnife view injection, https://github.com/JakeWharton/butterknife
-    def butterKnifeVersion = '8.8.1'
+    def butterKnifeVersion = '10.2.0'
     implementation "com.jakewharton:butterknife:$butterKnifeVersion"
     annotationProcessor "com.jakewharton:butterknife-compiler:$butterKnifeVersion"
 
@@ -353,26 +353,27 @@ dependencies {
     // Support Libraries. All com.android.support.* libraries must use the same version
 
     // Support Library AppCompat
-    implementation "com.android.support:appcompat-v7:$supportLibraryVersion"
+    implementation 'androidx.appcompat:appcompat:1.1.0'
 
-    // Support Library ExifInterface replaces com.android.media.ExifInterface by com.android.support.media.ExifInterface
-    implementation "com.android.support:exifinterface:$supportLibraryVersion"
+    // Support Library ExifInterface
+    implementation 'androidx.exifinterface:exifinterface:1.1.0'
 
     // Support Library GridLayout used by the coordinate calculator
-    implementation "com.android.support:gridlayout-v7:$supportLibraryVersion"
+    implementation 'androidx.gridlayout:gridlayout:1.0.0'
 
     // Support Library RecyclerView
-    implementation "com.android.support:recyclerview-v7:$supportLibraryVersion"
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
     // we don't want to implement decorators on our own
     implementation 'com.yqritc:recyclerview-flexibledivider:1.4.0'
 
-    // Support Annotations. enforce same version for the main app and the test app
-    implementation "com.android.support:support-annotations:$supportLibraryVersion"
-    androidTestImplementation "com.android.support:support-annotations:$supportLibraryVersion"
+    // Support Annotations. use same version for the main app and the test app
+    def annotationVersion = '1.1.0'
+    implementation "androidx.annotation:annotation:$annotationVersion"
+    androidTestImplementation "androidx.annotation:annotation:$annotationVersion"
 
     // Testing Support Libraries
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation "com.android.support.test.espresso:espresso-core:3.0.2"
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
     // Undo toast
     implementation 'com.github.jenzz.undobar:library:1.3:api8Release@aar'

diff --git a/main/res/layout/addresslist_activity.xml b/main/res/layout/addresslist_activity.xml
@@ -6,7 +6,7 @@
     android:orientation="vertical"
     tools:context=".address.AddressListActivity" >
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/address_list"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"

diff --git a/main/res/layout/cachedetail_activity.xml b/main/res/layout/cachedetail_activity.xml
@@ -8,7 +8,7 @@
     android:orientation="vertical"
     tools:context=".CacheDetailActivity" >
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/viewpager"
         android:layout_width="fill_parent"
         android:layout_height="0dp"

diff --git a/main/res/layout/cachedetail_inventory_page.xml b/main/res/layout/cachedetail_inventory_page.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/list"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"

diff --git a/main/res/layout/coordinates_calculate.xml b/main/res/layout/coordinates_calculate.xml
@@ -37,7 +37,7 @@
     </LinearLayout>
 
     <!-- H DDD°MM'SS.PPPPP" -->
-    <android.support.v7.widget.GridLayout
+    <androidx.gridlayout.widget.GridLayout
         android:id="@+id/coordTable"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -200,5 +200,5 @@
             android:textSize="22sp"
             android:layout_marginRight="1dp"
             tools:ignore="HardcodedText" />
-    </android.support.v7.widget.GridLayout>
+    </androidx.gridlayout.widget.GridLayout>
 </merge>
diff --git a/main/res/layout/coordinates_equations.xml b/main/res/layout/coordinates_equations.xml
@@ -20,8 +20,7 @@
         android:orientation="horizontal"
         android:padding="6dp" >
 
-        <android.support.v7.widget.GridLayout
-            xmlns:grid="http://schemas.android.com/apk/res-auto"
+        <androidx.gridlayout.widget.GridLayout
 
             android:id="@+id/EquationTable"
             android:layout_height="wrap_content"
@@ -39,13 +38,12 @@
             android:layout_marginRight="4dp"
             android:background="@color/just_white"/>
 
-        <android.support.v7.widget.GridLayout
+        <androidx.gridlayout.widget.GridLayout
             android:id="@+id/FreeVariableTable"
-            xmlns:grid="http://schemas.android.com/apk/res-auto"
 
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
 
-            app:orientation="vertical"/>
+            app:orientation="vertical" />
     </LinearLayout>
 </HorizontalScrollView>
diff --git a/main/res/layout/gpx.xml b/main/res/layout/gpx.xml
@@ -13,7 +13,7 @@
         android:visibility="gone"
         tools:visibility="visible"/>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/list"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"

diff --git a/main/res/layout/pocketquery_activity.xml b/main/res/layout/pocketquery_activity.xml
@@ -6,7 +6,7 @@
     android:orientation="vertical"
     tools:context=".connector.gc.PocketQueryListActivity" >
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/pocketquery_list"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"

diff --git a/main/res/layout/usefulapps_activity.xml b/main/res/layout/usefulapps_activity.xml
@@ -7,7 +7,7 @@
     android:orientation="vertical"
     tools:context=".helper.UsefulAppsActivity" >
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/apps_list"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"

diff --git a/main/res/layout/viewpager_activity.xml b/main/res/layout/viewpager_activity.xml
@@ -6,7 +6,7 @@
     android:background="?background_color"
     android:orientation="vertical" >
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/viewpager"
         android:layout_width="fill_parent"
         android:layout_height="0dp"

diff --git a/main/res/menu/cache_options.xml b/main/res/menu/cache_options.xml
@@ -86,7 +86,7 @@
         android:id="@+id/menu_share"
         android:icon="@drawable/ic_menu_share"
         android:title="@string/cache_menu_share"
-        app:actionProviderClass="android.support.v7.widget.ShareActionProvider"
+        app:actionProviderClass="androidx.appcompat.widget.ShareActionProvider"
         app:showAsAction="ifRoom">
     </item>
     <item

diff --git a/main/res/menu/main_activity_options.xml b/main/res/menu/main_activity_options.xml
@@ -7,7 +7,7 @@
         android:id="@+id/menu_gosearch"
         android:icon="@android:drawable/ic_menu_search"
         android:title="@string/search_bar_hint"
-        app:actionViewClass="android.support.v7.widget.SearchView"
+        app:actionViewClass="androidx.appcompat.widget.SearchView"
         app:iconifiedByDefault="true"
         app:showAsAction="collapseActionView|always"/>
     <item

diff --git a/main/src/cgeo/contacts/ContactsAddon.java b/main/src/cgeo/contacts/ContactsAddon.java
@@ -6,7 +6,8 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 public class ContactsAddon {
 

diff --git a/main/src/cgeo/geocaching/AboutActivity.java b/main/src/cgeo/geocaching/AboutActivity.java
@@ -13,8 +13,6 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.RawRes;
-import android.support.annotation.StringRes;
 import android.text.Html;
 import android.text.SpannableStringBuilder;
 import android.view.View;
@@ -23,6 +21,9 @@
 import android.widget.ScrollView;
 import android.widget.TextView;
 
+import androidx.annotation.RawRes;
+import androidx.annotation.StringRes;
+
 import java.io.InputStream;
 import java.util.Arrays;
 import java.util.List;

diff --git a/main/src/cgeo/geocaching/AbstractDialogFragment.java b/main/src/cgeo/geocaching/AbstractDialogFragment.java
@@ -27,8 +27,6 @@
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.widget.PopupMenu;
 import android.view.ContextMenu;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -38,9 +36,11 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.appcompat.widget.PopupMenu;
+import androidx.fragment.app.DialogFragment;
+
 import java.util.concurrent.Callable;
 
-import butterknife.ButterKnife;
 import io.reactivex.Maybe;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.functions.Consumer;
@@ -85,7 +85,7 @@ public void onCreate(final Bundle savedInstanceState) {
     }
 
     protected void initCustomActionBar(final View v) {
-        final ImageView defaultNavigationImageView = ButterKnife.findById(v, R.id.defaultNavigation);
+        final ImageView defaultNavigationImageView = v.findViewById(R.id.defaultNavigation);
         defaultNavigationImageView.setOnLongClickListener(v12 -> {
             startDefaultNavigation2();
             return true;
@@ -110,7 +110,7 @@ protected void initCustomActionBar(final View v) {
     public final void setTitle(final CharSequence title) {
         final View view = getView();
         assert view != null;
-        final TextView titleview = ButterKnife.findById(view, R.id.actionbar_title);
+        final TextView titleview = view.findViewById(R.id.actionbar_title);
         if (titleview != null) {
             titleview.setText(title);
         }
@@ -228,7 +228,7 @@ protected final void addCacheDetails() {
         // more details
         final View view = getView();
         assert view != null;
-        final Button buttonMore = ButterKnife.findById(view, R.id.more_details);
+        final Button buttonMore = view.findViewById(R.id.more_details);
 
         buttonMore.setOnClickListener(arg0 -> {
             CacheDetailActivity.startActivity(getActivity(), geocode);