From 1b08b775ac1732a7a31dc8fcae9be963a0fd02cc Mon Sep 17 00:00:00 2001 From: Hemanth S Date: Sat, 5 Dec 2020 19:02:49 +0530 Subject: [PATCH] code clean --- .../monkey/retromusic/adapter/HomeAdapter.kt | 10 ++++++---- .../monkey/retromusic/adapter/SongFileAdapter.kt | 16 ++++++++-------- .../retromusic/adapter/artist/ArtistAdapter.kt | 2 +- .../adapter/song/PlaylistSongAdapter.kt | 6 +++--- .../retromusic/dialogs/DeleteSongsDialog.kt | 11 ++++++----- .../retromusic/dialogs/SleepTimerDialog.kt | 1 - .../retromusic/dialogs/SongDetailDialog.kt | 11 ++++++----- .../monkey/retromusic/dialogs/SongShareDialog.kt | 11 ++++++----- .../monkey/retromusic/extensions/DrawableExt.kt | 13 +------------ .../retromusic/fragments/VolumeFragment.kt | 4 ---- 10 files changed, 37 insertions(+), 48 deletions(-) diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt index 6e5ce64d..f57c45ab 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt @@ -239,15 +239,17 @@ class HomeAdapter( val clickableArea: ViewGroup = itemView.findViewById(R.id.clickable_area) } - fun artistsAdapter(artists: List) = + private fun artistsAdapter(artists: List) = ArtistAdapter(activity, artists, PreferenceUtil.homeArtistGridStyle, null, this) - fun albumAdapter(albums: List) = + private fun albumAdapter(albums: List) = AlbumAdapter(activity, albums, PreferenceUtil.homeAlbumGridStyle, null, this) - fun gridLayoutManager() = GridLayoutManager(activity, 1, GridLayoutManager.HORIZONTAL, false) + private fun gridLayoutManager() = + GridLayoutManager(activity, 1, GridLayoutManager.HORIZONTAL, false) - fun linearLayoutManager() = LinearLayoutManager(activity, LinearLayoutManager.HORIZONTAL, false) + private fun linearLayoutManager() = + LinearLayoutManager(activity, LinearLayoutManager.HORIZONTAL, false) override fun onArtist(artistId: Long, view: View) { activity.findNavController(R.id.fragment_container).navigate( diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt index eabde5bf..5b55e02d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt @@ -42,10 +42,10 @@ class SongFileAdapter( private val activity: AppCompatActivity, private var dataSet: List, private val itemLayoutRes: Int, - private val ICallbacks: ICallbacks?, - ICabHolder: ICabHolder? + private val iCallbacks: ICallbacks?, + iCabHolder: ICabHolder? ) : AbsMultiSelectAdapter( - activity, ICabHolder, R.menu.menu_media_selection + activity, iCabHolder, R.menu.menu_media_selection ), PopupTextProvider { init { @@ -135,8 +135,8 @@ class SongFileAdapter( } override fun onMultipleItemAction(menuItem: MenuItem, selection: List) { - if (ICallbacks == null) return - ICallbacks.onMultipleItemAction(menuItem, selection as ArrayList) + if (iCallbacks == null) return + iCallbacks.onMultipleItemAction(menuItem, selection as ArrayList) } override fun getPopupText(position: Int): String { @@ -150,11 +150,11 @@ class SongFileAdapter( inner class ViewHolder(itemView: View) : MediaEntryViewHolder(itemView) { init { - if (menu != null && ICallbacks != null) { + if (menu != null && iCallbacks != null) { menu?.setOnClickListener { v -> val position = layoutPosition if (isPositionInRange(position)) { - ICallbacks.onFileMenuClicked(dataSet[position], v) + iCallbacks.onFileMenuClicked(dataSet[position], v) } } } @@ -169,7 +169,7 @@ class SongFileAdapter( if (isInQuickSelectMode) { toggleChecked(position) } else { - ICallbacks?.onFileSelected(dataSet[position]) + iCallbacks?.onFileSelected(dataSet[position]) } } } diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt index a88d6885..395d922d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt @@ -85,7 +85,7 @@ class ArtistAdapter( loadArtistImage(artist, holder) } - fun setColors(processor: MediaNotificationProcessor, holder: ViewHolder) { + private fun setColors(processor: MediaNotificationProcessor, holder: ViewHolder) { holder.mask?.backgroundTintList = ColorStateList.valueOf(processor.primaryTextColor) if (holder.paletteColorContainer != null) { holder.paletteColorContainer?.setBackgroundColor(processor.backgroundColor) diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlaylistSongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlaylistSongAdapter.kt index 612abcd5..8f077d8a 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlaylistSongAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlaylistSongAdapter.kt @@ -24,13 +24,13 @@ import code.name.monkey.retromusic.dialogs.RemoveSongFromPlaylistDialog import code.name.monkey.retromusic.interfaces.ICabHolder import code.name.monkey.retromusic.model.Song -open class PlaylistSongAdapter( +class PlaylistSongAdapter( private val playlist: PlaylistEntity, activity: FragmentActivity, dataSet: MutableList, itemLayoutRes: Int, - ICabHolder: ICabHolder? -) : SongAdapter(activity, dataSet, itemLayoutRes, ICabHolder) { + iCabHolder: ICabHolder? +) : SongAdapter(activity, dataSet, itemLayoutRes, iCabHolder) { init { this.setMultiSelectMenuRes(R.menu.menu_cannot_delete_single_songs_playlist_songs_selection) diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/DeleteSongsDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/DeleteSongsDialog.kt index 2d7a9fc1..ca562dca 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/DeleteSongsDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/DeleteSongsDialog.kt @@ -16,6 +16,7 @@ package code.name.monkey.retromusic.dialogs import android.app.Dialog import android.os.Bundle +import androidx.core.os.bundleOf import androidx.core.text.HtmlCompat import androidx.fragment.app.DialogFragment import code.name.monkey.retromusic.EXTRA_SONG @@ -40,11 +41,11 @@ class DeleteSongsDialog : DialogFragment() { } fun create(songs: List): DeleteSongsDialog { - val dialog = DeleteSongsDialog() - val args = Bundle() - args.putParcelableArrayList(EXTRA_SONG, ArrayList(songs)) - dialog.arguments = args - return dialog + return DeleteSongsDialog().apply { + arguments = bundleOf( + EXTRA_SONG to ArrayList(songs) + ) + } } } diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.kt index 3c3fd6e2..7e671ebd 100755 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.kt @@ -164,7 +164,6 @@ class SleepTimerDialog : DialogFragment() { ) { override fun onTick(millisUntilFinished: Long) { - println("onTick: $millisUntilFinished") seekBar.progress = millisUntilFinished.toInt() } diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt index 72e548a8..0e7c0aba 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt @@ -23,6 +23,7 @@ import android.util.Log import android.view.LayoutInflater import android.widget.TextView import androidx.annotation.NonNull +import androidx.core.os.bundleOf import androidx.core.text.HtmlCompat import androidx.fragment.app.DialogFragment import code.name.monkey.retromusic.EXTRA_SONG @@ -155,11 +156,11 @@ class SongDetailDialog : DialogFragment() { val TAG: String = SongDetailDialog::class.java.simpleName fun create(song: Song): SongDetailDialog { - val dialog = SongDetailDialog() - val args = Bundle() - args.putParcelable(EXTRA_SONG, song) - dialog.arguments = args - return dialog + return SongDetailDialog().apply { + arguments = bundleOf( + EXTRA_SONG to song + ) + } } private fun makeTextWithTitle(context: Context, titleResId: Int, text: String?): Spanned { diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.kt index 1a5fbca6..5c7af673 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.kt @@ -17,6 +17,7 @@ package code.name.monkey.retromusic.dialogs import android.app.Dialog import android.content.Intent import android.os.Bundle +import androidx.core.os.bundleOf import androidx.fragment.app.DialogFragment import code.name.monkey.retromusic.EXTRA_SONG import code.name.monkey.retromusic.R @@ -93,11 +94,11 @@ class SongShareDialog : DialogFragment() { companion object { fun create(song: Song): SongShareDialog { - val dialog = SongShareDialog() - val args = Bundle() - args.putParcelable(EXTRA_SONG, song) - dialog.arguments = args - return dialog + return SongShareDialog().apply { + arguments = bundleOf( + EXTRA_SONG to song + ) + } } } } diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/DrawableExt.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/DrawableExt.kt index 3281c57b..03e0ad57 100644 --- a/app/src/main/java/code/name/monkey/retromusic/extensions/DrawableExt.kt +++ b/app/src/main/java/code/name/monkey/retromusic/extensions/DrawableExt.kt @@ -48,15 +48,4 @@ fun Drawable.getBitmapDrawable(): Bitmap { val canvas = Canvas(bmp) draw(canvas) return bmp -} - -fun getAdaptiveIconDrawable(context: Context): Drawable { - return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { - AdaptiveIconDrawable( - ContextCompat.getDrawable(context, R.drawable.ic_launcher_background), - ContextCompat.getDrawable(context, R.drawable.ic_launcher_background) - ) - } else { - ContextCompat.getDrawable(context, R.drawable.color_circle_gradient)!! - } -} +} \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt index ed2f88cc..f08c8552 100755 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt @@ -122,10 +122,6 @@ class VolumeFragment : Fragment(), SeekBar.OnSeekBarChangeListener, OnAudioVolum volumeSeekBar.applyColor(color) } - fun removeThumb() { - volumeSeekBar.thumb = null - } - private fun setPauseWhenZeroVolume(pauseWhenZeroVolume: Boolean) { if (PreferenceUtil.isPauseOnZeroVolume) if (MusicPlayerRemote.isPlaying && pauseWhenZeroVolume)