From 5e16b79d232bb9b1ee6e158ec274c3466b86fc1e Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathameshmm02@gmail.com>
Date: Mon, 27 Sep 2021 21:08:04 +0530
Subject: [PATCH] Fixed lyrics toolbar button not working

---
 .../name/monkey/retromusic/fragments/LyricsFragment.kt | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/LyricsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/LyricsFragment.kt
index f43400759..c4aa78a76 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/LyricsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/LyricsFragment.kt
@@ -99,11 +99,10 @@ class LyricsFragment : AbsMusicServiceFragment(R.layout.fragment_lyrics) {
 
         setupWakelock()
 
-        binding.toolbar.setBackgroundColor(surfaceColor())
         binding.tabLyrics.setBackgroundColor(surfaceColor())
         binding.container.setBackgroundColor(surfaceColor())
-        ToolbarContentTintHelper.colorBackButton(binding.toolbar)
         setupViews()
+        setupToolbar()
         updateTitleSong()
     }
 
@@ -122,6 +121,13 @@ class LyricsFragment : AbsMusicServiceFragment(R.layout.fragment_lyrics) {
         binding.tabLyrics.setTabTextColors(textColorSecondary(), accentColor())
     }
 
+    private fun setupToolbar() {
+        binding.toolbar.setBackgroundColor(surfaceColor())
+        ToolbarContentTintHelper.colorBackButton(binding.toolbar)
+        binding.toolbar.setNavigationOnClickListener {
+            findNavController().navigateUp()
+        }
+    }
 
     override fun onPlayingMetaChanged() {
         super.onPlayingMetaChanged()