Code refactor

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

@@ -136,7 +136,7 @@ open class AlbumAdapter(
     private fun getSongList(albums: List<Album>): List<Song> {
         val songs = ArrayList<Song>()
         for (album in albums) {
-            songs.addAll(album.songs!!)
+            songs.addAll(album.songs)
         }
         return songs
     }
@@ -170,8 +170,7 @@ open class AlbumAdapter(
             if (isInQuickSelectMode) {
                 toggleChecked(layoutPosition)
             } else {
-                println(dataSet[layoutPosition].id)
+                albumClickListener?.onAlbumClick(dataSet[layoutPosition].id, itemView)
-                image?.let { albumClickListener?.onAlbumClick(dataSet[layoutPosition].id, it) }
             }
         }
 

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

@@ -113,6 +113,7 @@ public class MediaEntryViewHolder extends AbstractDraggableSwipeableItemViewHold
         itemView.setOnLongClickListener(this);
     }
 
+    @Nullable
     @Override
     public View getSwipeableContainerView() {
         return null;
@@ -129,11 +130,12 @@ public class MediaEntryViewHolder extends AbstractDraggableSwipeableItemViewHold
     }
 
     public void setImageTransitionName(@NonNull String transitionName) {
-        if (imageContainerCard != null) {
+        itemView.setTransitionName(transitionName);
+        /* if (imageContainerCard != null) {
             imageContainerCard.setTransitionName(transitionName);
         }
         if (image != null) {
             image.setTransitionName(transitionName);
-        }
+        }*/
     }
 }

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

@@ -6,6 +6,7 @@ import androidx.fragment.app.FragmentActivity
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.R.menu
 import code.name.monkey.retromusic.db.PlaylistEntity
+import code.name.monkey.retromusic.db.toSongEntity
 import code.name.monkey.retromusic.db.toSongs
 import code.name.monkey.retromusic.dialogs.RemoveSongFromPlaylistDialog
 import code.name.monkey.retromusic.interfaces.CabHolder

app/src/main/java/code/name/monkey/retromusic/db/SongExtension.kt

@@ -14,6 +14,44 @@ fun List<Song>.toSongs(playlistId: Long): List<SongEntity> {
     }
 }
 
+fun Song.toHistoryEntity(timePlayed: Long): HistoryEntity {
+    return HistoryEntity(
+        id = id,
+        title = title,
+        trackNumber = trackNumber,
+        year = year,
+        duration = duration,
+        data = data,
+        dateModified = dateModified,
+        albumId = albumId,
+        albumName = albumName,
+        artistId = artistId,
+        artistName = artistName,
+        composer = composer,
+        albumArtist = albumArtist,
+        timePlayed = timePlayed
+    )
+}
+
+fun Song.toSongEntity(playListId: Long): SongEntity {
+    return SongEntity(
+        playlistCreatorId = playListId,
+        id = id,
+        title = title,
+        trackNumber = trackNumber,
+        year = year,
+        duration = duration,
+        data = data,
+        dateModified = dateModified,
+        albumId = albumId,
+        albumName = albumName,
+        artistId = artistId,
+        artistName = artistName,
+        composer = composer,
+        albumArtist = albumArtist
+    )
+}
+
 fun SongEntity.toSong(): Song {
     return Song(
         id = id,

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

@@ -11,6 +11,7 @@ import androidx.lifecycle.lifecycleScope
 import code.name.monkey.retromusic.EXTRA_SONG
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.db.PlaylistEntity
+import code.name.monkey.retromusic.db.toSongEntity
 import code.name.monkey.retromusic.extensions.colorButtons
 import code.name.monkey.retromusic.extensions.extra
 import code.name.monkey.retromusic.extensions.materialDialog

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

@@ -7,6 +7,7 @@ import androidx.lifecycle.viewModelScope
 import code.name.monkey.retromusic.db.PlaylistEntity
 import code.name.monkey.retromusic.db.PlaylistWithSongs
 import code.name.monkey.retromusic.db.SongEntity
+import code.name.monkey.retromusic.db.toSongEntity
 import code.name.monkey.retromusic.fragments.ReloadType.*
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.interfaces.MusicServiceEventListener

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

@@ -46,6 +46,7 @@ import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.RetroUtil
 import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
 import com.bumptech.glide.Glide
+import com.google.android.material.transition.MaterialContainerTransform
 import kotlinx.android.synthetic.main.fragment_album_content.*
 import kotlinx.android.synthetic.main.fragment_album_details.*
 import kotlinx.coroutines.Dispatchers
@@ -70,8 +71,14 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
     private val savedSortOrder: String
         get() = PreferenceUtil.albumDetailSongSortOrder
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
+    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+        super.onCreate(savedInstanceState)
+        sharedElementEnterTransition = MaterialContainerTransform().apply {
+            duration = 1000L
+        }
+    }
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         setHasOptionsMenu(true)
         mainActivity.hideBottomBarVisibility(false)
         mainActivity.addMusicServiceEventListener(detailsViewModel)
@@ -91,11 +98,11 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
                     bundleOf(EXTRA_ARTIST_ID to album.artistId)
                 )
         }
-        playAction.setOnClickListener { MusicPlayerRemote.openQueue(album.songs!!, 0, true) }
+        playAction.setOnClickListener { MusicPlayerRemote.openQueue(album.songs, 0, true) }
 
         shuffleAction.setOnClickListener {
             MusicPlayerRemote.openAndShuffleQueue(
-                album.songs!!,
+                album.songs,
                 true
             )
         }
@@ -134,7 +141,7 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
     }
 
     private fun showAlbum(album: Album) {
-        if (album.songs!!.isEmpty()) {
+        if (album.songs.isEmpty()) {
             return
         }
         this.album = album

app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt

@@ -23,6 +23,7 @@ import code.name.monkey.retromusic.activities.tageditor.AbsTagEditorActivity
 import code.name.monkey.retromusic.activities.tageditor.SongTagEditorActivity
 import code.name.monkey.retromusic.db.PlaylistEntity
 import code.name.monkey.retromusic.db.SongEntity
+import code.name.monkey.retromusic.db.toSongEntity
 import code.name.monkey.retromusic.dialogs.*
 import code.name.monkey.retromusic.extensions.hide
 import code.name.monkey.retromusic.extensions.whichFragment

app/src/main/java/code/name/monkey/retromusic/fragments/playlists/ImportPlaylistFragment.kt

@@ -1,72 +0,0 @@
-package code.name.monkey.retromusic.fragments.playlists
-
-import android.os.Bundle
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.View
-import android.widget.Toast
-import androidx.lifecycle.Observer
-import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.LinearLayoutManager
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.playlist.LegacyPlaylistAdapter
-import code.name.monkey.retromusic.db.PlaylistEntity
-import code.name.monkey.retromusic.fragments.ReloadType.Playlists
-import code.name.monkey.retromusic.fragments.base.AbsRecyclerViewFragment
-import code.name.monkey.retromusic.model.Playlist
-import kotlinx.coroutines.Dispatchers.IO
-import kotlinx.coroutines.launch
-
-class ImportPlaylistFragment :
-    AbsRecyclerViewFragment<LegacyPlaylistAdapter, LinearLayoutManager>(),
-    LegacyPlaylistAdapter.PlaylistClickListener {
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        libraryViewModel.getLegacyPlaylist().observe(viewLifecycleOwner, Observer {
-            if (it.isNotEmpty())
-                adapter?.swapData(it)
-            else
-                adapter?.swapData(listOf())
-        })
-    }
-
-    override fun createLayoutManager(): LinearLayoutManager {
-        return LinearLayoutManager(requireContext())
-    }
-
-    override fun createAdapter(): LegacyPlaylistAdapter {
-        return LegacyPlaylistAdapter(
-            requireActivity(),
-            ArrayList(),
-            R.layout.item_list_no_image,
-            this
-        )
-    }
-
-    override fun onPlaylistClick(playlist: Playlist) {
-        Toast.makeText(requireContext(), "Importing ${playlist.name}", Toast.LENGTH_LONG).show()
-        lifecycleScope.launch(IO) {
-            if (playlist.name.isNotEmpty()) {
-                if (libraryViewModel.checkPlaylistExists(playlist.name).isEmpty()) {
-                    val playlistId: Long =
-                        libraryViewModel.createPlaylist(PlaylistEntity(playlistName = playlist.name))
-                    libraryViewModel.insertSongs(playlist.getSongs().map {
-                        it.toSongEntity(playlistId)
-                    })
-                    libraryViewModel.forceReload(Playlists)
-                } else {
-                    Toast.makeText(requireContext(), "Playlist exists", Toast.LENGTH_SHORT)
-                        .show()
-                }
-            }
-        }
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        menu.removeItem(R.id.action_grid_size)
-        menu.removeItem(R.id.action_layout_type)
-        menu.removeItem(R.id.action_sort_order)
-        super.onCreateOptionsMenu(menu, inflater)
-    }
-}

app/src/main/java/code/name/monkey/retromusic/fragments/songs/SongsFragment.kt

@@ -16,7 +16,6 @@ import code.name.monkey.retromusic.util.RetroUtil
 
 class SongsFragment : AbsRecyclerViewCustomGridSizeFragment<SongAdapter, GridLayoutManager>() {
 
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         libraryViewModel.getSongs().observe(viewLifecycleOwner, Observer {

app/src/main/java/code/name/monkey/retromusic/model/Song.kt

@@ -35,43 +35,7 @@ open class Song(
     open val composer: String?,
     open val albumArtist: String?
 ) : Parcelable {
-    fun toHistoryEntity(timePlayed: Long): HistoryEntity {
-        return HistoryEntity(
-            id = id,
-            title = title,
-            trackNumber = trackNumber,
-            year = year,
-            duration = duration,
-            data = data,
-            dateModified = dateModified,
-            albumId = albumId,
-            albumName = albumName,
-            artistId = artistId,
-            artistName = artistName,
-            composer = composer,
-            albumArtist = albumArtist,
-            timePlayed = timePlayed
-        )
-    }
 
-    fun toSongEntity(playListId: Long): SongEntity {
-        return SongEntity(
-            playlistCreatorId = playListId,
-            id = id,
-            title = title,
-            trackNumber = trackNumber,
-            year = year,
-            duration = duration,
-            data = data,
-            dateModified = dateModified,
-            albumId = albumId,
-            albumName = albumName,
-            artistId = artistId,
-            artistName = artistName,
-            composer = composer,
-            albumArtist = albumArtist
-        )
-    }
 
     // need to override manually because is open and cannot be a data class
     override fun equals(other: Any?): Boolean {

app/src/main/res/layout/fragment_album_details.xml

@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:transitionName="@string/transition_album_art">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBarLayout"
@@ -48,7 +49,6 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginTop="8dp"
                 android:layout_marginEnd="16dp"
-                android:transitionName="@string/transition_album_art"
                 app:cardCornerRadius="24dp"
                 app:layout_constraintDimensionRatio="1:1"
                 app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/navigation/library_graph.xml

@@ -41,9 +41,5 @@
         android:label=""
         tools:layout="@layout/fragment_banner_home" />
 
-    <fragment
+
-        android:id="@+id/action_import_playlist"
-        android:name="code.name.monkey.retromusic.fragments.playlists.ImportPlaylistFragment"
-        android:label="ImportPlaylist"
-        tools:layout="@layout/fragment_main_activity_recycler_view" />
 </navigation>