Skip to content

Commit ecd3e85

Browse files
StypoxStypox
authored
Merge pull request #12714 from litetex/properly-layout-player-topbar
2 parents f3ca5f6 + 4198190 commit ecd3e85

File tree

2 files changed

+79
-68
lines changed

2 files changed

+79
-68
lines changed

‎app/src/main/java/org/schabi/newpipe/player/ui/MainPlayerUi.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,6 @@ protected void setupElementsVisibility() {
290290
binding.topControls.setFocusable(true);
291291

292292
binding.metadataView.setVisibility(isFullscreen ? View.VISIBLE : View.GONE);
293-
binding.titleTextView.setVisibility(isFullscreen ? View.VISIBLE : View.GONE);
294-
binding.channelTextView.setVisibility(isFullscreen ? View.VISIBLE : View.GONE);
295293
}
296294

297295
@Override
@@ -936,8 +934,6 @@ public void toggleFullscreen() {
936934
fragmentListener.onFullscreenStateChanged(isFullscreen);
937935

938936
binding.metadataView.setVisibility(isFullscreen ? View.VISIBLE : View.GONE);
939-
binding.titleTextView.setVisibility(isFullscreen ? View.VISIBLE : View.GONE);
940-
binding.channelTextView.setVisibility(isFullscreen ? View.VISIBLE : View.GONE);
941937
binding.playerCloseButton.setVisibility(isFullscreen ? View.GONE : View.VISIBLE);
942938
setupScreenRotationButton();
943939
}

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

Lines changed: 79 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -109,73 +109,88 @@
109109
android:layout_marginEnd="8dp"
110110
android:background="?attr/selectableItemBackgroundBorderless"
111111
android:clickable="true"
112+
android:contentDescription="@string/close"
112113
android:focusable="true"
113114
android:padding="@dimen/player_main_buttons_padding"
114115
android:scaleType="fitXY"
115116
android:src="@drawable/ic_close"
116117
android:visibility="gone"
117118
app:tint="@color/white"
118-
android:contentDescription="@string/close"
119119
tools:ignore="RtlHardcoded" />
120120

121121
<LinearLayout
122-
android:id="@+id/metadataView"
123122
android:layout_width="0dp"
124-
android:layout_height="wrap_content"
125-
android:layout_marginTop="6dp"
126-
android:layout_marginEnd="8dp"
123+
android:layout_height="match_parent"
127124
android:layout_weight="1"
128-
android:gravity="top"
129-
android:orientation="vertical"
130-
tools:ignore="RtlHardcoded">
125+
android:orientation="horizontal">
131126

132-
<org.schabi.newpipe.views.NewPipeTextView
133-
android:id="@+id/titleTextView"
134-
android:layout_width="match_parent"
127+
<LinearLayout
128+
android:id="@+id/metadataView"
129+
android:layout_width="wrap_content"
135130
android:layout_height="wrap_content"
136-
android:ellipsize="marquee"
137-
android:fadingEdge="horizontal"
138-
android:marqueeRepeatLimit="marquee_forever"
139-
android:scrollHorizontally="true"
140-
android:singleLine="true"
141-
android:textColor="@android:color/white"
142-
android:textSize="15sp"
143-
android:textStyle="bold"
144-
tools:ignore="RtlHardcoded"
145-
tools:text="The Video Title LONG very LONG" />
146-
147-
<org.schabi.newpipe.views.NewPipeTextView
148-
android:id="@+id/channelTextView"
149-
android:layout_width="match_parent"
131+
android:layout_marginTop="6dp"
132+
android:layout_marginEnd="8dp"
133+
android:layout_weight="1"
134+
android:gravity="top"
135+
android:orientation="vertical"
136+
tools:ignore="NestedWeights,RtlHardcoded">
137+
138+
<org.schabi.newpipe.views.NewPipeTextView
139+
android:id="@+id/titleTextView"
140+
android:layout_width="match_parent"
141+
android:layout_height="wrap_content"
142+
android:ellipsize="marquee"
143+
android:fadingEdge="horizontal"
144+
android:marqueeRepeatLimit="marquee_forever"
145+
android:scrollHorizontally="true"
146+
android:singleLine="true"
147+
android:textColor="@android:color/white"
148+
android:textSize="15sp"
149+
android:textStyle="bold"
150+
tools:ignore="RtlHardcoded"
151+
tools:text="The Video Title LONG very LONG" />
152+
153+
<org.schabi.newpipe.views.NewPipeTextView
154+
android:id="@+id/channelTextView"
155+
android:layout_width="match_parent"
156+
android:layout_height="wrap_content"
157+
android:ellipsize="marquee"
158+
android:fadingEdge="horizontal"
159+
android:marqueeRepeatLimit="marquee_forever"
160+
android:scrollHorizontally="true"
161+
android:singleLine="true"
162+
android:textColor="@android:color/white"
163+
android:textSize="12sp"
164+
tools:text="The Video Artist LONG very LONG very Long" />
165+
166+
</LinearLayout>
167+
168+
<FrameLayout
169+
android:layout_width="wrap_content"
150170
android:layout_height="wrap_content"
151-
android:ellipsize="marquee"
152-
android:fadingEdge="horizontal"
153-
android:marqueeRepeatLimit="marquee_forever"
154-
android:scrollHorizontally="true"
155-
android:singleLine="true"
156-
android:textColor="@android:color/white"
157-
android:textSize="12sp"
158-
tools:text="The Video Artist LONG very LONG very Long" />
159-
</LinearLayout>
171+
android:layout_weight="1">
172+
173+
<org.schabi.newpipe.views.NewPipeTextView
174+
android:id="@+id/audioTrackTextView"
175+
android:layout_width="wrap_content"
176+
android:layout_height="35dp"
177+
android:layout_gravity="right"
178+
android:layout_marginEnd="8dp"
179+
android:background="?attr/selectableItemBackground"
180+
android:ellipsize="end"
181+
android:gravity="center"
182+
android:minWidth="0dp"
183+
android:padding="@dimen/player_main_buttons_padding"
184+
android:singleLine="true"
185+
android:textColor="@android:color/white"
186+
android:textStyle="bold"
187+
android:visibility="gone"
188+
tools:ignore="HardcodedText,RtlHardcoded"
189+
tools:text="English (United States) original"
190+
tools:visibility="visible" />
191+
</FrameLayout>
160192

161-
<org.schabi.newpipe.views.NewPipeTextView
162-
android:id="@+id/audioTrackTextView"
163-
android:layout_width="0dp"
164-
android:layout_height="35dp"
165-
android:layout_marginEnd="8dp"
166-
android:layout_weight="1"
167-
android:background="?attr/selectableItemBackground"
168-
android:gravity="center"
169-
android:minWidth="0dp"
170-
android:singleLine="true"
171-
android:ellipsize="end"
172-
android:padding="@dimen/player_main_buttons_padding"
173-
android:textColor="@android:color/white"
174-
android:textStyle="bold"
175-
android:visibility="gone"
176-
tools:ignore="HardcodedText,RtlHardcoded"
177-
tools:visibility="visible"
178-
tools:text="English (Original)" />
193+
</LinearLayout>
179194

180195
<org.schabi.newpipe.views.NewPipeTextView
181196
android:id="@+id/qualityTextView"
@@ -212,6 +227,7 @@
212227
android:layout_marginEnd="8dp"
213228
android:background="?attr/selectableItemBackgroundBorderless"
214229
android:clickable="true"
230+
android:contentDescription="@string/open_play_queue"
215231
android:focusable="true"
216232
android:paddingStart="3dp"
217233
android:paddingTop="5dp"
@@ -221,7 +237,6 @@
221237
android:src="@drawable/ic_list"
222238
android:visibility="gone"
223239
app:tint="@color/white"
224-
android:contentDescription="@string/open_play_queue"
225240
tools:ignore="RtlHardcoded" />
226241

227242
<androidx.appcompat.widget.AppCompatImageButton
@@ -231,16 +246,16 @@
231246
android:layout_marginEnd="8dp"
232247
android:background="?attr/selectableItemBackgroundBorderless"
233248
android:clickable="true"
249+
android:contentDescription="@string/chapters"
234250
android:focusable="true"
235251
android:paddingStart="6dp"
252+
android:paddingTop="3dp"
236253
android:paddingEnd="6dp"
237254
android:paddingBottom="3dp"
238-
android:paddingTop="3dp"
239255
android:scaleType="fitCenter"
240256
android:src="@drawable/ic_menu_book"
241257
android:visibility="gone"
242258
app:tint="@color/white"
243-
android:contentDescription="@string/chapters"
244259
tools:ignore="RtlHardcoded" />
245260

246261
<androidx.appcompat.widget.AppCompatImageButton
@@ -249,12 +264,12 @@
249264
android:layout_height="wrap_content"
250265
android:background="?attr/selectableItemBackgroundBorderless"
251266
android:clickable="true"
267+
android:contentDescription="@string/more_options"
252268
android:focusable="true"
253269
android:padding="@dimen/player_main_buttons_padding"
254270
android:scaleType="fitXY"
255271
android:src="@drawable/ic_expand_more"
256272
app:tint="@color/white"
257-
android:contentDescription="@string/more_options"
258273
tools:ignore="RtlHardcoded" />
259274

260275
</LinearLayout>
@@ -371,11 +386,11 @@
371386
android:layout_height="40dp"
372387
android:background="?attr/selectableItemBackgroundBorderless"
373388
android:clickable="true"
389+
android:contentDescription="@string/toggle_fullscreen"
374390
android:focusable="true"
375391
android:padding="@dimen/player_main_buttons_padding"
376392
android:scaleType="fitCenter"
377393
android:src="@drawable/ic_fullscreen"
378-
android:contentDescription="@string/toggle_fullscreen"
379394
android:visibility="gone"
380395
app:tint="@color/white"
381396
tools:ignore="RtlHardcoded"
@@ -495,13 +510,13 @@
495510
android:layout_marginStart="4dp"
496511
android:background="?attr/selectableItemBackgroundBorderless"
497512
android:clickable="true"
513+
android:contentDescription="@string/toggle_screen_orientation"
498514
android:focusable="true"
499515
android:nextFocusUp="@id/playbackSeekBar"
500516
android:padding="@dimen/player_main_buttons_padding"
501517
android:scaleType="fitCenter"
502518
android:src="@drawable/ic_fullscreen"
503519
android:visibility="gone"
504-
android:contentDescription="@string/toggle_screen_orientation"
505520
app:tint="@color/white"
506521
tools:ignore="RtlHardcoded"
507522
tools:visibility="visible" />
@@ -523,10 +538,10 @@
523538
android:layout_weight="1"
524539
android:background="?attr/selectableItemBackgroundBorderless"
525540
android:clickable="true"
541+
android:contentDescription="@string/previous_stream"
526542
android:focusable="true"
527543
android:scaleType="fitCenter"
528544
android:src="@drawable/ic_previous"
529-
android:contentDescription="@string/previous_stream"
530545
app:tint="@color/white" />
531546

532547

@@ -536,9 +551,9 @@
536551
android:layout_height="60dp"
537552
android:layout_weight="1"
538553
android:background="?attr/selectableItemBackgroundBorderless"
554+
android:contentDescription="@string/pause"
539555
android:scaleType="fitCenter"
540556
android:src="@drawable/ic_pause"
541-
android:contentDescription="@string/pause"
542557
app:tint="@color/white" />
543558

544559
<androidx.appcompat.widget.AppCompatImageButton
@@ -549,10 +564,10 @@
549564
android:layout_weight="1"
550565
android:background="?attr/selectableItemBackgroundBorderless"
551566
android:clickable="true"
567+
android:contentDescription="@string/next_stream"
552568
android:focusable="true"
553569
android:scaleType="fitCenter"
554570
android:src="@drawable/ic_next"
555-
android:contentDescription="@string/next_stream"
556571
app:tint="@color/white" />
557572

558573
</LinearLayout>
@@ -599,12 +614,12 @@
599614
android:layout_marginLeft="40dp"
600615
android:background="?attr/selectableItemBackgroundBorderless"
601616
android:clickable="true"
617+
android:contentDescription="@string/notification_action_repeat"
602618
android:focusable="true"
603619
android:padding="10dp"
604620
android:scaleType="fitXY"
605621
android:src="@drawable/exo_controls_repeat_off"
606622
android:tint="?attr/colorAccent"
607-
android:contentDescription="@string/notification_action_repeat"
608623
tools:ignore="RtlHardcoded" />
609624

610625
<androidx.appcompat.widget.AppCompatImageButton
@@ -615,12 +630,12 @@
615630
android:layout_toRightOf="@id/repeatButton"
616631
android:background="?attr/selectableItemBackgroundBorderless"
617632
android:clickable="true"
633+
android:contentDescription="@string/notification_action_shuffle"
618634
android:focusable="true"
619635
android:padding="10dp"
620636
android:scaleType="fitXY"
621637
android:src="@drawable/ic_shuffle"
622638
android:tint="?attr/colorAccent"
623-
android:contentDescription="@string/notification_action_shuffle"
624639
tools:ignore="RtlHardcoded" />
625640

626641
<androidx.appcompat.widget.AppCompatTextView
@@ -642,12 +657,12 @@
642657
android:layout_toLeftOf="@+id/itemsListClose"
643658
android:background="?attr/selectableItemBackgroundBorderless"
644659
android:clickable="true"
660+
android:contentDescription="@string/add_to_playlist"
645661
android:focusable="true"
646662
android:padding="10dp"
647663
android:scaleType="fitXY"
648664
android:src="@drawable/ic_playlist_add"
649665
android:tint="?attr/colorAccent"
650-
android:contentDescription="@string/add_to_playlist"
651666
tools:ignore="RtlHardcoded" />
652667

653668
<androidx.appcompat.widget.AppCompatImageButton

0 commit comments

Comments
 (0)