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 e2eaf6c9b..e27e31c06 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 @@ -35,7 +35,6 @@ import code.name.monkey.appthemehelper.common.ATHToolbarActivity import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.appthemehelper.util.VersionUtils import code.name.monkey.retromusic.R -import code.name.monkey.retromusic.activities.MainActivity import code.name.monkey.retromusic.activities.tageditor.TagWriter import code.name.monkey.retromusic.databinding.FragmentLyricsBinding import code.name.monkey.retromusic.databinding.FragmentNormalLyricsBinding @@ -422,7 +421,7 @@ class LyricsFragment : AbsMainActivityFragment(R.layout.fragment_lyrics) { override fun onDestroyView() { super.onDestroyView() if (MusicPlayerRemote.playingQueue.isNotEmpty()) - (requireActivity() as MainActivity).expandPanel() + mainActivity.expandPanel() _binding = null } } diff --git a/app/src/normal/java/code/name/monkey/retromusic/cast/CastOptionsProvider.kt b/app/src/normal/java/code/name/monkey/retromusic/cast/CastOptionsProvider.kt index 35115dafb..6ebc71010 100644 --- a/app/src/normal/java/code/name/monkey/retromusic/cast/CastOptionsProvider.kt +++ b/app/src/normal/java/code/name/monkey/retromusic/cast/CastOptionsProvider.kt @@ -3,36 +3,18 @@ package code.name.monkey.retromusic.cast import android.content.Context -import code.name.monkey.retromusic.activities.MainActivity -import com.google.android.gms.cast.CastMediaControlIntent +import com.google.android.gms.cast.CastMediaControlIntent.DEFAULT_MEDIA_RECEIVER_APPLICATION_ID import com.google.android.gms.cast.framework.CastOptions import com.google.android.gms.cast.framework.OptionsProvider import com.google.android.gms.cast.framework.SessionProvider import com.google.android.gms.cast.framework.media.CastMediaOptions -import com.google.android.gms.cast.framework.media.MediaIntentReceiver -import com.google.android.gms.cast.framework.media.NotificationOptions class CastOptionsProvider : OptionsProvider { override fun getCastOptions(context: Context): CastOptions { - val buttonActions: MutableList = ArrayList() - buttonActions.add(MediaIntentReceiver.ACTION_SKIP_PREV) - buttonActions.add(MediaIntentReceiver.ACTION_TOGGLE_PLAYBACK) - buttonActions.add(MediaIntentReceiver.ACTION_SKIP_NEXT) - buttonActions.add(MediaIntentReceiver.ACTION_STOP_CASTING) - val compatButtonActionsIndices = intArrayOf(1, 3) - val notificationOptions = NotificationOptions.Builder() - .setActions(buttonActions, compatButtonActionsIndices) - .setTargetActivityClassName(MainActivity::class.java.name) - .build() - - val mediaOptions = CastMediaOptions.Builder() - .setNotificationOptions(notificationOptions) - .setExpandedControllerActivityClassName(MainActivity::class.java.name) - .build() - + val mediaOptions = CastMediaOptions.Builder().setNotificationOptions(null).build() return CastOptions.Builder() - .setReceiverApplicationId(CastMediaControlIntent.DEFAULT_MEDIA_RECEIVER_APPLICATION_ID) + .setReceiverApplicationId(DEFAULT_MEDIA_RECEIVER_APPLICATION_ID) .setCastMediaOptions(mediaOptions) .build() }