fix(widget): clean leftover unused methods and restore notification lyric strings

Author: SteveZMTstudios

app/src/main/java/org/akanework/gramophone/logic/GramophonePlaybackService.kt

@@ -890,136 +890,6 @@ class GramophonePlaybackService : MediaLibraryService(), MediaSessionService.Lis
         }
     }
 
-    private fun createErrorNotificationChannel() {
-        nm.createNotificationChannel(
-            NotificationChannelCompat.Builder(
-                NOTIFY_CHANNEL_ID, NotificationManagerCompat.IMPORTANCE_HIGH
-            ).apply {
-                setName(getString(R.string.error_in_bg))
-                setVibrationEnabled(true)
-                setVibrationPattern(longArrayOf(0L, 200L))
-                setLightsEnabled(false)
-                setShowBadge(false)
-                setSound(null, null)
-            }.build()
-        )
-    }
-
-    private fun initCustomCommands(): List<CommandButton> = listOf(
-        CommandButton.Builder(CommandButton.ICON_SHUFFLE_OFF)
-            .setDisplayName(getString(R.string.shuffle))
-            .setPlayerCommand(Player.COMMAND_SET_SHUFFLE_MODE, true)
-            .build(),
-        CommandButton.Builder(CommandButton.ICON_SHUFFLE_ON)
-            .setDisplayName(getString(R.string.shuffle))
-            .setPlayerCommand(Player.COMMAND_SET_SHUFFLE_MODE, false)
-            .build(),
-        CommandButton.Builder(CommandButton.ICON_REPEAT_OFF)
-            .setDisplayName(getString(R.string.repeat_mode))
-            .setPlayerCommand(Player.COMMAND_SET_REPEAT_MODE, Player.REPEAT_MODE_ALL)
-            .build(),
-        CommandButton.Builder(CommandButton.ICON_REPEAT_ALL)
-            .setDisplayName(getString(R.string.repeat_mode))
-            .setPlayerCommand(Player.COMMAND_SET_REPEAT_MODE, Player.REPEAT_MODE_ONE)
-            .build(),
-        CommandButton.Builder(CommandButton.ICON_REPEAT_ONE)
-            .setDisplayName(getString(R.string.repeat_mode))
-            .setPlayerCommand(Player.COMMAND_SET_REPEAT_MODE, Player.REPEAT_MODE_OFF)
-            .build(),
-        CommandButton.Builder(CommandButton.ICON_HEART_UNFILLED)
-            .setDisplayName(getString(R.string.favorite))
-            .setSessionCommand(SessionCommand(SessionCommand.COMMAND_CODE_SESSION_SET_RATING), HeartRating(true))
-            .build(),
-        CommandButton.Builder(CommandButton.ICON_HEART_FILLED)
-            .setDisplayName(getString(R.string.unfavorite))
-            .setSessionCommand(SessionCommand(SessionCommand.COMMAND_CODE_SESSION_SET_RATING), HeartRating(false))
-            .build(),
-    )
-
-    private fun initAfFormatTracker(): AfFormatTracker {
-        return AfFormatTracker(this, playbackHandler, handler).apply {
-            formatChangedCallback = { format, period ->
-                if (period != null) {
-                    handler.post {
-                        val currentPeriod = endedWorkaroundPlayer?.exoPlayer?.currentPeriodIndex
-                            ?.takeIf { it != C.INDEX_UNSET && (endedWorkaroundPlayer?.exoPlayer?.currentTimeline?.periodCount ?: 0) > it }
-                            ?.let { endedWorkaroundPlayer!!.exoPlayer.currentTimeline.getUidOfPeriod(it) }
-                        if (currentPeriod != period) {
-                            if (format != null) pendingAfTrackFormats[period] = format
-                            else pendingAfTrackFormats.remove(period)
-                        } else {
-                            afTrackFormat = format?.let { period to it }
-                            mediaSession?.broadcastCustomCommand(
-                                SessionCommand(SERVICE_GET_AUDIO_FORMAT, Bundle.EMPTY),
-                                Bundle.EMPTY
-                            )
-                        }
-                    }
-                } else {
-                    Log.e(TAG, "mediaPeriodId is NULL in formatChangedCallback!!")
-                }
-            }
-        }
-    }
-
-    private fun buildEndedWorkaroundPlayer(): EndedWorkaroundPlayer {
-        val player = EndedWorkaroundPlayer(
-            this,
-            prefs,
-            exoPlayer = ExoPlayer.Builder(
-                this,
-                GramophoneRenderFactory(
-                    this, rgAp, this::onAudioSinkInputFormatChanged,
-                    afFormatTracker::setAudioSink
-                )
-                    .setEnableHighResolutionPcmOutput(true)
-                    .setEnableDecoderFallback(true)
-                    .setEnableAudioOutputPlaybackParameters(true)
-                    .setExtensionRendererMode(DefaultRenderersFactory.EXTENSION_RENDERER_MODE_ON),
-                GramophoneMediaSourceFactory(
-                    DefaultDataSource.Factory(this),
-                    GramophoneExtractorsFactory().also {
-                        it.setConstantBitrateSeekingEnabled(true)
-                        it.setMp3ExtractorFlags(Mp3Extractor.FLAG_ENABLE_INDEX_SEEKING)
-                    })
-            )
-                .setWakeMode(C.WAKE_MODE_LOCAL)
-                .setAudioAttributes(
-                    AudioAttributes.Builder()
-                        .setUsage(C.USAGE_MEDIA)
-                        .setContentType(C.AUDIO_CONTENT_TYPE_MUSIC)
-                        .build(), true
-                )
-                .setHandleAudioBecomingNoisy(true)
-                .setTrackSelector(DefaultTrackSelector(this).apply {
-                    setParameters(
-                        buildUponParameters()
-                            .setAllowInvalidateSelectionsOnRendererCapabilitiesChange(true)
-                            .setAudioOffloadPreferences(
-                                TrackSelectionParameters.AudioOffloadPreferences.Builder()
-                                    .apply {
-                                        val config = prefs.getStringStrict("offload", "0")?.toIntOrNull()
-                                        if (config != null && config > 0 && Flags.OFFLOAD) {
-                                            rgAp.setOffloadEnabled(true)
-                                            setAudioOffloadMode(TrackSelectionParameters.AudioOffloadPreferences.AUDIO_OFFLOAD_MODE_ENABLED)
-                                            setIsGaplessSupportRequired(config == 2)
-                                        }
-                                    }
-                                    .build()))
-                })
-                .setPlaybackLooper(internalPlaybackThread.looper)
-                .build(),
-            { lyrics },
-            queueBoard = qb,
-            getNotificationLyric = { lastSentNotificationLyric }
-        )
-        player.exoPlayer.addAnalyticsListener(EventLogger())
-        player.exoPlayer.addAnalyticsListener(afFormatTracker)
-        player.exoPlayer.addAnalyticsListener(this)
-        player.exoPlayer.setShuffleOrder(CircularShuffleOrder(player, 0, 0, Random.nextLong()))
-        return player
-    }
-
     // When destroying, we should release server side player
     // alongside with the mediaSession.
     override fun onDestroy() {

app/src/main/res/values/strings.xml

@@ -392,6 +392,10 @@
     <string name="settings_status_bar_lyrics_title">Status bar lyrics</string>
     <!-- Settings toggle to enable showing lyrics in status bar (requires meizu phone). Subtext -->
     <string name="settings_status_bar_lyrics_summary">Enable MeiZu method of displaying lyrics in status bar (only available on some devices)</string>
+    <!-- Settings toggle to enable showing lyrics in media notification. Title -->
+    <string name="settings_notification_lyrics_title">Notification lyrics</string>
+    <!-- Settings toggle to enable showing lyrics in media notification. Subtext -->
+    <string name="settings_notification_lyrics_summary">Display lyrics as the notification title and artist - title as subtitle</string>
     <!-- Description shown about lyric widget in Android launcher / home screen's widget selector on Android 12+ -->
     <string name="lyric_widget_description">Widget that shows lyrics of currently playing media</string>
     <string name="card_widget_title">Card widget</string>