1
0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2024-12-01 14:30:55 +01:00

Merge pull request #6824 from phigjm/player_queue_control_rearrangement

Swap seekbar position with player buttons in Queue screen
This commit is contained in:
Tobi 2021-10-02 09:47:25 +02:00 committed by GitHub
commit 5b3137093f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -31,84 +31,78 @@
android:id="@+id/play_queue" android:id="@+id/play_queue"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_above="@id/center" android:layout_above="@id/metadata"
android:layout_below="@id/appbar" android:layout_below="@id/appbar"
android:scrollbars="vertical" android:scrollbars="vertical"
app:layoutManager="LinearLayoutManager" app:layoutManager="LinearLayoutManager"
tools:listitem="@layout/play_queue_item" /> tools:listitem="@layout/play_queue_item" />
<RelativeLayout <TextView
android:id="@+id/center" android:id="@+id/seek_display"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_above="@id/metadata"
android:background="#c0000000"
android:paddingLeft="30dp"
android:paddingTop="5dp"
android:paddingRight="30dp"
android:paddingBottom="5dp"
android:textColor="@android:color/white"
android:textSize="22sp"
android:textStyle="bold"
android:visibility="gone"
tools:ignore="RtlHardcoded"
tools:text="1:06:29"
tools:visibility="visible" />
<LinearLayout
android:id="@+id/metadata"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_above="@+id/playback_controls"> android:layout_above="@id/progress_bar"
android:background="?attr/selectableItemBackground"
<LinearLayout android:clickable="true"
android:id="@+id/metadata" android:focusable="true"
android:layout_width="match_parent" android:orientation="vertical"
android:layout_height="wrap_content" android:padding="8dp"
android:background="?attr/selectableItemBackground" tools:ignore="RtlHardcoded,RtlSymmetry">
android:clickable="true"
android:focusable="true"
android:orientation="vertical"
android:padding="8dp"
tools:ignore="RtlHardcoded,RtlSymmetry">
<TextView
android:id="@+id/song_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textSize="14sp"
tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis nec aliquam augue, eget cursus est. Ut id tristique enim, ut scelerisque tellus. Sed ultricies ipsum non mauris ultricies, commodo malesuada velit porta." />
<TextView
android:id="@+id/artist_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="12sp"
tools:text="Duis posuere arcu condimentum lobortis mattis." />
</LinearLayout>
<TextView <TextView
android:id="@+id/seek_display" android:id="@+id/song_name"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerInParent="true" android:ellipsize="marquee"
android:background="#c0000000" android:fadingEdge="horizontal"
android:paddingLeft="30dp" android:marqueeRepeatLimit="marquee_forever"
android:paddingTop="5dp" android:scrollHorizontally="true"
android:paddingRight="30dp" android:singleLine="true"
android:paddingBottom="5dp" android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@android:color/white" android:textSize="14sp"
android:textSize="22sp" tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis nec aliquam augue, eget cursus est. Ut id tristique enim, ut scelerisque tellus. Sed ultricies ipsum non mauris ultricies, commodo malesuada velit porta." />
android:textStyle="bold"
android:visibility="gone" <TextView
tools:ignore="RtlHardcoded" android:id="@+id/artist_name"
tools:text="1:06:29" android:layout_width="match_parent"
tools:visibility="visible" /> android:layout_height="wrap_content"
</RelativeLayout> android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="12sp"
tools:text="Duis posuere arcu condimentum lobortis mattis." />
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/progress_bar" android:id="@+id/progress_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:gravity="center"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="12dp" android:paddingLeft="12dp"
android:paddingRight="12dp"> android:paddingRight="12dp"
android:layout_above="@+id/playback_controls">
<TextView <TextView
android:id="@+id/current_time" android:id="@+id/current_time"
@ -163,8 +157,9 @@
android:id="@+id/playback_controls" android:id="@+id/playback_controls"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_above="@+id/progress_bar"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_alignParentBottom="true"
android:layout_marginBottom="12dp"
tools:ignore="RtlHardcoded"> tools:ignore="RtlHardcoded">
<ImageButton <ImageButton
@ -294,5 +289,4 @@
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
</RelativeLayout> </RelativeLayout>
</RelativeLayout> </RelativeLayout>