Commit c778c713 authored by Thomas's avatar Thomas
Browse files

Prepare Media3

parent 596c546c

app/build.gradle

+7 −4
Original line number Diff line number Diff line
@@ -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'

app/src/fdroid/java/app/fedilab/android/activities/BasePeertubeActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

app/src/main/java/app/fedilab/android/mastodon/helper/CacheDataSourceFactory.java

+11 −11
Original line number Diff line number Diff line
@@ -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.android.exoplayer2.database.ExoDatabaseProvider;

import com.google.android.exoplayer2.upstream.DataSource;

import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;

import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;

import com.google.android.exoplayer2.upstream.DefaultHttpDataSource;

import com.google.android.exoplayer2.upstream.FileDataSource;

import com.google.android.exoplayer2.upstream.cache.CacheDataSink;

import com.google.android.exoplayer2.upstream.cache.CacheDataSource;

import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor;

import com.google.android.exoplayer2.upstream.cache.SimpleCache;

import androidx.media3.datasource.DataSource;

import androidx.media3.datasource.DefaultDataSourceFactory;

import androidx.media3.datasource.DefaultHttpDataSource;

import androidx.media3.datasource.FileDataSource;

import androidx.media3.datasource.cache.CacheDataSink;

import androidx.media3.datasource.cache.CacheDataSource;

import androidx.media3.datasource.cache.LeastRecentlyUsedCacheEvictor;

import androidx.media3.datasource.cache.SimpleCache;



import java.io.File;



import app.fedilab.android.R;





@androidx.annotation.OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)

public class CacheDataSourceFactory implements DataSource.Factory {



    private static SimpleCache sDownloadCache;

app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java

+10 −7
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ import android.widget.Toast; 


import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.annotation.OptIn;

import androidx.appcompat.app.AlertDialog;

import androidx.appcompat.app.AppCompatActivity;

import androidx.appcompat.widget.LinearLayoutCompat;
@@ -88,6 +89,14 @@ import androidx.fragment.app.Fragment; 
import androidx.lifecycle.LifecycleOwner;

import androidx.lifecycle.ViewModelProvider;

import androidx.lifecycle.ViewModelStoreOwner;

import androidx.media3.common.MediaItem;

import androidx.media3.common.Player;

import androidx.media3.common.util.UnstableApi;

import androidx.media3.datasource.DataSource;

import androidx.media3.datasource.DefaultDataSource;

import androidx.media3.exoplayer.ExoPlayer;

import androidx.media3.exoplayer.source.ProgressiveMediaSource;

import androidx.media3.ui.PlayerView;

import androidx.preference.PreferenceManager;

import androidx.recyclerview.widget.LinearLayoutManager;

import androidx.recyclerview.widget.RecyclerView;
@@ -97,13 +106,6 @@ import com.bumptech.glide.ListPreloader; 
import com.bumptech.glide.RequestBuilder;

import com.bumptech.glide.request.RequestOptions;

import com.github.stom79.mytransl.MyTransL;

import com.google.android.exoplayer2.ExoPlayer;

import com.google.android.exoplayer2.MediaItem;

import com.google.android.exoplayer2.Player;

import com.google.android.exoplayer2.source.ProgressiveMediaSource;

import com.google.android.exoplayer2.ui.PlayerView;

import com.google.android.exoplayer2.upstream.DataSource;

import com.google.android.exoplayer2.upstream.DefaultDataSource;

import com.google.android.material.dialog.MaterialAlertDialogBuilder;

import com.smarteist.autoimageslider.SliderAnimations;

import com.smarteist.autoimageslider.SliderView;
@@ -390,6 +392,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
     * @param status       {@link Status}

     */

    @SuppressLint("ClickableViewAccessibility")

    @androidx.annotation.OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)

    public static void statusManagement(Context context,

                                        StatusesVM statusesVM,

                                        SearchVM searchVM,

app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusDirectMessageAdapter.java

+8 −7
Original line number Diff line number Diff line
@@ -49,17 +49,18 @@ import androidx.core.content.ContextCompat; 
import androidx.lifecycle.LifecycleOwner;

import androidx.lifecycle.ViewModelProvider;

import androidx.lifecycle.ViewModelStoreOwner;

import androidx.media3.common.MediaItem;

import androidx.media3.common.Player;

import androidx.media3.datasource.DataSource;

import androidx.media3.datasource.DefaultDataSource;

import androidx.media3.exoplayer.ExoPlayer;

import androidx.media3.exoplayer.source.ProgressiveMediaSource;

import androidx.media3.ui.PlayerView;

import androidx.preference.PreferenceManager;

import androidx.recyclerview.widget.RecyclerView;



import com.bumptech.glide.RequestBuilder;

import com.google.android.exoplayer2.ExoPlayer;

import com.google.android.exoplayer2.MediaItem;

import com.google.android.exoplayer2.Player;

import com.google.android.exoplayer2.source.ProgressiveMediaSource;

import com.google.android.exoplayer2.ui.PlayerView;

import com.google.android.exoplayer2.upstream.DataSource;

import com.google.android.exoplayer2.upstream.DefaultDataSource;





import org.jetbrains.annotations.NotNull;