diff options
Diffstat (limited to '')
14 files changed, 43 insertions, 18 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewVideoActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewVideoActivity.java index 54eecf43..0600191a 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewVideoActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewVideoActivity.java @@ -57,6 +57,7 @@ import com.google.android.exoplayer2.source.hls.HlsMediaSource; import com.google.android.exoplayer2.trackselection.DefaultTrackSelector; import com.google.android.exoplayer2.trackselection.TrackSelectionOverride; import com.google.android.exoplayer2.ui.PlayerControlView; +import com.google.android.exoplayer2.ui.StyledPlayerControlView; import com.google.android.exoplayer2.ui.StyledPlayerView; import com.google.android.exoplayer2.ui.TrackSelectionDialogBuilder; import com.google.android.exoplayer2.upstream.DataSource; @@ -464,9 +465,9 @@ public class ViewVideoActivity extends AppCompatActivity implements CustomFontRe } else { StyledPlayerView videoPlayerView = findViewById(R.id.player_view_view_video_activity); videoPlayerView.setPlayer(player); - videoPlayerView.setControllerVisibilityListener(new StyledPlayerView.ControllerVisibilityListener() { + videoPlayerView.setControllerVisibilityListener(new StyledPlayerControlView.VisibilityListener() { @Override - public void onVisibilityChanged(int visibility) { + public void onVisibilityChange(int visibility) { switch (visibility) { case View.GONE: getWindow().getDecorView().setSystemUiVisibility( diff --git a/app/src/main/res/layout/activity_post_video.xml b/app/src/main/res/layout/activity_post_video.xml index 5b0b6f46..3dcde6b8 100644 --- a/app/src/main/res/layout/activity_post_video.xml +++ b/app/src/main/res/layout/activity_post_video.xml @@ -271,7 +271,9 @@ android:layout_width="match_parent" android:layout_height="400dp" android:visibility="gone" - 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" /> </LinearLayout> diff --git a/app/src/main/res/layout/activity_view_video.xml b/app/src/main/res/layout/activity_view_video.xml index 786cd9ae..10af052b 100644 --- a/app/src/main/res/layout/activity_view_video.xml +++ b/app/src/main/res/layout/activity_view_video.xml @@ -25,7 +25,9 @@ android:id="@+id/player_view_view_video_activity" android:layout_width="match_parent" android:layout_height="match_parent" - 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_playback_control_view.xml b/app/src/main/res/layout/exo_playback_control_view.xml index d6175ba3..5bcbb41f 100644 --- a/app/src/main/res/layout/exo_playback_control_view.xml +++ b/app/src/main/res/layout/exo_playback_control_view.xml @@ -37,7 +37,7 @@ app:strokeWidth="0dp" app:iconSize="24dp" app:iconTint="@null" - app:backgroundTint="#22FFFFFF" + app:backgroundTint="#10FFFFFF" android:visibility="gone" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" @@ -52,7 +52,7 @@ app:icon="@drawable/ic_fast_rewind_24dp" app:iconSize="24dp" app:iconTint="@null" - app:backgroundTint="#22FFFFFF" + app:backgroundTint="#444141" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/exo_play" @@ -85,7 +85,7 @@ app:icon="@drawable/ic_fast_forward_24dp" app:iconSize="24dp" app:iconTint="@null" - app:backgroundTint="#22FFFFFF" + app:backgroundTint="#444141" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -102,7 +102,7 @@ app:icon="@drawable/ic_video_quality_24dp" app:iconSize="24dp" app:iconTint="@null" - app:backgroundTint="#22FFFFFF" + app:backgroundTint="#444141" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" 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 3b8112d2..919dce1e 100644 --- a/app/src/main/res/layout/fragment_view_imgur_video.xml +++ b/app/src/main/res/layout/fragment_view_imgur_video.xml @@ -1,8 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <com.google.android.exoplayer2.ui.StyledPlayerView 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" android:layout_height="match_parent" - xmlns:app="http://schemas.android.com/apk/res-auto" + android:animateLayoutChanges="true" app:controller_layout_id="@layout/exo_playback_control_view" + app:animation_enabled="false" tools:context=".fragments.ViewImgurVideoFragment" />
\ No newline at end of file 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 5f11afb2..d2650ff3 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 @@ -10,6 +10,8 @@ android:id="@+id/player_view_view_reddit_gallery_video_fragment" android:layout_width="match_parent" android:layout_height="match_parent" - 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" /> </RelativeLayout>
\ No newline at end of file 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 acfbbd72..6a279d0c 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 @@ -30,9 +30,11 @@ android:id="@+id/player_view_item_post_card_2_video_autoplay" android:layout_width="match_parent" android:layout_height="match_parent" + android:animateLayoutChanges="true" app:show_timeout="1500" app:auto_show="false" - app:controller_layout_id="@layout/exo_autoplay_playback_control_view" /> + app:controller_layout_id="@layout/exo_autoplay_playback_control_view" + app:animation_enabled="false" /> <pl.droidsonroids.gif.GifImageView android:id="@+id/preview_image_view_item_post_card_2_video_autoplay" 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 281c9b33..552e6180 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 @@ -30,9 +30,11 @@ android:id="@+id/player_view_item_post_card_2_video_autoplay" android:layout_width="match_parent" android:layout_height="match_parent" + android:animateLayoutChanges="true" app:show_timeout="1500" app:auto_show="false" - app:controller_layout_id="@layout/exo_autoplay_playback_control_view_legacy" /> + app:controller_layout_id="@layout/exo_autoplay_playback_control_view_legacy" + app:animation_enabled="false" /> <pl.droidsonroids.gif.GifImageView android:id="@+id/preview_image_view_item_post_card_2_video_autoplay" 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 7f21cddc..472dffda 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 @@ -28,9 +28,11 @@ android:id="@+id/player_view_item_post_card_3_video_type_autoplay" android:layout_width="match_parent" android:layout_height="match_parent" + android:animateLayoutChanges="true" app:show_timeout="1500" app:auto_show="false" - app:controller_layout_id="@layout/exo_autoplay_playback_control_view" /> + app:controller_layout_id="@layout/exo_autoplay_playback_control_view" + app:animation_enabled="false" /> <pl.droidsonroids.gif.GifImageView android:id="@+id/preview_image_view_item_post_card_3_video_type_autoplay" 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 91509ab8..75e4f379 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 @@ -28,9 +28,11 @@ android:id="@+id/player_view_item_post_card_3_video_type_autoplay" android:layout_width="match_parent" android:layout_height="match_parent" + android:animateLayoutChanges="true" app:show_timeout="1500" app:auto_show="false" - app:controller_layout_id="@layout/exo_autoplay_playback_control_view_legacy" /> + app:controller_layout_id="@layout/exo_autoplay_playback_control_view_legacy" + app:animation_enabled="false" /> <pl.droidsonroids.gif.GifImageView android:id="@+id/preview_image_view_item_post_card_3_video_type_autoplay" 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 bb624809..519150d7 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 @@ -205,9 +205,11 @@ android:id="@+id/player_view_item_post_detail_video_autoplay" android:layout_width="match_parent" android:layout_height="match_parent" + android:animateLayoutChanges="true" app:show_timeout="1500" app:auto_show="false" - app:controller_layout_id="@layout/exo_autoplay_playback_control_view" /> + app:controller_layout_id="@layout/exo_autoplay_playback_control_view" + app:animation_enabled="false" /> <pl.droidsonroids.gif.GifImageView android:id="@+id/preview_image_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 49e6b34e..1bf5ed1f 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 @@ -205,9 +205,11 @@ android:id="@+id/player_view_item_post_detail_video_autoplay" android:layout_width="match_parent" android:layout_height="match_parent" + android:animateLayoutChanges="true" app:show_timeout="1500" app:auto_show="false" - app:controller_layout_id="@layout/exo_autoplay_playback_control_view_legacy" /> + app:controller_layout_id="@layout/exo_autoplay_playback_control_view_legacy" + app:animation_enabled="false" /> <pl.droidsonroids.gif.GifImageView android:id="@+id/preview_image_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 edde042a..93a7c205 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 @@ -195,9 +195,11 @@ android:id="@+id/player_view_item_post_video_type_autoplay" android:layout_width="match_parent" android:layout_height="match_parent" + android:animateLayoutChanges="true" app:show_timeout="1500" app:auto_show="false" - app:controller_layout_id="@layout/exo_autoplay_playback_control_view" /> + app:controller_layout_id="@layout/exo_autoplay_playback_control_view" + app:animation_enabled="false" /> <pl.droidsonroids.gif.GifImageView android:id="@+id/preview_image_view_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 9c093823..95516640 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 @@ -195,9 +195,11 @@ android:id="@+id/player_view_item_post_video_type_autoplay" android:layout_width="match_parent" android:layout_height="match_parent" + android:animateLayoutChanges="true" app:show_timeout="1500" app:auto_show="false" - app:controller_layout_id="@layout/exo_autoplay_playback_control_view_legacy" /> + app:controller_layout_id="@layout/exo_autoplay_playback_control_view_legacy" + app:animation_enabled="false" /> <pl.droidsonroids.gif.GifImageView android:id="@+id/preview_image_view_item_post_video_type_autoplay" |