player fragment: add lazy init for subtitle/debug info

Author: yuliskov

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/exoplayer/other/DebugInfoManager.java

@@ -75,14 +75,13 @@ public final class DebugInfoManager implements Runnable, Player.EventListener {
     private final String mAppVersion;
 
     /**
-     * @param root        root view
-     * @param resLayoutId The {@link TextView} that should be updated to display the information.
+     * @param debugViewGroup The container that should be updated to display the information.
      * @param player      The {@link SimpleExoPlayer} from which debug information should be obtained.
      */
-    public DebugInfoManager(View root, int resLayoutId, SimpleExoPlayer player) {
+    public DebugInfoManager(ViewGroup debugViewGroup, SimpleExoPlayer player) {
+        mContext = debugViewGroup.getContext();
+        mDebugViewGroup = debugViewGroup;
         mPlayer = player;
-        mDebugViewGroup = root.findViewById(resLayoutId);
-        mContext = root.getContext();
         mTextSize = mContext.getResources().getDimension(R.dimen.debug_text_size);
         mAppVersion = String.format("%s version", mContext.getString(R.string.app_name));
         inflate();

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/exoplayer/other/SubtitleManager.java

@@ -1,6 +1,5 @@
 package com.liskovsoft.smartyoutubetv2.common.exoplayer.other;
 
-import android.app.Activity;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.Typeface;
@@ -56,9 +55,9 @@ public boolean isSystem() {
         }
     }
 
-    public SubtitleManager(View root, int subViewId) {
-        mContext = root.getContext();
-        mSubtitleView = root.findViewById(subViewId);
+    public SubtitleManager(SubtitleView subtitleView) {
+        mContext = subtitleView.getContext();
+        mSubtitleView = subtitleView;
         mPrefs = AppPrefs.instance(mContext);
         mPlayerData = PlayerData.instance(mContext);
         mPlayerData.setOnChange(this);

smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/playback/PlaybackFragment.java

@@ -444,9 +444,9 @@ private void createPlayerObjects() {
 
         createPlayerGlue();
 
-        createSubtitleManager();
+        //createSubtitleManager();
 
-        createDebugManager();
+        //createDebugManager();
 
         createMediaSession();
 
@@ -489,15 +489,17 @@ private void createPlayerGlue() {
     }
 
     private void createSubtitleManager() {
-        if (getView() == null) {
+        if (getView() == null || mPlayer == null) {
             return;
         }
 
-        mSubtitleManager = new SubtitleManager(getView(), R.id.leanback_subtitles);
+        if (mSubtitleManager == null) {
+            mSubtitleManager = new SubtitleManager(getView().findViewById(R.id.leanback_subtitles));
 
-        // subs renderer
-        if (mPlayer.getTextComponent() != null) {
-            mPlayer.getTextComponent().addTextOutput(mSubtitleManager);
+            // subs renderer
+            if (mPlayer.getTextComponent() != null) {
+                mPlayer.getTextComponent().addTextOutput(mSubtitleManager);
+            }
         }
     }
 
@@ -506,7 +508,9 @@ private void createDebugManager() {
             return;
         }
 
-        mDebugInfoManager = new DebugInfoManager(getView(), R.id.debug_view_group, mPlayer);
+        if (mDebugInfoManager == null) {
+            mDebugInfoManager = new DebugInfoManager(getView().findViewById(R.id.debug_view_group), mPlayer);
+        }
     }
 
     private void initializeGlobalClock() {
@@ -1326,19 +1330,22 @@ public void setNextTitle(Video nextVideo) {
 
     @Override
     public void showDebugInfo(boolean show) {
+        createDebugManager();
         if (mDebugInfoManager != null) {
             mDebugInfoManager.show(show);
         }
     }
 
     @Override
     public void showSubtitles(boolean show) {
+        createSubtitleManager();
         if (mSubtitleManager != null) {
             mSubtitleManager.show(show);
         }
     }
 
     public boolean isDebugInfoShown() {
+        createDebugManager();
         return mDebugInfoManager != null && mDebugInfoManager.isShown();
     }