From 8501b55066bea40ea8b33fce3efb3503dd0e6e3f Mon Sep 17 00:00:00 2001 From: dkanada Date: Fri, 25 Sep 2020 00:51:34 +0900 Subject: [PATCH] refactor imports --- .../adapter/AlbumCoverPagerAdapter.java | 8 +++--- .../gramophone/adapter/CategoryAdapter.java | 7 +++--- .../gramophone/adapter/GenreAdapter.java | 11 ++++---- .../adapter/MusicLibraryPagerAdapter.java | 5 ++-- .../gramophone/adapter/PlaylistAdapter.java | 10 ++++---- .../gramophone/adapter/SearchAdapter.java | 10 ++++---- .../adapter/album/AlbumAdapter.java | 13 +++++----- .../adapter/album/HorizontalAlbumAdapter.java | 6 ++--- .../adapter/artist/ArtistAdapter.java | 12 ++++----- .../adapter/base/AbsMultiSelectAdapter.java | 5 ++-- .../adapter/base/MediaEntryViewHolder.java | 7 +++--- .../adapter/song/AbsOffsetSongAdapter.java | 7 +++--- .../adapter/song/AlbumSongAdapter.java | 3 ++- .../adapter/song/ArtistSongAdapter.java | 10 ++++---- .../song/OrderablePlaylistSongAdapter.java | 5 ++-- .../adapter/song/PlayingQueueAdapter.java | 5 ++-- .../adapter/song/PlaylistSongAdapter.java | 5 ++-- .../song/ShuffleButtonSongAdapter.java | 3 ++- .../gramophone/adapter/song/SongAdapter.java | 12 ++++----- .../dialogs/AddToPlaylistDialog.java | 1 + .../dialogs/CreatePlaylistDialog.java | 3 ++- .../dialogs/DeletePlaylistDialog.java | 3 ++- .../dialogs/RemoveFromPlaylistDialog.java | 3 ++- .../dialogs/RenamePlaylistDialog.java | 3 ++- .../gramophone/dialogs/SleepTimerDialog.java | 5 ++-- .../gramophone/dialogs/SongDetailDialog.java | 5 ++-- .../gramophone/glide/BlurTransformation.java | 1 + .../glide/palette/BitmapPaletteWrapper.java | 1 + .../gramophone/interfaces/CabHolder.java | 1 - .../interfaces/PaletteColorHolder.java | 1 - .../dkanada/gramophone/loader/SongLoader.java | 1 + .../preferences/CategoryPreferenceDialog.java | 3 ++- .../NowPlayingScreenPreferenceDialog.java | 9 ++++--- .../gramophone/provider/QueueStore.java | 1 + .../gramophone/service/MultiPlayer.java | 7 +++--- .../gramophone/service/MusicService.java | 1 - .../notification/PlayingNotification.java | 1 + .../notification/PlayingNotificationImpl.java | 5 ++-- .../PlayingNotificationImpl24.java | 2 +- .../shortcuts/AppShortcutIconGenerator.java | 3 ++- .../ui/activities/AboutActivity.java | 5 ++-- .../ui/activities/MainActivity.java | 22 ++++++---------- .../ui/activities/SettingsActivity.java | 5 ++-- .../ui/activities/base/AbsBaseActivity.java | 5 ++-- .../base/AbsMusicServiceActivity.java | 2 +- .../base/AbsSlidingMusicPanelActivity.java | 9 ++++--- .../ui/activities/base/AbsThemeActivity.java | 4 +-- .../details/AlbumDetailActivity.java | 7 +++--- .../details/ArtistDetailActivity.java | 5 ++-- .../details/GenreDetailActivity.java | 7 +++--- .../ui/fragments/AbsMusicServiceFragment.java | 3 ++- .../mainactivity/AbsMainActivityFragment.java | 1 + .../mainactivity/library/LibraryFragment.java | 25 ++++++------------- ...gerRecyclerViewCustomGridSizeFragment.java | 3 ++- .../AbsLibraryPagerRecyclerViewFragment.java | 15 ++++++----- .../library/pager/GenresFragment.java | 1 + .../library/pager/SongsFragment.java | 1 + .../fragments/player/AbsPlayerFragment.java | 4 +-- .../fragments/player/MiniPlayerFragment.java | 5 ++-- .../player/PlayerAlbumCoverFragment.java | 5 ++-- .../player/card/CardPlayerFragment.java | 12 ++++----- .../CardPlayerPlaybackControlsFragment.java | 6 ++--- .../player/flat/FlatPlayerFragment.java | 12 ++++----- .../FlatPlayerPlaybackControlsFragment.java | 5 ++-- .../dkanada/gramophone/util/ImageUtil.java | 7 +++--- .../dkanada/gramophone/util/MusicUtil.java | 7 +++--- .../gramophone/util/NavigationUtil.java | 1 + .../gramophone/util/PreferenceUtil.java | 1 - .../dkanada/gramophone/util/ThemeUtil.java | 1 + .../com/dkanada/gramophone/util/Util.java | 7 +++--- .../com/dkanada/gramophone/util/ViewUtil.java | 3 ++- .../views/HeightFitSquareLayout.java | 1 - .../gramophone/views/IconImageView.java | 3 ++- .../gramophone/views/PlayPauseDrawable.java | 3 ++- .../views/WidthFitSquareLayout.java | 1 - .../gramophone/widgets/AppWidgetAlbum.java | 3 ++- .../gramophone/widgets/AppWidgetCard.java | 5 ++-- .../gramophone/widgets/AppWidgetClassic.java | 5 ++-- 78 files changed, 219 insertions(+), 202 deletions(-) diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/AlbumCoverPagerAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/AlbumCoverPagerAdapter.java index 8636e334..185d2827 100644 --- a/app/src/main/java/com/dkanada/gramophone/adapter/AlbumCoverPagerAdapter.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/AlbumCoverPagerAdapter.java @@ -1,14 +1,14 @@ package com.dkanada.gramophone.adapter; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.bumptech.glide.Glide; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; + import com.dkanada.gramophone.databinding.FragmentAlbumCoverBinding; import com.dkanada.gramophone.glide.CustomGlideRequest; import com.dkanada.gramophone.glide.CustomPaletteTarget; diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/CategoryAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/CategoryAdapter.java index 8bdfae9d..aa89341e 100644 --- a/app/src/main/java/com/dkanada/gramophone/adapter/CategoryAdapter.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/CategoryAdapter.java @@ -1,9 +1,6 @@ package com.dkanada.gramophone.adapter; import android.annotation.SuppressLint; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.ItemTouchHelper; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; @@ -12,6 +9,10 @@ import android.widget.CheckBox; import android.widget.TextView; import android.widget.Toast; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.ItemTouchHelper; + import com.dkanada.gramophone.R; import com.dkanada.gramophone.model.CategoryInfo; import com.dkanada.gramophone.helper.SwipeAndDragHelper; diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/GenreAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/GenreAdapter.java index abbff569..2968a3b9 100644 --- a/app/src/main/java/com/dkanada/gramophone/adapter/GenreAdapter.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/GenreAdapter.java @@ -1,16 +1,15 @@ package com.dkanada.gramophone.adapter; -import androidx.annotation.LayoutRes; -import androidx.annotation.NonNull; -import androidx.appcompat.app.AppCompatActivity; -import androidx.recyclerview.widget.RecyclerView; - import android.graphics.drawable.Drawable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.bumptech.glide.Glide; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.RecyclerView; + import com.dkanada.gramophone.adapter.base.MediaEntryViewHolder; import com.dkanada.gramophone.glide.CustomGlideRequest; import com.dkanada.gramophone.glide.CustomPaletteTarget; diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/MusicLibraryPagerAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/MusicLibraryPagerAdapter.java index a16da5db..954ff883 100644 --- a/app/src/main/java/com/dkanada/gramophone/adapter/MusicLibraryPagerAdapter.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/MusicLibraryPagerAdapter.java @@ -2,12 +2,13 @@ package com.dkanada.gramophone.adapter; import android.content.Context; import android.os.Bundle; +import android.util.SparseArray; +import android.view.ViewGroup; + import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentPagerAdapter; -import android.util.SparseArray; -import android.view.ViewGroup; import com.dkanada.gramophone.model.CategoryInfo; import com.dkanada.gramophone.ui.fragments.mainactivity.library.pager.AlbumsFragment; diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/PlaylistAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/PlaylistAdapter.java index 27dc0099..37666131 100644 --- a/app/src/main/java/com/dkanada/gramophone/adapter/PlaylistAdapter.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/PlaylistAdapter.java @@ -1,17 +1,17 @@ package com.dkanada.gramophone.adapter; import android.graphics.drawable.Drawable; -import androidx.annotation.LayoutRes; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatActivity; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.widget.PopupMenu; -import com.bumptech.glide.Glide; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; + import com.dkanada.gramophone.R; import com.dkanada.gramophone.adapter.base.AbsMultiSelectAdapter; import com.dkanada.gramophone.adapter.base.MediaEntryViewHolder; diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/SearchAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/SearchAdapter.java index f7692aed..578481f0 100644 --- a/app/src/main/java/com/dkanada/gramophone/adapter/SearchAdapter.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/SearchAdapter.java @@ -1,15 +1,15 @@ package com.dkanada.gramophone.adapter; import android.os.Build; -import androidx.annotation.NonNull; -import androidx.core.util.Pair; -import androidx.appcompat.app.AppCompatActivity; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.bumptech.glide.Glide; +import androidx.annotation.NonNull; +import androidx.core.util.Pair; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.RecyclerView; + import com.kabouzeid.appthemehelper.util.ATHUtil; import com.dkanada.gramophone.R; import com.dkanada.gramophone.adapter.base.MediaEntryViewHolder; diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/album/AlbumAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/album/AlbumAdapter.java index fd0fc19a..848d972c 100644 --- a/app/src/main/java/com/dkanada/gramophone/adapter/album/AlbumAdapter.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/album/AlbumAdapter.java @@ -1,17 +1,17 @@ package com.dkanada.gramophone.adapter.album; import android.graphics.drawable.Drawable; -import androidx.annotation.LayoutRes; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.util.Pair; -import androidx.appcompat.app.AppCompatActivity; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import com.bumptech.glide.Glide; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.util.Pair; +import androidx.appcompat.app.AppCompatActivity; + import com.kabouzeid.appthemehelper.util.ColorUtil; import com.kabouzeid.appthemehelper.util.MaterialValueHelper; import com.dkanada.gramophone.R; @@ -27,7 +27,6 @@ import com.dkanada.gramophone.model.Song; import com.dkanada.gramophone.util.MusicUtil; import com.dkanada.gramophone.util.NavigationUtil; import com.dkanada.gramophone.util.PreferenceUtil; - import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView; import java.util.ArrayList; diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/album/HorizontalAlbumAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/album/HorizontalAlbumAdapter.java index 31740858..03477650 100644 --- a/app/src/main/java/com/dkanada/gramophone/adapter/album/HorizontalAlbumAdapter.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/album/HorizontalAlbumAdapter.java @@ -1,14 +1,14 @@ package com.dkanada.gramophone.adapter.album; import android.graphics.drawable.Drawable; +import android.view.View; +import android.view.ViewGroup; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; import androidx.cardview.widget.CardView; -import android.view.View; -import android.view.ViewGroup; -import com.bumptech.glide.Glide; import com.kabouzeid.appthemehelper.util.ColorUtil; import com.kabouzeid.appthemehelper.util.MaterialValueHelper; import com.dkanada.gramophone.glide.CustomGlideRequest; diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/artist/ArtistAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/artist/ArtistAdapter.java index 5ad0e558..4fb2d9fe 100644 --- a/app/src/main/java/com/dkanada/gramophone/adapter/artist/ArtistAdapter.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/artist/ArtistAdapter.java @@ -1,17 +1,17 @@ package com.dkanada.gramophone.adapter.artist; import android.graphics.drawable.Drawable; -import androidx.annotation.LayoutRes; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.util.Pair; -import androidx.appcompat.app.AppCompatActivity; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import com.bumptech.glide.Glide; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.util.Pair; +import androidx.appcompat.app.AppCompatActivity; + import com.kabouzeid.appthemehelper.util.ColorUtil; import com.kabouzeid.appthemehelper.util.MaterialValueHelper; import com.dkanada.gramophone.R; diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/base/AbsMultiSelectAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/base/AbsMultiSelectAdapter.java index dbbb7443..78d0ba64 100644 --- a/app/src/main/java/com/dkanada/gramophone/adapter/base/AbsMultiSelectAdapter.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/base/AbsMultiSelectAdapter.java @@ -1,11 +1,12 @@ package com.dkanada.gramophone.adapter.base; import android.content.Context; +import android.view.Menu; +import android.view.MenuItem; + import androidx.annotation.MenuRes; import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; -import android.view.Menu; -import android.view.MenuItem; import com.afollestad.materialcab.MaterialCab; import com.dkanada.gramophone.R; diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/base/MediaEntryViewHolder.java b/app/src/main/java/com/dkanada/gramophone/adapter/base/MediaEntryViewHolder.java index 19d218d9..629bb89a 100644 --- a/app/src/main/java/com/dkanada/gramophone/adapter/base/MediaEntryViewHolder.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/base/MediaEntryViewHolder.java @@ -1,13 +1,14 @@ package com.dkanada.gramophone.adapter.base; import android.os.Build; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; + import com.dkanada.gramophone.R; public class MediaEntryViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener { diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/song/AbsOffsetSongAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/song/AbsOffsetSongAdapter.java index 7b936337..c56983f9 100644 --- a/app/src/main/java/com/dkanada/gramophone/adapter/song/AbsOffsetSongAdapter.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/song/AbsOffsetSongAdapter.java @@ -1,12 +1,13 @@ package com.dkanada.gramophone.adapter.song; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + import androidx.annotation.LayoutRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; import com.dkanada.gramophone.R; import com.dkanada.gramophone.helper.MusicPlayerRemote; diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/song/AlbumSongAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/song/AlbumSongAdapter.java index d22109aa..507a1716 100644 --- a/app/src/main/java/com/dkanada/gramophone/adapter/song/AlbumSongAdapter.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/song/AlbumSongAdapter.java @@ -1,10 +1,11 @@ package com.dkanada.gramophone.adapter.song; +import android.view.View; + import androidx.annotation.LayoutRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import android.view.View; import com.dkanada.gramophone.interfaces.CabHolder; import com.dkanada.gramophone.model.Song; diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/song/ArtistSongAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/song/ArtistSongAdapter.java index c5f02ea9..865e1e58 100644 --- a/app/src/main/java/com/dkanada/gramophone/adapter/song/ArtistSongAdapter.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/song/ArtistSongAdapter.java @@ -1,10 +1,6 @@ package com.dkanada.gramophone.adapter.song; import android.os.Build; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.util.Pair; -import androidx.appcompat.app.AppCompatActivity; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; @@ -14,8 +10,12 @@ import android.widget.ArrayAdapter; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.util.Pair; +import androidx.appcompat.app.AppCompatActivity; + import com.afollestad.materialcab.MaterialCab; -import com.bumptech.glide.Glide; import com.dkanada.gramophone.R; import com.dkanada.gramophone.glide.CustomGlideRequest; import com.dkanada.gramophone.helper.MusicPlayerRemote; diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/song/OrderablePlaylistSongAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/song/OrderablePlaylistSongAdapter.java index c4d71e0d..557a520e 100644 --- a/app/src/main/java/com/dkanada/gramophone/adapter/song/OrderablePlaylistSongAdapter.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/song/OrderablePlaylistSongAdapter.java @@ -1,11 +1,12 @@ package com.dkanada.gramophone.adapter.song; +import android.view.MenuItem; +import android.view.View; + import androidx.annotation.LayoutRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import android.view.MenuItem; -import android.view.View; import com.h6ah4i.android.widget.advrecyclerview.draggable.DraggableItemAdapter; import com.h6ah4i.android.widget.advrecyclerview.draggable.DraggableItemViewHolder; diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/song/PlayingQueueAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/song/PlayingQueueAdapter.java index 1789470b..fafb53fd 100644 --- a/app/src/main/java/com/dkanada/gramophone/adapter/song/PlayingQueueAdapter.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/song/PlayingQueueAdapter.java @@ -1,11 +1,12 @@ package com.dkanada.gramophone.adapter.song; +import android.view.MenuItem; +import android.view.View; + import androidx.annotation.LayoutRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import android.view.MenuItem; -import android.view.View; import com.h6ah4i.android.widget.advrecyclerview.draggable.DraggableItemAdapter; import com.h6ah4i.android.widget.advrecyclerview.draggable.DraggableItemViewHolder; diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/song/PlaylistSongAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/song/PlaylistSongAdapter.java index 4b06c3f9..98b69f5d 100644 --- a/app/src/main/java/com/dkanada/gramophone/adapter/song/PlaylistSongAdapter.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/song/PlaylistSongAdapter.java @@ -1,12 +1,13 @@ package com.dkanada.gramophone.adapter.song; +import android.view.MenuItem; +import android.view.View; + import androidx.annotation.LayoutRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.util.Pair; import androidx.appcompat.app.AppCompatActivity; -import android.view.MenuItem; -import android.view.View; import com.kabouzeid.appthemehelper.ThemeStore; import com.dkanada.gramophone.R; diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/song/ShuffleButtonSongAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/song/ShuffleButtonSongAdapter.java index 4bf1b998..43738ac7 100644 --- a/app/src/main/java/com/dkanada/gramophone/adapter/song/ShuffleButtonSongAdapter.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/song/ShuffleButtonSongAdapter.java @@ -1,11 +1,12 @@ package com.dkanada.gramophone.adapter.song; import android.graphics.Typeface; +import android.view.View; + import androidx.annotation.LayoutRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import android.view.View; import com.kabouzeid.appthemehelper.ThemeStore; import com.dkanada.gramophone.R; diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/song/SongAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/song/SongAdapter.java index a99d07a9..cc953db9 100644 --- a/app/src/main/java/com/dkanada/gramophone/adapter/song/SongAdapter.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/song/SongAdapter.java @@ -1,18 +1,18 @@ package com.dkanada.gramophone.adapter.song; import android.graphics.drawable.Drawable; -import androidx.annotation.LayoutRes; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.util.Pair; -import androidx.appcompat.app.AppCompatActivity; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.util.Pair; +import androidx.appcompat.app.AppCompatActivity; + import com.afollestad.materialcab.MaterialCab; -import com.bumptech.glide.Glide; import com.kabouzeid.appthemehelper.util.ColorUtil; import com.kabouzeid.appthemehelper.util.MaterialValueHelper; import com.dkanada.gramophone.R; diff --git a/app/src/main/java/com/dkanada/gramophone/dialogs/AddToPlaylistDialog.java b/app/src/main/java/com/dkanada/gramophone/dialogs/AddToPlaylistDialog.java index e2527fb4..4a94b0ba 100644 --- a/app/src/main/java/com/dkanada/gramophone/dialogs/AddToPlaylistDialog.java +++ b/app/src/main/java/com/dkanada/gramophone/dialogs/AddToPlaylistDialog.java @@ -2,6 +2,7 @@ package com.dkanada.gramophone.dialogs; import android.app.Dialog; import android.os.Bundle; + import androidx.annotation.NonNull; import androidx.fragment.app.DialogFragment; diff --git a/app/src/main/java/com/dkanada/gramophone/dialogs/CreatePlaylistDialog.java b/app/src/main/java/com/dkanada/gramophone/dialogs/CreatePlaylistDialog.java index 9074708c..e5414f3d 100644 --- a/app/src/main/java/com/dkanada/gramophone/dialogs/CreatePlaylistDialog.java +++ b/app/src/main/java/com/dkanada/gramophone/dialogs/CreatePlaylistDialog.java @@ -2,10 +2,11 @@ package com.dkanada.gramophone.dialogs; import android.app.Dialog; import android.os.Bundle; +import android.text.InputType; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.DialogFragment; -import android.text.InputType; import com.afollestad.materialdialogs.MaterialDialog; import com.dkanada.gramophone.R; diff --git a/app/src/main/java/com/dkanada/gramophone/dialogs/DeletePlaylistDialog.java b/app/src/main/java/com/dkanada/gramophone/dialogs/DeletePlaylistDialog.java index ffadf63a..dcf31f2f 100644 --- a/app/src/main/java/com/dkanada/gramophone/dialogs/DeletePlaylistDialog.java +++ b/app/src/main/java/com/dkanada/gramophone/dialogs/DeletePlaylistDialog.java @@ -2,9 +2,10 @@ package com.dkanada.gramophone.dialogs; import android.app.Dialog; import android.os.Bundle; +import android.text.Html; + import androidx.annotation.NonNull; import androidx.fragment.app.DialogFragment; -import android.text.Html; import com.afollestad.materialdialogs.MaterialDialog; import com.dkanada.gramophone.R; diff --git a/app/src/main/java/com/dkanada/gramophone/dialogs/RemoveFromPlaylistDialog.java b/app/src/main/java/com/dkanada/gramophone/dialogs/RemoveFromPlaylistDialog.java index 5580293c..155ff203 100644 --- a/app/src/main/java/com/dkanada/gramophone/dialogs/RemoveFromPlaylistDialog.java +++ b/app/src/main/java/com/dkanada/gramophone/dialogs/RemoveFromPlaylistDialog.java @@ -2,9 +2,10 @@ package com.dkanada.gramophone.dialogs; import android.app.Dialog; import android.os.Bundle; +import android.text.Html; + import androidx.annotation.NonNull; import androidx.fragment.app.DialogFragment; -import android.text.Html; import com.afollestad.materialdialogs.MaterialDialog; import com.dkanada.gramophone.R; diff --git a/app/src/main/java/com/dkanada/gramophone/dialogs/RenamePlaylistDialog.java b/app/src/main/java/com/dkanada/gramophone/dialogs/RenamePlaylistDialog.java index f8513d6a..5ea065ac 100644 --- a/app/src/main/java/com/dkanada/gramophone/dialogs/RenamePlaylistDialog.java +++ b/app/src/main/java/com/dkanada/gramophone/dialogs/RenamePlaylistDialog.java @@ -2,9 +2,10 @@ package com.dkanada.gramophone.dialogs; import android.app.Dialog; import android.os.Bundle; +import android.text.InputType; + import androidx.annotation.NonNull; import androidx.fragment.app.DialogFragment; -import android.text.InputType; import com.afollestad.materialdialogs.MaterialDialog; import com.dkanada.gramophone.R; diff --git a/app/src/main/java/com/dkanada/gramophone/dialogs/SleepTimerDialog.java b/app/src/main/java/com/dkanada/gramophone/dialogs/SleepTimerDialog.java index 4791483b..88a1a7b0 100644 --- a/app/src/main/java/com/dkanada/gramophone/dialogs/SleepTimerDialog.java +++ b/app/src/main/java/com/dkanada/gramophone/dialogs/SleepTimerDialog.java @@ -9,11 +9,12 @@ import android.content.Intent; import android.os.Bundle; import android.os.CountDownTimer; import android.os.SystemClock; -import androidx.annotation.NonNull; -import androidx.fragment.app.DialogFragment; import android.widget.FrameLayout; import android.widget.Toast; +import androidx.annotation.NonNull; +import androidx.fragment.app.DialogFragment; + import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.internal.ThemeSingleton; diff --git a/app/src/main/java/com/dkanada/gramophone/dialogs/SongDetailDialog.java b/app/src/main/java/com/dkanada/gramophone/dialogs/SongDetailDialog.java index d05613be..bd4f4d49 100644 --- a/app/src/main/java/com/dkanada/gramophone/dialogs/SongDetailDialog.java +++ b/app/src/main/java/com/dkanada/gramophone/dialogs/SongDetailDialog.java @@ -4,13 +4,14 @@ import android.app.Activity; import android.app.Dialog; import android.content.Context; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.fragment.app.DialogFragment; import android.text.Html; import android.text.Spanned; import android.view.View; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.fragment.app.DialogFragment; + import com.afollestad.materialdialogs.MaterialDialog; import com.dkanada.gramophone.R; import com.dkanada.gramophone.model.Song; diff --git a/app/src/main/java/com/dkanada/gramophone/glide/BlurTransformation.java b/app/src/main/java/com/dkanada/gramophone/glide/BlurTransformation.java index 1e3b2792..a9ec36ee 100644 --- a/app/src/main/java/com/dkanada/gramophone/glide/BlurTransformation.java +++ b/app/src/main/java/com/dkanada/gramophone/glide/BlurTransformation.java @@ -8,6 +8,7 @@ import android.renderscript.Allocation; import android.renderscript.Element; import android.renderscript.RenderScript; import android.renderscript.ScriptIntrinsicBlur; + import androidx.annotation.FloatRange; import androidx.annotation.NonNull; diff --git a/app/src/main/java/com/dkanada/gramophone/glide/palette/BitmapPaletteWrapper.java b/app/src/main/java/com/dkanada/gramophone/glide/palette/BitmapPaletteWrapper.java index 3aaa89f8..e7af6f2e 100644 --- a/app/src/main/java/com/dkanada/gramophone/glide/palette/BitmapPaletteWrapper.java +++ b/app/src/main/java/com/dkanada/gramophone/glide/palette/BitmapPaletteWrapper.java @@ -1,6 +1,7 @@ package com.dkanada.gramophone.glide.palette; import android.graphics.Bitmap; + import androidx.palette.graphics.Palette; public class BitmapPaletteWrapper { diff --git a/app/src/main/java/com/dkanada/gramophone/interfaces/CabHolder.java b/app/src/main/java/com/dkanada/gramophone/interfaces/CabHolder.java index 72ece569..4c0b68cc 100644 --- a/app/src/main/java/com/dkanada/gramophone/interfaces/CabHolder.java +++ b/app/src/main/java/com/dkanada/gramophone/interfaces/CabHolder.java @@ -5,7 +5,6 @@ import androidx.annotation.NonNull; import com.afollestad.materialcab.MaterialCab; public interface CabHolder { - @NonNull MaterialCab openCab(final int menuRes, final MaterialCab.Callback callback); } diff --git a/app/src/main/java/com/dkanada/gramophone/interfaces/PaletteColorHolder.java b/app/src/main/java/com/dkanada/gramophone/interfaces/PaletteColorHolder.java index da91fbb6..c66628bd 100644 --- a/app/src/main/java/com/dkanada/gramophone/interfaces/PaletteColorHolder.java +++ b/app/src/main/java/com/dkanada/gramophone/interfaces/PaletteColorHolder.java @@ -3,7 +3,6 @@ package com.dkanada.gramophone.interfaces; import androidx.annotation.ColorInt; public interface PaletteColorHolder { - @ColorInt int getPaletteColor(); } diff --git a/app/src/main/java/com/dkanada/gramophone/loader/SongLoader.java b/app/src/main/java/com/dkanada/gramophone/loader/SongLoader.java index 575fe9e4..5aa5e3fe 100644 --- a/app/src/main/java/com/dkanada/gramophone/loader/SongLoader.java +++ b/app/src/main/java/com/dkanada/gramophone/loader/SongLoader.java @@ -5,6 +5,7 @@ import android.database.Cursor; import android.provider.BaseColumns; import android.provider.MediaStore; import android.provider.MediaStore.Audio.AudioColumns; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/app/src/main/java/com/dkanada/gramophone/preferences/CategoryPreferenceDialog.java b/app/src/main/java/com/dkanada/gramophone/preferences/CategoryPreferenceDialog.java index 49685148..879671f3 100644 --- a/app/src/main/java/com/dkanada/gramophone/preferences/CategoryPreferenceDialog.java +++ b/app/src/main/java/com/dkanada/gramophone/preferences/CategoryPreferenceDialog.java @@ -2,11 +2,12 @@ package com.dkanada.gramophone.preferences; import android.app.Dialog; import android.os.Bundle; +import android.view.View; + import androidx.annotation.NonNull; import androidx.fragment.app.DialogFragment; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import android.view.View; import com.afollestad.materialdialogs.MaterialDialog; import com.dkanada.gramophone.R; diff --git a/app/src/main/java/com/dkanada/gramophone/preferences/NowPlayingScreenPreferenceDialog.java b/app/src/main/java/com/dkanada/gramophone/preferences/NowPlayingScreenPreferenceDialog.java index 045e2a18..01d8c862 100644 --- a/app/src/main/java/com/dkanada/gramophone/preferences/NowPlayingScreenPreferenceDialog.java +++ b/app/src/main/java/com/dkanada/gramophone/preferences/NowPlayingScreenPreferenceDialog.java @@ -5,16 +5,17 @@ import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.fragment.app.DialogFragment; -import androidx.viewpager.widget.PagerAdapter; -import androidx.viewpager.widget.ViewPager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.fragment.app.DialogFragment; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; + import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.MaterialDialog; import com.heinrichreimersoftware.materialintro.view.InkPageIndicator; diff --git a/app/src/main/java/com/dkanada/gramophone/provider/QueueStore.java b/app/src/main/java/com/dkanada/gramophone/provider/QueueStore.java index 0a7af241..fc34f6ab 100644 --- a/app/src/main/java/com/dkanada/gramophone/provider/QueueStore.java +++ b/app/src/main/java/com/dkanada/gramophone/provider/QueueStore.java @@ -23,6 +23,7 @@ import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; import android.provider.BaseColumns; import android.provider.MediaStore.Audio.AudioColumns; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/app/src/main/java/com/dkanada/gramophone/service/MultiPlayer.java b/app/src/main/java/com/dkanada/gramophone/service/MultiPlayer.java index c8628e46..54894fa3 100644 --- a/app/src/main/java/com/dkanada/gramophone/service/MultiPlayer.java +++ b/app/src/main/java/com/dkanada/gramophone/service/MultiPlayer.java @@ -1,16 +1,15 @@ package com.dkanada.gramophone.service; import android.content.Context; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.net.Uri; - import android.util.Log; import android.widget.Toast; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.dkanada.gramophone.R; import com.dkanada.gramophone.service.playback.Playback; - import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.Player; diff --git a/app/src/main/java/com/dkanada/gramophone/service/MusicService.java b/app/src/main/java/com/dkanada/gramophone/service/MusicService.java index d6cfbffe..8b63907b 100644 --- a/app/src/main/java/com/dkanada/gramophone/service/MusicService.java +++ b/app/src/main/java/com/dkanada/gramophone/service/MusicService.java @@ -32,7 +32,6 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.bumptech.glide.Glide; import com.bumptech.glide.RequestBuilder; import com.bumptech.glide.request.target.SimpleTarget; import com.bumptech.glide.request.transition.Transition; diff --git a/app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotification.java b/app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotification.java index 2930c8ec..a7b10f1f 100644 --- a/app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotification.java +++ b/app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotification.java @@ -4,6 +4,7 @@ import android.app.Notification; import android.app.NotificationChannel; import android.app.NotificationManager; import android.os.Build; + import androidx.annotation.RequiresApi; import com.dkanada.gramophone.R; diff --git a/app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotificationImpl.java b/app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotificationImpl.java index f0e429ab..d7421796 100644 --- a/app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotificationImpl.java +++ b/app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotificationImpl.java @@ -8,12 +8,13 @@ import android.content.Intent; import android.graphics.Bitmap; import android.graphics.Color; import android.graphics.drawable.Drawable; -import androidx.annotation.Nullable; -import androidx.core.app.NotificationCompat; import android.text.TextUtils; import android.view.View; import android.widget.RemoteViews; +import androidx.annotation.Nullable; +import androidx.core.app.NotificationCompat; + import com.bumptech.glide.Glide; import com.bumptech.glide.request.target.SimpleTarget; import com.bumptech.glide.request.target.Target; diff --git a/app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotificationImpl24.java b/app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotificationImpl24.java index 4f69949d..6c41d1c9 100644 --- a/app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotificationImpl24.java +++ b/app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotificationImpl24.java @@ -8,11 +8,11 @@ import android.graphics.BitmapFactory; import android.graphics.Color; import android.graphics.drawable.Drawable; import android.os.Build; + import androidx.core.app.NotificationCompat; import androidx.media.app.NotificationCompat.MediaStyle; import androidx.palette.graphics.Palette; -import com.bumptech.glide.Glide; import com.bumptech.glide.request.target.SimpleTarget; import com.bumptech.glide.request.transition.Transition; import com.dkanada.gramophone.R; diff --git a/app/src/main/java/com/dkanada/gramophone/shortcuts/AppShortcutIconGenerator.java b/app/src/main/java/com/dkanada/gramophone/shortcuts/AppShortcutIconGenerator.java index f3abdaf3..a1828ae5 100644 --- a/app/src/main/java/com/dkanada/gramophone/shortcuts/AppShortcutIconGenerator.java +++ b/app/src/main/java/com/dkanada/gramophone/shortcuts/AppShortcutIconGenerator.java @@ -6,9 +6,10 @@ import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; import android.graphics.drawable.LayerDrawable; import android.os.Build; +import android.util.TypedValue; + import androidx.annotation.RequiresApi; import androidx.core.graphics.drawable.IconCompat; -import android.util.TypedValue; import com.kabouzeid.appthemehelper.ThemeStore; import com.dkanada.gramophone.R; diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/AboutActivity.java b/app/src/main/java/com/dkanada/gramophone/ui/activities/AboutActivity.java index 6f7fe7ce..ab549bdf 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/activities/AboutActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/activities/AboutActivity.java @@ -5,17 +5,18 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.net.Uri; import android.os.Bundle; -import androidx.annotation.NonNull; import android.view.MenuItem; import android.view.View; +import androidx.annotation.NonNull; + +import com.kabouzeid.appthemehelper.ThemeStore; import com.dkanada.gramophone.databinding.ActivityAboutBinding; import com.dkanada.gramophone.databinding.CardAboutAppBinding; import com.dkanada.gramophone.databinding.CardAuthorBinding; import com.dkanada.gramophone.databinding.CardSpecialThanksBinding; import com.dkanada.gramophone.databinding.CardSupportDevelopmentBinding; import com.dkanada.gramophone.R; -import com.kabouzeid.appthemehelper.ThemeStore; import com.dkanada.gramophone.ui.activities.base.AbsBaseActivity; @SuppressWarnings("FieldCanBeLocal") diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/MainActivity.java b/app/src/main/java/com/dkanada/gramophone/ui/activities/MainActivity.java index e391f5fe..50f37433 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/activities/MainActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/activities/MainActivity.java @@ -4,28 +4,23 @@ import android.content.Intent; import android.os.Build; import android.os.Bundle; import android.os.Handler; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import com.dkanada.gramophone.databinding.ActivityMainContentBinding; -import com.dkanada.gramophone.databinding.ActivityMainDrawerLayoutBinding; -import com.dkanada.gramophone.databinding.NavigationDrawerHeaderBinding; -import com.dkanada.gramophone.dialogs.ConfirmLogoutDialog; -import androidx.fragment.app.Fragment; -import androidx.drawerlayout.widget.DrawerLayout; - import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; -import com.bumptech.glide.Glide; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.drawerlayout.widget.DrawerLayout; import com.kabouzeid.appthemehelper.ThemeStore; import com.kabouzeid.appthemehelper.util.ATHUtil; import com.kabouzeid.appthemehelper.util.NavigationViewUtil; +import com.dkanada.gramophone.databinding.ActivityMainContentBinding; +import com.dkanada.gramophone.databinding.ActivityMainDrawerLayoutBinding; +import com.dkanada.gramophone.databinding.NavigationDrawerHeaderBinding; +import com.dkanada.gramophone.dialogs.ConfirmLogoutDialog; import com.dkanada.gramophone.R; import com.dkanada.gramophone.glide.CustomGlideRequest; import com.dkanada.gramophone.helper.MusicPlayerRemote; @@ -34,7 +29,6 @@ import com.dkanada.gramophone.model.Song; import com.dkanada.gramophone.ui.activities.base.AbsSlidingMusicPanelActivity; import com.dkanada.gramophone.ui.fragments.mainactivity.library.LibraryFragment; import com.dkanada.gramophone.util.MusicUtil; - import com.dkanada.gramophone.util.QueryUtil; import com.sothree.slidinguppanel.SlidingUpPanelLayout; diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/SettingsActivity.java b/app/src/main/java/com/dkanada/gramophone/ui/activities/SettingsActivity.java index e5206557..3ebe925e 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/activities/SettingsActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/activities/SettingsActivity.java @@ -3,6 +3,9 @@ package com.dkanada.gramophone.ui.activities; import android.content.SharedPreferences; import android.os.Build; import android.os.Bundle; +import android.view.MenuItem; +import android.view.View; + import androidx.annotation.ColorInt; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -11,8 +14,6 @@ import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceManager; import androidx.preference.TwoStatePreference; -import android.view.MenuItem; -import android.view.View; import com.afollestad.materialdialogs.color.ColorChooserDialog; import com.dkanada.gramophone.databinding.ActivitySettingsBinding; diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsBaseActivity.java b/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsBaseActivity.java index a0cf842a..935fee2f 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsBaseActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsBaseActivity.java @@ -8,16 +8,17 @@ import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.provider.Settings; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; - -import com.google.android.material.snackbar.Snackbar; import androidx.core.app.ActivityCompat; + import android.view.KeyEvent; import android.view.View; import com.kabouzeid.appthemehelper.ThemeStore; import com.dkanada.gramophone.R; +import com.google.android.material.snackbar.Snackbar; public abstract class AbsBaseActivity extends AbsThemeActivity { public static final int PERMISSION_REQUEST = 100; diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsMusicServiceActivity.java b/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsMusicServiceActivity.java index 33e7674f..231ee5ca 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsMusicServiceActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsMusicServiceActivity.java @@ -9,6 +9,7 @@ import android.content.IntentFilter; import android.content.ServiceConnection; import android.os.Bundle; import android.os.IBinder; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -22,7 +23,6 @@ import java.util.ArrayList; import java.util.List; public abstract class AbsMusicServiceActivity extends AbsBaseActivity implements MusicServiceEventListener { - private final List mMusicServiceEventListeners = new ArrayList<>(); private MusicPlayerRemote.ServiceToken serviceToken; diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java b/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java index e766877e..cddeb356 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java @@ -5,15 +5,16 @@ import android.animation.ValueAnimator; import android.content.Intent; import android.os.Build; import android.os.Bundle; -import androidx.annotation.ColorInt; -import androidx.annotation.FloatRange; -import androidx.core.graphics.ColorUtils; -import androidx.fragment.app.Fragment; import android.view.View; import android.view.ViewGroup; import android.view.ViewTreeObserver; import android.view.animation.PathInterpolator; +import androidx.annotation.ColorInt; +import androidx.annotation.FloatRange; +import androidx.core.graphics.ColorUtils; +import androidx.fragment.app.Fragment; + import com.dkanada.gramophone.App; import com.dkanada.gramophone.R; import com.dkanada.gramophone.databinding.SlidingMusicPanelLayoutBinding; diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsThemeActivity.java b/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsThemeActivity.java index 14420c0e..9aed1705 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsThemeActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsThemeActivity.java @@ -1,11 +1,11 @@ package com.dkanada.gramophone.ui.activities.base; -import android.graphics.Color; import android.os.Build; import android.os.Bundle; -import androidx.annotation.ColorInt; import android.view.View; +import androidx.annotation.ColorInt; + import com.kabouzeid.appthemehelper.ATH; import com.kabouzeid.appthemehelper.ThemeStore; import com.kabouzeid.appthemehelper.common.ATHToolbarActivity; diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/details/AlbumDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/ui/activities/details/AlbumDetailActivity.java index 6ce8354b..1f93cb79 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/activities/details/AlbumDetailActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/activities/details/AlbumDetailActivity.java @@ -2,15 +2,14 @@ package com.dkanada.gramophone.ui.activities.details; import android.graphics.PorterDuff; import android.os.Bundle; +import android.view.Menu; +import android.view.MenuItem; +import android.view.View; import androidx.annotation.NonNull; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import android.view.Menu; -import android.view.MenuItem; -import android.view.View; - import com.afollestad.materialcab.MaterialCab; import com.afollestad.materialdialogs.util.DialogUtils; import com.dkanada.gramophone.databinding.ActivityAlbumDetailBinding; diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/details/ArtistDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/ui/activities/details/ArtistDetailActivity.java index 7c05529a..61fbd10b 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/activities/details/ArtistDetailActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/activities/details/ArtistDetailActivity.java @@ -11,11 +11,8 @@ import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import java.util.List; - import com.afollestad.materialcab.MaterialCab; import com.afollestad.materialdialogs.util.DialogUtils; -import com.bumptech.glide.Glide; import com.dkanada.gramophone.adapter.song.SongAdapter; import com.dkanada.gramophone.databinding.ActivityArtistDetailBinding; import com.google.android.material.appbar.AppBarLayout; @@ -42,6 +39,8 @@ import com.dkanada.gramophone.util.QueryUtil; import org.jellyfin.apiclient.model.querying.ItemQuery; +import java.util.List; + public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implements PaletteColorHolder, CabHolder, AppBarLayout.OnOffsetChangedListener { public static final String EXTRA_ARTIST = "extra_artist"; diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/details/GenreDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/ui/activities/details/GenreDetailActivity.java index 82533e5d..34246d8a 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/activities/details/GenreDetailActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/activities/details/GenreDetailActivity.java @@ -1,13 +1,14 @@ package com.dkanada.gramophone.ui.activities.details; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import android.view.Menu; import android.view.MenuItem; import android.view.View; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.afollestad.materialcab.MaterialCab; import com.dkanada.gramophone.databinding.ActivityGenreDetailBinding; import com.h6ah4i.android.widget.advrecyclerview.utils.WrapperAdapterUtils; diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/AbsMusicServiceFragment.java b/app/src/main/java/com/dkanada/gramophone/ui/fragments/AbsMusicServiceFragment.java index 2697ce13..f1095b29 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/AbsMusicServiceFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/fragments/AbsMusicServiceFragment.java @@ -2,9 +2,10 @@ package com.dkanada.gramophone.ui.fragments; import android.content.Context; import android.os.Bundle; +import android.view.View; + import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; -import android.view.View; import com.dkanada.gramophone.interfaces.MusicServiceEventListener; import com.dkanada.gramophone.ui.activities.base.AbsMusicServiceActivity; diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/AbsMainActivityFragment.java b/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/AbsMainActivityFragment.java index e1133f46..358f98c3 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/AbsMainActivityFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/AbsMainActivityFragment.java @@ -1,6 +1,7 @@ package com.dkanada.gramophone.ui.fragments.mainactivity; import android.os.Bundle; + import androidx.fragment.app.Fragment; import com.dkanada.gramophone.ui.activities.MainActivity; diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java b/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java index e8ad8b20..e5fee4bb 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java @@ -4,16 +4,6 @@ import android.app.Activity; import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import com.dkanada.gramophone.App; -import com.dkanada.gramophone.databinding.FragmentLibraryBinding; -import com.dkanada.gramophone.model.Song; -import com.dkanada.gramophone.util.QueryUtil; -import com.google.android.material.appbar.AppBarLayout; -import androidx.fragment.app.Fragment; -import androidx.viewpager.widget.ViewPager; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -22,6 +12,13 @@ import android.view.SubMenu; import android.view.View; import android.view.ViewGroup; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +import com.dkanada.gramophone.databinding.FragmentLibraryBinding; +import com.google.android.material.appbar.AppBarLayout; import com.afollestad.materialcab.MaterialCab; import com.kabouzeid.appthemehelper.ThemeStore; import com.kabouzeid.appthemehelper.common.ATHToolbarActivity; @@ -47,14 +44,6 @@ import com.dkanada.gramophone.util.ThemeUtil; import com.dkanada.gramophone.util.PreferenceUtil; import com.dkanada.gramophone.util.Util; -import org.jellyfin.apiclient.interaction.Response; -import org.jellyfin.apiclient.model.dto.BaseItemDto; -import org.jellyfin.apiclient.model.querying.ItemQuery; -import org.jellyfin.apiclient.model.querying.ItemsResult; - -import java.util.ArrayList; -import java.util.List; - public class LibraryFragment extends AbsMainActivityFragment implements CabHolder, MainActivity.MainActivityFragmentCallbacks, ViewPager.OnPageChangeListener, SharedPreferences.OnSharedPreferenceChangeListener { private FragmentLibraryBinding binding; diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java b/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java index 7ce7daa6..e621c1ac 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java @@ -1,10 +1,11 @@ package com.dkanada.gramophone.ui.fragments.mainactivity.library.pager; import android.os.Bundle; +import android.view.View; + import androidx.annotation.LayoutRes; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import android.view.View; import com.dkanada.gramophone.R; import com.dkanada.gramophone.util.Util; diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewFragment.java b/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewFragment.java index 60261ae7..d88cf473 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewFragment.java @@ -1,6 +1,13 @@ package com.dkanada.gramophone.ui.fragments.mainactivity.library.pager; import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import androidx.annotation.NonNull; import androidx.annotation.StringRes; @@ -9,14 +16,6 @@ import com.dkanada.gramophone.databinding.FragmentMainActivityRecyclerViewBindin import com.dkanada.gramophone.util.PreferenceUtil; import com.google.android.material.appbar.AppBarLayout; import com.google.android.material.appbar.AppBarLayout.OnOffsetChangedListener; - -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - import com.kabouzeid.appthemehelper.ThemeStore; import com.dkanada.gramophone.R; import com.dkanada.gramophone.util.ViewUtil; diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/GenresFragment.java b/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/GenresFragment.java index ed926419..b2a3ab7a 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/GenresFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/GenresFragment.java @@ -1,6 +1,7 @@ package com.dkanada.gramophone.ui.fragments.mainactivity.library.pager; import android.os.Bundle; + import androidx.annotation.NonNull; import androidx.recyclerview.widget.LinearLayoutManager; diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java b/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java index 1c945948..38261f28 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java @@ -1,6 +1,7 @@ package com.dkanada.gramophone.ui.fragments.mainactivity.library.pager; import android.os.Bundle; + import androidx.annotation.NonNull; import androidx.recyclerview.widget.GridLayoutManager; diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/AbsPlayerFragment.java b/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/AbsPlayerFragment.java index 7ce7b652..36980c4e 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/AbsPlayerFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/AbsPlayerFragment.java @@ -1,11 +1,11 @@ package com.dkanada.gramophone.ui.fragments.player; import android.content.Context; +import android.view.MenuItem; +import android.view.View; import androidx.annotation.Nullable; import androidx.appcompat.widget.Toolbar; -import android.view.MenuItem; -import android.view.View; import com.dkanada.gramophone.R; import com.dkanada.gramophone.dialogs.AddToPlaylistDialog; diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/MiniPlayerFragment.java b/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/MiniPlayerFragment.java index af273018..cc57c5da 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/MiniPlayerFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/MiniPlayerFragment.java @@ -5,14 +5,15 @@ import android.content.Context; import android.content.res.ColorStateList; import android.graphics.PorterDuff; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.view.GestureDetector; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.dkanada.gramophone.databinding.FragmentMiniPlayerBinding; import com.kabouzeid.appthemehelper.ThemeStore; import com.kabouzeid.appthemehelper.util.ATHUtil; diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/PlayerAlbumCoverFragment.java b/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/PlayerAlbumCoverFragment.java index 2b858d61..e9a97e48 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/PlayerAlbumCoverFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/PlayerAlbumCoverFragment.java @@ -3,8 +3,6 @@ package com.dkanada.gramophone.ui.fragments.player; import android.animation.Animator; import android.annotation.SuppressLint; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.viewpager.widget.ViewPager; import android.view.GestureDetector; import android.view.LayoutInflater; import android.view.MotionEvent; @@ -13,6 +11,9 @@ import android.view.ViewGroup; import android.view.animation.AccelerateInterpolator; import android.view.animation.DecelerateInterpolator; +import androidx.annotation.NonNull; +import androidx.viewpager.widget.ViewPager; + import com.dkanada.gramophone.adapter.AlbumCoverPagerAdapter; import com.dkanada.gramophone.databinding.FragmentPlayerAlbumCoverBinding; import com.dkanada.gramophone.helper.MusicPlayerRemote; diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/card/CardPlayerFragment.java b/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/card/CardPlayerFragment.java index 90c81ec5..4ebd4669 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/card/CardPlayerFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/card/CardPlayerFragment.java @@ -7,12 +7,6 @@ import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.os.Build; import android.os.Bundle; -import androidx.annotation.ColorInt; -import androidx.annotation.NonNull; -import androidx.appcompat.app.AppCompatActivity; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; @@ -21,6 +15,12 @@ import android.view.ViewGroup; import android.view.ViewTreeObserver; import android.widget.ImageView; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.dkanada.gramophone.databinding.FragmentCardPlayerBinding; import com.h6ah4i.android.widget.advrecyclerview.animator.GeneralItemAnimator; import com.h6ah4i.android.widget.advrecyclerview.animator.RefactoredDefaultItemAnimator; diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/card/CardPlayerPlaybackControlsFragment.java b/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/card/CardPlayerPlaybackControlsFragment.java index 6342ccd5..2fa6077d 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/card/CardPlayerPlaybackControlsFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/card/CardPlayerPlaybackControlsFragment.java @@ -3,20 +3,20 @@ package com.dkanada.gramophone.ui.fragments.player.card; import android.graphics.Color; import android.graphics.PorterDuff; import android.os.Bundle; -import androidx.annotation.NonNull; - -import com.dkanada.gramophone.databinding.FragmentCardPlayerPlaybackControlsBinding; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.animation.DecelerateInterpolator; import android.widget.SeekBar; +import androidx.annotation.NonNull; + import com.kabouzeid.appthemehelper.util.ColorUtil; import com.kabouzeid.appthemehelper.util.MaterialValueHelper; import com.kabouzeid.appthemehelper.util.TintHelper; import com.dkanada.gramophone.R; import com.dkanada.gramophone.helper.MusicPlayerRemote; +import com.dkanada.gramophone.databinding.FragmentCardPlayerPlaybackControlsBinding; import com.dkanada.gramophone.helper.MusicProgressViewUpdateHelper; import com.dkanada.gramophone.helper.PlayPauseButtonOnClickHandler; import com.dkanada.gramophone.misc.SimpleOnSeekbarChangeListener; diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java b/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java index 16af23fd..64ce51bc 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java @@ -6,12 +6,6 @@ import android.graphics.Color; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.os.Bundle; -import androidx.annotation.ColorInt; -import androidx.annotation.NonNull; -import androidx.appcompat.app.AppCompatActivity; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; @@ -19,6 +13,12 @@ import android.view.ViewGroup; import android.view.ViewTreeObserver; import android.widget.ImageView; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.dkanada.gramophone.databinding.FragmentFlatPlayerBinding; import com.h6ah4i.android.widget.advrecyclerview.animator.GeneralItemAnimator; import com.h6ah4i.android.widget.advrecyclerview.animator.RefactoredDefaultItemAnimator; diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/flat/FlatPlayerPlaybackControlsFragment.java b/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/flat/FlatPlayerPlaybackControlsFragment.java index 159ac99f..cc00b296 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/flat/FlatPlayerPlaybackControlsFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/flat/FlatPlayerPlaybackControlsFragment.java @@ -7,13 +7,14 @@ import android.animation.TimeInterpolator; import android.graphics.Color; import android.graphics.PorterDuff; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.interpolator.view.animation.FastOutSlowInInterpolator; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.SeekBar; +import androidx.annotation.NonNull; +import androidx.interpolator.view.animation.FastOutSlowInInterpolator; + import com.dkanada.gramophone.databinding.FragmentFlatPlayerPlaybackControlsBinding; import com.kabouzeid.appthemehelper.util.MaterialValueHelper; import com.dkanada.gramophone.R; diff --git a/app/src/main/java/com/dkanada/gramophone/util/ImageUtil.java b/app/src/main/java/com/dkanada/gramophone/util/ImageUtil.java index 04b4000d..efb2834e 100644 --- a/app/src/main/java/com/dkanada/gramophone/util/ImageUtil.java +++ b/app/src/main/java/com/dkanada/gramophone/util/ImageUtil.java @@ -7,19 +7,18 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Canvas; import android.graphics.drawable.Drawable; -import android.os.Build; + import androidx.annotation.AttrRes; import androidx.annotation.ColorInt; import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.content.res.ResourcesCompat; -import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat; - -import java.io.InputStream; import com.kabouzeid.appthemehelper.util.TintHelper; +import java.io.InputStream; + public class ImageUtil { public static int calculateInSampleSize(int width, int height, int reqWidth) { diff --git a/app/src/main/java/com/dkanada/gramophone/util/MusicUtil.java b/app/src/main/java/com/dkanada/gramophone/util/MusicUtil.java index dfaaf464..11d0c8ca 100644 --- a/app/src/main/java/com/dkanada/gramophone/util/MusicUtil.java +++ b/app/src/main/java/com/dkanada/gramophone/util/MusicUtil.java @@ -2,14 +2,13 @@ package com.dkanada.gramophone.util; import android.content.Context; import android.content.Intent; -import android.net.Uri; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.Log; import android.widget.Toast; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.dkanada.gramophone.App; import com.dkanada.gramophone.R; import com.dkanada.gramophone.model.Album; diff --git a/app/src/main/java/com/dkanada/gramophone/util/NavigationUtil.java b/app/src/main/java/com/dkanada/gramophone/util/NavigationUtil.java index c0a334e1..73931407 100644 --- a/app/src/main/java/com/dkanada/gramophone/util/NavigationUtil.java +++ b/app/src/main/java/com/dkanada/gramophone/util/NavigationUtil.java @@ -2,6 +2,7 @@ package com.dkanada.gramophone.util; import android.app.Activity; import android.content.Intent; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.app.ActivityOptionsCompat; diff --git a/app/src/main/java/com/dkanada/gramophone/util/PreferenceUtil.java b/app/src/main/java/com/dkanada/gramophone/util/PreferenceUtil.java index 39cf523d..2d429a81 100644 --- a/app/src/main/java/com/dkanada/gramophone/util/PreferenceUtil.java +++ b/app/src/main/java/com/dkanada/gramophone/util/PreferenceUtil.java @@ -10,7 +10,6 @@ import androidx.annotation.StyleRes; import com.google.gson.Gson; import com.google.gson.JsonSyntaxException; import com.google.gson.reflect.TypeToken; - import com.dkanada.gramophone.R; import com.dkanada.gramophone.helper.sort.SortMethod; import com.dkanada.gramophone.helper.sort.SortOrder; diff --git a/app/src/main/java/com/dkanada/gramophone/util/ThemeUtil.java b/app/src/main/java/com/dkanada/gramophone/util/ThemeUtil.java index e38ee781..2bb9ce0e 100644 --- a/app/src/main/java/com/dkanada/gramophone/util/ThemeUtil.java +++ b/app/src/main/java/com/dkanada/gramophone/util/ThemeUtil.java @@ -1,6 +1,7 @@ package com.dkanada.gramophone.util; import android.graphics.Bitmap; + import androidx.annotation.ColorInt; import androidx.annotation.Nullable; import androidx.palette.graphics.Palette; diff --git a/app/src/main/java/com/dkanada/gramophone/util/Util.java b/app/src/main/java/com/dkanada/gramophone/util/Util.java index 89fd63ec..ff814436 100644 --- a/app/src/main/java/com/dkanada/gramophone/util/Util.java +++ b/app/src/main/java/com/dkanada/gramophone/util/Util.java @@ -8,9 +8,6 @@ import android.content.res.Resources; import android.content.res.TypedArray; import android.graphics.Point; import android.os.Build; -import androidx.annotation.AttrRes; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.util.TypedValue; import android.view.Display; import android.view.View; @@ -18,6 +15,10 @@ import android.view.Window; import android.view.WindowManager; import android.view.inputmethod.InputMethodManager; +import androidx.annotation.AttrRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.dkanada.gramophone.R; public class Util { diff --git a/app/src/main/java/com/dkanada/gramophone/util/ViewUtil.java b/app/src/main/java/com/dkanada/gramophone/util/ViewUtil.java index 477291c0..16b47cc1 100644 --- a/app/src/main/java/com/dkanada/gramophone/util/ViewUtil.java +++ b/app/src/main/java/com/dkanada/gramophone/util/ViewUtil.java @@ -12,12 +12,13 @@ import android.graphics.drawable.Drawable; import android.graphics.drawable.RippleDrawable; import android.graphics.drawable.StateListDrawable; import android.os.Build; -import androidx.annotation.ColorInt; import android.util.DisplayMetrics; import android.view.View; import android.view.animation.PathInterpolator; import android.widget.TextView; +import androidx.annotation.ColorInt; + import com.kabouzeid.appthemehelper.util.ATHUtil; import com.kabouzeid.appthemehelper.util.ColorUtil; import com.kabouzeid.appthemehelper.util.MaterialValueHelper; diff --git a/app/src/main/java/com/dkanada/gramophone/views/HeightFitSquareLayout.java b/app/src/main/java/com/dkanada/gramophone/views/HeightFitSquareLayout.java index afe7ef0f..7050ac79 100644 --- a/app/src/main/java/com/dkanada/gramophone/views/HeightFitSquareLayout.java +++ b/app/src/main/java/com/dkanada/gramophone/views/HeightFitSquareLayout.java @@ -7,7 +7,6 @@ import android.util.AttributeSet; import android.widget.FrameLayout; public class HeightFitSquareLayout extends FrameLayout { - private boolean forceSquare = true; public HeightFitSquareLayout(Context context) { diff --git a/app/src/main/java/com/dkanada/gramophone/views/IconImageView.java b/app/src/main/java/com/dkanada/gramophone/views/IconImageView.java index 9ba0ceed..0ef369f9 100644 --- a/app/src/main/java/com/dkanada/gramophone/views/IconImageView.java +++ b/app/src/main/java/com/dkanada/gramophone/views/IconImageView.java @@ -2,9 +2,10 @@ package com.dkanada.gramophone.views; import android.content.Context; import android.graphics.PorterDuff; -import androidx.appcompat.widget.AppCompatImageView; import android.util.AttributeSet; +import androidx.appcompat.widget.AppCompatImageView; + import com.kabouzeid.appthemehelper.util.ATHUtil; import com.dkanada.gramophone.R; diff --git a/app/src/main/java/com/dkanada/gramophone/views/PlayPauseDrawable.java b/app/src/main/java/com/dkanada/gramophone/views/PlayPauseDrawable.java index f2d8e794..5560c5c3 100644 --- a/app/src/main/java/com/dkanada/gramophone/views/PlayPauseDrawable.java +++ b/app/src/main/java/com/dkanada/gramophone/views/PlayPauseDrawable.java @@ -13,10 +13,11 @@ import android.graphics.Path; import android.graphics.PixelFormat; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import androidx.annotation.NonNull; import android.util.Property; import android.view.animation.DecelerateInterpolator; +import androidx.annotation.NonNull; + import com.dkanada.gramophone.R; public class PlayPauseDrawable extends Drawable { diff --git a/app/src/main/java/com/dkanada/gramophone/views/WidthFitSquareLayout.java b/app/src/main/java/com/dkanada/gramophone/views/WidthFitSquareLayout.java index b7f5a6e6..2fe490ed 100644 --- a/app/src/main/java/com/dkanada/gramophone/views/WidthFitSquareLayout.java +++ b/app/src/main/java/com/dkanada/gramophone/views/WidthFitSquareLayout.java @@ -7,7 +7,6 @@ import android.util.AttributeSet; import android.widget.FrameLayout; public class WidthFitSquareLayout extends FrameLayout { - private boolean forceSquare = true; public WidthFitSquareLayout(Context context) { diff --git a/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetAlbum.java b/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetAlbum.java index 9e0e7022..deb8c195 100644 --- a/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetAlbum.java +++ b/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetAlbum.java @@ -7,11 +7,12 @@ import android.content.Intent; import android.graphics.Bitmap; import android.graphics.Point; import android.graphics.drawable.Drawable; -import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.View; import android.widget.RemoteViews; +import androidx.annotation.Nullable; + import com.bumptech.glide.Glide; import com.bumptech.glide.request.target.SimpleTarget; import com.bumptech.glide.request.target.Target; diff --git a/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetCard.java b/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetCard.java index 02b8a644..5145e772 100644 --- a/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetCard.java +++ b/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetCard.java @@ -6,12 +6,13 @@ import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; import android.graphics.drawable.Drawable; -import androidx.annotation.Nullable; -import androidx.palette.graphics.Palette; import android.text.TextUtils; import android.view.View; import android.widget.RemoteViews; +import androidx.annotation.Nullable; +import androidx.palette.graphics.Palette; + import com.bumptech.glide.Glide; import com.bumptech.glide.request.target.SimpleTarget; import com.bumptech.glide.request.target.Target; diff --git a/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetClassic.java b/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetClassic.java index 2b76fa69..16915412 100644 --- a/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetClassic.java +++ b/app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetClassic.java @@ -6,12 +6,13 @@ import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; import android.graphics.drawable.Drawable; -import androidx.annotation.Nullable; -import androidx.palette.graphics.Palette; import android.text.TextUtils; import android.view.View; import android.widget.RemoteViews; +import androidx.annotation.Nullable; +import androidx.palette.graphics.Palette; + import com.bumptech.glide.Glide; import com.bumptech.glide.request.target.SimpleTarget; import com.bumptech.glide.request.target.Target;