diff --git a/app/build.gradle b/app/build.gradle index d8b20546..08611970 100644 --- 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 index db187ed7..066a61b4 100644 --- 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 index 516bbb34..b276ddbf 100644 --- 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 index c710863e..8a525991 100644 --- 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 index c0c3c3ed..cbbf5c64 100644 --- 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/app/src/main/java/com/music/player/bhandari/m/UIElementHelper/recyclerviewHelper/ItemTouchHelperAdapter.java b/app/src/main/java/com/music/player/bhandari/m/UIElementHelper/recyclerviewHelper/ItemTouchHelperAdapter.java index 75725bc7..e815f372 100644 --- a/app/src/main/java/com/music/player/bhandari/m/UIElementHelper/recyclerviewHelper/ItemTouchHelperAdapter.java +++ b/app/src/main/java/com/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/app/src/main/java/com/music/player/bhandari/m/UIElementHelper/recyclerviewHelper/ItemTouchHelperViewHolder.java b/app/src/main/java/com/music/player/bhandari/m/UIElementHelper/recyclerviewHelper/ItemTouchHelperViewHolder.java index 9c5b830d..a162c074 100644 --- a/app/src/main/java/com/music/player/bhandari/m/UIElementHelper/recyclerviewHelper/ItemTouchHelperViewHolder.java +++ b/app/src/main/java/com/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/app/src/main/java/com/music/player/bhandari/m/UIElementHelper/recyclerviewHelper/OnStartDragListener.java b/app/src/main/java/com/music/player/bhandari/m/UIElementHelper/recyclerviewHelper/OnStartDragListener.java index ea33f514..1dd570f7 100644 --- a/app/src/main/java/com/music/player/bhandari/m/UIElementHelper/recyclerviewHelper/OnStartDragListener.java +++ b/app/src/main/java/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/app/src/main/java/com/music/player/bhandari/m/UIElementHelper/recyclerviewHelper/SimpleItemTouchHelperCallback.java b/app/src/main/java/com/music/player/bhandari/m/UIElementHelper/recyclerviewHelper/SimpleItemTouchHelperCallback.java index 24e86f74..cce25f58 100644 --- a/app/src/main/java/com/music/player/bhandari/m/UIElementHelper/recyclerviewHelper/SimpleItemTouchHelperCallback.java +++ b/app/src/main/java/com/music/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 index 4109e557..4ca437fc 100644 --- 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 index b662a3d1..9571951f 100644 --- 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 index 08343098..4c2acb6e 100644 --- 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 index d3077965..1a1b76a1 100644 --- 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 index 6fb4b8dd..45ec5ac2 100644 --- 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 index 8b4d61f5..c984527f 100644 --- 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 index 7218602c..e4b32aaa 100644 --- 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 index 4d86c3b1..05cccc37 100644 --- 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; diff --git a/app/src/main/java/com/music/player/bhandari/m/activity/ActivityMain.java b/app/src/main/java/com/music/player/bhandari/m/activity/ActivityMain.java index bfe64492..ebfed8f0 100644 --- a/app/src/main/java/com/music/player/bhandari/m/activity/ActivityMain.java +++ b/app/src/main/java/com/music/player/bhandari/m/activity/ActivityMain.java @@ -18,21 +18,21 @@ import android.os.Bundle; import android.os.Handler; import android.os.SystemClock; -import android.support.annotation.NonNull; -import android.support.design.internal.NavigationMenuView; -import android.support.design.widget.AppBarLayout; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.design.widget.TabLayout; -import android.support.v4.app.ActivityCompat; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.content.ContextCompat; -import android.support.v4.content.LocalBroadcastManager; -import android.support.v4.view.ViewPager; -import android.support.v4.app.FragmentPagerAdapter; -import android.support.v7.view.ActionMode; -import android.support.v7.widget.PopupMenu; +import androidx.annotation.NonNull; +import com.google.android.material.appbar.AppBarLayout; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.internal.NavigationMenuView; +import com.google.android.material.snackbar.Snackbar; +import com.google.android.material.tabs.TabLayout; +import androidx.core.app.ActivityCompat; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.core.content.ContextCompat; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.viewpager.widget.ViewPager; +import androidx.fragment.app.FragmentPagerAdapter; +import androidx.appcompat.view.ActionMode; +import androidx.appcompat.widget.PopupMenu; import android.text.Editable; import android.text.InputType; import android.text.TextWatcher; @@ -43,12 +43,12 @@ import android.view.MenuInflater; import android.view.MotionEvent; import android.view.View; -import android.support.design.widget.NavigationView; -import android.support.v4.view.GravityCompat; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBarDrawerToggle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import com.google.android.material.navigation.NavigationView; +import androidx.core.view.GravityCompat; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; import android.view.ViewGroup; diff --git a/app/src/main/java/com/music/player/bhandari/m/activity/ActivityNowPlaying.java b/app/src/main/java/com/music/player/bhandari/m/activity/ActivityNowPlaying.java index 58fd3f9e..5a2d0a64 100644 --- a/app/src/main/java/com/music/player/bhandari/m/activity/ActivityNowPlaying.java +++ b/app/src/main/java/com/music/player/bhandari/m/activity/ActivityNowPlaying.java @@ -15,22 +15,22 @@ import android.os.Bundle; import android.os.Handler; import android.os.SystemClock; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; -import android.support.design.widget.Snackbar; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; -import android.support.v4.content.FileProvider; -import android.support.v4.content.LocalBroadcastManager; -import android.support.v4.view.ViewPager; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.DividerItemDecoration; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; -import android.support.v7.widget.helper.ItemTouchHelper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; +import com.google.android.material.snackbar.Snackbar; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; +import androidx.core.content.FileProvider; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; +import androidx.recyclerview.widget.ItemTouchHelper; import android.text.InputType; import android.text.method.ScrollingMovementMethod; import android.transition.ArcMotion; diff --git a/app/src/main/java/com/music/player/bhandari/m/activity/ActivityPermissionSeek.java b/app/src/main/java/com/music/player/bhandari/m/activity/ActivityPermissionSeek.java index 0bf36177..919b6e3d 100644 --- a/app/src/main/java/com/music/player/bhandari/m/activity/ActivityPermissionSeek.java +++ b/app/src/main/java/com/music/player/bhandari/m/activity/ActivityPermissionSeek.java @@ -12,10 +12,10 @@ import android.os.Bundle; import android.os.IBinder; import android.os.RemoteException; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.ActivityCompat; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.ActivityCompat; +import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import android.widget.Toast; @@ -36,19 +36,14 @@ import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings; import com.music.player.bhandari.m.R; import com.music.player.bhandari.m.UIElementHelper.MyDialogBuilder; -import com.music.player.bhandari.m.UIElementHelper.TypeFaceHelper; import com.music.player.bhandari.m.fcm.CountryInfo; import com.music.player.bhandari.m.model.Constants; import com.music.player.bhandari.m.service.NotificationListenerService; import com.music.player.bhandari.m.service.PlayerService; import com.music.player.bhandari.m.MyApp; -import com.music.player.bhandari.m.trackInfo.models.FetchTrackInfo; -import com.music.player.bhandari.m.trackInfo.models.TrackInfo; import com.music.player.bhandari.m.utils.UtilityFun; -import org.jetbrains.annotations.NotNull; - import java.util.ArrayList; import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper; diff --git a/app/src/main/java/com/music/player/bhandari/m/activity/ActivityRequestNotificationAccess.java b/app/src/main/java/com/music/player/bhandari/m/activity/ActivityRequestNotificationAccess.java index c314e655..360f8690 100644 --- a/app/src/main/java/com/music/player/bhandari/m/activity/ActivityRequestNotificationAccess.java +++ b/app/src/main/java/com/music/player/bhandari/m/activity/ActivityRequestNotificationAccess.java @@ -4,8 +4,8 @@ import android.content.Intent; import android.os.Build; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.ProgressBar; import android.widget.TextView; diff --git a/app/src/main/java/com/music/player/bhandari/m/activity/ActivitySavedLyrics.kt b/app/src/main/java/com/music/player/bhandari/m/activity/ActivitySavedLyrics.kt index a27f81b9..eae0634c 100644 --- a/app/src/main/java/com/music/player/bhandari/m/activity/ActivitySavedLyrics.kt +++ b/app/src/main/java/com/music/player/bhandari/m/activity/ActivitySavedLyrics.kt @@ -6,12 +6,12 @@ import android.graphics.Bitmap import android.os.Bundle import android.os.Handler import android.os.Looper -import android.support.design.widget.Snackbar -import android.support.v4.content.ContextCompat -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 com.google.android.material.snackbar.Snackbar +import androidx.core.content.ContextCompat +import androidx.appcompat.app.AppCompatActivity +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import androidx.appcompat.widget.Toolbar import android.text.Editable import android.text.TextWatcher import android.util.Log diff --git a/app/src/main/java/com/music/player/bhandari/m/activity/ActivitySecondaryLibrary.java b/app/src/main/java/com/music/player/bhandari/m/activity/ActivitySecondaryLibrary.java index 00f5cfc3..1a307f22 100644 --- a/app/src/main/java/com/music/player/bhandari/m/activity/ActivitySecondaryLibrary.java +++ b/app/src/main/java/com/music/player/bhandari/m/activity/ActivitySecondaryLibrary.java @@ -14,18 +14,18 @@ import android.os.Handler; import android.os.Looper; import android.os.SystemClock; -import android.support.annotation.NonNull; -import android.support.design.widget.AppBarLayout; -import android.support.design.widget.CollapsingToolbarLayout; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; -import android.support.v4.content.LocalBroadcastManager; -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 com.google.android.material.appbar.AppBarLayout; +import com.google.android.material.appbar.CollapsingToolbarLayout; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +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.Gravity; import android.view.KeyEvent; @@ -64,7 +64,6 @@ import com.music.player.bhandari.m.model.MusicLibrary; import com.music.player.bhandari.m.MyApp; import com.music.player.bhandari.m.model.PlaylistManager; -import com.music.player.bhandari.m.utils.AppLaunchCountManager; import com.music.player.bhandari.m.utils.UtilityFun; import java.util.ArrayList; @@ -74,7 +73,6 @@ import butterknife.BindView; import butterknife.ButterKnife; -import butterknife.OnClick; import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper; /** diff --git a/app/src/main/java/com/music/player/bhandari/m/activity/ActivitySettings.java b/app/src/main/java/com/music/player/bhandari/m/activity/ActivitySettings.java index efae6760..dac41835 100644 --- a/app/src/main/java/com/music/player/bhandari/m/activity/ActivitySettings.java +++ b/app/src/main/java/com/music/player/bhandari/m/activity/ActivitySettings.java @@ -13,13 +13,13 @@ import android.preference.CheckBoxPreference; import android.preference.Preference; import android.preference.PreferenceFragment; -import android.support.annotation.NonNull; -import android.support.v4.view.MotionEventCompat; -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 android.support.v7.widget.helper.ItemTouchHelper; +import androidx.annotation.NonNull; +import androidx.core.view.MotionEventCompat; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; +import androidx.recyclerview.widget.ItemTouchHelper; import android.text.InputType; import android.util.Log; import android.view.Gravity; @@ -38,7 +38,6 @@ import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.MaterialDialog; -import com.afollestad.materialdialogs.Theme; import com.google.android.flexbox.FlexDirection; import com.google.android.flexbox.FlexboxLayoutManager; import com.google.android.flexbox.JustifyContent; diff --git a/app/src/main/java/com/music/player/bhandari/m/activity/ActivityTagEditor.java b/app/src/main/java/com/music/player/bhandari/m/activity/ActivityTagEditor.java index 6a6e181f..282b6239 100644 --- a/app/src/main/java/com/music/player/bhandari/m/activity/ActivityTagEditor.java +++ b/app/src/main/java/com/music/player/bhandari/m/activity/ActivityTagEditor.java @@ -9,9 +9,9 @@ import android.os.Bundle; import android.os.Environment; import android.provider.MediaStore; -import android.support.annotation.NonNull; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.view.KeyEvent; import android.view.Menu; diff --git a/app/src/main/java/com/music/player/bhandari/m/activity/FragmentAlbumArt.java b/app/src/main/java/com/music/player/bhandari/m/activity/FragmentAlbumArt.java index 96fde478..48dd1cb7 100644 --- a/app/src/main/java/com/music/player/bhandari/m/activity/FragmentAlbumArt.java +++ b/app/src/main/java/com/music/player/bhandari/m/activity/FragmentAlbumArt.java @@ -4,22 +4,19 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.content.res.Configuration; import android.net.Uri; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.content.LocalBroadcastManager; +import androidx.annotation.Nullable; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.ViewTreeObserver; import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.RelativeLayout; import com.bumptech.glide.DrawableRequestBuilder; import com.bumptech.glide.Glide; diff --git a/app/src/main/java/com/music/player/bhandari/m/activity/FragmentAlbumLibrary.java b/app/src/main/java/com/music/player/bhandari/m/activity/FragmentAlbumLibrary.java index e682defb..8abef49a 100644 --- a/app/src/main/java/com/music/player/bhandari/m/activity/FragmentAlbumLibrary.java +++ b/app/src/main/java/com/music/player/bhandari/m/activity/FragmentAlbumLibrary.java @@ -9,24 +9,22 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.content.LocalBroadcastManager; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.fragment.app.Fragment; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import com.music.player.bhandari.m.R; -import com.music.player.bhandari.m.UIElementHelper.ColorHelper; import com.music.player.bhandari.m.UIElementHelper.FastScroller; import com.music.player.bhandari.m.adapter.AlbumLibraryAdapter; import com.music.player.bhandari.m.model.Constants; import com.music.player.bhandari.m.model.MusicLibrary; import com.music.player.bhandari.m.MyApp; -import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView; import java.util.concurrent.Executors; diff --git a/app/src/main/java/com/music/player/bhandari/m/activity/FragmentArtistInfo.java b/app/src/main/java/com/music/player/bhandari/m/activity/FragmentArtistInfo.java index a775d0b4..430472e8 100644 --- a/app/src/main/java/com/music/player/bhandari/m/activity/FragmentArtistInfo.java +++ b/app/src/main/java/com/music/player/bhandari/m/activity/FragmentArtistInfo.java @@ -14,10 +14,10 @@ import android.os.AsyncTask; import android.os.Bundle; import android.provider.MediaStore; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.content.LocalBroadcastManager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import android.text.SpannableString; import android.text.Spanned; import android.text.TextPaint; @@ -53,7 +53,6 @@ import butterknife.BindView; import butterknife.ButterKnife; -import butterknife.OnClick; /** Copyright 2017 Amit Bhandari AB diff --git a/app/src/main/java/com/music/player/bhandari/m/activity/FragmentFolderLibrary.java b/app/src/main/java/com/music/player/bhandari/m/activity/FragmentFolderLibrary.java index 8fa22c06..c09704fb 100644 --- a/app/src/main/java/com/music/player/bhandari/m/activity/FragmentFolderLibrary.java +++ b/app/src/main/java/com/music/player/bhandari/m/activity/FragmentFolderLibrary.java @@ -6,12 +6,12 @@ import android.content.IntentFilter; import android.os.Bundle; import android.os.Handler; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; -import android.support.v4.content.LocalBroadcastManager; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -20,12 +20,10 @@ import com.music.player.bhandari.m.MyApp; import com.music.player.bhandari.m.R; import com.music.player.bhandari.m.UIElementHelper.BottomOffsetDecoration; -import com.music.player.bhandari.m.UIElementHelper.ColorHelper; import com.music.player.bhandari.m.UIElementHelper.FastScroller; import com.music.player.bhandari.m.adapter.FolderLibraryAdapter; import com.music.player.bhandari.m.model.Constants; import com.music.player.bhandari.m.model.MusicLibrary; -import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView; import java.util.concurrent.Executors; diff --git a/app/src/main/java/com/music/player/bhandari/m/activity/FragmentLibrary.java b/app/src/main/java/com/music/player/bhandari/m/activity/FragmentLibrary.java index 7136b147..43f0abfd 100644 --- a/app/src/main/java/com/music/player/bhandari/m/activity/FragmentLibrary.java +++ b/app/src/main/java/com/music/player/bhandari/m/activity/FragmentLibrary.java @@ -4,12 +4,12 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; -import android.support.v4.content.LocalBroadcastManager; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -17,14 +17,11 @@ import com.music.player.bhandari.m.R; import com.music.player.bhandari.m.UIElementHelper.BottomOffsetDecoration; -import com.music.player.bhandari.m.UIElementHelper.ColorHelper; import com.music.player.bhandari.m.UIElementHelper.FastScroller; import com.music.player.bhandari.m.adapter.MainLibraryAdapter; import com.music.player.bhandari.m.model.Constants; import com.music.player.bhandari.m.model.MusicLibrary; import com.music.player.bhandari.m.MyApp; -import com.music.player.bhandari.m.model.dataItem; -import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView; import java.util.ArrayList; diff --git a/app/src/main/java/com/music/player/bhandari/m/activity/FragmentLyrics.java b/app/src/main/java/com/music/player/bhandari/m/activity/FragmentLyrics.java index e482b5c0..b9a08f20 100644 --- a/app/src/main/java/com/music/player/bhandari/m/activity/FragmentLyrics.java +++ b/app/src/main/java/com/music/player/bhandari/m/activity/FragmentLyrics.java @@ -9,16 +9,14 @@ import android.os.Bundle; import android.os.Handler; import android.os.Looper; -import android.os.SystemClock; import android.provider.MediaStore; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.FloatingActionButton; -import android.support.v4.app.Fragment; -import android.support.v4.content.LocalBroadcastManager; -import android.support.v4.view.GestureDetectorCompat; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.core.view.GestureDetectorCompat; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.Html; import android.util.Log; import android.view.ActionMode; @@ -30,14 +28,10 @@ import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; -import android.view.animation.Animation; -import android.view.animation.AnimationUtils; import android.view.inputmethod.InputMethodManager; import android.widget.Button; import android.widget.EditText; -import android.widget.ImageView; import android.widget.LinearLayout; -import android.widget.SeekBar; import android.widget.TextView; import android.widget.Toast; @@ -56,20 +50,17 @@ import com.music.player.bhandari.m.qlyrics.LyricsAndArtistInfo.tasks.DownloadLyricThread; import com.music.player.bhandari.m.service.PlayerService; import com.music.player.bhandari.m.MyApp; -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; import com.nshmura.snappysmoothscroller.SnappyLinearLayoutManager; import com.wang.avi.AVLoadingIndicatorView; -import java.util.Arrays; import java.util.List; import java.util.concurrent.Executors; import butterknife.BindView; import butterknife.ButterKnife; -import butterknife.OnClick; /** * Copyright 2017 Amit Bhandari AB diff --git a/app/src/main/java/com/music/player/bhandari/m/activity/FragmentPlaylistLibrary.java b/app/src/main/java/com/music/player/bhandari/m/activity/FragmentPlaylistLibrary.java index ba69ceab..bce806ee 100644 --- a/app/src/main/java/com/music/player/bhandari/m/activity/FragmentPlaylistLibrary.java +++ b/app/src/main/java/com/music/player/bhandari/m/activity/FragmentPlaylistLibrary.java @@ -2,10 +2,10 @@ import android.content.Context; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/music/player/bhandari/m/adapter/AlbumLibraryAdapter.java b/app/src/main/java/com/music/player/bhandari/m/adapter/AlbumLibraryAdapter.java index dd136c2e..b596e3a9 100644 --- a/app/src/main/java/com/music/player/bhandari/m/adapter/AlbumLibraryAdapter.java +++ b/app/src/main/java/com/music/player/bhandari/m/adapter/AlbumLibraryAdapter.java @@ -1,21 +1,19 @@ package com.music.player.bhandari.m.adapter; import android.app.Activity; -import android.app.ActivityOptions; import android.content.Context; -import android.content.DialogInterface; import android.content.Intent; import android.graphics.drawable.Drawable; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.design.widget.Snackbar; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; -import android.support.v4.content.FileProvider; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.CardView; -import android.support.v7.widget.RecyclerView; -import android.util.Log; +import androidx.annotation.NonNull; +import com.google.android.material.snackbar.Snackbar; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.core.content.FileProvider; +import androidx.appcompat.app.AlertDialog; +import androidx.cardview.widget.CardView; +import androidx.recyclerview.widget.RecyclerView; + import android.view.LayoutInflater; import android.view.MenuInflater; import android.view.MenuItem; @@ -24,7 +22,6 @@ import android.widget.ImageView; import android.widget.PopupMenu; import android.widget.TextView; -import android.widget.Toast; import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.MaterialDialog; @@ -33,13 +30,10 @@ import com.bumptech.glide.load.resource.drawable.GlideDrawable; import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.target.Target; -import com.bumptech.glide.signature.StringSignature; import com.music.player.bhandari.m.R; import com.music.player.bhandari.m.UIElementHelper.BubbleTextGetter; 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.activity.ActivityMain; import com.music.player.bhandari.m.activity.ActivitySecondaryLibrary; import com.music.player.bhandari.m.model.Constants; import com.music.player.bhandari.m.model.TrackItem; @@ -52,7 +46,6 @@ import java.io.File; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.Comparator; diff --git a/app/src/main/java/com/music/player/bhandari/m/adapter/CurrentTracklistAdapter.java b/app/src/main/java/com/music/player/bhandari/m/adapter/CurrentTracklistAdapter.java index 11608c03..ab2afd8b 100644 --- a/app/src/main/java/com/music/player/bhandari/m/adapter/CurrentTracklistAdapter.java +++ b/app/src/main/java/com/music/player/bhandari/m/adapter/CurrentTracklistAdapter.java @@ -2,20 +2,17 @@ import android.app.Activity; import android.content.Context; -import android.content.DialogInterface; import android.content.Intent; import android.net.Uri; import android.os.Handler; import android.os.Looper; import android.os.SystemClock; -import android.support.annotation.NonNull; -import android.support.design.widget.Snackbar; -import android.support.v4.content.FileProvider; -import android.support.v4.content.LocalBroadcastManager; -import android.support.v4.view.MotionEventCompat; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.CardView; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.core.content.FileProvider; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.core.view.MotionEventCompat; +import androidx.appcompat.app.AlertDialog; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.LayoutInflater; import android.view.MenuInflater; @@ -36,14 +33,11 @@ import com.music.player.bhandari.m.UIElementHelper.MyDialogBuilder; import com.music.player.bhandari.m.UIElementHelper.TypeFaceHelper; import com.music.player.bhandari.m.activity.ActivityTagEditor; -import com.music.player.bhandari.m.activity.ActivityNowPlaying; -import com.music.player.bhandari.m.activity.ActivityPermissionSeek; import com.music.player.bhandari.m.model.Constants; import com.music.player.bhandari.m.model.dataItem; import com.music.player.bhandari.m.model.MusicLibrary; import com.music.player.bhandari.m.UIElementHelper.recyclerviewHelper.ItemTouchHelperAdapter; import com.music.player.bhandari.m.UIElementHelper.recyclerviewHelper.OnStartDragListener; -import com.music.player.bhandari.m.ringtoneCutter.RingdroidEditActivity; import com.music.player.bhandari.m.service.PlayerService; import com.music.player.bhandari.m.MyApp; import com.music.player.bhandari.m.utils.UtilityFun; @@ -51,9 +45,7 @@ import java.io.File; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; -import java.util.HashMap; import java.util.concurrent.Executors; /** diff --git a/app/src/main/java/com/music/player/bhandari/m/adapter/FolderLibraryAdapter.java b/app/src/main/java/com/music/player/bhandari/m/adapter/FolderLibraryAdapter.java index 00d5a521..adf06044 100644 --- a/app/src/main/java/com/music/player/bhandari/m/adapter/FolderLibraryAdapter.java +++ b/app/src/main/java/com/music/player/bhandari/m/adapter/FolderLibraryAdapter.java @@ -2,17 +2,15 @@ import android.annotation.SuppressLint; import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; import android.net.Uri; import android.os.Environment; import android.os.Handler; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.design.widget.Snackbar; -import android.support.v4.content.FileProvider; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import com.google.android.material.snackbar.Snackbar; +import androidx.core.content.FileProvider; +import androidx.appcompat.app.AlertDialog; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.LayoutInflater; import android.view.MenuInflater; @@ -32,7 +30,6 @@ 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.activity.ActivityExploreLyrics; import com.music.player.bhandari.m.activity.ActivityMain; import com.music.player.bhandari.m.model.Constants; import com.music.player.bhandari.m.model.MusicLibrary; diff --git a/app/src/main/java/com/music/player/bhandari/m/adapter/LyricsViewAdapter.java b/app/src/main/java/com/music/player/bhandari/m/adapter/LyricsViewAdapter.java index ea34db5f..8c1a8a4b 100644 --- a/app/src/main/java/com/music/player/bhandari/m/adapter/LyricsViewAdapter.java +++ b/app/src/main/java/com/music/player/bhandari/m/adapter/LyricsViewAdapter.java @@ -3,7 +3,7 @@ import android.content.Context; import android.graphics.Color; import android.os.Build; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.text.Html; import android.util.Log; import android.util.SparseBooleanArray; @@ -16,7 +16,6 @@ import android.widget.TextView; import com.music.player.bhandari.m.R; -import com.music.player.bhandari.m.UIElementHelper.ColorHelper; import com.music.player.bhandari.m.UIElementHelper.TypeFaceHelper; import com.music.player.bhandari.m.qlyrics.LyricsAndArtistInfo.lyrics.Lyrics; import com.music.player.bhandari.m.MyApp; diff --git a/app/src/main/java/com/music/player/bhandari/m/adapter/MainLibraryAdapter.java b/app/src/main/java/com/music/player/bhandari/m/adapter/MainLibraryAdapter.java index c3f00931..4196f794 100644 --- a/app/src/main/java/com/music/player/bhandari/m/adapter/MainLibraryAdapter.java +++ b/app/src/main/java/com/music/player/bhandari/m/adapter/MainLibraryAdapter.java @@ -1,20 +1,18 @@ package com.music.player.bhandari.m.adapter; import android.app.Activity; -import android.content.ComponentName; import android.content.Context; -import android.content.DialogInterface; import android.content.Intent; import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Handler; import android.os.SystemClock; -import android.support.annotation.NonNull; -import android.support.design.widget.Snackbar; -import android.support.v4.content.ContextCompat; -import android.support.v4.content.FileProvider; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import com.google.android.material.snackbar.Snackbar; +import androidx.core.content.ContextCompat; +import androidx.core.content.FileProvider; +import androidx.appcompat.app.AlertDialog; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.util.SparseBooleanArray; import android.view.LayoutInflater; @@ -40,7 +38,6 @@ 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.activity.ActivityMain; import com.music.player.bhandari.m.activity.ActivitySecondaryLibrary; import com.music.player.bhandari.m.activity.ActivityTagEditor; import com.music.player.bhandari.m.activity.FragmentLibrary; @@ -48,7 +45,6 @@ import com.music.player.bhandari.m.model.TrackItem; import com.music.player.bhandari.m.model.dataItem; import com.music.player.bhandari.m.model.MusicLibrary; -import com.music.player.bhandari.m.ringtoneCutter.RingdroidEditActivity; import com.music.player.bhandari.m.service.PlayerService; 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/adapter/PlaylistLibraryAdapter.java b/app/src/main/java/com/music/player/bhandari/m/adapter/PlaylistLibraryAdapter.java index c9a58d6c..0c5c4171 100644 --- a/app/src/main/java/com/music/player/bhandari/m/adapter/PlaylistLibraryAdapter.java +++ b/app/src/main/java/com/music/player/bhandari/m/adapter/PlaylistLibraryAdapter.java @@ -2,16 +2,15 @@ import android.app.Activity; import android.content.Context; -import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; import android.net.Uri; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.design.widget.Snackbar; -import android.support.v4.content.FileProvider; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import com.google.android.material.snackbar.Snackbar; +import androidx.core.content.FileProvider; +import androidx.appcompat.app.AlertDialog; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.MenuInflater; import android.view.MenuItem; @@ -20,15 +19,12 @@ import android.widget.ImageView; import android.widget.PopupMenu; import android.widget.TextView; -import android.widget.Toast; import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.MaterialDialog; 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.activity.ActivityMain; import com.music.player.bhandari.m.activity.ActivitySecondaryLibrary; import com.music.player.bhandari.m.model.Constants; import com.music.player.bhandari.m.model.dataItem; @@ -36,11 +32,9 @@ import com.music.player.bhandari.m.model.MusicLibrary; import com.music.player.bhandari.m.MyApp; import com.music.player.bhandari.m.model.PlaylistManager; -import com.music.player.bhandari.m.utils.UtilityFun; import java.io.File; import java.util.ArrayList; -import java.util.Arrays; /** Copyright 2017 Amit Bhandari AB diff --git a/app/src/main/java/com/music/player/bhandari/m/adapter/SecondaryLibraryAdapter.java b/app/src/main/java/com/music/player/bhandari/m/adapter/SecondaryLibraryAdapter.java index c1b595d0..dc7f28a9 100644 --- a/app/src/main/java/com/music/player/bhandari/m/adapter/SecondaryLibraryAdapter.java +++ b/app/src/main/java/com/music/player/bhandari/m/adapter/SecondaryLibraryAdapter.java @@ -1,13 +1,12 @@ package com.music.player.bhandari.m.adapter; import android.content.Context; -import android.content.DialogInterface; import android.content.Intent; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.v4.content.FileProvider; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.core.content.FileProvider; +import androidx.appcompat.app.AlertDialog; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.LayoutInflater; import android.view.MenuInflater; @@ -32,14 +31,12 @@ import com.music.player.bhandari.m.model.dataItem; import com.music.player.bhandari.m.model.MusicLibrary; import com.music.player.bhandari.m.model.TrackItem; -import com.music.player.bhandari.m.ringtoneCutter.RingdroidEditActivity; import com.music.player.bhandari.m.service.PlayerService; import com.music.player.bhandari.m.MyApp; import com.music.player.bhandari.m.model.PlaylistManager; import com.music.player.bhandari.m.utils.UtilityFun; import java.io.File; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; /** diff --git a/app/src/main/java/com/music/player/bhandari/m/adapter/TopTracksAdapter.java b/app/src/main/java/com/music/player/bhandari/m/adapter/TopTracksAdapter.java index efb70cef..3154af92 100644 --- a/app/src/main/java/com/music/player/bhandari/m/adapter/TopTracksAdapter.java +++ b/app/src/main/java/com/music/player/bhandari/m/adapter/TopTracksAdapter.java @@ -3,8 +3,8 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; -import android.graphics.Bitmap; -import android.support.v7.widget.RecyclerView; + +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.MenuInflater; import android.view.MenuItem; @@ -14,14 +14,8 @@ import android.widget.PopupMenu; import android.widget.TextView; -import com.bumptech.glide.Glide; -import com.bumptech.glide.load.engine.DiskCacheStrategy; -import com.bumptech.glide.request.animation.GlideAnimation; -import com.bumptech.glide.request.target.SimpleTarget; import com.music.player.bhandari.m.R; -import com.music.player.bhandari.m.activity.ActivityExploreLyrics; import com.music.player.bhandari.m.activity.ActivityLyricView; -import com.music.player.bhandari.m.customViews.RoundedImageView; import com.music.player.bhandari.m.lyricsExplore.Track; import com.music.player.bhandari.m.utils.UtilityFun; diff --git a/app/src/main/java/com/music/player/bhandari/m/customViews/CustomViewPager.java b/app/src/main/java/com/music/player/bhandari/m/customViews/CustomViewPager.java index 04026b8c..f3f0cdce 100644 --- a/app/src/main/java/com/music/player/bhandari/m/customViews/CustomViewPager.java +++ b/app/src/main/java/com/music/player/bhandari/m/customViews/CustomViewPager.java @@ -1,7 +1,7 @@ package com.music.player.bhandari.m.customViews; import android.content.Context; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.ViewPager; import android.util.AttributeSet; import android.view.MotionEvent; diff --git a/app/src/main/java/com/music/player/bhandari/m/customViews/MoveUpwardBehavior.java b/app/src/main/java/com/music/player/bhandari/m/customViews/MoveUpwardBehavior.java index 883f9df3..5c73e0af 100644 --- a/app/src/main/java/com/music/player/bhandari/m/customViews/MoveUpwardBehavior.java +++ b/app/src/main/java/com/music/player/bhandari/m/customViews/MoveUpwardBehavior.java @@ -1,10 +1,10 @@ package com.music.player.bhandari.m.customViews; import android.content.Context; -import android.support.annotation.Keep; -import android.support.design.widget.CoordinatorLayout; -import android.support.design.widget.Snackbar; -import android.support.v4.view.ViewCompat; +import androidx.annotation.Keep; +import androidx.coordinatorlayout.widget.CoordinatorLayout; +import com.google.android.material.snackbar.Snackbar; +import androidx.core.view.ViewCompat; import android.util.AttributeSet; import android.view.View; diff --git a/app/src/main/java/com/music/player/bhandari/m/customViews/MyImageView.java b/app/src/main/java/com/music/player/bhandari/m/customViews/MyImageView.java index 8c5e0e14..dcb61c5e 100644 --- a/app/src/main/java/com/music/player/bhandari/m/customViews/MyImageView.java +++ b/app/src/main/java/com/music/player/bhandari/m/customViews/MyImageView.java @@ -28,7 +28,7 @@ limitations under the License. */ -public class MyImageView extends android.support.v7.widget.AppCompatImageView { +public class MyImageView extends androidx.appcompat.widget.AppCompatImageView { public String getUrl() { return url; diff --git a/app/src/main/java/com/music/player/bhandari/m/customViews/MyRecyclerView.java b/app/src/main/java/com/music/player/bhandari/m/customViews/MyRecyclerView.java index 703258d4..4945b6cf 100644 --- a/app/src/main/java/com/music/player/bhandari/m/customViews/MyRecyclerView.java +++ b/app/src/main/java/com/music/player/bhandari/m/customViews/MyRecyclerView.java @@ -1,8 +1,8 @@ package com.music.player.bhandari.m.customViews; import android.content.Context; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.util.AttributeSet; /** diff --git a/app/src/main/java/com/music/player/bhandari/m/customViews/RoundedImageView.java b/app/src/main/java/com/music/player/bhandari/m/customViews/RoundedImageView.java index 2e45579f..f24cc0d5 100644 --- a/app/src/main/java/com/music/player/bhandari/m/customViews/RoundedImageView.java +++ b/app/src/main/java/com/music/player/bhandari/m/customViews/RoundedImageView.java @@ -11,7 +11,7 @@ import android.graphics.Rect; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; -import android.support.v7.widget.AppCompatImageView; +import androidx.appcompat.widget.AppCompatImageView; import android.util.AttributeSet; /** diff --git a/app/src/main/java/com/music/player/bhandari/m/customViews/VerticalSeekBar.java b/app/src/main/java/com/music/player/bhandari/m/customViews/VerticalSeekBar.java index de27b176..629e2735 100644 --- a/app/src/main/java/com/music/player/bhandari/m/customViews/VerticalSeekBar.java +++ b/app/src/main/java/com/music/player/bhandari/m/customViews/VerticalSeekBar.java @@ -39,7 +39,7 @@ */ //Creates a Vertical SeekBar using Android's basic UI elements. -public class VerticalSeekBar extends android.support.v7.widget.AppCompatSeekBar { +public class VerticalSeekBar extends androidx.appcompat.widget.AppCompatSeekBar { public VerticalSeekBar(Context context) { super(context); diff --git a/app/src/main/java/com/music/player/bhandari/m/customViews/ZoomTextView.java b/app/src/main/java/com/music/player/bhandari/m/customViews/ZoomTextView.java index 7272f23d..ce72fac8 100644 --- a/app/src/main/java/com/music/player/bhandari/m/customViews/ZoomTextView.java +++ b/app/src/main/java/com/music/player/bhandari/m/customViews/ZoomTextView.java @@ -1,7 +1,7 @@ package com.music.player.bhandari.m.customViews; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.AttributeSet; import android.util.Log; import android.util.TypedValue; diff --git a/app/src/main/java/com/music/player/bhandari/m/customViews/fast_scroller/RecyclerFastScroller.java b/app/src/main/java/com/music/player/bhandari/m/customViews/fast_scroller/RecyclerFastScroller.java index a5acb09a..6ac2957b 100644 --- a/app/src/main/java/com/music/player/bhandari/m/customViews/fast_scroller/RecyclerFastScroller.java +++ b/app/src/main/java/com/music/player/bhandari/m/customViews/fast_scroller/RecyclerFastScroller.java @@ -10,15 +10,15 @@ import android.graphics.drawable.Drawable; import android.graphics.drawable.InsetDrawable; import android.graphics.drawable.StateListDrawable; -import android.support.annotation.ColorInt; -import android.support.annotation.Nullable; -import android.support.design.widget.AppBarLayout; -import android.support.design.widget.CoordinatorLayout; -import android.support.v4.view.GravityCompat; -import android.support.v4.view.ViewCompat; -import android.support.v4.view.animation.FastOutLinearInInterpolator; -import android.support.v4.view.animation.LinearOutSlowInInterpolator; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.ColorInt; +import androidx.annotation.Nullable; +import com.google.android.material.appbar.AppBarLayout; +import androidx.coordinatorlayout.widget.CoordinatorLayout; +import androidx.core.view.GravityCompat; +import androidx.core.view.ViewCompat; +import androidx.interpolator.view.animation.FastOutLinearInInterpolator; +import androidx.interpolator.view.animation.LinearOutSlowInInterpolator; +import androidx.recyclerview.widget.RecyclerView; import android.util.AttributeSet; import android.util.Log; import android.view.MotionEvent; diff --git a/app/src/main/java/com/music/player/bhandari/m/customViews/fast_scroller/RecyclerFastScrollerUtils.java b/app/src/main/java/com/music/player/bhandari/m/customViews/fast_scroller/RecyclerFastScrollerUtils.java index 5c36aa54..e3e58803 100644 --- a/app/src/main/java/com/music/player/bhandari/m/customViews/fast_scroller/RecyclerFastScrollerUtils.java +++ b/app/src/main/java/com/music/player/bhandari/m/customViews/fast_scroller/RecyclerFastScrollerUtils.java @@ -5,8 +5,8 @@ import android.content.res.TypedArray; import android.graphics.drawable.Drawable; import android.os.Build; -import android.support.annotation.AttrRes; -import android.support.annotation.ColorInt; +import androidx.annotation.AttrRes; +import androidx.annotation.ColorInt; import android.view.View; /** diff --git a/app/src/main/java/com/music/player/bhandari/m/fcm/MyFirebaseInstanceIDService.java b/app/src/main/java/com/music/player/bhandari/m/fcm/MyFirebaseInstanceIDService.java index 23dcb57d..38a4d823 100644 --- a/app/src/main/java/com/music/player/bhandari/m/fcm/MyFirebaseInstanceIDService.java +++ b/app/src/main/java/com/music/player/bhandari/m/fcm/MyFirebaseInstanceIDService.java @@ -16,17 +16,11 @@ limitations under the License. */ -import android.app.Service; -import android.content.Intent; -import android.os.IBinder; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; -import com.google.firebase.database.DatabaseReference; -import com.google.firebase.database.FirebaseDatabase; import com.google.firebase.iid.FirebaseInstanceId; import com.google.firebase.iid.FirebaseInstanceIdService; -import com.google.firebase.messaging.FirebaseMessaging; public class MyFirebaseInstanceIDService extends FirebaseInstanceIdService { diff --git a/app/src/main/java/com/music/player/bhandari/m/fcm/MyFirebaseMessagingService.java b/app/src/main/java/com/music/player/bhandari/m/fcm/MyFirebaseMessagingService.java index 02861d2d..685dca09 100644 --- a/app/src/main/java/com/music/player/bhandari/m/fcm/MyFirebaseMessagingService.java +++ b/app/src/main/java/com/music/player/bhandari/m/fcm/MyFirebaseMessagingService.java @@ -16,7 +16,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.Looper; -import android.support.v4.app.NotificationCompat; +import androidx.core.app.NotificationCompat; import android.util.Log; import com.google.firebase.analytics.FirebaseAnalytics; diff --git a/app/src/main/java/com/music/player/bhandari/m/lyricCard/ActivityLyricCard.java b/app/src/main/java/com/music/player/bhandari/m/lyricCard/ActivityLyricCard.java index 08d605a6..4e2d4641 100644 --- a/app/src/main/java/com/music/player/bhandari/m/lyricCard/ActivityLyricCard.java +++ b/app/src/main/java/com/music/player/bhandari/m/lyricCard/ActivityLyricCard.java @@ -10,16 +10,16 @@ import android.os.Environment; import android.os.Handler; import android.os.HandlerThread; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.FileProvider; -import android.support.v4.provider.FontRequest; -import android.support.v4.provider.FontsContractCompat; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.AppCompatEditText; -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 androidx.core.content.FileProvider; +import androidx.core.provider.FontRequest; +import androidx.core.provider.FontsContractCompat; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.AppCompatEditText; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.view.Gravity; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/music/player/bhandari/m/lyricCard/QueryBuilder.java b/app/src/main/java/com/music/player/bhandari/m/lyricCard/QueryBuilder.java index ea0e4096..e92364a9 100644 --- a/app/src/main/java/com/music/player/bhandari/m/lyricCard/QueryBuilder.java +++ b/app/src/main/java/com/music/player/bhandari/m/lyricCard/QueryBuilder.java @@ -16,8 +16,8 @@ package com.music.player.bhandari.m.lyricCard; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; /** Copyright 2017 Amit Bhandari AB diff --git a/app/src/main/java/com/music/player/bhandari/m/lyricsExplore/OnPopularTracksReady.java b/app/src/main/java/com/music/player/bhandari/m/lyricsExplore/OnPopularTracksReady.java index 0de2064b..3aa14ac3 100644 --- a/app/src/main/java/com/music/player/bhandari/m/lyricsExplore/OnPopularTracksReady.java +++ b/app/src/main/java/com/music/player/bhandari/m/lyricsExplore/OnPopularTracksReady.java @@ -1,6 +1,6 @@ package com.music.player.bhandari.m.lyricsExplore; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.List; diff --git a/app/src/main/java/com/music/player/bhandari/m/model/CustomRecyclerView.java b/app/src/main/java/com/music/player/bhandari/m/model/CustomRecyclerView.java index 36cdb45e..d73ff6e1 100644 --- a/app/src/main/java/com/music/player/bhandari/m/model/CustomRecyclerView.java +++ b/app/src/main/java/com/music/player/bhandari/m/model/CustomRecyclerView.java @@ -1,8 +1,8 @@ package com.music.player.bhandari.m.model; import android.content.Context; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.util.AttributeSet; import com.music.player.bhandari.m.adapter.MainLibraryAdapter; diff --git a/app/src/main/java/com/music/player/bhandari/m/model/MusicLibrary.java b/app/src/main/java/com/music/player/bhandari/m/model/MusicLibrary.java index 2e98617c..fc2e38b8 100644 --- a/app/src/main/java/com/music/player/bhandari/m/model/MusicLibrary.java +++ b/app/src/main/java/com/music/player/bhandari/m/model/MusicLibrary.java @@ -10,8 +10,8 @@ import android.net.Uri; import android.os.ParcelFileDescriptor; import android.provider.MediaStore; -import android.support.annotation.NonNull; -import android.support.v4.content.LocalBroadcastManager; +import androidx.annotation.NonNull; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import android.util.Log; import android.util.SparseArray; @@ -22,7 +22,6 @@ import com.music.player.bhandari.m.qlyrics.LyricsAndArtistInfo.offlineStorage.OfflineStorageArtistBio; import com.music.player.bhandari.m.utils.UtilityFun; -import java.io.File; import java.io.FileDescriptor; import java.util.ArrayList; import java.util.Collections; diff --git a/app/src/main/java/com/music/player/bhandari/m/model/dataItem.java b/app/src/main/java/com/music/player/bhandari/m/model/dataItem.java index f7f6fa5e..7e8ea677 100644 --- a/app/src/main/java/com/music/player/bhandari/m/model/dataItem.java +++ b/app/src/main/java/com/music/player/bhandari/m/model/dataItem.java @@ -1,7 +1,6 @@ package com.music.player.bhandari.m.model; -import android.support.annotation.NonNull; -import android.util.Log; +import androidx.annotation.NonNull; /** Copyright 2017 Amit Bhandari AB diff --git a/app/src/main/java/com/music/player/bhandari/m/ringtoneCutter/RingdroidEditActivity.java b/app/src/main/java/com/music/player/bhandari/m/ringtoneCutter/RingdroidEditActivity.java index 8470d6c0..f3342435 100644 --- a/app/src/main/java/com/music/player/bhandari/m/ringtoneCutter/RingdroidEditActivity.java +++ b/app/src/main/java/com/music/player/bhandari/m/ringtoneCutter/RingdroidEditActivity.java @@ -18,26 +18,22 @@ import android.app.Activity; import android.app.AlertDialog; -import android.app.ProgressDialog; import android.content.ContentValues; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.pm.PackageManager; import android.content.res.Configuration; -import android.graphics.Color; -import android.graphics.drawable.ColorDrawable; import android.media.RingtoneManager; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.os.Environment; import android.os.Handler; import android.os.Message; import android.provider.MediaStore; -import android.support.annotation.NonNull; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.text.Editable; import android.text.TextWatcher; import android.util.DisplayMetrics; @@ -48,8 +44,6 @@ import android.view.MenuItem; import android.view.View; import android.view.View.OnClickListener; -import android.view.Window; -import android.view.WindowManager; import android.widget.ImageButton; import android.widget.RelativeLayout; import android.widget.TextView; @@ -62,7 +56,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.ringtoneCutter.soundfile.SoundFile; diff --git a/app/src/main/java/com/music/player/bhandari/m/service/BatchDownloaderService.java b/app/src/main/java/com/music/player/bhandari/m/service/BatchDownloaderService.java index e1d13bd5..a6af28d6 100644 --- a/app/src/main/java/com/music/player/bhandari/m/service/BatchDownloaderService.java +++ b/app/src/main/java/com/music/player/bhandari/m/service/BatchDownloaderService.java @@ -1,6 +1,5 @@ package com.music.player.bhandari.m.service; -import android.app.NotificationChannel; import android.app.NotificationManager; import android.app.PendingIntent; import android.app.Service; @@ -12,9 +11,9 @@ import android.os.Bundle; import android.os.Handler; import android.os.IBinder; -import android.support.annotation.Nullable; -import android.support.v4.app.NotificationCompat; -import android.support.v4.content.LocalBroadcastManager; +import androidx.annotation.Nullable; +import androidx.core.app.NotificationCompat; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import android.util.Log; import android.widget.Toast; diff --git a/app/src/main/java/com/music/player/bhandari/m/service/NotificationListenerService.java b/app/src/main/java/com/music/player/bhandari/m/service/NotificationListenerService.java index fd94f39a..29940b0c 100644 --- a/app/src/main/java/com/music/player/bhandari/m/service/NotificationListenerService.java +++ b/app/src/main/java/com/music/player/bhandari/m/service/NotificationListenerService.java @@ -20,9 +20,9 @@ import android.os.Build; import android.provider.Settings; import android.service.notification.StatusBarNotification; -import android.support.annotation.NonNull; -import android.support.v4.app.NotificationCompat; -import android.support.v4.content.LocalBroadcastManager; +import androidx.annotation.NonNull; +import androidx.core.app.NotificationCompat; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import android.util.Log; import com.music.player.bhandari.m.R; diff --git a/app/src/main/java/com/music/player/bhandari/m/service/PlayerService.java b/app/src/main/java/com/music/player/bhandari/m/service/PlayerService.java index 23fb2251..33b75598 100644 --- a/app/src/main/java/com/music/player/bhandari/m/service/PlayerService.java +++ b/app/src/main/java/com/music/player/bhandari/m/service/PlayerService.java @@ -41,9 +41,11 @@ import android.os.Handler; import android.os.IBinder; import android.os.ResultReceiver; -import android.support.annotation.NonNull; -import android.support.v4.app.NotificationCompat; -import android.support.v4.content.LocalBroadcastManager; + +import androidx.annotation.NonNull; +import androidx.core.app.NotificationCompat; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import android.support.v4.media.MediaMetadataCompat; import android.support.v4.media.session.MediaSessionCompat;; import android.support.v4.media.session.PlaybackStateCompat; @@ -874,7 +876,7 @@ public void run() { final Notification notification; - android.support.v4.media.app.NotificationCompat.MediaStyle mediaStyle = new android.support.v4.media.app.NotificationCompat.MediaStyle() + androidx.media.app.NotificationCompat.MediaStyle mediaStyle = new androidx.media.app.NotificationCompat.MediaStyle() .setShowActionsInCompactView(0, 1, 2); if (mMediaSession != null) { @@ -918,12 +920,10 @@ public void run() { builder.addAction(new NotificationCompat.Action(R.drawable.ic_close_white_24dp, "Close", pdismissIntent)); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - builder.setVisibility(Notification.VISIBILITY_PUBLIC); + builder.setVisibility(NotificationCompat.VISIBILITY_PUBLIC); } - if (Build.VERSION.SDK_INT > Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) { - builder.setPriority(Notification.PRIORITY_MAX); - } + builder.setPriority(Notification.PRIORITY_MAX); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { builder.setChannelId(getString(R.string.notification_channel)); diff --git a/app/src/main/java/com/music/player/bhandari/m/trackInfo/TrackInfoActivity.kt b/app/src/main/java/com/music/player/bhandari/m/trackInfo/TrackInfoActivity.kt index 0c8de6eb..dae091fd 100644 --- a/app/src/main/java/com/music/player/bhandari/m/trackInfo/TrackInfoActivity.kt +++ b/app/src/main/java/com/music/player/bhandari/m/trackInfo/TrackInfoActivity.kt @@ -8,12 +8,12 @@ import android.graphics.Bitmap import android.graphics.Color import android.net.Uri import android.os.Bundle -import android.support.design.widget.Snackbar -import android.support.v7.app.AppCompatActivity -import android.support.v7.widget.CardView -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView -import android.support.v7.widget.Toolbar +import com.google.android.material.snackbar.Snackbar +import androidx.appcompat.app.AppCompatActivity +import androidx.cardview.widget.CardView +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 diff --git a/app/src/main/java/com/music/player/bhandari/m/trackInfo/TrackInfoService.kt b/app/src/main/java/com/music/player/bhandari/m/trackInfo/TrackInfoService.kt index eef3275b..4bedcc1c 100644 --- a/app/src/main/java/com/music/player/bhandari/m/trackInfo/TrackInfoService.kt +++ b/app/src/main/java/com/music/player/bhandari/m/trackInfo/TrackInfoService.kt @@ -1,6 +1,6 @@ package com.music.player.bhandari.m.trackInfo.models -import android.support.annotation.Keep +import androidx.annotation.Keep import com.music.player.bhandari.m.trackInfo.models.album.AlbumWrap import com.music.player.bhandari.m.trackInfo.models.similar.SimilartracksWrap import com.music.player.bhandari.m.trackInfo.models.track.TrackWrap diff --git a/app/src/main/java/com/music/player/bhandari/m/transition/MorphDrawable.java b/app/src/main/java/com/music/player/bhandari/m/transition/MorphDrawable.java index e9309b07..d65ae39a 100644 --- a/app/src/main/java/com/music/player/bhandari/m/transition/MorphDrawable.java +++ b/app/src/main/java/com/music/player/bhandari/m/transition/MorphDrawable.java @@ -21,7 +21,7 @@ import android.graphics.Outline; import android.graphics.Paint; import android.graphics.drawable.Drawable; -import android.support.annotation.ColorInt; +import androidx.annotation.ColorInt; import android.util.Property; /** diff --git a/app/src/main/java/com/music/player/bhandari/m/transition/MorphMiniToNowPlaying.java b/app/src/main/java/com/music/player/bhandari/m/transition/MorphMiniToNowPlaying.java index 00aad095..969a62a8 100644 --- a/app/src/main/java/com/music/player/bhandari/m/transition/MorphMiniToNowPlaying.java +++ b/app/src/main/java/com/music/player/bhandari/m/transition/MorphMiniToNowPlaying.java @@ -21,8 +21,8 @@ import android.animation.ObjectAnimator; import android.content.Context; import android.os.Build; -import android.support.annotation.RequiresApi; -import android.support.v4.content.ContextCompat; +import androidx.annotation.RequiresApi; +import androidx.core.content.ContextCompat; import android.transition.ChangeBounds; import android.transition.TransitionValues; import android.util.AttributeSet; diff --git a/app/src/main/java/com/music/player/bhandari/m/transition/MorphNowPlayingToMini.java b/app/src/main/java/com/music/player/bhandari/m/transition/MorphNowPlayingToMini.java index f6372223..31920fc6 100644 --- a/app/src/main/java/com/music/player/bhandari/m/transition/MorphNowPlayingToMini.java +++ b/app/src/main/java/com/music/player/bhandari/m/transition/MorphNowPlayingToMini.java @@ -21,8 +21,8 @@ import android.animation.ObjectAnimator; import android.content.Context; import android.os.Build; -import android.support.annotation.RequiresApi; -import android.support.v4.content.ContextCompat; +import androidx.annotation.RequiresApi; +import androidx.core.content.ContextCompat; import android.transition.ChangeBounds; import android.transition.TransitionValues; import android.util.AttributeSet; diff --git a/app/src/main/java/com/music/player/bhandari/m/transition/MorphTransition.java b/app/src/main/java/com/music/player/bhandari/m/transition/MorphTransition.java index 679d7660..ee9d3e37 100644 --- a/app/src/main/java/com/music/player/bhandari/m/transition/MorphTransition.java +++ b/app/src/main/java/com/music/player/bhandari/m/transition/MorphTransition.java @@ -6,7 +6,7 @@ import android.content.Context; import android.graphics.Color; import android.os.Build; -import android.support.annotation.RequiresApi; +import androidx.annotation.RequiresApi; import android.transition.ChangeBounds; import android.transition.TransitionValues; import android.util.AttributeSet; diff --git a/app/src/main/java/com/music/player/bhandari/m/utils/AppLaunchCountManager.java b/app/src/main/java/com/music/player/bhandari/m/utils/AppLaunchCountManager.java index 57c90363..d4f572f0 100644 --- a/app/src/main/java/com/music/player/bhandari/m/utils/AppLaunchCountManager.java +++ b/app/src/main/java/com/music/player/bhandari/m/utils/AppLaunchCountManager.java @@ -4,14 +4,13 @@ import android.content.Intent; import android.content.SharedPreferences; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.MaterialDialog; import com.music.player.bhandari.m.MyApp; import com.music.player.bhandari.m.R; import com.music.player.bhandari.m.UIElementHelper.MyDialogBuilder; -import com.music.player.bhandari.m.UIElementHelper.TypeFaceHelper; /** Copyright 2017 Amit Bhandari AB diff --git a/app/src/main/java/com/music/player/bhandari/m/utils/GenericFileProvider.java b/app/src/main/java/com/music/player/bhandari/m/utils/GenericFileProvider.java index 1aeea6ee..a555b6a5 100644 --- a/app/src/main/java/com/music/player/bhandari/m/utils/GenericFileProvider.java +++ b/app/src/main/java/com/music/player/bhandari/m/utils/GenericFileProvider.java @@ -1,6 +1,6 @@ package com.music.player.bhandari.m.utils; -import android.support.v4.content.FileProvider; +import androidx.core.content.FileProvider; /** Copyright 2017 Amit Bhandari AB diff --git a/app/src/main/java/com/music/player/bhandari/m/utils/UtilityFun.java b/app/src/main/java/com/music/player/bhandari/m/utils/UtilityFun.java index a50fa158..f946af1c 100644 --- a/app/src/main/java/com/music/player/bhandari/m/utils/UtilityFun.java +++ b/app/src/main/java/com/music/player/bhandari/m/utils/UtilityFun.java @@ -25,7 +25,7 @@ import android.os.Looper; import android.provider.MediaStore; import android.provider.Settings; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.DisplayMetrics; import android.util.Log; import android.view.View; @@ -37,7 +37,6 @@ import com.music.player.bhandari.m.MyApp; import com.music.player.bhandari.m.R; import com.music.player.bhandari.m.UIElementHelper.MyDialogBuilder; -import com.music.player.bhandari.m.UIElementHelper.TypeFaceHelper; import com.music.player.bhandari.m.activity.ActivityPermissionSeek; import com.music.player.bhandari.m.model.Constants; import com.music.player.bhandari.m.model.MusicLibrary; @@ -53,7 +52,6 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; -import java.util.Calendar; import java.util.Random; import java.util.concurrent.Executors; diff --git a/app/src/main/res/layout-large/album_card.xml b/app/src/main/res/layout-large/album_card.xml index c338eeae..b35e8196 100644 --- a/app/src/main/res/layout-large/album_card.xml +++ b/app/src/main/res/layout-large/album_card.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - + \ No newline at end of file diff --git a/app/src/main/res/layout-ldpi/activity_now_playing.xml b/app/src/main/res/layout-ldpi/activity_now_playing.xml index 73b23fb0..a7455bd9 100644 --- a/app/src/main/res/layout-ldpi/activity_now_playing.xml +++ b/app/src/main/res/layout-ldpi/activity_now_playing.xml @@ -1,6 +1,6 @@ - - - - + - - + diff --git a/app/src/main/res/layout/acitivty_settings.xml b/app/src/main/res/layout/acitivty_settings.xml index 67144611..a446c6e0 100644 --- a/app/src/main/res/layout/acitivty_settings.xml +++ b/app/src/main/res/layout/acitivty_settings.xml @@ -7,19 +7,19 @@ android:background="@color/colorTransparent" android:theme="@style/AppTheme.AppBarOverlay"> - - - + - - - - - - + - - + - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_invite.xml b/app/src/main/res/layout/activity_invite.xml index 32b9b554..001ec545 100644 --- a/app/src/main/res/layout/activity_invite.xml +++ b/app/src/main/res/layout/activity_invite.xml @@ -1,6 +1,6 @@ - - - - - - + - - + diff --git a/app/src/main/res/layout/activity_licenses.xml b/app/src/main/res/layout/activity_licenses.xml index 66f1709b..d0cd8bf4 100644 --- a/app/src/main/res/layout/activity_licenses.xml +++ b/app/src/main/res/layout/activity_licenses.xml @@ -6,7 +6,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical"> - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_lyric_card.xml b/app/src/main/res/layout/activity_lyric_card.xml index 8a4e6f7d..1ed61b8d 100644 --- a/app/src/main/res/layout/activity_lyric_card.xml +++ b/app/src/main/res/layout/activity_lyric_card.xml @@ -9,7 +9,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"> - - - + - - + diff --git a/app/src/main/res/layout/activity_lyrics_explore.xml b/app/src/main/res/layout/activity_lyrics_explore.xml index 34f91a9c..a2ae790a 100644 --- a/app/src/main/res/layout/activity_lyrics_explore.xml +++ b/app/src/main/res/layout/activity_lyrics_explore.xml @@ -8,7 +8,7 @@ xmlns:ads="http://schemas.android.com/apk/res-auto"> - - - - + - + - - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_now_playing.xml b/app/src/main/res/layout/activity_now_playing.xml index 9cce6d5e..3d7171da 100644 --- a/app/src/main/res/layout/activity_now_playing.xml +++ b/app/src/main/res/layout/activity_now_playing.xml @@ -1,6 +1,6 @@ - - - - + - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_saved_lyrics.xml b/app/src/main/res/layout/activity_saved_lyrics.xml index c03a532b..014a5a33 100644 --- a/app/src/main/res/layout/activity_saved_lyrics.xml +++ b/app/src/main/res/layout/activity_saved_lyrics.xml @@ -8,7 +8,7 @@ android:layout_height="match_parent" xmlns:card_view="http://schemas.android.com/tools"> - - - + - - - - - + - + - - - - - + - - + - + diff --git a/app/src/main/res/layout/activity_tag_editor.xml b/app/src/main/res/layout/activity_tag_editor.xml index 7f17af06..2bda6de7 100644 --- a/app/src/main/res/layout/activity_tag_editor.xml +++ b/app/src/main/res/layout/activity_tag_editor.xml @@ -9,7 +9,7 @@ android:orientation="vertical"> - - - - - + - - + - - + @@ -268,17 +268,17 @@ android:layout_marginBottom="10dp" android:text="Similar Tracks"/> - - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/album_card.xml b/app/src/main/res/layout/album_card.xml index 7f8fbbc1..a575e0c6 100644 --- a/app/src/main/res/layout/album_card.xml +++ b/app/src/main/res/layout/album_card.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - + \ No newline at end of file diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml index 5e0c577f..5b453c29 100644 --- a/app/src/main/res/layout/app_bar_main.xml +++ b/app/src/main/res/layout/app_bar_main.xml @@ -1,5 +1,5 @@ - - - - - + - - + - + - - - + diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml index dcf03f00..629483f4 100644 --- a/app/src/main/res/layout/content_main.xml +++ b/app/src/main/res/layout/content_main.xml @@ -8,7 +8,7 @@ app:layout_behavior="@string/appbar_scrolling_view_behavior" tools:context="com.music.player.bhandari.m.activity.ActivityMain"> - - - - - - - --> - - + - + diff --git a/app/src/main/res/layout/fragment_playlist_item.xml b/app/src/main/res/layout/fragment_playlist_item.xml index d2f4a837..04acb6dc 100644 --- a/app/src/main/res/layout/fragment_playlist_item.xml +++ b/app/src/main/res/layout/fragment_playlist_item.xml @@ -18,7 +18,7 @@ android:scaleType="centerCrop"> --> - - + - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/item_color.xml b/app/src/main/res/layout/item_color.xml index b803b4e2..b15bbc90 100644 --- a/app/src/main/res/layout/item_color.xml +++ b/app/src/main/res/layout/item_color.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/item_invite.xml b/app/src/main/res/layout/item_invite.xml index 2d3c7098..36f093be 100644 --- a/app/src/main/res/layout/item_invite.xml +++ b/app/src/main/res/layout/item_invite.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/item_saved_lyric.xml b/app/src/main/res/layout/item_saved_lyric.xml index 43595e58..5ef7e33e 100644 --- a/app/src/main/res/layout/item_saved_lyric.xml +++ b/app/src/main/res/layout/item_saved_lyric.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/main/res/layout/item_tag.xml b/app/src/main/res/layout/item_tag.xml index ffbbf7a8..893f999f 100644 --- a/app/src/main/res/layout/item_tag.xml +++ b/app/src/main/res/layout/item_tag.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/ringtone_cutter_editor.xml b/app/src/main/res/layout/ringtone_cutter_editor.xml index b89e9262..6c24d73a 100644 --- a/app/src/main/res/layout/ringtone_cutter_editor.xml +++ b/app/src/main/res/layout/ringtone_cutter_editor.xml @@ -26,7 +26,7 @@ android:layout_height="fill_parent" android:orientation="vertical"> - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/tab_sequence_preference.xml b/app/src/main/res/layout/tab_sequence_preference.xml index 0ad046ea..3ede9403 100644 --- a/app/src/main/res/layout/tab_sequence_preference.xml +++ b/app/src/main/res/layout/tab_sequence_preference.xml @@ -3,7 +3,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> - - - - + diff --git a/app/src/main/res/layout/track_item_square_image.xml b/app/src/main/res/layout/track_item_square_image.xml index 6bb071a8..a4f55f17 100644 --- a/app/src/main/res/layout/track_item_square_image.xml +++ b/app/src/main/res/layout/track_item_square_image.xml @@ -1,7 +1,7 @@ - - + diff --git a/app/version.properties b/app/version.properties index 76885a56..a2ba26c9 100644 --- a/app/version.properties +++ b/app/version.properties @@ -1,4 +1,4 @@ -#Sat Oct 17 13:05:09 IST 2020 -VERSION_NUMBER=223 +#Sat Oct 17 21:52:06 IST 2020 +VERSION_NUMBER=224 VERSION_BUILD=742 VERSION_PATCH=3 diff --git a/dialogs/src/main/java/com/afollestad/materialdialogs/DefaultRvAdapter.java b/dialogs/src/main/java/com/afollestad/materialdialogs/DefaultRvAdapter.java index edec3aed..354a4eba 100644 --- a/dialogs/src/main/java/com/afollestad/materialdialogs/DefaultRvAdapter.java +++ b/dialogs/src/main/java/com/afollestad/materialdialogs/DefaultRvAdapter.java @@ -4,8 +4,8 @@ import android.annotation.TargetApi; import android.content.res.Configuration; import android.os.Build; -import android.support.annotation.LayoutRes; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.LayoutRes; +import androidx.recyclerview.widget.RecyclerView; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; diff --git a/dialogs/src/main/java/com/afollestad/materialdialogs/DialogBase.java b/dialogs/src/main/java/com/afollestad/materialdialogs/DialogBase.java index 5f7c68f9..d1b7a85d 100644 --- a/dialogs/src/main/java/com/afollestad/materialdialogs/DialogBase.java +++ b/dialogs/src/main/java/com/afollestad/materialdialogs/DialogBase.java @@ -3,7 +3,7 @@ import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import android.view.ViewGroup; import com.afollestad.materialdialogs.internal.MDRootLayout; diff --git a/dialogs/src/main/java/com/afollestad/materialdialogs/DialogInit.java b/dialogs/src/main/java/com/afollestad/materialdialogs/DialogInit.java index a701a96a..52d2878f 100644 --- a/dialogs/src/main/java/com/afollestad/materialdialogs/DialogInit.java +++ b/dialogs/src/main/java/com/afollestad/materialdialogs/DialogInit.java @@ -5,10 +5,10 @@ import android.graphics.drawable.Drawable; import android.graphics.drawable.GradientDrawable; import android.os.Build; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.annotation.StyleRes; -import android.support.annotation.UiThread; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.StyleRes; +import androidx.annotation.UiThread; import android.text.InputType; import android.text.method.LinkMovementMethod; import android.text.method.PasswordTransformationMethod; diff --git a/dialogs/src/main/java/com/afollestad/materialdialogs/MaterialDialog.java b/dialogs/src/main/java/com/afollestad/materialdialogs/MaterialDialog.java index d120df98..17e9056f 100644 --- a/dialogs/src/main/java/com/afollestad/materialdialogs/MaterialDialog.java +++ b/dialogs/src/main/java/com/afollestad/materialdialogs/MaterialDialog.java @@ -9,22 +9,22 @@ import android.graphics.drawable.Drawable; import android.os.Build; import android.os.Handler; -import android.support.annotation.ArrayRes; -import android.support.annotation.AttrRes; -import android.support.annotation.ColorInt; -import android.support.annotation.ColorRes; -import android.support.annotation.DimenRes; -import android.support.annotation.DrawableRes; -import android.support.annotation.IntRange; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.annotation.UiThread; -import android.support.v4.content.res.ResourcesCompat; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.ArrayRes; +import androidx.annotation.AttrRes; +import androidx.annotation.ColorInt; +import androidx.annotation.ColorRes; +import androidx.annotation.DimenRes; +import androidx.annotation.DrawableRes; +import androidx.annotation.IntRange; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.annotation.UiThread; +import androidx.core.content.res.ResourcesCompat; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.Editable; import android.text.Html; import android.text.TextUtils; @@ -2011,7 +2011,7 @@ public Builder autoDismiss(boolean dismiss) { } /** - * Sets a custom {@link android.support.v7.widget.RecyclerView.Adapter} for the dialog's list + * Sets a custom {@link RecyclerView.Adapter} for the dialog's list * * @param adapter The adapter to set to the list. * @param layoutManager The layout manager to use in the RecyclerView. Pass null to use the diff --git a/dialogs/src/main/java/com/afollestad/materialdialogs/internal/MDRootLayout.java b/dialogs/src/main/java/com/afollestad/materialdialogs/internal/MDRootLayout.java index 1f4493f4..7f2bbddb 100644 --- a/dialogs/src/main/java/com/afollestad/materialdialogs/internal/MDRootLayout.java +++ b/dialogs/src/main/java/com/afollestad/materialdialogs/internal/MDRootLayout.java @@ -8,8 +8,8 @@ import android.graphics.Canvas; import android.graphics.Paint; import android.os.Build; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; diff --git a/dialogs/src/main/java/com/afollestad/materialdialogs/internal/MDTintHelper.java b/dialogs/src/main/java/com/afollestad/materialdialogs/internal/MDTintHelper.java index 075927bb..631b1d23 100644 --- a/dialogs/src/main/java/com/afollestad/materialdialogs/internal/MDTintHelper.java +++ b/dialogs/src/main/java/com/afollestad/materialdialogs/internal/MDTintHelper.java @@ -6,11 +6,11 @@ import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.os.Build; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; -import android.support.v4.content.ContextCompat; -import android.support.v4.graphics.drawable.DrawableCompat; -import android.support.v7.widget.AppCompatEditText; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; +import androidx.core.graphics.drawable.DrawableCompat; +import androidx.appcompat.widget.AppCompatEditText; import android.util.Log; import android.widget.CheckBox; import android.widget.EditText; diff --git a/dialogs/src/main/java/com/afollestad/materialdialogs/internal/ThemeSingleton.java b/dialogs/src/main/java/com/afollestad/materialdialogs/internal/ThemeSingleton.java index fb089011..d48a511e 100644 --- a/dialogs/src/main/java/com/afollestad/materialdialogs/internal/ThemeSingleton.java +++ b/dialogs/src/main/java/com/afollestad/materialdialogs/internal/ThemeSingleton.java @@ -2,8 +2,8 @@ import android.content.res.ColorStateList; import android.graphics.drawable.Drawable; -import android.support.annotation.ColorInt; -import android.support.annotation.DrawableRes; +import androidx.annotation.ColorInt; +import androidx.annotation.DrawableRes; import com.afollestad.materialdialogs.GravityEnum; /** diff --git a/dialogs/src/main/java/com/afollestad/materialdialogs/util/DialogUtils.java b/dialogs/src/main/java/com/afollestad/materialdialogs/util/DialogUtils.java index 74fd0f65..de869097 100644 --- a/dialogs/src/main/java/com/afollestad/materialdialogs/util/DialogUtils.java +++ b/dialogs/src/main/java/com/afollestad/materialdialogs/util/DialogUtils.java @@ -8,13 +8,13 @@ import android.graphics.drawable.Drawable; import android.os.Build; import android.os.IBinder; -import android.support.annotation.ArrayRes; -import android.support.annotation.AttrRes; -import android.support.annotation.ColorInt; -import android.support.annotation.ColorRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; +import androidx.annotation.ArrayRes; +import androidx.annotation.AttrRes; +import androidx.annotation.ColorInt; +import androidx.annotation.ColorRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import android.util.TypedValue; import android.view.View; import android.view.inputmethod.InputMethodManager; diff --git a/dialogs/src/main/java/com/afollestad/materialdialogs/util/RippleHelper.java b/dialogs/src/main/java/com/afollestad/materialdialogs/util/RippleHelper.java index a69e31ea..fd5f61d1 100644 --- a/dialogs/src/main/java/com/afollestad/materialdialogs/util/RippleHelper.java +++ b/dialogs/src/main/java/com/afollestad/materialdialogs/util/RippleHelper.java @@ -5,7 +5,7 @@ import android.graphics.drawable.Drawable; import android.graphics.drawable.RippleDrawable; import android.os.Build; -import android.support.annotation.ColorInt; +import androidx.annotation.ColorInt; /** @author Aidan Follestad (afollestad) */ @TargetApi(Build.VERSION_CODES.LOLLIPOP) diff --git a/dialogs/src/main/java/com/afollestad/materialdialogs/util/TypefaceHelper.java b/dialogs/src/main/java/com/afollestad/materialdialogs/util/TypefaceHelper.java index 35070a41..0163c106 100644 --- a/dialogs/src/main/java/com/afollestad/materialdialogs/util/TypefaceHelper.java +++ b/dialogs/src/main/java/com/afollestad/materialdialogs/util/TypefaceHelper.java @@ -2,7 +2,7 @@ import android.content.Context; import android.graphics.Typeface; -import android.support.v4.util.SimpleArrayMap; +import androidx.collection.SimpleArrayMap; /* Each call to Typeface.createFromAsset will load a new instance of the typeface into memory, diff --git a/dialogs/src/main/res/layout-ldrtl/md_listitem_multichoice.xml b/dialogs/src/main/res/layout-ldrtl/md_listitem_multichoice.xml index 51461fa1..5dc1acfa 100644 --- a/dialogs/src/main/res/layout-ldrtl/md_listitem_multichoice.xml +++ b/dialogs/src/main/res/layout-ldrtl/md_listitem_multichoice.xml @@ -26,7 +26,7 @@ tools:ignore="RtlSymmetry" tools:text="Item"/> - - - - - -