androidx

app/build.gradle

@@ -225,6 +225,7 @@ dependencies {
     implementation Dependencies.Google.prefCompatv14
     implementation Dependencies.Google.recyclerView
     implementation Dependencies.Google.supportv4
+    implementation Dependencies.Google.legacySupport
     implementation Dependencies.Google.firebaseCore
     implementation Dependencies.Google.firebaseRemoteConfig
     implementation Dependencies.Google.constraintLayout

app/proguard-rules.pro

@@ -113,4 +113,7 @@
 
 # Custom Cast Media Button, only referenced via menu
 -keep class com.simplecity.amp_library.ui.views.CustomMediaRouteActionProvider.CustomMediaRouteButton { *; }
--keep class com.simplecity.amp_library.ui.views.CustomMediaRouteActionProvider { *; }
+-keep class com.simplecity.amp_library.ui.views.CustomMediaRouteActionProvider { *; }
+
+# Adopted from https://github.com/afollestad/aesthetic/issues/41
+-keep class com.google.android.material.textfield.** { *; }

app/src/main/AndroidManifest.xml

@@ -307,7 +307,7 @@
             android:exported="false"/>
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
             android:exported="false"
             android:grantUriPermissions="true">

app/src/main/java/android/support/design/widget/CustomCollapsingTextHelper.java → app/src/main/java/com/google/android/material/appbar/CustomCollapsingTextHelper.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package android.support.design.widget;
+package com.google.android.material.appbar;
 
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
@@ -27,12 +27,12 @@
 import android.graphics.RectF;
 import android.graphics.Typeface;
 import android.os.Build;
-import android.support.annotation.ColorInt;
-import android.support.design.animation.AnimationUtils;
-import android.support.v4.math.MathUtils;
-import android.support.v4.text.TextDirectionHeuristicsCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.widget.TintTypedArray;
+import androidx.annotation.ColorInt;
+import com.google.android.material.animation.AnimationUtils;
+import androidx.core.math.MathUtils;
+import androidx.core.text.TextDirectionHeuristicsCompat;
+import androidx.core.view.ViewCompat;
+import androidx.appcompat.widget.TintTypedArray;
 import android.text.TextPaint;
 import android.text.TextUtils;
 import android.view.Gravity;
@@ -213,24 +213,24 @@ public void setCollapsedTextGravity(int gravity) {
 
     public void setCollapsedTextAppearance(int resId) {
         TintTypedArray a = TintTypedArray.obtainStyledAttributes(mView.getContext(), resId,
-                android.support.v7.appcompat.R.styleable.TextAppearance);
-        if (a.hasValue(android.support.v7.appcompat.R.styleable.TextAppearance_android_textColor)) {
+                androidx.appcompat.R.styleable.TextAppearance);
+        if (a.hasValue(androidx.appcompat.R.styleable.TextAppearance_android_textColor)) {
             mCollapsedTitleColor = a.getColorStateList(
-                    android.support.v7.appcompat.R.styleable.TextAppearance_android_textColor);
+                    androidx.appcompat.R.styleable.TextAppearance_android_textColor);
         }
-        if (a.hasValue(android.support.v7.appcompat.R.styleable.TextAppearance_android_textSize)) {
+        if (a.hasValue(androidx.appcompat.R.styleable.TextAppearance_android_textSize)) {
             mCollapsedTextSize = a.getDimensionPixelSize(
-                    android.support.v7.appcompat.R.styleable.TextAppearance_android_textSize,
+                    androidx.appcompat.R.styleable.TextAppearance_android_textSize,
                     (int) mCollapsedTextSize);
         }
         mCollapsedShadowColor = a.getInt(
-                android.support.v7.appcompat.R.styleable.TextAppearance_android_shadowColor, 0);
+                androidx.appcompat.R.styleable.TextAppearance_android_shadowColor, 0);
         mCollapsedShadowDx = a.getFloat(
-                android.support.v7.appcompat.R.styleable.TextAppearance_android_shadowDx, 0);
+                androidx.appcompat.R.styleable.TextAppearance_android_shadowDx, 0);
         mCollapsedShadowDy = a.getFloat(
-                android.support.v7.appcompat.R.styleable.TextAppearance_android_shadowDy, 0);
+                androidx.appcompat.R.styleable.TextAppearance_android_shadowDy, 0);
         mCollapsedShadowRadius = a.getFloat(
-                android.support.v7.appcompat.R.styleable.TextAppearance_android_shadowRadius, 0);
+                androidx.appcompat.R.styleable.TextAppearance_android_shadowRadius, 0);
         a.recycle();
 
         if (Build.VERSION.SDK_INT >= 16) {
@@ -242,24 +242,24 @@ public void setCollapsedTextAppearance(int resId) {
 
     public void setExpandedTextAppearance(int resId) {
         TintTypedArray a = TintTypedArray.obtainStyledAttributes(mView.getContext(), resId,
-                android.support.v7.appcompat.R.styleable.TextAppearance);
-        if (a.hasValue(android.support.v7.appcompat.R.styleable.TextAppearance_android_textColor)) {
+                androidx.appcompat.R.styleable.TextAppearance);
+        if (a.hasValue(androidx.appcompat.R.styleable.TextAppearance_android_textColor)) {
             mExpandedTitleColor = a.getColorStateList(
-                    android.support.v7.appcompat.R.styleable.TextAppearance_android_textColor);
+                    androidx.appcompat.R.styleable.TextAppearance_android_textColor);
         }
-        if (a.hasValue(android.support.v7.appcompat.R.styleable.TextAppearance_android_textSize)) {
+        if (a.hasValue(androidx.appcompat.R.styleable.TextAppearance_android_textSize)) {
             mExpandedTextSize = a.getDimensionPixelSize(
-                    android.support.v7.appcompat.R.styleable.TextAppearance_android_textSize,
+                    androidx.appcompat.R.styleable.TextAppearance_android_textSize,
                     (int) mExpandedTextSize);
         }
         mExpandedShadowColor = a.getInt(
-                android.support.v7.appcompat.R.styleable.TextAppearance_android_shadowColor, 0);
+                androidx.appcompat.R.styleable.TextAppearance_android_shadowColor, 0);
         mExpandedShadowDx = a.getFloat(
-                android.support.v7.appcompat.R.styleable.TextAppearance_android_shadowDx, 0);
+                androidx.appcompat.R.styleable.TextAppearance_android_shadowDx, 0);
         mExpandedShadowDy = a.getFloat(
-                android.support.v7.appcompat.R.styleable.TextAppearance_android_shadowDy, 0);
+                androidx.appcompat.R.styleable.TextAppearance_android_shadowDy, 0);
         mExpandedShadowRadius = a.getFloat(
-                android.support.v7.appcompat.R.styleable.TextAppearance_android_shadowRadius, 0);
+                androidx.appcompat.R.styleable.TextAppearance_android_shadowRadius, 0);
         a.recycle();
 
         if (Build.VERSION.SDK_INT >= 16) {
@@ -283,14 +283,14 @@ public void setCollapsedSubAppearance(int resId) {
 
     public void setExpandedSubAppearance(int resId) {
         TintTypedArray a = TintTypedArray.obtainStyledAttributes(mView.getContext(), resId,
-                android.support.v7.appcompat.R.styleable.TextAppearance);
-        if (a.hasValue(android.support.v7.appcompat.R.styleable.TextAppearance_android_textColor)) {
+                androidx.appcompat.R.styleable.TextAppearance);
+        if (a.hasValue(androidx.appcompat.R.styleable.TextAppearance_android_textColor)) {
             mExpandedSubColor = a.getColorStateList(
-                    android.support.v7.appcompat.R.styleable.TextAppearance_android_textColor);
+                    androidx.appcompat.R.styleable.TextAppearance_android_textColor);
         }
-        if (a.hasValue(android.support.v7.appcompat.R.styleable.TextAppearance_android_textSize)) {
+        if (a.hasValue(androidx.appcompat.R.styleable.TextAppearance_android_textSize)) {
             mExpandedSubSize = a.getDimensionPixelSize(
-                    android.support.v7.appcompat.R.styleable.TextAppearance_android_textSize,
+                    androidx.appcompat.R.styleable.TextAppearance_android_textSize,
                     (int) mExpandedSubSize);
         }
     }

app/src/main/java/android/support/design/widget/CustomCollapsingToolbarLayout.java → app/src/main/java/com/google/android/material/appbar/CustomCollapsingToolbarLayout.java

@@ -1,4 +1,4 @@
-package android.support.design.widget;
+package com.google.android.material.appbar;
 
 import android.animation.ValueAnimator;
 import android.content.Context;
@@ -9,23 +9,23 @@
 import android.graphics.Typeface;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.ColorInt;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.IntDef;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
-import android.support.annotation.StyleRes;
-import android.support.design.animation.AnimationUtils;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v4.math.MathUtils;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.WindowInsetsCompat;
-import android.support.v4.widget.ViewGroupUtils;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.IntDef;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.StyleRes;
+import com.google.android.material.animation.AnimationUtils;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.core.math.MathUtils;
+import androidx.core.view.GravityCompat;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+import androidx.coordinatorlayout.widget.ViewGroupUtils;
+import androidx.appcompat.widget.Toolbar;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.Gravity;
@@ -35,12 +35,14 @@
 import android.view.animation.Interpolator;
 import android.widget.FrameLayout;
 
+import com.google.android.material.appbar.AppBarLayout;
+
 import com.simplecity.amp_library.R;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import static android.support.annotation.RestrictTo.Scope.LIBRARY_GROUP;
+import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
 
 /**
  * @author Hendra Anggrian (hendraanggrian@gmail.com)
@@ -158,7 +160,7 @@ public CustomCollapsingToolbarLayout(Context context, AttributeSet attrs, int de
         mCollapsingTextHelper.setExpandedTextAppearance(
                 R.style.TextAppearance_Design_CollapsingToolbar_Expanded);
         mCollapsingTextHelper.setCollapsedTextAppearance(
-                android.support.v7.appcompat.R.style.TextAppearance_AppCompat_Widget_ActionBar_Title);
+                androidx.appcompat.R.style.TextAppearance_AppCompat_Widget_ActionBar_Title);
 
         // Now overlay any custom text appearances
         if (a1.hasValue(R.styleable.CollapsingToolbarLayout_expandedTitleTextAppearance)) {

app/src/main/java/com/simplecity/amp_library/ShuttleApplication.java

@@ -9,9 +9,9 @@
 import android.os.Environment;
 import android.os.StrictMode;
 import android.provider.MediaStore;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.preference.PreferenceManager;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.util.Log;
 import com.annimon.stream.Stream;

app/src/main/java/com/simplecity/amp_library/billing/BillingManager.java

@@ -2,7 +2,7 @@
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 import com.android.billingclient.api.BillingClient;
 import com.android.billingclient.api.BillingClientStateListener;

app/src/main/java/com/simplecity/amp_library/di/app/activity/ActivityModule.kt

@@ -1,8 +1,8 @@
 package com.simplecity.amp_library.di.app.activity
 
 import android.app.Activity
-import android.support.v4.app.FragmentManager
-import android.support.v7.app.AppCompatActivity
+import androidx.fragment.app.FragmentManager
+import androidx.appcompat.app.AppCompatActivity
 import dagger.Module
 import dagger.Provides
 

app/src/main/java/com/simplecity/amp_library/di/app/activity/fragment/DialogFragmentModule.java

@@ -1,6 +1,6 @@
 package com.simplecity.amp_library.di.app.activity.fragment;
 
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import dagger.Binds;
 import dagger.Module;
 import javax.inject.Named;

app/src/main/java/com/simplecity/amp_library/di/app/activity/fragment/FragmentModule.kt

@@ -1,6 +1,6 @@
 package com.simplecity.amp_library.di.app.activity.fragment
 
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import com.bumptech.glide.Glide
 import com.bumptech.glide.RequestManager
 import dagger.Module

app/src/main/java/com/simplecity/amp_library/glide/fetcher/BaseFetcher.java

@@ -1,6 +1,6 @@
 package com.simplecity.amp_library.glide.fetcher;
 
-import android.support.annotation.CallSuper;
+import androidx.annotation.CallSuper;
 import com.bumptech.glide.Priority;
 import com.bumptech.glide.load.data.DataFetcher;
 import com.simplecity.amp_library.model.ArtworkProvider;

app/src/main/java/com/simplecity/amp_library/glide/palette/ColorSet.kt

@@ -3,7 +3,7 @@ package com.simplecity.amp_library.glide.palette
 import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.Color
-import android.support.annotation.WorkerThread
+import androidx.annotation.WorkerThread
 import com.simplecity.amp_library.utils.color.BitmapPaletteProcessor
 import com.simplecity.amp_library.utils.color.ColorHelper
 

app/src/main/java/com/simplecity/amp_library/glide/palette/ColorSetResource.java

@@ -1,6 +1,6 @@
 package com.simplecity.amp_library.glide.palette;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.bumptech.glide.load.engine.Resource;
 
 public class ColorSetResource implements Resource<ColorSet> {

app/src/main/java/com/simplecity/amp_library/glide/preloader/RecyclerToListViewScrollListener.java

@@ -1,12 +1,12 @@
 package com.simplecity.amp_library.glide.preloader;
 
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.widget.AbsListView;
 import android.widget.ListView;
 
 /**
- * Converts {@link android.support.v7.widget.RecyclerView.OnScrollListener} events to
+ * Converts {@link androidx.recyclerview.widget.RecyclerView.OnScrollListener} events to
  * {@link AbsListView} scroll events.
  * <p>
  * <p>Requires that the the recycler view be using a {@link LinearLayoutManager} subclass.

app/src/main/java/com/simplecity/amp_library/glide/preloader/RecyclerViewPreloader.java

@@ -1,6 +1,6 @@
 package com.simplecity.amp_library.glide.preloader;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import com.bumptech.glide.ListPreloader;
 import com.bumptech.glide.ListPreloader.PreloadModelProvider;
 import com.bumptech.glide.ListPreloader.PreloadSizeProvider;
@@ -14,10 +14,10 @@
  * <p> Must be added as a listener to the {@link RecyclerView} using
  * {@link RecyclerView#addOnScrollListener(RecyclerView.OnScrollListener)}, or have its
  * corresponding methods called from another
- * {@link android.support.v7.widget.RecyclerView.OnScrollListener} to function. </p>
+ * {@link androidx.recyclerview.widget.RecyclerView.OnScrollListener} to function. </p>
  *
- * <p> This class only works with {@link android.support.v7.widget.LinearLayoutManager} and
- * subclasses of {@link android.support.v7.widget.LinearLayoutManager}. </p>
+ * <p> This class only works with {@link androidx.recyclerview.widget.LinearLayoutManager} and
+ * subclasses of {@link androidx.recyclerview.widget.LinearLayoutManager}. </p>
  *
  * @param <T> The type of the model being displayed in the {@link RecyclerView}.
  */

app/src/main/java/com/simplecity/amp_library/glide/utils/GlideUtils.java

@@ -4,7 +4,7 @@
 import android.graphics.Canvas;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 public class GlideUtils {
 

app/src/main/java/com/simplecity/amp_library/glide/utils/WrappingViewAdapter.java

@@ -1,7 +1,7 @@
 package com.simplecity.amp_library.glide.utils;
 
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.View;
 import com.bumptech.glide.request.animation.GlideAnimation.ViewAdapter;
 

app/src/main/java/com/simplecity/amp_library/interfaces/FileType.java

@@ -1,6 +1,6 @@
 package com.simplecity.amp_library.interfaces;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 
 @IntDef({ FileType.PARENT, FileType.FOLDER, FileType.FILE })
 public @interface FileType {

app/src/main/java/com/simplecity/amp_library/model/Album.java

@@ -1,9 +1,9 @@
 package com.simplecity.amp_library.model;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
 import com.simplecity.amp_library.utils.ArtworkUtils;
 import com.simplecity.amp_library.utils.ComparisonUtils;
 import com.simplecity.amp_library.utils.StringUtils;

app/src/main/java/com/simplecity/amp_library/model/AlbumArtist.java

@@ -1,8 +1,8 @@
 package com.simplecity.amp_library.model;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import com.annimon.stream.Stream;
 import com.simplecity.amp_library.data.Repository;
 import com.simplecity.amp_library.utils.ComparisonUtils;

app/src/main/java/com/simplecity/amp_library/model/ArtworkProvider.java

@@ -1,8 +1,8 @@
 package com.simplecity.amp_library.model;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import java.io.File;
 import java.io.InputStream;
 import java.util.List;

app/src/main/java/com/simplecity/amp_library/model/CategoryItem.java

@@ -2,8 +2,8 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.support.annotation.StringRes;
-import android.support.v4.app.Fragment;
+import androidx.annotation.StringRes;
+import androidx.fragment.app.Fragment;
 import com.simplecity.amp_library.R;
 import com.simplecity.amp_library.ui.screens.album.list.AlbumListFragment;
 import com.simplecity.amp_library.ui.screens.artist.list.AlbumArtistListFragment;