Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix next previous drawable size

Browse source
This commit is contained in:
Prathamesh More 2022-07-06 18:10:43 +05:30
parent 31df20ffe5
commit 1de4bbcdec
12 changed files with 20 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationClassic.kt
View file

@ -189,12 +189,12 @@ class PlayingNotificationClassic(
).toBitmap() ).toBitmap()
val prev = val prev =
context.getTintedDrawable( context.getTintedDrawable(
R.drawable.ic_skip_previous_round_white_32dp, R.drawable.ic_skip_previous,
primary primary
).toBitmap() ).toBitmap()
val next = val next =
context.getTintedDrawable( context.getTintedDrawable(
R.drawable.ic_skip_next_round_white_32dp, R.drawable.ic_skip_next,
primary primary
).toBitmap() ).toBitmap()
val playPause = getPlayPauseBitmap(true) val playPause = getPlayPauseBitmap(true)

4
app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl24.kt
View file

@ -75,12 +75,12 @@ class PlayingNotificationImpl24(
val toggleFavorite = buildFavoriteAction(false) val toggleFavorite = buildFavoriteAction(false)
val playPauseAction = buildPlayAction(true) val playPauseAction = buildPlayAction(true)
val previousAction = NotificationCompat.Action( val previousAction = NotificationCompat.Action(
R.drawable.ic_skip_previous_round_white_32dp, R.drawable.ic_skip_previous,
context.getString(R.string.action_previous), context.getString(R.string.action_previous),
retrievePlaybackAction(ACTION_REWIND) retrievePlaybackAction(ACTION_REWIND)
) )
val nextAction = NotificationCompat.Action( val nextAction = NotificationCompat.Action(
R.drawable.ic_skip_next_round_white_32dp, R.drawable.ic_skip_next,
context.getString(R.string.action_next), context.getString(R.string.action_next),
retrievePlaybackAction(ACTION_SKIP) retrievePlaybackAction(ACTION_SKIP)
) )

13
app/src/main/res/drawable/ic_skip_next.xml
View file

@ -1,19 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="@dimen/icon_notification_dimen"
android:height="24dp" android:height="@dimen/icon_notification_dimen"
android:viewportWidth="24" android:viewportWidth="24"
android:viewportHeight="24" android:viewportHeight="24"
android:tint="?attr/colorControlNormal"> android:tint="?attr/colorControlNormal">
<path <path
android:fillColor="@android:color/white" android:fillColor="@android:color/white"
android:pathData="M17.5,18Q17.075,18 16.788,17.712Q16.5,17.425 16.5,17V7Q16.5,6.575 16.788,6.287Q17.075,6 17.5,6Q17.925,6 18.212,6.287Q18.5,6.575 18.5,7V17Q18.5,17.425 18.212,17.712Q17.925,18 17.5,18ZM7.05,16.975Q6.55,17.325 6.025,17.025Q5.5,16.725 5.5,16.125V7.875Q5.5,7.275 6.025,6.987Q6.55,6.7 7.05,7.025L13.25,11.175Q13.7,11.475 13.7,12Q13.7,12.525 13.25,12.825Z"/> android:pathData="M17.5,18Q17.075,18 16.788,17.712Q16.5,17.425 16.5,17V7Q16.5,6.575 16.788,6.287Q17.075,6 17.5,6Q17.925,6 18.212,6.287Q18.5,6.575 18.5,7V17Q18.5,17.425 18.212,17.712Q17.925,18 17.5,18ZM7.05,16.975Q6.55,17.325 6.025,17.025Q5.5,16.725 5.5,16.125V7.875Q5.5,7.275 6.025,6.987Q6.55,6.7 7.05,7.025L13.25,11.175Q13.7,11.475 13.7,12Q13.7,12.525 13.25,12.825Z"/>
</vector><vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="32dp"
android:height="32dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M17.5,18Q17.075,18 16.788,17.712Q16.5,17.425 16.5,17V7Q16.5,6.575 16.788,6.287Q17.075,6 17.5,6Q17.925,6 18.212,6.287Q18.5,6.575 18.5,7V17Q18.5,17.425 18.212,17.712Q17.925,18 17.5,18ZM7.05,16.975Q6.55,17.325 6.025,17.025Q5.5,16.725 5.5,16.125V7.875Q5.5,7.275 6.025,6.987Q6.55,6.7 7.05,7.025L13.25,11.175Q13.7,11.475 13.7,12Q13.7,12.525 13.25,12.825Z"/>
</vector> </vector>

10
app/src/main/res/drawable/ic_skip_next_round_white_32dp.xml
View file

@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="32dp"
android:height="32dp"
android:tint="?attr/colorControlNormal"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M17.5,18Q17.075,18 16.788,17.712Q16.5,17.425 16.5,17V7Q16.5,6.575 16.788,6.287Q17.075,6 17.5,6Q17.925,6 18.212,6.287Q18.5,6.575 18.5,7V17Q18.5,17.425 18.212,17.712Q17.925,18 17.5,18ZM7.05,16.975Q6.55,17.325 6.025,17.025Q5.5,16.725 5.5,16.125V7.875Q5.5,7.275 6.025,6.987Q6.55,6.7 7.05,7.025L13.25,11.175Q13.7,11.475 13.7,12Q13.7,12.525 13.25,12.825Z" />
</vector>

4
app/src/main/res/drawable/ic_skip_previous.xml
View file

@ -1,6 +1,6 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="@dimen/icon_notification_dimen"
android:height="24dp" android:height="@dimen/icon_notification_dimen"
android:viewportWidth="24" android:viewportWidth="24"
android:viewportHeight="24" android:viewportHeight="24"
android:tint="?attr/colorControlNormal"> android:tint="?attr/colorControlNormal">

10
app/src/main/res/drawable/ic_skip_previous_round_white_32dp.xml
View file

@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="32dp"
android:height="32dp"
android:tint="?attr/colorControlNormal"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M6.5,18Q6.075,18 5.787,17.712Q5.5,17.425 5.5,17V7Q5.5,6.575 5.787,6.287Q6.075,6 6.5,6Q6.925,6 7.213,6.287Q7.5,6.575 7.5,7V17Q7.5,17.425 7.213,17.712Q6.925,18 6.5,18ZM16.95,16.975 L10.75,12.825Q10.3,12.525 10.3,12Q10.3,11.475 10.75,11.175L16.95,7.025Q17.45,6.7 17.975,6.987Q18.5,7.275 18.5,7.875V16.125Q18.5,16.725 17.975,17.025Q17.45,17.325 16.95,16.975Z" />
</vector>

4
app/src/main/res/layout-land/fragment_circle_player.xml
View file

@ -118,7 +118,7 @@
app:layout_constraintBottom_toBottomOf="@+id/playPauseButton" app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
app:layout_constraintStart_toEndOf="@+id/playPauseButton" app:layout_constraintStart_toEndOf="@+id/playPauseButton"
app:layout_constraintTop_toTopOf="@+id/playPauseButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton"
app:srcCompat="@drawable/ic_skip_next_round_white_32dp" app:srcCompat="@drawable/ic_skip_next"
app:tint="@color/md_green_500" /> app:tint="@color/md_green_500" />
<ImageButton <ImageButton
@ -132,7 +132,7 @@
app:layout_constraintBottom_toBottomOf="@+id/playPauseButton" app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
app:layout_constraintEnd_toStartOf="@+id/playPauseButton" app:layout_constraintEnd_toStartOf="@+id/playPauseButton"
app:layout_constraintTop_toTopOf="@+id/playPauseButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton"
app:srcCompat="@drawable/ic_skip_previous_round_white_32dp" app:srcCompat="@drawable/ic_skip_previous"
app:tint="@color/md_green_500" /> app:tint="@color/md_green_500" />
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView

4
app/src/main/res/layout-v31/layout_notification_collapsed.xml
View file

@ -75,7 +75,7 @@
android:layout_height="38dp" android:layout_height="38dp"
android:background="@drawable/notification_selector" android:background="@drawable/notification_selector"
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="@drawable/ic_skip_previous_round_white_32dp" android:src="@drawable/ic_skip_previous"
tools:tint="?colorOnPrimary" /> tools:tint="?colorOnPrimary" />
<ImageButton <ImageButton
@ -93,7 +93,7 @@
android:layout_height="38dp" android:layout_height="38dp"
android:background="@drawable/notification_selector" android:background="@drawable/notification_selector"
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="@drawable/ic_skip_next_round_white_32dp" android:src="@drawable/ic_skip_next"
tools:tint="?colorOnPrimary" /> tools:tint="?colorOnPrimary" />
</LinearLayout> </LinearLayout>

4
app/src/main/res/layout-v31/layout_notification_expanded.xml
View file

@ -68,7 +68,7 @@
android:layout_height="42dp" android:layout_height="42dp"
android:background="@drawable/notification_selector" android:background="@drawable/notification_selector"
android:scaleType="centerInside" android:scaleType="centerInside"
tools:src="@drawable/ic_skip_previous_round_white_32dp" tools:src="@drawable/ic_skip_previous"
tools:tint="?colorOnPrimary" /> tools:tint="?colorOnPrimary" />
<ImageButton <ImageButton
@ -86,7 +86,7 @@
android:layout_height="42dp" android:layout_height="42dp"
android:background="@drawable/notification_selector" android:background="@drawable/notification_selector"
android:scaleType="centerInside" android:scaleType="centerInside"
tools:src="@drawable/ic_skip_next_round_white_32dp" tools:src="@drawable/ic_skip_next"
tools:tint="?colorOnPrimary" /> tools:tint="?colorOnPrimary" />
<ImageButton <ImageButton

4
app/src/main/res/layout/fragment_circle_player.xml
View file

@ -134,7 +134,7 @@
app:layout_constraintBottom_toBottomOf="@+id/playPauseButton" app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
app:layout_constraintStart_toEndOf="@+id/playPauseButton" app:layout_constraintStart_toEndOf="@+id/playPauseButton"
app:layout_constraintTop_toTopOf="@+id/playPauseButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton"
app:srcCompat="@drawable/ic_skip_next_round_white_32dp" app:srcCompat="@drawable/ic_skip_next"
tools:tint="@color/md_white_1000" /> tools:tint="@color/md_white_1000" />
<ImageButton <ImageButton
@ -148,7 +148,7 @@
app:layout_constraintBottom_toBottomOf="@+id/playPauseButton" app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
app:layout_constraintEnd_toStartOf="@+id/playPauseButton" app:layout_constraintEnd_toStartOf="@+id/playPauseButton"
app:layout_constraintTop_toTopOf="@+id/playPauseButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton"
app:srcCompat="@drawable/ic_skip_previous_round_white_32dp" app:srcCompat="@drawable/ic_skip_previous"
tools:tint="@color/md_white_1000" /> tools:tint="@color/md_white_1000" />
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView

4
app/src/main/res/layout/layout_notification_collapsed.xml
View file

@ -107,7 +107,7 @@
android:layout_height="38dp" android:layout_height="38dp"
android:background="@drawable/notification_selector" android:background="@drawable/notification_selector"
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="@drawable/ic_skip_previous_round_white_32dp" android:src="@drawable/ic_skip_previous"
tools:tint="?colorOnPrimary" /> tools:tint="?colorOnPrimary" />
<ImageButton <ImageButton
@ -125,7 +125,7 @@
android:layout_height="38dp" android:layout_height="38dp"
android:background="@drawable/notification_selector" android:background="@drawable/notification_selector"
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="@drawable/ic_skip_next_round_white_32dp" android:src="@drawable/ic_skip_next"
tools:tint="?colorOnPrimary" /> tools:tint="?colorOnPrimary" />
<ImageButton <ImageButton

4
app/src/main/res/layout/layout_notification_expanded.xml
View file

@ -98,7 +98,7 @@
android:layout_height="42dp" android:layout_height="42dp"
android:background="@drawable/notification_selector" android:background="@drawable/notification_selector"
android:scaleType="centerInside" android:scaleType="centerInside"
tools:src="@drawable/ic_skip_previous_round_white_32dp" tools:src="@drawable/ic_skip_previous"
tools:tint="?colorOnPrimary" /> tools:tint="?colorOnPrimary" />
<ImageButton <ImageButton
@ -116,7 +116,7 @@
android:layout_height="42dp" android:layout_height="42dp"
android:background="@drawable/notification_selector" android:background="@drawable/notification_selector"
android:scaleType="centerInside" android:scaleType="centerInside"
tools:src="@drawable/ic_skip_next_round_white_32dp" tools:src="@drawable/ic_skip_next"
tools:tint="?colorOnPrimary" /> tools:tint="?colorOnPrimary" />
<ImageButton <ImageButton