Fixed colors

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

@@ -9,6 +9,7 @@ import android.view.View
 import androidx.core.app.ShareCompat
 import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.LinearLayoutManager
+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
@@ -68,8 +69,13 @@ class AboutActivity : AbsBaseActivity(), View.OnClickListener {
 
         loadContributors()
         setSupportActionBar(toolbar)
-        ToolbarContentTintHelper.colorBackButton(toolbar )
-        version.setSummary ( getAppVersion())
+        toolbar.apply {
+            setTitleTextColor(ATHUtil.resolveColor(this@AboutActivity, R.attr.colorOnPrimary))
+            setBackgroundColor(ATHUtil.resolveColor(this@AboutActivity, R.attr.colorPrimary))
+            setNavigationOnClickListener { onBackPressed() }
+            ToolbarContentTintHelper.colorBackButton(toolbar)
+        }
+        version.setSummary(getAppVersion())
         setUpView()
     }
 

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

@@ -30,6 +30,7 @@ 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;
@@ -61,11 +62,11 @@ public class LicenseActivity extends AbsBaseActivity {
         setContentView(R.layout.activity_license);
         setStatusbarColorAuto();
         setNavigationBarColorPrimary();
-        setTaskDescriptionColorAuto();
         setLightNavigationBar(true);
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
-        ToolbarContentTintHelper.colorBackButton(toolbar );
+        ToolbarContentTintHelper.colorBackButton(toolbar);
+        toolbar.setBackgroundColor(INSTANCE.resolveColor(this, R.attr.colorPrimary));
         WebView webView = findViewById(R.id.license);
         try {
             StringBuilder buf = new StringBuilder();

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

@@ -29,7 +29,6 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
         setTheme(ThemeManager.getThemeResValue(this))
         hideStatusBar()
         super.onCreate(savedInstanceState)
-        //MaterialDialogsUtil.updateMaterialDialogsThemeSingleton(this)
 
         changeBackgroundShape()
         setImmersiveFullscreen()

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

@@ -3,8 +3,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.appthemehelper.util.ATHUtil
-import code.name.monkey.appthemehelper.util.MaterialUtil
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.interfaces.CabHolder
@@ -27,13 +25,11 @@ class ShuffleButtonSongAdapter(activity: AppCompatActivity,
         if (holder.itemViewType == OFFSET_ITEM) {
             val viewHolder = holder as ViewHolder
             viewHolder.playAction?.let {
-                MaterialUtil.setTint(it, color = ATHUtil.resolveColor(activity, R.attr.cardBackgroundColor))
                 it.setOnClickListener {
                     MusicPlayerRemote.openQueue(dataSet, 0, true)
                 }
             }
             viewHolder.shuffleAction?.let {
-                MaterialUtil.setTint(button = it, color = ATHUtil.resolveColor(activity, R.attr.cardBackgroundColor))
                 it.setOnClickListener {
                     MusicPlayerRemote.openAndShuffleQueue(dataSet, true)
                 }

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

@@ -31,7 +31,6 @@ abstract class AbsLibraryPagerRecyclerViewCustomGridSizeFragment<A : RecyclerVie
      * @see .getGridSize
      */
     protected val itemLayoutRes: Int
-        @LayoutRes
         get() = if (getGridSize() > maxGridSizeForList) {
             R.layout.item_grid
         } else R.layout.item_list
@@ -124,13 +123,11 @@ abstract class AbsLibraryPagerRecyclerViewCustomGridSizeFragment<A : RecyclerVie
         applyRecyclerViewPaddingForLayoutRes(recyclerView(), currentLayoutRes)
     }
 
-    private fun applyRecyclerViewPaddingForLayoutRes(recyclerView: RecyclerView,
-                                                     @LayoutRes res: Int) {
-        val padding: Int
-        if (res == R.layout.item_grid) {
-            padding = (resources.displayMetrics.density * 2).toInt()
+    private fun applyRecyclerViewPaddingForLayoutRes(recyclerView: RecyclerView, res: Int) {
+        val padding: Int = if (res == R.layout.item_grid) {
+            (resources.displayMetrics.density * 2).toInt()
         } else {
-            padding = 0
+            0
         }
         recyclerView.setPadding(padding, padding, padding, padding)
     }

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

@@ -6,8 +6,6 @@ import android.view.View
 import androidx.fragment.app.Fragment
 import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
 import code.name.monkey.retromusic.interfaces.MusicServiceEventListener
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
 
 /**
  * Created by hemanths on 18/08/17.
@@ -34,13 +32,13 @@ open class AbsMusicServiceFragment : Fragment(), MusicServiceEventListener {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        playerActivity!!.addMusicServiceEventListener(this)
+        playerActivity?.addMusicServiceEventListener(this)
 
     }
 
     override fun onDestroyView() {
         super.onDestroyView()
-        playerActivity!!.removeMusicServiceEventListener(this)
+        playerActivity?.removeMusicServiceEventListener(this)
     }
 
     override fun onPlayingMetaChanged() {

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

@@ -2,7 +2,6 @@ package code.name.monkey.retromusic.fragments.mainactivity;
 
 import android.app.Activity;
 import android.app.ActivityOptions;
-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -38,12 +37,11 @@ import code.name.monkey.retromusic.helper.SortOrder;
 import code.name.monkey.retromusic.interfaces.CabHolder;
 import code.name.monkey.retromusic.interfaces.MainActivityFragmentCallbacks;
 import code.name.monkey.retromusic.util.NavigationUtil;
-import code.name.monkey.retromusic.util.PreferenceUtil;
 import code.name.monkey.retromusic.util.RetroColorUtil;
 import code.name.monkey.retromusic.util.RetroUtil;
 import io.reactivex.disposables.CompositeDisposable;
 
-public class LibraryFragment extends AbsMainActivityFragment implements CabHolder, MainActivityFragmentCallbacks, SharedPreferences.OnSharedPreferenceChangeListener {
+public class LibraryFragment extends AbsMainActivityFragment implements CabHolder, MainActivityFragmentCallbacks {
 
     public static final String TAG = "LibraryFragment";
     private static final String CURRENT_TAB_ID = "current_tab_id";
@@ -75,19 +73,18 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
     public void onDestroyView() {
         super.onDestroyView();
         disposable.dispose();
-        PreferenceUtil.getInstance(requireActivity()).unregisterOnSharedPreferenceChangedListener(this);
     }
 
     @Nullable
     @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+    public View onCreateView(@NonNull LayoutInflater inflater,
+                             @Nullable ViewGroup container,
                              @Nullable Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_library, container, false);
         disposable = new CompositeDisposable();
         appBarLayout = view.findViewById(R.id.appBarLayout);
         toolbarContainer = view.findViewById(R.id.toolbarContainer);
         toolbar = view.findViewById(R.id.toolbar);
-        PreferenceUtil.getInstance(requireActivity()).registerOnSharedPreferenceChangedListener(this);
         return view;
     }
 
@@ -457,11 +454,4 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
         }
         return false;
     }
-
-
-    @Override
-    public void onSharedPreferenceChanged(@NonNull SharedPreferences sharedPreferences,
-                                          @NonNull String key) {
-
-    }
 }

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

@@ -1,14 +1,9 @@
 package code.name.monkey.retromusic.fragments.player.color
 
-import android.animation.ArgbEvaluator
 import android.animation.ValueAnimator
-import android.annotation.SuppressLint
-import android.content.Intent
 import android.graphics.Color
 import android.graphics.drawable.Drawable
-import android.os.AsyncTask
 import android.os.Bundle
-import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -19,22 +14,24 @@ 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.activities.LyricsActivity
 import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
 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
-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.Glide
 import com.bumptech.glide.request.animation.GlideAnimation
 import kotlinx.android.synthetic.main.fragment_color_player.*
 
 class ColorFragment : AbsPlayerFragment() {
+
+    private var lastColor: Int = 0
+    private var backgroundColor: Int = 0
+    private var playbackControlsFragment: ColorPlaybackControlsFragment? = null
+    private var valueAnimator: ValueAnimator? = null
+
     override fun playerToolbar(): Toolbar {
         return playerToolbar
     }
@@ -50,16 +47,6 @@ class ColorFragment : AbsPlayerFragment() {
 
     }
 
-
-    private var lastColor: Int = 0
-    private var backgroundColor: Int = 0
-
-    private var playbackControlsFragment: ColorPlaybackControlsFragment? = null
-
-    private var valueAnimator: ValueAnimator? = null
-    private var updateLyricsAsyncTask: AsyncTask<*, *, *>? = null
-    private var lyricsColor: Lyrics? = null
-
     override fun onShow() {
         playbackControlsFragment!!.show()
     }
@@ -102,7 +89,6 @@ class ColorFragment : AbsPlayerFragment() {
         super.onViewCreated(view, savedInstanceState)
         setUpSubFragments()
         setUpPlayerToolbar()
-        setupViews()
     }
 
     private fun setUpSubFragments() {
@@ -113,7 +99,7 @@ class ColorFragment : AbsPlayerFragment() {
     private fun setUpPlayerToolbar() {
         playerToolbar.apply {
             inflateMenu(R.menu.menu_player)
-            setNavigationOnClickListener { activity!!.onBackPressed() }
+            setNavigationOnClickListener { requireActivity().onBackPressed() }
             setOnMenuItemClickListener(this@ColorFragment)
             ToolbarContentTintHelper.colorizeToolbar(this, ATHUtil.resolveColor(context, R.attr.iconColor), activity)
         }
@@ -122,18 +108,14 @@ class ColorFragment : AbsPlayerFragment() {
     override fun onPlayingMetaChanged() {
         super.onPlayingMetaChanged()
         updateSong()
-        updateLyricsLocal()
     }
 
     override fun onServiceConnected() {
         super.onServiceConnected()
         updateSong()
-        updateLyricsLocal()
     }
 
     private fun updateSong() {
-
-
         SongGlideRequest.Builder.from(Glide.with(requireActivity()), MusicPlayerRemote.currentSong)
                 .checkIgnoreMediaStore(requireContext())
                 .generatePalette(requireContext())
@@ -148,7 +130,6 @@ class ColorFragment : AbsPlayerFragment() {
                         resource?.let {
                             val background = resource.palette.getColor()
 
-
                             val palette = resource.palette
                             val swatch = RetroColorUtil.getSwatch(palette)
 
@@ -175,85 +156,12 @@ class ColorFragment : AbsPlayerFragment() {
 
     private fun setColors(backgroundColor: Int, textColor: Int) {
         playbackControlsFragment!!.setDark(textColor, backgroundColor)
-
         colorGradientBackground?.setBackgroundColor(backgroundColor)
-
         ToolbarContentTintHelper.colorizeToolbar(playerToolbar, textColor, activity)
-
         lastColor = textColor
-
         this.backgroundColor = backgroundColor
-
-        if (playerActivity != null) {
-            playerActivity!!.setLightNavigationBar(ColorUtil.isColorLight(backgroundColor))
-        }
-        callbacks!!.onPaletteColorChanged()
-
-    }
-
-    private fun colorize(i: Int) {
-        if (valueAnimator != null) {
-            valueAnimator!!.cancel()
-        }
-
-        valueAnimator = ValueAnimator.ofObject(ArgbEvaluator(), paletteColor, i)
-        valueAnimator!!.addUpdateListener { animation ->
-            colorGradientBackground?.setBackgroundColor(animation.animatedValue as Int)
-        }
-        valueAnimator!!.setDuration(ViewUtil.RETRO_MUSIC_ANIM_TIME.toLong()).start()
-    }
-
-    @SuppressLint("StaticFieldLeak")
-    private fun updateLyricsLocal() {
-        if (updateLyricsAsyncTask != null) {
-            updateLyricsAsyncTask!!.cancel(false)
-        }
-        val song = MusicPlayerRemote.currentSong
-        updateLyricsAsyncTask = object : AsyncTask<Void?, Void?, Lyrics?>() {
-            override fun onPreExecute() {
-                super.onPreExecute()
-                lyricsColor = null
-                playerToolbar.menu.removeItem(R.id.action_show_lyrics)
-            }
-
-            override fun doInBackground(vararg params: Void?): Lyrics? {
-                val data = MusicUtil.getLyrics(song)
-                return if (TextUtils.isEmpty(data)) {
-                    null
-                } else Lyrics.parse(song, data!!)
-            }
-
-            override fun onPostExecute(l: Lyrics?) {
-                lyricsColor = l
-                if (lyricsColor == null) {
-                    lyricsView?.setText(R.string.no_lyrics_found)
-                } else {
-                    lyricsView?.text = lyricsColor!!.text
-                }
-            }
-
-            override fun onCancelled(s: Lyrics?) {
-                onPostExecute(null)
-            }
-        }.execute()
-    }
-
-    private fun setupViews() {
-        lyricsView.setOnClickListener {
-            if (lyricsContainer!!.visibility == View.GONE) {
-                lyricsContainer!!.visibility = View.VISIBLE
-            } else {
-                lyricsContainer!!.visibility = View.GONE
-            }
-        }
-        playerImage.setOnClickListener {
-            if (lyricsContainer!!.visibility == View.GONE) {
-                lyricsContainer!!.visibility = View.VISIBLE
-            } else {
-                lyricsContainer!!.visibility = View.GONE
-            }
-        }
-        expand.setOnClickListener { startActivity(Intent(context, LyricsActivity::class.java)) }
+        playerActivity?.setLightNavigationBar(ColorUtil.isColorLight(backgroundColor))
+        callbacks?.onPaletteColorChanged()
     }
 
     companion object {