Skip to content

Commit b125780

Browse files
litetexStypox
litetex
authored and
Stypox
committed
Clean up pre-Lollipop compat attributes
1 parent 99104fc commit b125780

37 files changed

Lines changed: 122 additions & 219 deletions

‎app/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ android {
2020
versionName "0.23.1"
2121

2222
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
23-
vectorDrawables.useSupportLibrary = true
2423

2524
javaCompileOptions {
2625
annotationProcessorOptions {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@
138138
android:clickable="true"
139139
android:focusable="true"
140140
android:scaleType="fitCenter"
141+
android:src="@drawable/ic_pause"
141142
android:tint="?attr/colorAccent"
142-
app:srcCompat="@drawable/ic_pause"
143143
tools:ignore="ContentDescription" />
144144

145145
<ProgressBar
@@ -199,8 +199,8 @@
199199
android:gravity="center"
200200
android:minWidth="50dp"
201201
android:scaleType="fitCenter"
202+
android:src="@drawable/ic_previous"
202203
android:tint="?attr/colorAccent"
203-
app:srcCompat="@drawable/ic_previous"
204204
tools:ignore="ContentDescription" />
205205

206206
<ImageButton
@@ -214,8 +214,8 @@
214214
android:clickable="true"
215215
android:focusable="true"
216216
android:scaleType="fitXY"
217+
android:src="@drawable/ic_repeat"
217218
android:tint="?attr/colorAccent"
218-
app:srcCompat="@drawable/ic_repeat"
219219
tools:ignore="ContentDescription" />
220220

221221
<View
@@ -235,8 +235,8 @@
235235
android:clickable="true"
236236
android:focusable="true"
237237
android:scaleType="fitXY"
238+
android:src="@drawable/ic_shuffle"
238239
android:tint="?attr/colorAccent"
239-
app:srcCompat="@drawable/ic_shuffle"
240240
tools:ignore="ContentDescription" />
241241

242242
<androidx.appcompat.widget.AppCompatImageButton
@@ -253,8 +253,8 @@
253253
android:gravity="center"
254254
android:minWidth="50dp"
255255
android:scaleType="fitCenter"
256+
android:src="@drawable/ic_next"
256257
android:tint="?attr/colorAccent"
257-
app:srcCompat="@drawable/ic_next"
258258
tools:ignore="ContentDescription" />
259259
</RelativeLayout>
260260
</RelativeLayout>

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

Lines changed: 23 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
android:layout_height="64dp"
6666
android:layout_gravity="center"
6767
android:background="@android:color/transparent"
68+
android:src="@drawable/ic_play_arrow_shadow"
6869
android:visibility="invisible"
69-
app:srcCompat="@drawable/ic_play_arrow_shadow"
7070
tools:ignore="ContentDescription"
7171
tools:visibility="visible" />
7272

@@ -199,7 +199,7 @@
199199
android:layout_gravity="top|end"
200200
android:layout_marginTop="11dp"
201201
android:layout_marginEnd="10dp"
202-
app:srcCompat="@drawable/ic_expand_more"
202+
android:src="@drawable/ic_expand_more"
203203
tools:ignore="ContentDescription" />
204204

205205
</FrameLayout>
@@ -326,18 +326,6 @@
326326
tools:text="Uploader" />
327327
</LinearLayout>
328328

329-
<!--<Button
330-
android:id="@+id/detail_uploader_subscribe"
331-
android:layout_width="wrap_content"
332-
android:layout_height="wrap_content"
333-
android:layout_gravity="center_vertical|right"
334-
android:layout_marginRight="12dp"
335-
android:text="@string/rss_button_title"
336-
android:textSize="12sp"
337-
android:theme="@style/RedButton"
338-
app:drawableLeftCompat="@drawable/ic_rss_feed"
339-
tools:ignore="RtlHardcoded"
340-
android:visibility="gone"/>-->
341329
</LinearLayout>
342330

343331
<!-- VIEW & THUMBS -->
@@ -369,7 +357,7 @@
369357
android:layout_height="@dimen/video_item_detail_like_image_height"
370358
android:layout_below="@id/detail_view_count_view"
371359
android:contentDescription="@string/detail_likes_img_view_description"
372-
app:srcCompat="@drawable/ic_thumb_up" />
360+
android:src="@drawable/ic_thumb_up" />
373361

374362
<org.schabi.newpipe.views.NewPipeTextView
375363
android:id="@+id/detail_thumbs_up_count_view"
@@ -393,7 +381,7 @@
393381
android:layout_marginLeft="12dp"
394382
android:layout_toRightOf="@id/detail_thumbs_up_count_view"
395383
android:contentDescription="@string/detail_dislikes_img_view_description"
396-
app:srcCompat="@drawable/ic_thumb_down"
384+
android:src="@drawable/ic_thumb_down"
397385
tools:ignore="RtlHardcoded" />
398386

399387
<org.schabi.newpipe.views.NewPipeTextView
@@ -447,12 +435,12 @@
447435
android:background="?attr/selectableItemBackgroundBorderless"
448436
android:clickable="true"
449437
android:contentDescription="@string/add_to_playlist"
438+
android:drawableTop="@drawable/ic_playlist_add"
450439
android:focusable="true"
451440
android:gravity="center"
452441
android:paddingVertical="@dimen/detail_control_padding"
453442
android:text="@string/controls_add_to_playlist_title"
454-
android:textSize="@dimen/detail_control_text_size"
455-
app:drawableTopCompat="@drawable/ic_playlist_add" />
443+
android:textSize="@dimen/detail_control_text_size" />
456444

457445
<org.schabi.newpipe.views.NewPipeTextView
458446
android:id="@+id/detail_controls_background"
@@ -463,12 +451,12 @@
463451
android:background="?attr/selectableItemBackgroundBorderless"
464452
android:clickable="true"
465453
android:contentDescription="@string/play_audio"
454+
android:drawableTop="@drawable/ic_headset"
466455
android:focusable="true"
467456
android:gravity="center"
468457
android:paddingVertical="@dimen/detail_control_padding"
469458
android:text="@string/controls_background_title"
470-
android:textSize="@dimen/detail_control_text_size"
471-
app:drawableTopCompat="@drawable/ic_headset" />
459+
android:textSize="@dimen/detail_control_text_size" />
472460

473461
<org.schabi.newpipe.views.NewPipeTextView
474462
android:id="@+id/detail_controls_popup"
@@ -479,12 +467,12 @@
479467
android:background="?attr/selectableItemBackgroundBorderless"
480468
android:clickable="true"
481469
android:contentDescription="@string/open_in_popup_mode"
470+
android:drawableTop="@drawable/ic_picture_in_picture"
482471
android:focusable="true"
483472
android:gravity="center"
484473
android:paddingVertical="@dimen/detail_control_padding"
485474
android:text="@string/controls_popup_title"
486-
android:textSize="@dimen/detail_control_text_size"
487-
app:drawableTopCompat="@drawable/ic_picture_in_picture" />
475+
android:textSize="@dimen/detail_control_text_size" />
488476

489477
<org.schabi.newpipe.views.NewPipeTextView
490478
android:id="@+id/detail_controls_download"
@@ -495,12 +483,12 @@
495483
android:background="?attr/selectableItemBackgroundBorderless"
496484
android:clickable="true"
497485
android:contentDescription="@string/controls_download_desc"
486+
android:drawableTop="@drawable/ic_file_download"
498487
android:focusable="true"
499488
android:gravity="center"
500489
android:paddingVertical="@dimen/detail_control_padding"
501490
android:text="@string/download"
502-
android:textSize="@dimen/detail_control_text_size"
503-
app:drawableTopCompat="@drawable/ic_file_download" />
491+
android:textSize="@dimen/detail_control_text_size" />
504492

505493
</LinearLayout>
506494

@@ -526,12 +514,12 @@
526514
android:background="?attr/selectableItemBackgroundBorderless"
527515
android:clickable="true"
528516
android:contentDescription="@string/share"
517+
android:drawableTop="@drawable/ic_share"
529518
android:focusable="true"
530519
android:gravity="center"
531520
android:paddingVertical="@dimen/detail_control_padding"
532521
android:text="@string/share"
533-
android:textSize="@dimen/detail_control_text_size"
534-
app:drawableTopCompat="@drawable/ic_share" />
522+
android:textSize="@dimen/detail_control_text_size" />
535523

536524
<org.schabi.newpipe.views.NewPipeTextView
537525
android:id="@+id/detail_controls_open_in_browser"
@@ -542,12 +530,12 @@
542530
android:background="?attr/selectableItemBackgroundBorderless"
543531
android:clickable="true"
544532
android:contentDescription="@string/open_in_browser"
533+
android:drawableTop="@drawable/ic_language"
545534
android:focusable="true"
546535
android:gravity="center"
547536
android:paddingVertical="@dimen/detail_control_padding"
548537
android:text="@string/open_in_browser"
549-
android:textSize="@dimen/detail_control_text_size"
550-
app:drawableTopCompat="@drawable/ic_language" />
538+
android:textSize="@dimen/detail_control_text_size" />
551539

552540
<org.schabi.newpipe.views.NewPipeTextView
553541
android:id="@+id/detail_controls_play_with_kodi"
@@ -558,14 +546,14 @@
558546
android:background="?attr/selectableItemBackgroundBorderless"
559547
android:clickable="true"
560548
android:contentDescription="@string/play_with_kodi_title"
549+
android:drawableTop="@drawable/ic_cast"
561550
android:focusable="true"
562551
android:gravity="center"
563552
android:paddingVertical="@dimen/detail_control_padding"
564553
android:text="@string/play_with_kodi_title"
565-
android:textSize="@dimen/detail_control_text_size"
566-
app:drawableTopCompat="@drawable/ic_cast" />
554+
android:textSize="@dimen/detail_control_text_size" />
567555

568-
<TextView
556+
<org.schabi.newpipe.views.NewPipeTextView
569557
android:id="@+id/detail_controls_crash_the_player"
570558
android:layout_width="@dimen/detail_control_width"
571559
android:layout_height="@dimen/detail_control_height"
@@ -574,12 +562,12 @@
574562
android:background="?attr/selectableItemBackgroundBorderless"
575563
android:clickable="true"
576564
android:contentDescription="@string/crash_the_player"
565+
android:drawableTop="@drawable/ic_bug_report"
577566
android:focusable="true"
578567
android:gravity="center"
579568
android:paddingVertical="@dimen/detail_control_padding"
580569
android:text="@string/crash_the_player"
581-
android:textSize="@dimen/detail_control_text_size"
582-
app:drawableTopCompat="@drawable/ic_bug_report" />
570+
android:textSize="@dimen/detail_control_text_size" />
583571

584572
</LinearLayout>
585573

@@ -719,7 +707,7 @@
719707
android:scaleType="center"
720708
android:focusable="true"
721709
android:focusedByDefault="true"
722-
app:srcCompat="@drawable/ic_play_arrow"
710+
android:src="@drawable/ic_play_arrow"
723711
tools:ignore="ContentDescription,RtlHardcoded" />
724712

725713
<ImageButton
@@ -729,7 +717,7 @@
729717
android:background="?attr/selectableItemBackground"
730718
android:padding="10dp"
731719
android:scaleType="center"
732-
app:srcCompat="@drawable/ic_close"
720+
android:src="@drawable/ic_close"
733721
tools:ignore="ContentDescription,RtlHardcoded" />
734722

735723
</LinearLayout>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@
174174
android:clickable="true"
175175
android:focusable="true"
176176
android:scaleType="fitXY"
177+
android:src="@drawable/ic_repeat"
177178
android:tint="?attr/colorAccent"
178-
app:srcCompat="@drawable/ic_repeat"
179179
tools:ignore="ContentDescription" />
180180

181181
<androidx.appcompat.widget.AppCompatImageButton
@@ -189,8 +189,8 @@
189189
android:clickable="true"
190190
android:focusable="true"
191191
android:scaleType="fitCenter"
192+
android:src="@drawable/ic_previous"
192193
android:tint="?attr/colorAccent"
193-
app:srcCompat="@drawable/ic_previous"
194194
tools:ignore="ContentDescription" />
195195

196196
<ImageButton
@@ -219,8 +219,8 @@
219219
android:clickable="true"
220220
android:focusable="true"
221221
android:scaleType="fitCenter"
222+
android:src="@drawable/ic_pause"
222223
android:tint="?attr/colorAccent"
223-
app:srcCompat="@drawable/ic_pause"
224224
tools:ignore="ContentDescription" />
225225

226226
<ProgressBar
@@ -268,8 +268,8 @@
268268
android:clickable="true"
269269
android:focusable="true"
270270
android:scaleType="fitCenter"
271+
android:src="@drawable/ic_next"
271272
android:tint="?attr/colorAccent"
272-
app:srcCompat="@drawable/ic_next"
273273
tools:ignore="ContentDescription" />
274274

275275
<ImageButton
@@ -284,8 +284,8 @@
284284
android:clickable="true"
285285
android:focusable="true"
286286
android:scaleType="fitXY"
287+
android:src="@drawable/ic_shuffle"
287288
android:tint="?attr/colorAccent"
288-
app:srcCompat="@drawable/ic_shuffle"
289289
tools:ignore="ContentDescription" />
290290

291291
</RelativeLayout>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,8 @@
193193
android:layout_centerVertical="true"
194194
android:minWidth="0dp"
195195
android:scaleType="centerInside"
196+
android:src="@drawable/ic_delete"
196197
android:visibility="gone"
197-
app:srcCompat="@drawable/ic_delete"
198198
tools:ignore="ContentDescription"
199199
tools:visibility="visible" />
200200

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:app="http://schemas.android.com/apk/res-auto"
43
xmlns:tools="http://schemas.android.com/tools"
54
android:layout_width="match_parent"
65
android:layout_height="match_parent"
@@ -154,7 +153,7 @@
154153
android:layout_alignParentEnd="true"
155154
android:clickable="true"
156155
android:focusable="true"
157-
app:srcCompat="@drawable/ic_expand_more"
156+
android:src="@drawable/ic_expand_more"
158157
tools:ignore="ContentDescription" />
159158

160159
<LinearLayout

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2-
xmlns:app="http://schemas.android.com/apk/res-auto"
32
xmlns:tools="http://schemas.android.com/tools"
43
android:layout_width="match_parent"
54
android:layout_height="match_parent">
@@ -20,7 +19,7 @@
2019
android:layout_centerVertical="true"
2120
android:layout_marginLeft="12dp"
2221
android:layout_marginRight="12dp"
23-
app:srcCompat="@drawable/ic_playlist_add"
22+
android:src="@drawable/ic_playlist_add"
2423
tools:ignore="ContentDescription,RtlHardcoded" />
2524

2625
<org.schabi.newpipe.views.NewPipeTextView

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
android:layout_width="@dimen/drawer_header_newpipe_icon_size"
4040
android:layout_height="@dimen/drawer_header_newpipe_icon_size"
4141
android:layout_marginEnd="@dimen/drawer_header_newpipe_icon_title_space"
42-
app:srcCompat="@drawable/splash_foreground"
42+
android:src="@drawable/splash_foreground"
4343
tools:ignore="ContentDescription" />
4444

4545
<org.schabi.newpipe.views.NewPipeTextView
@@ -86,7 +86,7 @@
8686
android:scaleType="fitCenter"
8787
app:tint="@color/drawer_header_font_color"
8888
tools:ignore="ContentDescription"
89-
tools:srcCompat="@drawable/ic_smart_display" />
89+
tools:src="@drawable/ic_smart_display" />
9090

9191
<org.schabi.newpipe.views.NewPipeTextView
9292
android:id="@+id/drawer_header_service_view"
@@ -104,7 +104,7 @@
104104
android:layout_width="24dp"
105105
android:layout_height="24dp"
106106
android:layout_marginStart="4dp"
107-
app:srcCompat="@drawable/ic_arrow_drop_down"
107+
android:src="@drawable/ic_arrow_drop_down"
108108
app:tint="@color/drawer_header_font_color"
109109
tools:ignore="ContentDescription" />
110110
</LinearLayout>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
android:layout_height="14dp"
2525
android:layout_gravity="center"
2626
android:scaleType="centerInside"
27-
app:srcCompat="@drawable/ic_add"
27+
android:src="@drawable/ic_add"
2828
tools:ignore="ContentDescription" />
2929

3030
<org.schabi.newpipe.views.NewPipeTextView

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
android:paddingTop="12dp"
5656
android:paddingRight="16dp"
5757
android:paddingBottom="12dp"
58-
app:srcCompat="@drawable/ic_drag_handle"
58+
android:src="@drawable/ic_drag_handle"
5959
tools:ignore="ContentDescription,RtlHardcoded" />
6060
</RelativeLayout>
6161
</androidx.cardview.widget.CardView>

0 commit comments

Comments
 (0)