Crash fixed

app/build.gradle

@@ -108,7 +108,7 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation project(':appthemehelper')
     implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'androidx.fragment:fragment:1.2.0-rc01'
+    implementation 'androidx.fragment:fragment:1.2.0-rc02'
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0-rc01'
     implementation "androidx.gridlayout:gridlayout:1.0.0"
@@ -118,9 +118,10 @@ dependencies {
     implementation 'androidx.preference:preference:1.1.0'
     implementation 'androidx.palette:palette-ktx:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.core:core-ktx:1.1.0'
 
     implementation 'com.google.android.material:material:1.2.0-alpha01'
-    implementation 'com.google.android.play:core:1.6.3'
+    implementation 'com.google.android.play:core:1.6.4'
 
     implementation 'com.squareup.retrofit2:retrofit:2.6.2'
     implementation 'com.squareup.retrofit2:converter-gson:2.6.2'

app/src/main/AndroidManifest.xml

@@ -119,13 +119,6 @@
             android:name=".activities.SearchActivity"
             android:windowSoftInputMode="stateVisible" />
 
-        <activity
-            android:name=".activities.bugreport.ErrorHandlerActivity"
-            android:immersive="true"
-            android:label="@string/error"
-            android:launchMode="singleInstance"
-            android:theme="@style/ErrorHandlingTheme" />
-
         <activity
             android:name=".activities.LockScreenActivity"
             android:noHistory="true"

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

@@ -4,13 +4,10 @@ import android.content.Intent
 import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Bundle
-import android.view.MenuItem
+import android.view.*
-import android.view.View
 import androidx.core.app.ShareCompat
-import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.*
-import androidx.recyclerview.widget.LinearLayoutManager
+import code.name.monkey.appthemehelper.util.*
-import code.name.monkey.appthemehelper.util.ATHUtil
-import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.Constants.APP_INSTAGRAM_LINK
 import code.name.monkey.retromusic.Constants.APP_TELEGRAM_LINK
 import code.name.monkey.retromusic.Constants.APP_TWITTER_LINK
@@ -24,10 +21,8 @@ import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsBaseActivity
 import code.name.monkey.retromusic.adapter.ContributorAdapter
 import code.name.monkey.retromusic.model.Contributor
-import code.name.monkey.retromusic.util.NavigationUtil
+import code.name.monkey.retromusic.util.*
-import code.name.monkey.retromusic.util.PreferenceUtil
+import com.afollestad.materialdialogs.*
-import com.afollestad.materialdialogs.LayoutMode
-import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.bottomsheets.BottomSheet
 import com.afollestad.materialdialogs.list.listItems
 import com.google.gson.Gson
@@ -79,7 +74,6 @@ class AboutActivity : AbsBaseActivity(), View.OnClickListener {
 		setUpView()
 	}
 
-
 	override fun onOptionsItemSelected(item: MenuItem): Boolean {
 		if (item.itemId == android.R.id.home) {
 			onBackPressed()
@@ -131,8 +125,7 @@ class AboutActivity : AbsBaseActivity(), View.OnClickListener {
 	}
 
 	private fun showChangeLogOptions() {
-        MaterialDialog(this, BottomSheet(LayoutMode.WRAP_CONTENT))
+		MaterialDialog(this, BottomSheet(LayoutMode.WRAP_CONTENT)).show {
-                .show {
 			cornerRadius(PreferenceUtil.getInstance(this@AboutActivity).dialogCorner)
 			listItems(items = listOf("Telegram Channel", "App")) { _, position, _ ->
 				if (position == 0) {
@@ -155,11 +148,9 @@ class AboutActivity : AbsBaseActivity(), View.OnClickListener {
 	}
 
 	private fun shareApp() {
-        ShareCompat.IntentBuilder.from(this)
+		ShareCompat.IntentBuilder.from(this).setType("text/plain")
-                .setType("text/plain")
 			.setChooserTitle(R.string.share_app)
-                .setText(String.format(getString(R.string.app_share), packageName))
+			.setText(String.format(getString(R.string.app_share), packageName)).startChooser()
-                .startChooser()
 	}
 
 	private fun loadContributors() {

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

@@ -4,41 +4,25 @@ import android.app.ActivityOptions
 import android.content.Intent
 import android.graphics.Color
 import android.os.Bundle
-import android.view.Menu
+import android.view.*
-import android.view.MenuItem
-import android.view.SubMenu
-import android.view.View
 import android.widget.ImageView
 import androidx.core.app.ActivityCompat
-import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.*
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.LinearLayoutManager
 import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.*
-import code.name.monkey.appthemehelper.util.ColorUtil
+import code.name.monkey.retromusic.*
-import code.name.monkey.appthemehelper.util.MaterialUtil
-import code.name.monkey.retromusic.App
-import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity
-import code.name.monkey.retromusic.activities.tageditor.AbsTagEditorActivity
+import code.name.monkey.retromusic.activities.tageditor.*
-import code.name.monkey.retromusic.activities.tageditor.AlbumTagEditorActivity
 import code.name.monkey.retromusic.adapter.album.HorizontalAlbumAdapter
 import code.name.monkey.retromusic.adapter.song.SimpleSongAdapter
-import code.name.monkey.retromusic.dialogs.AddToPlaylistDialog
+import code.name.monkey.retromusic.dialogs.*
-import code.name.monkey.retromusic.dialogs.DeleteSongsDialog
 import code.name.monkey.retromusic.extensions.show
-import code.name.monkey.retromusic.glide.ArtistGlideRequest
+import code.name.monkey.retromusic.glide.*
-import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
-import code.name.monkey.retromusic.glide.SongGlideRequest
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.SortOrder.AlbumSongSortOrder
-import code.name.monkey.retromusic.model.Album
+import code.name.monkey.retromusic.model.*
-import code.name.monkey.retromusic.model.Artist
+import code.name.monkey.retromusic.mvp.presenter.*
-import code.name.monkey.retromusic.mvp.presenter.AlbumDetailsPresenter
+import code.name.monkey.retromusic.util.*
-import code.name.monkey.retromusic.mvp.presenter.AlbumDetailsView
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.NavigationUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
 import com.bumptech.glide.Glide
 import kotlinx.android.synthetic.main.activity_album.*
 import kotlinx.android.synthetic.main.activity_album_content.*
@@ -46,7 +30,6 @@ import java.util.*
 import javax.inject.Inject
 import android.util.Pair as UtilPair
 
-
 class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView {
 
 	private lateinit var simpleSongAdapter: SimpleSongAdapter
@@ -80,7 +63,13 @@ class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView {
 		setupRecyclerView()
 
 		artistImage.setOnClickListener {
-            val artistPairs = ActivityOptions.makeSceneTransitionAnimation(this, UtilPair.create(artistImage, getString(R.string.transition_artist_image)))
+			val artistPairs = ActivityOptions.makeSceneTransitionAnimation(
+					this,
+					UtilPair.create(
+							artistImage,
+							getString(R.string.transition_artist_image)
+					)
+			)
 			NavigationUtil.goToArtistOptions(this, album.artistId, artistPairs)
 		}
 		playAction.apply {
@@ -129,32 +118,52 @@ class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView {
 
 		albumTitle.text = album.title
 		if (MusicUtil.getYearString(album.year) == "-") {
-            albumText.text = String.format("%s • %s", album.artistName, MusicUtil.getReadableDurationString(MusicUtil.getTotalDuration(this, album.songs)))
+			albumText.text = String.format(
+					"%s • %s",
+					album.artistName,
+					MusicUtil.getReadableDurationString(
+							MusicUtil.getTotalDuration(
+									this,
+									album.songs
+							)
+					)
+			)
 		} else {
-            albumText.text = String.format("%s • %s • %s", album.artistName, MusicUtil.getYearString(album.year), MusicUtil.getReadableDurationString(MusicUtil.getTotalDuration(this, album.songs)))
+			albumText.text = String.format(
+					"%s • %s • %s",
+					album.artistName,
+					MusicUtil.getYearString(album.year),
+					MusicUtil.getReadableDurationString(
+							MusicUtil.getTotalDuration(
+									this,
+									album.songs
+							)
+					)
+			)
 		}
 		loadAlbumCover()
 		simpleSongAdapter.swapDataSet(album.songs)
 		albumDetailsPresenter.loadMore(album.artistId)
 	}
 
-
 	override fun moreAlbums(albums: ArrayList<Album>) {
 		moreTitle.show()
 		moreRecyclerView.show()
 		moreTitle.text = String.format(getString(R.string.label_more_from), album.artistName)
 
 		val albumAdapter = HorizontalAlbumAdapter(this, albums, false, null)
-        moreRecyclerView.layoutManager = GridLayoutManager(this, 1, GridLayoutManager.HORIZONTAL, false)
+		moreRecyclerView.layoutManager = GridLayoutManager(
+				this,
+				1,
+				GridLayoutManager.HORIZONTAL,
+				false
+		)
 		moreRecyclerView.adapter = albumAdapter
 	}
 
 	override fun loadArtistImage(artist: Artist) {
-        ArtistGlideRequest.Builder.from(Glide.with(this), artist)
+		ArtistGlideRequest.Builder.from(Glide.with(this), artist).generatePalette(this).build()
-                .generatePalette(this).build()
+			.dontAnimate().dontTransform().into(object : RetroMusicColoredTarget(artistImage) {
-                .dontAnimate()
-                .dontTransform()
-                .into(object : RetroMusicColoredTarget(artistImage) {
 				override fun onColorReady(color: Int) {
 
 				}
@@ -164,9 +173,7 @@ class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView {
 
 	private fun loadAlbumCover() {
 		SongGlideRequest.Builder.from(Glide.with(this), album.safeGetFirstSong())
-                .checkIgnoreMediaStore(this)
+			.checkIgnoreMediaStore(this).generatePalette(this).build().dontAnimate().dontTransform()
-                .generatePalette(this).build()
-                .dontAnimate().dontTransform()
 			.into(object : RetroMusicColoredTarget(image) {
 				override fun onColorReady(color: Int) {
 					setColors(color)
@@ -248,10 +255,14 @@ class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView {
 
 	private fun setUpSortOrderMenu(sortOrder: SubMenu) {
 		when (savedSortOrder) {
-            AlbumSongSortOrder.SONG_A_Z -> sortOrder.findItem(R.id.action_sort_order_title).isChecked = true
+			AlbumSongSortOrder.SONG_A_Z        -> sortOrder.findItem(R.id.action_sort_order_title)
-            AlbumSongSortOrder.SONG_Z_A -> sortOrder.findItem(R.id.action_sort_order_title_desc).isChecked = true
+				.isChecked = true
-            AlbumSongSortOrder.SONG_TRACK_LIST -> sortOrder.findItem(R.id.action_sort_order_track_list).isChecked = true
+			AlbumSongSortOrder.SONG_Z_A        -> sortOrder.findItem(R.id.action_sort_order_title_desc)
-            AlbumSongSortOrder.SONG_DURATION -> sortOrder.findItem(R.id.action_sort_order_artist_song_duration).isChecked = true
+				.isChecked = true
+			AlbumSongSortOrder.SONG_TRACK_LIST -> sortOrder.findItem(R.id.action_sort_order_track_list)
+				.isChecked = true
+			AlbumSongSortOrder.SONG_DURATION   -> sortOrder.findItem(R.id.action_sort_order_artist_song_duration)
+				.isChecked = true
 		}
 	}
 

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

@@ -3,35 +3,23 @@ package code.name.monkey.retromusic.activities
 import android.app.Activity
 import android.content.Intent
 import android.graphics.Color
-import android.os.Build
+import android.os.*
-import android.os.Bundle
+import android.text.*
-import android.text.Html
+import android.view.*
-import android.text.Spanned
-import android.view.Menu
-import android.view.MenuItem
-import android.view.View
 import android.widget.Toast
 import androidx.core.app.ActivityCompat
-import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.*
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.LinearLayoutManager
 import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.*
-import code.name.monkey.appthemehelper.util.ColorUtil
+import code.name.monkey.retromusic.*
-import code.name.monkey.appthemehelper.util.MaterialUtil
-import code.name.monkey.retromusic.App
-import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity
-import code.name.monkey.retromusic.adapter.album.AlbumAdapter
+import code.name.monkey.retromusic.adapter.album.*
-import code.name.monkey.retromusic.adapter.album.HorizontalAlbumAdapter
 import code.name.monkey.retromusic.adapter.song.SimpleSongAdapter
 import code.name.monkey.retromusic.dialogs.AddToPlaylistDialog
-import code.name.monkey.retromusic.glide.ArtistGlideRequest
+import code.name.monkey.retromusic.glide.*
-import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.mvp.presenter.ArtistDetailsPresenter
+import code.name.monkey.retromusic.mvp.presenter.*
-import code.name.monkey.retromusic.mvp.presenter.ArtistDetailsView
 import code.name.monkey.retromusic.rest.LastFMRestClient
 import code.name.monkey.retromusic.rest.model.LastFmArtist
 import code.name.monkey.retromusic.util.*
@@ -117,7 +105,6 @@ class ArtistDetailActivity : AbsSlidingMusicPanelActivity(), ArtistDetailsView {
 		}
 	}
 
-
 	private fun setupRecyclerView() {
 		albumAdapter = HorizontalAlbumAdapter(this, ArrayList(), false, null)
 		albumRecyclerView.apply {
@@ -133,12 +120,13 @@ class ArtistDetailActivity : AbsSlidingMusicPanelActivity(), ArtistDetailsView {
 		}
 	}
 
-
 	override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
 		super.onActivityResult(requestCode, resultCode, data)
 		when (requestCode) {
 			REQUEST_CODE_SELECT_IMAGE -> if (resultCode == Activity.RESULT_OK) {
-                data?.data?.let { CustomArtistImageUtil.getInstance(this).setCustomArtistImage(artist, it) }
+				data?.data?.let {
+					CustomArtistImageUtil.getInstance(this).setCustomArtistImage(artist, it)
+				}
 			}
 			else                      -> if (resultCode == Activity.RESULT_OK) {
 				reload()
@@ -165,15 +153,19 @@ class ArtistDetailActivity : AbsSlidingMusicPanelActivity(), ArtistDetailsView {
 			loadBiography(artist.name)
 		}
 		artistTitle.text = artist.name
-        text.text = String.format("%s • %s", MusicUtil.getArtistInfoString(this, artist), MusicUtil
+		text.text = String.format(
-                .getReadableDurationString(MusicUtil.getTotalDuration(this, artist.songs)))
+				"%s • %s",
+				MusicUtil.getArtistInfoString(this, artist),
+				MusicUtil.getReadableDurationString(MusicUtil.getTotalDuration(this, artist.songs))
+		)
 
 		songAdapter.swapDataSet(artist.songs)
 		albumAdapter.swapDataSet(artist.albums!!)
 	}
 
-    private fun loadBiography(name: String,
+	private fun loadBiography(
-                              lang: String? = Locale.getDefault().language) {
+			name: String, lang: String? = Locale.getDefault().language
+	) {
 		biography = null
 		this.lang = lang
 		artistDetailsPresenter.loadBiography(name, lang, null)
@@ -203,10 +195,8 @@ class ArtistDetailActivity : AbsSlidingMusicPanelActivity(), ArtistDetailsView {
 	private var lang: String? = null
 
 	private fun loadArtistImage() {
-        ArtistGlideRequest.Builder.from(Glide.with(this), artist)
+		ArtistGlideRequest.Builder.from(Glide.with(this), artist).generatePalette(this).build()
-                .generatePalette(this).build()
+			.dontAnimate().into(object : RetroMusicColoredTarget(artistImage) {
-                .dontAnimate()
-                .into(object : RetroMusicColoredTarget(artistImage) {
 				override fun onColorReady(color: Int) {
 					setColors(color)
 				}
@@ -233,7 +223,6 @@ class ArtistDetailActivity : AbsSlidingMusicPanelActivity(), ArtistDetailsView {
 		supportActionBar?.title = null
 	}
 
-
 	override fun onOptionsItemSelected(item: MenuItem): Boolean {
 		return handleSortOrderMenuItem(item)
 	}
@@ -260,13 +249,22 @@ class ArtistDetailActivity : AbsSlidingMusicPanelActivity(), ArtistDetailsView {
 			R.id.action_set_artist_image       -> {
 				val intent = Intent(Intent.ACTION_GET_CONTENT)
 				intent.type = "image/*"
-                startActivityForResult(Intent.createChooser(intent, getString(R.string.pick_from_local_storage)), REQUEST_CODE_SELECT_IMAGE)
+				startActivityForResult(
+						Intent.createChooser(
+								intent,
+								getString(R.string.pick_from_local_storage)
+						), REQUEST_CODE_SELECT_IMAGE
+				)
 				return true
 			}
 			R.id.action_reset_artist_image     -> {
-                Toast.makeText(this@ArtistDetailActivity, resources.getString(R.string.updating),
+				Toast.makeText(
-                        Toast.LENGTH_SHORT).show()
+						this@ArtistDetailActivity,
-                CustomArtistImageUtil.getInstance(this@ArtistDetailActivity).resetCustomArtistImage(artist)
+						resources.getString(R.string.updating),
+						Toast.LENGTH_SHORT
+				).show()
+				CustomArtistImageUtil.getInstance(this@ArtistDetailActivity)
+					.resetCustomArtistImage(artist)
 				forceDownload = true
 				return true
 			}

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

@@ -2,26 +2,18 @@ package code.name.monkey.retromusic.activities
 
 import android.graphics.Color
 import android.os.Bundle
-import android.view.Menu
+import android.view.*
-import android.view.MenuItem
+import androidx.recyclerview.widget.*
-import android.view.View
+import code.name.monkey.appthemehelper.util.*
-import androidx.recyclerview.widget.DefaultItemAnimator
+import code.name.monkey.retromusic.*
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import code.name.monkey.appthemehelper.util.ATHUtil
-import code.name.monkey.appthemehelper.util.ColorUtil
-import code.name.monkey.retromusic.App
-import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity
 import code.name.monkey.retromusic.adapter.song.ShuffleButtonSongAdapter
 import code.name.monkey.retromusic.extensions.applyToolbar
 import code.name.monkey.retromusic.helper.menu.GenreMenuHelper
 import code.name.monkey.retromusic.interfaces.CabHolder
-import code.name.monkey.retromusic.model.Genre
+import code.name.monkey.retromusic.model.*
-import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.mvp.presenter.*
-import code.name.monkey.retromusic.mvp.presenter.GenreDetailsPresenter
+import code.name.monkey.retromusic.util.*
-import code.name.monkey.retromusic.mvp.presenter.GenreDetailsView
-import code.name.monkey.retromusic.util.RetroColorUtil
 import code.name.monkey.retromusic.util.ViewUtil
 import com.afollestad.materialcab.MaterialCab
 import kotlinx.android.synthetic.main.activity_playlist_detail.*
@@ -108,7 +100,7 @@ class GenreDetailsActivity : AbsSlidingMusicPanelActivity(), CabHolder, GenreDet
 	}
 
 	private fun setupRecyclerView() {
-        ViewUtil.setUpFastScrollRecyclerViewColor(this, recyclerView )
+		ViewUtil.setUpFastScrollRecyclerViewColor(this, recyclerView)
 		songAdapter = ShuffleButtonSongAdapter(this, ArrayList(), R.layout.item_list, false, this)
 		recyclerView.apply {
 			itemAnimator = DefaultItemAnimator()
@@ -129,17 +121,20 @@ class GenreDetailsActivity : AbsSlidingMusicPanelActivity(), CabHolder, GenreDet
 
 	override fun openCab(menuRes: Int, callback: MaterialCab.Callback): MaterialCab {
 		if (cab != null && cab!!.isActive) cab!!.finish()
-        cab = MaterialCab(this, R.id.cab_stub)
+		cab = MaterialCab(this, R.id.cab_stub).setMenu(menuRes)
-                .setMenu(menuRes)
+			.setCloseDrawableRes(R.drawable.ic_close_white_24dp).setBackgroundColor(
-                .setCloseDrawableRes(R.drawable.ic_close_white_24dp)
+					RetroColorUtil.shiftBackgroundColorForLightText(
-                .setBackgroundColor(RetroColorUtil.shiftBackgroundColorForLightText(ATHUtil.resolveColor(this, R.attr.colorPrimary)))
+							ATHUtil.resolveColor(
-                .start(callback)
+									this,
+									R.attr.colorPrimary
+							)
+					)
+			).start(callback)
 		return cab!!
 	}
 
 	override fun onBackPressed() {
-        if (cab != null && cab!!.isActive)
+		if (cab != null && cab!!.isActive) cab!!.finish()
-            cab!!.finish()
 		else {
 			recyclerView!!.stopScroll()
 			super.onBackPressed()

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

@@ -30,7 +30,6 @@ import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 
 import code.name.monkey.appthemehelper.ThemeStore;
-import code.name.monkey.appthemehelper.util.ATHUtil;
 import code.name.monkey.appthemehelper.util.ColorUtil;
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper;
 import code.name.monkey.retromusic.R;

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

@@ -2,23 +2,18 @@ package code.name.monkey.retromusic.activities
 
 import android.app.KeyguardManager
 import android.content.Context
-import android.os.Build
+import android.os.*
-import android.os.Bundle
+import android.view.*
-import android.view.View
-import android.view.WindowManager
 import androidx.core.view.ViewCompat
 import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
 import code.name.monkey.retromusic.fragments.player.lockscreen.LockScreenPlayerControlsFragment
-import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
+import code.name.monkey.retromusic.glide.*
-import code.name.monkey.retromusic.glide.SongGlideRequest
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import com.bumptech.glide.Glide
 import com.r0adkll.slidr.Slidr
-import com.r0adkll.slidr.model.SlidrConfig
+import com.r0adkll.slidr.model.*
-import com.r0adkll.slidr.model.SlidrListener
-import com.r0adkll.slidr.model.SlidrPosition
 import kotlinx.android.synthetic.main.activity_lock_screen.*
 
 class LockScreenActivity : AbsMusicServiceActivity() {
@@ -30,9 +25,9 @@ class LockScreenActivity : AbsMusicServiceActivity() {
 			setShowWhenLocked(true)
 			setTurnScreenOn(true)
 		} else {
-            this.window.addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD or
+			this.window.addFlags(
-                    WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
+					WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD or WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
-                    WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON)
+			)
 		}
 		setDrawUnderStatusBar()
 		setContentView(R.layout.activity_lock_screen)
@@ -43,8 +38,7 @@ class LockScreenActivity : AbsMusicServiceActivity() {
 		setTaskDescriptionColorAuto()
 		setLightNavigationBar(true)
 
-        val config = SlidrConfig.Builder()
+		val config = SlidrConfig.Builder().listener(object : SlidrListener {
-                .listener(object : SlidrListener {
 			override fun onSlideStateChanged(state: Int) {
 
 			}
@@ -65,9 +59,7 @@ class LockScreenActivity : AbsMusicServiceActivity() {
 				finish()
 				return true
 			}
-                })
+		}).position(SlidrPosition.BOTTOM).build()
-                .position(SlidrPosition.BOTTOM)
-                .build()
 
 		Slidr.attach(this, config)
 
@@ -76,14 +68,14 @@ class LockScreenActivity : AbsMusicServiceActivity() {
 		findViewById<View>(R.id.slide).apply {
 			translationY = 100f
 			alpha = 0f
-            ViewCompat.animate(this)
+			ViewCompat.animate(this).translationY(0f).alpha(1f).setDuration(1500).start()
-                    .translationY(0f)
-                    .alpha(1f)
-                    .setDuration(1500)
-                    .start()
 		}
 
-        findViewById<View>(R.id.root_layout).setBackgroundColor(ATHUtil.resolveColor(this, R.attr.colorPrimary))
+		findViewById<View>(R.id.root_layout).setBackgroundColor(
+				ATHUtil.resolveColor(
+						this, R.attr.colorPrimary
+				)
+		)
 	}
 
 	override fun onPlayingMetaChanged() {
@@ -98,11 +90,9 @@ class LockScreenActivity : AbsMusicServiceActivity() {
 
 	private fun updateSongs() {
 		val song = MusicPlayerRemote.currentSong
-        SongGlideRequest.Builder.from(Glide.with(this), song)
+		SongGlideRequest.Builder.from(Glide.with(this), song).checkIgnoreMediaStore(this)
-                .checkIgnoreMediaStore(this)
+			.generatePalette(this).build().dontAnimate()
-                .generatePalette(this).build()
+			.into(object : RetroMusicColoredTarget(image) {
-                .dontAnimate()
-                .into(object : RetroMusicColoredTarget(image ) {
 				override fun onColorReady(color: Int) {
 					fragment?.setDark(color)
 				}

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

@@ -95,7 +95,13 @@ class LyricsActivity : AbsMusicServiceActivity(), View.OnClickListener, ViewPage
         appBarLayout.setBackgroundColor(primaryColor)
         toolbar.apply {
             setBackgroundColor(primaryColor)
-            navigationIcon = TintHelper.createTintedDrawable(ContextCompat.getDrawable(this@LyricsActivity, R.drawable.ic_keyboard_backspace_black_24dp), ThemeStore.textColorSecondary(this@LyricsActivity))
+            navigationIcon = TintHelper.createTintedDrawable(
+                    ContextCompat.getDrawable(
+                            this@LyricsActivity,
+                            R.drawable.ic_keyboard_backspace_black_24dp
+                    ),
+                    ThemeStore.textColorSecondary(this@LyricsActivity)
+            )
             setSupportActionBar(toolbar)
         }
 
@@ -160,12 +166,17 @@ class LyricsActivity : AbsMusicServiceActivity(), View.OnClickListener, ViewPage
             e.printStackTrace()
         }
 
-        val materialDialog = MaterialDialog(this, BottomSheet(LayoutMode.WRAP_CONTENT)).show {
+        val materialDialog = MaterialDialog(
+                this,
+                BottomSheet(LayoutMode.WRAP_CONTENT)
+        ).show {
             title(R.string.add_time_framed_lryics)
             negativeButton(R.string.action_search) { RetroUtil.openUrl(this@LyricsActivity, googleSearchLrcUrl) }
-            input(hint = getString(R.string.paste_lyrics_here),
+            input(
+                    hint = getString(R.string.paste_lyrics_here),
                     prefill = content,
-                    inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE) { _, input ->
+                    inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE
+            ) { _, input ->
                 LyricUtil.writeLrcToLoc(song.data, song.artistName, input.toString())
             }
             positiveButton(android.R.string.ok) {
@@ -189,12 +200,16 @@ class LyricsActivity : AbsMusicServiceActivity(), View.OnClickListener, ViewPage
             lyricsString!!
         }
 
-        val materialDialog = MaterialDialog(this, BottomSheet(LayoutMode.WRAP_CONTENT)).show {
+        val materialDialog = MaterialDialog(
+                this, BottomSheet(LayoutMode.WRAP_CONTENT)
+        ).show {
             title(R.string.add_lyrics)
             negativeButton(R.string.action_search) { RetroUtil.openUrl(this@LyricsActivity, getGoogleSearchUrl()) }
-            input(hint = getString(R.string.paste_lyrics_here),
+            input(
+                    hint = getString(R.string.paste_lyrics_here),
                     prefill = content,
-                    inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE) { _, input ->
+                    inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE
+            ) { _, input ->
                 val fieldKeyValueMap = EnumMap<FieldKey, String>(FieldKey::class.java)
                 fieldKeyValueMap[FieldKey.LYRICS] = input.toString()
                 WriteTagsAsyncTask(this@LyricsActivity).execute(WriteTagsAsyncTask.LoadingInfo(getSongPaths(song), fieldKeyValueMap, null))
@@ -221,8 +236,10 @@ class LyricsActivity : AbsMusicServiceActivity(), View.OnClickListener, ViewPage
     }
 
     class PagerAdapter(fm: FragmentManager) : FragmentStatePagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
-        class Tabs(@StringRes val title: Int,
+        class Tabs(
-                   val fragment: Fragment)
+                @StringRes val title: Int,
+                val fragment: Fragment
+        )
 
         private var tabs = ArrayList<Tabs>()
 

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

@@ -12,19 +12,14 @@ import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity
 import code.name.monkey.retromusic.fragments.mainactivity.LibraryFragment
 import code.name.monkey.retromusic.fragments.mainactivity.folders.FoldersFragment
 import code.name.monkey.retromusic.fragments.mainactivity.home.BannerHomeFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.helper.*
-import code.name.monkey.retromusic.helper.SearchQueryHelper
 import code.name.monkey.retromusic.interfaces.MainActivityFragmentCallbacks
-import code.name.monkey.retromusic.loaders.AlbumLoader
+import code.name.monkey.retromusic.loaders.*
-import code.name.monkey.retromusic.loaders.ArtistLoader
-import code.name.monkey.retromusic.loaders.PlaylistSongsLoader
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.util.AppRater
+import code.name.monkey.retromusic.util.*
-import code.name.monkey.retromusic.util.PreferenceUtil
 import io.reactivex.disposables.CompositeDisposable
 import java.util.*
 
-
 class MainActivity : AbsSlidingMusicPanelActivity(), SharedPreferences.OnSharedPreferenceChangeListener {
 
 	private lateinit var currentFragment: MainActivityFragmentCallbacks
@@ -78,7 +73,10 @@ class MainActivity : AbsSlidingMusicPanelActivity(), SharedPreferences.OnSharedP
 			val pInfo = packageManager.getPackageInfo(packageName, 0)
 			val currentVersion = pInfo.versionCode
 			if (currentVersion != PreferenceUtil.getInstance(this).lastChangelogVersion) {
-                startActivityForResult(Intent(this, WhatsNewActivity::class.java), APP_INTRO_REQUEST)
+				startActivityForResult(
+						Intent(this, WhatsNewActivity::class.java),
+						APP_INTRO_REQUEST
+				)
 			}
 		} catch (e: Throwable) {
 			e.printStackTrace()
@@ -112,7 +110,8 @@ class MainActivity : AbsSlidingMusicPanelActivity(), SharedPreferences.OnSharedP
 	private fun setCurrentFragment(fragment: Fragment, tag: String) {
 		println("setCurrentFragment -> $tag -> ${supportFragmentManager.findFragmentById(R.id.fragment_container)?.tag}")
 		if (tag != supportFragmentManager.findFragmentById(R.id.fragment_container)?.tag) {
-            supportFragmentManager.beginTransaction().replace(R.id.fragment_container, fragment, tag).commit()
+			supportFragmentManager.beginTransaction()
+				.replace(R.id.fragment_container, fragment, tag).commit()
 			currentFragment = fragment as MainActivityFragmentCallbacks
 		}
 	}
@@ -220,33 +219,7 @@ class MainActivity : AbsSlidingMusicPanelActivity(), SharedPreferences.OnSharedP
 	}
 
 	override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
-        if (key == PreferenceUtil.GENERAL_THEME ||
+		if (key == PreferenceUtil.GENERAL_THEME || key == PreferenceUtil.BLACK_THEME || key == PreferenceUtil.ADAPTIVE_COLOR_APP || key == PreferenceUtil.DOMINANT_COLOR || key == PreferenceUtil.USER_NAME || key == PreferenceUtil.TOGGLE_FULL_SCREEN || key == PreferenceUtil.TOGGLE_VOLUME || key == PreferenceUtil.ROUND_CORNERS || key == PreferenceUtil.CAROUSEL_EFFECT || key == PreferenceUtil.NOW_PLAYING_SCREEN_ID || key == PreferenceUtil.TOGGLE_GENRE || key == PreferenceUtil.BANNER_IMAGE_PATH || key == PreferenceUtil.PROFILE_IMAGE_PATH || key == PreferenceUtil.CIRCULAR_ALBUM_ART || key == PreferenceUtil.KEEP_SCREEN_ON || key == PreferenceUtil.TOGGLE_SEPARATE_LINE || key == PreferenceUtil.ALBUM_GRID_STYLE || key == PreferenceUtil.ARTIST_GRID_STYLE || key == PreferenceUtil.TOGGLE_HOME_BANNER || key == PreferenceUtil.TOGGLE_ADD_CONTROLS || key == PreferenceUtil.ALBUM_COVER_STYLE || key == PreferenceUtil.HOME_ARTIST_GRID_STYLE || key == PreferenceUtil.ALBUM_COVER_TRANSFORM || key == PreferenceUtil.DESATURATED_COLOR || key == PreferenceUtil.TAB_TEXT_MODE || key == PreferenceUtil.LIBRARY_CATEGORIES) postRecreate()
-                key == PreferenceUtil.BLACK_THEME ||
-                key == PreferenceUtil.ADAPTIVE_COLOR_APP ||
-                key == PreferenceUtil.DOMINANT_COLOR ||
-                key == PreferenceUtil.USER_NAME ||
-                key == PreferenceUtil.TOGGLE_FULL_SCREEN ||
-                key == PreferenceUtil.TOGGLE_VOLUME ||
-                key == PreferenceUtil.ROUND_CORNERS ||
-                key == PreferenceUtil.CAROUSEL_EFFECT ||
-                key == PreferenceUtil.NOW_PLAYING_SCREEN_ID ||
-                key == PreferenceUtil.TOGGLE_GENRE ||
-                key == PreferenceUtil.BANNER_IMAGE_PATH ||
-                key == PreferenceUtil.PROFILE_IMAGE_PATH ||
-                key == PreferenceUtil.CIRCULAR_ALBUM_ART ||
-                key == PreferenceUtil.KEEP_SCREEN_ON ||
-                key == PreferenceUtil.TOGGLE_SEPARATE_LINE ||
-                key == PreferenceUtil.ALBUM_GRID_STYLE ||
-                key == PreferenceUtil.ARTIST_GRID_STYLE ||
-                key == PreferenceUtil.TOGGLE_HOME_BANNER ||
-                key == PreferenceUtil.TOGGLE_ADD_CONTROLS ||
-                key == PreferenceUtil.ALBUM_COVER_STYLE ||
-                key == PreferenceUtil.HOME_ARTIST_GRID_STYLE ||
-                key == PreferenceUtil.ALBUM_COVER_TRANSFORM ||
-                key == PreferenceUtil.DESATURATED_COLOR ||
-                key == PreferenceUtil.TAB_TEXT_MODE ||
-                key == PreferenceUtil.LIBRARY_CATEGORIES)
-            postRecreate()
 
 	}
 
@@ -266,12 +239,14 @@ class MainActivity : AbsSlidingMusicPanelActivity(), SharedPreferences.OnSharedP
 
 	private fun selectedFragment(itemId: Int) {
 		when (itemId) {
-            R.id.action_album,
+			R.id.action_album, R.id.action_artist, R.id.action_playlist, R.id.action_genre, R.id.action_song -> setCurrentFragment(
-            R.id.action_artist,
+					LibraryFragment.newInstance(itemId),
-            R.id.action_playlist,
+					itemId.toString()
-            R.id.action_genre,
+			)
-            R.id.action_song -> setCurrentFragment(LibraryFragment.newInstance(itemId), itemId.toString())
+			R.id.action_home                                                                                 -> setCurrentFragment(
-            R.id.action_home -> setCurrentFragment(BannerHomeFragment.newInstance(), BannerHomeFragment.TAG)
+					BannerHomeFragment.newInstance(),
+					BannerHomeFragment.TAG
+			)
 			else                                                                                             -> {
 				setCurrentFragment(BannerHomeFragment.newInstance(), BannerHomeFragment.TAG)
 			}

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

@@ -3,25 +3,21 @@ package code.name.monkey.retromusic.activities
 import android.content.res.ColorStateList
 import android.os.Bundle
 import android.view.MenuItem
-import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.*
-import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.*
-import code.name.monkey.appthemehelper.util.ColorUtil
-import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
 import code.name.monkey.retromusic.adapter.song.PlayingQueueAdapter
 import code.name.monkey.retromusic.extensions.applyToolbar
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.util.MusicUtil
+import code.name.monkey.retromusic.util.*
 import code.name.monkey.retromusic.util.ViewUtil
 import com.h6ah4i.android.widget.advrecyclerview.animator.RefactoredDefaultItemAnimator
 import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager
 import com.h6ah4i.android.widget.advrecyclerview.utils.WrapperAdapterUtils
 import kotlinx.android.synthetic.main.activity_playing_queue.*
 
-
 open class PlayingQueueActivity : AbsMusicServiceActivity() {
 
 	private var wrappedAdapter: RecyclerView.Adapter<*>? = null
@@ -29,13 +25,11 @@ open class PlayingQueueActivity : AbsMusicServiceActivity() {
 	private var playingQueueAdapter: PlayingQueueAdapter? = null
 	private lateinit var linearLayoutManager: LinearLayoutManager
 
-
 	private fun getUpNextAndQueueTime(): String {
 		val duration = MusicPlayerRemote.getQueueDurationMillis(MusicPlayerRemote.position)
 
 		return MusicUtil.buildInfoString(
-                resources.getString(R.string.up_next),
+				resources.getString(R.string.up_next), MusicUtil.getReadableDurationString(duration)
-                MusicUtil.getReadableDurationString(duration)
 		)
 	}
 
@@ -77,7 +71,8 @@ open class PlayingQueueActivity : AbsMusicServiceActivity() {
 				this,
 				MusicPlayerRemote.playingQueue,
 				MusicPlayerRemote.position,
-                R.layout.item_queue)
+				R.layout.item_queue
+		)
 		wrappedAdapter = recyclerViewDragDropManager?.createWrappedAdapter(playingQueueAdapter!!)
 
 		linearLayoutManager = LinearLayoutManager(this)
@@ -176,7 +171,16 @@ open class PlayingQueueActivity : AbsMusicServiceActivity() {
 		appBarLayout.setBackgroundColor(ATHUtil.resolveColor(this, R.attr.colorPrimary))
 
 		clearQueue.backgroundTintList = ColorStateList.valueOf(ThemeStore.accentColor(this))
-        ColorStateList.valueOf(MaterialValueHelper.getPrimaryTextColor(this, ColorUtil.isColorLight(ThemeStore.accentColor(this)))).apply {
+		ColorStateList.valueOf(
+				MaterialValueHelper.getPrimaryTextColor(
+						this,
+						ColorUtil.isColorLight(
+								ThemeStore.accentColor(
+										this
+								)
+						)
+				)
+		).apply {
 			clearQueue.setTextColor(this)
 			clearQueue.iconTint = this
 		}

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

@@ -2,31 +2,19 @@ package code.name.monkey.retromusic.activities
 
 import android.graphics.Color
 import android.os.Bundle
-import android.view.Menu
+import android.view.*
-import android.view.MenuItem
+import androidx.recyclerview.widget.*
-import android.view.View
+import code.name.monkey.appthemehelper.util.*
-import androidx.recyclerview.widget.LinearLayoutManager
+import code.name.monkey.retromusic.*
-import androidx.recyclerview.widget.RecyclerView
-import code.name.monkey.appthemehelper.util.ATHUtil
-import code.name.monkey.appthemehelper.util.ColorUtil
-import code.name.monkey.retromusic.App
-import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity
-import code.name.monkey.retromusic.adapter.song.OrderablePlaylistSongAdapter
+import code.name.monkey.retromusic.adapter.song.*
-import code.name.monkey.retromusic.adapter.song.PlaylistSongAdapter
-import code.name.monkey.retromusic.adapter.song.SongAdapter
 import code.name.monkey.retromusic.extensions.applyToolbar
 import code.name.monkey.retromusic.helper.menu.PlaylistMenuHelper
 import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.loaders.PlaylistLoader
-import code.name.monkey.retromusic.model.AbsCustomPlaylist
+import code.name.monkey.retromusic.model.*
-import code.name.monkey.retromusic.model.Playlist
+import code.name.monkey.retromusic.mvp.presenter.*
-import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.util.*
-import code.name.monkey.retromusic.mvp.presenter.PlaylistSongsPresenter
-import code.name.monkey.retromusic.mvp.presenter.PlaylistSongsView
-import code.name.monkey.retromusic.util.DensityUtil
-import code.name.monkey.retromusic.util.PlaylistsUtil
-import code.name.monkey.retromusic.util.RetroColorUtil
 import code.name.monkey.retromusic.util.ViewUtil
 import com.afollestad.materialcab.MaterialCab
 import com.h6ah4i.android.widget.advrecyclerview.animator.RefactoredDefaultItemAnimator
@@ -35,7 +23,6 @@ import com.h6ah4i.android.widget.advrecyclerview.utils.WrapperAdapterUtils
 import kotlinx.android.synthetic.main.activity_playlist_detail.*
 import javax.inject.Inject
 
-
 class PlaylistDetailActivity : AbsSlidingMusicPanelActivity(), CabHolder, PlaylistSongsView {
 
 	@Inject
@@ -85,13 +72,30 @@ class PlaylistDetailActivity : AbsSlidingMusicPanelActivity(), CabHolder, Playli
 		} else {
 			recyclerViewDragDropManager = RecyclerViewDragDropManager()
 			val animator = RefactoredDefaultItemAnimator()
-            adapter = OrderablePlaylistSongAdapter(this, ArrayList(), R.layout.item_list, false, this,
+			adapter = OrderablePlaylistSongAdapter(this,
+			                                       ArrayList(),
+			                                       R.layout.item_list,
+			                                       false,
+			                                       this,
 			                                       object : OrderablePlaylistSongAdapter.OnMoveItemListener {
-                        override fun onMoveItem(fromPosition: Int, toPosition: Int) {
+				                                       override fun onMoveItem(
-                            if (PlaylistsUtil.moveItem(this@PlaylistDetailActivity, playlist.id, fromPosition, toPosition)) {
+						                                       fromPosition: Int,
-                                val song = adapter.dataSet.removeAt(fromPosition)
+						                                       toPosition: Int
+				                                       ) {
+					                                       if (PlaylistsUtil.moveItem(
+									                                       this@PlaylistDetailActivity,
+									                                       playlist.id,
+									                                       fromPosition,
+									                                       toPosition
+							                                       )) {
+						                                       val song = adapter.dataSet.removeAt(
+								                                       fromPosition
+						                                       )
 						                                       adapter.dataSet.add(toPosition, song)
-                                adapter.notifyItemMoved(fromPosition, toPosition)
+						                                       adapter.notifyItemMoved(
+								                                       fromPosition,
+								                                       toPosition
+						                                       )
 					                                       }
 				                                       }
 			                                       })
@@ -121,7 +125,10 @@ class PlaylistDetailActivity : AbsSlidingMusicPanelActivity(), CabHolder, Playli
 	}
 
 	override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(if (playlist is AbsCustomPlaylist) R.menu.menu_smart_playlist_detail else R.menu.menu_playlist_detail, menu)
+		menuInflater.inflate(
+				if (playlist is AbsCustomPlaylist) R.menu.menu_smart_playlist_detail
+				else R.menu.menu_playlist_detail, menu
+		)
 		return super.onCreateOptionsMenu(menu)
 	}
 
@@ -139,12 +146,15 @@ class PlaylistDetailActivity : AbsSlidingMusicPanelActivity(), CabHolder, Playli
 		if (cab != null && cab!!.isActive) {
 			cab!!.finish()
 		}
-        cab = MaterialCab(this, R.id.cab_stub)
+		cab = MaterialCab(this, R.id.cab_stub).setMenu(menuRes)
-                .setMenu(menuRes)
+			.setCloseDrawableRes(R.drawable.ic_close_white_24dp).setBackgroundColor(
-                .setCloseDrawableRes(R.drawable.ic_close_white_24dp)
+					RetroColorUtil.shiftBackgroundColorForLightText(
-                .setBackgroundColor(
+							ATHUtil.resolveColor(
-                        RetroColorUtil.shiftBackgroundColorForLightText(ATHUtil.resolveColor(this, R.attr.colorPrimary)))
+									this,
-                .start(callback)
+									R.attr.colorPrimary
+							)
+					)
+			).start(callback)
 		return cab!!
 	}
 

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

@@ -1,27 +1,21 @@
 package code.name.monkey.retromusic.activities
 
 import android.content.Intent
-import android.os.AsyncTask
+import android.os.*
-import android.os.Bundle
 import android.util.Log
 import android.view.MenuItem
 import android.widget.Toast
-import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.*
-import code.name.monkey.appthemehelper.util.MaterialUtil
+import code.name.monkey.retromusic.*
-import code.name.monkey.retromusic.App
 import code.name.monkey.retromusic.BuildConfig
-import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsBaseActivity
 import code.name.monkey.retromusic.extensions.applyToolbar
-import com.anjlab.android.iab.v3.BillingProcessor
+import com.anjlab.android.iab.v3.*
-import com.anjlab.android.iab.v3.TransactionDetails
 import kotlinx.android.synthetic.main.activity_pro_version.*
 import java.lang.ref.WeakReference
 
-
 class PurchaseActivity : AbsBaseActivity(), BillingProcessor.IBillingHandler {
 
-
 	private lateinit var billingProcessor: BillingProcessor
 	private var restorePurchaseAsyncTask: AsyncTask<*, *, *>? = null
 
@@ -67,7 +61,6 @@ class PurchaseActivity : AbsBaseActivity(), BillingProcessor.IBillingHandler {
 		restorePurchaseAsyncTask = RestorePurchaseAsyncTask(this).execute()
 	}
 
-
 	override fun onProductPurchased(productId: String, details: TransactionDetails?) {
 		Toast.makeText(this, R.string.thank_you, Toast.LENGTH_SHORT).show()
 		setResult(RESULT_OK)
@@ -75,7 +68,11 @@ class PurchaseActivity : AbsBaseActivity(), BillingProcessor.IBillingHandler {
 
 	override fun onPurchaseHistoryRestored() {
 		if (App.isProVersion()) {
-            Toast.makeText(this, R.string.restored_previous_purchase_please_restart, Toast.LENGTH_LONG).show()
+			Toast.makeText(
+					this,
+					R.string.restored_previous_purchase_please_restart,
+					Toast.LENGTH_LONG
+			).show()
 			setResult(RESULT_OK)
 		} else {
 			Toast.makeText(this, R.string.no_purchase_found, Toast.LENGTH_SHORT).show()
@@ -86,13 +83,11 @@ class PurchaseActivity : AbsBaseActivity(), BillingProcessor.IBillingHandler {
 		Log.e(TAG, "Billing error: code = $errorCode", error)
 	}
 
-
 	override fun onBillingInitialized() {
 		restoreButton.isEnabled = true
 		purchaseButton.isEnabled = true
 	}
 
-
 	public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
 		if (!billingProcessor.handleActivityResult(requestCode, resultCode, data)) {
 			super.onActivityResult(requestCode, resultCode, data)
@@ -113,13 +108,16 @@ class PurchaseActivity : AbsBaseActivity(), BillingProcessor.IBillingHandler {
 
 	private class RestorePurchaseAsyncTask internal constructor(purchaseActivity: PurchaseActivity) : AsyncTask<Void, Void, Boolean>() {
 
-        private val buyActivityWeakReference: WeakReference<PurchaseActivity> = WeakReference(purchaseActivity)
+		private val buyActivityWeakReference: WeakReference<PurchaseActivity> = WeakReference(
+				purchaseActivity
+		)
 
 		override fun onPreExecute() {
 			super.onPreExecute()
 			val purchaseActivity = buyActivityWeakReference.get()
 			if (purchaseActivity != null) {
-                Toast.makeText(purchaseActivity, R.string.restoring_purchase, Toast.LENGTH_SHORT).show()
+				Toast.makeText(purchaseActivity, R.string.restoring_purchase, Toast.LENGTH_SHORT)
+					.show()
 			} else {
 				cancel(false)
 			}
@@ -144,7 +142,11 @@ class PurchaseActivity : AbsBaseActivity(), BillingProcessor.IBillingHandler {
 			if (b) {
 				purchaseActivity.onPurchaseHistoryRestored()
 			} else {
-                Toast.makeText(purchaseActivity, R.string.could_not_restore_purchase, Toast.LENGTH_SHORT).show()
+				Toast.makeText(
+						purchaseActivity,
+						R.string.could_not_restore_purchase,
+						Toast.LENGTH_SHORT
+				).show()
 			}
 		}
 	}

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

@@ -1,33 +1,24 @@
 package code.name.monkey.retromusic.activities
 
-import android.app.Activity
+import android.app.*
-import android.app.Service
+import android.content.*
-import android.content.ActivityNotFoundException
-import android.content.Intent
 import android.content.res.ColorStateList
 import android.os.Bundle
 import android.speech.RecognizerIntent
-import android.text.Editable
+import android.text.*
-import android.text.TextWatcher
 import android.view.View
 import android.view.inputmethod.InputMethodManager
 import android.widget.TextView.BufferType
 import android.widget.Toast
 import androidx.appcompat.widget.SearchView.OnQueryTextListener
-import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.*
-import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.*
-import code.name.monkey.appthemehelper.util.ColorUtil
+import code.name.monkey.retromusic.*
-import code.name.monkey.appthemehelper.util.MaterialValueHelper
-import code.name.monkey.retromusic.App
-import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
 import code.name.monkey.retromusic.adapter.SearchAdapter
-import code.name.monkey.retromusic.mvp.presenter.SearchPresenter
+import code.name.monkey.retromusic.mvp.presenter.*
-import code.name.monkey.retromusic.mvp.presenter.SearchView
+import code.name.monkey.retromusic.util.*
-import code.name.monkey.retromusic.util.RetroColorUtil
-import code.name.monkey.retromusic.util.RetroUtil
 import kotlinx.android.synthetic.main.activity_search.*
 import java.util.*
 import javax.inject.Inject
@@ -71,7 +62,16 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, TextWatch
 		}
 
 		keyboardPopup.backgroundTintList = ColorStateList.valueOf(ThemeStore.accentColor(this))
-        ColorStateList.valueOf(MaterialValueHelper.getPrimaryTextColor(this, ColorUtil.isColorLight(ThemeStore.accentColor(this)))).apply {
+		ColorStateList.valueOf(
+				MaterialValueHelper.getPrimaryTextColor(
+						this,
+						ColorUtil.isColorLight(
+								ThemeStore.accentColor(
+										this
+								)
+						)
+				)
+		).apply {
 			keyboardPopup.setTextColor(this)
 			keyboardPopup.iconTint = this
 		}
@@ -124,7 +124,6 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, TextWatch
 		appBarLayout.setBackgroundColor(ATHUtil.resolveColor(this, R.attr.colorPrimary))
 	}
 
-
 	private fun search(query: String) {
 		this.query = query
 		voiceSearch.visibility = if (query.isNotEmpty()) View.GONE else View.VISIBLE
@@ -177,14 +176,18 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, TextWatch
 
 	private fun startMicSearch() {
 		val intent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH)
-        intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, RecognizerIntent.LANGUAGE_MODEL_FREE_FORM)
+		intent.putExtra(
+				RecognizerIntent.EXTRA_LANGUAGE_MODEL,
+				RecognizerIntent.LANGUAGE_MODEL_FREE_FORM
+		)
 		intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE, Locale.getDefault())
 		intent.putExtra(RecognizerIntent.EXTRA_PROMPT, getString(R.string.speech_prompt))
 		try {
 			startActivityForResult(intent, REQ_CODE_SPEECH_INPUT)
 		} catch (e: ActivityNotFoundException) {
 			e.printStackTrace()
-            Toast.makeText(this, getString(R.string.speech_not_supported), Toast.LENGTH_SHORT).show()
+			Toast.makeText(this, getString(R.string.speech_not_supported), Toast.LENGTH_SHORT)
+				.show()
 		}
 
 	}

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

@@ -5,14 +5,12 @@ import android.view.MenuItem
 import androidx.annotation.StringRes
 import androidx.fragment.app.Fragment
 import androidx.transition.TransitionManager
-import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.*
-import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsBaseActivity
 import code.name.monkey.retromusic.fragments.settings.MainSettingsFragment
 import kotlinx.android.synthetic.main.activity_settings.*
 
-
 class SettingsActivity : AbsBaseActivity() {
 
     private val fragmentManager = supportFragmentManager

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

@@ -2,30 +2,20 @@ package code.name.monkey.retromusic.activities
 
 import android.content.Intent
 import android.graphics.Paint
-import android.os.AsyncTask
+import android.os.*
-import android.os.Bundle
 import android.util.Log
-import android.view.LayoutInflater
+import android.view.*
-import android.view.MenuItem
+import android.widget.*
-import android.view.View
-import android.view.ViewGroup
-import android.widget.TextView
-import android.widget.Toast
 import androidx.annotation.LayoutRes
 import androidx.appcompat.widget.AppCompatImageView
-import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.*
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.*
-import code.name.monkey.appthemehelper.util.TintHelper
+import code.name.monkey.retromusic.*
 import code.name.monkey.retromusic.BuildConfig
-import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsBaseActivity
 import code.name.monkey.retromusic.extensions.applyToolbar
-import com.anjlab.android.iab.v3.BillingProcessor
+import com.anjlab.android.iab.v3.*
-import com.anjlab.android.iab.v3.SkuDetails
-import com.anjlab.android.iab.v3.TransactionDetails
 import kotlinx.android.synthetic.main.activity_donation.*
 import java.lang.ref.WeakReference
 import java.util.*
@@ -124,7 +114,9 @@ class SupportDevelopmentActivity : AbsBaseActivity(), BillingProcessor.IBillingH
 }
 
 private class SkuDetailsLoadAsyncTask internal constructor(supportDevelopmentActivity: SupportDevelopmentActivity) : AsyncTask<Void, Void, List<SkuDetails>>() {
-    private val weakReference: WeakReference<SupportDevelopmentActivity> = WeakReference(supportDevelopmentActivity)
+	private val weakReference: WeakReference<SupportDevelopmentActivity> = WeakReference(
+			supportDevelopmentActivity
+	)
 
 	override fun onPreExecute() {
 		super.onPreExecute()
@@ -162,8 +154,7 @@ private class SkuDetailsLoadAsyncTask internal constructor(supportDevelopmentAct
 }
 
 class SkuDetailsAdapter(
-        private var donationsDialog: SupportDevelopmentActivity,
+		private var donationsDialog: SupportDevelopmentActivity, objects: List<SkuDetails>
-        objects: List<SkuDetails>
 ) : RecyclerView.Adapter<SkuDetailsAdapter.ViewHolder>() {
 	private var skuDetailsList: List<SkuDetails> = ArrayList()
 
@@ -185,20 +176,32 @@ class SkuDetailsAdapter(
 	}
 
 	override fun onCreateViewHolder(viewGroup: ViewGroup, i: Int): ViewHolder {
-        return ViewHolder(LayoutInflater.from(donationsDialog).inflate(LAYOUT_RES_ID, viewGroup, false))
+		return ViewHolder(
+				LayoutInflater.from(donationsDialog).inflate(
+						LAYOUT_RES_ID,
+						viewGroup,
+						false
+				)
+		)
 	}
 
 	override fun onBindViewHolder(viewHolder: ViewHolder, i: Int) {
 		val skuDetails = skuDetailsList[i]
-        viewHolder.title.text = skuDetails.title.replace("(Retro Music Player)", "").trim { it <= ' ' }
+		viewHolder.title.text = skuDetails.title.replace("(Retro Music Player)", "")
+			.trim { it <= ' ' }
 		viewHolder.text.text = skuDetails.description
 		viewHolder.text.visibility = View.GONE
 		viewHolder.price.text = skuDetails.priceText
 		viewHolder.image.setImageResource(getIcon(i))
 
 		val purchased = donationsDialog.billingProcessor!!.isPurchased(skuDetails.productId)
-        val titleTextColor = if (purchased) ATHUtil.resolveColor(donationsDialog, android.R.attr.textColorHint) else ThemeStore.textColorPrimary(donationsDialog)
+		val titleTextColor = if (purchased) ATHUtil.resolveColor(
-        val contentTextColor = if (purchased) titleTextColor else ThemeStore.textColorSecondary(donationsDialog)
+				donationsDialog,
+				android.R.attr.textColorHint
+		) else ThemeStore.textColorPrimary(donationsDialog)
+		val contentTextColor = if (purchased) titleTextColor else ThemeStore.textColorSecondary(
+				donationsDialog
+		)
 
 
 		viewHolder.title.setTextColor(titleTextColor)
@@ -229,10 +232,8 @@ class SkuDetailsAdapter(
 		private val LAYOUT_RES_ID = R.layout.item_donation_option
 
 		private fun strikeThrough(textView: TextView, strikeThrough: Boolean) {
-            textView.paintFlags = if (strikeThrough)
+			textView.paintFlags = if (strikeThrough) textView.paintFlags or Paint.STRIKE_THRU_TEXT_FLAG
-                textView.paintFlags or Paint.STRIKE_THRU_TEXT_FLAG
+			else textView.paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv()
-            else
-                textView.paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv()
 		}
 	}
 }

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

@@ -1,10 +1,7 @@
 package code.name.monkey.retromusic.activities
 
 import android.app.Activity
-import android.content.ContentUris
+import android.content.*
-import android.content.Context
-import android.content.ContextWrapper
-import android.content.Intent
 import android.content.res.ColorStateList
 import android.graphics.Bitmap
 import android.net.Uri
@@ -16,30 +13,23 @@ import android.text.TextUtils
 import android.view.MenuItem
 import android.widget.Toast
 import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.*
-import code.name.monkey.appthemehelper.util.ColorUtil
+import code.name.monkey.retromusic.*
-import code.name.monkey.appthemehelper.util.MaterialUtil
-import code.name.monkey.appthemehelper.util.MaterialValueHelper
-import code.name.monkey.retromusic.App
 import code.name.monkey.retromusic.Constants.USER_BANNER
 import code.name.monkey.retromusic.Constants.USER_PROFILE
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsBaseActivity
 import code.name.monkey.retromusic.extensions.applyToolbar
-import code.name.monkey.retromusic.util.Compressor
+import code.name.monkey.retromusic.util.*
 import code.name.monkey.retromusic.util.ImageUtil.getResizedBitmap
-import code.name.monkey.retromusic.util.PreferenceUtil
+import com.afollestad.materialdialogs.*
-import com.afollestad.materialdialogs.LayoutMode
-import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.bottomsheets.BottomSheet
 import com.afollestad.materialdialogs.list.listItems
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.schedulers.Schedulers
 import kotlinx.android.synthetic.main.activity_user_info.*
-import java.io.File
+import java.io.*
-import java.io.FileOutputStream
-import java.io.IOException
 
 class UserInfoActivity : AbsBaseActivity() {
 
@@ -67,7 +57,12 @@ class UserInfoActivity : AbsBaseActivity() {
 		userImage.setOnClickListener {
 			MaterialDialog(this, BottomSheet(LayoutMode.WRAP_CONTENT)).show {
 				title(text = getString(R.string.set_photo))
-                listItems(items = listOf(getString(R.string.new_profile_photo), getString(R.string.remove_profile_photo))) { _, position, _ ->
+				listItems(
+						items = listOf(
+								getString(R.string.new_profile_photo),
+								getString(R.string.remove_profile_photo)
+						)
+				) { _, position, _ ->
 					when (position) {
 						0 -> pickNewPhoto()
 						1 -> PreferenceUtil.getInstance(this@UserInfoActivity).saveProfileImage("")
@@ -96,7 +91,16 @@ class UserInfoActivity : AbsBaseActivity() {
 			finish()
 		}
 		next.backgroundTintList = ColorStateList.valueOf(ThemeStore.accentColor(this))
-        ColorStateList.valueOf(MaterialValueHelper.getPrimaryTextColor(this, ColorUtil.isColorLight(ThemeStore.accentColor(this)))).apply {
+		ColorStateList.valueOf(
+				MaterialValueHelper.getPrimaryTextColor(
+						this,
+						ColorUtil.isColorLight(
+								ThemeStore.accentColor(
+										this
+								)
+						)
+				)
+		).apply {
 			next.setTextColor(this)
 			next.iconTint = this
 		}
@@ -118,8 +122,12 @@ class UserInfoActivity : AbsBaseActivity() {
 	private fun showBannerOptions() {
 		MaterialDialog(this, BottomSheet(LayoutMode.WRAP_CONTENT)).show {
 			title(R.string.select_banner_photo)
-            listItems(items = listOf(getString(R.string.new_banner_photo), getString(R.string.remove_banner_photo)))
+			listItems(
-            { _, position, _ ->
+					items = listOf(
+							getString(R.string.new_banner_photo),
+							getString(R.string.remove_banner_photo)
+					)
+			) { _, position, _ ->
 				when (position) {
 					0 -> selectBannerImage()
 					1 -> PreferenceUtil.getInstance(this@UserInfoActivity).setBannerImagePath("")
@@ -140,14 +148,16 @@ class UserInfoActivity : AbsBaseActivity() {
 			pickImageIntent.putExtra("aspectY", 9)
 			pickImageIntent.putExtra("scale", true)
 			//intent.setAction(Intent.ACTION_GET_CONTENT);
-            startActivityForResult(Intent.createChooser(pickImageIntent, "Select Picture"), PICK_BANNER_REQUEST)
+			startActivityForResult(
+					Intent.createChooser(pickImageIntent, "Select Picture"),
+					PICK_BANNER_REQUEST
+			)
 		} else {
 			PreferenceUtil.getInstance(this).setBannerImagePath("")
 			bannerImage.setImageResource(android.R.color.transparent)
 		}
 	}
 
-
 	private fun pickNewPhoto() {
 		val pickImageIntent = Intent(Intent.ACTION_PICK, Media.EXTERNAL_CONTENT_URI)
 		pickImageIntent.type = "image/*"
@@ -157,7 +167,10 @@ class UserInfoActivity : AbsBaseActivity() {
 		pickImageIntent.putExtra("aspectX", 1)
 		pickImageIntent.putExtra("aspectY", 1)
 		pickImageIntent.putExtra("scale", true)
-        startActivityForResult(Intent.createChooser(pickImageIntent, "Select Picture"), PICK_IMAGE_REQUEST)
+		startActivityForResult(
+				Intent.createChooser(pickImageIntent, "Select Picture"),
+				PICK_IMAGE_REQUEST
+		)
 	}
 
 	public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -167,7 +180,10 @@ class UserInfoActivity : AbsBaseActivity() {
 				PICK_IMAGE_REQUEST -> {
 					try {
 						data.data?.let {
-                            val bitmap = getResizedBitmap(getBitmap(contentResolver, it), PROFILE_ICON_SIZE)
+							val bitmap = getResizedBitmap(
+									getBitmap(contentResolver, it),
+									PROFILE_ICON_SIZE
+							)
 							val profileImagePath = saveToInternalStorage(bitmap, USER_PROFILE)
 							PreferenceUtil.getInstance(this).saveProfileImage(profileImagePath)
 							loadImageFromStorage(profileImagePath)
@@ -193,7 +209,6 @@ class UserInfoActivity : AbsBaseActivity() {
 		}
 	}
 
-
 	private fun getImagePathFromUri(aUri: Uri?): String? {
 		var imagePath: String? = null
 		if (aUri == null) {
@@ -206,8 +221,10 @@ class UserInfoActivity : AbsBaseActivity() {
 				val selection = Media._ID + "=" + id
 				imagePath = getImagePath(Media.EXTERNAL_CONTENT_URI, selection)
 			} else if ("com.android.providers.downloads.documents" == aUri.authority) {
-                val contentUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"),
+				val contentUri = ContentUris.withAppendedId(
-                        java.lang.Long.valueOf(documentId))
+						Uri.parse("content://downloads/public_downloads"),
+						java.lang.Long.valueOf(documentId)
+				)
 				imagePath = getImagePath(contentUri, null)
 			}
 		} else if ("content".equals(aUri.scheme!!, ignoreCase = true)) {
@@ -231,25 +248,28 @@ class UserInfoActivity : AbsBaseActivity() {
 	}
 
 	private fun loadBannerFromStorage(profileImagePath: String) {
-        disposable.add(Compressor(this)
+		disposable.add(
-                .setQuality(100)
+				Compressor(this).setQuality(100).setCompressFormat(Bitmap.CompressFormat.WEBP).compressToBitmapAsFlowable(
-                .setCompressFormat(Bitmap.CompressFormat.WEBP)
+							File(profileImagePath, USER_BANNER)
-                .compressToBitmapAsFlowable(File(profileImagePath, USER_BANNER))
+					).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(
-                .subscribeOn(Schedulers.io())
+							{ bitmap -> bannerImage.setImageBitmap(bitmap) },
-                .observeOn(AndroidSchedulers.mainThread())
+							{ t -> println() })
-                .subscribe({ bitmap -> bannerImage.setImageBitmap(bitmap) }, { t -> println() }))
+		)
 	}
 
 	private fun loadImageFromStorage(path: String) {
-        disposable.add(Compressor(this)
+		disposable.add(
-                .setMaxHeight(300)
+				Compressor(this).setMaxHeight(300).setMaxWidth(300).setQuality(75).setCompressFormat(
-                .setMaxWidth(300)
+							Bitmap.CompressFormat.WEBP
-                .setQuality(75)
+					).compressToBitmapAsFlowable(
-                .setCompressFormat(Bitmap.CompressFormat.WEBP)
+							File(
-                .compressToBitmapAsFlowable(File(path, USER_PROFILE))
+									path,
-                .subscribeOn(Schedulers.io())
+									USER_PROFILE
-                .observeOn(AndroidSchedulers.mainThread())
+							)
-                .subscribe({ bitmap -> userImage!!.setImageBitmap(bitmap) },  { t -> println() }))
+					).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(
+							{ bitmap -> userImage!!.setImageBitmap(bitmap) },
+							{ t -> println() })
+		)
 	}
 
 	private fun saveToInternalStorage(bitmapImage: Bitmap, userBanner: String): String {

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

@@ -5,22 +5,18 @@ import android.content.Intent
 import android.content.pm.PackageManager
 import android.media.AudioManager
 import android.net.Uri
-import android.os.Build
+import android.os.*
-import android.os.Bundle
 import android.provider.Settings
-import android.view.KeyEvent
+import android.view.*
-import android.view.View
 import androidx.core.app.ActivityCompat
 import code.name.monkey.appthemehelper.ThemeStore
 import com.google.android.material.snackbar.Snackbar
 
-
 abstract class AbsBaseActivity : AbsThemeActivity() {
 	private var hadPermissions: Boolean = false
 	private lateinit var permissions: Array<String>
 	private var permissionDeniedMessage: String? = null
 
-
 	open fun getPermissionsToRequest(): Array<String> {
 		return arrayOf()
 	}
@@ -33,11 +29,9 @@ abstract class AbsBaseActivity : AbsThemeActivity() {
 		return if (permissionDeniedMessage == null) getString(code.name.monkey.retromusic.R.string.permissions_denied) else permissionDeniedMessage!!
 	}
 
-
 	private val snackBarContainer: View
 		get() = window.decorView
 
-
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		volumeControlStream = AudioManager.STREAM_MUSIC
@@ -97,32 +91,43 @@ abstract class AbsBaseActivity : AbsThemeActivity() {
 		return true
 	}
 
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
+	override fun onRequestPermissionsResult(
+			requestCode: Int,
+			permissions: Array<String>,
+			grantResults: IntArray
+	) {
 		super.onRequestPermissionsResult(requestCode, permissions, grantResults)
 		if (requestCode == PERMISSION_REQUEST) {
 			for (grantResult in grantResults) {
 				if (grantResult != PackageManager.PERMISSION_GRANTED) {
-                    if (ActivityCompat.shouldShowRequestPermissionRationale(this@AbsBaseActivity,
+					if (ActivityCompat.shouldShowRequestPermissionRationale(
-                                    Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
+									this@AbsBaseActivity, Manifest.permission.WRITE_EXTERNAL_STORAGE
+							)) {
 						//User has deny from permission dialog
-                        Snackbar.make(snackBarContainer, permissionDeniedMessage!!,
+						Snackbar.make(
-                                Snackbar.LENGTH_INDEFINITE)
+								snackBarContainer,
+								permissionDeniedMessage!!,
+								Snackbar.LENGTH_INDEFINITE
+						)
 							.setAction(code.name.monkey.retromusic.R.string.action_grant) { requestPermissions() }
-                                .setActionTextColor(ThemeStore.accentColor(this))
+							.setActionTextColor(ThemeStore.accentColor(this)).show()
-                                .show()
 					} else {
 						// User has deny permission and checked never show permission dialog so you can redirect to Application settings page
-                        Snackbar.make(snackBarContainer, permissionDeniedMessage!!,
+						Snackbar.make(
-                                Snackbar.LENGTH_INDEFINITE)
+								snackBarContainer,
-                                .setAction(code.name.monkey.retromusic.R.string.action_settings) {
+								permissionDeniedMessage!!,
+								Snackbar.LENGTH_INDEFINITE
+						).setAction(code.name.monkey.retromusic.R.string.action_settings) {
 							val intent = Intent()
 							intent.action = Settings.ACTION_APPLICATION_DETAILS_SETTINGS
-                                    val uri = Uri.fromParts("package", this@AbsBaseActivity.packageName, null)
+							val uri = Uri.fromParts(
+									"package",
+									this@AbsBaseActivity.packageName,
+									null
+							)
 							intent.data = uri
 							startActivity(intent)
-                                }
+						}.setActionTextColor(ThemeStore.accentColor(this)).show()
-                                .setActionTextColor(ThemeStore.accentColor(this))
-                                .show()
 					}
 					return
 				}

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

@@ -1,12 +0,0 @@
-package code.name.monkey.retromusic.activities.base
-
-import android.os.Bundle
-import code.name.monkey.appthemehelper.ATHActivity
-import code.name.monkey.retromusic.helper.TopExceptionHandler
-
-abstract class AbsCrashCollector : ATHActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        Thread.setDefaultUncaughtExceptionHandler(TopExceptionHandler())
-    }
-}

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

@@ -2,8 +2,7 @@ package code.name.monkey.retromusic.activities.base
 
 import android.Manifest
 import android.content.*
-import android.os.Bundle
+import android.os.*
-import android.os.IBinder
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.interfaces.MusicServiceEventListener
@@ -11,7 +10,6 @@ import code.name.monkey.retromusic.service.MusicService.*
 import java.lang.ref.WeakReference
 import java.util.*
 
-
 abstract class AbsMusicServiceActivity : AbsBaseActivity(), MusicServiceEventListener {
 
 	private val mMusicServiceEventListeners = ArrayList<MusicServiceEventListener>()
@@ -129,13 +127,18 @@ abstract class AbsMusicServiceActivity : AbsBaseActivity(), MusicServiceEventLis
 	override fun onHasPermissionsChanged(hasPermissions: Boolean) {
 		super.onHasPermissionsChanged(hasPermissions)
 		val intent = Intent(MEDIA_STORE_CHANGED)
-        intent.putExtra("from_permissions_changed", true) // just in case we need to know this at some point
+		intent.putExtra(
+				"from_permissions_changed",
+				true
+		) // just in case we need to know this at some point
 		sendBroadcast(intent)
 	}
 
-
 	override fun getPermissionsToRequest(): Array<String> {
-        return arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE)
+		return arrayOf(
+				Manifest.permission.READ_EXTERNAL_STORAGE,
+				Manifest.permission.WRITE_EXTERNAL_STORAGE
+		)
 	}
 
 	private class MusicStateReceiver(activity: AbsMusicServiceActivity) : BroadcastReceiver() {
@@ -147,8 +150,7 @@ abstract class AbsMusicServiceActivity : AbsBaseActivity(), MusicServiceEventLis
 			val activity = reference.get()
 			if (activity != null && action != null) {
 				when (action) {
-                    FAVORITE_STATE_CHANGED,
+					FAVORITE_STATE_CHANGED, META_CHANGED -> activity.onPlayingMetaChanged()
-                    META_CHANGED -> activity.onPlayingMetaChanged()
 					QUEUE_CHANGED                        -> activity.onQueueChanged()
 					PLAY_STATE_CHANGED                   -> activity.onPlayStateChanged()
 					REPEAT_MODE_CHANGED                  -> activity.onRepeatModeChanged()

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

@@ -2,22 +2,15 @@ package code.name.monkey.retromusic.activities.base
 
 import android.animation.ValueAnimator
 import android.annotation.SuppressLint
-import android.graphics.Color
+import android.graphics.*
-import android.graphics.Rect
 import android.os.Bundle
-import android.view.MotionEvent
+import android.view.*
-import android.view.View
-import android.view.ViewGroup
-import android.view.ViewTreeObserver
 import androidx.annotation.LayoutRes
 import androidx.fragment.app.Fragment
-import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.*
-import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.hide
+import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.extensions.show
+import code.name.monkey.retromusic.fragments.*
-import code.name.monkey.retromusic.fragments.MiniPlayerFragment
-import code.name.monkey.retromusic.fragments.NowPlayingScreen
 import code.name.monkey.retromusic.fragments.NowPlayingScreen.*
 import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
 import code.name.monkey.retromusic.fragments.player.adaptive.AdaptiveFragment
@@ -35,14 +28,12 @@ import code.name.monkey.retromusic.fragments.player.plain.PlainPlayerFragment
 import code.name.monkey.retromusic.fragments.player.simple.SimplePlayerFragment
 import code.name.monkey.retromusic.fragments.player.tiny.TinyPlayerFragment
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.util.DensityUtil
+import code.name.monkey.retromusic.util.*
-import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.views.BottomNavigationBarTinted
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.card.MaterialCardView
 import kotlinx.android.synthetic.main.sliding_music_panel_layout.*
 
-
 abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), AbsPlayerFragment.Callbacks {
 	companion object {
 		val TAG: String = AbsSlidingMusicPanelActivity::class.java.simpleName
@@ -85,7 +76,6 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), AbsPlay
 		}
 	}
 
-
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		setContentView(createContentView())
@@ -119,10 +109,10 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), AbsPlay
 		if (navigationBarColorAnimator != null) navigationBarColorAnimator!!.cancel() // just in case
 	}
 
-
 	protected fun wrapSlidingMusicPanel(@LayoutRes resId: Int): View {
-        @SuppressLint("InflateParams")
+		@SuppressLint("InflateParams") val slidingMusicPanelLayout = layoutInflater.inflate(
-        val slidingMusicPanelLayout = layoutInflater.inflate(R.layout.sliding_music_panel_layout, null)
+				R.layout.sliding_music_panel_layout, null
+		)
 		val contentContainer = slidingMusicPanelLayout.findViewById<ViewGroup>(R.id.mainContentFrame)
 		layoutInflater.inflate(resId, contentContainer)
 		return slidingMusicPanelLayout
@@ -172,8 +162,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), AbsPlay
 	}
 
 	private fun setupSlidingUpPanel() {
-        slidingPanel.viewTreeObserver
+		slidingPanel.viewTreeObserver.addOnGlobalLayoutListener(object : ViewTreeObserver.OnGlobalLayoutListener {
-                .addOnGlobalLayoutListener(object : ViewTreeObserver.OnGlobalLayoutListener {
 			override fun onGlobalLayout() {
 				slidingPanel.viewTreeObserver.removeOnGlobalLayoutListener(this)
 				if (currentNowPlayingScreen != PEAK) {
@@ -182,9 +171,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), AbsPlay
 					slidingPanel.layoutParams = params
 				}
 				when (panelState) {
-                            BottomSheetBehavior.STATE_EXPANDED -> {
+					BottomSheetBehavior.STATE_EXPANDED  -> onPanelExpanded()
-                                onPanelExpanded()
-                            }
 					BottomSheetBehavior.STATE_COLLAPSED -> onPanelCollapsed()
 					else                                -> playerFragment!!.onHide()
 				}
@@ -244,12 +231,13 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), AbsPlay
 			PEAK      -> PeakPlayerFragment()
 			else      -> PlayerFragment()
 		} // must implement AbsPlayerFragment
-        supportFragmentManager.beginTransaction().replace(R.id.playerFragmentContainer, fragment).commit()
+		supportFragmentManager.beginTransaction().replace(R.id.playerFragmentContainer, fragment)
+			.commit()
 		supportFragmentManager.executePendingTransactions()
 
 		playerFragment = supportFragmentManager.findFragmentById(R.id.playerFragmentContainer) as AbsPlayerFragment
 		miniPlayerFragment = supportFragmentManager.findFragmentById(R.id.miniPlayerFragment) as MiniPlayerFragment
-        miniPlayerFragment!!.view!!.setOnClickListener { expandPanel() }
+		miniPlayerFragment?.view?.setOnClickListener { expandPanel() }
 	}
 
 	override fun onServiceConnected() {
@@ -270,13 +258,11 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), AbsPlay
 	}
 
 	override fun onBackPressed() {
-        if (!handleBackPress())
+		if (!handleBackPress()) super.onBackPressed()
-            super.onBackPressed()
 	}
 
 	open fun handleBackPress(): Boolean {
-        if (bottomSheetBehavior.peekHeight != 0 && playerFragment!!.onBackPressed())
+		if (bottomSheetBehavior.peekHeight != 0 && playerFragment!!.onBackPressed()) return true
-            return true
 		if (panelState == BottomSheetBehavior.STATE_EXPANDED) {
 			collapsePanel()
 			return true
@@ -291,12 +277,10 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), AbsPlay
 
 			val isColorLight = ColorUtil.isColorLight(paletteColor)
 
-            if (PreferenceUtil.getInstance(this).adaptiveColor &&
+			if (PreferenceUtil.getInstance(this).adaptiveColor && (currentNowPlayingScreen == NORMAL || currentNowPlayingScreen == FLAT)) {
-                    (currentNowPlayingScreen == NORMAL || currentNowPlayingScreen == FLAT)) {
 				super.setLightNavigationBar(true)
 				super.setLightStatusbar(isColorLight)
-            } else if (currentNowPlayingScreen == FULL || currentNowPlayingScreen == CARD ||
+			} else if (currentNowPlayingScreen == FULL || currentNowPlayingScreen == CARD || currentNowPlayingScreen == FIT || currentNowPlayingScreen == BLUR || currentNowPlayingScreen == BLUR_CARD) {
-                    currentNowPlayingScreen == FIT || currentNowPlayingScreen == BLUR || currentNowPlayingScreen == BLUR_CARD) {
 				super.setLightStatusbar(false)
 				super.setLightNavigationBar(true)
 			} else if (currentNowPlayingScreen == COLOR || currentNowPlayingScreen == TINY) {
@@ -304,7 +288,13 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), AbsPlay
 				super.setLightNavigationBar(isColorLight)
 				super.setLightStatusbar(isColorLight)
 			} else {
-                super.setLightStatusbar(ColorUtil.isColorLight(ATHUtil.resolveColor(this, R.attr.colorPrimary)))
+				super.setLightStatusbar(
+						ColorUtil.isColorLight(
+								ATHUtil.resolveColor(
+										this, R.attr.colorPrimary
+								)
+						)
+				)
 				super.setLightNavigationBar(true)
 			}
 		}
@@ -339,15 +329,15 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), AbsPlay
 		}
 	}
 
-
 	private fun updateTabs() {
 		bottomNavigationView.menu.clear()
 		val currentTabs = PreferenceUtil.getInstance(this).libraryCategoryInfos
 		for (tab in currentTabs) {
 			if (tab.visible) {
 				val menu = tab.category
-                bottomNavigationView.menu.add(0, menu.id, 0, menu.stringRes)
+				bottomNavigationView.menu.add(
-                        .setIcon(menu.icon)
+						0, menu.id, 0, menu.stringRes
+				).setIcon(menu.icon)
 			}
 		}
 	}

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

@@ -2,24 +2,15 @@ package code.name.monkey.retromusic.activities.base
 
 import android.graphics.Color
 import android.graphics.drawable.Drawable
-import android.os.Bundle
+import android.os.*
-import android.os.Handler
+import android.view.*
-import android.view.KeyEvent
-import android.view.View
-import android.view.WindowManager
 import androidx.annotation.ColorInt
 import androidx.core.content.ContextCompat
-import code.name.monkey.appthemehelper.ATH
+import code.name.monkey.appthemehelper.*
-import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.common.ATHToolbarActivity
-import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.*
-import code.name.monkey.appthemehelper.util.ColorUtil
-import code.name.monkey.appthemehelper.util.TintHelper
-import code.name.monkey.appthemehelper.util.VersionUtils
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.util.*
-import code.name.monkey.retromusic.util.RetroUtil
-import code.name.monkey.retromusic.util.ThemeManager
 
 abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
 
@@ -66,13 +57,16 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
 		}
 	}
 
-
 	private fun changeBackgroundShape() {
-        var background: Drawable? = if (PreferenceUtil.getInstance(this).isRoundCorners)
+		var background: Drawable? = if (PreferenceUtil.getInstance(this).isRoundCorners) ContextCompat.getDrawable(
-            ContextCompat.getDrawable(this, R.drawable.round_window)
+				this,
-        else
+				R.drawable.round_window
-            ContextCompat.getDrawable(this, R.drawable.square_window)
+		)
-        background = TintHelper.createTintedDrawable(background, ATHUtil.resolveColor(this, R.attr.colorPrimary))
+		else ContextCompat.getDrawable(this, R.drawable.square_window)
+		background = TintHelper.createTintedDrawable(
+				background,
+				ATHUtil.resolveColor(this, R.attr.colorPrimary)
+		)
 		window.setBackgroundDrawable(background)
 	}
 
@@ -95,7 +89,11 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
 		if (statusBar != null) {
 			when {
 				VersionUtils.hasMarshmallow() -> window.statusBarColor = color
-                VersionUtils.hasLollipop() -> statusBar.setBackgroundColor(ColorUtil.darkenColor(color))
+				VersionUtils.hasLollipop()    -> statusBar.setBackgroundColor(
+						ColorUtil.darkenColor(
+								color
+						)
+				)
 				else                          -> statusBar.setBackgroundColor(color)
 			}
 		} else {
@@ -165,12 +163,7 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
 	}
 
 	private fun setImmersiveFullscreen() {
-        val flags = (View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+		val flags = (View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_FULLSCREEN or View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY)
-                or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
-                or View.SYSTEM_UI_FLAG_FULLSCREEN
-                or View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY)
 
 		if (PreferenceUtil.getInstance(this).fullScreenMode) {
 			window.decorView.systemUiVisibility = flags
@@ -196,7 +189,6 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
 		exitFullscreen()
 	}
 
-
 	override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
 		if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN || keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
 			handler.removeCallbacks(this)

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

@@ -1,32 +1,21 @@
 package code.name.monkey.retromusic.activities.bugreport
 
-import android.app.Activity
+import android.app.*
-import android.app.Dialog
+import android.content.*
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.content.Context
-import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.text.TextUtils
 import android.view.MenuItem
 import android.view.inputmethod.EditorInfo
 import android.widget.Toast
-import androidx.annotation.StringDef
+import androidx.annotation.*
-import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
 import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.*
-import code.name.monkey.appthemehelper.util.MaterialUtil
-import code.name.monkey.appthemehelper.util.TintHelper
-import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsThemeActivity
-import code.name.monkey.retromusic.activities.bugreport.model.DeviceInfo
+import code.name.monkey.retromusic.activities.bugreport.model.*
-import code.name.monkey.retromusic.activities.bugreport.model.Report
+import code.name.monkey.retromusic.activities.bugreport.model.github.*
-import code.name.monkey.retromusic.activities.bugreport.model.github.ExtraInfo
-import code.name.monkey.retromusic.activities.bugreport.model.github.GithubLogin
-import code.name.monkey.retromusic.activities.bugreport.model.github.GithubTarget
 import code.name.monkey.retromusic.misc.DialogAsyncTask
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.callbacks.onCancel
@@ -36,8 +25,7 @@ import kotlinx.android.synthetic.main.activity_bug_report.*
 import kotlinx.android.synthetic.main.bug_report_card_device_info.*
 import kotlinx.android.synthetic.main.bug_report_card_report.*
 import org.eclipse.egit.github.core.Issue
-import org.eclipse.egit.github.core.client.GitHubClient
+import org.eclipse.egit.github.core.client.*
-import org.eclipse.egit.github.core.client.RequestException
 import org.eclipse.egit.github.core.service.IssueService
 import java.io.IOException
 
@@ -47,7 +35,13 @@ private const val RESULT_INVALID_TOKEN = "RESULT_INVALID_TOKEN"
 private const val RESULT_ISSUES_NOT_ENABLED = "RESULT_ISSUES_NOT_ENABLED"
 private const val RESULT_UNKNOWN = "RESULT_UNKNOWN"
 
-@StringDef(RESULT_SUCCESS, RESULT_BAD_CREDENTIALS, RESULT_INVALID_TOKEN, RESULT_ISSUES_NOT_ENABLED, RESULT_UNKNOWN)
+@StringDef(
+		RESULT_SUCCESS,
+		RESULT_BAD_CREDENTIALS,
+		RESULT_INVALID_TOKEN,
+		RESULT_ISSUES_NOT_ENABLED,
+		RESULT_UNKNOWN
+)
 @Retention(AnnotationRetention.SOURCE)
 private annotation class Result
 
@@ -65,8 +59,7 @@ open class BugReportActivity : AbsThemeActivity() {
 
 		initViews()
 
-        if (TextUtils.isEmpty(title))
+		if (TextUtils.isEmpty(title)) setTitle(R.string.report_an_issue)
-            setTitle(R.string.report_an_issue)
 
 		deviceInfo = DeviceInfo(this)
 		airTextDeviceInfo.text = deviceInfo.toString()
@@ -151,7 +144,11 @@ open class BugReportActivity : AbsThemeActivity() {
 		val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
 		val clip = ClipData.newPlainText(getString(R.string.device_info), deviceInfo?.toMarkdown())
 		clipboard.primaryClip = clip
-        Toast.makeText(this@BugReportActivity, R.string.copied_device_info_to_clipboard, Toast.LENGTH_LONG).show()
+		Toast.makeText(
+				this@BugReportActivity,
+				R.string.copied_device_info_to_clipboard,
+				Toast.LENGTH_LONG
+		).show()
 	}
 
 	private fun validateInput(): Boolean {
@@ -222,11 +219,14 @@ open class BugReportActivity : AbsThemeActivity() {
 		return super.onOptionsItemSelected(item)
 	}
 
-    private class ReportIssueAsyncTask private constructor(activity: Activity, private val report: Report, private val target: GithubTarget,
+	private class ReportIssueAsyncTask private constructor(
-                                                           private val login: GithubLogin) : DialogAsyncTask<Void, Void, String>(activity) {
+			activity: Activity,
+			private val report: Report,
+			private val target: GithubTarget,
+			private val login: GithubLogin
+	) : DialogAsyncTask<Void, Void, String>(activity) {
 		override fun createDialog(context: Context): Dialog {
-            return AlertDialog.Builder(context)
+			return AlertDialog.Builder(context).show()
-                    .show()
 		}
 
 		@Result
@@ -299,7 +299,12 @@ open class BugReportActivity : AbsThemeActivity() {
 
 		companion object {
 
-            fun report(activity: Activity, report: Report, target: GithubTarget, login: GithubLogin) {
+			fun report(
+					activity: Activity,
+					report: Report,
+					target: GithubTarget,
+					login: GithubLogin
+			) {
 				ReportIssueAsyncTask(activity, report, target, login).execute()
 			}
 		}

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

@@ -1 +0,0 @@
-package code.name.monkey.retromusic.activities.bugreport

import android.content.ActivityNotFoundException
import android.content.Intent
import android.net.Uri
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import code.name.monkey.retromusic.R
import code.name.monkey.retromusic.activities.bugreport.model.DeviceInfo
import kotlinx.android.synthetic.main.activity_error_handler.*


class ErrorHandlerActivity : AppCompatActivity() {
    private var deviceInfo: DeviceInfo? = null
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        setContentView(R.layout.activity_error_handler)

        deviceInfo = DeviceInfo(this)

        clearAppData.setOnClickListener {
            try {
                val intent = Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
                intent.data = Uri.parse("package:$packageName")
                startActivity(intent)
            } catch (e: ActivityNotFoundException) {
                val intent = Intent(android.provider.Settings.ACTION_MANAGE_APPLICATIONS_SETTINGS)
                startActivity(intent)
            }
        }

        sendCrashLog.setOnClickListener {
            val sendIntent = Intent(Intent.ACTION_SEND)
            val subject = "Error report"
            val body = intent.getStringExtra("error") + "\n" + deviceInfo!!.toString()

            sendIntent.putExtra(Intent.EXTRA_EMAIL, arrayOf("monkeycodeapp@gmail.com"))
            sendIntent.putExtra(Intent.EXTRA_TEXT, body)
            sendIntent.putExtra(Intent.EXTRA_SUBJECT, subject)
            sendIntent.type = "message/rfc822"

            startActivity(Intent.createChooser(sendIntent, "Send crash log"))
            deleteFile("stack.trace")
        }

        showCrashError.text = String.format("%s", intent.getStringExtra("error"))
        showCrashError.append(deviceInfo!!.toString())
    }
}

app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/DeviceInfo.java

@@ -6,9 +6,10 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
 
+import androidx.annotation.IntRange;
+
 import java.util.Arrays;
 
-import androidx.annotation.IntRange;
 import code.name.monkey.retromusic.util.PreferenceUtil;
 
 public class DeviceInfo {

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

@@ -1,45 +1,32 @@
 package code.name.monkey.retromusic.activities.tageditor
 
-import android.app.Activity
+import android.app.*
-import android.app.SearchManager
 import android.content.Intent
 import android.content.res.ColorStateList
-import android.graphics.Bitmap
+import android.graphics.*
-import android.graphics.BitmapFactory
 import android.net.Uri
-import android.os.Build
+import android.os.*
-import android.os.Bundle
 import android.util.Log
-import android.view.MenuItem
+import android.view.*
-import android.view.View
 import android.view.animation.OvershootInterpolator
 import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.*
-import code.name.monkey.appthemehelper.util.ColorUtil
-import code.name.monkey.appthemehelper.util.MaterialValueHelper
-import code.name.monkey.appthemehelper.util.TintHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsBaseActivity
 import code.name.monkey.retromusic.activities.saf.SAFGuideActivity
-import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.util.*
-import code.name.monkey.retromusic.util.RetroUtil
+import com.afollestad.materialdialogs.*
-import code.name.monkey.retromusic.util.SAFUtil
-import com.afollestad.materialdialogs.LayoutMode
-import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.bottomsheets.BottomSheet
 import com.afollestad.materialdialogs.list.listItems
 import com.google.android.material.button.MaterialButton
 import kotlinx.android.synthetic.main.activity_album_tag_editor.*
-import org.jaudiotagger.audio.AudioFile
+import org.jaudiotagger.audio.*
-import org.jaudiotagger.audio.AudioFileIO
 import org.jaudiotagger.tag.FieldKey
 import java.io.File
 import java.util.*
 
-
 abstract class AbsTagEditorActivity : AbsBaseActivity() {
 
-
 	protected var id: Int = 0
 		private set
 	private var paletteColorPrimary: Int = 0
@@ -53,8 +40,7 @@ abstract class AbsTagEditorActivity : AbsBaseActivity() {
 	private var savedArtworkInfo: ArtworkInfo? = null
 
 	protected val show: MaterialDialog
-        get() = MaterialDialog(this, BottomSheet(LayoutMode.WRAP_CONTENT))
+		get() = MaterialDialog(this, BottomSheet(LayoutMode.WRAP_CONTENT)).show {
-                .show {
 			cornerRadius(PreferenceUtil.getInstance(this@AbsTagEditorActivity).dialogCorner)
 			title(R.string.update_image)
 			listItems(items = items) { _, position, _ ->
@@ -70,8 +56,7 @@ abstract class AbsTagEditorActivity : AbsBaseActivity() {
 	internal val albumArtist: String?
 		get() {
 			return try {
-                getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault
+				getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.ALBUM_ARTIST)
-                        .getFirst(FieldKey.ALBUM_ARTIST)
 			} catch (ignored: Exception) {
 				null
 			}
@@ -120,8 +105,7 @@ abstract class AbsTagEditorActivity : AbsBaseActivity() {
 	protected val albumArtistName: String?
 		get() {
 			return try {
-                getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault
+				getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.ALBUM_ARTIST)
-                        .getFirst(FieldKey.ALBUM_ARTIST)
 			} catch (ignored: Exception) {
 				null
 			}
@@ -168,15 +152,17 @@ abstract class AbsTagEditorActivity : AbsBaseActivity() {
 
 		}
 
-
 	protected val albumArt: Bitmap?
 		get() {
 			try {
-                val artworkTag = getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault
+				val artworkTag = getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.firstArtwork
-                        .firstArtwork
 				if (artworkTag != null) {
 					val artworkBinaryData = artworkTag.binaryData
-                    return BitmapFactory.decodeByteArray(artworkBinaryData, 0, artworkBinaryData.size)
+					return BitmapFactory.decodeByteArray(
+							artworkBinaryData,
+							0,
+							artworkBinaryData.size
+					)
 				}
 				return null
 			} catch (ignored: Exception) {
@@ -219,14 +205,23 @@ abstract class AbsTagEditorActivity : AbsBaseActivity() {
 
 	private fun setUpImageView() {
 		loadCurrentImage()
-        items = listOf(getString(code.name.monkey.retromusic.R.string.pick_from_local_storage), getString(code.name.monkey.retromusic.R.string.web_search), getString(code.name.monkey.retromusic.R.string.remove_cover))
+		items = listOf(
+				getString(code.name.monkey.retromusic.R.string.pick_from_local_storage),
+				getString(code.name.monkey.retromusic.R.string.web_search),
+				getString(code.name.monkey.retromusic.R.string.remove_cover)
+		)
 		editorImage?.setOnClickListener { show }
 	}
 
 	private fun startImagePicker() {
 		val intent = Intent(Intent.ACTION_GET_CONTENT)
 		intent.type = "image/*"
-        startActivityForResult(Intent.createChooser(intent, getString(code.name.monkey.retromusic.R.string.pick_from_local_storage)), REQUEST_CODE_SELECT_IMAGE)
+		startActivityForResult(
+				Intent.createChooser(
+						intent,
+						getString(code.name.monkey.retromusic.R.string.pick_from_local_storage)
+				), REQUEST_CODE_SELECT_IMAGE
+		)
 	}
 
 	protected abstract fun loadCurrentImage()
@@ -237,7 +232,16 @@ abstract class AbsTagEditorActivity : AbsBaseActivity() {
 
 	private fun setUpFab() {
 		saveFab.backgroundTintList = ColorStateList.valueOf(ThemeStore.accentColor(this))
-        ColorStateList.valueOf(MaterialValueHelper.getPrimaryTextColor(this, ColorUtil.isColorLight(ThemeStore.accentColor(this)))).apply {
+		ColorStateList.valueOf(
+				MaterialValueHelper.getPrimaryTextColor(
+						this,
+						ColorUtil.isColorLight(
+								ThemeStore.accentColor(
+										this
+								)
+						)
+				)
+		).apply {
 			saveFab.setTextColor(this)
 			saveFab.iconTint = this
 		}
@@ -290,7 +294,12 @@ abstract class AbsTagEditorActivity : AbsBaseActivity() {
 		editorImage?.visibility = View.GONE
 		editorImage?.isEnabled = false
 
-        setColors(intent.getIntExtra(EXTRA_PALETTE, ATHUtil.resolveColor(this, R.attr.colorPrimary)))
+		setColors(
+				intent.getIntExtra(
+						EXTRA_PALETTE,
+						ATHUtil.resolveColor(this, R.attr.colorPrimary)
+				)
+		)
 	}
 
 	protected fun dataChanged() {
@@ -298,22 +307,14 @@ abstract class AbsTagEditorActivity : AbsBaseActivity() {
 	}
 
 	private fun showFab() {
-        saveFab.animate()
+		saveFab.animate().setDuration(500).setInterpolator(OvershootInterpolator()).scaleX(1f)
-                .setDuration(500)
+			.scaleY(1f).start()
-                .setInterpolator(OvershootInterpolator())
-                .scaleX(1f)
-                .scaleY(1f)
-                .start()
 		saveFab.isEnabled = true
 	}
 
 	private fun hideFab() {
-        saveFab.animate()
+		saveFab.animate().setDuration(500).setInterpolator(OvershootInterpolator()).scaleX(0.0f)
-                .setDuration(500)
+			.scaleY(0.0f).start()
-                .setInterpolator(OvershootInterpolator())
-                .scaleX(0.0f)
-                .scaleY(0.0f)
-                .start()
 		saveFab.isEnabled = false
 	}
 
@@ -330,8 +331,9 @@ abstract class AbsTagEditorActivity : AbsBaseActivity() {
 		paletteColorPrimary = color
 	}
 
-    protected fun writeValuesToFiles(fieldKeyValueMap: Map<FieldKey, String>,
+	protected fun writeValuesToFiles(
-                                     artworkInfo: ArtworkInfo?) {
+			fieldKeyValueMap: Map<FieldKey, String>, artworkInfo: ArtworkInfo?
+	) {
 		RetroUtil.hideSoftKeyboard(this)
 
 		hideFab()
@@ -347,14 +349,23 @@ abstract class AbsTagEditorActivity : AbsBaseActivity() {
 				if (SAFUtil.isSDCardAccessGranted(this)) {
 					writeTags(savedSongPaths)
 				} else {
-                    startActivityForResult(Intent(this, SAFGuideActivity::class.java), SAFGuideActivity.REQUEST_CODE_SAF_GUIDE)
+					startActivityForResult(
+							Intent(this, SAFGuideActivity::class.java),
+							SAFGuideActivity.REQUEST_CODE_SAF_GUIDE
+					)
 				}
 			}
 		}
 	}
 
 	private fun writeTags(paths: List<String>?) {
-        WriteTagsAsyncTask(this).execute(WriteTagsAsyncTask.LoadingInfo(paths, savedTags, savedArtworkInfo))
+		WriteTagsAsyncTask(this).execute(
+				WriteTagsAsyncTask.LoadingInfo(
+						paths,
+						savedTags,
+						savedArtworkInfo
+				)
+		)
 	}
 
 	override fun onActivityResult(requestCode: Int, resultCode: Int, intent: Intent?) {

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

@@ -2,27 +2,20 @@ package code.name.monkey.retromusic.activities.tageditor
 
 import android.app.Activity
 import android.content.res.ColorStateList
-import android.graphics.Bitmap
+import android.graphics.*
-import android.graphics.BitmapFactory
-import android.graphics.Color
 import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.os.Bundle
-import android.text.Editable
+import android.text.*
-import android.text.TextUtils
-import android.text.TextWatcher
 import android.widget.Toast
-import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.*
-import code.name.monkey.appthemehelper.util.MaterialUtil
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.extensions.appHandleColor
-import code.name.monkey.retromusic.glide.palette.BitmapPaletteTranscoder
+import code.name.monkey.retromusic.glide.palette.*
-import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
 import code.name.monkey.retromusic.loaders.AlbumLoader
 import code.name.monkey.retromusic.rest.LastFMRestClient
 import code.name.monkey.retromusic.rest.model.LastFmAlbum
-import code.name.monkey.retromusic.util.ImageUtil
+import code.name.monkey.retromusic.util.*
-import code.name.monkey.retromusic.util.LastFMUtil
 import code.name.monkey.retromusic.util.RetroColorUtil.generatePalette
 import code.name.monkey.retromusic.util.RetroColorUtil.getColor
 import com.bumptech.glide.Glide
@@ -34,24 +27,32 @@ import kotlinx.android.synthetic.main.activity_album_tag_editor.*
 import org.jaudiotagger.tag.FieldKey
 import java.util.*
 
-
 class AlbumTagEditorActivity : AbsTagEditorActivity(), TextWatcher {
 	override val contentViewLayout: Int
 		get() = R.layout.activity_album_tag_editor
 
 	override fun loadImageFromFile(selectedFileUri: Uri?) {
 
-        Glide.with(this@AlbumTagEditorActivity)
+		Glide.with(this@AlbumTagEditorActivity).load(selectedFileUri).asBitmap()
-                .load(selectedFileUri)
-                .asBitmap()
 			.transcode(BitmapPaletteTranscoder(this), BitmapPaletteWrapper::class.java)
-                .diskCacheStrategy(DiskCacheStrategy.NONE)
+			.diskCacheStrategy(DiskCacheStrategy.NONE).skipMemoryCache(true)
-                .skipMemoryCache(true)
 			.into(object : SimpleTarget<BitmapPaletteWrapper>() {
-                    override fun onResourceReady(resource: BitmapPaletteWrapper?, glideAnimation: GlideAnimation<in BitmapPaletteWrapper>?) {
+				override fun onResourceReady(
+						resource: BitmapPaletteWrapper?,
+						glideAnimation: GlideAnimation<in BitmapPaletteWrapper>?
+				) {
 					getColor(resource?.palette, Color.TRANSPARENT)
 					albumArtBitmap = resource?.bitmap?.let { ImageUtil.resizeBitmap(it, 2048) }
-                        setImageBitmap(albumArtBitmap, getColor(resource?.palette, ATHUtil.resolveColor(this@AlbumTagEditorActivity, R.attr.defaultFooterColor)))
+					setImageBitmap(
+							albumArtBitmap,
+							getColor(
+									resource?.palette,
+									ATHUtil.resolveColor(
+											this@AlbumTagEditorActivity,
+											R.attr.defaultFooterColor
+									)
+							)
+					)
 					deleteAlbumArt = false
 					dataChanged()
 					setResult(Activity.RESULT_OK)
@@ -59,7 +60,8 @@ class AlbumTagEditorActivity : AbsTagEditorActivity(), TextWatcher {
 
 				override fun onLoadFailed(e: Exception?, errorDrawable: Drawable?) {
 					super.onLoadFailed(e, errorDrawable)
-                        Toast.makeText(this@AlbumTagEditorActivity, e.toString(), Toast.LENGTH_LONG).show()
+					Toast.makeText(this@AlbumTagEditorActivity, e.toString(), Toast.LENGTH_LONG)
+						.show()
 				}
 			})
 	}
@@ -84,7 +86,6 @@ class AlbumTagEditorActivity : AbsTagEditorActivity(), TextWatcher {
 		setupToolbar()
 	}
 
-
 	private fun setUpViews() {
 		fillViewsWithFileTags()
 
@@ -108,7 +109,13 @@ class AlbumTagEditorActivity : AbsTagEditorActivity(), TextWatcher {
 
 	override fun loadCurrentImage() {
 		val bitmap = albumArt
-        setImageBitmap(bitmap, getColor(generatePalette(bitmap), ATHUtil.resolveColor(this, R.attr.defaultFooterColor)))
+		setImageBitmap(
+				bitmap,
+				getColor(
+						generatePalette(bitmap),
+						ATHUtil.resolveColor(this, R.attr.defaultFooterColor)
+				)
+		)
 		deleteAlbumArt = false
 	}
 
@@ -123,21 +130,42 @@ class AlbumTagEditorActivity : AbsTagEditorActivity(), TextWatcher {
 			val url = LastFMUtil.getLargestAlbumImageUrl(lastFmAlbum.album.image)
 
 			if (!TextUtils.isEmpty(url) && url.trim { it <= ' ' }.isNotEmpty()) {
-                Glide.with(this@AlbumTagEditorActivity)
+				Glide.with(this@AlbumTagEditorActivity).load(url).asBitmap()
-                        .load(url)
-                        .asBitmap()
 					.transcode(BitmapPaletteTranscoder(this), BitmapPaletteWrapper::class.java)
-                        .diskCacheStrategy(DiskCacheStrategy.SOURCE)
+					.diskCacheStrategy(DiskCacheStrategy.SOURCE).error(R.drawable.default_album_art)
-                        .error(R.drawable.default_album_art)
 					.into(object : SimpleTarget<BitmapPaletteWrapper>() {
-                            override fun onLoadFailed(e: java.lang.Exception?, errorDrawable: Drawable?) {
+						override fun onLoadFailed(
+								e: java.lang.Exception?,
+								errorDrawable: Drawable?
+						) {
 							super.onLoadFailed(e, errorDrawable)
-                                Toast.makeText(this@AlbumTagEditorActivity, e.toString(), Toast.LENGTH_LONG).show()
+							Toast.makeText(
+									this@AlbumTagEditorActivity,
+									e.toString(),
+									Toast.LENGTH_LONG
+							).show()
 						}
 
-                            override fun onResourceReady(resource: BitmapPaletteWrapper?, glideAnimation: GlideAnimation<in BitmapPaletteWrapper>?) {
+						override fun onResourceReady(
-                                albumArtBitmap = resource?.bitmap?.let { ImageUtil.resizeBitmap(it, 2048) }
+								resource: BitmapPaletteWrapper?,
-                                setImageBitmap(albumArtBitmap, getColor(resource?.palette, ATHUtil.resolveColor(this@AlbumTagEditorActivity, R.attr.defaultFooterColor)))
+								glideAnimation: GlideAnimation<in BitmapPaletteWrapper>?
+						) {
+							albumArtBitmap = resource?.bitmap?.let {
+								ImageUtil.resizeBitmap(
+										it,
+										2048
+								)
+							}
+							setImageBitmap(
+									albumArtBitmap,
+									getColor(
+											resource?.palette,
+											ATHUtil.resolveColor(
+													this@AlbumTagEditorActivity,
+													R.attr.defaultFooterColor
+											)
+									)
+							)
 							deleteAlbumArt = false
 							dataChanged()
 							setResult(RESULT_OK)
@@ -154,7 +182,11 @@ class AlbumTagEditorActivity : AbsTagEditorActivity(), TextWatcher {
 	}
 
 	private fun toastLoadingFailed() {
-        Toast.makeText(this@AlbumTagEditorActivity, R.string.could_not_download_album_cover, Toast.LENGTH_SHORT).show()
+		Toast.makeText(
+				this@AlbumTagEditorActivity,
+				R.string.could_not_download_album_cover,
+				Toast.LENGTH_SHORT
+		).show()
 	}
 
 	override fun searchImageOnWeb() {
@@ -162,7 +194,10 @@ class AlbumTagEditorActivity : AbsTagEditorActivity(), TextWatcher {
 	}
 
 	override fun deleteImage() {
-        setImageBitmap(BitmapFactory.decodeResource(resources, R.drawable.default_album_art), ATHUtil.resolveColor(this, R.attr.defaultFooterColor))
+		setImageBitmap(
+				BitmapFactory.decodeResource(resources, R.drawable.default_album_art),
+				ATHUtil.resolveColor(this, R.attr.defaultFooterColor)
+		)
 		deleteAlbumArt = true
 		dataChanged()
 	}
@@ -176,8 +211,10 @@ class AlbumTagEditorActivity : AbsTagEditorActivity(), TextWatcher {
 		fieldKeyValueMap[FieldKey.GENRE] = genreTitle.text.toString()
 		fieldKeyValueMap[FieldKey.YEAR] = yearTitle.text.toString()
 
-        writeValuesToFiles(fieldKeyValueMap, if (deleteAlbumArt) ArtworkInfo(id, null)
+		writeValuesToFiles(
-        else if (albumArtBitmap == null) null else ArtworkInfo(id, albumArtBitmap!!))
+				fieldKeyValueMap, if (deleteAlbumArt) ArtworkInfo(id, null)
+		else if (albumArtBitmap == null) null else ArtworkInfo(id, albumArtBitmap!!)
+		)
 	}
 
 	override fun getSongPaths(): List<String> {
@@ -189,7 +226,6 @@ class AlbumTagEditorActivity : AbsTagEditorActivity(), TextWatcher {
 		return paths
 	}
 
-
 	override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {
 
 	}

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

@@ -2,13 +2,10 @@ package code.name.monkey.retromusic.activities.tageditor
 
 import android.net.Uri
 import android.os.Bundle
-import android.text.Editable
+import android.text.*
-import android.text.TextWatcher
 import androidx.core.content.ContextCompat
 import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.*
-import code.name.monkey.appthemehelper.util.MaterialUtil
-import code.name.monkey.appthemehelper.util.TintHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.extensions.appHandleColor
 import code.name.monkey.retromusic.loaders.SongLoader
@@ -16,7 +13,6 @@ import kotlinx.android.synthetic.main.activity_song_tag_editor.*
 import org.jaudiotagger.tag.FieldKey
 import java.util.*
 
-
 class SongTagEditorActivity : AbsTagEditorActivity(), TextWatcher {
 
 	override val contentViewLayout: Int
@@ -25,8 +21,18 @@ class SongTagEditorActivity : AbsTagEditorActivity(), TextWatcher {
 	private fun setupToolbar() {
 		appBarLayout.setBackgroundColor(ATHUtil.resolveColor(this, R.attr.colorPrimary))
 		toolbar.apply {
-            setBackgroundColor(ATHUtil.resolveColor(this@SongTagEditorActivity, R.attr.colorPrimary))
+			setBackgroundColor(
-            navigationIcon = TintHelper.createTintedDrawable(ContextCompat.getDrawable(context, R.drawable.ic_keyboard_backspace_black_24dp), ThemeStore.textColorPrimary(context))
+					ATHUtil.resolveColor(
+							this@SongTagEditorActivity,
+							R.attr.colorPrimary
+					)
+			)
+			navigationIcon = TintHelper.createTintedDrawable(
+					ContextCompat.getDrawable(
+							context,
+							R.drawable.ic_keyboard_backspace_black_24dp
+					), ThemeStore.textColorPrimary(context)
+			)
 			setNavigationOnClickListener { onBackPressed() }
 			setSupportActionBar(toolbar)
 		}

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

@@ -1,9 +1,7 @@
 package code.name.monkey.retromusic.adapter
 
 import android.app.Activity
-import android.view.LayoutInflater
+import android.view.*
-import android.view.View
-import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.retromusic.R
@@ -18,9 +16,20 @@ class ContributorAdapter(
 
 	override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
 		return if (viewType == HEADER) {
-            ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.item_contributor_header, parent, false))
+			ViewHolder(
-        } else
+					LayoutInflater.from(parent.context).inflate(
-            ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.item_contributor, parent, false))
+							R.layout.item_contributor_header,
+							parent,
+							false
+					)
+			)
+		} else ViewHolder(
+				LayoutInflater.from(parent.context).inflate(
+						R.layout.item_contributor,
+						parent,
+						false
+				)
+		)
 	}
 
 	companion object {
@@ -57,12 +66,9 @@ class ContributorAdapter(
 			title.text = contributor.name
 			text.text = contributor.summary
 			println(contributor.profileImage)
-            Glide.with(image.context)
+			Glide.with(image.context).load(contributor.profileImage)
-                    .load(contributor.profileImage)
 				.error(R.drawable.ic_account_white_24dp)
-                    .placeholder(R.drawable.ic_account_white_24dp)
+				.placeholder(R.drawable.ic_account_white_24dp).dontAnimate().into(image)
-                    .dontAnimate()
-                    .into(image)
 		}
 	}
 }

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

@@ -1,9 +1,7 @@
 package code.name.monkey.retromusic.adapter
 
 import android.app.Activity
-import android.view.LayoutInflater
+import android.view.*
-import android.view.View
-import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
@@ -16,9 +14,7 @@ import java.util.*
  */
 
 class GenreAdapter(
-        private val mActivity: Activity,
+		private val activity: Activity, dataSet: ArrayList<Genre>, private val mItemLayoutRes: Int
-        dataSet: ArrayList<Genre>,
-        private val mItemLayoutRes: Int
 ) : RecyclerView.Adapter<GenreAdapter.ViewHolder>() {
 	var dataSet = ArrayList<Genre>()
 		private set
@@ -28,7 +24,7 @@ class GenreAdapter(
 	}
 
 	override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return ViewHolder(LayoutInflater.from(mActivity).inflate(mItemLayoutRes, parent, false))
+		return ViewHolder(LayoutInflater.from(activity).inflate(mItemLayoutRes, parent, false))
 	}
 
 	override fun onBindViewHolder(holder: ViewHolder, position: Int) {
@@ -37,10 +33,13 @@ class GenreAdapter(
 			holder.title!!.text = genre.name
 		}
 		if (holder.text != null) {
-            holder.text!!.text = String.format(Locale.getDefault(), "%d %s", genre.songCount, if (genre.songCount > 1)
+			holder.text!!.text = String.format(
-                mActivity.getString(R.string.songs)
+					Locale.getDefault(),
-            else
+					"%d %s",
-                mActivity.getString(R.string.song))
+					genre.songCount,
+					if (genre.songCount > 1) activity.getString(R.string.songs)
+					else activity.getString(R.string.song)
+			)
 		}
 	}
 
@@ -57,7 +56,7 @@ class GenreAdapter(
 		override fun onClick(v: View?) {
 			super.onClick(v)
 			val genre = dataSet[adapterPosition]
-            NavigationUtil.goToGenre(mActivity, genre)
+			NavigationUtil.goToGenre(activity, genre)
 		}
 	}
 }

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

@@ -1,30 +1,22 @@
 package code.name.monkey.retromusic.adapter
 
 import android.util.DisplayMetrics
-import android.view.LayoutInflater
+import android.view.*
-import android.view.View
-import android.view.ViewGroup
 import androidx.annotation.IntDef
 import androidx.appcompat.app.AppCompatActivity
-import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.*
-import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.album.AlbumFullWidthAdapter
 import code.name.monkey.retromusic.adapter.artist.ArtistAdapter
 import code.name.monkey.retromusic.adapter.song.SongAdapter
 import code.name.monkey.retromusic.extensions.show
 import code.name.monkey.retromusic.loaders.PlaylistSongsLoader
-import code.name.monkey.retromusic.model.Album
+import code.name.monkey.retromusic.model.*
-import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.model.Home
-import code.name.monkey.retromusic.model.Playlist
 import code.name.monkey.retromusic.util.PreferenceUtil
 import com.google.android.material.textview.MaterialTextView
 
-
 class HomeAdapter(
-        private val activity: AppCompatActivity,
+		private val activity: AppCompatActivity, private val displayMetrics: DisplayMetrics
-        private val displayMetrics: DisplayMetrics
 ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
 	private var list = ArrayList<Home>()
@@ -34,12 +26,19 @@ class HomeAdapter(
 	}
 
 	override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val layout = LayoutInflater.from(activity).inflate(R.layout.section_recycler_view, parent, false)
+		val layout = LayoutInflater.from(activity)
+			.inflate(R.layout.section_recycler_view, parent, false)
 		return when (viewType) {
 			RECENT_ARTISTS, TOP_ARTISTS -> ArtistViewHolder(layout)
 			PLAYLISTS                   -> PlaylistViewHolder(layout)
 			else                        -> {
-                AlbumViewHolder(LayoutInflater.from(activity).inflate(R.layout.metal_section_recycler_view, parent, false))
+				AlbumViewHolder(
+						LayoutInflater.from(activity).inflate(
+								R.layout.metal_section_recycler_view,
+								parent,
+								false
+						)
+				)
 			}
 		}
 	}
@@ -49,24 +48,44 @@ class HomeAdapter(
 		when (getItemViewType(position)) {
 			RECENT_ALBUMS -> {
 				val viewHolder = holder as AlbumViewHolder
-                viewHolder.bindView(list[position].arrayList.toAlbums(), R.string.recent_albums, R.string.recent_added_albums)
+				viewHolder.bindView(
+						list[position].arrayList.toAlbums(),
+						R.string.recent_albums,
+						R.string.recent_added_albums
+				)
 			}
 			TOP_ALBUMS -> {
 				val viewHolder = holder as AlbumViewHolder
-                viewHolder.bindView(list[position].arrayList.toAlbums(), R.string.top_albums, R.string.most_played_albums)
+				viewHolder.bindView(
+						list[position].arrayList.toAlbums(),
+						R.string.top_albums,
+						R.string.most_played_albums
+				)
 			}
 			RECENT_ARTISTS -> {
 				val viewHolder = holder as ArtistViewHolder
-                viewHolder.bindView(list[position].arrayList.toArtists(), R.string.recent_artists, R.string.recent_added_artists)
+				viewHolder.bindView(
+						list[position].arrayList.toArtists(),
+						R.string.recent_artists,
+						R.string.recent_added_artists
+				)
 			}
 			TOP_ARTISTS -> {
 				val viewHolder = holder as ArtistViewHolder
 
-                viewHolder.bindView(list[position].arrayList.toArtists(), R.string.top_artists, R.string.most_played_artists)
+				viewHolder.bindView(
+						list[position].arrayList.toArtists(),
+						R.string.top_artists,
+						R.string.most_played_artists
+				)
 			}
 			PLAYLISTS -> {
 				val viewHolder = holder as PlaylistViewHolder
-                viewHolder.bindView(list[position].arrayList.toPlaylist(), R.string.favorites, R.string.favorites_songs)
+				viewHolder.bindView(
+						list[position].arrayList.toPlaylist(),
+						R.string.favorites,
+						R.string.favorites_songs
+				)
 			}
 		}
 	}
@@ -115,9 +134,19 @@ class HomeAdapter(
 			if (list.isNotEmpty()) {
 				recyclerView.apply {
 					show()
-                    layoutManager = GridLayoutManager(activity, 1, GridLayoutManager.HORIZONTAL, false)
+					layoutManager = GridLayoutManager(
-                    val artistAdapter = ArtistAdapter(activity, list,
+							activity,
-                            PreferenceUtil.getInstance(activity).getHomeGridStyle(activity), false, null)
+							1,
+							GridLayoutManager.HORIZONTAL,
+							false
+					)
+					val artistAdapter = ArtistAdapter(
+							activity,
+							list,
+							PreferenceUtil.getInstance(activity).getHomeGridStyle(activity),
+							false,
+							null
+					)
 					adapter = artistAdapter
 				}
 				titleContainer.show()
@@ -134,8 +163,19 @@ class HomeAdapter(
 				if (songs.isNotEmpty()) {
 					recyclerView.apply {
 						show()
-                        val songAdapter = SongAdapter(activity, songs, R.layout.item_album_card, false, null)
+						val songAdapter = SongAdapter(
-                        layoutManager = GridLayoutManager(activity, 1, GridLayoutManager.HORIZONTAL, false)
+								activity,
+								songs,
+								R.layout.item_album_card,
+								false,
+								null
+						)
+						layoutManager = GridLayoutManager(
+								activity,
+								1,
+								GridLayoutManager.HORIZONTAL,
+								false
+						)
 						adapter = songAdapter
 
 					}

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

@@ -1,29 +1,22 @@
 package code.name.monkey.retromusic.adapter
 
 import android.app.ActivityOptions
-import android.view.LayoutInflater
+import android.view.*
-import android.view.View
-import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
-import code.name.monkey.retromusic.glide.ArtistGlideRequest
+import code.name.monkey.retromusic.glide.*
-import code.name.monkey.retromusic.glide.SongGlideRequest
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.menu.SongMenuHelper
-import code.name.monkey.retromusic.model.Album
+import code.name.monkey.retromusic.model.*
-import code.name.monkey.retromusic.model.Artist
+import code.name.monkey.retromusic.util.*
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.NavigationUtil
 import com.bumptech.glide.Glide
 import android.util.Pair as UtilPair
 
 class SearchAdapter(
-        private val activity: AppCompatActivity,
+		private val activity: AppCompatActivity, private var dataSet: List<Any>?
-        private var dataSet: List<Any>?
 ) : RecyclerView.Adapter<SearchAdapter.ViewHolder>() {
 
 	fun swapDataSet(dataSet: MutableList<Any>) {
@@ -38,7 +31,16 @@ class SearchAdapter(
 	}
 
 	override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return if (viewType == HEADER) ViewHolder(LayoutInflater.from(activity).inflate(R.layout.sub_header, parent, false), viewType) else ViewHolder(LayoutInflater.from(activity).inflate(R.layout.item_list, parent, false), viewType)
+		return if (viewType == HEADER) ViewHolder(
+				LayoutInflater.from(activity).inflate(
+						R.layout.sub_header,
+						parent,
+						false
+				), viewType
+		) else ViewHolder(
+				LayoutInflater.from(activity).inflate(R.layout.item_list, parent, false),
+				viewType
+		)
 	}
 
 	override fun onBindViewHolder(holder: ViewHolder, position: Int) {
@@ -48,15 +50,14 @@ class SearchAdapter(
 				holder.title?.text = album.title
 				holder.text?.text = album.artistName
 				SongGlideRequest.Builder.from(Glide.with(activity), album.safeGetFirstSong())
-                        .checkIgnoreMediaStore(activity).build()
+					.checkIgnoreMediaStore(activity).build().into(holder.image)
-                        .into(holder.image)
 			}
 			ARTIST -> {
 				val artist = dataSet?.get(position) as Artist
 				holder.title?.text = artist.name
 				holder.text?.text = MusicUtil.getArtistInfoString(activity, artist)
-                ArtistGlideRequest.Builder.from(Glide.with(activity), artist)
+				ArtistGlideRequest.Builder.from(Glide.with(activity), artist).build()
-                        .build().into(holder.image)
+					.into(holder.image)
 			}
 			SONG   -> {
 				val song = dataSet?.get(position) as Song
@@ -102,13 +103,23 @@ class SearchAdapter(
 			val item = dataSet!![adapterPosition]
 			when (itemViewType) {
 				ALBUM  -> {
-                    val options = ActivityOptions.makeSceneTransitionAnimation(activity,
+					val options = ActivityOptions.makeSceneTransitionAnimation(
-                            UtilPair.create(image, activity.getString(R.string.transition_album_art)))
+							activity,
+							UtilPair.create(
+									image,
+									activity.getString(R.string.transition_album_art)
+							)
+					)
 					NavigationUtil.goToAlbumOptions(activity, (item as Album).id, options)
 				}
 				ARTIST -> {
-                    val options = ActivityOptions.makeSceneTransitionAnimation(activity,
+					val options = ActivityOptions.makeSceneTransitionAnimation(
-                            UtilPair.create(image, activity.getString(R.string.transition_artist_image)))
+							activity,
+							UtilPair.create(
+									image,
+									activity.getString(R.string.transition_artist_image)
+							)
+					)
 					NavigationUtil.goToArtistOptions(activity, (item as Artist).id, options)
 				}
 				SONG   -> {

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

@@ -1,15 +1,11 @@
 package code.name.monkey.retromusic.adapter
 
 import android.graphics.PorterDuff
-import android.view.LayoutInflater
+import android.view.*
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
+import code.name.monkey.retromusic.adapter.base.*
-import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
 import code.name.monkey.retromusic.glide.audiocover.AudioFileCover
 import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.util.RetroUtil
@@ -20,9 +16,7 @@ import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
 import java.io.File
 import java.text.DecimalFormat
 import java.util.*
-import kotlin.math.log10
+import kotlin.math.*
-import kotlin.math.pow
-
 
 class SongFileAdapter(
 		private val activity: AppCompatActivity,
@@ -30,7 +24,9 @@ class SongFileAdapter(
 		private val itemLayoutRes: Int,
 		private val callbacks: Callbacks?,
 		cabHolder: CabHolder?
-) : AbsMultiSelectAdapter<SongFileAdapter.ViewHolder, File>(activity, cabHolder, R.menu.menu_media_selection), FastScrollRecyclerView.SectionedAdapter {
+) : AbsMultiSelectAdapter<SongFileAdapter.ViewHolder, File>(
+		activity, cabHolder, R.menu.menu_media_selection
+), FastScrollRecyclerView.SectionedAdapter {
 
 	init {
 		this.setHasStableIds(true)
@@ -59,9 +55,9 @@ class SongFileAdapter(
 		holder.title?.text = getFileTitle(file)
 		if (holder.text != null) {
 			if (holder.itemViewType == FILE) {
-                holder.text!!.text = getFileText(file)
+				holder.text?.text = getFileText(file)
 			} else {
-                holder.text!!.visibility = View.GONE
+				holder.text?.visibility = View.GONE
 			}
 		}
 
@@ -85,18 +81,20 @@ class SongFileAdapter(
 				it.setColorFilter(iconColor, PorterDuff.Mode.SRC_IN)
 				it.setImageResource(R.drawable.ic_folder_white_24dp)
 			}
-            holder.imageTextContainer?.setCardBackgroundColor(ATHUtil.resolveColor(activity, R.attr.colorPrimary))
+			holder.imageTextContainer?.setCardBackgroundColor(
+					ATHUtil.resolveColor(
+							activity, R.attr.colorPrimary
+					)
+			)
 
 		} else {
-            val error = RetroUtil.getTintedVectorDrawable(activity, R.drawable.ic_file_music_white_24dp, iconColor)
+			val error = RetroUtil.getTintedVectorDrawable(
-            Glide.with(activity)
+					activity, R.drawable.ic_file_music_white_24dp, iconColor
-                    .load(AudioFileCover(file.path))
+			)
-                    .diskCacheStrategy(DiskCacheStrategy.NONE)
+			Glide.with(activity).load(AudioFileCover(file.path))
-                    .error(error)
+				.diskCacheStrategy(DiskCacheStrategy.NONE).error(error).placeholder(error)
-                    .placeholder(error)
 				.animate(android.R.anim.fade_in)
-                    .signature(MediaStoreSignature("", file.lastModified(), 0))
+				.signature(MediaStoreSignature("", file.lastModified(), 0)).into(holder.image)
-                    .into(holder.image)
 		}
 	}
 

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

@@ -3,43 +3,34 @@ package code.name.monkey.retromusic.adapter.album
 import android.app.ActivityOptions
 import android.content.res.ColorStateList
 import android.graphics.drawable.Drawable
-import android.view.LayoutInflater
+import android.view.*
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
-import androidx.annotation.LayoutRes
 import androidx.appcompat.app.AppCompatActivity
-import code.name.monkey.appthemehelper.util.ColorUtil
+import code.name.monkey.appthemehelper.util.*
-import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
+import code.name.monkey.retromusic.adapter.base.*
-import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
+import code.name.monkey.retromusic.glide.*
-import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
+import code.name.monkey.retromusic.helper.*
-import code.name.monkey.retromusic.glide.SongGlideRequest
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.SortOrder
 import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
 import code.name.monkey.retromusic.interfaces.CabHolder
-import code.name.monkey.retromusic.model.Album
+import code.name.monkey.retromusic.model.*
-import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.util.*
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.NavigationUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
 import com.bumptech.glide.Glide
 import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
 
-
+open class AlbumAdapter(
-open class AlbumAdapter(protected val activity: AppCompatActivity,
+		protected val activity: AppCompatActivity,
 		dataSet: ArrayList<Album>,
-                        @param:LayoutRes protected var itemLayoutRes: Int,
+		protected var itemLayoutRes: Int,
 		usePalette: Boolean,
-                        cabHolder: CabHolder?) : AbsMultiSelectAdapter<AlbumAdapter.ViewHolder, Album>(activity, cabHolder, code.name.monkey.retromusic.R.menu.menu_media_selection), FastScrollRecyclerView.SectionedAdapter {
+		cabHolder: CabHolder?
+) : AbsMultiSelectAdapter<AlbumAdapter.ViewHolder, Album>(
+		activity, cabHolder, code.name.monkey.retromusic.R.menu.menu_media_selection
+), FastScrollRecyclerView.SectionedAdapter {
 	var dataSet: ArrayList<Album>
 		protected set
 
 	protected var usePalette = false
 
-
 	init {
 		this.dataSet = dataSet
 		this.usePalette = usePalette
@@ -84,15 +75,28 @@ open class AlbumAdapter(protected val activity: AppCompatActivity,
 		holder.itemView.isActivated = isChecked
 		holder.title?.text = getAlbumTitle(album)
 		holder.text?.text = getAlbumText(album)
-        holder.playSongs?.setOnClickListener { album.songs?.let { songs -> MusicPlayerRemote.openQueue(songs, 0, true) } }
+		holder.playSongs?.setOnClickListener {
+			album.songs?.let { songs ->
+				MusicPlayerRemote.openQueue(
+						songs, 0, true
+				)
+			}
+		}
 		loadAlbumCover(album, holder)
 	}
 
 	protected open fun setColors(color: Int, holder: ViewHolder) {
 		if (holder.paletteColorContainer != null) {
 			holder.title?.setTextColor(
-                    MaterialValueHelper.getPrimaryTextColor(activity, ColorUtil.isColorLight(color)))
+					MaterialValueHelper.getPrimaryTextColor(activity, ColorUtil.isColorLight(color))
-            holder.text?.setTextColor(MaterialValueHelper.getSecondaryTextColor(activity, ColorUtil.isColorLight(color)))
+			)
+			holder.text?.setTextColor(
+					MaterialValueHelper.getSecondaryTextColor(
+							activity, ColorUtil.isColorLight(
+							color
+					)
+					)
+			)
 			holder.paletteColorContainer?.setBackgroundColor(color)
 		}
 
@@ -105,8 +109,7 @@ open class AlbumAdapter(protected val activity: AppCompatActivity,
 		}
 
 		SongGlideRequest.Builder.from(Glide.with(activity), album.safeGetFirstSong())
-                .checkIgnoreMediaStore(activity)
+			.checkIgnoreMediaStore(activity).generatePalette(activity).build()
-                .generatePalette(activity).build()
 			.into(object : RetroMusicColoredTarget(holder.image!!) {
 				override fun onLoadCleared(placeholder: Drawable?) {
 					super.onLoadCleared(placeholder)
@@ -135,8 +138,9 @@ open class AlbumAdapter(protected val activity: AppCompatActivity,
 		return album.title!!
 	}
 
-    override fun onMultipleItemAction(menuItem: MenuItem,
+	override fun onMultipleItemAction(
-                                      selection: ArrayList<Album>) {
+			menuItem: MenuItem, selection: ArrayList<Album>
+	) {
 		SongsMenuHelper.handleMenuClick(activity, getSongList(selection), menuItem.itemId)
 	}
 
@@ -153,7 +157,9 @@ open class AlbumAdapter(protected val activity: AppCompatActivity,
 		when (PreferenceUtil.getInstance(activity).albumSortOrder) {
 			SortOrder.AlbumSortOrder.ALBUM_A_Z, SortOrder.AlbumSortOrder.ALBUM_Z_A -> sectionName = dataSet[position].title
 			SortOrder.AlbumSortOrder.ALBUM_ARTIST                                  -> sectionName = dataSet[position].artistName
-            SortOrder.AlbumSortOrder.ALBUM_YEAR -> return MusicUtil.getYearString(dataSet[position].year)
+			SortOrder.AlbumSortOrder.ALBUM_YEAR                                    -> return MusicUtil.getYearString(
+					dataSet[position].year
+			)
 		}
 
 		return MusicUtil.getSectionName(sectionName)
@@ -171,8 +177,14 @@ open class AlbumAdapter(protected val activity: AppCompatActivity,
 			if (isInQuickSelectMode) {
 				toggleChecked(adapterPosition)
 			} else {
-                val activityOptions = ActivityOptions.makeSceneTransitionAnimation(activity, image, activity.getString(R.string.transition_album_art))
+				val activityOptions = ActivityOptions.makeSceneTransitionAnimation(
-                NavigationUtil.goToAlbumOptions(activity, dataSet[adapterPosition].id, activityOptions)
+						activity, image, activity.getString(
+						R.string.transition_album_art
+				)
+				)
+				NavigationUtil.goToAlbumOptions(
+						activity, dataSet[adapterPosition].id, activityOptions
+				)
 			}
 		}
 

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

@@ -1,25 +1,22 @@
 package code.name.monkey.retromusic.adapter.album
 
 import android.os.Bundle
-import android.view.LayoutInflater
+import android.view.*
-import android.view.View
-import android.view.ViewGroup
 import android.widget.ImageView
-import androidx.fragment.app.Fragment
+import androidx.fragment.app.*
-import androidx.fragment.app.FragmentManager
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.fragments.AlbumCoverStyle
-import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
+import code.name.monkey.retromusic.glide.*
-import code.name.monkey.retromusic.glide.SongGlideRequest
 import code.name.monkey.retromusic.misc.CustomFragmentStatePagerAdapter
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.NavigationUtil
+import code.name.monkey.retromusic.util.*
-import code.name.monkey.retromusic.util.PreferenceUtil
 import com.bumptech.glide.Glide
 import java.util.*
 
-
+class AlbumCoverPagerAdapter(
-class AlbumCoverPagerAdapter(fm: FragmentManager, private val dataSet: ArrayList<Song>) : CustomFragmentStatePagerAdapter(fm) {
+		fm: FragmentManager,
+		private val dataSet: ArrayList<Song>
+) : CustomFragmentStatePagerAdapter(fm) {
 
 	private var currentColorReceiver: AlbumCoverFragment.ColorReceiver? = null
 	private var currentColorReceiverPosition = -1
@@ -87,7 +84,11 @@ class AlbumCoverPagerAdapter(fm: FragmentManager, private val dataSet: ArrayList
 			}
 		}
 
-        override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+		override fun onCreateView(
+				inflater: LayoutInflater,
+				container: ViewGroup?,
+				savedInstanceState: Bundle?
+		): View? {
 			val finalLayout = when {
 				PreferenceUtil.getInstance(activity).carouselEffect() -> R.layout.fragment_album_carousel_cover
 				else                                                  -> layout
@@ -106,7 +107,6 @@ class AlbumCoverPagerAdapter(fm: FragmentManager, private val dataSet: ArrayList
 			loadAlbumCover()
 		}
 
-
 		override fun onDestroyView() {
 			super.onDestroyView()
 			colorReceiver = null
@@ -114,8 +114,7 @@ class AlbumCoverPagerAdapter(fm: FragmentManager, private val dataSet: ArrayList
 
 		private fun loadAlbumCover() {
 			SongGlideRequest.Builder.from(Glide.with(requireContext()), song)
-                    .checkIgnoreMediaStore(activity)
+				.checkIgnoreMediaStore(activity).generatePalette(activity).build()
-                    .generatePalette(activity).build()
 				.into(object : RetroMusicColoredTarget(albumCover) {
 					override fun onColorReady(color: Int) {
 						setColor(color)

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

@@ -15,26 +15,31 @@
  */
 package code.name.monkey.retromusic.adapter.album
 
-import android.app.Activity
+import android.app.*
-import android.app.ActivityOptions
 import android.util.DisplayMetrics
-import android.view.LayoutInflater
+import android.view.*
-import android.view.View
-import android.view.ViewGroup
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
+import code.name.monkey.retromusic.glide.*
-import code.name.monkey.retromusic.glide.SongGlideRequest
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.Album
 import code.name.monkey.retromusic.util.NavigationUtil
 import code.name.monkey.retromusic.views.MetalRecyclerViewPager
 import com.bumptech.glide.Glide
 
-class AlbumFullWidthAdapter(private val activity: Activity, private val dataSet: ArrayList<Album>, metrics: DisplayMetrics) :
+class AlbumFullWidthAdapter(
-        MetalRecyclerViewPager.MetalAdapter<AlbumFullWidthAdapter.FullMetalViewHolder>(metrics) {
+		private val activity: Activity,
+		private val dataSet: ArrayList<Album>,
+		metrics: DisplayMetrics
+) : MetalRecyclerViewPager.MetalAdapter<AlbumFullWidthAdapter.FullMetalViewHolder>(metrics) {
 
 	override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): FullMetalViewHolder {
-        return FullMetalViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.pager_item, parent, false))
+		return FullMetalViewHolder(
+				LayoutInflater.from(parent.context).inflate(
+						R.layout.pager_item,
+						parent,
+						false
+				)
+		)
 	}
 
 	override fun onBindViewHolder(holder: FullMetalViewHolder, position: Int) {
@@ -43,7 +48,15 @@ class AlbumFullWidthAdapter(private val activity: Activity, private val dataSet:
 		val album = dataSet[position]
 		holder.title?.text = getAlbumTitle(album)
 		holder.text?.text = getAlbumText(album)
-        holder.playSongs?.setOnClickListener { album.songs?.let { songs -> MusicPlayerRemote.openQueue(songs, 0, true) } }
+		holder.playSongs?.setOnClickListener {
+			album.songs?.let { songs ->
+				MusicPlayerRemote.openQueue(
+						songs,
+						0,
+						true
+				)
+			}
+		}
 		loadAlbumCover(album, holder)
 	}
 
@@ -60,8 +73,7 @@ class AlbumFullWidthAdapter(private val activity: Activity, private val dataSet:
 			return
 		}
 		SongGlideRequest.Builder.from(Glide.with(activity), album.safeGetFirstSong())
-                .checkIgnoreMediaStore(activity)
+			.checkIgnoreMediaStore(activity).generatePalette(activity).build()
-                .generatePalette(activity).build()
 			.into(object : RetroMusicColoredTarget(holder.image!!) {
 				override fun onColorReady(color: Int) {
 
@@ -73,10 +85,16 @@ class AlbumFullWidthAdapter(private val activity: Activity, private val dataSet:
 		return dataSet.size
 	}
 
-    inner class FullMetalViewHolder(itemView: View) : MetalRecyclerViewPager.MetalViewHolder(itemView) {
+	inner class FullMetalViewHolder(itemView: View) : MetalRecyclerViewPager.MetalViewHolder(
+			itemView
+	) {
 
 		override fun onClick(v: View?) {
-            val activityOptions = ActivityOptions.makeSceneTransitionAnimation(activity, image, activity.getString(R.string.transition_album_art))
+			val activityOptions = ActivityOptions.makeSceneTransitionAnimation(
+					activity,
+					image,
+					activity.getString(R.string.transition_album_art)
+			)
 			NavigationUtil.goToAlbumOptions(activity, dataSet[adapterPosition].id, activityOptions)
 		}
 	}

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

@@ -1,13 +1,10 @@
 package code.name.monkey.retromusic.adapter.album
 
 import android.graphics.drawable.Drawable
-import android.view.View
+import android.view.*
-import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
-import code.name.monkey.appthemehelper.util.ColorUtil
+import code.name.monkey.appthemehelper.util.*
-import code.name.monkey.appthemehelper.util.MaterialValueHelper
+import code.name.monkey.retromusic.glide.*
-import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
-import code.name.monkey.retromusic.glide.SongGlideRequest
 import code.name.monkey.retromusic.helper.HorizontalAdapterHelper
 import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.model.Album
@@ -15,18 +12,13 @@ import code.name.monkey.retromusic.util.MusicUtil
 import com.bumptech.glide.Glide
 import java.util.*
 
-
 class HorizontalAlbumAdapter(
 		activity: AppCompatActivity,
 		dataSet: ArrayList<Album>,
 		usePalette: Boolean,
 		cabHolder: CabHolder?
 ) : AlbumAdapter(
-        activity,
+		activity, dataSet, HorizontalAdapterHelper.LAYOUT_RES, usePalette, cabHolder
-        dataSet,
-        HorizontalAdapterHelper.LAYOUT_RES,
-        usePalette,
-        cabHolder
 ) {
 
 	override fun createViewHolder(view: View, viewType: Int): ViewHolder {
@@ -36,16 +28,29 @@ class HorizontalAlbumAdapter(
 	}
 
 	override fun setColors(color: Int, holder: ViewHolder) {
-        holder.title?.setTextColor(MaterialValueHelper.getPrimaryTextColor(activity, ColorUtil.isColorLight(color)))
+		holder.title?.setTextColor(
-        holder.text?.setTextColor(MaterialValueHelper.getSecondaryTextColor(activity, ColorUtil.isColorLight(color)))
+				MaterialValueHelper.getPrimaryTextColor(
+						activity,
+						ColorUtil.isColorLight(
+								color
+						)
+				)
+		)
+		holder.text?.setTextColor(
+				MaterialValueHelper.getSecondaryTextColor(
+						activity,
+						ColorUtil.isColorLight(
+								color
+						)
+				)
+		)
 	}
 
 	override fun loadAlbumCover(album: Album, holder: ViewHolder) {
 		if (holder.image == null) return
 
 		SongGlideRequest.Builder.from(Glide.with(activity), album.safeGetFirstSong())
-                .checkIgnoreMediaStore(activity)
+			.checkIgnoreMediaStore(activity).generatePalette(activity).build()
-                .generatePalette(activity).build()
 			.into(object : RetroMusicColoredTarget(holder.image!!) {
 				override fun onLoadCleared(placeholder: Drawable?) {
 					super.onLoadCleared(placeholder)
@@ -53,10 +58,8 @@ class HorizontalAlbumAdapter(
 				}
 
 				override fun onColorReady(color: Int) {
-                        if (usePalette)
+					if (usePalette) setColors(color, holder)
-                            setColors(color, holder)
+					else setColors(albumArtistFooterColor, holder)
-                        else
-                            setColors(albumArtistFooterColor, holder)
 				}
 			})
 	}

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

@@ -3,36 +3,29 @@ package code.name.monkey.retromusic.adapter.artist
 import android.app.ActivityOptions
 import android.content.res.ColorStateList
 import android.graphics.drawable.Drawable
-import android.view.LayoutInflater
+import android.view.*
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
-import androidx.annotation.LayoutRes
 import androidx.appcompat.app.AppCompatActivity
-import code.name.monkey.appthemehelper.util.ColorUtil
+import code.name.monkey.appthemehelper.util.*
-import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
+import code.name.monkey.retromusic.adapter.base.*
-import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
+import code.name.monkey.retromusic.glide.*
-import code.name.monkey.retromusic.glide.ArtistGlideRequest
-import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
 import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
 import code.name.monkey.retromusic.interfaces.CabHolder
-import code.name.monkey.retromusic.model.Artist
+import code.name.monkey.retromusic.model.*
-import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.util.*
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.NavigationUtil
 import com.bumptech.glide.Glide
 import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
 import java.util.*
 
-
+class ArtistAdapter(
-class ArtistAdapter(val activity: AppCompatActivity,
+		val activity: AppCompatActivity,
 		var dataSet: ArrayList<Artist>,
-                    @LayoutRes var itemLayoutRes: Int,
+		var itemLayoutRes: Int,
 		var usePalette: Boolean,
 		cabHolder: CabHolder?
-) : AbsMultiSelectAdapter<ArtistAdapter.ViewHolder, Artist>(activity, cabHolder, R.menu.menu_media_selection), FastScrollRecyclerView.SectionedAdapter {
+) : AbsMultiSelectAdapter<ArtistAdapter.ViewHolder, Artist>(
+		activity, cabHolder, R.menu.menu_media_selection
+), FastScrollRecyclerView.SectionedAdapter {
 
 	fun swapDataSet(dataSet: ArrayList<Artist>) {
 		this.dataSet = dataSet
@@ -69,7 +62,13 @@ class ArtistAdapter(val activity: AppCompatActivity,
 	fun setColors(color: Int, holder: ViewHolder) {
 		if (holder.paletteColorContainer != null) {
 			holder.paletteColorContainer?.setBackgroundColor(color)
-            holder.title?.setTextColor(MaterialValueHelper.getPrimaryTextColor(activity, ColorUtil.isColorLight(color)))
+			holder.title?.setTextColor(
+					MaterialValueHelper.getPrimaryTextColor(
+							activity, ColorUtil.isColorLight(
+							color
+					)
+					)
+			)
 		}
 
 		holder.mask?.backgroundTintList = ColorStateList.valueOf(color)
@@ -79,9 +78,8 @@ class ArtistAdapter(val activity: AppCompatActivity,
 		if (holder.image == null) {
 			return
 		}
-        ArtistGlideRequest.Builder.from(Glide.with(activity), artist)
+		ArtistGlideRequest.Builder.from(Glide.with(activity), artist).generatePalette(activity)
-                .generatePalette(activity).build()
+			.build().into(object : RetroMusicColoredTarget(holder.image!!) {
-                .into(object : RetroMusicColoredTarget(holder.image!!) {
 				override fun onLoadCleared(placeholder: Drawable?) {
 					super.onLoadCleared(placeholder)
 					setColors(defaultFooterColor, holder)
@@ -105,8 +103,9 @@ class ArtistAdapter(val activity: AppCompatActivity,
 		return artist.name
 	}
 
-    override fun onMultipleItemAction(menuItem: MenuItem,
+	override fun onMultipleItemAction(
-                                      selection: ArrayList<Artist>) {
+			menuItem: MenuItem, selection: ArrayList<Artist>
+	) {
 		SongsMenuHelper.handleMenuClick(activity, getSongList(selection), menuItem.itemId)
 	}
 
@@ -134,8 +133,14 @@ class ArtistAdapter(val activity: AppCompatActivity,
 			if (isInQuickSelectMode) {
 				toggleChecked(adapterPosition)
 			} else {
-                val activityOptions = ActivityOptions.makeSceneTransitionAnimation(activity, image, activity.getString(R.string.transition_artist_image))
+				val activityOptions = ActivityOptions.makeSceneTransitionAnimation(
-                NavigationUtil.goToArtistOptions(activity, dataSet[adapterPosition].id, activityOptions)
+						activity, image, activity.getString(
+						R.string.transition_artist_image
+				)
+				)
+				NavigationUtil.goToArtistOptions(
+						activity, dataSet[adapterPosition].id, activityOptions
+				)
 			}
 		}
 

app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.java

@@ -1,12 +1,13 @@
 package code.name.monkey.retromusic.adapter.base;
 
 import android.content.Context;
+import android.view.Menu;
+import android.view.MenuItem;
+
 import androidx.annotation.MenuRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
-import android.view.Menu;
-import android.view.MenuItem;
 
 import com.afollestad.materialcab.MaterialCab;
 

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

@@ -1,42 +1,35 @@
 package code.name.monkey.retromusic.adapter.playlist
 
 import android.graphics.drawable.Drawable
-import android.view.LayoutInflater
+import android.view.*
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.PopupMenu
 import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.*
-import code.name.monkey.appthemehelper.util.TintHelper
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
+import code.name.monkey.retromusic.adapter.base.*
-import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
+import code.name.monkey.retromusic.dialogs.*
-import code.name.monkey.retromusic.dialogs.ClearSmartPlaylistDialog
+import code.name.monkey.retromusic.helper.menu.*
-import code.name.monkey.retromusic.dialogs.DeletePlaylistDialog
-import code.name.monkey.retromusic.helper.menu.PlaylistMenuHelper
-import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
 import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.loaders.PlaylistSongsLoader
-import code.name.monkey.retromusic.model.AbsCustomPlaylist
+import code.name.monkey.retromusic.model.*
-import code.name.monkey.retromusic.model.Playlist
+import code.name.monkey.retromusic.model.smartplaylist.*
-import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.util.*
-import code.name.monkey.retromusic.model.smartplaylist.AbsSmartPlaylist
-import code.name.monkey.retromusic.model.smartplaylist.LastAddedPlaylist
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.NavigationUtil
 import java.util.*
 
-
+class PlaylistAdapter(
-class PlaylistAdapter(private val activity: AppCompatActivity,
+		private val activity: AppCompatActivity,
 		var dataSet: ArrayList<Playlist>,
 		private var itemLayoutRes: Int,
-                      cabHolder: CabHolder?) : AbsMultiSelectAdapter<PlaylistAdapter.ViewHolder, Playlist>(activity, cabHolder, R.menu.menu_playlists_selection) {
+		cabHolder: CabHolder?
+) : AbsMultiSelectAdapter<PlaylistAdapter.ViewHolder, Playlist>(
+		activity,
+		cabHolder,
+		R.menu.menu_playlists_selection
+) {
 
 	var songs = ArrayList<Song>()
 
-
 	init {
 		setHasStableIds(true)
 	}
@@ -51,8 +44,7 @@ class PlaylistAdapter(private val activity: AppCompatActivity,
 	}
 
 	override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val view = LayoutInflater.from(activity)
+		val view = LayoutInflater.from(activity).inflate(itemLayoutRes, parent, false)
-                .inflate(itemLayoutRes, parent, false)
 		return createViewHolder(view)
 	}
 
@@ -78,12 +70,25 @@ class PlaylistAdapter(private val activity: AppCompatActivity,
 
 	private fun getIconRes(playlist: Playlist): Drawable {
 		if (playlist is AbsSmartPlaylist) {
-            return TintHelper.createTintedDrawable(activity, playlist.iconRes, ATHUtil.resolveColor(activity, R.attr.iconColor))!!
+			return TintHelper.createTintedDrawable(
+					activity,
+					playlist.iconRes,
+					ATHUtil.resolveColor(activity, R.attr.iconColor)
+			)!!
 		}
-        return if (MusicUtil.isFavoritePlaylist(activity, playlist))
+		return if (MusicUtil.isFavoritePlaylist(
-            TintHelper.createTintedDrawable(activity, R.drawable.ic_favorite_white_24dp, ThemeStore.accentColor(activity))!!
+						activity,
-        else
+						playlist
-            TintHelper.createTintedDrawable(activity, R.drawable.ic_playlist_play_white_24dp, ATHUtil.resolveColor(activity, R.attr.iconColor))!!
+				)) TintHelper.createTintedDrawable(
+				activity,
+				R.drawable.ic_favorite_white_24dp,
+				ThemeStore.accentColor(activity)
+		)!!
+		else TintHelper.createTintedDrawable(
+				activity,
+				R.drawable.ic_playlist_play_white_24dp,
+				ATHUtil.resolveColor(activity, R.attr.iconColor)
+		)!!
 	}
 
 	override fun getItemViewType(position: Int): Int {
@@ -109,9 +114,9 @@ class PlaylistAdapter(private val activity: AppCompatActivity,
 				while (i < selection.size) {
 					val playlist = selection[i]
 					if (playlist is AbsSmartPlaylist) {
-                        ClearSmartPlaylistDialog.create(playlist)
+						ClearSmartPlaylistDialog.create(playlist).show(
-                                .show(activity.supportFragmentManager,
+								activity.supportFragmentManager, "CLEAR_PLAYLIST_" + playlist.name
-                                        "CLEAR_PLAYLIST_" + playlist.name)
+						)
 						selection.remove(playlist)
 						i--
 					}
@@ -122,7 +127,11 @@ class PlaylistAdapter(private val activity: AppCompatActivity,
 						.show(activity.supportFragmentManager, "DELETE_PLAYLIST")
 				}
 			}
-            else -> SongsMenuHelper.handleMenuClick(activity, getSongList(selection), menuItem.itemId)
+			else                        -> SongsMenuHelper.handleMenuClick(
+					activity,
+					getSongList(selection),
+					menuItem.itemId
+			)
 		}
 	}
 
@@ -148,7 +157,6 @@ class PlaylistAdapter(private val activity: AppCompatActivity,
 		return songs
 	}
 
-
 	inner class ViewHolder(itemView: View) : MediaEntryViewHolder(itemView) {
 		init {
 
@@ -161,24 +169,26 @@ class PlaylistAdapter(private val activity: AppCompatActivity,
 			menu?.setOnClickListener { view ->
 				val playlist = dataSet[adapterPosition]
 				val popupMenu = PopupMenu(activity, view)
-                popupMenu.inflate(if (itemViewType == SMART_PLAYLIST)
+				popupMenu.inflate(
-                    R.menu.menu_item_smart_playlist
+						if (itemViewType == SMART_PLAYLIST) R.menu.menu_item_smart_playlist
-                else
+						else R.menu.menu_item_playlist
-                    R.menu.menu_item_playlist)
+				)
 				if (playlist is LastAddedPlaylist) {
 					popupMenu.menu.findItem(R.id.action_clear_playlist).isVisible = false
 				}
 				popupMenu.setOnMenuItemClickListener { item ->
 					if (item.itemId == R.id.action_clear_playlist) {
 						if (playlist is AbsSmartPlaylist) {
-                            ClearSmartPlaylistDialog.create(playlist)
+							ClearSmartPlaylistDialog.create(playlist).show(
-                                    .show(activity.supportFragmentManager,
+									activity.supportFragmentManager,
-                                            "CLEAR_SMART_PLAYLIST_" + playlist.name)
+									"CLEAR_SMART_PLAYLIST_" + playlist.name
+							)
 							return@setOnMenuItemClickListener true
 						}
 					}
 					PlaylistMenuHelper.handleMenuClick(
-                            activity, dataSet[adapterPosition], item)
+							activity, dataSet[adapterPosition], item
+					)
 				}
 				popupMenu.show()
 			}

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

@@ -1,8 +1,6 @@
 package code.name.monkey.retromusic.adapter.song
 
-import android.view.LayoutInflater
+import android.view.*
-import android.view.View
-import android.view.ViewGroup
 import androidx.annotation.LayoutRes
 import androidx.appcompat.app.AppCompatActivity
 import code.name.monkey.retromusic.R
@@ -11,16 +9,28 @@ import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.model.Song
 import java.util.*
 
-
 abstract class AbsOffsetSongAdapter : SongAdapter {
 
-    constructor(activity: AppCompatActivity, dataSet: ArrayList<Song>, @LayoutRes itemLayoutRes: Int, usePalette: Boolean, cabHolder: CabHolder?) : super(activity, dataSet, itemLayoutRes, usePalette, cabHolder)
+	constructor(
+			activity: AppCompatActivity,
+			dataSet: ArrayList<Song>, @LayoutRes itemLayoutRes: Int,
+			usePalette: Boolean,
+			cabHolder: CabHolder?
+	) : super(activity, dataSet, itemLayoutRes, usePalette, cabHolder)
 
-    constructor(activity: AppCompatActivity, dataSet: ArrayList<Song>, @LayoutRes itemLayoutRes: Int, usePalette: Boolean, cabHolder: CabHolder?, showSectionName: Boolean) : super(activity, dataSet, itemLayoutRes, usePalette, cabHolder, showSectionName) {}
+	constructor(
+			activity: AppCompatActivity,
+			dataSet: ArrayList<Song>, @LayoutRes itemLayoutRes: Int,
+			usePalette: Boolean,
+			cabHolder: CabHolder?,
+			showSectionName: Boolean
+	) : super(activity, dataSet, itemLayoutRes, usePalette, cabHolder, showSectionName) {
+	}
 
 	override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SongAdapter.ViewHolder {
 		if (viewType == OFFSET_ITEM) {
-            val view = LayoutInflater.from(activity).inflate(R.layout.item_list_quick_actions, parent, false)
+			val view = LayoutInflater.from(activity)
+				.inflate(R.layout.item_list_quick_actions, parent, false)
 			return createViewHolder(view)
 		}
 		return super.onCreateViewHolder(parent, viewType)
@@ -59,7 +69,7 @@ abstract class AbsOffsetSongAdapter : SongAdapter {
 
 	open inner class ViewHolder(itemView: View) : SongAdapter.ViewHolder(itemView) {
 
-        override// could also return null, just to be safe return empty song
+		override // could also return null, just to be safe return empty song
 		val song: Song
 			get() = if (itemViewType == OFFSET_ITEM) Song.emptySong else dataSet[adapterPosition - 1]
 

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

@@ -1,27 +1,25 @@
 package code.name.monkey.retromusic.adapter.song
 
-import android.view.MenuItem
+import android.view.*
-import android.view.View
-import androidx.annotation.LayoutRes
 import androidx.appcompat.app.AppCompatActivity
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.dialogs.RemoveFromPlaylistDialog
 import code.name.monkey.retromusic.interfaces.CabHolder
-import code.name.monkey.retromusic.model.PlaylistSong
+import code.name.monkey.retromusic.model.*
-import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.ViewUtil
-import com.h6ah4i.android.widget.advrecyclerview.draggable.DraggableItemAdapter
+import com.h6ah4i.android.widget.advrecyclerview.draggable.*
-import com.h6ah4i.android.widget.advrecyclerview.draggable.DraggableItemViewHolder
-import com.h6ah4i.android.widget.advrecyclerview.draggable.ItemDraggableRange
 import com.h6ah4i.android.widget.advrecyclerview.draggable.annotation.DraggableItemStateFlags
 
-
+class OrderablePlaylistSongAdapter(
-class OrderablePlaylistSongAdapter(activity: AppCompatActivity,
+		activity: AppCompatActivity,
 		dataSet: ArrayList<Song>,
-                                   @LayoutRes itemLayoutRes: Int,
+		itemLayoutRes: Int,
 		usePalette: Boolean,
 		cabHolder: CabHolder?,
-                                   private val onMoveItemListener: OnMoveItemListener?) : PlaylistSongAdapter(activity, dataSet, itemLayoutRes, usePalette, cabHolder), DraggableItemAdapter<OrderablePlaylistSongAdapter.ViewHolder> {
+		private val onMoveItemListener: OnMoveItemListener?
+) : PlaylistSongAdapter(
+		activity, dataSet, itemLayoutRes, usePalette, cabHolder
+), DraggableItemAdapter<OrderablePlaylistSongAdapter.ViewHolder> {
 
 	init {
 		setMultiSelectMenuRes(code.name.monkey.retromusic.R.menu.menu_playlists_songs_selection)
@@ -49,7 +47,8 @@ class OrderablePlaylistSongAdapter(activity: AppCompatActivity,
 	override fun onMultipleItemAction(menuItem: MenuItem, selection: ArrayList<Song>) {
 		when (menuItem.itemId) {
 			R.id.action_remove_from_playlist -> {
-                RemoveFromPlaylistDialog.create(selection as ArrayList<PlaylistSong>).show(activity.supportFragmentManager, "ADD_PLAYLIST")
+				RemoveFromPlaylistDialog.create(selection as ArrayList<PlaylistSong>)
+					.show(activity.supportFragmentManager, "ADD_PLAYLIST")
 				return
 			}
 		}
@@ -57,8 +56,9 @@ class OrderablePlaylistSongAdapter(activity: AppCompatActivity,
 	}
 
 	override fun onCheckCanStartDrag(holder: ViewHolder, position: Int, x: Int, y: Int): Boolean {
-        return onMoveItemListener != null && position > 0 &&
+		return onMoveItemListener != null && position > 0 && (ViewUtil.hitTest(
-                (ViewUtil.hitTest(holder.dragView!!, x, y) || ViewUtil.hitTest(holder.image!!, x, y))
+				holder.dragView!!, x, y
+		) || ViewUtil.hitTest(holder.image!!, x, y))
 	}
 
 	override fun onGetItemDraggableRange(holder: ViewHolder, position: Int): ItemDraggableRange {
@@ -110,7 +110,8 @@ class OrderablePlaylistSongAdapter(activity: AppCompatActivity,
 		override fun onSongMenuItemClick(item: MenuItem): Boolean {
 			when (item.itemId) {
 				code.name.monkey.retromusic.R.id.action_remove_from_playlist -> {
-                    RemoveFromPlaylistDialog.create(song as PlaylistSong).show(activity.supportFragmentManager, "REMOVE_FROM_PLAYLIST")
+					RemoveFromPlaylistDialog.create(song as PlaylistSong)
+						.show(activity.supportFragmentManager, "REMOVE_FROM_PLAYLIST")
 					return true
 				}
 			}

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

@@ -1,32 +1,24 @@
 package code.name.monkey.retromusic.adapter.song
 
-import android.graphics.Color
+import android.graphics.*
-import android.graphics.PorterDuff
+import android.view.*
-import android.view.MenuItem
-import android.view.View
 import android.widget.ImageView
 import androidx.appcompat.app.AppCompatActivity
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.MusicUtil
+import code.name.monkey.retromusic.util.*
-import code.name.monkey.retromusic.util.ViewUtil
+import com.h6ah4i.android.widget.advrecyclerview.draggable.*
-import com.h6ah4i.android.widget.advrecyclerview.draggable.DraggableItemAdapter
-import com.h6ah4i.android.widget.advrecyclerview.draggable.DraggableItemViewHolder
-import com.h6ah4i.android.widget.advrecyclerview.draggable.ItemDraggableRange
 import com.h6ah4i.android.widget.advrecyclerview.draggable.annotation.DraggableItemStateFlags
 import java.util.*
 
-
+class PlayingQueueAdapter(
-class PlayingQueueAdapter(activity: AppCompatActivity,
+		activity: AppCompatActivity,
 		dataSet: ArrayList<Song>,
 		private var current: Int,
-                          itemLayoutRes: Int) : SongAdapter(
+		itemLayoutRes: Int
-        activity,
+) : SongAdapter(
-        dataSet,
+		activity, dataSet, itemLayoutRes, false, null
-        itemLayoutRes,
-        false,
-        null
 ), DraggableItemAdapter<PlayingQueueAdapter.ViewHolder> {
 
 	private var color = -1
@@ -103,7 +95,11 @@ class PlayingQueueAdapter(activity: AppCompatActivity,
 	}
 
 	override fun onCheckCanStartDrag(holder: ViewHolder, position: Int, x: Int, y: Int): Boolean {
-        return ViewUtil.hitTest(holder.imageText!!, x, y) || ViewUtil.hitTest(holder.dragView!!, x, y)
+		return ViewUtil.hitTest(holder.imageText!!, x, y) || ViewUtil.hitTest(
+				holder.dragView!!,
+				x,
+				y
+		)
 	}
 
 	override fun onGetItemDraggableRange(holder: ViewHolder, position: Int): ItemDraggableRange? {

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

@@ -2,28 +2,24 @@ package code.name.monkey.retromusic.adapter.song
 
 import android.app.ActivityOptions
 import android.content.res.ColorStateList
-import android.view.MenuItem
+import android.view.*
-import android.view.View
-import androidx.annotation.LayoutRes
 import androidx.appcompat.app.AppCompatActivity
-import code.name.monkey.appthemehelper.util.ColorUtil
+import code.name.monkey.appthemehelper.util.*
-import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.NavigationUtil
+import code.name.monkey.retromusic.util.*
-import code.name.monkey.retromusic.util.RetroColorUtil
 import com.google.android.material.button.MaterialButton
 import java.util.*
 
-
+open class PlaylistSongAdapter(
-open class PlaylistSongAdapter(activity: AppCompatActivity,
+		activity: AppCompatActivity,
 		dataSet: ArrayList<Song>,
-                               @LayoutRes itemLayoutRes: Int,
+		itemLayoutRes: Int,
 		usePalette: Boolean,
-                               cabHolder: CabHolder?) :
+		cabHolder: CabHolder?
-        AbsOffsetSongAdapter(activity, dataSet, itemLayoutRes, usePalette, cabHolder, false) {
+) : AbsOffsetSongAdapter(activity, dataSet, itemLayoutRes, usePalette, cabHolder, false) {
 
 	init {
 		this.setMultiSelectMenuRes(R.menu.menu_cannot_delete_single_songs_playlist_songs_selection)
@@ -38,7 +34,11 @@ open class PlaylistSongAdapter(activity: AppCompatActivity,
 		if (holder.itemViewType == OFFSET_ITEM) {
 
 			val buttonColor = RetroColorUtil.toolbarColor(activity)
-            val textColor = MaterialValueHelper.getPrimaryTextColor(activity, ColorUtil.isColorLight(buttonColor))
+			val textColor = MaterialValueHelper.getPrimaryTextColor(
+					activity, ColorUtil.isColorLight(
+					buttonColor
+			)
+			)
 			val viewHolder = holder as ViewHolder
 
 			viewHolder.playAction?.let {
@@ -76,8 +76,14 @@ open class PlaylistSongAdapter(activity: AppCompatActivity,
 
 		override fun onSongMenuItemClick(item: MenuItem): Boolean {
 			if (item.itemId == R.id.action_go_to_album) {
-                val activityOptions = ActivityOptions.makeSceneTransitionAnimation(activity, image, activity.getString(R.string.transition_album_art))
+				val activityOptions = ActivityOptions.makeSceneTransitionAnimation(
-                NavigationUtil.goToAlbumOptions(activity, dataSet[adapterPosition - 1].albumId, activityOptions)
+						activity, image, activity.getString(
+						R.string.transition_album_art
+				)
+				)
+				NavigationUtil.goToAlbumOptions(
+						activity, dataSet[adapterPosition - 1].albumId, activityOptions
+				)
 				return true
 			}
 			return super.onSongMenuItemClick(item)

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

@@ -1,7 +1,6 @@
 package code.name.monkey.retromusic.adapter.song
 
 import android.view.View
-import androidx.annotation.LayoutRes
 import androidx.appcompat.app.AppCompatActivity
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
@@ -10,12 +9,13 @@ import code.name.monkey.retromusic.model.Song
 import com.google.android.material.button.MaterialButton
 import java.util.*
 
-
+class ShuffleButtonSongAdapter(
-class ShuffleButtonSongAdapter(activity: AppCompatActivity,
+		activity: AppCompatActivity,
 		dataSet: ArrayList<Song>,
-                               @LayoutRes itemLayoutRes: Int,
+		itemLayoutRes: Int,
 		usePalette: Boolean,
-                               cabHolder: CabHolder?) : AbsOffsetSongAdapter(activity, dataSet, itemLayoutRes, usePalette, cabHolder) {
+		cabHolder: CabHolder?
+) : AbsOffsetSongAdapter(activity, dataSet, itemLayoutRes, usePalette, cabHolder) {
 
 	override fun createViewHolder(view: View): SongAdapter.ViewHolder {
 		return ViewHolder(view)

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

@@ -1,18 +1,14 @@
 package code.name.monkey.retromusic.adapter.song
 
-import android.view.LayoutInflater
+import android.view.*
-import android.view.ViewGroup
-import androidx.annotation.LayoutRes
 import androidx.appcompat.app.AppCompatActivity
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.MusicUtil
 import java.util.*
 
-
+class SimpleSongAdapter(
-class SimpleSongAdapter(context: AppCompatActivity,
+		context: AppCompatActivity, songs: ArrayList<Song>, i: Int
-                        songs: ArrayList<Song>,
+) : SongAdapter(context, songs, i, false, null) {
-                        @LayoutRes i: Int) : SongAdapter(context, songs, i, false, null) {
-
 
 	override fun swapDataSet(dataSet: ArrayList<Song>) {
 		this.dataSet.clear()

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

@@ -2,45 +2,36 @@ package code.name.monkey.retromusic.adapter.song
 
 import android.app.ActivityOptions
 import android.graphics.drawable.Drawable
-import android.view.LayoutInflater
+import android.view.*
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
-import code.name.monkey.appthemehelper.util.ColorUtil
+import code.name.monkey.appthemehelper.util.*
-import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
+import code.name.monkey.retromusic.adapter.base.*
-import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
+import code.name.monkey.retromusic.glide.*
-import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
+import code.name.monkey.retromusic.helper.*
-import code.name.monkey.retromusic.glide.SongGlideRequest
+import code.name.monkey.retromusic.helper.menu.*
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.SortOrder
-import code.name.monkey.retromusic.helper.menu.SongMenuHelper
-import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
 import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.MusicUtil
+import code.name.monkey.retromusic.util.*
-import code.name.monkey.retromusic.util.NavigationUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
 import com.afollestad.materialcab.MaterialCab
 import com.bumptech.glide.Glide
 import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
 import java.util.*
 
-
 /**
  * Created by hemanths on 13/08/17.
  */
 
-open class SongAdapter @JvmOverloads constructor(
+open class SongAdapter(
 		protected val activity: AppCompatActivity,
 		dataSet: ArrayList<Song>,
 		protected var itemLayoutRes: Int,
 		usePalette: Boolean,
 		cabHolder: CabHolder?,
 		showSectionName: Boolean = true
-) : AbsMultiSelectAdapter<SongAdapter.ViewHolder, Song>(activity, cabHolder, R.menu.menu_media_selection), MaterialCab.Callback, FastScrollRecyclerView.SectionedAdapter {
+) : AbsMultiSelectAdapter<SongAdapter.ViewHolder, Song>(
+		activity, cabHolder, R.menu.menu_media_selection
+), MaterialCab.Callback, FastScrollRecyclerView.SectionedAdapter {
 	var dataSet: ArrayList<Song>
 
 	protected var usePalette = false
@@ -88,8 +79,20 @@ open class SongAdapter @JvmOverloads constructor(
 	private fun setColors(color: Int, holder: ViewHolder) {
 		if (holder.paletteColorContainer != null) {
 			holder.paletteColorContainer?.setBackgroundColor(color)
-            holder.title?.setTextColor(MaterialValueHelper.getPrimaryTextColor(activity, ColorUtil.isColorLight(color)))
+			holder.title?.setTextColor(
-            holder.text?.setTextColor(MaterialValueHelper.getSecondaryTextColor(activity, ColorUtil.isColorLight(color)))
+					MaterialValueHelper.getPrimaryTextColor(
+							activity, ColorUtil.isColorLight(
+							color
+					)
+					)
+			)
+			holder.text?.setTextColor(
+					MaterialValueHelper.getSecondaryTextColor(
+							activity, ColorUtil.isColorLight(
+							color
+					)
+					)
+			)
 		}
 	}
 
@@ -97,8 +100,7 @@ open class SongAdapter @JvmOverloads constructor(
 		if (holder.image == null) {
 			return
 		}
-        SongGlideRequest.Builder.from(Glide.with(activity), song)
+		SongGlideRequest.Builder.from(Glide.with(activity), song).checkIgnoreMediaStore(activity)
-                .checkIgnoreMediaStore(activity)
 			.generatePalette(activity).build()
 			.into(object : RetroMusicColoredTarget(holder.image!!) {
 				override fun onLoadCleared(placeholder: Drawable?) {
@@ -107,10 +109,8 @@ open class SongAdapter @JvmOverloads constructor(
 				}
 
 				override fun onColorReady(color: Int) {
-                        if (usePalette)
+					if (usePalette) setColors(color, holder)
-                            setColors(color, holder)
+					else setColors(defaultFooterColor, holder)
-                        else
-                            setColors(defaultFooterColor, holder)
 				}
 			})
 	}
@@ -135,8 +135,9 @@ open class SongAdapter @JvmOverloads constructor(
 		return song.title
 	}
 
-    override fun onMultipleItemAction(menuItem: MenuItem,
+	override fun onMultipleItemAction(
-                                      selection: ArrayList<Song>) {
+			menuItem: MenuItem, selection: ArrayList<Song>
+	) {
 		SongsMenuHelper.handleMenuClick(activity, selection, menuItem.itemId)
 	}
 
@@ -148,7 +149,9 @@ open class SongAdapter @JvmOverloads constructor(
 			SortOrder.SongSortOrder.SONG_A_Z, SortOrder.SongSortOrder.SONG_Z_A -> dataSet[position].title
 			SortOrder.SongSortOrder.SONG_ALBUM                                 -> dataSet[position].albumName
 			SortOrder.SongSortOrder.SONG_ARTIST                                -> dataSet[position].artistName
-            SortOrder.SongSortOrder.SONG_YEAR -> return MusicUtil.getYearString(dataSet[position].year)
+			SortOrder.SongSortOrder.SONG_YEAR                                  -> return MusicUtil.getYearString(
+					dataSet[position].year
+			)
 			SortOrder.SongSortOrder.COMPOSER                                   -> dataSet[position].composer
 			else                                                               -> {
 				return ""
@@ -181,7 +184,9 @@ open class SongAdapter @JvmOverloads constructor(
 			if (image != null && image!!.visibility == View.VISIBLE) {
 				when (item.itemId) {
 					R.id.action_go_to_album -> {
-                        val options: ActivityOptions = ActivityOptions.makeSceneTransitionAnimation(activity, image, activity.getString(R.string.transition_album_art))
+						val options: ActivityOptions = ActivityOptions.makeSceneTransitionAnimation(
+								activity, image, activity.getString(R.string.transition_album_art)
+						)
 						NavigationUtil.goToAlbumOptions(activity, song.albumId, options)
 						return true
 					}

app/src/main/java/code/name/monkey/retromusic/appshortcuts/AppShortcutIconGenerator.kt

@@ -15,19 +15,14 @@
 package code.name.monkey.retromusic.appshortcuts
 
 import android.content.Context
-import android.graphics.Bitmap
+import android.graphics.*
-import android.graphics.Canvas
+import android.graphics.drawable.*
-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 code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.util.*
-import code.name.monkey.retromusic.util.RetroUtil
 
 @RequiresApi(Build.VERSION_CODES.N_MR1)
 object AppShortcutIconGenerator {
@@ -41,7 +36,9 @@ object AppShortcutIconGenerator {
 
 	private fun generateDefaultThemedIcon(context: Context, iconId: Int): Icon {
 		// Return an Icon of iconId with default colors
-        return generateThemedIcon(context, iconId,
+		return generateThemedIcon(
+				context,
+				iconId,
 				context.getColor(R.color.app_shortcut_default_foreground),
 				context.getColor(R.color.app_shortcut_default_background)
 		)
@@ -53,16 +50,19 @@ object AppShortcutIconGenerator {
 		context.theme.resolveAttribute(android.R.attr.colorBackground, typedColorBackground, true)
 
 		// Return an Icon of iconId with those colors
-        return generateThemedIcon(context, iconId,
+		return generateThemedIcon(
-                ThemeStore.accentColor(context),
+				context, iconId, ThemeStore.accentColor(context), typedColorBackground.data
-                typedColorBackground.data
 		)
 	}
 
-    private fun generateThemedIcon(context: Context, iconId: Int, foregroundColor: Int, backgroundColor: Int): Icon {
+	private fun generateThemedIcon(
+			context: Context, iconId: Int, foregroundColor: Int, backgroundColor: Int
+	): Icon {
 		// Get and tint foreground and background drawables
 		val vectorDrawable = RetroUtil.getTintedVectorDrawable(context, iconId, foregroundColor)
-        val backgroundDrawable = RetroUtil.getTintedVectorDrawable(context, R.drawable.ic_app_shortcut_background, backgroundColor)
+		val backgroundDrawable = RetroUtil.getTintedVectorDrawable(
+				context, R.drawable.ic_app_shortcut_background, backgroundColor
+		)
 
 		// Squash the two drawables together
 		val layerDrawable = LayerDrawable(arrayOf(backgroundDrawable, vectorDrawable))
@@ -72,7 +72,9 @@ object AppShortcutIconGenerator {
 	}
 
 	private fun drawableToBitmap(drawable: Drawable): Bitmap {
-        val bitmap = Bitmap.createBitmap(drawable.intrinsicWidth, drawable.intrinsicHeight, Bitmap.Config.ARGB_8888)
+		val bitmap = Bitmap.createBitmap(
+				drawable.intrinsicWidth, drawable.intrinsicHeight, Bitmap.Config.ARGB_8888
+		)
 		val canvas = Canvas(bitmap)
 		drawable.setBounds(0, 0, canvas.width, canvas.height)
 		drawable.draw(canvas)

app/src/main/java/code/name/monkey/retromusic/appshortcuts/AppShortcutLauncherActivity.kt

@@ -18,18 +18,12 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import code.name.monkey.retromusic.activities.SearchActivity
-import code.name.monkey.retromusic.appshortcuts.shortcuttype.LastAddedShortcutType
+import code.name.monkey.retromusic.appshortcuts.shortcuttype.*
-import code.name.monkey.retromusic.appshortcuts.shortcuttype.SearchShortCutType
-import code.name.monkey.retromusic.appshortcuts.shortcuttype.ShuffleAllShortcutType
-import code.name.monkey.retromusic.appshortcuts.shortcuttype.TopTracksShortcutType
 import code.name.monkey.retromusic.model.Playlist
-import code.name.monkey.retromusic.model.smartplaylist.LastAddedPlaylist
+import code.name.monkey.retromusic.model.smartplaylist.*
-import code.name.monkey.retromusic.model.smartplaylist.MyTopTracksPlaylist
-import code.name.monkey.retromusic.model.smartplaylist.ShuffleAllPlaylist
 import code.name.monkey.retromusic.service.MusicService
 import code.name.monkey.retromusic.service.MusicService.*
 
-
 class AppShortcutLauncherActivity : Activity() {
 
 	public override fun onCreate(savedInstanceState: Bundle?) {
@@ -45,18 +39,21 @@ class AppShortcutLauncherActivity : Activity() {
 
 		when (shortcutType) {
 			SHORTCUT_TYPE_SHUFFLE_ALL -> {
-                startServiceWithPlaylist(MusicService.SHUFFLE_MODE_SHUFFLE,
+				startServiceWithPlaylist(
-                        ShuffleAllPlaylist(applicationContext))
+						MusicService.SHUFFLE_MODE_SHUFFLE, ShuffleAllPlaylist(applicationContext)
+				)
 				DynamicShortcutManager.reportShortcutUsed(this, ShuffleAllShortcutType.id)
 			}
 			SHORTCUT_TYPE_TOP_TRACKS  -> {
-                startServiceWithPlaylist(MusicService.SHUFFLE_MODE_NONE,
+				startServiceWithPlaylist(
-                        MyTopTracksPlaylist(applicationContext))
+						MusicService.SHUFFLE_MODE_NONE, MyTopTracksPlaylist(applicationContext)
+				)
 				DynamicShortcutManager.reportShortcutUsed(this, TopTracksShortcutType.id)
 			}
 			SHORTCUT_TYPE_LAST_ADDED  -> {
-                startServiceWithPlaylist(MusicService.SHUFFLE_MODE_NONE,
+				startServiceWithPlaylist(
-                        LastAddedPlaylist(applicationContext))
+						MusicService.SHUFFLE_MODE_NONE, LastAddedPlaylist(applicationContext)
+				)
 				DynamicShortcutManager.reportShortcutUsed(this, LastAddedShortcutType.id)
 			}
 			SHORTCUT_TYPE_SEARCH      -> {

app/src/main/java/code/name/monkey/retromusic/appshortcuts/DynamicShortcutManager.kt

@@ -15,19 +15,12 @@
 package code.name.monkey.retromusic.appshortcuts
 
 import android.annotation.TargetApi
-import android.content.Context
+import android.content.*
-import android.content.Intent
+import android.content.pm.*
-import android.content.pm.ShortcutInfo
-import android.content.pm.ShortcutManager
 import android.graphics.drawable.Icon
 import android.os.Build
-
+import code.name.monkey.retromusic.appshortcuts.shortcuttype.*
-import java.util.Arrays
+import java.util.*
-
-import code.name.monkey.retromusic.appshortcuts.shortcuttype.LastAddedShortcutType
-import code.name.monkey.retromusic.appshortcuts.shortcuttype.SearchShortCutType
-import code.name.monkey.retromusic.appshortcuts.shortcuttype.ShuffleAllShortcutType
-import code.name.monkey.retromusic.appshortcuts.shortcuttype.TopTracksShortcutType
 
 @TargetApi(Build.VERSION_CODES.N_MR1)
 class DynamicShortcutManager(private val context: Context) {
@@ -54,13 +47,16 @@ class DynamicShortcutManager(private val context: Context) {
 
 	companion object {
 
-        fun createShortcut(context: Context, id: String, shortLabel: String, longLabel: String, icon: Icon, intent: Intent): ShortcutInfo {
+		fun createShortcut(
-            return ShortcutInfo.Builder(context, id)
+				context: Context,
-                    .setShortLabel(shortLabel)
+				id: String,
-                    .setLongLabel(longLabel)
+				shortLabel: String,
-                    .setIcon(icon)
+				longLabel: String,
-                    .setIntent(intent)
+				icon: Icon,
-                    .build()
+				intent: Intent
+		): ShortcutInfo {
+			return ShortcutInfo.Builder(context, id).setShortLabel(shortLabel)
+				.setLongLabel(longLabel).setIcon(icon).setIntent(intent).build()
 		}
 
 		fun reportShortcutUsed(context: Context, shortcutId: String) {

app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/BaseShortcutType.kt

@@ -15,12 +15,9 @@
 package code.name.monkey.retromusic.appshortcuts.shortcuttype
 
 import android.annotation.TargetApi
-import android.content.Context
+import android.content.*
-import android.content.Intent
 import android.content.pm.ShortcutInfo
-import android.os.Build
+import android.os.*
-import android.os.Bundle
-
 import code.name.monkey.retromusic.appshortcuts.AppShortcutLauncherActivity
 
 @TargetApi(Build.VERSION_CODES.N_MR1)

app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/LastAddedShortcutType.kt

@@ -19,19 +19,23 @@ import android.content.Context
 import android.content.pm.ShortcutInfo
 import android.os.Build
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.appshortcuts.AppShortcutIconGenerator
+import code.name.monkey.retromusic.appshortcuts.*
-import code.name.monkey.retromusic.appshortcuts.AppShortcutLauncherActivity
 
 @TargetApi(Build.VERSION_CODES.N_MR1)
 class LastAddedShortcutType(context: Context) : BaseShortcutType(context) {
 
 	override val shortcutInfo: ShortcutInfo
-        get() = ShortcutInfo.Builder(context, id)
+		get() = ShortcutInfo.Builder(
-                .setShortLabel(context.getString(R.string.app_shortcut_last_added_short))
+				context,
-                .setLongLabel(context.getString(R.string.app_shortcut_last_added_long))
+				id
-                .setIcon(AppShortcutIconGenerator.generateThemedIcon(context, R.drawable.ic_app_shortcut_last_added))
+		).setShortLabel(context.getString(R.string.app_shortcut_last_added_short)).setLongLabel(
-                .setIntent(getPlaySongsIntent(AppShortcutLauncherActivity.SHORTCUT_TYPE_LAST_ADDED))
+					context.getString(R.string.app_shortcut_last_added_long)
-                .build()
+			).setIcon(
+					AppShortcutIconGenerator.generateThemedIcon(
+							context,
+							R.drawable.ic_app_shortcut_last_added
+					)
+			).setIntent(getPlaySongsIntent(AppShortcutLauncherActivity.SHORTCUT_TYPE_LAST_ADDED)).build()
 
 	companion object {
 

app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/SearchShortCutType.kt

@@ -19,8 +19,7 @@ import android.content.Context
 import android.content.pm.ShortcutInfo
 import android.os.Build
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.appshortcuts.AppShortcutIconGenerator
+import code.name.monkey.retromusic.appshortcuts.*
-import code.name.monkey.retromusic.appshortcuts.AppShortcutLauncherActivity
 
 @TargetApi(Build.VERSION_CODES.N_MR1)
 class SearchShortCutType(context: Context) : BaseShortcutType(context) {
@@ -31,10 +30,13 @@ class SearchShortCutType(context: Context) : BaseShortcutType(context) {
 	}
 
 	override val shortcutInfo: ShortcutInfo
-        get() = ShortcutInfo.Builder(context, id)
+		get() = ShortcutInfo.Builder(
-                .setShortLabel(context.getString(R.string.action_search))
+				context,
-                .setLongLabel(context.getString(R.string.search_hint))
+				id
-                .setIcon(AppShortcutIconGenerator.generateThemedIcon(context, R.drawable.ic_app_shortcut_search))
+		).setShortLabel(context.getString(R.string.action_search)).setLongLabel(context.getString(R.string.search_hint)).setIcon(
-                .setIntent(getPlaySongsIntent(AppShortcutLauncherActivity.SHORTCUT_TYPE_SEARCH))
+					AppShortcutIconGenerator.generateThemedIcon(
-                .build()
+							context,
+							R.drawable.ic_app_shortcut_search
+					)
+			).setIntent(getPlaySongsIntent(AppShortcutLauncherActivity.SHORTCUT_TYPE_SEARCH)).build()
 }

app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/ShuffleAllShortcutType.kt

@@ -18,22 +18,22 @@ import android.annotation.TargetApi
 import android.content.Context
 import android.content.pm.ShortcutInfo
 import android.os.Build
-
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.appshortcuts.AppShortcutIconGenerator
+import code.name.monkey.retromusic.appshortcuts.*
-import code.name.monkey.retromusic.appshortcuts.AppShortcutLauncherActivity
-import java.security.AccessController.getContext
 
 @TargetApi(Build.VERSION_CODES.N_MR1)
 class ShuffleAllShortcutType(context: Context) : BaseShortcutType(context) {
 
 	override val shortcutInfo: ShortcutInfo
-        get() = ShortcutInfo.Builder(context, id)
+		get() = ShortcutInfo.Builder(
-                .setShortLabel(context.getString(R.string.app_shortcut_shuffle_all_short))
+				context, id
-                .setLongLabel(context.getString(R.string.app_shortcut_shuffle_all_long))
+		).setShortLabel(context.getString(R.string.app_shortcut_shuffle_all_short)).setLongLabel(
-                .setIcon(AppShortcutIconGenerator.generateThemedIcon(context, R.drawable.ic_app_shortcut_shuffle_all))
+				context.getString(R.string.app_shortcut_shuffle_all_long)
-                .setIntent(getPlaySongsIntent(AppShortcutLauncherActivity.SHORTCUT_TYPE_SHUFFLE_ALL))
+		).setIcon(
-                .build()
+				AppShortcutIconGenerator.generateThemedIcon(
+						context, R.drawable.ic_app_shortcut_shuffle_all
+				)
+		).setIntent(getPlaySongsIntent(AppShortcutLauncherActivity.SHORTCUT_TYPE_SHUFFLE_ALL)).build()
 
 	companion object {
 

app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/TopTracksShortcutType.kt

@@ -19,19 +19,21 @@ import android.content.Context
 import android.content.pm.ShortcutInfo
 import android.os.Build
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.appshortcuts.AppShortcutIconGenerator
+import code.name.monkey.retromusic.appshortcuts.*
-import code.name.monkey.retromusic.appshortcuts.AppShortcutLauncherActivity
 
 @TargetApi(Build.VERSION_CODES.N_MR1)
 class TopTracksShortcutType(context: Context) : BaseShortcutType(context) {
 
 	override val shortcutInfo: ShortcutInfo
-        get() = ShortcutInfo.Builder(context, id)
+		get() = ShortcutInfo.Builder(
-                .setShortLabel(context.getString(R.string.app_shortcut_top_tracks_short))
+				context, id
-                .setLongLabel(context.getString(R.string.app_shortcut_top_tracks_long))
+		).setShortLabel(context.getString(R.string.app_shortcut_top_tracks_short)).setLongLabel(
-                .setIcon(AppShortcutIconGenerator.generateThemedIcon(context, R.drawable.ic_app_shortcut_top_tracks))
+				context.getString(R.string.app_shortcut_top_tracks_long)
-                .setIntent(getPlaySongsIntent(AppShortcutLauncherActivity.SHORTCUT_TYPE_TOP_TRACKS))
+		).setIcon(
-                .build()
+				AppShortcutIconGenerator.generateThemedIcon(
+						context, R.drawable.ic_app_shortcut_top_tracks
+				)
+		).setIntent(getPlaySongsIntent(AppShortcutLauncherActivity.SHORTCUT_TYPE_TOP_TRACKS)).build()
 
 	companion object {
 

app/src/main/java/code/name/monkey/retromusic/appwidgets/base/BaseAppWidget.kt

@@ -15,21 +15,16 @@
 package code.name.monkey.retromusic.appwidgets.base
 
 import android.app.PendingIntent
-import android.appwidget.AppWidgetManager
+import android.appwidget.*
-import android.appwidget.AppWidgetProvider
+import android.content.*
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
 import android.content.res.Resources
 import android.graphics.*
-import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.*
-import android.graphics.drawable.Drawable
 import android.os.Build
 import android.text.TextUtils
 import android.widget.RemoteViews
 import androidx.core.content.ContextCompat
-import code.name.monkey.retromusic.App
+import code.name.monkey.retromusic.*
-import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.service.MusicService
 import code.name.monkey.retromusic.service.MusicService.*
@@ -39,8 +34,9 @@ abstract class BaseAppWidget : AppWidgetProvider() {
 	/**
 	 * {@inheritDoc}
 	 */
-    override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager,
+	override fun onUpdate(
-                          appWidgetIds: IntArray) {
+			context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray
+	) {
 		defaultAppWidget(context, appWidgetIds)
 		val updateIntent = Intent(APP_WIDGET_UPDATE)
 		updateIntent.putExtra(EXTRA_APP_WIDGET_NAME, NAME)
@@ -60,8 +56,9 @@ abstract class BaseAppWidget : AppWidgetProvider() {
 		}
 	}
 
-    protected fun pushUpdate(context: Context, appWidgetIds: IntArray?,
+	protected fun pushUpdate(
-                             views: RemoteViews) {
+			context: Context, appWidgetIds: IntArray?, views: RemoteViews
+	) {
 		val appWidgetManager = AppWidgetManager.getInstance(context)
 		if (appWidgetIds != null) {
 			appWidgetManager.updateAppWidget(appWidgetIds, views)
@@ -75,13 +72,17 @@ abstract class BaseAppWidget : AppWidgetProvider() {
 	 */
 	private fun hasInstances(context: Context): Boolean {
 		val appWidgetManager = AppWidgetManager.getInstance(context)
-        val mAppWidgetIds = appWidgetManager.getAppWidgetIds(ComponentName(context,
+		val mAppWidgetIds = appWidgetManager.getAppWidgetIds(
-                javaClass))
+				ComponentName(
+						context, javaClass
+				)
+		)
 		return mAppWidgetIds.isNotEmpty()
 	}
 
-    protected fun buildPendingIntent(context: Context, action: String,
+	protected fun buildPendingIntent(
-                                     serviceName: ComponentName): PendingIntent {
+			context: Context, action: String, serviceName: ComponentName
+	): PendingIntent {
 		val intent = Intent(action)
 		intent.component = serviceName
 		return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -117,9 +118,15 @@ abstract class BaseAppWidget : AppWidgetProvider() {
 
 		const val NAME: String = "app_widget"
 
-
+		fun createRoundedBitmap(
-        fun createRoundedBitmap(drawable: Drawable?, width: Int, height: Int, tl: Float,
+				drawable: Drawable?,
-                                tr: Float, bl: Float, br: Float): Bitmap? {
+				width: Int,
+				height: Int,
+				tl: Float,
+				tr: Float,
+				bl: Float,
+				br: Float
+		): Bitmap? {
 			if (drawable == null) {
 				return null
 			}
@@ -135,21 +142,30 @@ abstract class BaseAppWidget : AppWidgetProvider() {
 			val paint = Paint()
 			paint.shader = BitmapShader(bitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP)
 			paint.isAntiAlias = true
-            canvas.drawPath(composeRoundedRectPath(RectF(0f, 0f, width.toFloat(), height.toFloat()), tl, tr, bl, br), paint)
+			canvas.drawPath(
+					composeRoundedRectPath(
+							RectF(0f, 0f, width.toFloat(), height.toFloat()), tl, tr, bl, br
+					), paint
+			)
 
 			return rounded
 		}
 
 		fun createBitmap(drawable: Drawable, sizeMultiplier: Float): Bitmap {
-            val bitmap = Bitmap.createBitmap((drawable.intrinsicWidth * sizeMultiplier).toInt(),
+			val bitmap = Bitmap.createBitmap(
-                    (drawable.intrinsicHeight * sizeMultiplier).toInt(), Bitmap.Config.ARGB_8888)
+					(drawable.intrinsicWidth * sizeMultiplier).toInt(),
+					(drawable.intrinsicHeight * sizeMultiplier).toInt(),
+					Bitmap.Config.ARGB_8888
+			)
 			val c = Canvas(bitmap)
 			drawable.setBounds(0, 0, c.width, c.height)
 			drawable.draw(c)
 			return bitmap
 		}
 
-        protected fun composeRoundedRectPath(rect: RectF, tl: Float, tr: Float, bl: Float, br: Float): Path {
+		protected fun composeRoundedRectPath(
+				rect: RectF, tl: Float, tr: Float, bl: Float, br: Float
+		): Path {
 			val path = Path()
 			path.moveTo(rect.left + tl, rect.top)
 			path.lineTo(rect.right - tr, rect.top)

app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt

@@ -4,19 +4,13 @@ import android.animation.ValueAnimator
 import android.graphics.Color
 import android.graphics.drawable.Drawable
 import android.os.Bundle
-import android.view.LayoutInflater
+import android.view.*
-import android.view.View
-import android.view.ViewGroup
 import androidx.appcompat.widget.Toolbar
 import androidx.palette.graphics.Palette
-import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.*
-import code.name.monkey.appthemehelper.util.ColorUtil
-import code.name.monkey.appthemehelper.util.MaterialValueHelper
-import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
+import code.name.monkey.retromusic.glide.*
-import code.name.monkey.retromusic.glide.SongGlideRequest
 import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.Song
@@ -79,8 +73,9 @@ class ColorFragment : AbsPlayerFragment() {
 		}
 	}
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+	override fun onCreateView(
-                              savedInstanceState: Bundle?): View? {
+			inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
+	): View? {
 
 		return inflater.inflate(R.layout.fragment_color_player, container, false)
 	}
@@ -92,7 +87,9 @@ class ColorFragment : AbsPlayerFragment() {
 	}
 
 	private fun setUpSubFragments() {
-        playbackControlsFragment = childFragmentManager.findFragmentById(R.id.playbackControlsFragment) as ColorPlaybackControlsFragment?
+		playbackControlsFragment = childFragmentManager.findFragmentById(
+				R.id.playbackControlsFragment
+		) as ColorPlaybackControlsFragment?
 
 	}
 
@@ -101,7 +98,11 @@ class ColorFragment : AbsPlayerFragment() {
 			inflateMenu(R.menu.menu_player)
 			setNavigationOnClickListener { requireActivity().onBackPressed() }
 			setOnMenuItemClickListener(this@ColorFragment)
-            ToolbarContentTintHelper.colorizeToolbar(this, ATHUtil.resolveColor(context, R.attr.iconColor), activity)
+			ToolbarContentTintHelper.colorizeToolbar(
+					this, ATHUtil.resolveColor(
+					context, R.attr.iconColor
+			), activity
+			)
 		}
 	}
 
@@ -117,15 +118,16 @@ class ColorFragment : AbsPlayerFragment() {
 
 	private fun updateSong() {
 		SongGlideRequest.Builder.from(Glide.with(requireActivity()), MusicPlayerRemote.currentSong)
-                .checkIgnoreMediaStore(requireContext())
+			.checkIgnoreMediaStore(requireContext()).generatePalette(requireContext()).build()
-                .generatePalette(requireContext())
-                .build()
 			.into(object : RetroMusicColoredTarget(playerImage) {
 				override fun onColorReady(color: Int) {
 
 				}
 
-                    override fun onResourceReady(resource: BitmapPaletteWrapper?, glideAnimation: GlideAnimation<in BitmapPaletteWrapper>?) {
+				override fun onResourceReady(
+						resource: BitmapPaletteWrapper?,
+						glideAnimation: GlideAnimation<in BitmapPaletteWrapper>?
+				) {
 					super.onResourceReady(resource, glideAnimation)
 					resource?.let {
 						val background = resource.palette.getColor()
@@ -144,18 +146,21 @@ class ColorFragment : AbsPlayerFragment() {
 				override fun onLoadFailed(e: Exception?, errorDrawable: Drawable?) {
 					super.onLoadFailed(e, errorDrawable)
 					val backgroundColor = defaultFooterColor
-                        val textColor = if (ColorUtil.isColorLight(defaultFooterColor))
+					val textColor = if (ColorUtil.isColorLight(defaultFooterColor)) MaterialValueHelper.getPrimaryTextColor(
-                            MaterialValueHelper.getPrimaryTextColor(context, true)
+							context,
-                        else
+							true
-                            MaterialValueHelper.getPrimaryTextColor(context, false)
+					)
+					else MaterialValueHelper.getPrimaryTextColor(context, false)
 
 					setColors(backgroundColor, textColor)
 				}
 			})
 	}
 
-    private fun setColors(backgroundColor: Int, textColor: Int) {
+	private fun setColors(
-        playbackControlsFragment!!.setDark(textColor, backgroundColor)
+			backgroundColor: Int, textColor: Int
+	) {
+		playbackControlsFragment?.setDark(textColor, backgroundColor)
 		colorGradientBackground?.setBackgroundColor(backgroundColor)
 		ToolbarContentTintHelper.colorizeToolbar(playerToolbar, textColor, activity)
 		lastColor = textColor
@@ -165,7 +170,6 @@ class ColorFragment : AbsPlayerFragment() {
 	}
 
 	companion object {
-
 		fun newInstance(): ColorFragment {
 			val args = Bundle()
 			val fragment = ColorFragment()
@@ -175,7 +179,6 @@ class ColorFragment : AbsPlayerFragment() {
 	}
 }
 
-
 fun Palette.getColor(): Int {
 	return when {
 		darkMutedSwatch != null -> darkMutedSwatch!!.rgb

app/src/main/java/code/name/monkey/retromusic/helper/LastChanceHandler.kt

@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-
-package code.name.monkey.retromusic.helper
-
-import android.content.Intent
-import androidx.core.app.ActivityCompat
-import code.name.monkey.retromusic.App
-import code.name.monkey.retromusic.activities.bugreport.ErrorHandlerActivity
-
-class TopExceptionHandler() : Thread.UncaughtExceptionHandler {
-    private val defaultUEH: Thread.UncaughtExceptionHandler = Thread.getDefaultUncaughtExceptionHandler()
-
-    override fun uncaughtException(t: Thread, e: Throwable) {
-        var arr = e.stackTrace
-        var report = e.toString() + "\n\n"
-
-        report += "--------- Stack trace ---------\n\n"
-        for (i in arr.indices) {
-            report += "    " + arr[i].toString() + "\n"
-        }
-        report += "-------------------------------\n\n"
-
-        // If the exception was thrown in a background thread inside
-        // AsyncTask, then the actual exception can be found with getCause
-
-        report += "--------- Cause ---------\n\n"
-        val cause = e.cause
-        if (cause != null) {
-            report += cause.toString() + "\n\n"
-            arr = cause.stackTrace
-            for (i in arr.indices) {
-                report += "    " + arr[i].toString() + "\n"
-            }
-        }
-        report += "-------------------------------\n\n"
-        ActivityCompat.startActivity(App.getContext(), Intent(App.getContext(), ErrorHandlerActivity::class.java)
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                .putExtra("error", report), null)
-        defaultUEH.uncaughtException(t, e)
-    }
-}

app/src/main/java/code/name/monkey/retromusic/util/LyricUtil.java

@@ -14,7 +14,9 @@
 
 package code.name.monkey.retromusic.util;
 
+import android.text.TextUtils;
 import android.util.Base64;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 
@@ -78,7 +80,7 @@ public class LyricUtil {
 
     @NonNull
     public static File getLocalLyricFile(@NonNull String title, @NonNull String artist) {
-        try{
+        try {
             File file = new File(getLrcPath(title, artist));
             File file2 = new File(getLrcPath2(title, artist));
             if (file.exists()) {
@@ -87,27 +89,30 @@ public class LyricUtil {
             } else if (file2.exists()) {
 
                 return file2;
-        }
+            } else {
-        else {
 
                 return new File("lyric file not exist");
-        }} catch (Exception dfs){
+            }
+        } catch (Exception dfs) {
             dfs.printStackTrace();
             return new File("lyric file not exist");
 
         }
     }
+
     public static String getLrcPath2(String title, String artist) {
+        Log.i("HEM", "getLrcPath2: " + title);
+        if (!TextUtils.isEmpty(title)) {
             String x2;
-        if(title.endsWith(".flac")||title.endsWith(".mogg")||title.endsWith(".alac")||title.endsWith(".aiff")||title.endsWith(".webv")){
+            if (title.endsWith(".flac") || title.endsWith(".mogg") || title.endsWith(".alac") || title.endsWith(".aiff") || title.endsWith(".webv")) {
-            x2= title.substring(0, title.length() -5 ) + ".lrc";
+                x2 = title.substring(0, title.length() - 5) + ".lrc";
+            } else {
+                x2 = title.substring(0, title.length() - 4) + ".lrc";
             }
-        else{
-                x2= title.substring(0, title.length() -4 ) + ".lrc";}
-
-
             return x2;
         }
+        return "";
+    }
 
     public static String getLrcPath(String title, String artist) {
         return lrcRootPath + title + " - " + artist + ".lrc";
@@ -135,7 +140,7 @@ public class LyricUtil {
         File file;
         File file2 = new File(getLrcPath(title, artist));
         File file3 = new File(getLrcPath2(title, artist));
-        if(file2.exists()){
+        if (file2.exists()) {
             file = file2;
         } else {
             file = file3;

gradle.properties

@@ -7,3 +7,5 @@ android.enabelR8=true
 android.enableR8.fullMode=false
 android.enableJetifier=true
 android.debug.obsoleteApi=true
+android.enableBuildCache=true
+android.jetifier.blacklist = butterknife.*\\.jar