migrated project to androidx

amit-bhandari · Oct 17, 2020 · 60b25a5 · 60b25a5
1 parent 7dbef9a
commit 60b25a5
Show file tree

Hide file tree

Showing 122 changed files with 481 additions and 575 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -61,7 +61,7 @@ android {
 
         defaultConfig {
             applicationId 'com.bhandari.music'
-            minSdkVersion 14
+            minSdkVersion 16
             targetSdkVersion 28
             versionCode versionProps['VERSION_NUMBER'].toInteger()
             versionName "${mVersionName} Build: ${versionProps['VERSION_BUILD']}"
@@ -135,17 +135,17 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     //noinspection GradleCompatible
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
     //noinspection GradleCompatible
-    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     //noinspection GradleCompatible
-    implementation 'com.android.support:design:28.0.0'
+    implementation 'com.google.android.material:material:1.2.1'
     //noinspection GradleCompatible
-    implementation 'com.android.support:cardview-v7:28.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
     testImplementation 'junit:junit:4.13'
 
     //small animations for lyric loading
@@ -184,13 +184,13 @@ dependencies {
 
     //firebase
     //implementation 'com.google.firebase:firebase-ads:17.1.3'
-    implementation 'com.google.firebase:firebase-core:16.0.7'
-    implementation 'com.google.android.gms:play-services-auth:16.0.1'
-    implementation 'com.google.firebase:firebase-messaging:17.3.4'
-    implementation 'com.google.firebase:firebase-database:16.0.6'
-    implementation 'com.google.firebase:firebase-invites:16.1.0'
-    implementation 'com.google.firebase:firebase-storage:16.0.5'
-    implementation 'com.google.firebase:firebase-config:16.3.0'
+    implementation 'com.google.firebase:firebase-core:17.5.1'
+    implementation 'com.google.android.gms:play-services-auth:18.1.0'
+    implementation 'com.google.firebase:firebase-messaging:20.3.0'
+    implementation 'com.google.firebase:firebase-database:19.5.0'
+    implementation 'com.google.firebase:firebase-invites:17.0.0'
+    implementation 'com.google.firebase:firebase-storage:19.2.0'
+    implementation 'com.google.firebase:firebase-config:19.2.0'
 
     //gson
     implementation 'com.google.code.gson:gson:2.8.6'
@@ -199,12 +199,12 @@ dependencies {
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.4'
 
     //crop images
-    implementation 'com.theartofdev.edmodo:android-image-cropper:2.6.0'
+    implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
 
     //view binding
     //noinspection AnnotationProcessorOnCompilePath
-    implementation 'com.jakewharton:butterknife:8.8.1'
-    kapt 'com.jakewharton:butterknife-compiler:8.8.1'
+    implementation 'com.jakewharton:butterknife:10.0.0'
+    kapt 'com.jakewharton:butterknife-compiler:10.0.0'
 
     //font
     //implementation 'uk.co.chrisjenx:calligraphy:2.3.0'

diff --git a/app/src/androidTest/java/com/music/player/bhandari/m/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/music/player/bhandari/m/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package com.music.player.bhandari.m;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/app/src/main/java/com/music/player/bhandari/m/UIElementHelper/BottomOffsetDecoration.java b/app/src/main/java/com/music/player/bhandari/m/UIElementHelper/BottomOffsetDecoration.java
@@ -1,7 +1,7 @@
 package com.music.player.bhandari.m.UIElementHelper;
 
 import android.graphics.Rect;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 /**

diff --git a/app/src/main/java/com/music/player/bhandari/m/UIElementHelper/FastScroller.java b/app/src/main/java/com/music/player/bhandari/m/UIElementHelper/FastScroller.java
@@ -5,9 +5,9 @@
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -18,7 +18,7 @@
 
 import com.music.player.bhandari.m.R;
 
-import static android.support.v7.widget.RecyclerView.OnScrollListener;
+import static androidx.recyclerview.widget.RecyclerView.OnScrollListener;
 
 public class FastScroller extends LinearLayout {
     private static final int BUBBLE_ANIMATION_DURATION = 100;

diff --git a/app/src/main/java/com/music/player/bhandari/m/UIElementHelper/MyDialogBuilder.java b/app/src/main/java/com/music/player/bhandari/m/UIElementHelper/MyDialogBuilder.java
@@ -1,7 +1,7 @@
 package com.music.player.bhandari.m.UIElementHelper;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.music.player.bhandari.m.MyApp;

diff --git a/...om/music/player/bhandari/m/UIElementHelper/recyclerviewHelper/ItemTouchHelperAdapter.java b/...om/music/player/bhandari/m/UIElementHelper/recyclerviewHelper/ItemTouchHelperAdapter.java
@@ -16,8 +16,8 @@
 
 package com.music.player.bhandari.m.UIElementHelper.recyclerviewHelper;
 
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.helper.ItemTouchHelper;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.ItemTouchHelper;
 
 /**
  * Interface to listen for a move or dismissal event from a {@link ItemTouchHelper.Callback}.

diff --git a/...music/player/bhandari/m/UIElementHelper/recyclerviewHelper/ItemTouchHelperViewHolder.java b/...music/player/bhandari/m/UIElementHelper/recyclerviewHelper/ItemTouchHelperViewHolder.java
@@ -16,7 +16,7 @@
 
 package com.music.player.bhandari.m.UIElementHelper.recyclerviewHelper;
 
-import android.support.v7.widget.helper.ItemTouchHelper;
+import androidx.recyclerview.widget.ItemTouchHelper;
 
 /**
  * Interface to notify an item ViewHolder of relevant callbacks from {@link

diff --git a/...a/com/music/player/bhandari/m/UIElementHelper/recyclerviewHelper/OnStartDragListener.java b/...a/com/music/player/bhandari/m/UIElementHelper/recyclerviewHelper/OnStartDragListener.java
@@ -16,7 +16,7 @@
 
 package com.music.player.bhandari.m.UIElementHelper.recyclerviewHelper;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 
 /**
  * Listener for manual initiation of a drag.

diff --git a/...c/player/bhandari/m/UIElementHelper/recyclerviewHelper/SimpleItemTouchHelperCallback.java b/...c/player/bhandari/m/UIElementHelper/recyclerviewHelper/SimpleItemTouchHelperCallback.java
@@ -17,9 +17,9 @@
 package com.music.player.bhandari.m.UIElementHelper.recyclerviewHelper;
 
 import android.graphics.Canvas;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.helper.ItemTouchHelper;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.ItemTouchHelper;
 import android.util.Log;
 
 /**

diff --git a/app/src/main/java/com/music/player/bhandari/m/activity/ActivityAboutUs.java b/app/src/main/java/com/music/player/bhandari/m/activity/ActivityAboutUs.java
@@ -5,14 +5,12 @@
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.graphics.Typeface;
-import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.TextPaint;
@@ -22,8 +20,6 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -33,7 +29,6 @@
 import com.music.player.bhandari.m.R;
 import com.music.player.bhandari.m.UIElementHelper.ColorHelper;
 import com.music.player.bhandari.m.UIElementHelper.MyDialogBuilder;
-import com.music.player.bhandari.m.UIElementHelper.TypeFaceHelper;
 import com.music.player.bhandari.m.model.Constants;
 import com.music.player.bhandari.m.MyApp;
 import com.music.player.bhandari.m.utils.UtilityFun;

diff --git a/app/src/main/java/com/music/player/bhandari/m/activity/ActivityDonateFunds.java b/app/src/main/java/com/music/player/bhandari/m/activity/ActivityDonateFunds.java
@@ -9,8 +9,8 @@
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.RemoteException;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.Toast;
 
 import com.android.vending.billing.IInAppBillingService;

diff --git a/app/src/main/java/com/music/player/bhandari/m/activity/ActivityEqualizer.java b/app/src/main/java/com/music/player/bhandari/m/activity/ActivityEqualizer.java
@@ -6,11 +6,11 @@
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.text.InputType;
 import android.util.Log;
 import android.view.MenuItem;

diff --git a/app/src/main/java/com/music/player/bhandari/m/activity/ActivityExploreLyrics.java b/app/src/main/java/com/music/player/bhandari/m/activity/ActivityExploreLyrics.java
@@ -7,14 +7,14 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.MotionEvent;

diff --git a/app/src/main/java/com/music/player/bhandari/m/activity/ActivityInstantLyric.java b/app/src/main/java/com/music/player/bhandari/m/activity/ActivityInstantLyric.java
@@ -17,16 +17,16 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v4.view.GestureDetectorCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.core.view.GestureDetectorCompat;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.text.Html;
 import android.util.Log;
 import android.view.ActionMode;

diff --git a/app/src/main/java/com/music/player/bhandari/m/activity/ActivityInvite.java b/app/src/main/java/com/music/player/bhandari/m/activity/ActivityInvite.java
@@ -2,25 +2,21 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.AppCompatButton;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.Nullable;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.AppCompatButton;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;

diff --git a/app/src/main/java/com/music/player/bhandari/m/activity/ActivityLicenses.java b/app/src/main/java/com/music/player/bhandari/m/activity/ActivityLicenses.java
@@ -2,8 +2,8 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.view.KeyEvent;
 import android.view.MenuItem;
 

diff --git a/app/src/main/java/com/music/player/bhandari/m/activity/ActivityLyricView.java b/app/src/main/java/com/music/player/bhandari/m/activity/ActivityLyricView.java
@@ -14,14 +14,14 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.support.v4.view.GestureDetectorCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.core.view.GestureDetectorCompat;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.text.Html;
 import android.view.ActionMode;
 import android.view.GestureDetector;
@@ -61,7 +61,6 @@
 import com.music.player.bhandari.m.qlyrics.LyricsAndArtistInfo.offlineStorage.OfflineStorageLyrics;
 import com.music.player.bhandari.m.qlyrics.LyricsAndArtistInfo.tasks.DownloadArtInfoThread;
 import com.music.player.bhandari.m.qlyrics.LyricsAndArtistInfo.tasks.DownloadLyricThread;
-import com.music.player.bhandari.m.utils.AppLaunchCountManager;
 import com.music.player.bhandari.m.utils.UtilityFun;
 import com.nshmura.snappysmoothscroller.SnapType;
 import com.nshmura.snappysmoothscroller.SnappyLayoutManager;
@@ -79,7 +78,6 @@
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import butterknife.OnClick;
 import jp.wasabeef.blurry.Blurry;
 import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper;