Skip to content

Commit 0712aa0

Browse files
StypoxStypox
committed
Make all buttons in player have selectable item background borderless
Except buttons with long text or text that changes on click
1 parent faa7a91 commit 0712aa0

File tree

2 files changed

+31
-31
lines changed

2 files changed

+31
-31
lines changed

‎app/src/main/res/layout-large-land/player.xml

+15-15
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
android:layout_width="wrap_content"
167167
android:layout_height="35dp"
168168
android:layout_marginEnd="8dp"
169-
android:background="?attr/selectableItemBackground"
169+
android:background="?attr/selectableItemBackgroundBorderless"
170170
android:gravity="center"
171171
android:minWidth="0dp"
172172
android:padding="@dimen/player_main_buttons_padding"
@@ -180,7 +180,7 @@
180180
android:layout_width="35dp"
181181
android:layout_height="35dp"
182182
android:layout_marginEnd="8dp"
183-
android:background="?attr/selectableItemBackground"
183+
android:background="?attr/selectableItemBackgroundBorderless"
184184
android:clickable="true"
185185
android:focusable="true"
186186
android:paddingStart="3dp"
@@ -199,7 +199,7 @@
199199
android:layout_width="35dp"
200200
android:layout_height="35dp"
201201
android:layout_marginEnd="8dp"
202-
android:background="?attr/selectableItemBackground"
202+
android:background="?attr/selectableItemBackgroundBorderless"
203203
android:clickable="true"
204204
android:focusable="true"
205205
android:paddingStart="3dp"
@@ -281,7 +281,7 @@
281281
android:layout_width="wrap_content"
282282
android:layout_height="35dp"
283283
android:layout_marginEnd="8dp"
284-
android:background="?attr/selectableItemBackground"
284+
android:background="?attr/selectableItemBackgroundBorderless"
285285
android:clickable="true"
286286
android:contentDescription="@string/play_with_kodi_title"
287287
android:focusable="true"
@@ -296,7 +296,7 @@
296296
android:layout_width="wrap_content"
297297
android:layout_height="35dp"
298298
android:layout_marginEnd="8dp"
299-
android:background="?attr/selectableItemBackground"
299+
android:background="?attr/selectableItemBackgroundBorderless"
300300
android:clickable="true"
301301
android:contentDescription="@string/open_in_browser"
302302
android:focusable="true"
@@ -311,7 +311,7 @@
311311
android:layout_width="wrap_content"
312312
android:layout_height="35dp"
313313
android:layout_marginEnd="8dp"
314-
android:background="?attr/selectableItemBackground"
314+
android:background="?attr/selectableItemBackgroundBorderless"
315315
android:clickable="true"
316316
android:contentDescription="@string/share"
317317
android:focusable="true"
@@ -325,7 +325,7 @@
325325
android:id="@+id/switchMute"
326326
android:layout_width="wrap_content"
327327
android:layout_height="37dp"
328-
android:background="?attr/selectableItemBackground"
328+
android:background="?attr/selectableItemBackgroundBorderless"
329329
android:clickable="true"
330330
android:contentDescription="@string/mute"
331331
android:focusable="true"
@@ -339,7 +339,7 @@
339339
android:id="@+id/fullScreenButton"
340340
android:layout_width="40dp"
341341
android:layout_height="40dp"
342-
android:background="?attr/selectableItemBackground"
342+
android:background="?attr/selectableItemBackgroundBorderless"
343343
android:clickable="true"
344344
android:focusable="true"
345345
android:padding="@dimen/player_main_buttons_padding"
@@ -447,7 +447,7 @@
447447
android:id="@+id/playbackLiveSync"
448448
android:layout_width="wrap_content"
449449
android:layout_height="match_parent"
450-
android:background="?attr/selectableItemBackground"
450+
android:background="?attr/selectableItemBackgroundBorderless"
451451
android:gravity="center"
452452
android:paddingLeft="4dp"
453453
android:paddingRight="4dp"
@@ -462,7 +462,7 @@
462462
android:layout_width="40dp"
463463
android:layout_height="40dp"
464464
android:layout_marginStart="4dp"
465-
android:background="?attr/selectableItemBackground"
465+
android:background="?attr/selectableItemBackgroundBorderless"
466466
android:clickable="true"
467467
android:focusable="true"
468468
android:nextFocusUp="@id/playbackSeekBar"
@@ -566,7 +566,7 @@
566566
android:layout_alignParentEnd="true"
567567
android:layout_centerVertical="true"
568568
android:layout_marginEnd="40dp"
569-
android:background="?android:selectableItemBackground"
569+
android:background="?attr/selectableItemBackgroundBorderless"
570570
android:clickable="true"
571571
android:contentDescription="@string/close"
572572
android:focusable="true"
@@ -584,7 +584,7 @@
584584
android:layout_centerVertical="true"
585585
android:layout_marginStart="40dp"
586586
android:layout_marginLeft="40dp"
587-
android:background="?android:selectableItemBackground"
587+
android:background="?attr/selectableItemBackgroundBorderless"
588588
android:clickable="true"
589589
android:focusable="true"
590590
android:padding="10dp"
@@ -599,7 +599,7 @@
599599
android:layout_height="50dp"
600600
android:layout_centerVertical="true"
601601
android:layout_toRightOf="@id/repeatButton"
602-
android:background="?android:selectableItemBackground"
602+
android:background="?attr/selectableItemBackgroundBorderless"
603603
android:clickable="true"
604604
android:focusable="true"
605605
android:padding="10dp"
@@ -614,8 +614,8 @@
614614
android:layout_width="wrap_content"
615615
android:layout_height="wrap_content"
616616
android:layout_centerVertical="true"
617-
android:layout_toLeftOf="@id/itemsListClose"
618-
android:layout_toRightOf="@id/shuffleButton"
617+
android:layout_toStartOf="@id/itemsListClose"
618+
android:layout_toEndOf="@id/shuffleButton"
619619
android:gravity="center"
620620
android:textColor="@android:color/white" />
621621
</RelativeLayout>

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

+16-16
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@
168168
android:layout_width="wrap_content"
169169
android:layout_height="35dp"
170170
android:layout_marginEnd="8dp"
171-
android:background="?attr/selectableItemBackground"
171+
android:background="?attr/selectableItemBackgroundBorderless"
172172
android:gravity="center"
173173
android:minWidth="0dp"
174174
android:padding="@dimen/player_main_buttons_padding"
@@ -182,7 +182,7 @@
182182
android:layout_width="35dp"
183183
android:layout_height="35dp"
184184
android:layout_marginEnd="8dp"
185-
android:background="?attr/selectableItemBackground"
185+
android:background="?attr/selectableItemBackgroundBorderless"
186186
android:clickable="true"
187187
android:focusable="true"
188188
android:paddingStart="3dp"
@@ -200,7 +200,7 @@
200200
android:layout_width="35dp"
201201
android:layout_height="35dp"
202202
android:layout_marginEnd="8dp"
203-
android:background="?attr/selectableItemBackground"
203+
android:background="?attr/selectableItemBackgroundBorderless"
204204
android:clickable="true"
205205
android:focusable="true"
206206
android:paddingStart="6dp"
@@ -280,7 +280,7 @@
280280
android:layout_width="wrap_content"
281281
android:layout_height="35dp"
282282
android:layout_marginEnd="8dp"
283-
android:background="?attr/selectableItemBackground"
283+
android:background="?attr/selectableItemBackgroundBorderless"
284284
android:clickable="true"
285285
android:contentDescription="@string/play_with_kodi_title"
286286
android:focusable="true"
@@ -295,7 +295,7 @@
295295
android:layout_width="wrap_content"
296296
android:layout_height="35dp"
297297
android:layout_marginEnd="8dp"
298-
android:background="?attr/selectableItemBackground"
298+
android:background="?attr/selectableItemBackgroundBorderless"
299299
android:clickable="true"
300300
android:contentDescription="@string/open_in_browser"
301301
android:focusable="true"
@@ -310,7 +310,7 @@
310310
android:layout_width="wrap_content"
311311
android:layout_height="35dp"
312312
android:layout_marginEnd="8dp"
313-
android:background="?attr/selectableItemBackground"
313+
android:background="?attr/selectableItemBackgroundBorderless"
314314
android:clickable="true"
315315
android:contentDescription="@string/share"
316316
android:focusable="true"
@@ -324,7 +324,7 @@
324324
android:id="@+id/switchMute"
325325
android:layout_width="wrap_content"
326326
android:layout_height="37dp"
327-
android:background="?attr/selectableItemBackground"
327+
android:background="?attr/selectableItemBackgroundBorderless"
328328
android:clickable="true"
329329
android:contentDescription="@string/mute"
330330
android:focusable="true"
@@ -338,7 +338,7 @@
338338
android:id="@+id/fullScreenButton"
339339
android:layout_width="40dp"
340340
android:layout_height="40dp"
341-
android:background="?attr/selectableItemBackground"
341+
android:background="?attr/selectableItemBackgroundBorderless"
342342
android:clickable="true"
343343
android:focusable="true"
344344
android:padding="@dimen/player_main_buttons_padding"
@@ -445,7 +445,7 @@
445445
android:id="@+id/playbackLiveSync"
446446
android:layout_width="wrap_content"
447447
android:layout_height="match_parent"
448-
android:background="?attr/selectableItemBackground"
448+
android:background="?attr/selectableItemBackgroundBorderless"
449449
android:gravity="center"
450450
android:paddingLeft="4dp"
451451
android:paddingRight="4dp"
@@ -460,7 +460,7 @@
460460
android:layout_width="40dp"
461461
android:layout_height="40dp"
462462
android:layout_marginStart="4dp"
463-
android:background="?attr/selectableItemBackground"
463+
android:background="?attr/selectableItemBackgroundBorderless"
464464
android:clickable="true"
465465
android:focusable="true"
466466
android:padding="@dimen/player_main_buttons_padding"
@@ -562,7 +562,7 @@
562562
android:layout_alignParentEnd="true"
563563
android:layout_centerVertical="true"
564564
android:layout_marginEnd="40dp"
565-
android:background="?android:selectableItemBackground"
565+
android:background="?attr/selectableItemBackgroundBorderless"
566566
android:clickable="true"
567567
android:contentDescription="@string/close"
568568
android:focusable="true"
@@ -580,7 +580,7 @@
580580
android:layout_centerVertical="true"
581581
android:layout_marginStart="40dp"
582582
android:layout_marginLeft="40dp"
583-
android:background="?android:selectableItemBackground"
583+
android:background="?attr/selectableItemBackgroundBorderless"
584584
android:clickable="true"
585585
android:focusable="true"
586586
android:padding="10dp"
@@ -595,7 +595,7 @@
595595
android:layout_height="50dp"
596596
android:layout_centerVertical="true"
597597
android:layout_toRightOf="@id/repeatButton"
598-
android:background="?android:selectableItemBackground"
598+
android:background="?attr/selectableItemBackgroundBorderless"
599599
android:clickable="true"
600600
android:focusable="true"
601601
android:padding="10dp"
@@ -611,8 +611,8 @@
611611
android:layout_width="wrap_content"
612612
android:layout_height="wrap_content"
613613
android:layout_centerVertical="true"
614-
android:layout_toRightOf="@id/shuffleButton"
615-
android:layout_toLeftOf="@id/itemsListClose"
614+
android:layout_toEndOf="@id/shuffleButton"
615+
android:layout_toStartOf="@id/itemsListClose"
616616
android:textColor="@android:color/white" />
617617
</RelativeLayout>
618618

@@ -722,7 +722,7 @@
722722
android:layout_height="70dp"
723723
android:layout_centerInParent="true"
724724
tools:ignore="ContentDescription"
725-
tools:src="@drawable/ic_brightness" />
725+
tools:src="@drawable/ic_brightness_high" />
726726
</RelativeLayout>
727727

728728
</RelativeLayout>

0 commit comments

Comments
 (0)