Prepare Media3

108 files changed, 1993 insertions, 73 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 268a76383..4917a13eb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -132,14 +132,18 @@ dependencies {
     implementation project(path: ':sparkbutton')
     implementation project(path: ':colorPicker')
     implementation project(path: ':mathjaxandroid')
-
+    implementation project(path: ':doubletapplayerview')
 
     implementation 'com.burhanrashid52:photoeditor:1.5.1'
     implementation("com.vanniktech:android-image-cropper:4.3.3")
     annotationProcessor "com.github.bumptech.glide:compiler:4.12.0"
     implementation 'jp.wasabeef:glide-transformations:4.3.0'
     implementation 'com.github.penfeizhou.android.animation:glide-plugin:2.23.0'
-    implementation 'com.google.android.exoplayer:exoplayer:2.19.1'
+    implementation "androidx.media3:media3-exoplayer:1.2.1"
+    implementation "androidx.media3:media3-exoplayer-dash:1.2.1"
+    implementation "androidx.media3:media3-ui:1.2.1"
+
+
     implementation "androidx.viewpager2:viewpager2:1.0.0"
     implementation 'com.github.piasy:rxandroidaudio:1.7.0'
     implementation 'com.github.piasy:AudioProcessor:1.7.0'
@@ -177,14 +181,13 @@ dependencies {
     implementation 'androidx.browser:browser:1.7.0'
     implementation 'androidx.documentfile:documentfile:1.0.1'
     implementation 'com.github.amoskorir:avatarimagegenerator:1.5.0'
-    implementation 'com.google.android.exoplayer:extension-mediasession:2.19.1'
+
     implementation "com.github.mabbas007:TagsEditText:1.0.5"
     implementation "net.gotev:uploadservice:4.9.2"
     implementation "net.gotev:uploadservice-okhttp:4.9.2"
     implementation 'androidx.media:media:1.7.0'
     implementation 'com.github.mancj:MaterialSearchBar:0.8.5'
 
-    implementation 'com.github.vkay94:DoubleTapPlayerView:1.0.0'
 
 
     implementation 'io.noties.markwon:core:4.6.2'
diff --git a/app/src/fdroid/java/app/fedilab/android/activities/BasePeertubeActivity.java b/app/src/fdroid/java/app/fedilab/android/activities/BasePeertubeActivity.java
index 1edddce2f..d190f88fa 100644
--- a/app/src/fdroid/java/app/fedilab/android/activities/BasePeertubeActivity.java
+++ b/app/src/fdroid/java/app/fedilab/android/activities/BasePeertubeActivity.java
@@ -28,9 +28,9 @@ import android.view.View;
 import android.webkit.MimeTypeMap;
 
 import androidx.appcompat.app.AlertDialog;
+import androidx.media3.common.Player;
 
 
-import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import org.jetbrains.annotations.NotNull;
@@ -53,7 +53,7 @@ public class BasePeertubeActivity extends BaseBarActivity {
 
     protected ActivityPeertubeBinding binding;
     protected VideoData.Video peertube;
-    protected ExoPlayer player;
+    protected Player player;
     protected String videoURL;
     protected String subtitlesStr;
 
diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/CacheDataSourceFactory.java b/app/src/main/java/app/fedilab/android/mastodon/helper/CacheDataSourceFactory.java
index 3f74b906d..ddfceadfd 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/helper/CacheDataSourceFactory.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/helper/CacheDataSourceFactory.java
@@ -18,24 +18,24 @@ import android.content.Context;
 import android.content.SharedPreferences;
 
 import androidx.annotation.NonNull;
+import androidx.media3.database.ExoDatabaseProvider;
+import androidx.media3.exoplayer.upstream.DefaultBandwidthMeter;
 import androidx.preference.PreferenceManager;
 
-import com.google.a