Migrate to AndroidX

Haptic-Apps · Jul 15, 2020 · 42c13ce · 42c13ce
1 parent 4fe83b2
commit 42c13ce
Show file tree

Hide file tree

Showing 253 changed files with 938 additions and 961 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -68,7 +68,8 @@ android {
         abortOnError false
         ignoreWarnings true
         // Translations are crowd-sourced
-        disable 'MissingTranslation', 'ExtraTranslation'
+        disable 'MissingTranslation', 'ExtraTranslation',
+                'StaticFieldLeak', 'ClickableViewAccessibility'
     }
 
     testOptions {
@@ -79,7 +80,6 @@ android {
 }
 
 ext {
-    supportLibVersion = '28.0.0'
     robolectricVersion = '3.8'
     powerMockitoVersion = '1.7.4'
     exoPlayerVersion = '2.11.7'
@@ -95,15 +95,13 @@ dependencies {
     implementation 'com.github.ccrama:JReadability:bb291880a5'
     implementation 'com.github.Alexendoo:Android-RobotoTextView:f6d0eb5ac7'
 
-    implementation "com.android.support:design:${supportLibVersion}"
-    implementation "com.android.support:customtabs:${supportLibVersion}"
-    implementation "com.android.support:exifinterface:${supportLibVersion}"
-    implementation "com.android.support:appcompat-v7:${supportLibVersion}"
-    implementation "com.android.support:cardview-v7:${supportLibVersion}"
-    implementation "com.android.support:recyclerview-v7:${supportLibVersion}"
-    implementation "com.android.support:support-v13:${supportLibVersion}"
-    implementation "com.android.support:interpolator:${supportLibVersion}"
-    implementation 'com.android.support:multidex:1.0.3'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.browser:browser:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.interpolator:interpolator:1.0.0'
+    implementation 'androidx.multidex:multidex:2.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
 
     implementation "com.google.android.exoplayer:exoplayer-core:${exoPlayerVersion}"
     implementation "com.google.android.exoplayer:extension-okhttp:${exoPlayerVersion}"
@@ -150,5 +148,4 @@ dependencies {
     testImplementation "org.robolectric:shadows-multidex:${robolectricVersion}"
     testImplementation "org.powermock:powermock-api-mockito2:${powerMockitoVersion}"
     testImplementation "org.powermock:powermock-module-junit4:${powerMockitoVersion}"
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
 }
diff --git a/app/src/androidTest/java/me/ccrama/redditslide/ApplicationTest.java b/app/src/androidTest/java/me/ccrama/redditslide/ApplicationTest.java
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -22,7 +22,7 @@
             android:usesCleartextTraffic="true"
             android:theme="@style/yellow_dark">
         <provider
-                android:name="android.support.v4.content.FileProvider"
+                android:name="androidx.core.content.FileProvider"
                 android:authorities="${applicationId}.provider"
                 android:exported="false"
                 android:grantUriPermissions="true">

diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Album.java b/app/src/main/java/me/ccrama/redditslide/Activities/Album.java
@@ -8,11 +8,11 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v7.widget.RecyclerView;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;

diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/AlbumPager.java b/app/src/main/java/me/ccrama/redditslide/Activities/AlbumPager.java
@@ -13,11 +13,11 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v7.widget.Toolbar;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.*;
 import android.widget.*;

diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/BaseActivity.java b/app/src/main/java/me/ccrama/redditslide/Activities/BaseActivity.java
@@ -11,10 +11,10 @@
 import android.nfc.NfcEvent;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.IdRes;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.IdRes;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;

diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/CommentSearch.java b/app/src/main/java/me/ccrama/redditslide/Activities/CommentSearch.java
@@ -1,7 +1,7 @@
 package me.ccrama.redditslide.Activities;
 
 import android.os.Bundle;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.widget.EditText;

diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/CommentsScreen.java b/app/src/main/java/me/ccrama/redditslide/Activities/CommentsScreen.java
@@ -5,11 +5,11 @@
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v7.widget.RecyclerView;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.KeyEvent;
 import android.view.ViewGroup;
 import android.view.Window;

diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/CommentsScreenSingle.java b/app/src/main/java/me/ccrama/redditslide/Activities/CommentsScreenSingle.java
@@ -6,10 +6,10 @@
 import android.graphics.drawable.ColorDrawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
-import android.support.v4.view.ViewPager;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.ViewPager;
 import android.util.TypedValue;
 import android.view.KeyEvent;
 import android.view.ViewGroup;

diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/CreateMulti.java b/app/src/main/java/me/ccrama/redditslide/Activities/CreateMulti.java
@@ -21,8 +21,8 @@
 import android.graphics.PorterDuff;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;

diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Crosspost.java b/app/src/main/java/me/ccrama/redditslide/Activities/Crosspost.java
@@ -4,8 +4,8 @@
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v7.widget.SwitchCompat;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.appcompat.widget.SwitchCompat;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.View;

diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Discover.java b/app/src/main/java/me/ccrama/redditslide/Activities/Discover.java
@@ -2,13 +2,13 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v4.widget.DrawerLayout;
+import androidx.annotation.NonNull;
+import com.google.android.material.tabs.TabLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import androidx.drawerlayout.widget.DrawerLayout;
 import android.text.InputType;
 import android.view.Menu;
 import android.view.MenuInflater;

diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/DonateView.java b/app/src/main/java/me/ccrama/redditslide/Activities/DonateView.java
@@ -4,8 +4,8 @@
 import android.content.DialogInterface;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.Toolbar;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.View;
 import android.view.Window;

diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Draw.java b/app/src/main/java/me/ccrama/redditslide/Activities/Draw.java
@@ -7,9 +7,9 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.MediaStore;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;

diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/EditCardsLayout.java b/app/src/main/java/me/ccrama/redditslide/Activities/EditCardsLayout.java
@@ -2,9 +2,9 @@
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v7.widget.AppCompatCheckBox;
-import android.support.v7.widget.PopupMenu;
-import android.support.v7.widget.SwitchCompat;
+import androidx.appcompat.widget.AppCompatCheckBox;
+import androidx.appcompat.widget.PopupMenu;
+import androidx.appcompat.widget.SwitchCompat;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.CompoundButton;

diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Gallery.java b/app/src/main/java/me/ccrama/redditslide/Activities/Gallery.java
@@ -3,11 +3,11 @@
 import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 import net.dean.jraw.models.Submission;

diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Inbox.java b/app/src/main/java/me/ccrama/redditslide/Activities/Inbox.java
@@ -4,11 +4,11 @@
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
-import android.support.v4.view.ViewPager;
+import com.google.android.material.tabs.TabLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.ViewPager;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;

diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/LiveThread.java b/app/src/main/java/me/ccrama/redditslide/Activities/LiveThread.java
@@ -7,9 +7,9 @@
 import android.graphics.drawable.ColorDrawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.Html;
 import android.view.Gravity;
 import android.view.LayoutInflater;

diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Login.java b/app/src/main/java/me/ccrama/redditslide/Activities/Login.java
@@ -8,7 +8,7 @@
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 import android.view.View;
 import android.webkit.CookieManager;