migrate to API 28 and AndroidX

opacapp · Aug 7, 2019 · 4d6e798 · 4d6e798
1 parent 191dc98
commit 4d6e798
Show file tree

Hide file tree

Showing 69 changed files with 217 additions and 218 deletions.
diff --git a/opacclient/gradle.properties b/opacclient/gradle.properties
@@ -11,6 +11,8 @@
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx2048m
 
 # When configured, Gradle will run in incubating parallel mode.

diff --git a/opacclient/opacapp/build.gradle b/opacclient/opacapp/build.gradle
@@ -4,12 +4,12 @@ apply plugin: 'com.android.application'
 apply plugin: 'jacoco'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "de.geeksfactory.opacclient"
         minSdkVersion 15
-        targetSdkVersion 27
+        targetSdkVersion 28
         multiDexEnabled true
         versionCode 208
         versionName "6.0.4"
@@ -85,16 +85,15 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:1.3.11"
     implementation 'io.sentry:sentry-android:1.7.16'
     implementation 'org.jsoup:jsoup:1.8.3'
-    implementation 'com.android.support:design:27.1.1'
-    implementation 'com.android.support:support-v4:27.1.1'
-    implementation 'com.android.support:percent:27.1.1'
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:palette-v7:27.1.1'
-    implementation 'com.android.support:cardview-v7:27.1.1'
-    implementation 'com.android.support:preference-v7:27.1.1'
+    implementation 'com.github.opacapp:material-components-android:d290745a71'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.percentlayout:percentlayout:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.palette:palette:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.preference:preference:1.0.0'
     implementation 'org.apmem.tools:layouts:1.10@aar'
     implementation 'org.apache.httpcomponents:httpclient-android:4.3.5.1'
-    implementation 'net.opacapp:multiline-collapsingtoolbar:27.1.1'
     implementation 'joda-time:joda-time:2.9.9'
     implementation 'org.joda:joda-convert:1.8'
     implementation 'su.j2e:rv-joiner:1.0.6'
@@ -108,7 +107,7 @@ dependencies {
     implementation 'com.github.bumptech.glide:okhttp3-integration:1.5.0@aar'
     implementation 'com.evernote:android-job:1.2.0'
     implementation 'net.sourceforge.streamsupport:streamsupport-cfuture:1.6.0'
-    implementation 'com.android.support:multidex:1.0.3'
+    implementation 'androidx.multidex:multidex:2.0.0'
     debugImplementation 'com.facebook.stetho:stetho:1.5.0'
     debugImplementation 'com.facebook.stetho:stetho-okhttp3:1.5.0'
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.4-beta2'

diff --git a/opacclient/opacapp/src/main/AndroidManifest.xml b/opacclient/opacapp/src/main/AndroidManifest.xml
@@ -28,6 +28,9 @@
         android:supportsRtl="false"
         android:theme="@style/Theme.Opacapp.NoActionBar"
         tools:replace="android:supportsRtl, android:allowBackup">
+        <uses-library
+            android:name="org.apache.http.legacy"
+            android:required="false"/>
         <activity
             android:name="de.geeksfactory.opacclient.frontend.MainActivity"
             android:label="@string/launcher_name"

diff --git a/...id/support/v4/app/CustomListFragment.java → ...oidx/fragment/app/CustomListFragment.java b/...id/support/v4/app/CustomListFragment.java → ...oidx/fragment/app/CustomListFragment.java
@@ -1,4 +1,4 @@
-package android.support.v4.app;
+package androidx.fragment.app;
 
 import android.view.View;
 

diff --git a/opacclient/opacapp/src/main/java/de/geeksfactory/opacclient/OpacClient.java b/opacclient/opacapp/src/main/java/de/geeksfactory/opacclient/OpacClient.java
@@ -30,9 +30,6 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
-import android.support.multidex.MultiDex;
-import android.support.v4.app.ActivityCompat;
 import android.util.Log;
 
 import com.evernote.android.job.JobManager;
@@ -55,6 +52,9 @@
 import java.util.Map.Entry;
 import java.util.Set;
 
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.multidex.MultiDex;
 import de.geeksfactory.opacclient.apis.OpacApi;
 import de.geeksfactory.opacclient.frontend.AccountListActivity;
 import de.geeksfactory.opacclient.frontend.LibraryListActivity;

diff --git a/...lient/opacapp/src/main/java/de/geeksfactory/opacclient/barcode/BarcodeScanIntegrator.java b/...lient/opacapp/src/main/java/de/geeksfactory/opacclient/barcode/BarcodeScanIntegrator.java
@@ -22,7 +22,6 @@
 package de.geeksfactory.opacclient.barcode;
 
 import android.app.Activity;
-import android.support.v7.app.AlertDialog;
 import android.content.ActivityNotFoundException;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -36,6 +35,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import androidx.appcompat.app.AlertDialog;
 import de.geeksfactory.opacclient.R;
 import de.geeksfactory.opacclient.utils.CompatibilityUtils;
 

diff --git a/opacclient/opacapp/src/main/java/de/geeksfactory/opacclient/frontend/AboutActivity.java b/opacclient/opacapp/src/main/java/de/geeksfactory/opacclient/frontend/AboutActivity.java
@@ -22,10 +22,10 @@
 package de.geeksfactory.opacclient.frontend;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.preference.PreferenceFragmentCompat;
-import android.support.v7.widget.Toolbar;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.preference.PreferenceFragmentCompat;
 import de.geeksfactory.opacclient.R;
 
 public class AboutActivity extends AppCompatActivity {

diff --git a/opacclient/opacapp/src/main/java/de/geeksfactory/opacclient/frontend/AboutFragment.java b/opacclient/opacapp/src/main/java/de/geeksfactory/opacclient/frontend/AboutFragment.java
@@ -1,15 +1,10 @@
 package de.geeksfactory.opacclient.frontend;
 
 import android.app.Activity;
-import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatDialog;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceFragmentCompat;
 import android.text.Html;
-import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
@@ -19,6 +14,9 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
+import androidx.appcompat.app.AppCompatDialog;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
 import de.geeksfactory.opacclient.OpacClient;
 import de.geeksfactory.opacclient.R;
 

diff --git a/...client/opacapp/src/main/java/de/geeksfactory/opacclient/frontend/AccountEditActivity.java b/...client/opacapp/src/main/java/de/geeksfactory/opacclient/frontend/AccountEditActivity.java
@@ -27,12 +27,6 @@
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.design.widget.TextInputLayout;
-import android.support.v4.app.ActivityCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
-import android.util.Log;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -46,11 +40,17 @@
 import android.widget.RadioGroup;
 import android.widget.TextView;
 
+import com.google.android.material.textfield.TextInputLayout;
+
 import org.json.JSONException;
 
 import java.io.IOException;
 import java.util.List;
 
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ActivityCompat;
 import de.geeksfactory.opacclient.OpacClient;
 import de.geeksfactory.opacclient.R;
 import de.geeksfactory.opacclient.apis.OpacApi;

diff --git a/opacclient/opacapp/src/main/java/de/geeksfactory/opacclient/frontend/AccountFragment.java b/opacclient/opacapp/src/main/java/de/geeksfactory/opacclient/frontend/AccountFragment.java
@@ -31,13 +31,6 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.ActivityOptionsCompat;
-import android.support.v4.app.Fragment;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
@@ -71,6 +64,13 @@
 import java.util.Map;
 import java.util.Set;
 
+import androidx.appcompat.app.AlertDialog;
+import androidx.core.app.ActivityCompat;
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import de.geeksfactory.opacclient.OpacClient;
 import de.geeksfactory.opacclient.R;
 import de.geeksfactory.opacclient.apis.EbookServiceApi;

diff --git a/.../opacapp/src/main/java/de/geeksfactory/opacclient/frontend/AccountItemDetailActivity.java b/.../opacapp/src/main/java/de/geeksfactory/opacclient/frontend/AccountItemDetailActivity.java
@@ -3,14 +3,8 @@
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
-import android.databinding.DataBindingUtil;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.view.animation.FastOutLinearInInterpolator;
-import android.support.v4.view.animation.LinearOutSlowInInterpolator;
-import android.support.v7.app.AppCompatActivity;
 import android.text.Html;
 import android.transition.ChangeBounds;
 import android.transition.Transition;
@@ -19,6 +13,12 @@
 import android.view.View;
 import android.widget.ScrollView;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.databinding.DataBindingUtil;
+import androidx.interpolator.view.animation.FastOutLinearInInterpolator;
+import androidx.interpolator.view.animation.LinearOutSlowInInterpolator;
 import de.geeksfactory.opacclient.OpacClient;
 import de.geeksfactory.opacclient.R;
 import de.geeksfactory.opacclient.apis.EbookServiceApi;

diff --git a/...client/opacapp/src/main/java/de/geeksfactory/opacclient/frontend/AccountListActivity.java b/...client/opacapp/src/main/java/de/geeksfactory/opacclient/frontend/AccountListActivity.java
@@ -23,12 +23,6 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.ActivityOptionsCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.util.DisplayMetrics;
 import android.view.MenuItem;
 import android.view.View;
@@ -38,8 +32,15 @@
 import android.widget.ListView;
 import android.widget.RelativeLayout;
 
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
 import java.util.List;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ActivityCompat;
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.core.view.ViewCompat;
 import de.geeksfactory.opacclient.OpacClient;
 import de.geeksfactory.opacclient.R;
 import de.geeksfactory.opacclient.objects.Account;

diff --git a/opacclient/opacapp/src/main/java/de/geeksfactory/opacclient/frontend/CopiesAdapter.java b/opacclient/opacapp/src/main/java/de/geeksfactory/opacclient/frontend/CopiesAdapter.java
@@ -1,7 +1,6 @@
 package de.geeksfactory.opacclient.frontend;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -11,6 +10,7 @@
 
 import java.util.List;
 
+import androidx.recyclerview.widget.RecyclerView;
 import de.geeksfactory.opacclient.R;
 import de.geeksfactory.opacclient.objects.Copy;
 

diff --git a/opacclient/opacapp/src/main/java/de/geeksfactory/opacclient/frontend/DetailsAdapter.java b/opacclient/opacapp/src/main/java/de/geeksfactory/opacclient/frontend/DetailsAdapter.java
@@ -1,7 +1,6 @@
 package de.geeksfactory.opacclient.frontend;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
 import android.text.util.Linkify;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -10,6 +9,7 @@
 
 import java.util.List;
 
+import androidx.recyclerview.widget.RecyclerView;
 import de.geeksfactory.opacclient.R;
 import de.geeksfactory.opacclient.objects.Detail;
 

diff --git a/...ient/opacapp/src/main/java/de/geeksfactory/opacclient/frontend/DrawerAccountsAdapter.java b/...ient/opacapp/src/main/java/de/geeksfactory/opacclient/frontend/DrawerAccountsAdapter.java
@@ -4,10 +4,6 @@
 import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
-import android.support.graphics.drawable.VectorDrawableCompat;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -19,6 +15,10 @@
 import java.util.List;
 import java.util.Map;
 
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.preference.PreferenceManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
 import de.geeksfactory.opacclient.R;
 import de.geeksfactory.opacclient.objects.Account;
 import de.geeksfactory.opacclient.storage.AccountDataSource;

diff --git a/opacclient/opacapp/src/main/java/de/geeksfactory/opacclient/frontend/InfoFragment.java b/opacclient/opacapp/src/main/java/de/geeksfactory/opacclient/frontend/InfoFragment.java
@@ -25,8 +25,6 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -41,6 +39,8 @@
 
 import org.json.JSONException;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
 import de.geeksfactory.opacclient.OpacClient;
 import de.geeksfactory.opacclient.R;
 import de.geeksfactory.opacclient.frontend.OpacActivity.AccountSelectedListener;

diff --git a/...client/opacapp/src/main/java/de/geeksfactory/opacclient/frontend/LibraryListActivity.java b/...client/opacapp/src/main/java/de/geeksfactory/opacclient/frontend/LibraryListActivity.java
@@ -13,14 +13,6 @@
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.app.ListFragment;
-import android.support.v4.view.MenuItemCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.SearchView;
-import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -55,6 +47,14 @@
 import java.util.Locale;
 import java.util.Set;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.SearchView;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ActivityCompat;
+import androidx.core.view.MenuItemCompat;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.fragment.app.ListFragment;
 import de.geeksfactory.opacclient.BuildConfig;
 import de.geeksfactory.opacclient.OpacClient;
 import de.geeksfactory.opacclient.R;

diff --git a/opacclient/opacapp/src/main/java/de/geeksfactory/opacclient/frontend/MainActivity.java b/opacclient/opacapp/src/main/java/de/geeksfactory/opacclient/frontend/MainActivity.java
@@ -13,11 +13,6 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Toast;
@@ -34,6 +29,11 @@
 import java.util.List;
 import java.util.Locale;
 
+import androidx.appcompat.app.AlertDialog;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
 import de.geeksfactory.opacclient.R;
 import de.geeksfactory.opacclient.barcode.BarcodeScanIntegrator;
 import de.geeksfactory.opacclient.objects.Account;