diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/other/LyricsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/other/LyricsFragment.kt index 4f7b91e1..a197ddb6 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/LyricsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/other/LyricsFragment.kt @@ -60,6 +60,9 @@ class LyricsFragment : AbsMusicServiceFragment(R.layout.fragment_lyrics) { private val binding get() = _binding!! private lateinit var song: Song + val mainActivity: MainActivity + get() = activity as MainActivity + private lateinit var lyricsSectionsAdapter: LyricsSectionsAdapter private val googleSearchLrcUrl: String @@ -119,9 +122,21 @@ class LyricsFragment : AbsMusicServiceFragment(R.layout.fragment_lyrics) { binding.tabLyrics.setSelectedTabIndicatorColor(accentColor()) binding.tabLyrics.setTabTextColors(textColorSecondary(), accentColor()) + binding.editButton.accentColor() + binding.editButton.setOnClickListener { + when (binding.lyricsPager.currentItem) { + 0 -> { + editSyncedLyrics() + } + 1 -> { + editNormalLyrics() + } + } + } } private fun setupToolbar() { + mainActivity.setSupportActionBar(binding.toolbar) binding.toolbar.setBackgroundColor(surfaceColor()) ToolbarContentTintHelper.colorBackButton(binding.toolbar) binding.toolbar.setNavigationOnClickListener { @@ -167,15 +182,6 @@ class LyricsFragment : AbsMusicServiceFragment(R.layout.fragment_lyrics) { else -> googleSearchLrcUrl } ) - } else if (item.itemId == R.id.action_edit) { - when (binding.lyricsPager.currentItem) { - 0 -> { - editSyncedLyrics() - } - 1 -> { - editNormalLyrics() - } - } } return super.onOptionsItemSelected(item) } diff --git a/app/src/main/res/layout/fragment_lyrics.xml b/app/src/main/res/layout/fragment_lyrics.xml index 97c32a23..09fd7f01 100644 --- a/app/src/main/res/layout/fragment_lyrics.xml +++ b/app/src/main/res/layout/fragment_lyrics.xml @@ -5,7 +5,8 @@ android:id="@+id/container" android:layout_width="match_parent" android:layout_height="match_parent" - android:fitsSystemWindows="true"> + android:fitsSystemWindows="true" + android:paddingBottom="@dimen/mini_player_height"> + + \ No newline at end of file diff --git a/app/src/main/res/menu/menu_search.xml b/app/src/main/res/menu/menu_search.xml index a792688a..683dbb51 100644 --- a/app/src/main/res/menu/menu_search.xml +++ b/app/src/main/res/menu/menu_search.xml @@ -1,15 +1,9 @@ - - \ No newline at end of file