lasers
/
NewPipe
mirror of https://github.com/TeamNewPipe/NewPipe
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mering with master

This commit is contained in:
chschtsch 2015-12-14 13:44:15 +03:00
parent 29a3cbc688
commit be10b9750f
5 changed files with 52 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -8,8 +8,8 @@ android {
applicationId "org.schabi.newpipe" applicationId "org.schabi.newpipe"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 23 targetSdkVersion 23
versionCode 7 versionCode 8
versionName "0.6.1" versionName "0.6.2"
} }
buildTypes { buildTypes {
release { release {

95
app/src/main/res/layout/fragment_videoitem_detail.xml
View File

@ -35,7 +35,7 @@
<RelativeLayout <RelativeLayout
android:id="@+id/detailVideoThumbnailWindowLayout" android:id="@+id/detailVideoThumbnailWindowLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="250dp" android:layout_height="@dimen/video_item_detail_thumbnail_image_height"
android:background="?attr/selectableItemBackground"> android:background="?attr/selectableItemBackground">
<ProgressBar android:id="@+id/detailProgressBar" <ProgressBar android:id="@+id/detailProgressBar"
@ -67,10 +67,7 @@
android:visibility="invisible" android:visibility="invisible"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="5dp" android:padding="@dimen/video_item_detail_info_text_padding"
android:paddingBottom="5dp"
android:paddingRight="5dp"
android:paddingLeft="5dp"
android:layout_below="@id/detailVideoThumbnailWindowLayout" android:layout_below="@id/detailVideoThumbnailWindowLayout"
android:background="@color/background_gray"> android:background="@color/background_gray">
@ -80,14 +77,13 @@
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:textStyle="bold" android:textStyle="bold"
android:paddingBottom="3dp" android:textSize="@dimen/video_item_detail_title_text_size"
android:textSize="@dimen/text_video_title_size"
android:textAppearance="?android:attr/textAppearanceLarge"/> android:textAppearance="?android:attr/textAppearanceLarge"/>
<ImageView android:id="@+id/detailUploaderThumbnailView" <ImageView android:id="@+id/detailUploaderThumbnailView"
android:contentDescription="@string/detailUploaderThumbnailViewDescription" android:contentDescription="@string/detailUploaderThumbnailViewDescription"
android:layout_width="80dp" android:layout_width="@dimen/video_item_detail_uploader_image_size"
android:layout_height="80dp" android:layout_height="@dimen/video_item_detail_uploader_image_size"
android:layout_below="@id/detailVideoTitleView" android:layout_below="@id/detailVideoTitleView"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
@ -100,17 +96,16 @@
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:textStyle="bold" android:textStyle="bold"
android:textSize="@dimen/text_video_uploader_size" android:textSize="@dimen/video_item_detail_uploader_text_size"
android:textAppearance="?android:attr/textAppearanceLarge" /> android:textAppearance="?android:attr/textAppearanceLarge" />
<TextView android:id="@+id/detailViewCountView" <TextView android:id="@+id/detailViewCountView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="3dp"
android:layout_below="@id/detailVideoTitleView" android:layout_below="@id/detailVideoTitleView"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:textSize="@dimen/text_video_views_size" android:textSize="@dimen/video_item_detail_views_text_size"
android:textAppearance="?android:attr/textAppearanceLarge" /> android:textAppearance="?android:attr/textAppearanceLarge" />
<TextView android:id="@+id/detailThumbsDownCountView" <TextView android:id="@+id/detailThumbsDownCountView"
@ -119,20 +114,17 @@
android:layout_below="@id/detailViewCountView" android:layout_below="@id/detailViewCountView"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:textSize="@dimen/text_video_like_size" android:textSize="@dimen/video_item_detail_likes_text_size"
android:paddingRight="5dp"
android:paddingLeft="5dp"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
<ImageView android:id="@+id/detailThumbsDownImgView" <ImageView android:id="@+id/detailThumbsDownImgView"
android:contentDescription="@string/detailThumbsDownImgViewDescription" android:contentDescription="@string/detailThumbsDownImgViewDescription"
android:layout_width="30dp" android:layout_width="@dimen/video_item_detail_like_image_width"
android:layout_height="15dp" android:layout_height="@dimen/video_item_detail_like_image_height"
android:layout_below="@id/detailViewCountView" android:layout_below="@id/detailViewCountView"
android:layout_toLeftOf="@id/detailThumbsDownCountView" android:layout_toLeftOf="@id/detailThumbsDownCountView"
android:layout_toStartOf="@id/detailThumbsDownCountView" android:layout_toStartOf="@id/detailThumbsDownCountView"
android:paddingRight="5dp" android:paddingLeft="@dimen/video_item_detail_like_padding"
android:paddingLeft="5dp"
android:src="@drawable/thumbs_down" /> android:src="@drawable/thumbs_down" />
<TextView android:id="@+id/detailThumbsUpCountView" <TextView android:id="@+id/detailThumbsUpCountView"
@ -141,20 +133,16 @@
android:layout_below="@id/detailViewCountView" android:layout_below="@id/detailViewCountView"
android:layout_toLeftOf="@id/detailThumbsDownImgView" android:layout_toLeftOf="@id/detailThumbsDownImgView"
android:layout_toStartOf="@id/detailThumbsDownImgView" android:layout_toStartOf="@id/detailThumbsDownImgView"
android:paddingRight="5dp" android:textSize="@dimen/video_item_detail_likes_text_size"
android:paddingLeft="5dp"
android:textSize="@dimen/text_video_like_size"
android:textAppearance="?android:attr/textAppearanceMedium"/> android:textAppearance="?android:attr/textAppearanceMedium"/>
<ImageView android:id="@+id/detailThumbsUpImgView" <ImageView android:id="@+id/detailThumbsUpImgView"
android:contentDescription="@string/detailThumbsUpImgViewDescription" android:contentDescription="@string/detailThumbsUpImgViewDescription"
android:layout_width="30dp" android:layout_width="@dimen/video_item_detail_like_image_width"
android:layout_height="15dp" android:layout_height="@dimen/video_item_detail_like_image_height"
android:layout_below="@id/detailViewCountView" android:layout_below="@id/detailViewCountView"
android:layout_toLeftOf="@id/detailThumbsUpCountView" android:layout_toLeftOf="@id/detailThumbsUpCountView"
android:layout_toStartOf="@id/detailThumbsUpImgView" android:layout_toStartOf="@id/detailThumbsUpImgView"
android:paddingRight="5dp"
android:paddingLeft="5dp"
android:src="@drawable/thumbs_up" /> android:src="@drawable/thumbs_up" />
<TextView android:id="@+id/detailUploadDateView" <TextView android:id="@+id/detailUploadDateView"
@ -163,7 +151,7 @@
android:layout_below="@id/detailUploaderView" android:layout_below="@id/detailUploaderView"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:textSize="@dimen/text_video_upload_date_size" android:textSize="@dimen/video_item_detail_upload_date_text_size"
android:textAppearance="?android:attr/textAppearanceLarge" /> android:textAppearance="?android:attr/textAppearanceLarge" />
<TextView android:id="@+id/detailDescriptionView" <TextView android:id="@+id/detailDescriptionView"
@ -172,51 +160,48 @@
android:layout_below="@id/detailUploadDateView" android:layout_below="@id/detailUploadDateView"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:textSize="@dimen/text_video_description_size" android:textSize="@dimen/video_item_detail_description_text_size"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
<RelativeLayout <RelativeLayout android:id="@+id/detailNextVideoRootLayout"
android:id="@+id/detailNextVideoRootLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="10dp" android:padding="@dimen/video_item_detail_info_text_padding"
android:paddingBottom="10dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:layout_below="@id/detailDescriptionView" > android:layout_below="@id/detailDescriptionView" >
<TextView android:id="@+id/detailNextVideoTitle" <TextView android:id="@+id/detailNextVideoTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_centerHorizontal="true"
android:layout_alignParentStart="true" android:textSize="@dimen/video_item_detail_next_text_size"
android:textSize="@dimen/text_video_upload_date_size"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:text="@string/nextVideoTitle" android:text="@string/nextVideoTitle"
/> android:textAllCaps="true" />
<FrameLayout
android:id="@+id/detailNextVideoFrame" <RelativeLayout android:id="@+id/detailNextVidButtonAndContentLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/detailNextVideoTitle"/> android:layout_below="@id/detailNextVideoTitle">
<Button <FrameLayout
android:id="@+id/detailNextVideoButton" android:id="@+id/detailNextVideoFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<Button
android:id="@+id/detailNextVideoButton"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignTop="@id/detailNextVideoFrame"
android:layout_alignBottom="@id/detailNextVideoFrame"
android:background="?attr/selectableItemBackground"/>
</RelativeLayout>
<Button android:id="@+id/detailShowSimilarButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_alignTop="@id/detailNextVideoFrame" android:layout_below="@id/detailNextVidButtonAndContentLayout"
android:layout_alignBottom="@id/detailNextVideoFrame" android:text="@string/showSimilarVideosButtonText"/>
android:background="?attr/selectableItemBackground"/>
</RelativeLayout> </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> </RelativeLayout>
</RelativeLayout> </RelativeLayout>
</ScrollView> </ScrollView>

7
app/src/main/res/values-land/dimens.xml
View File

@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!---->
<!-- Video Item Search View Dimensions--> <!-- Video Item Search View Dimensions-->
<!---->
<!-- Text Size --> <!-- Text Size -->
<dimen name="video_item_search_title_text_size">22sp</dimen> <dimen name="video_item_search_title_text_size">22sp</dimen>
<dimen name="video_item_search_duration_text_size">16sp</dimen> <dimen name="video_item_search_duration_text_size">16sp</dimen>
@ -22,9 +21,7 @@
<!-- Miscellaneous --> <!-- Miscellaneous -->
<dimen name="video_item_search_card_radius">4dp</dimen> <dimen name="video_item_search_card_radius">4dp</dimen>
<!---->
<!-- Video Item Detail View Dimensions--> <!-- Video Item Detail View Dimensions-->
<!---->
<!-- Text Size --> <!-- Text Size -->
<dimen name="video_item_detail_title_text_size">24sp</dimen> <dimen name="video_item_detail_title_text_size">24sp</dimen>
<dimen name="video_item_detail_views_text_size">18sp</dimen> <dimen name="video_item_detail_views_text_size">18sp</dimen>
@ -32,9 +29,11 @@
<dimen name="video_item_detail_uploader_text_size">18sp</dimen> <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_upload_date_text_size">18sp</dimen>
<dimen name="video_item_detail_description_text_size">18sp</dimen> <dimen name="video_item_detail_description_text_size">18sp</dimen>
<dimen name="video_item_detail_next_text_size">20sp</dimen>
<!-- Elements Size --> <!-- Elements Size -->
<dimen name="video_item_detail_thumbnail_image_height">240dp</dimen> <dimen name="video_item_detail_thumbnail_image_height">240dp</dimen>
<dimen name="video_item_detail_uploader_image_size">100dp</dimen> <dimen name="video_item_detail_uploader_image_size">100dp</dimen>
<!-- Paddings & Margins --> <!-- Paddings & Margins -->
<dimen name="video_item_detail_info_text_padding">10sp</dimen> <dimen name="video_item_detail_info_text_padding">10sp</dimen>
</resources> </resources>

5
app/src/main/res/values-sw600dp/dimens.xml
View File

@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!---->
<!-- Video Item Detail View Dimensions--> <!-- Video Item Detail View Dimensions-->
<!---->
<!-- Text Size --> <!-- Text Size -->
<dimen name="video_item_detail_title_text_size">20sp</dimen> <dimen name="video_item_detail_title_text_size">20sp</dimen>
<dimen name="video_item_detail_views_text_size">16sp</dimen> <dimen name="video_item_detail_views_text_size">16sp</dimen>
@ -10,9 +9,11 @@
<dimen name="video_item_detail_uploader_text_size">16sp</dimen> <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_upload_date_text_size">16sp</dimen>
<dimen name="video_item_detail_description_text_size">16sp</dimen> <dimen name="video_item_detail_description_text_size">16sp</dimen>
<dimen name="video_item_detail_next_text_size">18sp</dimen>
<!-- Elements Size --> <!-- Elements Size -->
<dimen name="video_item_detail_thumbnail_image_height">300dp</dimen> <dimen name="video_item_detail_thumbnail_image_height">300dp</dimen>
<dimen name="video_item_detail_uploader_image_size">110dp</dimen> <dimen name="video_item_detail_uploader_image_size">110dp</dimen>
<!-- Paddings & Margins --> <!-- Paddings & Margins -->
<dimen name="video_item_detail_info_text_padding">10sp</dimen> <dimen name="video_item_detail_info_text_padding">10sp</dimen>
</resources> </resources>

8
app/src/main/res/values/dimens.xml
View File

@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!---->
<!-- Video Item Search View Dimensions--> <!-- Video Item Search View Dimensions-->
<!---->
<!-- Text Size --> <!-- Text Size -->
<dimen name="video_item_search_title_text_size">14sp</dimen> <dimen name="video_item_search_title_text_size">14sp</dimen>
<dimen name="video_item_search_duration_text_size">11sp</dimen> <dimen name="video_item_search_duration_text_size">11sp</dimen>
@ -22,9 +21,7 @@
<!-- Miscellaneous --> <!-- Miscellaneous -->
<dimen name="video_item_search_card_radius">4dp</dimen> <dimen name="video_item_search_card_radius">4dp</dimen>
<!---->
<!-- Video Item Detail View Dimensions--> <!-- Video Item Detail View Dimensions-->
<!---->
<!-- Text Size --> <!-- Text Size -->
<dimen name="video_item_detail_title_text_size">18sp</dimen> <dimen name="video_item_detail_title_text_size">18sp</dimen>
<dimen name="video_item_detail_views_text_size">14sp</dimen> <dimen name="video_item_detail_views_text_size">14sp</dimen>
@ -36,7 +33,10 @@
<!-- Elements Size --> <!-- Elements Size -->
<dimen name="video_item_detail_thumbnail_image_height">200dp</dimen> <dimen name="video_item_detail_thumbnail_image_height">200dp</dimen>
<dimen name="video_item_detail_uploader_image_size">80dp</dimen> <dimen name="video_item_detail_uploader_image_size">80dp</dimen>
<dimen name="video_item_detail_like_image_height">15dp</dimen>
<dimen name="video_item_detail_like_image_width">30dp</dimen>
<!-- Paddings & Margins --> <!-- Paddings & Margins -->
<dimen name="video_item_detail_info_text_padding">6sp</dimen> <dimen name="video_item_detail_info_text_padding">6sp</dimen>
<dimen name="video_item_detail_like_padding">6sp</dimen>
</resources> </resources>