From 320ac82dea1f7eeae989e7481c4379f6894c82a2 Mon Sep 17 00:00:00 2001
From: chschtsch <chschtsch@ya.ru>
Date: Fri, 11 Dec 2015 14:01:04 +0300
Subject: [PATCH] merging with master

---
 .../res/layout/fragment_videoitem_detail.xml  | 146 ++++++++++--------
 1 file changed, 81 insertions(+), 65 deletions(-)

diff --git a/app/src/main/res/layout/fragment_videoitem_detail.xml b/app/src/main/res/layout/fragment_videoitem_detail.xml
index 664cb6089..cd668ae1c 100644
--- a/app/src/main/res/layout/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout/fragment_videoitem_detail.xml
@@ -8,7 +8,8 @@
     style="?android:attr/textAppearanceLarge"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/videoitem_detail">
+    android:id="@+id/videoitem_detail"
+    android:background="@color/background_gray">
 
     <ProgressBar android:id="@+id/detailProgressBar"
         android:layout_width="wrap_content"
@@ -16,11 +17,23 @@
         android:layout_centerInParent="true"
         android:indeterminate="true"/>
 
+    <ImageView android:id="@+id/detailThumbnailView"
+        android:contentDescription="@string/detailThumbnailViewDescription"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:scaleType="centerInside"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:adjustViewBounds="true"
+        android:background="@android:color/black"
+        android:src="@drawable/dummy_thumbnail"/>
+
     <ScrollView
         android:id="@+id/detailMainContent"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="invisible">
+        android:visibility="visible">
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -30,23 +43,21 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <ImageView android:id="@+id/detailThumbnailView"
-                    android:contentDescription="@string/detailThumbnailViewDescription"
+                <View android:id="@+id/detailVideoThumbnailWindow"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/video_item_detail_thumbnail_image_height"
-                    android:scaleType="centerInside"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:layout_alignParentTop="true"
-                    android:adjustViewBounds="true"
-                    android:background="@color/dark_image_background"
-                    android:src="@drawable/dummy_thumbnail"/>
+                    android:layout_height="250dp"
+                    android:background="@android:color/transparent" />
 
-                <RelativeLayout
+                <RelativeLayout android:id="@+id/detailTextContentLayout"
+                    android:visibility="invisible"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_below="@id/detailThumbnailView"
-                    android:padding="@dimen/video_item_detail_info_text_padding" >
+                    android:layout_below="@id/detailVideoThumbnailWindow"
+                    android:paddingTop="5dp"
+                    android:paddingBottom="5dp"
+                    android:paddingRight="5dp"
+                    android:paddingLeft="5dp"
+                    android:background="@color/background_gray">
 
                     <TextView android:id="@+id/detailVideoTitleView"
                         android:layout_width="wrap_content"
@@ -55,13 +66,13 @@
                         android:layout_alignParentStart="true"
                         android:textStyle="bold"
                         android:paddingBottom="3dp"
-                        android:textSize="@dimen/video_item_detail_title_text_size"
+                        android:textSize="@dimen/text_video_title_size"
                         android:textAppearance="?android:attr/textAppearanceLarge"/>
 
                     <ImageView android:id="@+id/detailUploaderThumbnailView"
                         android:contentDescription="@string/detailUploaderThumbnailViewDescription"
-                        android:layout_width="@dimen/video_item_detail_uploader_image_size"
-                        android:layout_height="@dimen/video_item_detail_uploader_image_size"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
                         android:layout_below="@id/detailVideoTitleView"
                         android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true"
@@ -74,7 +85,7 @@
                         android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true"
                         android:textStyle="bold"
-                        android:textSize="@dimen/video_item_detail_uploader_text_size"
+                        android:textSize="@dimen/text_video_uploader_size"
                         android:textAppearance="?android:attr/textAppearanceLarge" />
 
                     <TextView android:id="@+id/detailViewCountView"
@@ -84,7 +95,7 @@
                         android:layout_below="@id/detailVideoTitleView"
                         android:layout_alignParentRight="true"
                         android:layout_alignParentEnd="true"
-                        android:textSize="@dimen/video_item_detail_views_text_size"
+                        android:textSize="@dimen/text_video_views_size"
                         android:textAppearance="?android:attr/textAppearanceLarge" />
 
                     <TextView android:id="@+id/detailThumbsDownCountView"
@@ -93,7 +104,7 @@
                         android:layout_below="@id/detailViewCountView"
                         android:layout_alignParentRight="true"
                         android:layout_alignParentEnd="true"
-                        android:textSize="@dimen/video_item_detail_likes_text_size"
+                        android:textSize="@dimen/text_video_like_size"
                         android:paddingRight="5dp"
                         android:paddingLeft="5dp"
                         android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -117,7 +128,7 @@
                         android:layout_toStartOf="@id/detailThumbsDownImgView"
                         android:paddingRight="5dp"
                         android:paddingLeft="5dp"
-                        android:textSize="@dimen/video_item_detail_likes_text_size"
+                        android:textSize="@dimen/text_video_like_size"
                         android:textAppearance="?android:attr/textAppearanceMedium"/>
 
                     <ImageView android:id="@+id/detailThumbsUpImgView"
@@ -137,7 +148,7 @@
                         android:layout_below="@id/detailUploaderView"
                         android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true"
-                        android:textSize="@dimen/video_item_detail_upload_date_text_size"
+                        android:textSize="@dimen/text_video_upload_date_size"
                         android:textAppearance="?android:attr/textAppearanceLarge" />
 
                     <TextView android:id="@+id/detailDescriptionView"
@@ -146,61 +157,66 @@
                         android:layout_below="@id/detailUploadDateView"
                         android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true"
-                        android:textSize="@dimen/video_item_detail_description_text_size"
+                        android:textSize="@dimen/text_video_description_size"
                         android:textAppearance="?android:attr/textAppearanceMedium" />
 
+
+                    <RelativeLayout
+                        android:id="@+id/detailNextVideoRootLayout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingTop="10dp"
+                        android:paddingBottom="10dp"
+                        android:paddingLeft="5dp"
+                        android:paddingRight="5dp"
+                        android:layout_below="@id/detailDescriptionView" >
+
+                        <TextView android:id="@+id/detailNextVideoTitle"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentLeft="true"
+                            android:layout_alignParentStart="true"
+                            android:textSize="@dimen/text_video_upload_date_size"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:textColor="@android:color/black"
+                            android:text="@string/nextVideoTitle"
+                            />
+                        <FrameLayout
+                            android:id="@+id/detailNextVideoFrame"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_below="@id/detailNextVideoTitle"/>
+                        <Button
+                            android:id="@+id/detailNextVideoButton"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_alignTop="@id/detailNextVideoFrame"
+                            android:layout_alignBottom="@id/detailNextVideoFrame"
+                            android:background="?attr/selectableItemBackground"/>
+                    </RelativeLayout>
+
+                    <Button android:id="@+id/detailShowSimilarButton"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="6dp"
+                        android:layout_marginRight="6dp"
+                        android:layout_below="@id/detailNextVideoRootLayout"
+                        android:text="@string/showSimilarVideosButtonText"/>
+
                 </RelativeLayout>
             </RelativeLayout>
-
-            <RelativeLayout android:id="@+id/detailNextVideoRootLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/video_item_detail_info_text_padding"
-                android:layout_below="@id/detailVideoInfo" >
-
-                <TextView android:id="@+id/detailNextVideoTitle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true"
-                    android:textSize="@dimen/video_item_detail_next_text_size"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:textColor="@android:color/black"
-                    android:text="@string/nextVideoTitle"
-                    android:textAllCaps="true" />
-
-                <RelativeLayout android:id="@+id/detailNextVidButtonAndContantLayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/detailNextVideoTitle">
-                    <FrameLayout
-                        android:id="@+id/detailNextVideoFrame"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-                    <Button
-                        android:id="@+id/detailNextVideoButton"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_alignTop="@id/detailNextVideoFrame"
-                        android:layout_alignBottom="@id/detailNextVideoFrame"
-                        android:background="?attr/selectableItemBackground"/>
-                </RelativeLayout>
-                <Button android:id="@+id/detailShowSimilarButton"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/detailNextVidButtonAndContantLayout"
-                    android:text="@string/showSimilarVideosButtonText"/>
-            </RelativeLayout>
-
         </RelativeLayout>
     </ScrollView>
 
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/playVideoButton"
-        android:layout_centerHorizontal="true"
+        android:visibility="visible"
         android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:backgroundTint="@color/primaryColorYoutube"
         android:src="@drawable/ic_play_arrow_black"
         android:layout_margin="20dp"/>
+
 </RelativeLayout>
\ No newline at end of file