Merge pull request #498 from DreamBanana/dev

Add an option to display video or channel information.

app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java

@@ -489,7 +489,7 @@ public class LiveActivity extends BaseActivity implements Clock.Callback, GroupP
 
     private void hideControl() {
         mBinding.control.getRoot().setVisibility(View.GONE);
-        mBinding.widget.top.setVisibility(View.GONE);
+        mBinding.widget.top.setVisibility(Setting.isDisplayVideoInformation() ? View.VISIBLE : View.GONE);   
         App.removeCallbacks(mR1);
     }
 
@@ -499,6 +499,7 @@ public class LiveActivity extends BaseActivity implements Clock.Callback, GroupP
         mBinding.display.clock.setVisibility(Setting.isDisplayTime() && visible  ? View.VISIBLE : View.GONE);
         mBinding.display.netspeed.setVisibility(Setting.isDisplaySpeed() && visible ? View.VISIBLE : View.GONE);
         mBinding.display.duration.setVisibility(View.GONE);
+        mBinding.widget.top.setVisibility(Setting.isDisplayVideoInformation() && visible ? View.VISIBLE : View.GONE);       
     }
 
     private void onTimeChangeDisplaySpeed() {

app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java

@@ -794,6 +794,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
         mBinding.display.netspeed.setVisibility(Setting.isDisplaySpeed() && !isVisible(mBinding.control.getRoot()) ? View.VISIBLE : View.GONE);
         mBinding.display.duration.setVisibility(Setting.isDisplayDuration() && !isVisible(mBinding.control.getRoot()) ? View.VISIBLE : View.GONE);
         mBinding.display.progress.setVisibility(Setting.isDisplayMiniProgress() && !isVisible(mBinding.control.getRoot()) && (mPlayers.getDuration() > 60000) ? View.VISIBLE : View.GONE);
+        mBinding.widget.info.setVisibility(Setting.isDisplayVideoInformation() || isVisible(mBinding.widget.info)  ? View.VISIBLE : View.GONE);
     }
 
     private void onTimeChangeDisplaySpeed() {
@@ -1113,7 +1114,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
     }
 
     private void hideInfo() {
-        mBinding.widget.info.setVisibility(View.GONE);
+        mBinding.widget.info.setVisibility(Setting.isDisplayVideoInformation() ? View.VISIBLE : View.GONE);
         showDisplayInfo();
     }
 
@@ -1556,7 +1557,8 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
         mBinding.widget.exoDuration.setText(mPlayers.getDurationTime());
         mBinding.widget.exoPosition.setText(mPlayers.getPositionTime(0));
         if (visible) showInfoAndCenter();
-        else hideInfoAndCenter();
+        else if (Setting.isDisplayVideoInformation() == false)
+            hideInfoAndCenter();
         mPlayers.pause();
     }
 

app/src/leanback/java/com/fongmi/android/tv/ui/adapter/DisplayAdapter.java

@@ -26,6 +26,7 @@ public class DisplayAdapter extends RecyclerView.Adapter<DisplayAdapter.ViewHold
         mItems.add(ResUtil.getString(R.string.play_netspeed));
         mItems.add(ResUtil.getString(R.string.play_duration));
         mItems.add(ResUtil.getString(R.string.play_mini_progress));
+        mItems.add(ResUtil.getString(R.string.play_video_information));
     }
 
     @Override
@@ -54,6 +55,7 @@ public class DisplayAdapter extends RecyclerView.Adapter<DisplayAdapter.ViewHold
         else if (position == 1) return Setting.isDisplaySpeed();
         else if (position == 2) return Setting.isDisplayDuration();
         else if (position == 3) return Setting.isDisplayMiniProgress();
+        else if (position == 4) return Setting.isDisplayVideoInformation();
         return false;
     }
 
@@ -62,6 +64,7 @@ public class DisplayAdapter extends RecyclerView.Adapter<DisplayAdapter.ViewHold
         else if (position == 1) Setting.putDisplaySpeed(!Setting.isDisplaySpeed());
         else if (position == 2) Setting.putDisplayDuration(!Setting.isDisplayDuration());
         else if (position == 3) Setting.putDisplayMiniProgress(!Setting.isDisplayMiniProgress());
+        else if (position == 4) Setting.putDisplayVideoInformation(!Setting.isDisplayVideoInformation());
         notifyItemRangeChanged(0, getItemCount());
     }
 
@@ -71,10 +74,12 @@ public class DisplayAdapter extends RecyclerView.Adapter<DisplayAdapter.ViewHold
         else if (position == 1) checked = Setting.isDisplaySpeed();
         else if (position == 2) checked = Setting.isDisplayDuration();
         else if (position == 3) checked = Setting.isDisplayMiniProgress();
+        else if (position == 4) checked = Setting.isDisplayVideoInformation();
         Setting.putDisplayTime(!checked);
         Setting.putDisplaySpeed(!checked);
         Setting.putDisplayDuration(!checked);
         Setting.putDisplayMiniProgress(!checked);
+        Setting.putDisplayVideoInformation(!checked);
         notifyItemRangeChanged(0, getItemCount());
         return true;
     }

app/src/main/java/com/fongmi/android/tv/Setting.java

@@ -374,6 +374,14 @@ public class Setting {
         Prefers.put("display_mini_progress", display);
     }
 
+    public static boolean isDisplayVideoInformation() {
+        return Prefers.getBoolean("display_video_information", false);
+    }
+
+    public static void putDisplayVideoInformation(boolean display) {
+        Prefers.put("display_video_information", display);
+    }
+
     public static float getPlaySpeed() {
         return Prefers.getFloat("play_speed", 1.0f);
     }

app/src/main/res/values-zh-rCN/strings.xml

@@ -40,6 +40,7 @@
     <string name="play_netspeed">网速</string>
     <string name="play_duration">进度</string>
     <string name="play_mini_progress">迷你进度</string>
+    <string name="play_video_information">影片/频道 资料</string>
     <string name="play_danmu">弹幕</string>
     <string name="play_display">屏显</string>
     <string name="play_speed">倍速</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -40,6 +40,7 @@
     <string name="play_netspeed">網速</string>
     <string name="play_duration">進度</string>
     <string name="play_mini_progress">迷你進度</string>
+    <string name="play_video_information">影片/頻道 資料</string>
     <string name="play_danmu">彈幕</string>
     <string name="play_display">屏顯</string>
     <string name="play_speed">倍速</string>

app/src/main/res/values/strings.xml

@@ -40,6 +40,7 @@
     <string name="play_netspeed">Net Speed</string>
     <string name="play_duration">Duration</string>
     <string name="play_mini_progress">Mini Progress</string>
+    <string name="play_video_information">Video/Channel Info</string>
     <string name="play_danmu">Danmu</string>
     <string name="play_display">Display</string>
     <string name="play_speed">Speed</string>

app/src/mobile/res/layout/dialog_control.xml

@@ -300,6 +300,16 @@
             android:textColor="@color/control"
             android:textSize="14sp" />
 
+        <TextView
+            android:id="@+id/dpvideoinformation"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:background="@drawable/shape_accent"
+            android:text="@string/play_video_information"
+            android:textColor="@color/control"
+            android:textSize="14sp" />            
+
     </LinearLayout>
 
     <TextView