Added the lower row in the TV player.

amahi · Jul 16, 2017 · d06b680 · d06b680
1 parent 8a34bf7
commit d06b680
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/src/main/java/org/amahi/anywhere/tv/activity/TvPlaybackVideoActivity.java b/src/main/java/org/amahi/anywhere/tv/activity/TvPlaybackVideoActivity.java
@@ -21,6 +21,7 @@
 
 import android.app.Activity;
 import android.app.Fragment;
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 

diff --git a/src/main/java/org/amahi/anywhere/tv/fragment/TvPlaybackVideoFragment.java b/src/main/java/org/amahi/anywhere/tv/fragment/TvPlaybackVideoFragment.java
@@ -33,11 +33,16 @@
 import android.support.v17.leanback.widget.ArrayObjectAdapter;
 import android.support.v17.leanback.widget.ClassPresenterSelector;
 import android.support.v17.leanback.widget.ControlButtonPresenterSelector;
+import android.support.v17.leanback.widget.HeaderItem;
 import android.support.v17.leanback.widget.ListRow;
 import android.support.v17.leanback.widget.ListRowPresenter;
 import android.support.v17.leanback.widget.OnActionClickedListener;
+import android.support.v17.leanback.widget.OnItemViewClickedListener;
 import android.support.v17.leanback.widget.PlaybackControlsRow;
 import android.support.v17.leanback.widget.PlaybackControlsRowPresenter;
+import android.support.v17.leanback.widget.Presenter;
+import android.support.v17.leanback.widget.Row;
+import android.support.v17.leanback.widget.RowPresenter;
 import android.support.v4.content.ContextCompat;
 import android.util.DisplayMetrics;
 import android.view.SurfaceHolder;
@@ -48,6 +53,7 @@
 import org.amahi.anywhere.server.client.ServerClient;
 import org.amahi.anywhere.server.model.ServerFile;
 import org.amahi.anywhere.server.model.ServerShare;
+import org.amahi.anywhere.tv.presenter.MainTVPresenter;
 import org.amahi.anywhere.tv.presenter.VideoDetailsDescriptionPresenter;
 import org.amahi.anywhere.util.Intents;
 import org.amahi.anywhere.util.Mimes;
@@ -97,6 +103,7 @@ public void onCreate(Bundle savedInstanceState) {
         setFadingEnabled(false);
         mHandler = new Handler(Looper.getMainLooper());
         setUpRows();
+        addOtherRows();
         mediaPlayer.setEventListener(new MediaPlayer.EventListener() {
             @Override
             public void onEvent(MediaPlayer.Event event) {
@@ -105,6 +112,16 @@ public void onEvent(MediaPlayer.Event event) {
                 }
             }
         });
+
+        setOnItemViewClickedListener(new OnItemViewClickedListener() {
+            @Override
+            public void onItemClicked(Presenter.ViewHolder itemViewHolder, Object item, RowPresenter.ViewHolder rowViewHolder, Row row) {
+                if(item instanceof ServerFile){
+                    ServerFile serverFile = (ServerFile)item;
+                    replaceFragment(serverFile);
+                }
+            }
+        });
     }
 
     private ArrayList<ServerFile> setAllVideoFiles() {
@@ -218,6 +235,20 @@ public void onActionClicked(Action action) {
         setAdapter(mRowsAdapter);
     }
 
+    private void addOtherRows(){
+        ArrayObjectAdapter adapter = new ArrayObjectAdapter(new MainTVPresenter(getActivity(), serverClient, getVideoShare()));
+        for(ServerFile serverFile:mVideoList){
+            adapter.add(serverFile);
+        }
+        HeaderItem headerItem;
+        if(getVideoFile().getParentFile()==null)
+            headerItem = new HeaderItem("Video(s) in "+getVideoShare().getName());
+        else
+            headerItem = new HeaderItem("Video(s) in "+getVideoFile().getParentFile().getName());
+
+        mRowsAdapter.add(new ListRow(headerItem,adapter));
+    }
+
     private void togglePlayPause(boolean isPaused) {
         if (isPaused) {
             mediaPlayer.pause();
@@ -372,6 +403,8 @@ public void onResume() {
     @Override
     public void onDestroy() {
         super.onDestroy();
+        mLibVlc.release();
+        mediaPlayer.stop();
         mediaPlayer.release();
         mediaPlayer = null;
     }