tablet ui support for comments

app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java

@@ -16,6 +16,7 @@ import android.support.annotation.Nullable;
 import android.support.design.widget.AppBarLayout;
 import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.view.ViewPager;
 import android.support.v4.view.animation.FastOutSlowInInterpolator;
@@ -152,7 +153,6 @@ public class VideoDetailFragment
 
     private View videoTitleRoot;
     private TextView videoTitleTextView;
-    @Nullable
     private ImageView videoTitleToggleArrow;
     private TextView videoCountView;
 
@@ -184,6 +184,7 @@ public class VideoDetailFragment
     private  ViewPager viewPager;
     private TabAdaptor pageAdapter;
     private TabLayout tabLayout;
+    private FrameLayout relatedStreamsLayout;
 
 
     /*////////////////////////////////////////////////////////////////////////*/
@@ -419,16 +420,14 @@ public class VideoDetailFragment
     }
 
     private void toggleTitleAndDescription() {
-        if (videoTitleToggleArrow != null) {    //it is null for tablets
-            if (videoDescriptionRootLayout.getVisibility() == View.VISIBLE) {
-                videoTitleTextView.setMaxLines(1);
-                videoDescriptionRootLayout.setVisibility(View.GONE);
-                videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
-            } else {
-                videoTitleTextView.setMaxLines(10);
-                videoDescriptionRootLayout.setVisibility(View.VISIBLE);
-                videoTitleToggleArrow.setImageResource(R.drawable.arrow_up);
-            }
+        if (videoDescriptionRootLayout.getVisibility() == View.VISIBLE) {
+            videoTitleTextView.setMaxLines(1);
+            videoDescriptionRootLayout.setVisibility(View.GONE);
+            videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
+        } else {
+            videoTitleTextView.setMaxLines(10);
+            videoDescriptionRootLayout.setVisibility(View.VISIBLE);
+            videoTitleToggleArrow.setImageResource(R.drawable.arrow_up);
         }
     }
 
@@ -483,6 +482,8 @@ public class VideoDetailFragment
         tabLayout = rootView.findViewById(R.id.tablayout);
         tabLayout.setupWithViewPager(viewPager);
 
+        relatedStreamsLayout = rootView.findViewById(R.id.relatedStreamsLayout);
+
         setHeightThumbnail();
 
 
@@ -809,7 +810,7 @@ public class VideoDetailFragment
             pageAdapter.addFragment(CommentsFragment.getInstance(serviceId, url, name), COMMENTS_TAB_TAG);
         }
 
-        if(showRelatedStreams){
+        if(showRelatedStreams && null == relatedStreamsLayout){
             //temp empty fragment. will be updated in handleResult
             pageAdapter.addFragment(new Fragment(), RELATED_TAB_TAG);
         }
@@ -1033,14 +1034,18 @@ public class VideoDetailFragment
         animateView(videoTitleTextView, true, 0);
 
         videoDescriptionRootLayout.setVisibility(View.GONE);
-        if (videoTitleToggleArrow != null) {    //phone
-            videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
-            videoTitleToggleArrow.setVisibility(View.GONE);
-        } else { //tablet
-            //TODO make comments/related streams fragment invisible
-        }
+        videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
+        videoTitleToggleArrow.setVisibility(View.GONE);
         videoTitleRoot.setClickable(false);
 
+        if(relatedStreamsLayout != null){
+            if(showRelatedStreams){
+                relatedStreamsLayout.setVisibility(View.INVISIBLE);
+            }else{
+                relatedStreamsLayout.setVisibility(View.GONE);
+            }
+        }
+
         imageLoader.cancelDisplayTask(thumbnailImageView);
         imageLoader.cancelDisplayTask(uploaderThumb);
         thumbnailImageView.setImageBitmap(null);
@@ -1054,8 +1059,15 @@ public class VideoDetailFragment
         setInitialData(info.getServiceId(), info.getOriginalUrl(), info.getName());
 
         if(showRelatedStreams){
-            pageAdapter.updateItem(RELATED_TAB_TAG, RelatedVideosFragment.getInstance(currentInfo));
-            pageAdapter.notifyDataSetUpdate();
+            if(null == relatedStreamsLayout){ //phone
+                pageAdapter.updateItem(RELATED_TAB_TAG, RelatedVideosFragment.getInstance(currentInfo));
+                pageAdapter.notifyDataSetUpdate();
+            }else{ //tablet
+                getChildFragmentManager().beginTransaction()
+                        .replace(R.id.relatedStreamsLayout, RelatedVideosFragment.getInstance(currentInfo))
+                        .commitNow();
+                relatedStreamsLayout.setVisibility(View.VISIBLE);
+            }
         }
 
         pushToStack(serviceId, url, name);
@@ -1120,14 +1132,10 @@ public class VideoDetailFragment
         }
 
         videoDescriptionView.setVisibility(View.GONE);
-        if (videoTitleToggleArrow != null) {
-            videoTitleRoot.setClickable(true);
-            videoTitleToggleArrow.setVisibility(View.VISIBLE);
-            videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
-            videoDescriptionRootLayout.setVisibility(View.GONE);
-        } else {
-            videoDescriptionRootLayout.setVisibility(View.VISIBLE);
-        }
+        videoTitleRoot.setClickable(true);
+        videoTitleToggleArrow.setVisibility(View.VISIBLE);
+        videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
+        videoDescriptionRootLayout.setVisibility(View.GONE);
         if (!TextUtils.isEmpty(info.getUploadDate())) {
             videoUploadDateView.setText(Localization.localizeDate(activity, info.getUploadDate()));
         }

app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.java

@@ -184,4 +184,9 @@ public class CommentsFragment extends BaseListInfoFragment<CommentsInfo> {
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         return;
     }
+
+    @Override
+    protected boolean isGridLayout() {
+        return false;
+    }
 }

app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java

@@ -193,4 +193,9 @@ public class RelatedVideosFragment extends BaseListInfoFragment<RelatedStreamInf
         Boolean autoplay = pref.getBoolean(getString(R.string.auto_queue_key), false);
         aSwitch.setChecked(autoplay);
     }
+
+    @Override
+    protected boolean isGridLayout() {
+        return false;
+    }
 }

app/src/main/res/layout-large-land/fragment_video_detail.xml

@@ -8,107 +8,121 @@
 	android:focusableInTouchMode="true"
 	android:orientation="horizontal">
 
-	<com.nirhart.parallaxscroll.views.ParallaxScrollView
+	<android.support.design.widget.CoordinatorLayout
 		android:id="@+id/detail_main_content"
-		app:parallax_factor="1.9"
 		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_weight="5">
+		android:layout_height="match_parent"
+		android:layout_weight="5"
+		android:fitsSystemWindows="true">
 
-		<!--WRAPPER-->
-		<LinearLayout
+		<android.support.design.widget.AppBarLayout
+			android:id="@+id/appbarlayout"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:orientation="vertical">
+			android:fitsSystemWindows="true"
+			app:elevation="0dp"
+			app:layout_behavior="android.support.design.widget.FlingBehavior">
 
-			<!-- THUMBNAIL -->
-			<FrameLayout
-				android:id="@+id/detail_thumbnail_root_layout"
+			<android.support.design.widget.CollapsingToolbarLayout
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:background="@android:color/black"
-				android:clickable="true"
-				android:focusable="true"
-				android:foreground="?attr/selectableItemBackground">
+				app:layout_scrollFlags="scroll">
 
-				<ImageView
-					android:id="@+id/detail_thumbnail_image_view"
+				<!-- THUMBNAIL -->
+				<FrameLayout
+					android:id="@+id/detail_thumbnail_root_layout"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-					android:background="@android:color/transparent"
-					android:contentDescription="@string/detail_thumbnail_view_description"
-					android:scaleType="fitCenter"
-					tools:ignore="RtlHardcoded"
-					tools:layout_height="200dp"
-					tools:src="@drawable/dummy_thumbnail" />
+					android:background="@android:color/black"
+					android:clickable="true"
+					android:focusable="true"
+					android:foreground="?attr/selectableItemBackground"
+					app:layout_collapseMode="parallax">
 
-				<ImageView
-					android:id="@+id/detail_thumbnail_play_button"
-					android:layout_width="64dp"
-					android:layout_height="64dp"
-					android:layout_gravity="center"
-					android:background="@android:color/transparent"
-					android:src="@drawable/new_play_arrow"
-					android:visibility="invisible"
-					tools:ignore="ContentDescription"
-					tools:visibility="visible" />
+					<ImageView
+						android:id="@+id/detail_thumbnail_image_view"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:background="@android:color/transparent"
+						android:contentDescription="@string/detail_thumbnail_view_description"
+						android:scaleType="fitCenter"
+						tools:ignore="RtlHardcoded"
+						tools:layout_height="200dp"
+						tools:src="@drawable/dummy_thumbnail" />
 
-				<TextView
-					android:id="@+id/touch_append_detail"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_gravity="center"
-					android:background="#64000000"
-					android:paddingBottom="10dp"
-					android:paddingLeft="30dp"
-					android:paddingRight="30dp"
-					android:paddingTop="10dp"
-					android:text="@string/hold_to_append"
-					android:textColor="@android:color/white"
-					android:textSize="20sp"
-					android:textStyle="bold"
-					android:visibility="gone"
-					tools:ignore="RtlHardcoded"
-					tools:visibility="visible" />
+					<ImageView
+						android:id="@+id/detail_thumbnail_play_button"
+						android:layout_width="64dp"
+						android:layout_height="64dp"
+						android:layout_gravity="center"
+						android:background="@android:color/transparent"
+						android:src="@drawable/new_play_arrow"
+						android:visibility="invisible"
+						tools:ignore="ContentDescription"
+						tools:visibility="visible" />
 
-				<TextView
-					android:id="@+id/detail_duration_view"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_gravity="bottom|right"
-					android:layout_marginBottom="8dp"
-					android:layout_marginLeft="12dp"
-					android:layout_marginRight="12dp"
-					android:layout_marginTop="8dp"
-					android:alpha=".6"
-					android:background="#23000000"
-					android:gravity="center"
-					android:paddingBottom="2dp"
-					android:paddingLeft="6dp"
-					android:paddingRight="6dp"
-					android:paddingTop="2dp"
-					android:textAllCaps="true"
-					android:textColor="@android:color/white"
-					android:textSize="12sp"
-					android:textStyle="bold"
-					android:visibility="gone"
-					tools:ignore="RtlHardcoded"
-					tools:text="12:38"
-					tools:visibility="visible" />
-			</FrameLayout>
+					<TextView
+						android:id="@+id/touch_append_detail"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center"
+						android:background="#64000000"
+						android:paddingBottom="10dp"
+						android:paddingLeft="30dp"
+						android:paddingRight="30dp"
+						android:paddingTop="10dp"
+						android:text="@string/hold_to_append"
+						android:textColor="@android:color/white"
+						android:textSize="20sp"
+						android:textStyle="bold"
+						android:visibility="gone"
+						tools:ignore="RtlHardcoded"
+						tools:visibility="visible" />
+
+					<TextView
+						android:id="@+id/detail_duration_view"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="bottom|right"
+						android:layout_marginBottom="8dp"
+						android:layout_marginLeft="12dp"
+						android:layout_marginRight="12dp"
+						android:layout_marginTop="8dp"
+						android:alpha=".6"
+						android:background="#23000000"
+						android:gravity="center"
+						android:paddingBottom="2dp"
+						android:paddingLeft="6dp"
+						android:paddingRight="6dp"
+						android:paddingTop="2dp"
+						android:textAllCaps="true"
+						android:textColor="@android:color/white"
+						android:textSize="12sp"
+						android:textStyle="bold"
+						android:visibility="gone"
+						tools:ignore="RtlHardcoded"
+						tools:text="12:38"
+						tools:visibility="visible" />
+				</FrameLayout>
+
+			</android.support.design.widget.CollapsingToolbarLayout>
 
 			<!-- CONTENT -->
 			<RelativeLayout
 				android:id="@+id/detail_content_root_layout"
 				android:layout_width="match_parent"
-				android:layout_height="match_parent"
-				android:background="?android:windowBackground">
+				android:layout_height="wrap_content"
+				android:background="?android:windowBackground"
+				app:layout_scrollFlags="scroll">
 
 				<!-- TITLE -->
 				<FrameLayout
 					android:id="@+id/detail_title_root_layout"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
+					android:background="?attr/selectableItemBackground"
+					android:clickable="true"
+					android:focusable="true"
 					android:paddingLeft="12dp"
 					android:paddingRight="12dp">
 
@@ -126,6 +140,15 @@
 						tools:ignore="RtlHardcoded"
 						tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed a ultricies ex. Integer sit amet sodales risus. Duis non mi et urna pretium bibendum. Nunc eleifend est quis ipsum porttitor egestas. Sed facilisis, nisl quis eleifend pellentesque, orci metus egestas dolor, at accumsan eros metus quis libero." />
 
+					<ImageView
+						android:id="@+id/detail_toggle_description_view"
+						android:layout_width="15dp"
+						android:layout_height="15dp"
+						android:layout_gravity="center_vertical|right"
+						android:layout_marginLeft="5dp"
+						android:src="@drawable/arrow_down"
+						tools:ignore="ContentDescription,RtlHardcoded" />
+
 				</FrameLayout>
 
 				<!-- LOADING INDICATOR-->
@@ -209,17 +232,17 @@
 								tools:text="Uploader" />
 
 							<!--<Button
-								android:id="@+id/detail_uploader_subscribe"
-								android:layout_width="wrap_content"
-								android:layout_height="wrap_content"
-								android:layout_gravity="center_vertical|right"
-								android:layout_marginRight="12dp"
-								android:text="@string/rss_button_title"
-								android:textSize="12sp"
-								android:theme="@style/RedButton"
-								android:drawableLeft="@drawable/ic_rss_feed_white_24dp"
-								tools:ignore="RtlHardcoded"
-								android:visibility="gone"/>-->
+                                android:id="@+id/detail_uploader_subscribe"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_vertical|right"
+                                android:layout_marginRight="12dp"
+                                android:text="@string/rss_button_title"
+                                android:textSize="12sp"
+                                android:theme="@style/RedButton"
+                                android:drawableLeft="@drawable/ic_rss_feed_white_24dp"
+                                tools:ignore="RtlHardcoded"
+                                android:visibility="gone"/>-->
 						</LinearLayout>
 
 						<!-- VIEW & THUMBS -->
@@ -401,7 +424,9 @@
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
 						android:layout_marginTop="5dp"
-						android:orientation="vertical">
+						android:orientation="vertical"
+						android:visibility="gone"
+						tools:visibility="visible">
 
 						<TextView
 							android:id="@+id/detail_upload_date_view"
@@ -435,57 +460,39 @@
 							android:background="?attr/separator_color" />
 
 					</LinearLayout>
+
 				</LinearLayout>
 			</RelativeLayout>
-		</LinearLayout>
 
-	</com.nirhart.parallaxscroll.views.ParallaxScrollView>
+		</android.support.design.widget.AppBarLayout>
 
-	<ScrollView
+
+		<android.support.v4.view.ViewPager
+			android:id="@+id/viewpager"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+
+		<android.support.design.widget.TabLayout
+			android:id="@+id/tablayout"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_gravity="bottom|center"
+			android:background="@color/transparent_background_color"
+			app:tabBackground="@drawable/tab_selector"
+			app:tabGravity="center"
+			app:tabIndicatorHeight="0dp">
+
+		</android.support.design.widget.TabLayout>
+
+	</android.support.design.widget.CoordinatorLayout>
+
+	<FrameLayout
+        android:id="@+id/relatedStreamsLayout"
 		android:layout_width="0dp"
 		android:layout_height="match_parent"
 		android:layout_weight="3">
 
-		<!--NEXT AND RELATED VIDEOS-->
-		<LinearLayout
-			android:id="@+id/detail_related_streams_root_layout"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_horizontal"
-			android:paddingTop="14dp"
-			android:paddingBottom="8dp"
-			android:orientation="vertical">
-
-			<TextView
-				android:id="@+id/detail_next_stream_title"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginLeft="12dp"
-				android:text="@string/next_video_title"
-				android:textAllCaps="true"
-				android:textAppearance="?android:attr/textAppearanceMedium"
-				android:textSize="@dimen/video_item_detail_next_text_size"
-				tools:ignore="RtlHardcoded" />
-
-			<LinearLayout
-				android:id="@+id/detail_related_streams_view"
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"
-				android:layout_marginTop="2dp"
-				android:orientation="vertical"
-				tools:minHeight="50dp" />
-
-			<ImageButton
-				android:id="@+id/detail_related_streams_expand"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:background="?attr/selectableItemBackground"
-				android:paddingBottom="10dp"
-				android:paddingTop="4dp"
-				android:src="?attr/expand"
-				android:textAlignment="center"
-				android:textAllCaps="true"
-				tools:ignore="ContentDescription" />
-		</LinearLayout>
-	</ScrollView>
+	</FrameLayout>
 </LinearLayout>