Optimized imports

app/src/main/java/code/name/monkey/retromusic/activities/DriveModeActivity.kt

@@ -21,7 +21,6 @@ import android.graphics.PorterDuff
 import android.os.Bundle
 import android.view.animation.LinearInterpolator
 import android.widget.SeekBar
-import androidx.activity.viewModels
 import androidx.lifecycle.lifecycleScope
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.retromusic.R
@@ -29,8 +28,6 @@ import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
 import code.name.monkey.retromusic.databinding.ActivityDriveModeBinding
 import code.name.monkey.retromusic.db.toSongEntity
 import code.name.monkey.retromusic.extensions.drawAboveSystemBars
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import code.name.monkey.retromusic.fragments.ReloadType
 import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
 import code.name.monkey.retromusic.glide.BlurTransformation
 import code.name.monkey.retromusic.glide.GlideApp
@@ -50,7 +47,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koin.android.ext.android.inject
-import org.koin.androidx.viewmodel.ext.android.viewModel
 
 
 /**

app/src/main/java/code/name/monkey/retromusic/activities/LicenseActivity.kt

@@ -25,7 +25,6 @@ import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsThemeActivity
 import code.name.monkey.retromusic.databinding.ActivityLicenseBinding
 import code.name.monkey.retromusic.extensions.drawAboveSystemBars
-import code.name.monkey.retromusic.extensions.drawAboveSystemBarsWithPadding
 import java.io.BufferedReader
 import java.io.InputStreamReader
 import java.nio.charset.StandardCharsets

app/src/main/java/code/name/monkey/retromusic/activities/SettingsActivity.kt

@@ -17,7 +17,6 @@ package code.name.monkey.retromusic.activities
 import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
-import androidx.core.view.ViewCompat
 import androidx.navigation.NavController
 import androidx.navigation.NavDestination
 import code.name.monkey.appthemehelper.ThemeStore
@@ -40,6 +39,11 @@ class SettingsActivity : AbsThemeActivity(), ColorCallback, OnThemeChangedListen
         setupToolbar()
     }
 
+    override fun onResume() {
+        super.onResume()
+        setNavigationBarColorPreOreo(surfaceColor())
+    }
+
     private fun setupToolbar() {
         applyToolbar(binding.toolbar)
         val navController: NavController = findNavController(R.id.contentFrame)

app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt

@@ -33,9 +33,10 @@ import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.RetroGlideExtension
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.menu.SongMenuHelper
-import code.name.monkey.retromusic.model.*
+import code.name.monkey.retromusic.model.Album
-import code.name.monkey.retromusic.model.smartplaylist.AbsSmartPlaylist
+import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.repository.PlaylistSongsLoader
+import code.name.monkey.retromusic.model.Genre
+import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.MusicUtil
 import java.util.*
 

app/src/main/java/code/name/monkey/retromusic/adapter/backup/BackupAdapter.kt

@@ -4,9 +4,9 @@ import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-import androidx.appcompat.widget.PopupMenu
 import android.widget.TextView
 import androidx.appcompat.widget.AppCompatImageView
+import androidx.appcompat.widget.PopupMenu
 import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.retromusic.R

app/src/main/java/code/name/monkey/retromusic/dialogs/ImportPlaylistDialog.kt

@@ -22,7 +22,6 @@ import code.name.monkey.retromusic.extensions.colorButtons
 import code.name.monkey.retromusic.extensions.materialDialog
 import code.name.monkey.retromusic.fragments.LibraryViewModel
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
-import java.lang.Exception
 
 class ImportPlaylistDialog : DialogFragment() {
     private val libraryViewModel by sharedViewModel<LibraryViewModel>()

app/src/main/java/code/name/monkey/retromusic/extensions/ActivityExtensions.kt

@@ -17,11 +17,11 @@ package code.name.monkey.retromusic.extensions
 import android.R
 import android.app.Activity
 import android.view.View
+import android.view.ViewGroup
 import androidx.annotation.DimenRes
 import androidx.appcompat.app.AppCompatActivity
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import com.google.android.material.appbar.MaterialToolbar
-import android.view.ViewGroup
 
 fun AppCompatActivity.applyToolbar(toolbar: MaterialToolbar) {
     ToolbarContentTintHelper.colorBackButton(toolbar)

app/src/main/java/code/name/monkey/retromusic/extensions/ActivityThemeExtensions.kt

@@ -6,7 +6,10 @@ import android.os.Build
 import android.view.View
 import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.*
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.WindowInsetsControllerCompat
+import androidx.core.view.isGone
 import androidx.fragment.app.FragmentActivity
 import code.name.monkey.appthemehelper.ATH
 import code.name.monkey.appthemehelper.util.ATHUtil

app/src/main/java/code/name/monkey/retromusic/extensions/FragmentMusicExtensions.kt

@@ -2,7 +2,6 @@ package code.name.monkey.retromusic.extensions
 
 import android.net.Uri
 import android.webkit.MimeTypeMap
-import androidx.fragment.app.Fragment
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.RetroUtil
 import org.jaudiotagger.audio.AudioFileIO

app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumsFragment.kt

@@ -24,7 +24,6 @@ import androidx.recyclerview.widget.GridLayoutManager
 import code.name.monkey.retromusic.EXTRA_ALBUM_ID
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.album.AlbumAdapter
-import code.name.monkey.retromusic.extensions.navigate
 import code.name.monkey.retromusic.extensions.surfaceColor
 import code.name.monkey.retromusic.fragments.GridStyle
 import code.name.monkey.retromusic.fragments.ReloadType

app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.kt

@@ -21,9 +21,9 @@ import android.os.Environment
 import android.text.Html
 import android.view.*
 import android.webkit.MimeTypeMap
-import androidx.appcompat.widget.PopupMenu
 import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
+import androidx.appcompat.widget.PopupMenu
 import androidx.loader.app.LoaderManager
 import androidx.loader.content.Loader
 import androidx.navigation.Navigation.findNavController

app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenresFragment.kt

@@ -27,12 +27,10 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import code.name.monkey.retromusic.EXTRA_GENRE
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.GenreAdapter
-import code.name.monkey.retromusic.extensions.navigate
 import code.name.monkey.retromusic.fragments.ReloadType
 import code.name.monkey.retromusic.fragments.base.AbsRecyclerViewFragment
 import code.name.monkey.retromusic.interfaces.IGenreClickListener
 import code.name.monkey.retromusic.model.Genre
-import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.RetroUtil
 import com.google.android.gms.cast.framework.CastButtonFactory
 import com.google.android.material.transition.MaterialSharedAxis

app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt

@@ -26,14 +26,13 @@ import android.view.MenuItem
 import android.view.View
 import android.view.animation.DecelerateInterpolator
 import android.view.animation.LinearInterpolator
-import androidx.appcompat.widget.PopupMenu
 import android.widget.SeekBar
+import androidx.appcompat.widget.PopupMenu
 import androidx.lifecycle.lifecycleScope
 import code.name.monkey.appthemehelper.util.ColorUtil
 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.SongEntity
 import code.name.monkey.retromusic.db.toSongEntity
 import code.name.monkey.retromusic.extensions.applyColor
 import code.name.monkey.retromusic.extensions.getSongInfo

app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt

@@ -23,9 +23,9 @@ import android.graphics.drawable.AnimatedVectorDrawable
 import android.os.Bundle
 import android.view.View
 import android.view.animation.LinearInterpolator
-import androidx.appcompat.widget.PopupMenu
 import android.widget.SeekBar
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.PopupMenu
 import androidx.appcompat.widget.Toolbar
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.ViewCompat
@@ -39,9 +39,6 @@ import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.RetroBottomSheetBehavior
 import code.name.monkey.retromusic.adapter.song.PlayingQueueAdapter
 import code.name.monkey.retromusic.databinding.FragmentGradientPlayerBinding
-import code.name.monkey.retromusic.db.PlaylistEntity
-import code.name.monkey.retromusic.db.SongEntity
-import code.name.monkey.retromusic.db.toSongEntity
 import code.name.monkey.retromusic.extensions.*
 import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
 import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment

app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt

@@ -30,8 +30,6 @@ import androidx.media.app.NotificationCompat.MediaStyle
 import code.name.monkey.appthemehelper.util.VersionUtils
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.MainActivity
-import code.name.monkey.retromusic.db.PlaylistEntity
-import code.name.monkey.retromusic.db.toSongEntity
 import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.RetroGlideExtension
 import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper