mirrors/NewPipe
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2025-10-31 15:23:00 +00:00
Code Issues Releases Wiki Activity

update views & dimens

Browse Source
This commit is contained in:
chschtsch
2015-12-14 14:10:12 +03:00
parent be10b9750f
commit a95da9a42d
5 changed files with 163 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

303
app/src/main/res/layout-v21/fragment_videoitem_detail.xml
View File

@@ -10,187 +10,163 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/videoitem_detail"> android:id="@+id/videoitem_detail">
<ImageView android:id="@+id/detailThumbnailView" <ProgressBar android:id="@+id/detailProgressBar"
android:contentDescription="@string/detailThumbnailViewDescription" android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:scaleType="fitCenter" android:layout_centerInParent="true"
android:adjustViewBounds="true" android:indeterminate="true"/>
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:background="@android:color/black"
android:src="@drawable/dummy_thumbnail_dark"/>
<ScrollView <ScrollView
android:id="@+id/detailMainContent" android:id="@+id/detailMainContent"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:visibility="visible"> android:visibility="invisible">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<RelativeLayout <RelativeLayout android:id="@+id/detailVideoInfo"
android:id="@+id/detailVideoThumbnailWindowLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="250dp" android:layout_height="wrap_content">
android:background="?attr/selectableItemBackground">
<ProgressBar android:id="@+id/detailProgressBar" <ImageView android:id="@+id/detailThumbnailView"
android:layout_width="wrap_content" android:contentDescription="@string/detailThumbnailViewDescription"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:indeterminate="true"
android:indeterminateTint="@color/primaryColorDarkYoutube"
android:indeterminateTintMode="src_in"/>
<android.support.design.widget.FloatingActionButton
android:id="@+id/playVideoButton"
android:visibility="invisible"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
app:backgroundTint="@color/primaryColorYoutube"
android:src="@drawable/ic_play_arrow_black"
android:layout_margin="20dp"/>
<Button
android:id="@+id/detailVideoThumbnailWindowBackgroundButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="@dimen/video_item_detail_thumbnail_image_height"
android:background="?attr/selectableItemBackground"/> android:scaleType="centerInside"
android:layout_alignParentLeft="true"
</RelativeLayout>
<RelativeLayout android:id="@+id/detailTextContentLayout"
android:visibility="invisible"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:paddingRight="5dp"
android:paddingLeft="5dp"
android:layout_below="@id/detailVideoThumbnailWindowLayout"
android:background="@color/background_gray">
<TextView android:id="@+id/detailVideoTitleView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:textStyle="bold" android:layout_alignParentTop="true"
android:paddingBottom="3dp" android:adjustViewBounds="true"
android:textSize="@dimen/text_video_title_size" android:background="@color/dark_image_background"
android:textAppearance="?android:attr/textAppearanceLarge"/> android:src="@drawable/dummy_thumbnail"/>
<ImageView android:id="@+id/detailUploaderThumbnailView"
android:contentDescription="@string/detailUploaderThumbnailViewDescription"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_below="@id/detailVideoTitleView"
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_alignParentStart="true"
android:textStyle="bold"
android:textSize="@dimen/text_video_uploader_size"
android:textAppearance="?android:attr/textAppearanceLarge" />
<TextView android:id="@+id/detailViewCountView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="3dp"
android:layout_below="@id/detailVideoTitleView"
android:layout_alignParentEnd="true"
android:textSize="@dimen/text_video_views_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_alignParentEnd="true"
android:textSize="@dimen/text_video_like_size"
android:paddingRight="5dp"
android:paddingLeft="5dp"
android:textAppearance="?android:attr/textAppearanceMedium" />
<ImageView android:id="@+id/detailThumbsDownImgView"
android:contentDescription="@string/detailThumbsDownImgViewDescription"
android:layout_width="30dp"
android:layout_height="15dp"
android:layout_below="@id/detailViewCountView"
android:layout_toStartOf="@id/detailThumbsDownCountView"
android:paddingRight="5dp"
android:paddingLeft="5dp"
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_toStartOf="@id/detailThumbsDownImgView"
android:paddingRight="5dp"
android:paddingLeft="5dp"
android:textSize="@dimen/text_video_like_size"
android:textAppearance="?android:attr/textAppearanceMedium"/>
<ImageView android:id="@+id/detailThumbsUpImgView"
android:contentDescription="@string/detailThumbsUpImgViewDescription"
android:layout_width="30dp"
android:layout_height="15dp"
android:layout_below="@id/detailViewCountView"
android:layout_toStartOf="@id/detailThumbsUpCountView"
android:paddingRight="5dp"
android:paddingLeft="5dp"
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_alignParentStart="true"
android:textSize="@dimen/text_video_upload_date_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_alignParentStart="true"
android:textSize="@dimen/text_video_description_size"
android:textAppearance="?android:attr/textAppearanceMedium" />
<RelativeLayout <RelativeLayout
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:layout_below="@id/detailThumbnailView"
android:paddingBottom="10dp" android:padding="@dimen/video_item_detail_info_text_padding" >
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:layout_below="@id/detailDescriptionView" >
<TextView android:id="@+id/detailNextVideoTitle" <TextView android:id="@+id/detailVideoTitleView"
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_alignParentStart="true" android:layout_alignParentStart="true"
android:textSize="@dimen/text_video_upload_date_size" android:textStyle="bold"
android:textAppearance="?android:attr/textAppearanceMedium" android:paddingBottom="3dp"
android:textColor="@android:color/black" android:textSize="@dimen/video_item_detail_title_text_size"
android:text="@string/nextVideoTitle" 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:paddingLeft="@dimen/video_item_detail_like_padding"
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 <FrameLayout
android:id="@+id/detailNextVideoFrame" android:id="@+id/detailNextVideoFrame"
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"/>
<Button <Button
android:id="@+id/detailNextVideoButton" android:id="@+id/detailNextVideoButton"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -199,15 +175,24 @@
android:layout_alignBottom="@id/detailNextVideoFrame" android:layout_alignBottom="@id/detailNextVideoFrame"
android:background="?attr/selectableItemBackground"/> android:background="?attr/selectableItemBackground"/>
</RelativeLayout> </RelativeLayout>
<Button android:id="@+id/detailShowSimilarButton" <Button android:id="@+id/detailShowSimilarButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="6dp" android:layout_below="@id/detailNextVidButtonAndContentLayout"
android:layout_marginRight="6dp" android:textSize="@dimen/video_item_detail_similar_text_size"
android:layout_below="@id/detailNextVideoRootLayout"
android:text="@string/showSimilarVideosButtonText"/> android:text="@string/showSimilarVideosButtonText"/>
</RelativeLayout> </RelativeLayout>
</RelativeLayout> </RelativeLayout>
</ScrollView> </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> </RelativeLayout>

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

@@ -48,12 +48,11 @@
android:id="@+id/playVideoButton" android:id="@+id/playVideoButton"
android:visibility="invisible" android:visibility="invisible"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerInParent="true" android:layout_centerInParent="true"
app:backgroundTint="@color/primaryColorYoutube" app:backgroundTint="@color/primaryColorYoutube"
android:src="@drawable/ic_play_arrow_black" android:src="@drawable/ic_play_arrow_black"
android:layout_margin="20dp"/> android:layout_margin="@dimen/video_item_detail_play_fab_margin"/>
<Button <Button
android:id="@+id/detailVideoThumbnailWindowBackgroundButton" android:id="@+id/detailVideoThumbnailWindowBackgroundButton"
@@ -142,7 +141,7 @@
android:layout_height="@dimen/video_item_detail_like_image_height" 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/detailThumbsUpCountView"
android:src="@drawable/thumbs_up" /> android:src="@drawable/thumbs_up" />
<TextView android:id="@+id/detailUploadDateView" <TextView android:id="@+id/detailUploadDateView"
@@ -176,7 +175,6 @@
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:textSize="@dimen/video_item_detail_next_text_size" android:textSize="@dimen/video_item_detail_next_text_size"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@android:color/black"
android:text="@string/nextVideoTitle" android:text="@string/nextVideoTitle"
android:textAllCaps="true" /> android:textAllCaps="true" />
@@ -200,8 +198,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/detailNextVidButtonAndContentLayout" android:layout_below="@id/detailNextVidButtonAndContentLayout"
android:textSize="@dimen/video_item_detail_similar_text_size"
android:text="@string/showSimilarVideosButtonText"/> android:text="@string/showSimilarVideosButtonText"/>
</RelativeLayout> </RelativeLayout>
</RelativeLayout> </RelativeLayout>
</RelativeLayout> </RelativeLayout>
</ScrollView> </ScrollView>

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

@@ -30,10 +30,15 @@
<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> <dimen name="video_item_detail_next_text_size">20sp</dimen>
<dimen name="video_item_detail_similar_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>
<dimen name="video_item_detail_like_image_height">16sp</dimen>
<dimen name="video_item_detail_like_image_width">32dp</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>
<dimen name="video_item_detail_like_padding">10sp</dimen>
<dimen name="video_item_detail_play_fab_margin">20dp</dimen>
</resources> </resources>

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

@@ -10,10 +10,15 @@
<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> <dimen name="video_item_detail_next_text_size">18sp</dimen>
<dimen name="video_item_detail_similar_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">100dp</dimen>
<dimen name="video_item_detail_like_image_height">14sp</dimen>
<dimen name="video_item_detail_like_image_width">28dp</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>
<dimen name="video_item_detail_like_padding">10sp</dimen>
<dimen name="video_item_detail_play_fab_margin">20dp</dimen>
</resources> </resources>

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

@@ -30,13 +30,15 @@
<dimen name="video_item_detail_upload_date_text_size">14sp</dimen> <dimen name="video_item_detail_upload_date_text_size">14sp</dimen>
<dimen name="video_item_detail_description_text_size">14sp</dimen> <dimen name="video_item_detail_description_text_size">14sp</dimen>
<dimen name="video_item_detail_next_text_size">16sp</dimen> <dimen name="video_item_detail_next_text_size">16sp</dimen>
<dimen name="video_item_detail_similar_text_size">16sp</dimen>
<!-- 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_height">12sp</dimen>
<dimen name="video_item_detail_like_image_width">30dp</dimen> <dimen name="video_item_detail_like_image_width">24dp</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> <dimen name="video_item_detail_like_padding">6sp</dimen>
<dimen name="video_item_detail_play_fab_margin">20dp</dimen>
</resources> </resources>