Skip to content

Commit 1014dd5

Browse files
litetexlitetex
committed
Correctly format player.xml
Otherwise it constantly switches the attributes which makes (re) viewing changes next to impossible
1 parent 09e4bea commit 1014dd5

1 file changed

Lines changed: 17 additions & 17 deletions

File tree

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,13 @@
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
@@ -165,17 +165,17 @@
165165
android:layout_marginEnd="8dp"
166166
android:layout_weight="1"
167167
android:background="?attr/selectableItemBackground"
168+
android:ellipsize="end"
168169
android:gravity="center"
169170
android:minWidth="0dp"
170-
android:singleLine="true"
171-
android:ellipsize="end"
172171
android:padding="@dimen/player_main_buttons_padding"
172+
android:singleLine="true"
173173
android:textColor="@android:color/white"
174174
android:textStyle="bold"
175175
android:visibility="gone"
176176
tools:ignore="HardcodedText,RtlHardcoded"
177-
tools:visibility="visible"
178-
tools:text="English (Original)" />
177+
tools:text="English (Original)"
178+
tools:visibility="visible" />
179179

180180
<org.schabi.newpipe.views.NewPipeTextView
181181
android:id="@+id/qualityTextView"
@@ -212,6 +212,7 @@
212212
android:layout_marginEnd="8dp"
213213
android:background="?attr/selectableItemBackgroundBorderless"
214214
android:clickable="true"
215+
android:contentDescription="@string/open_play_queue"
215216
android:focusable="true"
216217
android:paddingStart="3dp"
217218
android:paddingTop="5dp"
@@ -221,7 +222,6 @@
221222
android:src="@drawable/ic_list"
222223
android:visibility="gone"
223224
app:tint="@color/white"
224-
android:contentDescription="@string/open_play_queue"
225225
tools:ignore="RtlHardcoded" />
226226

227227
<androidx.appcompat.widget.AppCompatImageButton
@@ -231,16 +231,16 @@
231231
android:layout_marginEnd="8dp"
232232
android:background="?attr/selectableItemBackgroundBorderless"
233233
android:clickable="true"
234+
android:contentDescription="@string/chapters"
234235
android:focusable="true"
235236
android:paddingStart="6dp"
237+
android:paddingTop="3dp"
236238
android:paddingEnd="6dp"
237239
android:paddingBottom="3dp"
238-
android:paddingTop="3dp"
239240
android:scaleType="fitCenter"
240241
android:src="@drawable/ic_menu_book"
241242
android:visibility="gone"
242243
app:tint="@color/white"
243-
android:contentDescription="@string/chapters"
244244
tools:ignore="RtlHardcoded" />
245245

246246
<androidx.appcompat.widget.AppCompatImageButton
@@ -249,12 +249,12 @@
249249
android:layout_height="wrap_content"
250250
android:background="?attr/selectableItemBackgroundBorderless"
251251
android:clickable="true"
252+
android:contentDescription="@string/more_options"
252253
android:focusable="true"
253254
android:padding="@dimen/player_main_buttons_padding"
254255
android:scaleType="fitXY"
255256
android:src="@drawable/ic_expand_more"
256257
app:tint="@color/white"
257-
android:contentDescription="@string/more_options"
258258
tools:ignore="RtlHardcoded" />
259259

260260
</LinearLayout>
@@ -371,11 +371,11 @@
371371
android:layout_height="40dp"
372372
android:background="?attr/selectableItemBackgroundBorderless"
373373
android:clickable="true"
374+
android:contentDescription="@string/toggle_fullscreen"
374375
android:focusable="true"
375376
android:padding="@dimen/player_main_buttons_padding"
376377
android:scaleType="fitCenter"
377378
android:src="@drawable/ic_fullscreen"
378-
android:contentDescription="@string/toggle_fullscreen"
379379
android:visibility="gone"
380380
app:tint="@color/white"
381381
tools:ignore="RtlHardcoded"
@@ -495,13 +495,13 @@
495495
android:layout_marginStart="4dp"
496496
android:background="?attr/selectableItemBackgroundBorderless"
497497
android:clickable="true"
498+
android:contentDescription="@string/toggle_screen_orientation"
498499
android:focusable="true"
499500
android:nextFocusUp="@id/playbackSeekBar"
500501
android:padding="@dimen/player_main_buttons_padding"
501502
android:scaleType="fitCenter"
502503
android:src="@drawable/ic_fullscreen"
503504
android:visibility="gone"
504-
android:contentDescription="@string/toggle_screen_orientation"
505505
app:tint="@color/white"
506506
tools:ignore="RtlHardcoded"
507507
tools:visibility="visible" />
@@ -523,10 +523,10 @@
523523
android:layout_weight="1"
524524
android:background="?attr/selectableItemBackgroundBorderless"
525525
android:clickable="true"
526+
android:contentDescription="@string/previous_stream"
526527
android:focusable="true"
527528
android:scaleType="fitCenter"
528529
android:src="@drawable/ic_previous"
529-
android:contentDescription="@string/previous_stream"
530530
app:tint="@color/white" />
531531

532532

@@ -536,9 +536,9 @@
536536
android:layout_height="60dp"
537537
android:layout_weight="1"
538538
android:background="?attr/selectableItemBackgroundBorderless"
539+
android:contentDescription="@string/pause"
539540
android:scaleType="fitCenter"
540541
android:src="@drawable/ic_pause"
541-
android:contentDescription="@string/pause"
542542
app:tint="@color/white" />
543543

544544
<androidx.appcompat.widget.AppCompatImageButton
@@ -549,10 +549,10 @@
549549
android:layout_weight="1"
550550
android:background="?attr/selectableItemBackgroundBorderless"
551551
android:clickable="true"
552+
android:contentDescription="@string/next_stream"
552553
android:focusable="true"
553554
android:scaleType="fitCenter"
554555
android:src="@drawable/ic_next"
555-
android:contentDescription="@string/next_stream"
556556
app:tint="@color/white" />
557557

558558
</LinearLayout>
@@ -599,12 +599,12 @@
599599
android:layout_marginLeft="40dp"
600600
android:background="?attr/selectableItemBackgroundBorderless"
601601
android:clickable="true"
602+
android:contentDescription="@string/notification_action_repeat"
602603
android:focusable="true"
603604
android:padding="10dp"
604605
android:scaleType="fitXY"
605606
android:src="@drawable/exo_controls_repeat_off"
606607
android:tint="?attr/colorAccent"
607-
android:contentDescription="@string/notification_action_repeat"
608608
tools:ignore="RtlHardcoded" />
609609

610610
<androidx.appcompat.widget.AppCompatImageButton
@@ -615,12 +615,12 @@
615615
android:layout_toRightOf="@id/repeatButton"
616616
android:background="?attr/selectableItemBackgroundBorderless"
617617
android:clickable="true"
618+
android:contentDescription="@string/notification_action_shuffle"
618619
android:focusable="true"
619620
android:padding="10dp"
620621
android:scaleType="fitXY"
621622
android:src="@drawable/ic_shuffle"
622623
android:tint="?attr/colorAccent"
623-
android:contentDescription="@string/notification_action_shuffle"
624624
tools:ignore="RtlHardcoded" />
625625

626626
<androidx.appcompat.widget.AppCompatTextView
@@ -642,12 +642,12 @@
642642
android:layout_toLeftOf="@+id/itemsListClose"
643643
android:background="?attr/selectableItemBackgroundBorderless"
644644
android:clickable="true"
645+
android:contentDescription="@string/add_to_playlist"
645646
android:focusable="true"
646647
android:padding="10dp"
647648
android:scaleType="fitXY"
648649
android:src="@drawable/ic_playlist_add"
649650
android:tint="?attr/colorAccent"
650-
android:contentDescription="@string/add_to_playlist"
651651
tools:ignore="RtlHardcoded" />
652652

653653
<androidx.appcompat.widget.AppCompatImageButton

0 commit comments

Comments
 (0)