Merge remote-tracking branch 'origin/master'
|
@ -2,15 +2,15 @@ language: android
|
||||||
android:
|
android:
|
||||||
components:
|
components:
|
||||||
# The BuildTools version used by NewPipe
|
# The BuildTools version used by NewPipe
|
||||||
- build-tools-23.0.1
|
- build-tools-23.0.2
|
||||||
|
|
||||||
# The SDK version used to compile NewPipe
|
# The SDK version used to compile NewPipe
|
||||||
- android-23
|
- android-23
|
||||||
|
|
||||||
# Additional components
|
# Additional components
|
||||||
- extra-android-support
|
- extra-android-support
|
||||||
- extra-android-m2repository
|
- extra-android-m2repository
|
||||||
|
|
||||||
# Emulators
|
# Emulators
|
||||||
- sys-img-armeabi-v7a-android-21
|
- sys-img-armeabi-v7a-android-21
|
||||||
- sys-img-armeabi-v7a-android-19
|
- sys-img-armeabi-v7a-android-19
|
||||||
|
|
|
@ -13,8 +13,12 @@ Project status:
|
||||||
|
|
||||||
## Screenshots
|
## Screenshots
|
||||||
|
|
||||||
[<img src="assets/screenshot_1.png" width=200>](assets/screenshot_1.png)
|
[<img src="screenshots/screenshot_1.png" width=150>](screenshots/screenshot_1.png)
|
||||||
[<img src="assets/screenshot_2.png" width=200>](assets/screenshot_2.png)
|
[<img src="screenshots/screenshot_2.png" width=150>](screenshots/screenshot_2.png)
|
||||||
|
[<img src="screenshots/screenshot_3.png" width=150>](screenshots/screenshot_3.png)
|
||||||
|
[<img src="screenshots/screenshot_4.png" width=150>](screenshots/screenshot_4.png)
|
||||||
|
[<img src="screenshots/screenshot_5.png" width=150>](screenshots/screenshot_5.png)
|
||||||
|
[<img src="screenshots/screenshot_6.png" width=250>](screenshots/screenshot_6.png)
|
||||||
|
|
||||||
## Description
|
## Description
|
||||||
|
|
||||||
|
|
|
@ -1,198 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
|
|
||||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
tools:context=".VideoItemDetailFragment"
|
|
||||||
android:textIsSelectable="true"
|
|
||||||
style="?android:attr/textAppearanceLarge"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:id="@+id/videoitem_detail">
|
|
||||||
|
|
||||||
<ProgressBar android:id="@+id/detailProgressBar"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_centerInParent="true"
|
|
||||||
android:indeterminate="true"/>
|
|
||||||
|
|
||||||
<ScrollView
|
|
||||||
android:id="@+id/detailMainContent"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:visibility="invisible">
|
|
||||||
|
|
||||||
<RelativeLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content">
|
|
||||||
|
|
||||||
<RelativeLayout android:id="@+id/detailVideoInfo"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content">
|
|
||||||
|
|
||||||
<ImageView android:id="@+id/detailThumbnailView"
|
|
||||||
android:contentDescription="@string/detailThumbnailViewDescription"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/video_item_detail_thumbnail_image_height"
|
|
||||||
android:scaleType="centerInside"
|
|
||||||
android:layout_alignParentLeft="true"
|
|
||||||
android:layout_alignParentStart="true"
|
|
||||||
android:layout_alignParentTop="true"
|
|
||||||
android:adjustViewBounds="true"
|
|
||||||
android:background="@color/dark_image_background"
|
|
||||||
android:src="@drawable/dummy_thumbnail"/>
|
|
||||||
|
|
||||||
<RelativeLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_below="@id/detailThumbnailView"
|
|
||||||
android:padding="@dimen/video_item_detail_info_text_padding" >
|
|
||||||
|
|
||||||
<TextView android:id="@+id/detailVideoTitleView"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_alignParentLeft="true"
|
|
||||||
android:layout_alignParentStart="true"
|
|
||||||
android:textStyle="bold"
|
|
||||||
android:paddingBottom="3dp"
|
|
||||||
android:textSize="@dimen/video_item_detail_title_text_size"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceLarge"/>
|
|
||||||
|
|
||||||
<ImageView android:id="@+id/detailUploaderThumbnailView"
|
|
||||||
android:contentDescription="@string/detailUploaderThumbnailViewDescription"
|
|
||||||
android:layout_width="@dimen/video_item_detail_uploader_image_size"
|
|
||||||
android:layout_height="@dimen/video_item_detail_uploader_image_size"
|
|
||||||
android:layout_below="@id/detailVideoTitleView"
|
|
||||||
android:layout_alignParentLeft="true"
|
|
||||||
android:layout_alignParentStart="true"
|
|
||||||
android:src="@drawable/buddy" />
|
|
||||||
|
|
||||||
<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:layout_alignParentStart="true"
|
|
||||||
android:textStyle="bold"
|
|
||||||
android:textSize="@dimen/video_item_detail_uploader_text_size"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceLarge" />
|
|
||||||
|
|
||||||
<TextView android:id="@+id/detailViewCountView"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_below="@id/detailVideoTitleView"
|
|
||||||
android:layout_alignParentRight="true"
|
|
||||||
android:layout_alignParentEnd="true"
|
|
||||||
android:textSize="@dimen/video_item_detail_views_text_size"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceLarge" />
|
|
||||||
|
|
||||||
<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:layout_alignParentEnd="true"
|
|
||||||
android:textSize="@dimen/video_item_detail_likes_text_size"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium" />
|
|
||||||
|
|
||||||
<ImageView android:id="@+id/detailThumbsDownImgView"
|
|
||||||
android:contentDescription="@string/detailThumbsDownImgViewDescription"
|
|
||||||
android:layout_width="@dimen/video_item_detail_like_image_width"
|
|
||||||
android:layout_height="@dimen/video_item_detail_like_image_height"
|
|
||||||
android:layout_below="@id/detailViewCountView"
|
|
||||||
android:layout_toLeftOf="@id/detailThumbsDownCountView"
|
|
||||||
android:layout_toStartOf="@id/detailThumbsDownCountView"
|
|
||||||
android:layout_marginLeft="@dimen/video_item_detail_like_margin"
|
|
||||||
android:src="@drawable/thumbs_down" />
|
|
||||||
|
|
||||||
<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_toStartOf="@id/detailThumbsDownImgView"
|
|
||||||
android:textSize="@dimen/video_item_detail_likes_text_size"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium"/>
|
|
||||||
|
|
||||||
<ImageView android:id="@+id/detailThumbsUpImgView"
|
|
||||||
android:contentDescription="@string/detailThumbsUpImgViewDescription"
|
|
||||||
android:layout_width="@dimen/video_item_detail_like_image_width"
|
|
||||||
android:layout_height="@dimen/video_item_detail_like_image_height"
|
|
||||||
android:layout_below="@id/detailViewCountView"
|
|
||||||
android:layout_toLeftOf="@id/detailThumbsUpCountView"
|
|
||||||
android:layout_toStartOf="@id/detailThumbsUpCountView"
|
|
||||||
android:src="@drawable/thumbs_up" />
|
|
||||||
|
|
||||||
<TextView android:id="@+id/detailUploadDateView"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_below="@id/detailUploaderView"
|
|
||||||
android:layout_alignParentLeft="true"
|
|
||||||
android:layout_alignParentStart="true"
|
|
||||||
android:textSize="@dimen/video_item_detail_upload_date_text_size"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceLarge" />
|
|
||||||
|
|
||||||
<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:layout_alignParentStart="true"
|
|
||||||
android:textSize="@dimen/video_item_detail_description_text_size"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium" />
|
|
||||||
|
|
||||||
</RelativeLayout>
|
|
||||||
</RelativeLayout>
|
|
||||||
|
|
||||||
<RelativeLayout android:id="@+id/detailNextVideoRootLayout"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:padding="@dimen/video_item_detail_info_text_padding"
|
|
||||||
android:layout_below="@id/detailVideoInfo" >
|
|
||||||
|
|
||||||
<TextView android:id="@+id/detailNextVideoTitle"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_centerHorizontal="true"
|
|
||||||
android:textSize="@dimen/video_item_detail_next_text_size"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
|
||||||
android:text="@string/nextVideoTitle"
|
|
||||||
android:textAllCaps="true" />
|
|
||||||
|
|
||||||
<RelativeLayout android:id="@+id/detailNextVidButtonAndContentLayout"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_below="@id/detailNextVideoTitle">
|
|
||||||
<FrameLayout
|
|
||||||
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_height="wrap_content"
|
|
||||||
android:layout_below="@id/detailNextVidButtonAndContentLayout"
|
|
||||||
android:textSize="@dimen/video_item_detail_similar_text_size"
|
|
||||||
android:text="@string/showSimilarVideosButtonText"/>
|
|
||||||
</RelativeLayout>
|
|
||||||
|
|
||||||
</RelativeLayout>
|
|
||||||
</ScrollView>
|
|
||||||
|
|
||||||
<android.support.design.widget.FloatingActionButton
|
|
||||||
android:id="@+id/playVideoButton"
|
|
||||||
android:layout_centerHorizontal="true"
|
|
||||||
android:layout_alignParentBottom="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="@dimen/video_item_detail_play_fab_margin"/>
|
|
||||||
</RelativeLayout>
|
|
|
@ -3,12 +3,7 @@
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
xmlns:card_view="http://schemas.android.com/apk/res-auto"
|
xmlns:card_view="http://schemas.android.com/apk/res-auto"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content" >
|
||||||
android:paddingTop="@dimen/video_item_search_card_vertical_margin"
|
|
||||||
android:paddingBottom="@dimen/video_item_search_card_vertical_margin"
|
|
||||||
android:paddingLeft="@dimen/video_item_search_card_horizontal_margin"
|
|
||||||
android:paddingRight="@dimen/video_item_search_card_horizontal_margin"
|
|
||||||
>
|
|
||||||
|
|
||||||
<android.support.v7.widget.CardView
|
<android.support.v7.widget.CardView
|
||||||
xmlns:card_view="http://schemas.android.com/apk/res-auto"
|
xmlns:card_view="http://schemas.android.com/apk/res-auto"
|
||||||
|
@ -17,7 +12,11 @@
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
card_view:cardCornerRadius="@dimen/video_item_search_card_radius">
|
card_view:cardCornerRadius="@dimen/video_item_search_card_radius"
|
||||||
|
android:layout_marginTop="@dimen/video_item_search_card_vertical_margin"
|
||||||
|
android:layout_marginBottom="@dimen/video_item_search_card_vertical_margin"
|
||||||
|
android:layout_marginLeft="@dimen/video_item_search_card_horizontal_margin"
|
||||||
|
android:layout_marginRight="@dimen/video_item_search_card_horizontal_margin" >
|
||||||
|
|
||||||
<RelativeLayout
|
<RelativeLayout
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
<dimen name="video_item_search_thumbnail_image_width">210dp</dimen>
|
<dimen name="video_item_search_thumbnail_image_width">210dp</dimen>
|
||||||
<dimen name="video_item_search_thumbnail_image_height">130dp</dimen>
|
<dimen name="video_item_search_thumbnail_image_height">130dp</dimen>
|
||||||
<!-- Paddings & Margins -->
|
<!-- Paddings & Margins -->
|
||||||
<dimen name="video_item_search_card_vertical_margin">3dp</dimen>
|
<dimen name="video_item_search_card_vertical_margin">5dp</dimen>
|
||||||
<dimen name="video_item_search_card_horizontal_margin">10dp</dimen>
|
<dimen name="video_item_search_card_horizontal_margin">10dp</dimen>
|
||||||
<dimen name="video_item_search_card_padding">10dp</dimen>
|
<dimen name="video_item_search_card_padding">10dp</dimen>
|
||||||
<dimen name="video_item_search_image_right_margin">10dp</dimen>
|
<dimen name="video_item_search_image_right_margin">10dp</dimen>
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
<dimen name="video_item_search_thumbnail_image_width">140dp</dimen>
|
<dimen name="video_item_search_thumbnail_image_width">140dp</dimen>
|
||||||
<dimen name="video_item_search_thumbnail_image_height">85dp</dimen>
|
<dimen name="video_item_search_thumbnail_image_height">85dp</dimen>
|
||||||
<!-- Paddings & Margins -->
|
<!-- Paddings & Margins -->
|
||||||
<dimen name="video_item_search_card_vertical_margin">2dp</dimen>
|
<dimen name="video_item_search_card_vertical_margin">3dp</dimen>
|
||||||
<dimen name="video_item_search_card_horizontal_margin">6dp</dimen>
|
<dimen name="video_item_search_card_horizontal_margin">6dp</dimen>
|
||||||
<dimen name="video_item_search_card_padding">6dp</dimen>
|
<dimen name="video_item_search_card_padding">6dp</dimen>
|
||||||
<dimen name="video_item_search_image_right_margin">6dp</dimen>
|
<dimen name="video_item_search_image_right_margin">6dp</dimen>
|
||||||
|
|
Before Width: | Height: | Size: 252 KiB |
Before Width: | Height: | Size: 166 KiB |
BIN
screenshots/screenshot_1.png
Normal file
After Width: | Height: | Size: 6.8 KiB |
BIN
screenshots/screenshot_2.png
Normal file
After Width: | Height: | Size: 320 KiB |
BIN
screenshots/screenshot_3.png
Normal file
After Width: | Height: | Size: 247 KiB |
BIN
screenshots/screenshot_4.png
Normal file
After Width: | Height: | Size: 254 KiB |
BIN
screenshots/screenshot_5.png
Normal file
After Width: | Height: | Size: 169 KiB |
BIN
screenshots/screenshot_6.png
Normal file
After Width: | Height: | Size: 163 KiB |