Resolve conflicts: Some refactors on media activities.

This commit is contained in:
Alex Ning
2020-06-16 15:17:00 +08:00
parent 268ea4f9d8
commit 88a2119586
22 changed files with 519 additions and 908 deletions

View File

@@ -40,7 +40,7 @@ dependencies {
implementation "androidx.room:room-runtime:$roomVersion"
annotationProcessor "androidx.room:room-compiler:$roomVersion"
implementation 'androidx.work:work-runtime:2.3.4'
implementation 'com.google.android.material:material:1.2.0-alpha05'
implementation 'com.google.android.material:material:1.3.0-alpha01'
implementation 'com.google.android.exoplayer:exoplayer-core:2.10.4'
implementation 'com.google.android.exoplayer:exoplayer-hls:2.10.4'