From 03ed121610609727be3249ac23da36789b7dd13d Mon Sep 17 00:00:00 2001
From: darkon5 <ik_1dw3@218_HZ076751.H015110.NET>
Date: Tue, 22 Sep 2015 13:01:25 +0200
Subject: [PATCH 1/2] New Screen - indev1

---
 .../res/layout/activity_videoitem_list.xml    |  3 +-
 .../res/layout/fragment_videoitem_detail.xml  | 79 +++++++++++--------
 app/src/main/res/values/colors.xml            |  4 +-
 app/src/main/res/values/dimentxt.xml          |  7 ++
 4 files changed, 56 insertions(+), 37 deletions(-)

diff --git a/app/src/main/res/layout/activity_videoitem_list.xml b/app/src/main/res/layout/activity_videoitem_list.xml
index ef35fc763..87c28ee62 100644
--- a/app/src/main/res/layout/activity_videoitem_list.xml
+++ b/app/src/main/res/layout/activity_videoitem_list.xml
@@ -7,7 +7,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="10dp"
-        android:src="@drawable/new_pipe_watermark"/>
+        android:src="@drawable/new_pipe_watermark"
+        android:visibility="invisible"/>
 
     <fragment
         xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/fragment_videoitem_detail.xml b/app/src/main/res/layout/fragment_videoitem_detail.xml
index d58c52b10..cf04f4670 100644
--- a/app/src/main/res/layout/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout/fragment_videoitem_detail.xml
@@ -30,7 +30,7 @@
                 android:layout_alignParentLeft="true"
                 android:layout_alignParentTop="true"
                 android:adjustViewBounds="true"
-                android:visibility="invisible"
+                android:visibility="visible"
                 android:src="@drawable/dummi_thumbnail"/>
 
             <TextView android:id="@+id/detailVideoTitleView"
@@ -39,19 +39,20 @@
                 android:layout_below="@id/detailThumbnailView"
                 android:layout_alignParentLeft="true"
                 android:paddingLeft="6dp"
-                android:paddingBottom="20dp"
+                android:paddingBottom="0dp"
+                android:textStyle="bold"
                 android:textAppearance="?android:attr/textAppearanceLarge"
-                android:visibility="invisible"
-                android:text="Bla blabla !!!"/>
+                android:visibility="visible"
+                android:text="detailVideoTitleViewDUMMY"/>
 
             <ImageView android:id="@+id/detailUploaderThumbnailView"
                 android:layout_width="85dp"
                 android:layout_height="100dp"
-                android:paddingTop="25dp"
+                android:paddingTop="0dp"
                 android:paddingLeft="2dp"
                 android:layout_below="@id/detailVideoTitleView"
                 android:layout_alignParentLeft="true"
-                android:visibility="invisible"
+                android:visibility="visible"
                 android:src="@drawable/budy" />
 
             <TextView android:id="@+id/detailUploaderView"
@@ -61,55 +62,63 @@
                 android:layout_alignParentLeft="true"
                 android:paddingLeft="6dp"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:visibility="invisible"
-                android:text="Herr von Gurken" />
+                android:textSize="@dimen/text_video_uploader_size"
+                android:visibility="visible"
+                android:text="detailUploaderViewDUMMY" />
 
             <TextView android:id="@+id/detailViewCountView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingTop="25dp"
+                android:paddingTop="6dp"
                 android:layout_below="@id/detailVideoTitleView"
-                android:layout_alignParentRight="true"
-                android:paddingRight="16dp"
+                android:layout_toRightOf="@id/detailUploaderThumbnailView"
+                android:paddingLeft="6dp"
                 android:textAppearance="?android:attr/textAppearanceLarge"
-                android:visibility="invisible"
+                android:textSize="@dimen/text_video_visits_size"
+                android:visibility="visible"
                 android:text="drölf views" />
 
+
+            <ImageView android:id="@+id/detailThumbsDownImgView"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_below="@id/detailViewCountView"
+                android:layout_toRightOf="@id/detailUploaderThumbnailView"
+                android:paddingLeft="6dp"
+                android:visibility="visible"
+                android:src="@drawable/thumbs_down" />
+
             <TextView android:id="@+id/detailThumbsDownCountView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/detailViewCountView"
-                android:layout_alignParentRight="true"
-                android:paddingRight="16dp"
+                android:layout_toRightOf="@id/detailThumbsDownImgView"
+                android:paddingRight="6dp"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:visibility="invisible"
+                android:textSize="@dimen/text_video_like_size"
+                android:visibility="visible"
                 android:text="-5.000" />
 
-            <ImageView android:id="@+id/detailThumbsDownImgView"
-                android:layout_width="40dp"
+
+            <ImageView android:id="@+id/detailThumbsUpImgView"
+                android:layout_width="20dp"
                 android:layout_height="20dp"
                 android:layout_below="@id/detailViewCountView"
-                android:layout_toLeftOf="@id/detailThumbsDownCountView"
-                android:visibility="invisible"
-                android:src="@drawable/thumbs_down" />
+                android:layout_toRightOf="@id/detailThumbsDownCountView"
+                android:paddingLeft="6dp"
+                android:visibility="visible"
+                android:src="@drawable/thumbs_up" />
 
             <TextView android:id="@+id/detailThumbsUpCountView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/detailViewCountView"
-                android:layout_toLeftOf="@id/detailThumbsDownImgView"
+                android:layout_toRightOf="@id/detailThumbsUpImgView"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:visibility="invisible"
+                android:textSize="@dimen/text_video_like_size"
+                android:visibility="visible"
                 android:text="∞" />
 
-            <ImageView android:id="@+id/detailThumbsUpImgView"
-                android:layout_width="40dp"
-                android:layout_height="20dp"
-                android:layout_below="@id/detailViewCountView"
-                android:layout_toLeftOf="@id/detailThumbsUpCountView"
-                android:visibility="invisible"
-                android:src="@drawable/thumbs_up" />
-
             <TextView android:id="@+id/detailUploadDateView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -118,8 +127,9 @@
                 android:paddingLeft="6dp"
                 android:paddingTop="20dp"
                 android:textAppearance="?android:attr/textAppearanceLarge"
-                android:visibility="invisible"
-                android:text="Uploaded at: 45.64.1285" />
+                android:textSize="@dimen/text_video_uploadtime_size"
+                android:visibility="visible"
+                android:text="Uploaded at: dummy tiem" />
 
             <TextView android:id="@+id/detailDescriptionView"
                 android:layout_width="wrap_content"
@@ -128,7 +138,8 @@
                 android:layout_alignParentLeft="true"
                 android:paddingLeft="6dp"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:visibility="invisible"
+                android:textSize="@dimen/text_video_description_size"
+                android:visibility="visible"
                 android:text="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmodtempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. "
                 />
 
@@ -147,5 +158,5 @@
         android:layout_height="wrap_content"
         app:backgroundTint="@color/primaryColorYoutube"
         android:src="@drawable/ic_play_arrow_black"
-        android:layout_margin="15pt"/>
+        android:layout_margin="35dp"/>
 </RelativeLayout>
\ 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 b444b0725..4d4bfd4c9 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="primaryColorYoutube">#dd0000</color>
-    <color name="primaryColorDarkYoutube">#bb0000</color>
+    <color name="primaryColorYoutube">#00aafd</color>
+    <color name="primaryColorDarkYoutube">#00aaff</color>
     <color name="accentColorYoutube">#000000</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 916afd036..5089b61e0 100644
--- a/app/src/main/res/values/dimentxt.xml
+++ b/app/src/main/res/values/dimentxt.xml
@@ -4,4 +4,11 @@
     <dimen name="text_search_duration_size">11sp</dimen>
     <dimen name="text_search_uploader_size">12sp</dimen>
     <dimen name="text_search_uploadtime_size">12sp</dimen>
+
+    <dimen name="text_video_title_size">14sp</dimen>
+    <dimen name="text_video_visits_size">14sp</dimen>
+    <dimen name="text_video_like_size">12sp</dimen>
+    <dimen name="text_video_uploader_size">14sp</dimen>
+    <dimen name="text_video_uploadtime_size">14sp</dimen>
+    <dimen name="text_video_description_size">14sp</dimen>
 </resources>
\ No newline at end of file

From 1ee54016a52e1fd67fa9bb477f77a46da894ed3c Mon Sep 17 00:00:00 2001
From: darkon5 <ik_1dw3@218_HZ076751.H015110.NET>
Date: Tue, 22 Sep 2015 14:48:33 +0200
Subject: [PATCH 2/2] New Screen - indev2

banner
---
 app/src/main/res/drawable/banner.png            | Bin 0 -> 10690 bytes
 .../res/layout/fragment_videoitem_detail.xml    |  11 +++++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 app/src/main/res/drawable/banner.png

diff --git a/app/src/main/res/drawable/banner.png b/app/src/main/res/drawable/banner.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e470c7e2554e291fabf261257b0749c8c3e75bd
GIT binary patch
literal 10690
zcmeAS@N?(olHy`uVBq!ia0y~y;P7BzV2tNr0*c&t@#hebVk{1FcVbv~PUa<$!;<dk
z>&U>cv7h@-A}f&3S>O>_%)r2R7=#&*=dVa%V9*Trba4!+h<kg}k(a@Mhk0Y}pU9~Z
zrV{EqIh4%z-<fII$H2(M!XcpG(16Ye5U6OKU?hY^2BLOfL!vW3R-Hik#-4^m<<DA<
zoY+hT=|9}Yhf9h{lJT(Hv(P4-R=4rW;&hb}Q(Nzu)hw!*{(*?_NL%5O;z(iPk)9dO
z>4gy#P#qFxCAg#nPH;$=8LbzZf*y)6%M5Z};F409AZU=25~r$xD<%?dT)-veprD*^
z<HR1X034C%aA3niX6*6n(BR;9V8g`9sS9w)10$GyG=iZ~J{rMj`E@i0BMPC>9E=DH
zaEUisM8gVxh0!7!Eo}g6+0i-}R-up9!DvmY(MA@cojBTxMuY`8!;H3~VdVxeU`D%1
zsGXkCZW2;>jP`?3d$pteV5IOE9q2$E))*b=Knjo1fsWCE4zy+$q60TN(18ex(SZ)6
z_6Dc`86As84Elh3wW9+ah|c}!KnEf$z{Tt6KnJ3h86D_AgvIDU2U`1Ubf5!i&<E6u
z8y)CCYIuwebRc!?fjMV%paUs9Mh7~OI`+Vx%jiG{Qh1CGbf8tVqboWPo%_*&4n$at
i4s;;3Hy{HY8wyic*)<pJehplA$>8bg=d#Wzp$PyNS+%PG

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/fragment_videoitem_detail.xml b/app/src/main/res/layout/fragment_videoitem_detail.xml
index cf04f4670..f39e545c7 100644
--- a/app/src/main/res/layout/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout/fragment_videoitem_detail.xml
@@ -23,6 +23,7 @@
                 android:layout_gravity="center"
                 android:indeterminate="true"/>
 
+
             <ImageView android:id="@+id/detailThumbnailView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -45,6 +46,15 @@
                 android:visibility="visible"
                 android:text="detailVideoTitleViewDUMMY"/>
 
+            <!-- THIS NEEDS TO BE STRETCHED - maybe by code? idk -->
+            <ImageView android:id="@+id/detailChannelBackground"
+                android:layout_width="fill_parent"
+                android:layout_height="100dp"
+                android:layout_below="@id/detailVideoTitleView"
+                android:paddingLeft="0dp"
+                android:visibility="visible"
+                android:src="@drawable/banner" />
+
             <ImageView android:id="@+id/detailUploaderThumbnailView"
                 android:layout_width="85dp"
                 android:layout_height="100dp"
@@ -55,6 +65,7 @@
                 android:visibility="visible"
                 android:src="@drawable/budy" />
 
+
             <TextView android:id="@+id/detailUploaderView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"