From 6d74eb686f9c97924cd33dee288d4fd7a258944d Mon Sep 17 00:00:00 2001 From: Igor Tironi Date: Thu, 3 Mar 2022 15:57:21 -0800 Subject: [PATCH 1/7] Always check for hideShutterView before showing shutterView --- .../src/main/java/com/brentvatne/exoplayer/ExoPlayerView.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ExoPlayerView.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ExoPlayerView.java index 61cb0dd6..f8881631 100644 --- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ExoPlayerView.java +++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ExoPlayerView.java @@ -139,7 +139,7 @@ public final class ExoPlayerView extends FrameLayout { clearVideoView(); } this.player = player; - shutterView.setVisibility(VISIBLE); + shutterView.setVisibility(this.hideShutterView ? View.INVISIBLE : View.VISIBLE); if (player != null) { setVideoView(); player.addVideoListener(componentListener); @@ -206,7 +206,7 @@ public final class ExoPlayerView extends FrameLayout { } } // Video disabled so the shutter must be closed. - shutterView.setVisibility(VISIBLE); + shutterView.setVisibility(this.hideShutterView ? View.INVISIBLE : View.VISIBLE); } public void invalidateAspectRatio() { From 4eed72f22462086fc9c5cce0ecf60e498b0548a0 Mon Sep 17 00:00:00 2001 From: Igor Tironi Date: Thu, 3 Mar 2022 16:03:59 -0800 Subject: [PATCH 2/7] update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc7f5943..aac2d41e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## Changelog +### Version 5.2.2 + +- Ensure we always use `hideShutterView` before showing the `shutterView` on Android + ### Version 5.2.1 - Add Google's maven repository to avoid build error [#2552] (https://github.com/react-native-video/react-native-video/pull/2552) From b025362d9821958c9afbc384b413bbadc8ad363b Mon Sep 17 00:00:00 2001 From: Igor Tironi Date: Fri, 29 Apr 2022 18:15:35 -0700 Subject: [PATCH 3/7] moved changes to 6.0.0-aplha1 --- CHANGELOG.md | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 02feb4d8..dbfcc328 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ### Version 6.0.0-alpha1 +- Ensure we always use `hideShutterView` before showing the `shutterView` on Android - Add Google's maven repository to avoid build error [#2552](https://github.com/react-native-video/react-native-video/pull/2552) - Fix iOS 15.4 HLS playback race condition [#2633](https://github.com/react-native-video/react-native-video/pull/2633) - Add fullscreen support on Android [#2073](https://github.com/react-native-video/react-native-video/pull/2073) @@ -13,14 +14,6 @@ - Fix nil string uri parameter error [#695](https://github.com/react-native-video/react-native-video/pull/695) - (Breaking) Bump shaka-player to 3.3.2 [#2587](https://github.com/react-native-video/react-native-video/pull/2587) -### Version 5.2.2 - -- Ensure we always use `hideShutterView` before showing the `shutterView` on Android - -### Version 5.2.1 - -- Add Google's maven repository to avoid build error [#2552] (https://github.com/react-native-video/react-native-video/pull/2552) - ### Version 5.2.0 - Fix for tvOS native audio menu language selector From 61888189fbb543c9005c96c9bb2c86d18dbdcc11 Mon Sep 17 00:00:00 2001 From: Igor Tironi Date: Fri, 29 Apr 2022 18:16:37 -0700 Subject: [PATCH 4/7] added link to PR --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dbfcc328..923f6137 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,6 @@ ### Version 6.0.0-alpha1 -- Ensure we always use `hideShutterView` before showing the `shutterView` on Android - Add Google's maven repository to avoid build error [#2552](https://github.com/react-native-video/react-native-video/pull/2552) - Fix iOS 15.4 HLS playback race condition [#2633](https://github.com/react-native-video/react-native-video/pull/2633) - Add fullscreen support on Android [#2073](https://github.com/react-native-video/react-native-video/pull/2073) @@ -13,6 +12,7 @@ - Better support newer versions of RNW (64 and newer) [#2535](https://github.com/react-native-video/react-native-video/pull/2535) - Fix nil string uri parameter error [#695](https://github.com/react-native-video/react-native-video/pull/695) - (Breaking) Bump shaka-player to 3.3.2 [#2587](https://github.com/react-native-video/react-native-video/pull/2587) +- Ensure we always use `hideShutterView` before showing the `shutterView` on Android [#2609](https://github.com/react-native-video/react-native-video/pull/2609) ### Version 5.2.0 From 37fd531a594f5b87918674b4ec6aa767b38928af Mon Sep 17 00:00:00 2001 From: Igor Tironi Date: Fri, 29 Apr 2022 18:18:44 -0700 Subject: [PATCH 5/7] moved to 6.0.0-alpha2 --- CHANGELOG.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 923f6137..f4e9e786 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## Changelog +### Version 6.0.0-alpha2 + +- Ensure we always use `hideShutterView` before showing the `shutterView` on Android [#2609](https://github.com/react-native-video/react-native-video/pull/2609) + ### Version 6.0.0-alpha1 - Add Google's maven repository to avoid build error [#2552](https://github.com/react-native-video/react-native-video/pull/2552) @@ -11,8 +15,6 @@ - Make sure modifiers are applied before playing [#2395](https://github.com/react-native-video/react-native-video/pull/2395) - Better support newer versions of RNW (64 and newer) [#2535](https://github.com/react-native-video/react-native-video/pull/2535) - Fix nil string uri parameter error [#695](https://github.com/react-native-video/react-native-video/pull/695) -- (Breaking) Bump shaka-player to 3.3.2 [#2587](https://github.com/react-native-video/react-native-video/pull/2587) -- Ensure we always use `hideShutterView` before showing the `shutterView` on Android [#2609](https://github.com/react-native-video/react-native-video/pull/2609) ### Version 5.2.0 From eb3cda3601ee8868d76a723d9abf5ea31f17c7d1 Mon Sep 17 00:00:00 2001 From: Igor Tironi Date: Fri, 29 Apr 2022 18:19:17 -0700 Subject: [PATCH 6/7] added back change that was removed --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4e9e786..157a2908 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Make sure modifiers are applied before playing [#2395](https://github.com/react-native-video/react-native-video/pull/2395) - Better support newer versions of RNW (64 and newer) [#2535](https://github.com/react-native-video/react-native-video/pull/2535) - Fix nil string uri parameter error [#695](https://github.com/react-native-video/react-native-video/pull/695) +- (Breaking) Bump shaka-player to 3.3.2 [#2587](https://github.com/react-native-video/react-native-video/pull/2587) ### Version 5.2.0 From 6c6155680b3db354a75b9ac21e15c94d866fc70a Mon Sep 17 00:00:00 2001 From: Igor Tironi Date: Mon, 2 May 2022 10:11:07 -0700 Subject: [PATCH 7/7] moved changelog item to alpha1 --- CHANGELOG.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 356c482e..8a872711 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,5 @@ ## Changelog -### Version 6.0.0-alpha2 - -- Ensure we always use `hideShutterView` before showing the `shutterView` on Android [#2609](https://github.com/react-native-video/react-native-video/pull/2609) - ### Version 6.0.0-alpha1 - Add Google's maven repository to avoid build error [#2552](https://github.com/react-native-video/react-native-video/pull/2552) @@ -17,6 +13,7 @@ - Fix nil string uri parameter error [#695](https://github.com/react-native-video/react-native-video/pull/695) - (Breaking) Bump shaka-player to 3.3.2 [#2587](https://github.com/react-native-video/react-native-video/pull/2587) - Improve basic player example on android [#2662](https://github.com/react-native-video/react-native-video/pull/2662) +- Ensure we always use `hideShutterView` before showing the `shutterView` on Android [#2609](https://github.com/react-native-video/react-native-video/pull/2609) ### Version 5.2.0