lasers
/
NewPipe
mirror of https://github.com/TeamNewPipe/NewPipe
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use vector drawables for close and replay

This commit is contained in:
wb9688 2020-05-14 17:05:09 +02:00
parent 4abf6b2f5c
commit 7d499ffba1
30 changed files with 55 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/org/schabi/newpipe/player/NotificationUtil.java
View File

@ -356,7 +356,7 @@ public final class NotificationUtil {
}
break;
case "close":
builder.addAction(R.drawable.ic_close_white_32dp, "Close",
builder.addAction(R.drawable.ic_close_white_24dp, "Close",
PendingIntent.getBroadcast(context, NOTIFICATION_ID_BACKGROUND,
new Intent(BackgroundPlayer.ACTION_CLOSE),
PendingIntent.FLAG_UPDATE_CURRENT));
@ -450,7 +450,7 @@ public final class NotificationUtil {
notificationBuilder.setSmallIcon(android.R.drawable.stat_sys_download);
} else if (basePlayerImpl.getCurrentState() == BasePlayer.STATE_COMPLETED) {
notificationBuilder.mActions.set(slotNumber,
new NotificationCompat.Action(R.drawable.ic_replay_white_32dp,
new NotificationCompat.Action(R.drawable.ic_replay_white_24dp,
"Completed", PendingIntent.getBroadcast(context,
NOTIFICATION_ID_BACKGROUND,
new Intent(BackgroundPlayer.ACTION_PLAY_PAUSE),
@ -486,7 +486,7 @@ public final class NotificationUtil {
PendingIntent.FLAG_UPDATE_CURRENT)));
} else if (basePlayerImpl.getCurrentState() == BasePlayer.STATE_COMPLETED) {
notificationBuilder.mActions.set(slotNumber,
new NotificationCompat.Action(R.drawable.ic_replay_white_32dp,
new NotificationCompat.Action(R.drawable.ic_replay_white_24dp,
"Completed", PendingIntent.getBroadcast(context,
NOTIFICATION_ID_BACKGROUND,
new Intent(BackgroundPlayer.ACTION_PLAY_PAUSE),
@ -611,7 +611,7 @@ public final class NotificationUtil {
break;
case "close":
notificationBuilder.mActions.set(slotNumber,
new NotificationCompat.Action(R.drawable.ic_close_white_32dp, "Close",
new NotificationCompat.Action(R.drawable.ic_close_white_24dp, "Close",
PendingIntent.getBroadcast(context, NOTIFICATION_ID_BACKGROUND,
new Intent(BackgroundPlayer.ACTION_CLOSE),
PendingIntent.FLAG_UPDATE_CURRENT)));
@ -840,7 +840,7 @@ public final class NotificationUtil {
}
break;
case "close":
builder.addAction(R.drawable.ic_close_white_32dp, "Close",
builder.addAction(R.drawable.ic_close_white_24dp, "Close",
PendingIntent.getBroadcast(context, NOTIFICATION_ID_POPUP,
new Intent(PopupVideoPlayer.ACTION_CLOSE),
PendingIntent.FLAG_UPDATE_CURRENT));
@ -927,7 +927,7 @@ public final class NotificationUtil {
notificationBuilder.setSmallIcon(android.R.drawable.stat_sys_download);
} else if (playerImpl.getCurrentState() == BasePlayer.STATE_COMPLETED) {
notificationBuilder.mActions.set(slotNumber,
new NotificationCompat.Action(R.drawable.ic_replay_white_32dp,
new NotificationCompat.Action(R.drawable.ic_replay_white_24dp,
"Completed", PendingIntent.getBroadcast(context,
NOTIFICATION_ID_POPUP,
new Intent(PopupVideoPlayer.ACTION_PLAY_PAUSE),
@ -963,7 +963,7 @@ public final class NotificationUtil {
PendingIntent.FLAG_UPDATE_CURRENT)));
} else if (playerImpl.getCurrentState() == BasePlayer.STATE_COMPLETED) {
notificationBuilder.mActions.set(slotNumber,
new NotificationCompat.Action(R.drawable.ic_replay_white_32dp,
new NotificationCompat.Action(R.drawable.ic_replay_white_24dp,
"Completed", PendingIntent.getBroadcast(context,
NOTIFICATION_ID_POPUP,
new Intent(PopupVideoPlayer.ACTION_PLAY_PAUSE),
@ -1090,7 +1090,7 @@ public final class NotificationUtil {
break;
case "close":
notificationBuilder.mActions.set(slotNumber,
new NotificationCompat.Action(R.drawable.ic_close_white_32dp, "Close",
new NotificationCompat.Action(R.drawable.ic_close_white_24dp, "Close",
PendingIntent.getBroadcast(context, NOTIFICATION_ID_POPUP,
new Intent(PopupVideoPlayer.ACTION_CLOSE),
PendingIntent.FLAG_UPDATE_CURRENT)));

BIN
app/src/main/res/drawable-hdpi/ic_close_white_24dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 221 B

BIN
app/src/main/res/drawable-hdpi/ic_close_white_32dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 257 B

BIN
app/src/main/res/drawable-hdpi/ic_replay_white_24dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 675 B

BIN
app/src/main/res/drawable-hdpi/ic_replay_white_32dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 804 B

BIN
app/src/main/res/drawable-mdpi/ic_close_white_24dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 175 B

BIN
app/src/main/res/drawable-mdpi/ic_close_white_32dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 542 B

BIN
app/src/main/res/drawable-mdpi/ic_replay_white_24dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 457 B

BIN
app/src/main/res/drawable-mdpi/ic_replay_white_32dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 583 B

BIN
app/src/main/res/drawable-xhdpi/ic_close_white_24dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 257 B

BIN
app/src/main/res/drawable-xhdpi/ic_close_white_32dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 666 B

BIN
app/src/main/res/drawable-xhdpi/ic_replay_white_24dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 908 B

BIN
app/src/main/res/drawable-xhdpi/ic_replay_white_32dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
app/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 347 B

BIN
app/src/main/res/drawable-xxhdpi/ic_close_white_32dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 436 B

BIN
app/src/main/res/drawable-xxhdpi/ic_replay_white_24dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

BIN
app/src/main/res/drawable-xxhdpi/ic_replay_white_32dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 908 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 436 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_close_white_32dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.8 KiB

BIN
app/src/main/res/drawable-xxxhdpi/ic_replay_white_24dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.8 KiB

BIN
app/src/main/res/drawable-xxxhdpi/ic_replay_white_32dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.5 KiB

9
app/src/main/res/drawable/ic_close_white_24dp.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
</vector>

9
app/src/main/res/drawable/ic_replay_white_24dp.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M12,5V1L7,6l5,5V7c3.31,0 6,2.69 6,6s-2.69,6 -6,6 -6,-2.69 -6,-6H4c0,4.42 3.58,8 8,8s8,-3.58 8,-8 -3.58,-8 -8,-8z"/>
</vector>

10
app/src/main/res/layout-large-land/activity_main_player.xml
View File

@ -65,18 +65,18 @@
android:id="@+id/playQueueClose"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_marginRight="40dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginEnd="40dp"
android:padding="10dp"
android:layout_marginRight="40dp"
android:background="?android:selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:padding="10dp"
android:scaleType="fitXY"
android:tint="?attr/colorAccent"
app:srcCompat="@drawable/ic_close_white_24dp"
android:background="?android:selectableItemBackground"
tools:ignore="ContentDescription"/>
<ImageButton

12
app/src/main/res/layout/activity_main_player.xml
View File

@ -63,19 +63,19 @@
android:id="@+id/playQueueClose"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_marginRight="40dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginEnd="40dp"
android:padding="10dp"
android:layout_marginRight="40dp"
android:background="?android:selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:padding="10dp"
android:scaleType="fitXY"
android:tint="?attr/colorAccent"
app:srcCompat="@drawable/ic_close_white_24dp"
android:background="?android:selectableItemBackground"
tools:ignore="ContentDescription"/>
tools:ignore="ContentDescription" />
<ImageButton
android:id="@+id/repeatButton"

12
app/src/main/res/layout/player_background_notification.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="64dp"
xmlns:tools="http://schemas.android.com/tools">
android:layout_height="64dp"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout
android:id="@+id/notificationContent"
@ -107,8 +107,8 @@
android:focusable="true"
android:padding="5dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_close_white_24dp"
tools:ignore="ContentDescription,RtlHardcoded"/>
app:srcCompat="@drawable/ic_close_white_24dp"
tools:ignore="ContentDescription,RtlHardcoded" />
</LinearLayout>
<ProgressBar
@ -121,4 +121,4 @@
android:progressDrawable="@drawable/custom_progress_bar"
tools:ignore="RtlHardcoded"
tools:progress="52"/>
</FrameLayout>
</FrameLayout>

6
app/src/main/res/layout/player_background_notification_expanded.xml
View File

@ -29,8 +29,8 @@
android:focusable="true"
android:padding="8dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_close_white_24dp"
tools:ignore="ContentDescription,RtlHardcoded"/>
app:srcCompat="@drawable/ic_close_white_24dp"
tools:ignore="ContentDescription,RtlHardcoded" />
<LinearLayout
@ -162,4 +162,4 @@
android:src="@drawable/exo_controls_next"
tools:ignore="ContentDescription"/>
</RelativeLayout>
</RelativeLayout>
</RelativeLayout>

9
app/src/main/res/layout/player_popup_close_overlay.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -11,8 +10,8 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|center_horizontal"
android:layout_marginBottom="24dp"
app:srcCompat="@drawable/ic_close_white_24dp"
app:backgroundTint="@color/light_youtube_primary_color"
app:borderWidth="0dp"
app:fabSize="normal"/>
</FrameLayout>
app:fabSize="normal"
app:srcCompat="@drawable/ic_close_white_24dp" />
</FrameLayout>

6
app/src/main/res/layout/player_popup_notification.xml
View File

@ -83,6 +83,6 @@
android:focusable="true"
android:padding="5dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_close_white_24dp"
tools:ignore="ContentDescription,RtlHardcoded"/>
</LinearLayout>
app:srcCompat="@drawable/ic_close_white_24dp"
tools:ignore="ContentDescription,RtlHardcoded" />
</LinearLayout>

4
app/src/main/res/layout/toolbar_search_layout.xml
View File

@ -47,7 +47,7 @@
android:contentDescription="@string/search"
android:scaleType="fitCenter"
app:srcCompat="?attr/ic_close"
tools:ignore="RtlHardcoded"/>
tools:ignore="RtlHardcoded" />
</FrameLayout>
</FrameLayout>
</FrameLayout>