Skip to content

Commit 6b5a1d0

Browse files
krlvmkrlvm
committed
Fix Player controls colors on KitKat
AppCompatImageButton ignores "tint" theme attribute on API 19, therefore, they had to be specified directly, these attributes can be removed after the KitKat support is dropped.
1 parent 24247fd commit 6b5a1d0

2 files changed

Lines changed: 28 additions & 0 deletions

File tree

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@
103103
android:padding="@dimen/player_main_buttons_padding"
104104
android:scaleType="fitXY"
105105
android:visibility="gone"
106+
app:tint="@color/white"
106107
app:srcCompat="@drawable/ic_close"
107108
tools:ignore="ContentDescription,RtlHardcoded" />
108109

@@ -188,6 +189,7 @@
188189
android:paddingBottom="3dp"
189190
android:scaleType="fitCenter"
190191
android:visibility="gone"
192+
app:tint="@color/white"
191193
app:srcCompat="@drawable/ic_list"
192194
tools:ignore="ContentDescription,RtlHardcoded"
193195
tools:visibility="visible" />
@@ -206,6 +208,7 @@
206208
android:paddingBottom="3dp"
207209
android:scaleType="fitCenter"
208210
android:visibility="gone"
211+
app:tint="@color/white"
209212
app:srcCompat="@drawable/ic_format_list_numbered"
210213
tools:ignore="ContentDescription,RtlHardcoded"
211214
tools:visibility="visible" />
@@ -219,6 +222,7 @@
219222
android:focusable="true"
220223
android:padding="@dimen/player_main_buttons_padding"
221224
android:scaleType="fitXY"
225+
app:tint="@color/white"
222226
app:srcCompat="@drawable/ic_expand_more"
223227
tools:ignore="ContentDescription,RtlHardcoded" />
224228

@@ -283,6 +287,7 @@
283287
android:focusable="true"
284288
android:padding="@dimen/player_main_buttons_padding"
285289
android:scaleType="fitXY"
290+
app:tint="@color/white"
286291
app:srcCompat="@drawable/ic_cast"
287292
tools:ignore="RtlHardcoded" />
288293

@@ -297,6 +302,7 @@
297302
android:focusable="true"
298303
android:padding="@dimen/player_main_buttons_padding"
299304
android:scaleType="fitXY"
305+
app:tint="@color/white"
300306
app:srcCompat="@drawable/ic_language"
301307
tools:ignore="RtlHardcoded" />
302308

@@ -311,6 +317,7 @@
311317
android:focusable="true"
312318
android:padding="@dimen/player_main_buttons_padding"
313319
android:scaleType="fitXY"
320+
app:tint="@color/white"
314321
app:srcCompat="@drawable/ic_share"
315322
tools:ignore="RtlHardcoded" />
316323

@@ -324,6 +331,7 @@
324331
android:focusable="true"
325332
android:padding="@dimen/player_main_buttons_padding"
326333
android:scaleType="fitXY"
334+
app:tint="@color/white"
327335
app:srcCompat="@drawable/ic_volume_off"
328336
tools:ignore="RtlHardcoded" />
329337

@@ -337,6 +345,7 @@
337345
android:padding="@dimen/player_main_buttons_padding"
338346
android:scaleType="fitCenter"
339347
android:visibility="gone"
348+
app:tint="@color/white"
340349
app:srcCompat="@drawable/ic_fullscreen"
341350
tools:ignore="ContentDescription,RtlHardcoded"
342351
tools:visibility="visible" />
@@ -416,6 +425,7 @@
416425
android:padding="@dimen/player_main_buttons_padding"
417426
android:scaleType="fitCenter"
418427
android:visibility="gone"
428+
app:tint="@color/white"
419429
app:srcCompat="@drawable/ic_fullscreen"
420430
tools:ignore="ContentDescription,RtlHardcoded"
421431
tools:visibility="visible" />
@@ -439,6 +449,7 @@
439449
android:clickable="true"
440450
android:focusable="true"
441451
android:scaleType="fitCenter"
452+
app:tint="@color/white"
442453
app:srcCompat="@drawable/ic_previous"
443454
tools:ignore="ContentDescription" />
444455

@@ -450,6 +461,7 @@
450461
android:layout_weight="1"
451462
android:background="?attr/selectableItemBackgroundBorderless"
452463
android:scaleType="fitCenter"
464+
app:tint="@color/white"
453465
app:srcCompat="@drawable/ic_pause"
454466
tools:ignore="ContentDescription" />
455467

@@ -463,6 +475,7 @@
463475
android:clickable="true"
464476
android:focusable="true"
465477
android:scaleType="fitCenter"
478+
app:tint="@color/white"
466479
app:srcCompat="@drawable/ic_next"
467480
tools:ignore="ContentDescription" />
468481

@@ -515,6 +528,7 @@
515528
android:focusable="true"
516529
android:padding="10dp"
517530
android:scaleType="fitXY"
531+
app:tint="@color/white"
518532
app:srcCompat="@drawable/ic_close" />
519533

520534
<ImageButton

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@
101101
android:padding="@dimen/player_main_buttons_padding"
102102
android:scaleType="fitXY"
103103
android:visibility="gone"
104+
app:tint="@color/white"
104105
app:srcCompat="@drawable/ic_close"
105106
tools:ignore="ContentDescription,RtlHardcoded" />
106107

@@ -190,6 +191,7 @@
190191
android:paddingBottom="3dp"
191192
android:scaleType="fitCenter"
192193
android:visibility="gone"
194+
app:tint="@color/white"
193195
app:srcCompat="@drawable/ic_list"
194196
tools:ignore="ContentDescription,RtlHardcoded" />
195197

@@ -207,6 +209,7 @@
207209
android:paddingBottom="3dp"
208210
android:scaleType="fitCenter"
209211
android:visibility="gone"
212+
app:tint="@color/white"
210213
app:srcCompat="@drawable/ic_format_list_numbered"
211214
tools:ignore="ContentDescription,RtlHardcoded" />
212215

@@ -219,6 +222,7 @@
219222
android:focusable="true"
220223
android:padding="@dimen/player_main_buttons_padding"
221224
android:scaleType="fitXY"
225+
app:tint="@color/white"
222226
app:srcCompat="@drawable/ic_expand_more"
223227
tools:ignore="ContentDescription,RtlHardcoded" />
224228

@@ -282,6 +286,7 @@
282286
android:focusable="true"
283287
android:padding="@dimen/player_main_buttons_padding"
284288
android:scaleType="fitXY"
289+
app:tint="@color/white"
285290
app:srcCompat="@drawable/ic_cast"
286291
tools:ignore="RtlHardcoded" />
287292

@@ -296,6 +301,7 @@
296301
android:focusable="true"
297302
android:padding="@dimen/player_main_buttons_padding"
298303
android:scaleType="fitXY"
304+
app:tint="@color/white"
299305
app:srcCompat="@drawable/ic_language"
300306
tools:ignore="RtlHardcoded" />
301307

@@ -310,6 +316,7 @@
310316
android:focusable="true"
311317
android:padding="@dimen/player_main_buttons_padding"
312318
android:scaleType="fitXY"
319+
app:tint="@color/white"
313320
app:srcCompat="@drawable/ic_share"
314321
tools:ignore="RtlHardcoded" />
315322

@@ -323,6 +330,7 @@
323330
android:focusable="true"
324331
android:padding="@dimen/player_main_buttons_padding"
325332
android:scaleType="fitXY"
333+
app:tint="@color/white"
326334
app:srcCompat="@drawable/ic_volume_off"
327335
tools:ignore="RtlHardcoded" />
328336

@@ -336,6 +344,7 @@
336344
android:padding="@dimen/player_main_buttons_padding"
337345
android:scaleType="fitCenter"
338346
android:visibility="gone"
347+
app:tint="@color/white"
339348
app:srcCompat="@drawable/ic_fullscreen"
340349
tools:ignore="ContentDescription,RtlHardcoded"
341350
tools:visibility="visible" />
@@ -413,6 +422,7 @@
413422
android:padding="@dimen/player_main_buttons_padding"
414423
android:scaleType="fitCenter"
415424
android:visibility="gone"
425+
app:tint="@color/white"
416426
app:srcCompat="@drawable/ic_fullscreen"
417427
tools:ignore="ContentDescription,RtlHardcoded"
418428
tools:visibility="visible" />
@@ -436,6 +446,7 @@
436446
android:clickable="true"
437447
android:focusable="true"
438448
android:scaleType="fitCenter"
449+
app:tint="@color/white"
439450
app:srcCompat="@drawable/ic_previous"
440451
tools:ignore="ContentDescription" />
441452

@@ -447,6 +458,7 @@
447458
android:layout_weight="1"
448459
android:background="?attr/selectableItemBackgroundBorderless"
449460
android:scaleType="fitCenter"
461+
app:tint="@color/white"
450462
app:srcCompat="@drawable/ic_pause"
451463
tools:ignore="ContentDescription" />
452464

@@ -460,6 +472,7 @@
460472
android:clickable="true"
461473
android:focusable="true"
462474
android:scaleType="fitCenter"
475+
app:tint="@color/white"
463476
app:srcCompat="@drawable/ic_next"
464477
tools:ignore="ContentDescription" />
465478

@@ -511,6 +524,7 @@
511524
android:focusable="true"
512525
android:padding="10dp"
513526
android:scaleType="fitXY"
527+
app:tint="@color/white"
514528
app:srcCompat="@drawable/ic_close" />
515529

516530
<androidx.appcompat.widget.AppCompatImageButton

0 commit comments

Comments
 (0)