From 6c63841d0c79b8baa4b4047e5ef694b538ee1fd6 Mon Sep 17 00:00:00 2001
From: chschtsch <chschtsch@ya.ru>
Date: Wed, 2 Dec 2015 21:55:57 +0300
Subject: [PATCH] update video detail layout

---
 app/src/main/AndroidManifest.xml              |  4 +--
 .../layout-land/fragment_videoitem_detail.xml | 36 ++++++++-----------
 .../fragment_videoitem_detail.xml             | 36 ++++++++-----------
 .../res/layout/activity_videoitem_list.xml    |  2 +-
 .../res/layout/fragment_videoitem_detail.xml  | 36 ++++++++-----------
 app/src/main/res/layout/video_item.xml        |  6 ++--
 app/src/main/res/values-land/dimens.xml       |  9 +++--
 app/src/main/res/values-sw600dp/dimens.xml    |  5 +++
 app/src/main/res/values-v21/styles.xml        |  4 +--
 app/src/main/res/values/colors.xml            |  9 ++---
 app/src/main/res/values/dimens.xml            | 10 ++++--
 app/src/main/res/values/styles.xml            |  4 +--
 12 files changed, 77 insertions(+), 84 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ea64136cb..f7bb5a6fa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="org.schabi.newpipe" >
 
-    <uses-permission android:name= "android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <application
@@ -15,7 +15,7 @@
         tools:ignore="AllowBackup">
         <activity
             android:name=".VideoItemListActivity"
-            android:label="@string/app_name" >
+            android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/res/layout-land/fragment_videoitem_detail.xml b/app/src/main/res/layout-land/fragment_videoitem_detail.xml
index f1c3707ea..cde5fde9b 100644
--- a/app/src/main/res/layout-land/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout-land/fragment_videoitem_detail.xml
@@ -33,22 +33,20 @@
                 <ImageView android:id="@+id/detailThumbnailView"
                     android:contentDescription="@string/detailThumbnailViewDescription"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    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"/>
 
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/detailThumbnailView"
-                    android:paddingTop="5dp"
-                    android:paddingBottom="5dp"
-                    android:paddingRight="5dp"
-                    android:paddingLeft="5dp">
+                    android:padding="@dimen/video_item_detail_info_text_padding" >
 
                     <TextView android:id="@+id/detailVideoTitleView"
                         android:layout_width="wrap_content"
@@ -62,8 +60,8 @@
 
                     <ImageView android:id="@+id/detailUploaderThumbnailView"
                         android:contentDescription="@string/detailUploaderThumbnailViewDescription"
-                        android:layout_width="80dp"
-                        android:layout_height="80dp"
+                        android:layout_width="@dimen/video_item_detail_uploader_image_size"
+                        android:layout_height="@dimen/video_item_detail_uploader_image_size"
                         android:layout_below="@id/detailVideoTitleView"
                         android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true"
@@ -157,22 +155,18 @@
             <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: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_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:textSize="@dimen/video_item_detail_upload_date_text_size"
+                    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"
@@ -190,15 +184,13 @@
                         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>
 
-            <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>
     </ScrollView>
 
diff --git a/app/src/main/res/layout-sw600dp/fragment_videoitem_detail.xml b/app/src/main/res/layout-sw600dp/fragment_videoitem_detail.xml
index f1c3707ea..cde5fde9b 100644
--- a/app/src/main/res/layout-sw600dp/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout-sw600dp/fragment_videoitem_detail.xml
@@ -33,22 +33,20 @@
                 <ImageView android:id="@+id/detailThumbnailView"
                     android:contentDescription="@string/detailThumbnailViewDescription"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    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"/>
 
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/detailThumbnailView"
-                    android:paddingTop="5dp"
-                    android:paddingBottom="5dp"
-                    android:paddingRight="5dp"
-                    android:paddingLeft="5dp">
+                    android:padding="@dimen/video_item_detail_info_text_padding" >
 
                     <TextView android:id="@+id/detailVideoTitleView"
                         android:layout_width="wrap_content"
@@ -62,8 +60,8 @@
 
                     <ImageView android:id="@+id/detailUploaderThumbnailView"
                         android:contentDescription="@string/detailUploaderThumbnailViewDescription"
-                        android:layout_width="80dp"
-                        android:layout_height="80dp"
+                        android:layout_width="@dimen/video_item_detail_uploader_image_size"
+                        android:layout_height="@dimen/video_item_detail_uploader_image_size"
                         android:layout_below="@id/detailVideoTitleView"
                         android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true"
@@ -157,22 +155,18 @@
             <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: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_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:textSize="@dimen/video_item_detail_upload_date_text_size"
+                    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"
@@ -190,15 +184,13 @@
                         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>
 
-            <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>
     </ScrollView>
 
diff --git a/app/src/main/res/layout/activity_videoitem_list.xml b/app/src/main/res/layout/activity_videoitem_list.xml
index 0a1c8e2e5..9032ba45d 100644
--- a/app/src/main/res/layout/activity_videoitem_list.xml
+++ b/app/src/main/res/layout/activity_videoitem_list.xml
@@ -10,6 +10,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tools:context=".VideoItemListActivity"
-        tools:layout="@android:layout/list_content"/>
+        tools:layout="@android:layout/list_content" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_videoitem_detail.xml b/app/src/main/res/layout/fragment_videoitem_detail.xml
index 35f6e01b0..664cb6089 100644
--- a/app/src/main/res/layout/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout/fragment_videoitem_detail.xml
@@ -33,22 +33,20 @@
                 <ImageView android:id="@+id/detailThumbnailView"
                     android:contentDescription="@string/detailThumbnailViewDescription"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    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"/>
 
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/detailThumbnailView"
-                    android:paddingTop="5dp"
-                    android:paddingBottom="5dp"
-                    android:paddingRight="5dp"
-                    android:paddingLeft="5dp">
+                    android:padding="@dimen/video_item_detail_info_text_padding" >
 
                     <TextView android:id="@+id/detailVideoTitleView"
                         android:layout_width="wrap_content"
@@ -62,8 +60,8 @@
 
                     <ImageView android:id="@+id/detailUploaderThumbnailView"
                         android:contentDescription="@string/detailUploaderThumbnailViewDescription"
-                        android:layout_width="80dp"
-                        android:layout_height="80dp"
+                        android:layout_width="@dimen/video_item_detail_uploader_image_size"
+                        android:layout_height="@dimen/video_item_detail_uploader_image_size"
                         android:layout_below="@id/detailVideoTitleView"
                         android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true"
@@ -157,22 +155,18 @@
             <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: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_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:textSize="@dimen/video_item_detail_upload_date_text_size"
+                    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"
@@ -190,15 +184,13 @@
                         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>
 
-            <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>
     </ScrollView>
 
diff --git a/app/src/main/res/layout/video_item.xml b/app/src/main/res/layout/video_item.xml
index dc1fa21ec..f08a46c91 100644
--- a/app/src/main/res/layout/video_item.xml
+++ b/app/src/main/res/layout/video_item.xml
@@ -33,8 +33,8 @@
 
                 <ImageView android:id="@+id/itemThumbnailView"
                     android:contentDescription="@string/itemThumbnailViewDescription"
-                    android:layout_width="@dimen/video_item_search_image_width"
-                    android:layout_height="@dimen/video_item_search_image_height"
+                    android:layout_width="@dimen/video_item_search_thumbnail_image_width"
+                    android:layout_height="@dimen/video_item_search_thumbnail_image_height"
                     android:scaleType="centerCrop"
                     android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
@@ -64,7 +64,7 @@
             <LinearLayout
                 android:orientation="vertical"
                 android:layout_width="fill_parent"
-                android:layout_height="@dimen/video_item_search_image_height"
+                android:layout_height="@dimen/video_item_search_thumbnail_image_height"
                 android:layout_toRightOf="@id/itemThumbnailViewContainer">
 
                 <TextView android:id="@+id/itemVideoTitleView"
diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
index 26ddc1741..71c4b1515 100644
--- a/app/src/main/res/values-land/dimens.xml
+++ b/app/src/main/res/values-land/dimens.xml
@@ -9,8 +9,8 @@
     <dimen name="video_item_search_uploader_text_size">18sp</dimen>
     <dimen name="video_item_search_upload_date_text_size">18sp</dimen>
     <!-- Elements Size -->
-    <dimen name="video_item_search_image_width">210dp</dimen>
-    <dimen name="video_item_search_image_height">130dp</dimen>
+    <dimen name="video_item_search_thumbnail_image_width">210dp</dimen>
+    <dimen name="video_item_search_thumbnail_image_height">130dp</dimen>
     <!-- Paddings & Margins -->
     <dimen name="video_item_search_card_vertical_margin">3dp</dimen>
     <dimen name="video_item_search_card_horizontal_margin">10dp</dimen>
@@ -32,4 +32,9 @@
     <dimen name="video_item_detail_uploader_text_size">18sp</dimen>
     <dimen name="video_item_detail_upload_date_text_size">18sp</dimen>
     <dimen name="video_item_detail_description_text_size">18sp</dimen>
+    <!-- Elements Size -->
+    <dimen name="video_item_detail_thumbnail_image_height">240dp</dimen>
+    <dimen name="video_item_detail_uploader_image_size">100dp</dimen>
+    <!-- Paddings & Margins -->
+    <dimen name="video_item_detail_info_text_padding">10sp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
index 4c547e7f3..84945755e 100644
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -10,4 +10,9 @@
     <dimen name="video_item_detail_uploader_text_size">16sp</dimen>
     <dimen name="video_item_detail_upload_date_text_size">16sp</dimen>
     <dimen name="video_item_detail_description_text_size">16sp</dimen>
+    <!-- Elements Size -->
+    <dimen name="video_item_detail_thumbnail_image_height">300dp</dimen>
+    <dimen name="video_item_detail_uploader_image_size">110dp</dimen>
+    <!-- Paddings & Margins -->
+    <dimen name="video_item_detail_info_text_padding">10sp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 6c4c1939d..b8610dc79 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -30,7 +30,7 @@
     <style name="VideoPlayerActionBarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid.Inverse" >
         <item name="android:displayOptions">showHome</item>
         <item name="displayOptions">showHome</item>
-        <item name="android:background">@color/black_overlay</item>
-        <item name="background">@color/black_overlay</item>
+        <item name="android:background">@color/dark_overlay</item>
+        <item name="background">@color/dark_overlay</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 610d00f89..aee88f5f5 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,8 +2,9 @@
 <resources>
     <color name="primaryColorYoutube">#cd322e</color>
     <color name="primaryColorDarkYoutube">#bc211d</color>
-    <color name="accentColorYoutube">#000000</color>
-    <color name="durationBackground">#aa000000</color>
-    <color name="durationText">#eeffffff</color>
-    <color name="black_overlay">#66000000</color>
+    <color name="accentColorYoutube">#000</color>
+    <color name="durationBackground">#a000</color>
+    <color name="durationText">#efff</color>
+    <color name="dark_overlay">#6000</color>
+    <color name="dark_image_background">#222</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 4793479a3..adc8e9e78 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -9,8 +9,8 @@
     <dimen name="video_item_search_uploader_text_size">12sp</dimen>
     <dimen name="video_item_search_upload_date_text_size">12sp</dimen>
     <!-- Elements Size -->
-    <dimen name="video_item_search_image_width">140dp</dimen>
-    <dimen name="video_item_search_image_height">80dp</dimen>
+    <dimen name="video_item_search_thumbnail_image_width">140dp</dimen>
+    <dimen name="video_item_search_thumbnail_image_height">85dp</dimen>
     <!-- Paddings & Margins -->
     <dimen name="video_item_search_card_vertical_margin">2dp</dimen>
     <dimen name="video_item_search_card_horizontal_margin">6dp</dimen>
@@ -32,5 +32,11 @@
     <dimen name="video_item_detail_uploader_text_size">14sp</dimen>
     <dimen name="video_item_detail_upload_date_text_size">14sp</dimen>
     <dimen name="video_item_detail_description_text_size">14sp</dimen>
+    <dimen name="video_item_detail_next_text_size">16sp</dimen>
+    <!-- Elements Size -->
+    <dimen name="video_item_detail_thumbnail_image_height">200dp</dimen>
+    <dimen name="video_item_detail_uploader_image_size">80dp</dimen>
+    <!-- Paddings & Margins -->
+    <dimen name="video_item_detail_info_text_padding">6sp</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a6ca5f74d..1126073b0 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -28,7 +28,7 @@
     <style name="VideoPlayerActionBarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid.Inverse" >
         <item name="android:displayOptions">showHome</item>
         <item name="displayOptions">showHome</item>
-        <item name="android:background">@color/black_overlay</item>
-        <item name="background">@color/black_overlay</item>
+        <item name="android:background">@color/dark_overlay</item>
+        <item name="background">@color/dark_overlay</item>
     </style>
 </resources>
\ No newline at end of file