From 80b0ecb49005393222e1eeb6ad99b94d501c768a Mon Sep 17 00:00:00 2001 From: Prathamesh More Date: Mon, 20 Mar 2023 00:36:00 +0530 Subject: [PATCH] Optimized imports --- .../code/name/monkey/retromusic/MainModule.kt | 1 - .../activities/PermissionActivity.kt | 1 - .../retromusic/activities/WhatsNewFragment.kt | 3 +- .../base/AbsMusicServiceActivity.kt | 1 - .../base/AbsSlidingMusicPanelActivity.kt | 46 ++----------------- .../activities/bugreport/model/DeviceInfo.kt | 1 - .../tageditor/AlbumTagEditorActivity.kt | 8 +--- .../adapter/album/AlbumCoverPagerAdapter.kt | 8 +--- .../extensions/ActivityExtensions.kt | 1 - .../fragments/albums/AlbumDetailsFragment.kt | 18 ++------ .../artists/AbsArtistDetailsFragment.kt | 16 ++----- .../fragments/backup/RestoreActivity.kt | 1 - .../fragments/folder/FoldersFragment.kt | 9 +--- .../retromusic/fragments/home/HomeFragment.kt | 14 +----- .../player/adaptive/AdaptiveFragment.kt | 7 +-- .../full/FullPlaybackControlsFragment.kt | 6 +-- .../fragments/player/normal/PlayerFragment.kt | 6 +-- .../player/peek/PeekPlayerFragment.kt | 7 +-- .../playlists/PlaylistDetailsFragment.kt | 1 - .../playlists/PlaylistDetailsViewModel.kt | 1 - .../fragments/playlists/PlaylistsFragment.kt | 1 - .../settings/PersonalizeSettingsFragment.kt | 8 +--- .../fragments/settings/SettingsFragment.kt | 1 - .../settings/ThemeSettingsFragment.kt | 1 - .../retromusic/glide/RetroMusicGlideModule.kt | 2 - .../retromusic/glide/SingleColorTarget.kt | 1 - .../monkey/retromusic/service/MusicService.kt | 3 -- .../retromusic/util/CustomArtistImageUtil.kt | 2 +- .../monkey/retromusic/util/PlagiarismUtil.kt | 1 - .../retromusic/views/TopAppBarLayout.kt | 1 - app/src/main/res/layout/fragment_settings.xml | 1 - 31 files changed, 23 insertions(+), 155 deletions(-) diff --git a/app/src/main/java/code/name/monkey/retromusic/MainModule.kt b/app/src/main/java/code/name/monkey/retromusic/MainModule.kt index 548fb576b..818ca96d2 100644 --- a/app/src/main/java/code/name/monkey/retromusic/MainModule.kt +++ b/app/src/main/java/code/name/monkey/retromusic/MainModule.kt @@ -4,7 +4,6 @@ import androidx.room.Room import code.name.monkey.retromusic.auto.AutoMusicProvider import code.name.monkey.retromusic.cast.RetroWebServer import code.name.monkey.retromusic.db.MIGRATION_23_24 -import code.name.monkey.retromusic.db.PlaylistWithSongs import code.name.monkey.retromusic.db.RetroDatabase import code.name.monkey.retromusic.fragments.LibraryViewModel import code.name.monkey.retromusic.fragments.albums.AlbumDetailsViewModel diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/PermissionActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/PermissionActivity.kt index f58be5ba2..67850d8ed 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/PermissionActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/PermissionActivity.kt @@ -14,7 +14,6 @@ */ package code.name.monkey.retromusic.activities -import android.Manifest import android.Manifest.permission.BLUETOOTH_CONNECT import android.content.Intent import android.content.pm.PackageManager diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewFragment.kt b/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewFragment.kt index da801f60c..48b39ed35 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewFragment.kt @@ -11,7 +11,6 @@ import android.view.ViewGroup import android.webkit.WebResourceRequest import android.webkit.WebView import android.webkit.WebViewClient -import androidx.core.content.PackageManagerCompat import androidx.core.content.pm.PackageInfoCompat import androidx.core.widget.NestedScrollView import androidx.fragment.app.FragmentActivity @@ -27,7 +26,7 @@ import code.name.monkey.retromusic.extensions.openUrl import code.name.monkey.retromusic.util.PreferenceUtil.lastVersion import com.google.android.material.bottomsheet.BottomSheetDialogFragment import java.nio.charset.StandardCharsets -import java.util.Locale +import java.util.* class WhatsNewFragment : BottomSheetDialogFragment() { private var _binding: FragmentWhatsNewBinding? = null diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt index e2485a7ee..86bf86461 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt @@ -16,7 +16,6 @@ package code.name.monkey.retromusic.activities.base import android.Manifest import android.content.* -import android.os.Build.VERSION_CODES import android.os.Bundle import android.os.IBinder import androidx.core.content.ContextCompat diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt index 3dc298aa1..2f19dc711 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt @@ -34,44 +34,10 @@ import androidx.core.view.isVisible import androidx.core.view.updateLayoutParams import androidx.fragment.app.commit import code.name.monkey.appthemehelper.util.VersionUtils -import code.name.monkey.retromusic.ADAPTIVE_COLOR_APP -import code.name.monkey.retromusic.ALBUM_COVER_STYLE -import code.name.monkey.retromusic.ALBUM_COVER_TRANSFORM -import code.name.monkey.retromusic.CAROUSEL_EFFECT -import code.name.monkey.retromusic.CIRCLE_PLAY_BUTTON -import code.name.monkey.retromusic.EXTRA_SONG_INFO -import code.name.monkey.retromusic.KEEP_SCREEN_ON -import code.name.monkey.retromusic.LIBRARY_CATEGORIES -import code.name.monkey.retromusic.NOW_PLAYING_SCREEN_ID -import code.name.monkey.retromusic.R -import code.name.monkey.retromusic.SCREEN_ON_LYRICS -import code.name.monkey.retromusic.SWIPE_ANYWHERE_NOW_PLAYING -import code.name.monkey.retromusic.SWIPE_DOWN_DISMISS -import code.name.monkey.retromusic.TAB_TEXT_MODE -import code.name.monkey.retromusic.TOGGLE_ADD_CONTROLS -import code.name.monkey.retromusic.TOGGLE_FULL_SCREEN -import code.name.monkey.retromusic.TOGGLE_VOLUME +import code.name.monkey.retromusic.* import code.name.monkey.retromusic.activities.PermissionActivity import code.name.monkey.retromusic.databinding.SlidingMusicPanelLayoutBinding -import code.name.monkey.retromusic.extensions.currentFragment -import code.name.monkey.retromusic.extensions.darkAccentColor -import code.name.monkey.retromusic.extensions.dip -import code.name.monkey.retromusic.extensions.getBottomInsets -import code.name.monkey.retromusic.extensions.hide -import code.name.monkey.retromusic.extensions.isColorLight -import code.name.monkey.retromusic.extensions.isLandscape -import code.name.monkey.retromusic.extensions.keepScreenOn -import code.name.monkey.retromusic.extensions.maybeSetScreenOn -import code.name.monkey.retromusic.extensions.peekHeightAnimate -import code.name.monkey.retromusic.extensions.setLightNavigationBar -import code.name.monkey.retromusic.extensions.setLightNavigationBarAuto -import code.name.monkey.retromusic.extensions.setLightStatusBar -import code.name.monkey.retromusic.extensions.setLightStatusBarAuto -import code.name.monkey.retromusic.extensions.setNavigationBarColorPreOreo -import code.name.monkey.retromusic.extensions.setTaskDescriptionColor -import code.name.monkey.retromusic.extensions.show -import code.name.monkey.retromusic.extensions.surfaceColor -import code.name.monkey.retromusic.extensions.whichFragment +import code.name.monkey.retromusic.extensions.* import code.name.monkey.retromusic.fragments.LibraryViewModel import code.name.monkey.retromusic.fragments.NowPlayingScreen import code.name.monkey.retromusic.fragments.NowPlayingScreen.* @@ -103,13 +69,7 @@ import code.name.monkey.retromusic.util.ViewUtil import code.name.monkey.retromusic.util.logD import com.google.android.material.bottomnavigation.BottomNavigationView import com.google.android.material.bottomsheet.BottomSheetBehavior -import com.google.android.material.bottomsheet.BottomSheetBehavior.BottomSheetCallback -import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_COLLAPSED -import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_DRAGGING -import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED -import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HIDDEN -import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_SETTLING -import com.google.android.material.bottomsheet.BottomSheetBehavior.from +import com.google.android.material.bottomsheet.BottomSheetBehavior.* import org.koin.androidx.viewmodel.ext.android.viewModel diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/DeviceInfo.kt b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/DeviceInfo.kt index eea95eacc..19aff73a2 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/DeviceInfo.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/DeviceInfo.kt @@ -9,7 +9,6 @@ import androidx.appcompat.app.AppCompatDelegate import androidx.core.content.pm.PackageInfoCompat import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.PreferenceUtil.isAdaptiveColor -import code.name.monkey.retromusic.util.PreferenceUtil.languageCode import code.name.monkey.retromusic.util.PreferenceUtil.nowPlayingScreen import java.util.* diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt index 1436da954..2c9013657 100755 --- a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt @@ -30,11 +30,7 @@ import androidx.core.widget.doAfterTextChanged import code.name.monkey.appthemehelper.util.MaterialValueHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.databinding.ActivityAlbumTagEditorBinding -import code.name.monkey.retromusic.extensions.appHandleColor -import code.name.monkey.retromusic.extensions.defaultFooterColor -import code.name.monkey.retromusic.extensions.isColorLight -import code.name.monkey.retromusic.extensions.setTint -import code.name.monkey.retromusic.extensions.showToast +import code.name.monkey.retromusic.extensions.* import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper import code.name.monkey.retromusic.model.ArtworkInfo @@ -50,7 +46,7 @@ import com.bumptech.glide.request.target.ImageViewTarget import com.bumptech.glide.request.transition.Transition import com.google.android.material.shape.MaterialShapeDrawable import org.jaudiotagger.tag.FieldKey -import java.util.EnumMap +import java.util.* class AlbumTagEditorActivity : AbsTagEditorActivity() { diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt index 5b371369b..5a0a7d3cd 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt @@ -27,13 +27,7 @@ import androidx.lifecycle.lifecycleScope import code.name.monkey.retromusic.R import code.name.monkey.retromusic.activities.MainActivity import code.name.monkey.retromusic.fragments.AlbumCoverStyle -import code.name.monkey.retromusic.fragments.NowPlayingScreen.Card -import code.name.monkey.retromusic.fragments.NowPlayingScreen.Classic -import code.name.monkey.retromusic.fragments.NowPlayingScreen.Fit -import code.name.monkey.retromusic.fragments.NowPlayingScreen.Full -import code.name.monkey.retromusic.fragments.NowPlayingScreen.Gradient -import code.name.monkey.retromusic.fragments.NowPlayingScreen.Peek -import code.name.monkey.retromusic.fragments.NowPlayingScreen.Tiny +import code.name.monkey.retromusic.fragments.NowPlayingScreen.* import code.name.monkey.retromusic.fragments.base.goToLyrics import code.name.monkey.retromusic.glide.RetroGlideExtension import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/ActivityExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/ActivityExtensions.kt index 043bcbea5..bf3d9d8cd 100644 --- a/app/src/main/java/code/name/monkey/retromusic/extensions/ActivityExtensions.kt +++ b/app/src/main/java/code/name/monkey/retromusic/extensions/ActivityExtensions.kt @@ -20,7 +20,6 @@ import android.view.View import android.view.ViewGroup import androidx.annotation.DimenRes import androidx.appcompat.app.AppCompatActivity -import androidx.core.os.BundleCompat import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import com.google.android.material.appbar.MaterialToolbar diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt index f9efbf0ad..d7ec17e76 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt @@ -18,11 +18,7 @@ import android.app.ActivityOptions import android.content.Intent import android.graphics.Color import android.os.Bundle -import android.view.Menu -import android.view.MenuInflater -import android.view.MenuItem -import android.view.SubMenu -import android.view.View +import android.view.* import androidx.appcompat.app.AppCompatActivity import androidx.core.os.bundleOf import androidx.core.text.parseAsHtml @@ -47,11 +43,7 @@ import code.name.monkey.retromusic.adapter.song.SimpleSongAdapter import code.name.monkey.retromusic.databinding.FragmentAlbumDetailsBinding import code.name.monkey.retromusic.dialogs.AddToPlaylistDialog import code.name.monkey.retromusic.dialogs.DeleteSongsDialog -import code.name.monkey.retromusic.extensions.applyColor -import code.name.monkey.retromusic.extensions.applyOutlineColor -import code.name.monkey.retromusic.extensions.findActivityNavController -import code.name.monkey.retromusic.extensions.show -import code.name.monkey.retromusic.extensions.surfaceColor +import code.name.monkey.retromusic.extensions.* import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment import code.name.monkey.retromusic.glide.RetroGlideExtension import code.name.monkey.retromusic.glide.RetroGlideExtension.albumCoverOptions @@ -69,11 +61,7 @@ import code.name.monkey.retromusic.model.Artist import code.name.monkey.retromusic.network.Result import code.name.monkey.retromusic.network.model.LastFmAlbum import code.name.monkey.retromusic.repository.RealRepository -import code.name.monkey.retromusic.util.MusicUtil -import code.name.monkey.retromusic.util.PreferenceUtil -import code.name.monkey.retromusic.util.RetroUtil -import code.name.monkey.retromusic.util.logD -import code.name.monkey.retromusic.util.logE +import code.name.monkey.retromusic.util.* import com.bumptech.glide.Glide import com.google.android.material.shape.MaterialShapeDrawable import com.google.android.material.transition.MaterialArcMotion diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt index 8f2acec1b..a2ef904b6 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt @@ -1,6 +1,5 @@ package code.name.monkey.retromusic.fragments.artists -import android.content.Intent import android.graphics.Color import android.os.Bundle import android.text.Spanned @@ -27,11 +26,7 @@ import code.name.monkey.retromusic.adapter.album.HorizontalAlbumAdapter import code.name.monkey.retromusic.adapter.song.SimpleSongAdapter import code.name.monkey.retromusic.databinding.FragmentArtistDetailsBinding import code.name.monkey.retromusic.dialogs.AddToPlaylistDialog -import code.name.monkey.retromusic.extensions.applyColor -import code.name.monkey.retromusic.extensions.applyOutlineColor -import code.name.monkey.retromusic.extensions.show -import code.name.monkey.retromusic.extensions.showToast -import code.name.monkey.retromusic.extensions.surfaceColor +import code.name.monkey.retromusic.extensions.* import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment import code.name.monkey.retromusic.glide.RetroGlideExtension import code.name.monkey.retromusic.glide.RetroGlideExtension.artistImageOptions @@ -44,12 +39,7 @@ import code.name.monkey.retromusic.model.Artist import code.name.monkey.retromusic.network.Result import code.name.monkey.retromusic.network.model.LastFmArtist import code.name.monkey.retromusic.repository.RealRepository -import code.name.monkey.retromusic.util.CustomArtistImageUtil -import code.name.monkey.retromusic.util.MusicUtil -import code.name.monkey.retromusic.util.PreferenceUtil -import code.name.monkey.retromusic.util.RetroUtil -import code.name.monkey.retromusic.util.logD -import code.name.monkey.retromusic.util.logE +import code.name.monkey.retromusic.util.* import com.bumptech.glide.Glide import com.google.android.material.shape.MaterialShapeDrawable import com.google.android.material.transition.MaterialContainerTransform @@ -57,7 +47,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.koin.android.ext.android.get -import java.util.Locale +import java.util.* abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_artist_details), IAlbumClickListener { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/RestoreActivity.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/backup/RestoreActivity.kt index dbdba0a6a..03cb17fb3 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/RestoreActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/backup/RestoreActivity.kt @@ -10,7 +10,6 @@ import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatDelegate import androidx.core.view.updateLayoutParams import androidx.lifecycle.lifecycleScope -import code.name.monkey.retromusic.R import code.name.monkey.retromusic.databinding.ActivityRestoreBinding import code.name.monkey.retromusic.extensions.accentColor import code.name.monkey.retromusic.extensions.accentOutlineColor diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.kt index 4d8556377..21d082bcb 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.kt @@ -17,11 +17,7 @@ import android.content.Context import android.media.MediaScannerConnection import android.os.Bundle import android.os.Environment -import android.view.Menu -import android.view.MenuInflater -import android.view.MenuItem -import android.view.View -import android.view.ViewGroup +import android.view.* import android.webkit.MimeTypeMap import androidx.activity.OnBackPressedCallback import androidx.appcompat.widget.PopupMenu @@ -77,8 +73,7 @@ import java.io.File import java.io.FileFilter import java.io.IOException import java.lang.ref.WeakReference -import java.util.Collections -import java.util.LinkedList +import java.util.* class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder), IMainActivityFragmentCallbacks, SelectionCallback, ICallbacks, diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt index 48b60aa81..e08e6d0a2 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt @@ -15,12 +15,8 @@ package code.name.monkey.retromusic.fragments.home import android.os.Bundle -import android.view.Menu -import android.view.MenuInflater -import android.view.MenuItem +import android.view.* import android.view.MenuItem.SHOW_AS_ACTION_IF_ROOM -import android.view.View -import android.view.ViewGroup import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.core.os.bundleOf import androidx.core.text.parseAsHtml @@ -34,18 +30,13 @@ import androidx.recyclerview.widget.LinearLayoutManager import code.name.monkey.appthemehelper.common.ATHToolbarActivity import code.name.monkey.appthemehelper.util.ColorUtil import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper -import code.name.monkey.retromusic.EXTRA_PLAYLIST_TYPE -import code.name.monkey.retromusic.HISTORY_PLAYLIST -import code.name.monkey.retromusic.LAST_ADDED_PLAYLIST -import code.name.monkey.retromusic.R -import code.name.monkey.retromusic.TOP_PLAYED_PLAYLIST +import code.name.monkey.retromusic.* import code.name.monkey.retromusic.adapter.HomeAdapter import code.name.monkey.retromusic.databinding.FragmentHomeBinding import code.name.monkey.retromusic.dialogs.CreatePlaylistDialog import code.name.monkey.retromusic.dialogs.ImportPlaylistDialog import code.name.monkey.retromusic.extensions.accentColor import code.name.monkey.retromusic.extensions.dip -import code.name.monkey.retromusic.extensions.drawNextToNavbar import code.name.monkey.retromusic.extensions.elevatedAccentColor import code.name.monkey.retromusic.extensions.setUpMediaRouteButton import code.name.monkey.retromusic.fragments.ReloadType @@ -60,7 +51,6 @@ import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.PreferenceUtil.userName import com.bumptech.glide.Glide -import com.google.android.material.shape.MaterialShapeDrawable import com.google.android.material.transition.MaterialFadeThrough import com.google.android.material.transition.MaterialSharedAxis diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt index 9fb6dda8f..4071e7dbf 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt @@ -20,12 +20,7 @@ import androidx.appcompat.widget.Toolbar import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.databinding.FragmentAdaptivePlayerBinding -import code.name.monkey.retromusic.extensions.colorControlNormal -import code.name.monkey.retromusic.extensions.drawAboveSystemBars -import code.name.monkey.retromusic.extensions.surfaceColor -import code.name.monkey.retromusic.extensions.textColorPrimary -import code.name.monkey.retromusic.extensions.textColorSecondary -import code.name.monkey.retromusic.extensions.whichFragment +import code.name.monkey.retromusic.extensions.* import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment import code.name.monkey.retromusic.helper.MusicPlayerRemote diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt index f42b204b7..f7e34433c 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt @@ -32,11 +32,7 @@ import code.name.monkey.retromusic.R import code.name.monkey.retromusic.databinding.FragmentFullPlayerControlsBinding import code.name.monkey.retromusic.db.PlaylistEntity import code.name.monkey.retromusic.db.toSongEntity -import code.name.monkey.retromusic.extensions.applyColor -import code.name.monkey.retromusic.extensions.getSongInfo -import code.name.monkey.retromusic.extensions.getTintedDrawable -import code.name.monkey.retromusic.extensions.hide -import code.name.monkey.retromusic.extensions.show +import code.name.monkey.retromusic.extensions.* import code.name.monkey.retromusic.fragments.LibraryViewModel import code.name.monkey.retromusic.fragments.ReloadType import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt index 8126f9817..381ded676 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt @@ -27,11 +27,7 @@ import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.SNOWFALL import code.name.monkey.retromusic.databinding.FragmentPlayerBinding -import code.name.monkey.retromusic.extensions.colorControlNormal -import code.name.monkey.retromusic.extensions.drawAboveSystemBars -import code.name.monkey.retromusic.extensions.isColorLight -import code.name.monkey.retromusic.extensions.surfaceColor -import code.name.monkey.retromusic.extensions.whichFragment +import code.name.monkey.retromusic.extensions.* import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment import code.name.monkey.retromusic.helper.MusicPlayerRemote diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peek/PeekPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/peek/PeekPlayerFragment.kt index 8e5c9a1c7..e27ff6961 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peek/PeekPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/peek/PeekPlayerFragment.kt @@ -20,12 +20,7 @@ import androidx.appcompat.widget.Toolbar import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.databinding.FragmentPeekPlayerBinding -import code.name.monkey.retromusic.extensions.colorControlNormal -import code.name.monkey.retromusic.extensions.drawAboveSystemBarsWithPadding -import code.name.monkey.retromusic.extensions.getSongInfo -import code.name.monkey.retromusic.extensions.hide -import code.name.monkey.retromusic.extensions.show -import code.name.monkey.retromusic.extensions.whichFragment +import code.name.monkey.retromusic.extensions.* import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment import code.name.monkey.retromusic.fragments.base.goToAlbum import code.name.monkey.retromusic.fragments.base.goToArtist diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt index bb99dbdc9..352bf453b 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt @@ -12,7 +12,6 @@ import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import androidx.recyclerview.widget.SimpleItemAnimator import code.name.monkey.retromusic.R import code.name.monkey.retromusic.adapter.song.OrderablePlaylistSongAdapter import code.name.monkey.retromusic.databinding.FragmentPlaylistDetailNewBinding diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsViewModel.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsViewModel.kt index 23599d384..ce2f452f5 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsViewModel.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsViewModel.kt @@ -18,7 +18,6 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.ViewModel import code.name.monkey.retromusic.db.PlaylistWithSongs import code.name.monkey.retromusic.db.SongEntity -import code.name.monkey.retromusic.model.Playlist import code.name.monkey.retromusic.repository.RealRepository class PlaylistDetailsViewModel( diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistsFragment.kt index ea62902fb..86b51abc4 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistsFragment.kt @@ -20,7 +20,6 @@ import androidx.core.os.bundleOf import androidx.core.view.MenuCompat import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.GridLayoutManager -import code.name.monkey.retromusic.EXTRA_PLAYLIST import code.name.monkey.retromusic.EXTRA_PLAYLIST_ID import code.name.monkey.retromusic.R import code.name.monkey.retromusic.adapter.playlist.PlaylistAdapter diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonalizeSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonalizeSettingsFragment.kt index f796d40e4..42dee53b9 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonalizeSettingsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonalizeSettingsFragment.kt @@ -19,13 +19,7 @@ import android.view.View import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEListPreference import code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference import code.name.monkey.appthemehelper.util.VersionUtils -import code.name.monkey.retromusic.ALBUM_ART_ON_LOCK_SCREEN -import code.name.monkey.retromusic.APPBAR_MODE -import code.name.monkey.retromusic.BLURRED_ALBUM_ART -import code.name.monkey.retromusic.HOME_ALBUM_GRID_STYLE -import code.name.monkey.retromusic.HOME_ARTIST_GRID_STYLE -import code.name.monkey.retromusic.R -import code.name.monkey.retromusic.TAB_TEXT_MODE +import code.name.monkey.retromusic.* class PersonalizeSettingsFragment : AbsSettingsFragment() { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/SettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/SettingsFragment.kt index 8c10b033d..cfc758307 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/SettingsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/SettingsFragment.kt @@ -24,7 +24,6 @@ import code.name.monkey.appthemehelper.util.VersionUtils import code.name.monkey.retromusic.R import code.name.monkey.retromusic.appshortcuts.DynamicShortcutManager import code.name.monkey.retromusic.databinding.FragmentSettingsBinding -import code.name.monkey.retromusic.extensions.applyToolbar import code.name.monkey.retromusic.extensions.findNavController import com.afollestad.materialdialogs.MaterialDialog import com.afollestad.materialdialogs.color.ColorCallback diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt index a89fedf96..27aba0dab 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt @@ -16,7 +16,6 @@ package code.name.monkey.retromusic.fragments.settings import android.annotation.SuppressLint import android.os.Bundle -import android.view.View import androidx.core.content.edit import androidx.preference.Preference import androidx.preference.TwoStatePreference diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicGlideModule.kt b/app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicGlideModule.kt index 0179535c6..be5e36056 100644 --- a/app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicGlideModule.kt +++ b/app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicGlideModule.kt @@ -16,7 +16,6 @@ package code.name.monkey.retromusic.glide import android.content.Context import android.graphics.Bitmap -import android.util.Log import code.name.monkey.retromusic.glide.artistimage.ArtistImage import code.name.monkey.retromusic.glide.artistimage.Factory import code.name.monkey.retromusic.glide.audiocover.AudioFileCover @@ -26,7 +25,6 @@ import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper import code.name.monkey.retromusic.glide.playlistPreview.PlaylistPreview import code.name.monkey.retromusic.glide.playlistPreview.PlaylistPreviewLoader import com.bumptech.glide.Glide -import com.bumptech.glide.GlideBuilder import com.bumptech.glide.Registry import com.bumptech.glide.annotation.GlideModule import com.bumptech.glide.module.AppGlideModule diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/SingleColorTarget.kt b/app/src/main/java/code/name/monkey/retromusic/glide/SingleColorTarget.kt index c60445fb5..6323411f8 100644 --- a/app/src/main/java/code/name/monkey/retromusic/glide/SingleColorTarget.kt +++ b/app/src/main/java/code/name/monkey/retromusic/glide/SingleColorTarget.kt @@ -17,7 +17,6 @@ package code.name.monkey.retromusic.glide import android.graphics.drawable.Drawable import android.widget.ImageView import code.name.monkey.appthemehelper.util.ATHUtil -import code.name.monkey.retromusic.R import code.name.monkey.retromusic.glide.palette.BitmapPaletteTarget import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper import code.name.monkey.retromusic.util.ColorUtil diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt index fb04d57c0..f3ad767c5 100644 --- a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt +++ b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt @@ -42,7 +42,6 @@ import androidx.core.content.ContextCompat import androidx.core.content.edit import androidx.core.content.getSystemService import androidx.core.os.BundleCompat -import androidx.core.os.ParcelCompat import androidx.media.MediaBrowserServiceCompat import androidx.preference.PreferenceManager import code.name.monkey.appthemehelper.util.VersionUtils @@ -51,12 +50,10 @@ import code.name.monkey.retromusic.activities.LockScreenActivity import code.name.monkey.retromusic.appwidgets.* import code.name.monkey.retromusic.auto.AutoMediaIDHelper import code.name.monkey.retromusic.auto.AutoMusicProvider -import code.name.monkey.retromusic.extensions.extra import code.name.monkey.retromusic.extensions.showToast import code.name.monkey.retromusic.extensions.toMediaSessionQueue import code.name.monkey.retromusic.extensions.uri import code.name.monkey.retromusic.glide.BlurTransformation -import code.name.monkey.retromusic.glide.RetroGlideExtension.getDefaultTransition import code.name.monkey.retromusic.glide.RetroGlideExtension.getSongModel import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions import code.name.monkey.retromusic.helper.ShuffleHelper.makeShuffleList diff --git a/app/src/main/java/code/name/monkey/retromusic/util/CustomArtistImageUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/CustomArtistImageUtil.kt index 4cc73fae8..3c0cb02d7 100644 --- a/app/src/main/java/code/name/monkey/retromusic/util/CustomArtistImageUtil.kt +++ b/app/src/main/java/code/name/monkey/retromusic/util/CustomArtistImageUtil.kt @@ -31,7 +31,7 @@ import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.withContext import java.io.File import java.io.IOException -import java.util.Locale +import java.util.* class CustomArtistImageUtil private constructor(context: Context) { diff --git a/app/src/main/java/code/name/monkey/retromusic/util/PlagiarismUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/PlagiarismUtil.kt index 230f250a0..7e9443ca1 100644 --- a/app/src/main/java/code/name/monkey/retromusic/util/PlagiarismUtil.kt +++ b/app/src/main/java/code/name/monkey/retromusic/util/PlagiarismUtil.kt @@ -6,7 +6,6 @@ import android.content.Intent import android.util.Log import android.widget.Toast import androidx.core.net.toUri -import androidx.fragment.app.Fragment import code.name.monkey.retromusic.BuildConfig import code.name.monkey.retromusic.extensions.showToast diff --git a/app/src/main/java/code/name/monkey/retromusic/views/TopAppBarLayout.kt b/app/src/main/java/code/name/monkey/retromusic/views/TopAppBarLayout.kt index f62c5c1d9..043915984 100644 --- a/app/src/main/java/code/name/monkey/retromusic/views/TopAppBarLayout.kt +++ b/app/src/main/java/code/name/monkey/retromusic/views/TopAppBarLayout.kt @@ -4,7 +4,6 @@ import android.content.Context import android.content.res.Configuration import android.util.AttributeSet import android.view.LayoutInflater -import androidx.appcompat.widget.Toolbar import androidx.core.view.updateLayoutParams import code.name.monkey.retromusic.databinding.CollapsingAppbarLayoutBinding import code.name.monkey.retromusic.databinding.SimpleAppbarLayoutBinding diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml index d252fb722..7c1b8e54a 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -1,7 +1,6 @@