From 21100201653b9094a47e4a756b074279044b4b9a Mon Sep 17 00:00:00 2001
From: chschtsch <chschtsch@greg-mac-osx.local>
Date: Sat, 14 Nov 2015 20:48:42 +0300
Subject: [PATCH] update design

---
 .../layout-land/fragment_videoitem_detail.xml | 20 ++----------
 .../fragment_videoitem_detail.xml             | 19 +-----------
 .../res/layout/fragment_videoitem_detail.xml  | 31 +++++--------------
 app/src/main/res/layout/video_item.xml        | 23 ++++++--------
 app/src/main/res/values/colors.xml            |  2 ++
 app/src/main/res/values/dimentxt.xml          |  1 +
 6 files changed, 24 insertions(+), 72 deletions(-)

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 a1a286a4a..0ff3bfe19 100644
--- a/app/src/main/res/layout-land/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout-land/fragment_videoitem_detail.xml
@@ -159,19 +159,10 @@
                     android:text="@string/nextVideoTitle"
                     />
 
-                <View android:id="@+id/detailNextVideoSeperationLine"
-                    android:layout_width="fill_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginLeft="6dp"
-                    android:layout_marginRight="6dp"
-                    android:background="@android:color/darker_gray"
-                    android:layout_below="@id/detailNextVideoTitle"
-                    android:layout_alignParentLeft="true" />
-
                 <RelativeLayout android:id="@+id/detailNextVidButtonAndContantLayout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_below="@id/detailNextVideoSeperationLine">
+                    android:layout_below="@id/detailNextVideoTitle">
                     <FrameLayout
                         android:id="@+id/detailNextVideoFrame"
                         android:layout_width="match_parent"
@@ -185,15 +176,8 @@
                         android:background="?attr/selectableItemBackground"/>
                 </RelativeLayout>
 
-                <View android:id="@+id/detailNextVideoSeperationLineEnd"
-                    android:layout_width="fill_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginLeft="6dp"
-                    android:layout_marginRight="6dp"
-                    android:background="@android:color/darker_gray"
-                    android:layout_below="@id/detailNextVidButtonAndContantLayout"
-                    android:layout_alignParentLeft="true" />
             </RelativeLayout>
+
             <Button android:id="@+id/detailShowSimilarButton"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
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 00797166f..33edf8ab9 100644
--- a/app/src/main/res/layout-sw600dp/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout-sw600dp/fragment_videoitem_detail.xml
@@ -159,19 +159,10 @@
                     android:text="@string/nextVideoTitle"
                     />
 
-                <View android:id="@+id/detailNextVideoSeperationLine"
-                    android:layout_width="fill_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginLeft="6dp"
-                    android:layout_marginRight="6dp"
-                    android:background="@android:color/darker_gray"
-                    android:layout_below="@id/detailNextVideoTitle"
-                    android:layout_alignParentLeft="true" />
-
                 <RelativeLayout android:id="@+id/detailNextVidButtonAndContantLayout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_below="@id/detailNextVideoSeperationLine">
+                    android:layout_below="@id/detailNextVideoTitle">
                     <FrameLayout
                         android:id="@+id/detailNextVideoFrame"
                         android:layout_width="match_parent"
@@ -185,14 +176,6 @@
                         android:background="?attr/selectableItemBackground"/>
                 </RelativeLayout>
 
-                <View android:id="@+id/detailNextVideoSeperationLineEnd"
-                    android:layout_width="fill_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginLeft="6dp"
-                    android:layout_marginRight="6dp"
-                    android:background="@android:color/darker_gray"
-                    android:layout_below="@id/detailNextVidButtonAndContantLayout"
-                    android:layout_alignParentLeft="true" />
             </RelativeLayout>
             <Button android:id="@+id/detailShowSimilarButton"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_videoitem_detail.xml b/app/src/main/res/layout/fragment_videoitem_detail.xml
index 40ab762eb..f8e3224c0 100644
--- a/app/src/main/res/layout/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout/fragment_videoitem_detail.xml
@@ -141,37 +141,30 @@
 
                 </RelativeLayout>
             </RelativeLayout>
+
             <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/detailVideoInfo" >
 
                 <TextView android:id="@+id/detailNextVideoTitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
-                    android:paddingLeft="6dp"
-                    android:paddingRight="6dp"
-                    android:paddingTop="20dp"
-                    android:paddingBottom="6dp"
+                    android:textSize="@dimen/text_video_upload_date_size"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:textColor="@android:color/black"
                     android:text="@string/nextVideoTitle"
                     />
 
-                <View android:id="@+id/detailNextVideoSeperationLine"
-                    android:layout_width="fill_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginLeft="6dp"
-                    android:layout_marginRight="6dp"
-                    android:background="@android:color/darker_gray"
-                    android:layout_below="@id/detailNextVideoTitle"
-                    android:layout_alignParentLeft="true" />
-
                 <RelativeLayout android:id="@+id/detailNextVidButtonAndContantLayout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_below="@id/detailNextVideoSeperationLine">
+                    android:layout_below="@id/detailNextVideoTitle">
                     <FrameLayout
                         android:id="@+id/detailNextVideoFrame"
                         android:layout_width="match_parent"
@@ -184,16 +177,8 @@
                         android:layout_alignBottom="@id/detailNextVideoFrame"
                         android:background="?attr/selectableItemBackground"/>
                 </RelativeLayout>
-
-                <View android:id="@+id/detailNextVideoSeperationLineEnd"
-                    android:layout_width="fill_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginLeft="6dp"
-                    android:layout_marginRight="6dp"
-                    android:background="@android:color/darker_gray"
-                    android:layout_below="@id/detailNextVidButtonAndContantLayout"
-                    android:layout_alignParentLeft="true" />
             </RelativeLayout>
+
             <Button android:id="@+id/detailShowSimilarButton"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/video_item.xml b/app/src/main/res/layout/video_item.xml
index e20e38ce2..18a6cff5a 100644
--- a/app/src/main/res/layout/video_item.xml
+++ b/app/src/main/res/layout/video_item.xml
@@ -3,12 +3,13 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="92dp"
     android:padding="6dp">
 
     <ImageView android:id="@+id/itemThumbnailView"
         android:layout_width="142dp"
         android:layout_height="80dp"
+        android:layout_marginRight="10dp"
         android:scaleType="centerCrop"
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
@@ -16,11 +17,9 @@
 
     <TextView android:id="@+id/itemVideoTitleView"
         android:layout_width="wrap_content"
-        android:layout_height="40dp"
+        android:layout_height="36dp"
         android:layout_toRightOf="@id/itemThumbnailView"
         android:layout_alignParentTop="true"
-        android:paddingLeft="6dp"
-        android:paddingTop="4dp"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:textSize="@dimen/text_search_title_size"
         android:text="title"
@@ -28,10 +27,9 @@
 
     <TextView android:id="@+id/itemUploaderView"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="15dp"
         android:layout_toRightOf="@id/itemThumbnailView"
         android:layout_below="@id/itemVideoTitleView"
-        android:paddingLeft="6dp"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textSize="@dimen/text_search_uploader_size"
         android:text="uploader"/>
@@ -42,7 +40,6 @@
         android:layout_height="wrap_content"
         android:layout_toRightOf="@id/itemThumbnailView"
         android:layout_below="@id/itemUploaderView"
-        android:paddingLeft="6dp"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textSize="@dimen/text_search_uploadtime_size"
         />
@@ -52,16 +49,16 @@
         android:layout_height="wrap_content"
         android:layout_alignBottom="@id/itemThumbnailView"
         android:layout_alignRight="@id/itemThumbnailView"
-        android:layout_marginRight="6dp"
-        android:layout_marginBottom="12dp"
-        android:paddingLeft="3dp"
-        android:paddingRight="3dp"
+        android:layout_marginRight="2dp"
+        android:layout_marginBottom="2dp"
         android:paddingTop="1dp"
         android:paddingBottom="1dp"
+        android:paddingRight="5dp"
+        android:paddingLeft="5dp"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textSize="@dimen/text_search_duration_size"
-        android:background="@drawable/durationback"
-        android:textColor="#f7f7f7"
+        android:background="@color/durationBackground"
+        android:textColor="@color/durationText"
         android:text="duration"
         />
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 93a3a82d1..610d00f89 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,5 +3,7 @@
     <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>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimentxt.xml b/app/src/main/res/values/dimentxt.xml
index 86e854c64..7d9242073 100644
--- a/app/src/main/res/values/dimentxt.xml
+++ b/app/src/main/res/values/dimentxt.xml
@@ -12,6 +12,7 @@
     <dimen name="text_video_upload_date_size">14sp</dimen>
     <dimen name="text_video_description_size">14sp</dimen>
 
+
     <dimen name="text_video_title_sw600dp_size">20sp</dimen>
     <dimen name="text_video_views_sw600dp_size">16sp</dimen>
     <dimen name="text_video_like_sw600dp_size">14sp</dimen>