jonasoreland · gerhardol · Jul 28, 2020 · Jul 23, 2020 · Feb 2, 2020 · Jul 26, 2020
diff --git a/app/assets/changes.html b/app/assets/changes.html
@@ -5,6 +5,11 @@
   </head>
   <body>
     <h1>What's new</h1>
+    <h2>v2.1.0.1</h2>
+    <p>
+    <ul>
+      <li>#947 AndroidX and AppCompatActivity migration</li>
+    </ul>
     <h2>v2.1.0.0</h2>
     <p>
     <ul>

diff --git a/app/build.gradle b/app/build.gradle
@@ -121,9 +121,7 @@ dependencies {
         latestWearApp project(':wear')
     }
 
-    //noinspection GradleCompatible
-    latestImplementation "com.android.support:design:${rootProject.ext.supportLibrary}"
-    latestImplementation "com.android.support:cardview-v7:${rootProject.ext.supportLibrary}"
+    latestImplementation "com.google.android.material:material:1.1.0"
     if (rootProject.ext.enableWear) {
         //noinspection GradleDependency
         latestImplementation "com.google.android.gms:play-services-wearable:${rootProject.ext.googlePlayServicesVersion}"

diff --git a/app/proguard.txt b/app/proguard.txt
@@ -175,4 +175,5 @@
 -dontwarn org.xmlpull.v1.**
 -dontnote org.xmlpull.v1.**
 -keep class org.xmlpull.** { *; }
--keepclassmembers class org.xmlpull.** { *; }
+-keepclassmembers class org.xmlpull.** { *; }
+-keep class androidx.core.app.CoreComponentFactory { *; }
diff --git a/app/res/layout-v14/feed_widget.xml b/app/res/layout-v14/feed_widget.xml
@@ -1,4 +1,5 @@
 <RelativeLayout 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"
@@ -10,7 +11,7 @@
         android:layout_width="30dp"
         android:layout_height="30dp"
         android:id="@+id/widget_app_icon"
-        android:src="@drawable/ic_feed_widget"
+        app:srcCompat="@drawable/ic_feed_widget"
         android:layout_alignParentTop="true"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"

diff --git a/app/res/layout-v15/feed_row_activity.xml b/app/res/layout-v15/feed_row_activity.xml
@@ -1,9 +1,9 @@
 <?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:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="16dp">
 
     <include layout="@layout/feed_row_contents" />
 
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>
diff --git a/app/res/layout-v15/history.xml b/app/res/layout-v15/history.xml
@@ -29,7 +29,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/feed_actionbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -48,7 +48,7 @@
 
     </LinearLayout>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/history_add"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

diff --git a/app/res/layout-v15/start_fab.xml b/app/res/layout-v15/start_fab.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.FloatingActionButton xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.floatingactionbutton.FloatingActionButton xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/start_button"
     android:layout_width="wrap_content"

diff --git a/app/res/layout/account_row.xml b/app/res/layout/account_row.xml
@@ -15,6 +15,7 @@
   ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     xmlns:tools="http://schemas.android.com/tools"
@@ -42,7 +43,7 @@
 
             <ImageView
                 android:id="@+id/account_list_icon"
-                android:src="@drawable/circle_40dp"
+                app:srcCompat="@drawable/circle_40dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
@@ -70,7 +71,7 @@
             android:minWidth="48dp"
             android:minHeight="48dp" />
 
-        <android.support.v7.widget.SwitchCompat
+        <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/account_list_feed"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
@@ -80,7 +81,7 @@
             android:minHeight="48dp"
             android:contentDescription="@string/feed" />
 
-        <android.support.v7.widget.SwitchCompat
+        <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/account_list_upload"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"

diff --git a/app/res/layout/detail.xml b/app/res/layout/detail.xml
@@ -30,7 +30,7 @@
         android:orientation="vertical"
         tools:ignore="UnusedAttribute">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/actionbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />

diff --git a/app/res/layout/detail_nomap.xml b/app/res/layout/detail_nomap.xml
@@ -30,7 +30,7 @@
         android:orientation="vertical"
         tools:ignore="UnusedAttribute">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/actionbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />

diff --git a/app/res/layout/feed.xml b/app/res/layout/feed.xml
@@ -22,7 +22,7 @@
               android:layout_height="fill_parent"
               android:orientation="vertical">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/feed_actionbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

diff --git a/app/res/layout/history.xml b/app/res/layout/history.xml
@@ -27,7 +27,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/feed_actionbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

diff --git a/app/res/layout/start.xml b/app/res/layout/start.xml
@@ -23,7 +23,7 @@
               android:orientation="vertical"
               tools:context=".view.StartActivity">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/start_actionbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -41,7 +41,7 @@
             android:minHeight="48dp"
             android:spinnerMode="dropdown" />
 
-    </android.support.v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>
 
     <TabHost
         android:id="@+id/tabhost_start"

diff --git a/app/res/values/styles.xml b/app/res/values/styles.xml
@@ -59,7 +59,7 @@
         <item name="android:ellipsize">marquee</item>
         <item name="android:singleLine">true</item>
         <item name="android:tabStripEnabled">false</item>
-        <item name="android:divider">@null</item>
+        <item name="divider">@null</item>
         <item name="android:gravity">fill_horizontal|center_vertical</item>
     </style>
 
@@ -73,7 +73,7 @@
     </style>
 
     <style name="AppBarStatisticsText">
-        <item name="android:fontFamily" tools:ignore="NewApi">@string/fontFamily_medium</item>
+        <item name="fontFamily" tools:ignore="NewApi">@string/fontFamily_medium</item>
         <item name="android:textSize">16sp</item>
         <item name="android:textColor">@android:color/white</item>
     </style>
@@ -89,7 +89,7 @@
     </style>
 
     <style name="ListCategoryHeading">
-        <item name="android:fontFamily" tools:ignore="NewApi">@string/fontFamily_medium</item>
+        <item name="fontFamily" tools:ignore="NewApi">@string/fontFamily_medium</item>
         <item name="android:textColor">@color/colorAccent</item>
         <item name="android:textSize">14sp</item>
     </style>

diff --git a/app/src/main/org/runnerup/content/ActivityProvider.java b/app/src/main/org/runnerup/content/ActivityProvider.java
@@ -27,7 +27,7 @@
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 import android.util.Pair;
 

diff --git a/app/src/main/org/runnerup/content/WorkoutFileProvider.java b/app/src/main/org/runnerup/content/WorkoutFileProvider.java
@@ -23,7 +23,7 @@
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.runnerup.BuildConfig;
 import org.runnerup.workout.WorkoutSerializer;

diff --git a/app/src/main/org/runnerup/db/DBHelper.java b/app/src/main/org/runnerup/db/DBHelper.java
@@ -17,6 +17,7 @@
 
 package org.runnerup.db;
 
+import androidx.appcompat.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.ContentValues;
 import android.content.Context;
@@ -25,7 +26,6 @@
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.os.AsyncTask;
-import android.support.v7.app.AlertDialog;
 import android.util.Log;
 
 import org.json.JSONException;

diff --git a/app/src/main/org/runnerup/db/entities/LocationEntity.java b/app/src/main/org/runnerup/db/entities/LocationEntity.java
@@ -20,7 +20,7 @@
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.location.Location;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.runnerup.common.util.Constants;
 

diff --git a/app/src/main/org/runnerup/export/DefaultSynchronizer.java b/app/src/main/org/runnerup/export/DefaultSynchronizer.java
@@ -17,13 +17,14 @@
 
 package org.runnerup.export;
 
-import android.app.Activity;
 import android.content.ContentValues;
 import android.content.Intent;
 import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
 import android.util.Pair;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import org.runnerup.R;
 import org.runnerup.common.util.Constants;
 import org.runnerup.db.DBHelper;
@@ -87,7 +88,8 @@ public String getAuthConfig() {
         return null;
     }
 
-    public Intent getAuthIntent(Activity a) {
+    @Override
+    public Intent getAuthIntent(AppCompatActivity a) {
         return null;
     }
 

diff --git a/app/src/main/org/runnerup/export/DropboxSynchronizer.java b/app/src/main/org/runnerup/export/DropboxSynchronizer.java
@@ -15,14 +15,15 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package org.runnerup.export;
-import android.app.Activity;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.runnerup.BuildConfig;
@@ -155,13 +156,13 @@ public String getAuthConfig() {
     }
 
     @Override
-    public Intent getAuthIntent(Activity activity) {
+    public Intent getAuthIntent(AppCompatActivity activity) {
         return OAuth2Activity.getIntent(activity, this);
     }
 
     @Override
     public Status getAuthResult(int resultCode, Intent data) {
-        if (resultCode == Activity.RESULT_OK) {
+        if (resultCode == AppCompatActivity.RESULT_OK) {
             try {
                 String authConfig = data.getStringExtra(DB.ACCOUNT.AUTH_CONFIG);
                 JSONObject obj = new JSONObject(authConfig);

diff --git a/app/src/main/org/runnerup/export/FacebookSynchronizer.java b/app/src/main/org/runnerup/export/FacebookSynchronizer.java
@@ -17,14 +17,15 @@
 
 package org.runnerup.export;
 
-import android.app.Activity;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
 import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
 import android.util.Log;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.runnerup.R;
@@ -188,13 +189,13 @@ public String getAuthConfig() {
     }
 
     @Override
-    public Intent getAuthIntent(Activity activity) {
+    public Intent getAuthIntent(AppCompatActivity activity) {
         return OAuth2Activity.getIntent(activity, this);
     }
 
     @Override
     public Status getAuthResult(int resultCode, Intent data) {
-        if (resultCode == Activity.RESULT_OK) {
+        if (resultCode == AppCompatActivity.RESULT_OK) {
             try {
                 String authConfig = data.getStringExtra(DB.ACCOUNT.AUTH_CONFIG);
                 Uri uri = Uri.parse("https://keso?" + authConfig);

diff --git a/app/src/main/org/runnerup/export/RunKeeperSynchronizer.java b/app/src/main/org/runnerup/export/RunKeeperSynchronizer.java
@@ -18,7 +18,6 @@
 package org.runnerup.export;
 
 import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
@@ -30,6 +29,8 @@
 import android.text.TextUtils;
 import android.util.Log;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -220,13 +221,13 @@ public String getAuthConfig() {
     }
 
     @Override
-    public Intent getAuthIntent(Activity activity) {
+    public Intent getAuthIntent(AppCompatActivity activity) {
         return OAuth2Activity.getIntent(activity, this);
     }
 
     @Override
     public Status getAuthResult(int resultCode, Intent data) {
-        if (resultCode == Activity.RESULT_OK) {
+        if (resultCode == AppCompatActivity.RESULT_OK) {
             String authConfig = data.getStringExtra(DB.ACCOUNT.AUTH_CONFIG);
             try {
                 JSONObject obj = new JSONObject(authConfig);