Code refactor and Genre category added to home

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

@@ -57,7 +57,8 @@ class LibraryViewModel(
             repository.recentArtists(),
             repository.recentAlbums(),
             repository.suggestions(),
-            repository.favoritePlaylist()
+            repository.favoritePlaylist(),
+            repository.homeGenres()
         )
         result.forEach {
             if (it != null && it.arrayList.isNotEmpty()) {

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

@@ -6,18 +6,22 @@ import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.GridLayoutManager
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.album.AlbumAdapter
+import code.name.monkey.retromusic.fragments.LibraryViewModel
 import code.name.monkey.retromusic.fragments.ReloadType
 import code.name.monkey.retromusic.fragments.base.AbsLibraryPagerRecyclerViewCustomGridSizeFragment
 import code.name.monkey.retromusic.interfaces.MainActivityFragmentCallbacks
 import code.name.monkey.retromusic.util.PreferenceUtil
+import org.koin.android.viewmodel.ext.android.sharedViewModel
 
 class AlbumsFragment :
     AbsLibraryPagerRecyclerViewCustomGridSizeFragment<AlbumAdapter, GridLayoutManager>(),
     MainActivityFragmentCallbacks {
 
+    private val libraryViewModel: LibraryViewModel by sharedViewModel()
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        mainActivity.libraryViewModel.allAlbums
+        libraryViewModel.allAlbums
             .observe(viewLifecycleOwner, Observer { albums ->
                 if (albums.isNotEmpty())
                     adapter?.swapDataSet(albums)
@@ -73,7 +77,7 @@ class AlbumsFragment :
     }
 
     override fun setSortOrder(sortOrder: String) {
-        mainActivity.libraryViewModel.forceReload(ReloadType.Albums)
+        libraryViewModel.forceReload(ReloadType.Albums)
     }
 
     override fun loadLayoutRes(): Int {

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

@@ -6,17 +6,22 @@ import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.GridLayoutManager
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.artist.ArtistAdapter
+import code.name.monkey.retromusic.fragments.LibraryViewModel
 import code.name.monkey.retromusic.fragments.ReloadType
 import code.name.monkey.retromusic.fragments.base.AbsLibraryPagerRecyclerViewCustomGridSizeFragment
 import code.name.monkey.retromusic.interfaces.MainActivityFragmentCallbacks
 import code.name.monkey.retromusic.util.PreferenceUtil
+import org.koin.android.viewmodel.ext.android.sharedViewModel
 
 class ArtistsFragment :
     AbsLibraryPagerRecyclerViewCustomGridSizeFragment<ArtistAdapter, GridLayoutManager>(),
     MainActivityFragmentCallbacks {
+
+    private val libraryViewModel: LibraryViewModel by sharedViewModel()
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        mainActivity.libraryViewModel.allArtists
+        libraryViewModel.allArtists
             .observe(viewLifecycleOwner, Observer { artists ->
                 if (artists.isNotEmpty()) {
                     adapter?.swapDataSet(artists)
@@ -34,7 +39,7 @@ class ArtistsFragment :
         get() = R.string.no_artists
 
     override fun setSortOrder(sortOrder: String) {
-        mainActivity.libraryViewModel.forceReload(ReloadType.Artists)
+         libraryViewModel.forceReload(ReloadType.Artists)
     }
 
     override fun createLayoutManager(): GridLayoutManager {

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

@@ -20,15 +20,19 @@ import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.GenreAdapter
+import code.name.monkey.retromusic.fragments.LibraryViewModel
 import code.name.monkey.retromusic.fragments.base.AbsLibraryPagerRecyclerViewFragment
 import code.name.monkey.retromusic.interfaces.MainActivityFragmentCallbacks
+import org.koin.android.viewmodel.ext.android.sharedViewModel
 
 class GenresFragment : AbsLibraryPagerRecyclerViewFragment<GenreAdapter, LinearLayoutManager>(),
     MainActivityFragmentCallbacks {
 
+    private val libraryViewModel: LibraryViewModel by sharedViewModel()
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        mainActivity.libraryViewModel.allGenres
+        libraryViewModel.allGenres
             .observe(viewLifecycleOwner, Observer { genres ->
                 if (genres.isNotEmpty()) {
                     adapter?.swapDataSet(genres)

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

@@ -24,6 +24,7 @@ import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.HomeAdapter
+import code.name.monkey.retromusic.fragments.LibraryViewModel
 import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
 import code.name.monkey.retromusic.glide.ProfileBannerGlideRequest
 import code.name.monkey.retromusic.glide.UserProfileGlideRequest
@@ -39,9 +40,12 @@ import com.bumptech.glide.Glide
 import kotlinx.android.synthetic.main.abs_playlists.*
 import kotlinx.android.synthetic.main.fragment_banner_home.*
 import kotlinx.android.synthetic.main.home_content.*
+import org.koin.android.viewmodel.ext.android.sharedViewModel
 
 class BannerHomeFragment : AbsMainActivityFragment(), MainActivityFragmentCallbacks {
+
     private lateinit var homeAdapter: HomeAdapter
+    private val libraryViewModel: LibraryViewModel by sharedViewModel()
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -112,7 +116,7 @@ class BannerHomeFragment : AbsMainActivityFragment(), MainActivityFragmentCallba
             adapter = homeAdapter
         }
 
-        mainActivity.libraryViewModel.homeSections
+        libraryViewModel.homeSections
             .observe(viewLifecycleOwner, Observer { sections ->
                 homeAdapter.swapData(sections)
             })

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

@@ -8,24 +8,26 @@ import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.GridLayoutManager
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.playlist.PlaylistAdapter
+import code.name.monkey.retromusic.fragments.LibraryViewModel
 import code.name.monkey.retromusic.fragments.base.AbsLibraryPagerRecyclerViewFragment
 import code.name.monkey.retromusic.interfaces.MainActivityFragmentCallbacks
+import org.koin.android.viewmodel.ext.android.sharedViewModel
 
 class PlaylistsFragment :
     AbsLibraryPagerRecyclerViewFragment<PlaylistAdapter, GridLayoutManager>(),
     MainActivityFragmentCallbacks {
 
+    private val libraryViewModel: LibraryViewModel by sharedViewModel()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        mainActivity.libraryViewModel.allPlaylisits
-            .observe(viewLifecycleOwner, Observer { playlists ->
-                if (playlists.isNotEmpty()) {
-                    adapter?.swapDataSet(playlists)
-                } else {
-                    adapter?.swapDataSet(listOf())
-                }
-            })
+        libraryViewModel.allPlaylisits.observe(viewLifecycleOwner, Observer { playlists ->
+            if (playlists.isNotEmpty()) {
+                adapter?.swapDataSet(playlists)
+            } else {
+                adapter?.swapDataSet(listOf())
+            }
+        })
     }
 
     override fun handleBackPress(): Boolean {

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

@@ -8,24 +8,28 @@ import androidx.recyclerview.widget.GridLayoutManager
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.song.ShuffleButtonSongAdapter
 import code.name.monkey.retromusic.adapter.song.SongAdapter
+import code.name.monkey.retromusic.fragments.LibraryViewModel
 import code.name.monkey.retromusic.fragments.ReloadType
 import code.name.monkey.retromusic.fragments.base.AbsLibraryPagerRecyclerViewCustomGridSizeFragment
 import code.name.monkey.retromusic.interfaces.MainActivityFragmentCallbacks
 import code.name.monkey.retromusic.util.PreferenceUtil
+import org.koin.android.viewmodel.ext.android.sharedViewModel
 
 class SongsFragment :
     AbsLibraryPagerRecyclerViewCustomGridSizeFragment<SongAdapter, GridLayoutManager>(),
     MainActivityFragmentCallbacks {
+
+    private val libraryViewModel: LibraryViewModel by sharedViewModel()
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        mainActivity.libraryViewModel.allSongs
-            .observe(viewLifecycleOwner, Observer {
-                if (it.isNotEmpty()) {
-                    adapter?.swapDataSet(it)
-                } else {
-                    adapter?.swapDataSet(listOf())
-                }
-            })
+        libraryViewModel.allSongs.observe(viewLifecycleOwner, Observer {
+            if (it.isNotEmpty()) {
+                adapter?.swapDataSet(it)
+            } else {
+                adapter?.swapDataSet(listOf())
+            }
+        })
     }
 
     override val emptyMessage: Int
@@ -93,7 +97,7 @@ class SongsFragment :
     }
 
     override fun setSortOrder(sortOrder: String) {
-        mainActivity.libraryViewModel.forceReload(ReloadType.Songs)
+        libraryViewModel.forceReload(ReloadType.Songs)
     }
 
     companion object {