Peertube
/
NewPipe-app-android
mirror of https://github.com/TeamNewPipe/NewPipe/
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3944 from Stypox/playlist-layout 

Improve playlist header layout: align with info items
This commit is contained in:
Tobias Groza 2020-08-03 14:15:30 +02:00 committed by GitHub
parent fbb5c8cdd6 67aaa9a655
commit 65637fce40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/res/layout/local_playlist_header.xml
View File

@ -1,34 +1,26 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="6dp"
android:background="?attr/contrast_background_color"> android:background="?attr/contrast_background_color">
<TextView <TextView
android:id="@+id/playlist_title_view" android:id="@+id/playlist_title_view"
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:paddingHorizontal="@dimen/video_item_search_padding"
android:layout_marginRight="6dp" android:paddingTop="@dimen/video_item_search_padding"
android:padding="6dp" android:paddingBottom="6dp"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:ellipsize="marquee" android:ellipsize="end"
android:fadingEdge="horizontal" android:maxLines="2"
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:textSize="@dimen/playlist_detail_title_text_size" android:textSize="@dimen/playlist_detail_title_text_size"
tools:text="Mix musics #23 title Lorem ipsum dolor sit amet, consectetur..."/> tools:text="Mix musics #23 title Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blanditLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsum"/>
<TextView <TextView
android:id="@+id/playlist_stream_count" android:id="@+id/playlist_stream_count"
@ -36,8 +28,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/playlist_title_view" android:layout_below="@id/playlist_title_view"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:paddingLeft="12dp" android:paddingHorizontal="@dimen/video_item_search_padding"
android:paddingRight="12dp"
android:ellipsize="end" android:ellipsize="end"
android:gravity="right|center_vertical" android:gravity="right|center_vertical"
android:maxLines="1" android:maxLines="1"

18
app/src/main/res/layout/playlist_header.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
@ -12,9 +11,8 @@
android:id="@+id/playlist_title_view" android:id="@+id/playlist_title_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:paddingHorizontal="@dimen/video_item_search_padding"
android:layout_marginRight="8dp" android:paddingTop="@dimen/video_item_search_padding"
android:layout_marginTop="6dp"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="2" android:maxLines="2"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
@ -25,19 +23,17 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/playlist_title_view" android:layout_below="@+id/playlist_title_view"
android:paddingHorizontal="@dimen/video_item_search_padding"
android:paddingTop="6dp"
android:id="@+id/playlist_meta"> android:id="@+id/playlist_meta">
<RelativeLayout <RelativeLayout
android:id="@+id/uploader_layout" android:id="@+id/uploader_layout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/playlist_detail_uploader_layout_height" android:layout_height="@dimen/playlist_detail_uploader_layout_height"
android:layout_marginLeft="4dp"
android:layout_marginRight="6dp"
android:layout_marginTop="6dp"
android:layout_toLeftOf="@+id/playlist_stream_count" android:layout_toLeftOf="@+id/playlist_stream_count"
android:layout_toStartOf="@+id/playlist_stream_count" android:layout_toStartOf="@+id/playlist_stream_count"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:gravity="left|center_vertical" android:gravity="left|center_vertical"
android:padding="2dp"
android:visibility="gone" android:visibility="gone"
tools:ignore="RtlHardcoded" tools:ignore="RtlHardcoded"
tools:visibility="visible"> tools:visibility="visible">
@ -46,8 +42,8 @@
android:id="@+id/uploader_avatar_view" android:id="@+id/uploader_avatar_view"
android:layout_width="@dimen/playlist_detail_uploader_image_size" android:layout_width="@dimen/playlist_detail_uploader_image_size"
android:layout_height="@dimen/playlist_detail_uploader_image_size" android:layout_height="@dimen/playlist_detail_uploader_image_size"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_margin="1dp"
android:src="@drawable/buddy" android:src="@drawable/buddy"
app:civ_border_color="#ffffff" app:civ_border_color="#ffffff"
app:civ_border_width="1dp"/> app:civ_border_width="1dp"/>
@ -56,7 +52,7 @@
android:id="@+id/uploader_name" android:id="@+id/uploader_name"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="4dp" android:paddingHorizontal="6dp"
android:layout_toRightOf="@+id/uploader_avatar_view" android:layout_toRightOf="@+id/uploader_avatar_view"
android:ellipsize="end" android:ellipsize="end"
android:gravity="left|center_vertical" android:gravity="left|center_vertical"
@ -73,7 +69,7 @@
android:layout_alignBottom="@+id/uploader_layout" android:layout_alignBottom="@+id/uploader_layout"
android:layout_alignTop="@+id/uploader_layout" android:layout_alignTop="@+id/uploader_layout"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginRight="6dp" android:layout_marginLeft="6dp"
android:ellipsize="end" android:ellipsize="end"
android:gravity="right|center_vertical" android:gravity="right|center_vertical"
android:maxLines="1" android:maxLines="1"