From 5772fcd812aeaffaa7cf6f3e0ba742687359a7c5 Mon Sep 17 00:00:00 2001 From: Prathamesh More Date: Sat, 8 Jan 2022 00:40:51 +0530 Subject: [PATCH] Added lyrics shadow for better visibility of text --- .../fragments/backup/BackupViewModel.kt | 2 +- .../fragments/other/CoverLyricsFragment.kt | 10 ++++++++++ .../name/monkey/retromusic/helper/BackupHelper.kt | 6 +++--- .../main/res/layout/fragment_adaptive_player.xml | 6 +++--- .../main/res/layout/fragment_card_blur_player.xml | 6 +++--- app/src/main/res/layout/fragment_card_player.xml | 2 +- app/src/main/res/layout/fragment_cover_lyrics.xml | 15 +++++++++------ app/src/main/res/layout/fragment_full.xml | 1 - .../res/layout/fragment_gradient_controls.xml | 4 ++-- .../main/res/layout/fragment_gradient_player.xml | 2 +- .../res/layout/fragment_player_album_cover.xml | 2 +- 11 files changed, 34 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupViewModel.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupViewModel.kt index 87e3f05dd..e506a3b4d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupViewModel.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupViewModel.kt @@ -21,7 +21,7 @@ class BackupViewModel : ViewModel() { val backupsLiveData: LiveData> = backupsMutableLiveData fun loadBackups(context: Context) { - BackupHelper.getBackupRoot(context).listFiles { _, name -> + BackupHelper.getBackupRoot().listFiles { _, name -> return@listFiles name.endsWith(BackupHelper.BACKUP_EXTENSION) }?.toList()?.let { backupsMutableLiveData.value = it diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/other/CoverLyricsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/other/CoverLyricsFragment.kt index c7aabefd1..b45b68d9d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/CoverLyricsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/other/CoverLyricsFragment.kt @@ -12,8 +12,10 @@ import androidx.preference.PreferenceManager import code.name.monkey.retromusic.R import code.name.monkey.retromusic.SHOW_LYRICS import code.name.monkey.retromusic.databinding.FragmentCoverLyricsBinding +import code.name.monkey.retromusic.fragments.NowPlayingScreen import code.name.monkey.retromusic.fragments.base.AbsMusicServiceFragment import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment +import code.name.monkey.retromusic.fragments.base.goToLyrics import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper import code.name.monkey.retromusic.model.lyrics.AbsSynchronizedLyrics @@ -45,6 +47,14 @@ class CoverLyricsFragment : AbsMusicServiceFragment(R.layout.fragment_cover_lyri if (PreferenceUtil.showLyrics) { progressViewUpdateHelper?.start() } + // Remove background on Fit theme + val nps = PreferenceUtil.nowPlayingScreen + if (nps == NowPlayingScreen.Fit || nps == NowPlayingScreen.Full) { + binding.root.background = null + } + binding.playerLyricsLine2.setOnClickListener { + goToLyrics(requireActivity()) + } } override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) { diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/BackupHelper.kt b/app/src/main/java/code/name/monkey/retromusic/helper/BackupHelper.kt index 4b786bb33..fef31b6d4 100644 --- a/app/src/main/java/code/name/monkey/retromusic/helper/BackupHelper.kt +++ b/app/src/main/java/code/name/monkey/retromusic/helper/BackupHelper.kt @@ -28,7 +28,7 @@ object BackupHelper : KoinComponent { suspend fun createBackup(context: Context, name: String) { val backupFile = - File(getBackupRoot(context), name + APPEND_EXTENSION) + File(getBackupRoot(), name + APPEND_EXTENSION) if (backupFile.parentFile?.exists() != true) { backupFile.parentFile?.mkdirs() } @@ -257,9 +257,9 @@ object BackupHelper : KoinComponent { } } - fun getBackupRoot(context: Context): File { + fun getBackupRoot(): File { return File( - context.getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS), + Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS), "RetroMusic/Backups" ) } diff --git a/app/src/main/res/layout/fragment_adaptive_player.xml b/app/src/main/res/layout/fragment_adaptive_player.xml index 5975ae228..0b740bbb7 100644 --- a/app/src/main/res/layout/fragment_adaptive_player.xml +++ b/app/src/main/res/layout/fragment_adaptive_player.xml @@ -62,9 +62,9 @@ android:id="@+id/cover_lyrics" android:name="code.name.monkey.retromusic.fragments.other.CoverLyricsFragment" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:elevation="20dp" - android:layout_gravity="center"/> + android:layout_height="match_parent" + android:layout_gravity="center" + android:elevation="20dp" /> + android:layout_height="match_parent" + android:layout_gravity="center" + tools:layout="@layout/fragment_cover_lyrics" /> diff --git a/app/src/main/res/layout/fragment_card_player.xml b/app/src/main/res/layout/fragment_card_player.xml index b67ed8db6..1e3ae7539 100644 --- a/app/src/main/res/layout/fragment_card_player.xml +++ b/app/src/main/res/layout/fragment_card_player.xml @@ -23,7 +23,7 @@ android:id="@+id/cover_lyrics" android:name="code.name.monkey.retromusic.fragments.other.CoverLyricsFragment" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="match_parent" android:layout_gravity="center" android:elevation="20dp" /> diff --git a/app/src/main/res/layout/fragment_cover_lyrics.xml b/app/src/main/res/layout/fragment_cover_lyrics.xml index 018426e9b..50d442695 100644 --- a/app/src/main/res/layout/fragment_cover_lyrics.xml +++ b/app/src/main/res/layout/fragment_cover_lyrics.xml @@ -1,17 +1,18 @@ - + tools:alpha="1" + tools:visibility="visible"> + android:visibility="gone" + tools:visibility="visible" /> + android:textColor="@color/md_white_1000" + tools:text="@tools:sample/full_names[5]" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_full.xml b/app/src/main/res/layout/fragment_full.xml index fefdc081b..d6d6411a1 100644 --- a/app/src/main/res/layout/fragment_full.xml +++ b/app/src/main/res/layout/fragment_full.xml @@ -7,7 +7,6 @@ android:clickable="true" android:focusable="true"> -