Skip to content

Commit acaf92d

Browse files
AudricVAudricV
committed
Unrevert PR 6824
PR 7061 reverted by mistake PR 6824 (it was a rebase issue). This commit unreverts this change and uses custom TextViews correctly in the file changed by PR 6824.
1 parent c673cb6 commit acaf92d

1 file changed

Lines changed: 54 additions & 60 deletions

File tree

‎app/src/main/res/layout/activity_player_queue_control.xml‎

Lines changed: 54 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -31,84 +31,78 @@
3131
android:id="@+id/play_queue"
3232
android:layout_width="match_parent"
3333
android:layout_height="match_parent"
34-
android:layout_above="@id/center"
34+
android:layout_above="@id/metadata"
3535
android:layout_below="@id/appbar"
3636
android:scrollbars="vertical"
3737
app:layoutManager="LinearLayoutManager"
3838
tools:listitem="@layout/play_queue_item" />
3939

40-
<RelativeLayout
41-
android:id="@+id/center"
40+
<org.schabi.newpipe.views.NewPipeTextView
41+
android:id="@+id/seek_display"
42+
android:layout_width="wrap_content"
43+
android:layout_height="wrap_content"
44+
android:layout_centerInParent="true"
45+
android:layout_above="@id/metadata"
46+
android:background="#c0000000"
47+
android:paddingLeft="30dp"
48+
android:paddingTop="5dp"
49+
android:paddingRight="30dp"
50+
android:paddingBottom="5dp"
51+
android:textColor="@android:color/white"
52+
android:textSize="22sp"
53+
android:textStyle="bold"
54+
android:visibility="gone"
55+
tools:ignore="RtlHardcoded"
56+
tools:text="1:06:29"
57+
tools:visibility="visible" />
58+
59+
<LinearLayout
60+
android:id="@+id/metadata"
4261
android:layout_width="match_parent"
4362
android:layout_height="wrap_content"
44-
android:layout_above="@+id/playback_controls">
63+
android:layout_above="@id/progress_bar"
64+
android:background="?attr/selectableItemBackground"
65+
android:clickable="true"
66+
android:focusable="true"
67+
android:orientation="vertical"
68+
android:padding="8dp"
69+
tools:ignore="RtlHardcoded,RtlSymmetry">
4570

46-
<LinearLayout
47-
android:id="@+id/metadata"
71+
<org.schabi.newpipe.views.NewPipeTextView
72+
android:id="@+id/song_name"
4873
android:layout_width="match_parent"
4974
android:layout_height="wrap_content"
50-
android:background="?attr/selectableItemBackground"
51-
android:clickable="true"
52-
android:focusable="true"
53-
android:orientation="vertical"
54-
android:padding="8dp"
55-
tools:ignore="RtlHardcoded,RtlSymmetry">
56-
57-
<org.schabi.newpipe.views.NewPipeTextView
58-
android:id="@+id/song_name"
59-
android:layout_width="match_parent"
60-
android:layout_height="wrap_content"
61-
android:ellipsize="marquee"
62-
android:fadingEdge="horizontal"
63-
android:marqueeRepeatLimit="marquee_forever"
64-
android:scrollHorizontally="true"
65-
android:singleLine="true"
66-
android:textAppearance="?android:attr/textAppearanceLarge"
67-
android:textSize="14sp"
68-
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." />
69-
70-
<org.schabi.newpipe.views.NewPipeTextView
71-
android:id="@+id/artist_name"
72-
android:layout_width="match_parent"
73-
android:layout_height="wrap_content"
74-
android:ellipsize="marquee"
75-
android:fadingEdge="horizontal"
76-
android:marqueeRepeatLimit="marquee_forever"
77-
android:scrollHorizontally="true"
78-
android:singleLine="true"
79-
android:textAppearance="?android:attr/textAppearanceMedium"
80-
android:textSize="12sp"
81-
tools:text="Duis posuere arcu condimentum lobortis mattis." />
82-
</LinearLayout>
75+
android:ellipsize="marquee"
76+
android:fadingEdge="horizontal"
77+
android:marqueeRepeatLimit="marquee_forever"
78+
android:scrollHorizontally="true"
79+
android:singleLine="true"
80+
android:textAppearance="?android:attr/textAppearanceLarge"
81+
android:textSize="14sp"
82+
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." />
8383

8484
<org.schabi.newpipe.views.NewPipeTextView
85-
android:id="@+id/seek_display"
86-
android:layout_width="wrap_content"
85+
android:id="@+id/artist_name"
86+
android:layout_width="match_parent"
8787
android:layout_height="wrap_content"
88-
android:layout_centerInParent="true"
89-
android:background="#c0000000"
90-
android:paddingLeft="30dp"
91-
android:paddingTop="5dp"
92-
android:paddingRight="30dp"
93-
android:paddingBottom="5dp"
94-
android:textColor="@android:color/white"
95-
android:textSize="22sp"
96-
android:textStyle="bold"
97-
android:visibility="gone"
98-
tools:ignore="RtlHardcoded"
99-
tools:text="1:06:29"
100-
tools:visibility="visible" />
101-
</RelativeLayout>
88+
android:ellipsize="marquee"
89+
android:fadingEdge="horizontal"
90+
android:marqueeRepeatLimit="marquee_forever"
91+
android:scrollHorizontally="true"
92+
android:singleLine="true"
93+
android:textAppearance="?android:attr/textAppearanceMedium"
94+
android:textSize="12sp"
95+
tools:text="Duis posuere arcu condimentum lobortis mattis." />
96+
</LinearLayout>
10297

10398
<LinearLayout
10499
android:id="@+id/progress_bar"
105100
android:layout_width="match_parent"
106101
android:layout_height="wrap_content"
107-
android:layout_alignParentBottom="true"
108-
android:gravity="center"
109102
android:orientation="horizontal"
110103
android:paddingLeft="12dp"
111-
android:paddingRight="12dp">
104+
android:paddingRight="12dp"
105+
android:layout_above="@+id/playback_controls">
112106

113107
<org.schabi.newpipe.views.NewPipeTextView
114108
android:id="@+id/current_time"
@@ -163,8 +157,9 @@
163157
android:id="@+id/playback_controls"
164158
android:layout_width="match_parent"
165159
android:layout_height="wrap_content"
166-
android:layout_above="@+id/progress_bar"
167160
android:orientation="horizontal"
161+
android:layout_alignParentBottom="true"
162+
android:layout_marginBottom="12dp"
168163
tools:ignore="RtlHardcoded">
169164

170165
<ImageButton
@@ -294,5 +289,4 @@
294289
tools:ignore="ContentDescription" />
295290

296291
</RelativeLayout>
297-
298292
</RelativeLayout>

0 commit comments

Comments
 (0)