Rolled back to old style image loading and mosaic

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

@@ -13,6 +13,26 @@ import code.name.monkey.retromusic.util.PreferenceUtil
 import javax.inject.Inject
 
 open class AlbumsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<AlbumAdapter, GridLayoutManager>(), AlbumsView {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        App.musicComponent.inject(this)
+        albumsPresenter.attachView(this)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        if (adapter!!.dataSet.isEmpty()) {
+            albumsPresenter.loadAlbums()
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        albumsPresenter.detachView()
+    }
+
+
     override fun albums(albums: java.util.ArrayList<Album>) {
         adapter?.swapDataSet(albums)
     }
@@ -86,20 +106,6 @@ open class AlbumsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<Al
         PreferenceUtil.getInstance(requireContext()).setAlbumColoredFooters(usePalette)
     }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        App.musicComponent?.inject(this)
-        albumsPresenter.attachView(this)
-    }
-
-    override fun onResume() {
-        super.onResume()
-        if (adapter!!.dataSet.isEmpty()) {
-            albumsPresenter.loadAlbums()
-        }
-    }
-
     override fun onMediaStoreChanged() {
         albumsPresenter.loadAlbums()
     }
@@ -108,19 +114,14 @@ open class AlbumsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<Al
         albumsPresenter.loadAlbums()
     }
 
-    override fun onDestroyView() {
-        super.onDestroyView()
-        albumsPresenter.detachView()
-    }
-
 
     override fun showEmptyView() {
         adapter?.swapDataSet(ArrayList())
     }
 
     companion object {
-
-        val TAG: String = AlbumsFragment::class.java.simpleName
+        @JvmField
+        var TAG: String = AlbumsFragment::class.java.simpleName
 
         fun newInstance(): AlbumsFragment {
             val args = Bundle()

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

@@ -25,7 +25,7 @@ class ArtistsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<Artist
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        App.musicComponent?.inject(this)
+        App.musicComponent.inject(this)
         artistsPresenter.attachView(this)
     }
 
@@ -36,6 +36,11 @@ class ArtistsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<Artist
         }
     }
 
+    override fun onDestroyView() {
+        super.onDestroyView()
+        artistsPresenter.detachView()
+    }
+
     override fun onMediaStoreChanged() {
         artistsPresenter.loadArtists()
     }
@@ -101,17 +106,13 @@ class ArtistsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<Artist
         PreferenceUtil.getInstance(requireContext()).artistSortOrder = sortOrder
     }
 
-    override fun onDestroyView() {
-        super.onDestroyView()
-        artistsPresenter.detachView()
-    }
 
     override fun showEmptyView() {
         adapter?.swapDataSet(ArrayList())
     }
 
     companion object {
-
+        @JvmField
         val TAG = ArtistsFragment::class.java.simpleName
 
         fun newInstance(): ArtistsFragment {

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

@@ -54,7 +54,7 @@ class GenresFragment : AbsLibraryPagerRecyclerViewFragment<GenreAdapter, LinearL
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        App.musicComponent?.inject(this)
+        App.musicComponent.inject(this)
         genresPresenter.attachView(this)
     }
 
@@ -75,6 +75,8 @@ class GenresFragment : AbsLibraryPagerRecyclerViewFragment<GenreAdapter, LinearL
     }
 
     companion object {
+        @JvmField
+        val TAG = GenresFragment::class.java.simpleName
 
         fun newInstance(): GenresFragment {
             return GenresFragment()

app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/LibraryFragment.java

@@ -183,9 +183,8 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
     private void selectedFragment(Fragment fragment) {
         fragmentManager = getChildFragmentManager();
         FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
-
         fragmentTransaction
-                .replace(R.id.fragmentContainer, fragment, TAG)
+                .replace(R.id.fragmentContainer, fragment, LibraryFragment.TAG)
                 .commit();
     }
 

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

@@ -71,6 +71,8 @@ class PlaylistsFragment : AbsLibraryPagerRecyclerViewFragment<PlaylistAdapter, L
     }
 
     companion object {
+        @JvmField
+        val TAG = PlaylistsFragment::class.java.simpleName
 
         fun newInstance(): PlaylistsFragment {
             val args = Bundle()

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

@@ -25,8 +25,7 @@ class SongsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<SongAdap
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        App.musicComponent?.inject(this)
-
+        App.musicComponent.inject(this)
         songPresenter.attachView(this)
     }
 
@@ -117,6 +116,9 @@ class SongsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<SongAdap
 
     companion object {
 
+        @JvmField
+        var TAG: String = SongsFragment::class.java.simpleName
+
         fun newInstance(): SongsFragment {
             val args = Bundle()
             val fragment = SongsFragment()

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

@@ -22,7 +22,6 @@ import code.name.monkey.retromusic.dialogs.OptionsSheetDialogFragment
 import code.name.monkey.retromusic.extensions.hide
 import code.name.monkey.retromusic.extensions.show
 import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
-import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.interfaces.MainActivityFragmentCallbacks
 import code.name.monkey.retromusic.loaders.SongLoader
@@ -33,6 +32,7 @@ import code.name.monkey.retromusic.model.smartplaylist.MyTopTracksPlaylist
 import code.name.monkey.retromusic.mvp.presenter.HomePresenter
 import code.name.monkey.retromusic.mvp.presenter.HomeView
 import code.name.monkey.retromusic.util.*
+import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
@@ -101,15 +101,14 @@ class BannerHomeFragment : AbsMainActivityFragment(), MainActivityFragmentCallba
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        App.musicComponent?.inject(this)
-        homePresenter.attachView(this)
+        App.musicComponent.inject(this)
+
     }
 
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-
         toolbar = view.findViewById(R.id.toolbar)
 
         bannerImage?.setOnClickListener {
@@ -146,7 +145,7 @@ class BannerHomeFragment : AbsMainActivityFragment(), MainActivityFragmentCallba
         }
         titleWelcome.setTextColor(ThemeStore.textColorPrimary(requireContext()))
         titleWelcome.text = String.format("%s", PreferenceUtil.getInstance(requireContext()).userName)
-
+        homePresenter.attachView(this)
         homePresenter.loadSections()
     }
 
@@ -254,7 +253,7 @@ class BannerHomeFragment : AbsMainActivityFragment(), MainActivityFragmentCallba
     private fun loadTimeImage(day: String) {
         if (bannerImage != null) {
             if (PreferenceUtil.getInstance(requireContext()).bannerImage.isEmpty()) {
-                GlideApp.with(requireActivity())
+                Glide.with(requireActivity())
                         .load(day)
                         .placeholder(R.drawable.material_design_default)
                         .diskCacheStrategy(DiskCacheStrategy.ALL)
@@ -277,10 +276,7 @@ class BannerHomeFragment : AbsMainActivityFragment(), MainActivityFragmentCallba
         const val TAG: String = "BannerHomeFragment"
 
         fun newInstance(): BannerHomeFragment {
-            val args = Bundle()
-            val fragment = BannerHomeFragment()
-            fragment.arguments = args
-            return fragment
+            return BannerHomeFragment()
         }
     }
 }

app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlayerFragment.kt

@@ -1,23 +1,22 @@
 package code.name.monkey.retromusic.fragments.player.blur
 
 import android.graphics.Color
-import android.graphics.drawable.Drawable
 import android.os.Bundle
-import android.preference.PreferenceManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.Toolbar
+import androidx.preference.PreferenceManager
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.glide.BlurTransformation
-import code.name.monkey.retromusic.glide.GlideApp
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
 import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
+import code.name.monkey.retromusic.glide.BlurTransformation
+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.model.Song
+import com.bumptech.glide.Glide
 import kotlinx.android.synthetic.main.fragment_blur.*
 
 class BlurPlayerFragment : AbsPlayerFragment() {
@@ -97,12 +96,11 @@ class BlurPlayerFragment : AbsPlayerFragment() {
         val activity = activity ?: return
         val blurAmount = PreferenceManager.getDefaultSharedPreferences(context).getInt("new_blur_amount", 25)
         colorBackground!!.clearColorFilter()
-        GlideApp.with(activity)
-                .asBitmapPalette()
-                .load(RetroGlideExtension.getSongModel(MusicPlayerRemote.currentSong))
-                .transition(RetroGlideExtension.getDefaultTransition())
+        SongGlideRequest.Builder.from(Glide.with(requireActivity()), MusicPlayerRemote.currentSong)
+                .checkIgnoreMediaStore(requireContext())
+                .generatePalette(requireContext()).build()
                 .transform(BlurTransformation.Builder(activity).blurRadius(blurAmount.toFloat()).build())
-                .songOptions(MusicPlayerRemote.currentSong)
+                .centerCrop()
                 .override(320, 480)
                 .into(object : RetroMusicColoredTarget(colorBackground) {
                     override fun onColorReady(color: Int) {
@@ -110,11 +108,6 @@ class BlurPlayerFragment : AbsPlayerFragment() {
                             colorBackground!!.setColorFilter(color)
                         }
                     }
-
-                    override fun onLoadFailed(errorDrawable: Drawable?) {
-                        super.onLoadFailed(errorDrawable)
-
-                    }
                 })
     }
 

app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurFragment.kt

@@ -1,27 +1,26 @@
 package code.name.monkey.retromusic.fragments.player.cardblur
 
 import android.graphics.Color
-import android.graphics.drawable.Drawable
 import android.os.Bundle
-import android.preference.PreferenceManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.Toolbar
+import androidx.preference.PreferenceManager
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.glide.BlurTransformation
-import code.name.monkey.retromusic.glide.GlideApp
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
 import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
 import code.name.monkey.retromusic.fragments.player.normal.PlayerFragment
+import code.name.monkey.retromusic.glide.BlurTransformation
+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.model.Song
+import com.bumptech.glide.Glide
 import kotlinx.android.synthetic.main.fragment_card_blur_player.*
 
-class CardBlurFragment : AbsPlayerFragment()  {
+class CardBlurFragment : AbsPlayerFragment() {
     override fun playerToolbar(): Toolbar {
         return playerToolbar
     }
@@ -125,17 +124,13 @@ class CardBlurFragment : AbsPlayerFragment()  {
 
     private fun updateBlur() {
         val activity = activity ?: return
-        val blurAmount = PreferenceManager.getDefaultSharedPreferences(context)
-                .getInt("new_blur_amount", 25)
-
+        val blurAmount = PreferenceManager.getDefaultSharedPreferences(context).getInt("new_blur_amount", 25)
         colorBackground!!.clearColorFilter()
-
-        GlideApp.with(activity)
-                .asBitmapPalette()
-                .load(RetroGlideExtension.getSongModel(MusicPlayerRemote.currentSong))
-                .transition(RetroGlideExtension.getDefaultTransition())
+        SongGlideRequest.Builder.from(Glide.with(requireActivity()), MusicPlayerRemote.currentSong)
+                .checkIgnoreMediaStore(requireContext())
+                .generatePalette(requireContext()).build()
                 .transform(BlurTransformation.Builder(activity).blurRadius(blurAmount.toFloat()).build())
-                .songOptions(MusicPlayerRemote.currentSong)
+                .centerCrop()
                 .override(320, 480)
                 .into(object : RetroMusicColoredTarget(colorBackground) {
                     override fun onColorReady(color: Int) {
@@ -143,11 +138,6 @@ class CardBlurFragment : AbsPlayerFragment()  {
                             colorBackground!!.setColorFilter(color)
                         }
                     }
-
-                    override fun onLoadFailed(errorDrawable: Drawable?) {
-                        super.onLoadFailed(errorDrawable)
-
-                    }
                 })
 
     }

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

@@ -21,9 +21,8 @@ import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.LyricsActivity
 import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.glide.GlideApp
-import code.name.monkey.retromusic.glide.RetroGlideExtension
 import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
+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
@@ -31,7 +30,8 @@ import code.name.monkey.retromusic.model.lyrics.Lyrics
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.RetroColorUtil
 import code.name.monkey.retromusic.util.ViewUtil
-import com.bumptech.glide.request.transition.Transition
+import com.bumptech.glide.Glide
+import com.bumptech.glide.request.animation.GlideAnimation
 import kotlinx.android.synthetic.main.fragment_color_player.*
 
 class ColorFragment : AbsPlayerFragment() {
@@ -133,21 +133,20 @@ class ColorFragment : AbsPlayerFragment() {
 
     private fun updateSong() {
 
-        GlideApp.with(activity!!)
-                .asBitmapPalette()
-                .load(RetroGlideExtension.getSongModel(MusicPlayerRemote.currentSong))
-                .songOptions(MusicPlayerRemote.currentSong)
-                .transition(RetroGlideExtension.getDefaultTransition())
+
+        SongGlideRequest.Builder.from(Glide.with(requireActivity()), MusicPlayerRemote.currentSong)
+                .checkIgnoreMediaStore(requireContext())
+                .generatePalette(requireContext())
+                .build()
                 .into(object : RetroMusicColoredTarget(playerImage) {
                     override fun onColorReady(color: Int) {
 
                     }
 
-                    override fun onResourceReady(resource: BitmapPaletteWrapper, glideAnimation: Transition<in BitmapPaletteWrapper>?) {
+                    override fun onResourceReady(resource: BitmapPaletteWrapper, glideAnimation: GlideAnimation<in BitmapPaletteWrapper>?) {
                         super.onResourceReady(resource, glideAnimation)
-
                         val background = resource.palette.getColor()
-                        val accentColor = resource.palette.getContrastColor(background)
+
 
                         val palette = resource.palette
                         val swatch = RetroColorUtil.getSwatch(palette)
@@ -158,8 +157,8 @@ class ColorFragment : AbsPlayerFragment() {
                         setColors(backgroundColor, textColor)
                     }
 
-                    override fun onLoadFailed(errorDrawable: Drawable?) {
-                        super.onLoadFailed(errorDrawable)
+                    override fun onLoadFailed(e: Exception, errorDrawable: Drawable?) {
+                        super.onLoadFailed(e, errorDrawable)
                         val backgroundColor = defaultFooterColor
                         val textColor = if (ColorUtil.isColorLight(defaultFooterColor))
                             MaterialValueHelper.getPrimaryTextColor(context, true)
@@ -265,10 +264,6 @@ class ColorFragment : AbsPlayerFragment() {
     }
 }
 
-fun Palette.getContrastColor(background: Int): Int {
-
-    return 0
-}
 
 fun Palette.getColor(): Int {
     return when {

app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt

@@ -13,16 +13,16 @@ 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.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
 import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
+import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.ViewUtil
 import code.name.monkey.retromusic.views.DrawableGradient
 import kotlinx.android.synthetic.main.fragment_flat_player.*
 
-class FlatPlayerFragment : AbsPlayerFragment()  {
+class FlatPlayerFragment : AbsPlayerFragment() {
     override fun playerToolbar(): Toolbar {
         return playerToolbar
     }

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

@@ -14,8 +14,7 @@ import code.name.monkey.retromusic.extensions.hide
 import code.name.monkey.retromusic.extensions.show
 import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
 import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
-import code.name.monkey.retromusic.glide.GlideApp
-import code.name.monkey.retromusic.glide.RetroGlideExtension
+import code.name.monkey.retromusic.glide.ArtistGlideRequest
 import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
@@ -24,12 +23,13 @@ import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.model.lyrics.AbsSynchronizedLyrics
 import code.name.monkey.retromusic.model.lyrics.Lyrics
 import code.name.monkey.retromusic.util.NavigationUtil
+import com.bumptech.glide.Glide
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.schedulers.Schedulers
 import kotlinx.android.synthetic.main.fragment_full.*
 
-class FullPlayerFragment : AbsPlayerFragment() , MusicProgressViewUpdateHelper.Callback {
+class FullPlayerFragment : AbsPlayerFragment(), MusicProgressViewUpdateHelper.Callback {
     private lateinit var lyricsLayout: FrameLayout
     private lateinit var lyricsLine1: TextView
     private lateinit var lyricsLine2: TextView
@@ -217,13 +217,9 @@ class FullPlayerFragment : AbsPlayerFragment() , MusicProgressViewUpdateHelper.C
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe {
-                    GlideApp.with(activity!!)
-                            .asBitmapPalette()
-                            .load(RetroGlideExtension.getArtistModel(it))
-                            .transition(RetroGlideExtension.getDefaultTransition())
-                            .artistOptions(it)
-                            .dontAnimate()
-                            .into(object : RetroMusicColoredTarget(artistImage) {
+                    ArtistGlideRequest.Builder.from(Glide.with(requireContext()), it)
+                            .generatePalette(requireContext())
+                            .build().into(object : RetroMusicColoredTarget(artistImage) {
                                 override fun onColorReady(color: Int) {
 
                                 }
@@ -238,7 +234,6 @@ class FullPlayerFragment : AbsPlayerFragment() , MusicProgressViewUpdateHelper.C
 
     private fun updateLabel() {
         (MusicPlayerRemote.playingQueue.size - 1).apply {
-            println("Log Position $this ${MusicPlayerRemote.position}")
             if (this == (MusicPlayerRemote.position)) {
                 nextSongLabel.setText(R.string.last_song)
                 nextSong.hide()

app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt

@@ -77,7 +77,7 @@ class TinyPlayerFragment : AbsPlayerFragment(), MusicProgressViewUpdateHelper.Ca
             ThemeStore.accentColor(requireContext())
         }
 
-        if (ColorUtil.isColorLight(color)) {
+        if (ColorUtil.isColorLight(colorFinal)) {
             textColorPrimary = MaterialValueHelper.getSecondaryTextColor(requireContext(), true)
             textColorPrimaryDisabled = MaterialValueHelper.getSecondaryTextColor(requireContext(), true)
         } else {