deps: update exoplayer to 2.18.0

Update ExoPlayer to 2.18.0 and fix all of the breaking changes.

CHANGELOG.md

@@ -10,12 +10,14 @@
 - Fixed broken tablet layouts
 - Fixed seam that would appear on some album covers
 - Fixed visual issue with the queue opening animation
+- Fixed miscellanious startup issues
 - Fixed crash if settings was navigated away before playback state
 finished saving
 
 #### Dev/Meta
 - Migrated preferences from shared object to utility
 - Removed 2.0.0 compat code
+- Updated ExoPlayer to 2.18.0
 
 ## v2.4.0
 

app/build.gradle

@@ -93,7 +93,7 @@ dependencies {
     // Exoplayer
     // WARNING: THE EXOPLAYER VERSION MUST BE KEPT IN LOCK-STEP WITH THE PRE-BUILD SCRIPT.
     // IF NOT, VERY UNFRIENDLY BUILD FAILURES AND CRASHES MAY ENSUE.
-    implementation "com.google.android.exoplayer:exoplayer-core:2.17.1"
+    implementation "com.google.android.exoplayer:exoplayer-core:2.18.0"
     implementation fileTree(dir: "libs", include: ["extension-*.aar"])
 
     // Image loading

app/src/main/java/org/oxycblt/auxio/playback/system/MediaSessionComponent.kt

@@ -166,7 +166,7 @@ class MediaSessionComponent(private val context: Context, private val player: Pl
 
     override fun onSettingChanged(key: String) {
         if (key == context.getString(R.string.set_key_show_covers) ||
-            key == context.getString(R.string.set_key_show_covers)) {
+            key == context.getString(R.string.set_key_quality_covers)) {
             updateMediaMetadata(playbackManager.song)
         }
     }

app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt

@@ -31,7 +31,7 @@ import com.google.android.exoplayer2.MediaItem
 import com.google.android.exoplayer2.PlaybackException
 import com.google.android.exoplayer2.Player
 import com.google.android.exoplayer2.RenderersFactory
-import com.google.android.exoplayer2.TracksInfo
+import com.google.android.exoplayer2.Tracks
 import com.google.android.exoplayer2.audio.AudioAttributes
 import com.google.android.exoplayer2.audio.AudioCapabilities
 import com.google.android.exoplayer2.audio.MediaCodecAudioRenderer
@@ -229,14 +229,14 @@ class PlaybackService :
         }
     }
 
-    override fun onTracksInfoChanged(tracksInfo: TracksInfo) {
+    override fun onTracksChanged(tracks: Tracks) {
-        super.onTracksInfoChanged(tracksInfo)
+        super.onTracksChanged(tracks)
 
-        for (info in tracksInfo.trackGroupInfos) {
+        for (group in tracks.groups) {
-            if (info.isSelected) {
+            if (group.isSelected) {
-                for (i in 0 until info.trackGroup.length) {
+                for (i in 0 until group.length) {
-                    if (info.isTrackSelected(i)) {
+                    if (group.isTrackSelected(i)) {
-                        replayGainProcessor.applyReplayGain(info.trackGroup.getFormat(i).metadata)
+                        replayGainProcessor.applyReplayGain(group.getTrackFormat(i).metadata)
                         break
                     }
                 }
@@ -292,11 +292,11 @@ class PlaybackService :
 
     override fun onSettingChanged(key: String) {
         when (key) {
-            getString(R.string.set_replay_gain),
+            getString(R.string.set_key_replay_gain),
-            getString(R.string.set_pre_amp_with),
+            getString(R.string.set_key_pre_amp_with),
-            getString(R.string.set_pre_amp_without) -> onTracksInfoChanged(player.currentTracksInfo)
+            getString(R.string.set_key_pre_amp_without) -> onTracksChanged(player.currentTracks)
-            getString(R.string.set_show_covers),
+            getString(R.string.set_key_show_covers),
-            getString(R.string.set_quality_covers) ->
+            getString(R.string.set_key_quality_covers) ->
                 playbackManager.song?.let { song ->
                     notificationComponent.updateMetadata(song, playbackManager.parent)
                 }
@@ -352,7 +352,7 @@ class PlaybackService :
             .setAudioAttributes(
                 AudioAttributes.Builder()
                     .setUsage(C.USAGE_MEDIA)
-                    .setContentType(C.CONTENT_TYPE_MUSIC)
+                    .setContentType(C.AUDIO_CONTENT_TYPE_MUSIC)
                     .build(),
                 true)
             .build()

app/src/main/res/values-sw600dp/styles_ui.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <style name="Widget.Auxio.Toolbar.Actions" parent="Widget.Auxio.Toolbar.Base">
         <item name="android:layout_marginEnd">@dimen/spacing_tiny_inv</item>
     </style>

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

@@ -20,22 +20,18 @@
          -->
         <item name="android:layout_marginEnd">@dimen/spacing_tiny</item>
     </style>
-    \
 
     <style name="Widget.Auxio.Toolbar.Icon" parent="Widget.Auxio.Toolbar.Base">
         <item name="navigationIcon">@drawable/ic_back</item>
     </style>
-    \
 
     <style name="Widget.Auxio.Toolbar.Icon.Actions" parent="Widget.Auxio.Toolbar.Actions">
         <item name="navigationIcon">@drawable/ic_back</item>
     </style>
-    \
 
     <style name="Widget.Auxio.Toolbar.Icon.Down" parent="Widget.Auxio.Toolbar.Base">
         <item name="navigationIcon">@drawable/ic_down</item>
     </style>
-    \
 
     <style name="Widget.Auxio.Toolbar.Icon.Down.Actions" parent="Widget.Auxio.Toolbar.Actions">
         <item name="navigationIcon">@drawable/ic_down</item>

prebuild.py

@@ -19,7 +19,7 @@ import re
 
 # WARNING: THE EXOPLAYER VERSION MUST BE KEPT IN LOCK-STEP WITH THE FLAC EXTENSION AND 
 # THE GRADLE DEPENDENCY. IF NOT, VERY UNFRIENDLY BUILD FAILURES AND CRASHES MAY ENSUE.
-EXO_VERSION = "2.17.1"
+EXO_VERSION = "2.18.0"
 FLAC_VERSION = "1.3.2"
 
 FATAL="\033[1;31m"