mirror of
https://github.com/TeamNewPipe/NewPipe
synced 2025-01-08 16:30:34 +00:00
Merge branch 'dev'
This commit is contained in:
commit
e59375afce
BIN
app/src/main/res/drawable/banner.png
Normal file
BIN
app/src/main/res/drawable/banner.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 10 KiB |
@ -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"
|
||||
|
@ -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"
|
||||
@ -30,7 +31,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,21 +40,32 @@
|
||||
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"/>
|
||||
|
||||
<!-- 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"
|
||||
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"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
@ -61,55 +73,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 +138,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 +149,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 +169,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>
|
@ -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>
|
@ -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>
|
Loading…
Reference in New Issue
Block a user