From 1eb577b4815a00e658e14998dbe2e8b00679db63 Mon Sep 17 00:00:00 2001 From: Yuriy Liskov Date: Tue, 24 Nov 2020 00:06:02 +0200 Subject: [PATCH] refactor --- common/build.gradle | 1 + smarttubetv/build.gradle | 4 ++++ .../smartyoutubetv2/tv/ui/playback/PlaybackFragment.java | 4 ++-- ...kDataProvider.java => StoryBoardSeekDataProvider.java} | 8 ++++---- 4 files changed, 11 insertions(+), 6 deletions(-) rename smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/playback/other/{PlaybackSeekNetworkDataProvider.java => StoryBoardSeekDataProvider.java} (79%) diff --git a/common/build.gradle b/common/build.gradle index 003e0032c..7b05daf4e 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -37,6 +37,7 @@ android { storig {} strtarmenia {} stbolshoetv {} + stredboxtv {} } } diff --git a/smarttubetv/build.gradle b/smarttubetv/build.gradle index 53ca1e1f6..d62904fe6 100644 --- a/smarttubetv/build.gradle +++ b/smarttubetv/build.gradle @@ -84,6 +84,10 @@ android { // matchingFallbacks = ['lite'] applicationIdSuffix ".bolshoetv" } + stredboxtv { + // matchingFallbacks = ['lite'] + applicationIdSuffix ".redboxtv" + } } // naming example: SmartYouTubeTV_Xwalk_v6.8.12_r.apk diff --git a/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/playback/PlaybackFragment.java b/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/playback/PlaybackFragment.java index 215ecb34c..cddba38fc 100644 --- a/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/playback/PlaybackFragment.java +++ b/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/playback/PlaybackFragment.java @@ -50,7 +50,7 @@ import com.liskovsoft.smartyoutubetv2.tv.adapter.VideoGroupObjectAdapter; import com.liskovsoft.smartyoutubetv2.tv.ui.common.LeanbackActivity; import com.liskovsoft.smartyoutubetv2.tv.ui.common.UriBackgroundManager; import com.liskovsoft.smartyoutubetv2.tv.ui.mod.leanback.ProgressBarManager; -import com.liskovsoft.smartyoutubetv2.tv.ui.playback.other.PlaybackSeekNetworkDataProvider; +import com.liskovsoft.smartyoutubetv2.tv.ui.playback.other.StoryBoardSeekDataProvider; import com.liskovsoft.smartyoutubetv2.tv.ui.playback.other.VideoEventsOverrideFragment; import com.liskovsoft.smartyoutubetv2.tv.ui.playback.other.VideoPlayerGlue; import com.liskovsoft.smartyoutubetv2.tv.ui.playback.other.VideoPlayerGlue.OnActionClickedListener; @@ -268,7 +268,7 @@ public class PlaybackFragment extends VideoEventsOverrideFragment implements Pla mPlayerGlue.setHost(new VideoSupportFragmentGlueHost(this)); mPlayerGlue.setSeekEnabled(true); mPlayerGlue.setControlsOverlayAutoHideEnabled(false); // don't show controls on some player events like play/pause/end - PlaybackSeekNetworkDataProvider.setSeekProvider(mPlayerGlue); + StoryBoardSeekDataProvider.setSeekProvider(mPlayerGlue); hideControlsOverlay(mIsAnimationEnabled); // hide controls upon fragment creation mExoPlayerController.setPlayer(mPlayer); diff --git a/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/playback/other/PlaybackSeekNetworkDataProvider.java b/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/playback/other/StoryBoardSeekDataProvider.java similarity index 79% rename from smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/playback/other/PlaybackSeekNetworkDataProvider.java rename to smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/playback/other/StoryBoardSeekDataProvider.java index 05e3a76ad..d571397e5 100644 --- a/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/playback/other/PlaybackSeekNetworkDataProvider.java +++ b/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/playback/other/StoryBoardSeekDataProvider.java @@ -4,14 +4,14 @@ import androidx.leanback.media.PlaybackGlue; import androidx.leanback.media.PlaybackTransportControlGlue; import androidx.leanback.widget.PlaybackSeekDataProvider; -public class PlaybackSeekNetworkDataProvider extends PlaybackSeekDataProvider { - public PlaybackSeekNetworkDataProvider(long duration, long interval) { +public class StoryBoardSeekDataProvider extends PlaybackSeekDataProvider { + public StoryBoardSeekDataProvider(long duration, long interval) { } public static void setSeekProvider(PlaybackTransportControlGlue glue) { if (glue.isPrepared()) { - glue.setSeekProvider(new PlaybackSeekNetworkDataProvider( + glue.setSeekProvider(new StoryBoardSeekDataProvider( glue.getDuration(), glue.getDuration() / 100)); } else { @@ -22,7 +22,7 @@ public class PlaybackSeekNetworkDataProvider extends PlaybackSeekDataProvider { glue.removePlayerCallback(this); PlaybackTransportControlGlue transportControlGlue = (PlaybackTransportControlGlue) glue; - transportControlGlue.setSeekProvider(new PlaybackSeekNetworkDataProvider( + transportControlGlue.setSeekProvider(new StoryBoardSeekDataProvider( transportControlGlue.getDuration(), transportControlGlue.getDuration() / 100)); }