diff options
Diffstat (limited to 'app/src/main/res')
17 files changed, 37 insertions, 35 deletions
diff --git a/app/src/main/res/layout/activity_post_video.xml b/app/src/main/res/layout/activity_post_video.xml index 3dcde6b8..9171b0ec 100644 --- a/app/src/main/res/layout/activity_post_video.xml +++ b/app/src/main/res/layout/activity_post_video.xml @@ -266,7 +266,7 @@ android:fontFamily="?attr/font_family" android:visibility="gone" /> - <com.google.android.exoplayer2.ui.StyledPlayerView + <androidx.media3.ui.PlayerView android:id="@+id/player_view_post_video_activity" android:layout_width="match_parent" android:layout_height="400dp" diff --git a/app/src/main/res/layout/activity_view_video.xml b/app/src/main/res/layout/activity_view_video.xml index 10af052b..7655bd63 100644 --- a/app/src/main/res/layout/activity_view_video.xml +++ b/app/src/main/res/layout/activity_view_video.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <com.google.android.exoplayer2.ui.StyledPlayerView + <androidx.media3.ui.PlayerView android:id="@+id/player_view_view_video_activity" android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/app/src/main/res/layout/activity_view_video_zoomable.xml b/app/src/main/res/layout/activity_view_video_zoomable.xml index c561ed82..3d2f9142 100644 --- a/app/src/main/res/layout/activity_view_video_zoomable.xml +++ b/app/src/main/res/layout/activity_view_video_zoomable.xml @@ -29,12 +29,14 @@ app:verticalPanEnabled="true" app:zoomEnabled="true" /> - <com.google.android.exoplayer2.ui.PlayerControlView + <androidx.media3.ui.PlayerControlView android:id="@+id/player_control_view_view_video_activity" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" - app:controller_layout_id="@layout/exo_playback_control_view" /> + android:animateLayoutChanges="true" + app:controller_layout_id="@layout/exo_playback_control_view" + app:animation_enabled="false" /> <ProgressBar android:id="@+id/progress_bar_view_video_activity" diff --git a/app/src/main/res/layout/exo_autoplay_playback_control_view.xml b/app/src/main/res/layout/exo_autoplay_playback_control_view.xml index b03d5f2b..de1b8fff 100644 --- a/app/src/main/res/layout/exo_autoplay_playback_control_view.xml +++ b/app/src/main/res/layout/exo_autoplay_playback_control_view.xml @@ -89,7 +89,7 @@ app:layout_constraintBottom_toTopOf="@id/exo_progress" app:layout_constraintEnd_toEndOf="parent" /> - <com.google.android.exoplayer2.ui.DefaultTimeBar + <androidx.media3.ui.DefaultTimeBar android:id="@id/exo_progress" android:layout_width="match_parent" android:layout_height="24dp" diff --git a/app/src/main/res/layout/exo_autoplay_playback_control_view_legacy.xml b/app/src/main/res/layout/exo_autoplay_playback_control_view_legacy.xml index 3310987d..1295c4c2 100644 --- a/app/src/main/res/layout/exo_autoplay_playback_control_view_legacy.xml +++ b/app/src/main/res/layout/exo_autoplay_playback_control_view_legacy.xml @@ -75,7 +75,7 @@ </RelativeLayout> - <com.google.android.exoplayer2.ui.DefaultTimeBar + <androidx.media3.ui.DefaultTimeBar android:id="@id/exo_progress" android:layout_width="wrap_content" android:layout_height="26dp"/> diff --git a/app/src/main/res/layout/exo_playback_control_view.xml b/app/src/main/res/layout/exo_playback_control_view.xml index d4b5dba5..3f0fa176 100644 --- a/app/src/main/res/layout/exo_playback_control_view.xml +++ b/app/src/main/res/layout/exo_playback_control_view.xml @@ -128,7 +128,7 @@ android:textColor="#FFFFFF" android:fontFamily="?attr/font_family" /> - <com.google.android.exoplayer2.ui.DefaultTimeBar + <androidx.media3.ui.DefaultTimeBar android:id="@id/exo_progress" android:layout_width="0dp" android:layout_weight="1" diff --git a/app/src/main/res/layout/fragment_view_imgur_video.xml b/app/src/main/res/layout/fragment_view_imgur_video.xml index 919dce1e..f6908967 100644 --- a/app/src/main/res/layout/fragment_view_imgur_video.xml +++ b/app/src/main/res/layout/fragment_view_imgur_video.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<com.google.android.exoplayer2.ui.StyledPlayerView xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.media3.ui.PlayerView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" diff --git a/app/src/main/res/layout/fragment_view_reddit_gallery_video.xml b/app/src/main/res/layout/fragment_view_reddit_gallery_video.xml index d2650ff3..ba8b4744 100644 --- a/app/src/main/res/layout/fragment_view_reddit_gallery_video.xml +++ b/app/src/main/res/layout/fragment_view_reddit_gallery_video.xml @@ -6,7 +6,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" tools:context=".fragments.ViewRedditGalleryVideoFragment"> - <com.google.android.exoplayer2.ui.StyledPlayerView + <androidx.media3.ui.PlayerView android:id="@+id/player_view_view_reddit_gallery_video_fragment" android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/app/src/main/res/layout/item_post_card_2_video_autoplay.xml b/app/src/main/res/layout/item_post_card_2_video_autoplay.xml index 6a279d0c..def1c328 100644 --- a/app/src/main/res/layout/item_post_card_2_video_autoplay.xml +++ b/app/src/main/res/layout/item_post_card_2_video_autoplay.xml @@ -19,14 +19,14 @@ app:cardCornerRadius="8dp" style="?attr/materialCardViewElevatedStyle"> - <com.google.android.exoplayer2.ui.AspectRatioFrameLayout + <androidx.media3.ui.AspectRatioFrameLayout android:id="@+id/aspect_ratio_frame_layout_item_post_card_2_video_autoplay" android:layout_width="match_parent" android:layout_height="0dp" android:background="#000000" app:resize_mode="fixed_width"> - <com.google.android.exoplayer2.ui.StyledPlayerView + <androidx.media3.ui.PlayerView android:id="@+id/player_view_item_post_card_2_video_autoplay" android:layout_width="match_parent" android:layout_height="match_parent" @@ -53,7 +53,7 @@ android:src="@drawable/ic_error_white_36dp" android:visibility="gone" /> - </com.google.android.exoplayer2.ui.AspectRatioFrameLayout> + </androidx.media3.ui.AspectRatioFrameLayout> </com.google.android.material.card.MaterialCardView> diff --git a/app/src/main/res/layout/item_post_card_2_video_autoplay_legacy_controller.xml b/app/src/main/res/layout/item_post_card_2_video_autoplay_legacy_controller.xml index 552e6180..08110054 100644 --- a/app/src/main/res/layout/item_post_card_2_video_autoplay_legacy_controller.xml +++ b/app/src/main/res/layout/item_post_card_2_video_autoplay_legacy_controller.xml @@ -19,14 +19,14 @@ app:cardCornerRadius="8dp" style="?attr/materialCardViewElevatedStyle"> - <com.google.android.exoplayer2.ui.AspectRatioFrameLayout + <androidx.media3.ui.AspectRatioFrameLayout android:id="@+id/aspect_ratio_frame_layout_item_post_card_2_video_autoplay" android:layout_width="match_parent" android:layout_height="0dp" android:background="#000000" app:resize_mode="fixed_width"> - <com.google.android.exoplayer2.ui.StyledPlayerView + <androidx.media3.ui.PlayerView android:id="@+id/player_view_item_post_card_2_video_autoplay" android:layout_width="match_parent" android:layout_height="match_parent" @@ -53,7 +53,7 @@ android:src="@drawable/ic_error_white_36dp" android:visibility="gone" /> - </com.google.android.exoplayer2.ui.AspectRatioFrameLayout> + </androidx.media3.ui.AspectRatioFrameLayout> </com.google.android.material.card.MaterialCardView> diff --git a/app/src/main/res/layout/item_post_card_3_video_type_autoplay.xml b/app/src/main/res/layout/item_post_card_3_video_type_autoplay.xml index 472dffda..5001a3ed 100644 --- a/app/src/main/res/layout/item_post_card_3_video_type_autoplay.xml +++ b/app/src/main/res/layout/item_post_card_3_video_type_autoplay.xml @@ -17,14 +17,14 @@ android:layout_height="wrap_content" android:orientation="vertical"> - <com.google.android.exoplayer2.ui.AspectRatioFrameLayout + <androidx.media3.ui.AspectRatioFrameLayout android:id="@+id/aspect_ratio_frame_layout_item_post_card_3_video_type_autoplay" android:layout_width="match_parent" android:layout_height="0dp" android:background="#000000" app:resize_mode="fixed_width"> - <com.google.android.exoplayer2.ui.StyledPlayerView + <androidx.media3.ui.PlayerView android:id="@+id/player_view_item_post_card_3_video_type_autoplay" android:layout_width="match_parent" android:layout_height="match_parent" @@ -51,7 +51,7 @@ android:src="@drawable/ic_error_white_36dp" android:visibility="gone" /> - </com.google.android.exoplayer2.ui.AspectRatioFrameLayout> + </androidx.media3.ui.AspectRatioFrameLayout> <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/item_post_card_3_video_type_autoplay_legacy_controller.xml b/app/src/main/res/layout/item_post_card_3_video_type_autoplay_legacy_controller.xml index 75e4f379..0b6d47ca 100644 --- a/app/src/main/res/layout/item_post_card_3_video_type_autoplay_legacy_controller.xml +++ b/app/src/main/res/layout/item_post_card_3_video_type_autoplay_legacy_controller.xml @@ -17,14 +17,14 @@ android:layout_height="wrap_content" android:orientation="vertical"> - <com.google.android.exoplayer2.ui.AspectRatioFrameLayout + <androidx.media3.ui.AspectRatioFrameLayout android:id="@+id/aspect_ratio_frame_layout_item_post_card_3_video_type_autoplay" android:layout_width="match_parent" android:layout_height="0dp" android:background="#000000" app:resize_mode="fixed_width"> - <com.google.android.exoplayer2.ui.StyledPlayerView + <androidx.media3.ui.PlayerView android:id="@+id/player_view_item_post_card_3_video_type_autoplay" android:layout_width="match_parent" android:layout_height="match_parent" @@ -51,7 +51,7 @@ android:src="@drawable/ic_error_white_36dp" android:visibility="gone" /> - </com.google.android.exoplayer2.ui.AspectRatioFrameLayout> + </androidx.media3.ui.AspectRatioFrameLayout> <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/item_post_detail_video_autoplay.xml b/app/src/main/res/layout/item_post_detail_video_autoplay.xml index 519150d7..c7f83e63 100644 --- a/app/src/main/res/layout/item_post_detail_video_autoplay.xml +++ b/app/src/main/res/layout/item_post_detail_video_autoplay.xml @@ -194,14 +194,14 @@ </com.nex3z.flowlayout.FlowLayout> - <com.google.android.exoplayer2.ui.AspectRatioFrameLayout + <androidx.media3.ui.AspectRatioFrameLayout android:id="@+id/aspect_ratio_frame_layout_item_post_detail_video_autoplay" android:layout_width="match_parent" android:layout_height="0dp" android:background="#000000" app:resize_mode="fixed_width"> - <com.google.android.exoplayer2.ui.StyledPlayerView + <androidx.media3.ui.PlayerView android:id="@+id/player_view_item_post_detail_video_autoplay" android:layout_width="match_parent" android:layout_height="match_parent" @@ -227,7 +227,7 @@ android:src="@drawable/ic_error_white_36dp" android:visibility="gone" /> - </com.google.android.exoplayer2.ui.AspectRatioFrameLayout> + </androidx.media3.ui.AspectRatioFrameLayout> <androidx.recyclerview.widget.RecyclerView android:id="@+id/content_markdown_view_item_post_detail_video_autoplay" diff --git a/app/src/main/res/layout/item_post_detail_video_autoplay_legacy_controller.xml b/app/src/main/res/layout/item_post_detail_video_autoplay_legacy_controller.xml index 1bf5ed1f..5fc8b31c 100644 --- a/app/src/main/res/layout/item_post_detail_video_autoplay_legacy_controller.xml +++ b/app/src/main/res/layout/item_post_detail_video_autoplay_legacy_controller.xml @@ -194,14 +194,14 @@ </com.nex3z.flowlayout.FlowLayout> - <com.google.android.exoplayer2.ui.AspectRatioFrameLayout + <androidx.media3.ui.AspectRatioFrameLayout android:id="@+id/aspect_ratio_frame_layout_item_post_detail_video_autoplay" android:layout_width="match_parent" android:layout_height="0dp" android:background="#000000" app:resize_mode="fixed_width"> - <com.google.android.exoplayer2.ui.StyledPlayerView + <androidx.media3.ui.PlayerView android:id="@+id/player_view_item_post_detail_video_autoplay" android:layout_width="match_parent" android:layout_height="match_parent" @@ -228,7 +228,7 @@ android:src="@drawable/ic_error_white_36dp" android:visibility="gone" /> - </com.google.android.exoplayer2.ui.AspectRatioFrameLayout> + </androidx.media3.ui.AspectRatioFrameLayout> <androidx.recyclerview.widget.RecyclerView android:id="@+id/content_markdown_view_item_post_detail_video_autoplay" diff --git a/app/src/main/res/layout/item_post_video_type_autoplay.xml b/app/src/main/res/layout/item_post_video_type_autoplay.xml index 93a7c205..6082e545 100644 --- a/app/src/main/res/layout/item_post_video_type_autoplay.xml +++ b/app/src/main/res/layout/item_post_video_type_autoplay.xml @@ -184,14 +184,14 @@ </com.nex3z.flowlayout.FlowLayout> - <com.google.android.exoplayer2.ui.AspectRatioFrameLayout + <androidx.media3.ui.AspectRatioFrameLayout android:id="@+id/aspect_ratio_frame_layout_item_post_video_type_autoplay" android:layout_width="match_parent" android:layout_height="0dp" android:background="#000000" app:resize_mode="fixed_width"> - <com.google.android.exoplayer2.ui.StyledPlayerView + <androidx.media3.ui.PlayerView android:id="@+id/player_view_item_post_video_type_autoplay" android:layout_width="match_parent" android:layout_height="match_parent" @@ -218,7 +218,7 @@ android:src="@drawable/ic_error_white_36dp" android:visibility="gone" /> - </com.google.android.exoplayer2.ui.AspectRatioFrameLayout> + </androidx.media3.ui.AspectRatioFrameLayout> <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/bottom_constraint_layout_item_post_video_type_autoplay" diff --git a/app/src/main/res/layout/item_post_video_type_autoplay_legacy_controller.xml b/app/src/main/res/layout/item_post_video_type_autoplay_legacy_controller.xml index 95516640..52290db7 100644 --- a/app/src/main/res/layout/item_post_video_type_autoplay_legacy_controller.xml +++ b/app/src/main/res/layout/item_post_video_type_autoplay_legacy_controller.xml @@ -184,14 +184,14 @@ </com.nex3z.flowlayout.FlowLayout> - <com.google.android.exoplayer2.ui.AspectRatioFrameLayout + <androidx.media3.ui.AspectRatioFrameLayout android:id="@+id/aspect_ratio_frame_layout_item_post_video_type_autoplay" android:layout_width="match_parent" android:layout_height="0dp" android:background="#000000" app:resize_mode="fixed_width"> - <com.google.android.exoplayer2.ui.StyledPlayerView + <androidx.media3.ui.PlayerView android:id="@+id/player_view_item_post_video_type_autoplay" android:layout_width="match_parent" android:layout_height="match_parent" @@ -218,7 +218,7 @@ android:src="@drawable/ic_error_white_36dp" android:visibility="gone" /> - </com.google.android.exoplayer2.ui.AspectRatioFrameLayout> + </androidx.media3.ui.AspectRatioFrameLayout> <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/bottom_constraint_layout_item_post_video_type_autoplay" diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 428d7c01..958b57dc 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -524,12 +524,12 @@ </style> <style name="ToroMediaButton.Play"> - <item name="android:src">@drawable/exo_controls_play</item> + <item name="android:src">@drawable/ic_play_arrow_24dp</item> <item name="android:contentDescription">@string/exo_controls_play_description</item> </style> <style name="ToroMediaButton.Pause"> - <item name="android:src">@drawable/exo_controls_pause</item> + <item name="android:src">@drawable/ic_pause_24dp</item> <item name="android:contentDescription">@string/exo_controls_pause_description</item> </style> |