From 1fb8bddf544476fa97d2db764391b6982855eab7 Mon Sep 17 00:00:00 2001 From: Jantz Date: Fri, 18 May 2018 11:07:47 -0500 Subject: [PATCH 1/6] Upgrade android gradle and dependencies --- app/build.gradle | 18 +++++++++--------- build.gradle | 4 +++- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 14 insertions(+), 12 deletions(-) mode change 100644 => 100755 app/build.gradle mode change 100644 => 100755 build.gradle diff --git a/app/build.gradle b/app/build.gradle old mode 100644 new mode 100755 index cba54cd5..4d99286e --- a/app/build.gradle +++ b/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 27 + buildToolsVersion '27.0.3' defaultConfig { applicationId "com.example.android.classicalmusicquiz" minSdkVersion 15 - targetSdkVersion 25 + targetSdkVersion 27 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -20,12 +20,12 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(dir: 'libs', include: ['*.jar']) + androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.google.android.exoplayer:exoplayer:r2.2.0' - compile 'com.android.support:appcompat-v7:25.3.0' - testCompile 'junit:junit:4.12' - compile 'com.android.support.constraint:constraint-layout:1.0.2' + implementation 'com.google.android.exoplayer:exoplayer:2.8.0' + implementation 'com.android.support:appcompat-v7:27.1.1' + testImplementation 'junit:junit:4.12' + implementation 'com.android.support.constraint:constraint-layout:1.1.0' } diff --git a/build.gradle b/build.gradle old mode 100644 new mode 100755 index 1ea4bd05..44bac8f9 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.0' + classpath 'com.android.tools.build:gradle:3.1.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,6 +16,7 @@ buildscript { allprojects { repositories { jcenter() + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7aff1511..5afc033d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Mar 07 11:16:24 PST 2017 +#Fri May 18 11:01:52 CDT 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip From edf747c147d21c8666fa4171eef0028ddbb6fd81 Mon Sep 17 00:00:00 2001 From: Jantz Date: Fri, 18 May 2018 13:08:37 -0500 Subject: [PATCH 2/6] Add //noinspection GradleCompatible --- app/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/app/build.gradle b/app/build.gradle index 4d99286e..819b27ad 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,6 +25,7 @@ dependencies { exclude group: 'com.android.support', module: 'support-annotations' }) implementation 'com.google.android.exoplayer:exoplayer:2.8.0' + //noinspection GradleCompatible implementation 'com.android.support:appcompat-v7:27.1.1' testImplementation 'junit:junit:4.12' implementation 'com.android.support.constraint:constraint-layout:1.1.0' From 767f815ea6b9cf8b8f61dadf168d425a07edc749 Mon Sep 17 00:00:00 2001 From: Jantz Date: Fri, 18 May 2018 16:03:34 -0500 Subject: [PATCH 3/6] Implement new ExoPlayer.EventListener updated methods --- .../classicalmusicquiz/QuizActivity.java | 27 +++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) mode change 100644 => 100755 app/src/main/java/com/example/android/classicalmusicquiz/QuizActivity.java diff --git a/app/src/main/java/com/example/android/classicalmusicquiz/QuizActivity.java b/app/src/main/java/com/example/android/classicalmusicquiz/QuizActivity.java old mode 100644 new mode 100755 index 7b4623f8..867cc75b --- a/app/src/main/java/com/example/android/classicalmusicquiz/QuizActivity.java +++ b/app/src/main/java/com/example/android/classicalmusicquiz/QuizActivity.java @@ -42,6 +42,7 @@ import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayerFactory; import com.google.android.exoplayer2.LoadControl; +import com.google.android.exoplayer2.PlaybackParameters; import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory; @@ -370,7 +371,8 @@ protected void onDestroy() { // ExoPlayer Event Listeners @Override - public void onTimelineChanged(Timeline timeline, Object manifest) { + public void onTimelineChanged(Timeline timeline, Object manifest, int reason) { + } @Override @@ -401,12 +403,33 @@ public void onPlayerStateChanged(boolean playWhenReady, int playbackState) { showNotification(mStateBuilder.build()); } + @Override + public void onRepeatModeChanged(int repeatMode) { + + } + + @Override + public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) { + + } + @Override public void onPlayerError(ExoPlaybackException error) { } @Override - public void onPositionDiscontinuity() { + public void onPositionDiscontinuity(int reason) { + + } + + @Override + public void onPlaybackParametersChanged(PlaybackParameters playbackParameters) { + + } + + @Override + public void onSeekProcessed() { + } /** From 591a19189f23f98bf4502ca71ba60ca56deeac29 Mon Sep 17 00:00:00 2001 From: Jantz Date: Fri, 18 May 2018 16:06:07 -0500 Subject: [PATCH 4/6] Import import android.support.v4.app.NotificationCompat instead of import android.support.v7.app.NotificationCompat --- .../com/example/android/classicalmusicquiz/QuizActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/example/android/classicalmusicquiz/QuizActivity.java b/app/src/main/java/com/example/android/classicalmusicquiz/QuizActivity.java index 867cc75b..e51d9fa1 100755 --- a/app/src/main/java/com/example/android/classicalmusicquiz/QuizActivity.java +++ b/app/src/main/java/com/example/android/classicalmusicquiz/QuizActivity.java @@ -27,12 +27,12 @@ import android.net.Uri; import android.os.Bundle; import android.os.Handler; +import android.support.v4.app.NotificationCompat; import android.support.v4.content.ContextCompat; import android.support.v4.media.session.MediaButtonReceiver; import android.support.v4.media.session.MediaSessionCompat; import android.support.v4.media.session.PlaybackStateCompat; import android.support.v7.app.AppCompatActivity; -import android.support.v7.app.NotificationCompat; import android.view.View; import android.widget.Button; import android.widget.Toast; From e79f7e5fd4f0380514e57bb979b1ab2518c14d3b Mon Sep 17 00:00:00 2001 From: Jantz Date: Fri, 18 May 2018 16:08:07 -0500 Subject: [PATCH 5/6] Apply "android.support.v4.media.app.NotificationCompat.MediaStyle"() in place of unresolved "Notification.MediaStyle()" --- .../com/example/android/classicalmusicquiz/QuizActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/example/android/classicalmusicquiz/QuizActivity.java b/app/src/main/java/com/example/android/classicalmusicquiz/QuizActivity.java index e51d9fa1..251d8ac4 100755 --- a/app/src/main/java/com/example/android/classicalmusicquiz/QuizActivity.java +++ b/app/src/main/java/com/example/android/classicalmusicquiz/QuizActivity.java @@ -231,7 +231,7 @@ private void showNotification(PlaybackStateCompat state) { .setVisibility(NotificationCompat.VISIBILITY_PUBLIC) .addAction(restartAction) .addAction(playPauseAction) - .setStyle(new NotificationCompat.MediaStyle() + .setStyle(new android.support.v4.media.app.NotificationCompat.MediaStyle() .setMediaSession(mMediaSession.getSessionToken()) .setShowActionsInCompactView(0,1)); From 262d947d4f57ec7854cef847cd38926d79b156bb Mon Sep 17 00:00:00 2001 From: Jantz Date: Fri, 18 May 2018 16:10:43 -0500 Subject: [PATCH 6/6] Replace "SeekBar" with "com.google.android.exoplayer2.ui.DefaultTimeBar" inside exo_playback_control_view.xml --- app/src/main/res/layout/exo_playback_control_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 app/src/main/res/layout/exo_playback_control_view.xml diff --git a/app/src/main/res/layout/exo_playback_control_view.xml b/app/src/main/res/layout/exo_playback_control_view.xml old mode 100644 new mode 100755 index b054fe67..0ee47233 --- a/app/src/main/res/layout/exo_playback_control_view.xml +++ b/app/src/main/res/layout/exo_playback_control_view.xml @@ -56,7 +56,7 @@ android:includeFontPadding="false" android:textColor="#FFBEBEBE"/> -