[📼] ExoPlayer 2.7.0 -> 2.9.1 (#388)

* bumping exoplayer after a futile subtitles attempt * fixing unsightly status bar on 21 and above * bumping support libraries because they clashed with dependencies' dependencies
kickstarter · Nov 27, 2018 · 7929359 · 7929359
1 parent 29cb41d
commit 7929359
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 18 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -158,9 +158,9 @@ android {
     }
 
     configurations.all {
-        resolutionStrategy.force 'com.android.support:appcompat-v7:27.1.0'
-        resolutionStrategy.force 'com.android.support:animated-vector-drawable:27.1.0'
-        resolutionStrategy.force 'com.android.support:customtabs:27.1.0'
+        resolutionStrategy.force 'com.android.support:appcompat-v7:27.1.1'
+        resolutionStrategy.force 'com.android.support:animated-vector-drawable:27.1.1'
+        resolutionStrategy.force 'com.android.support:customtabs:27.1.1'
     }
 
 }
@@ -212,7 +212,7 @@ final butterknife_version = "7.0.1"
 final constraint_layout_version = "1.1.0"
 final crashlytics_version = "2.9.6@aar"
 final dagger_version = "2.11"
-final exoplayer_version = "2.7.0"
+final exoplayer_version = "2.9.1"
 final facebook_version = "4.33.0"
 final firebase_version = "16.0.0"
 final firebase_job_dispatcher_version = "0.8.5"
@@ -232,7 +232,7 @@ final rx_binding_version = "0.3.0"
 final rx_java_version = "1.1.5"
 final rx_lifecycle_version = "0.3.0"
 final stripe_version = "6.1.2"
-final support_version = "27.1.0"
+final support_version = "27.1.1"
 final support_annotations_version = "27.1.1"
 final timber_version = "3.0.1"
 

diff --git a/app/src/main/java/com/kickstarter/ui/activities/VideoActivity.java b/app/src/main/java/com/kickstarter/ui/activities/VideoActivity.java
@@ -18,9 +18,7 @@
 import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
-import com.google.android.exoplayer2.trackselection.TrackSelector;
 import com.google.android.exoplayer2.ui.PlayerView;
-import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
 import com.google.android.exoplayer2.upstream.DefaultHttpDataSourceFactory;
 import com.google.android.exoplayer2.util.Util;
 import com.kickstarter.R;
@@ -38,13 +36,10 @@
 
 @RequiresActivityViewModel(VideoViewModel.ViewModel.class)
 public final class VideoActivity extends BaseActivity<VideoViewModel.ViewModel> {
-  private static final DefaultBandwidthMeter BANDWIDTH_METER = new DefaultBandwidthMeter();
-
   private Build build;
   private ExoPlayer player;
   private long playerPosition;
-  private TrackSelector trackSelector;
-
+  private DefaultTrackSelector trackSelector;
 
   protected @Bind(R.id.video_player_layout) View rootView;
   protected @Bind(R.id.player_view) PlayerView playerView;
@@ -109,7 +104,7 @@ private void onStateChanged(final int playbackState) {
   }
 
   private void preparePlayer(final @NonNull String videoUrl) {
-    final TrackSelection.Factory adaptiveTrackSelectionFactory = new AdaptiveTrackSelection.Factory(BANDWIDTH_METER);
+    final TrackSelection.Factory adaptiveTrackSelectionFactory = new AdaptiveTrackSelection.Factory();
     this.trackSelector = new DefaultTrackSelector(adaptiveTrackSelectionFactory);
 
     this.player = ExoPlayerFactory.newSimpleInstance(this, this.trackSelector);
@@ -145,8 +140,8 @@ private void releasePlayer() {
     }
   }
 
-  private @NonNull Player.DefaultEventListener eventListener =
-    new Player.DefaultEventListener() {
+  private @NonNull Player.EventListener eventListener =
+    new Player.EventListener() {
       @Override
       public void onPlayerStateChanged(final boolean playWhenReady, final int playbackState) {
         onStateChanged(playbackState);

diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
@@ -17,10 +17,6 @@
     <item name="android:windowDrawsSystemBarBackgrounds">true</item>
   </style>
 
-  <style name="VideoPlayerActivity" parent="DiscoveryBase">
-    <item name="android:statusBarColor">@color/transparent</item>
-  </style>
-
   <style name="EndSettingsWidget" parent="EndSettingsWidgetBase">
     <item name="android:layout_alignParentEnd">true</item>
   </style>