Skip to content

Video Detail Layout Update #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
darkon5 wants to merge 25 commits into from
Closed

Video Detail Layout Update #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
71743da
Merge branch 'master' into dev
darkon5 Sep 20, 2015
736ee71
Merge pull request #5 from darkon5/dev
darkon5 Sep 21, 2015
6c73778
Merge remote-tracking branch 'theScrabi/master'
Sep 21, 2015
fdeda1f
Merge remote-tracking branch 'theScrabi/master' into dev
Sep 21, 2015
12d8406
Merge remote-tracking branch 'theScrabi/master'
Sep 21, 2015
5838740
Merge remote-tracking branch 'theScrabi/master' into dev
Sep 22, 2015
ed4528a
Merge branch 'dev' of https://github.com/darkon5/NewPipe into dev
Sep 22, 2015
03ed121
New Screen - indev1
Sep 22, 2015
1ee5401
New Screen - indev2
Sep 22, 2015
e59375a
Merge branch 'dev'
darkon5 Sep 23, 2015
8052038
Merge branch 'master' into dev
darkon5 Sep 23, 2015
9da9682
Merge branch 'dev'
darkon5 Sep 23, 2015
6d5c45a
Merge branch 'master' into dev
darkon5 Sep 23, 2015
b4e2db9
Merge pull request #6 from theScrabi/master
darkon5 Sep 23, 2015
f98af6e
Merge pull request #7 from darkon5/master
darkon5 Sep 23, 2015
6333432
Merge remote-tracking branch 'theScrabi/master' into dev
Sep 25, 2015
8837361
Merge remote-tracking branch 'theScrabi/master'
Sep 25, 2015
617fc92
Merge remote-tracking branch 'theScrabi/master' into dev
Sep 30, 2015
4d1e618
Merge remote-tracking branch 'theScrabi/master' into dev
Sep 30, 2015
51e1eec
Button on position
Sep 30, 2015
3192183
Merge branch 'dev' of https://github.com/darkon5/NewPipe into dev
darkon5 Oct 14, 2015
ba3d489
Merge remote-tracking branch 'refs/remotes/theScrabi/master' into dev
darkon5 Oct 18, 2015
e3c63e3
Merge remote-tracking branch 'refs/remotes/origin/dev'
darkon5 Oct 20, 2015
4354401
Layout "Colorful" Update
darkon5 Oct 20, 2015
9a44f84
Moved detailThumbsUpCountView
darkon5 Oct 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added app/src/main/res/drawable/banner.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/newpipelogo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion app/src/main/res/layout/activity_videoitem_list.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/newpipelogo"
android:visibility="visible"/>

<fragment
xmlns:tools="http://schemas.android.com/tools"
Expand Down
101 changes: 64 additions & 37 deletions app/src/main/res/layout/fragment_videoitem_detail.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -39,95 +40,121 @@
android:layout_below="@id/detailThumbnailView"
android:layout_alignParentLeft="true"
android:paddingLeft="6dp"
android:paddingBottom="20dp"
android:paddingBottom="0dp"
android:paddingTop="3dp"
android:textStyle="bold"
android:textAppearance="?android:attr/textAppearanceLarge"
android:visibility="invisible"
android:text="Bla blabla !!!"/>
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="invisible"
android:src="@drawable/banner" />

<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:src="@drawable/budy" />

<TextView android:id="@+id/detailUploaderView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/detailUploaderThumbnailView"
android:layout_alignParentLeft="true"
android:paddingLeft="6dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:visibility="invisible"
android:text="Herr von Gurken" />

<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:textSize="@dimen/text_video_visits_size"
android:visibility="invisible"
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:paddingBottom="4dp"
android:visibility="invisible"
android:src="@drawable/thumbs_down" />

<TextView android:id="@+id/detailThumbsDownCountView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="20dp"
android:layout_below="@id/detailViewCountView"
android:layout_alignParentRight="true"
android:paddingRight="16dp"
android:layout_toRightOf="@id/detailThumbsDownImgView"
android:paddingLeft="6dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="@dimen/text_video_like_size"
android:visibility="invisible"
android:text="-5.000" />

<ImageView android:id="@+id/detailThumbsDownImgView"
android:layout_width="40dp"
android:layout_height="20dp"

<ImageView android:id="@+id/detailThumbsUpImgView"
android:layout_width="20dp"
android:layout_height="16dp"
android:layout_below="@id/detailViewCountView"
android:layout_toLeftOf="@id/detailThumbsDownCountView"
android:layout_toRightOf="@id/detailThumbsDownCountView"
android:paddingLeft="6dp"
android:visibility="invisible"
android:src="@drawable/thumbs_down" />
android:src="@drawable/thumbs_up" />

<TextView android:id="@+id/detailThumbsUpCountView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="20dp"
android:layout_below="@id/detailViewCountView"
android:layout_toLeftOf="@id/detailThumbsDownImgView"
android:layout_toRightOf="@id/detailThumbsUpImgView"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="@dimen/text_video_like_size"
android:paddingLeft="6dp"
android:visibility="invisible"
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"

<TextView android:id="@+id/detailUploaderView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/detailUploaderThumbnailView"
android:layout_toRightOf="@id/detailUploaderThumbnailView"
android:paddingLeft="6dp"
android:paddingBottom="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="@dimen/text_video_uploader_size"
android:visibility="invisible"
android:src="@drawable/thumbs_up" />
android:text="detailUploaderViewDUMMY" />

<TextView android:id="@+id/detailUploadDateView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/detailUploaderView"
android:layout_below="@id/detailUploaderThumbnailView"
android:layout_alignParentLeft="true"
android:paddingLeft="6dp"
android:paddingTop="20dp"
android:paddingTop="0dp"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textSize="@dimen/text_video_uploadtime_size"
android:visibility="invisible"
android:text="Uploaded at: 45.64.1285" />
android:text="Uploaded at: dummy tiem" />

<TextView android:id="@+id/detailDescriptionView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/detailUploadDateView"
android:layout_alignParentLeft="true"
android:paddingLeft="6dp"
android:paddingTop="3dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="@dimen/text_video_description_size"
android:visibility="invisible"
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. "
/>
Expand All @@ -142,10 +169,10 @@
<android.support.design.widget.FloatingActionButton
android:id="@+id/playVideoButton"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_alignParentRight="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="15pt"/>
android:layout_margin="20dp"/>
</RelativeLayout>
4 changes: 2 additions & 2 deletions app/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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">#CD322E</color>
<color name="primaryColorDarkYoutube">#bc211d</color>
<color name="accentColorYoutube">#000000</color>
<color name="black_overlay">#66000000</color>
</resources>
7 changes: 7 additions & 0 deletions app/src/main/res/values/dimentxt.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>