diff --git a/app/build.gradle b/app/build.gradle old mode 100644 new mode 100755 index cba54cd5..819b27ad --- 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,13 @@ 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' + //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' } 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..251d8ac4 --- 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; @@ -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; @@ -230,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)); @@ -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() { + } /** 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"/> -