Skip to content

Commit c73d178

Browse files
StypoxStypox
committed
Add icons for play/background/popup from here
1 parent 94a3035 commit c73d178

5 files changed

Lines changed: 209 additions & 0 deletions

File tree

‎app/src/main/java/org/schabi/newpipe/ui/components/menu/LongPressAction.kt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ import org.schabi.newpipe.player.playqueue.ChannelTabPlayQueue
4141
import org.schabi.newpipe.player.playqueue.PlayQueue
4242
import org.schabi.newpipe.player.playqueue.PlaylistPlayQueue
4343
import org.schabi.newpipe.player.playqueue.SinglePlayQueue
44+
import org.schabi.newpipe.ui.components.menu.icons.BackgroundFromHere
45+
import org.schabi.newpipe.ui.components.menu.icons.PlayFromHere
46+
import org.schabi.newpipe.ui.components.menu.icons.PopupFromHere
4447
import org.schabi.newpipe.util.NavigationHelper
4548
import org.schabi.newpipe.util.SparseItemUtil
4649
import org.schabi.newpipe.util.external_communication.ShareUtils
@@ -57,8 +60,11 @@ data class LongPressAction(
5760
Enqueue(R.string.enqueue, Icons.Default.AddToQueue),
5861
EnqueueNext(R.string.enqueue_next_stream, Icons.Default.QueuePlayNext),
5962
Background(R.string.controls_background_title, Icons.Default.Headset),
63+
BackgroundFromHere(R.string.background_from_here, Icons.Default.BackgroundFromHere),
6064
Popup(R.string.controls_popup_title, Icons.Default.PictureInPicture),
65+
PopupFromHere(R.string.popup_from_here, Icons.Default.PopupFromHere),
6166
Play(R.string.play, Icons.Default.PlayArrow),
67+
PlayFromHere(R.string.play_from_here, Icons.Default.PlayFromHere),
6268
PlayWithKodi(R.string.play_with_kodi_title, Icons.Default.Cast),
6369
Download(R.string.download, Icons.Default.Download),
6470
AddToPlaylist(R.string.add_to_playlist, Icons.AutoMirrored.Default.PlaylistAdd),

‎app/src/main/java/org/schabi/newpipe/ui/components/menu/icons/BackgroundFromHere.kt‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
@file:Suppress("UnusedReceiverParameter")
2+
3+
package org.schabi.newpipe.ui.components.menu.icons
4+
5+
import androidx.compose.foundation.layout.size
6+
import androidx.compose.material.icons.Icons
7+
import androidx.compose.material.icons.materialIcon
8+
import androidx.compose.material.icons.materialPath
9+
import androidx.compose.material3.Icon
10+
import androidx.compose.runtime.Composable
11+
import androidx.compose.ui.Modifier
12+
import androidx.compose.ui.graphics.vector.ImageVector
13+
import androidx.compose.ui.tooling.preview.Preview
14+
import androidx.compose.ui.unit.dp
15+
16+
/**
17+
* Obtained by combining Filled.Headset and Filled.PlaylistPlay
18+
*/
19+
val Icons.Filled.BackgroundFromHere: ImageVector by lazy {
20+
materialIcon(name = "Filled.HeadsetPlus") {
21+
materialPath {
22+
moveTo(7.200f, 0.000f)
23+
curveToRelative(-3.976f, 0.000f, -7.200f, 3.224f, -7.200f, 7.200f)
24+
verticalLineToRelative(5.600f)
25+
curveToRelative(0.000f, 1.328f, 1.072f, 2.400f, 2.400f, 2.400f)
26+
horizontalLineToRelative(2.400f)
27+
verticalLineToRelative(-6.400f)
28+
horizontalLineTo(1.600f)
29+
verticalLineToRelative(-1.600f)
30+
curveToRelative(0.000f, -3.096f, 2.504f, -5.600f, 5.600f, -5.600f)
31+
reflectiveCurveToRelative(5.600f, 2.504f, 5.600f, 5.600f)
32+
verticalLineToRelative(1.600f)
33+
horizontalLineToRelative(-3.200f)
34+
verticalLineToRelative(6.400f)
35+
horizontalLineToRelative(2.400f)
36+
curveToRelative(1.328f, 0.000f, 2.400f, -1.072f, 2.400f, -2.400f)
37+
verticalLineToRelative(-5.600f)
38+
curveToRelative(0.000f, -3.976f, -3.224f, -7.200f, -7.200f, -7.200f)
39+
close()
40+
}
41+
materialPath {
42+
moveTo(15.817f, 16.202f)
43+
lineToRelative(-0.916f, 0.916f)
44+
lineToRelative(2.977f, 2.983f)
45+
lineToRelative(-2.977f, 2.983f)
46+
lineToRelative(0.916f, 0.916f)
47+
lineToRelative(3.900f, -3.900f)
48+
close()
49+
}
50+
materialPath {
51+
moveTo(20.100f, 16.202f)
52+
lineToRelative(-0.916f, 0.916f)
53+
lineToRelative(2.977f, 2.983f)
54+
lineToRelative(-2.977f, 2.983f)
55+
lineToRelative(0.916f, 0.916f)
56+
lineToRelative(3.900f, -3.900f)
57+
close()
58+
}
59+
}
60+
}
61+
62+
@Preview(showBackground = true, backgroundColor = 0xFFFFFFFF)
63+
@Composable
64+
private fun BackgroundFromHerePreview() {
65+
Icon(
66+
imageVector = Icons.Filled.BackgroundFromHere,
67+
contentDescription = null,
68+
modifier = Modifier.size(240.dp),
69+
)
70+
}

‎app/src/main/java/org/schabi/newpipe/ui/components/menu/icons/PlayFromHere.kt‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
@file:Suppress("UnusedReceiverParameter")
2+
3+
package org.schabi.newpipe.ui.components.menu.icons
4+
5+
import androidx.compose.foundation.layout.size
6+
import androidx.compose.material.icons.Icons
7+
import androidx.compose.material.icons.materialIcon
8+
import androidx.compose.material.icons.materialPath
9+
import androidx.compose.material3.Icon
10+
import androidx.compose.runtime.Composable
11+
import androidx.compose.ui.Modifier
12+
import androidx.compose.ui.graphics.vector.ImageVector
13+
import androidx.compose.ui.tooling.preview.Preview
14+
import androidx.compose.ui.unit.dp
15+
16+
/**
17+
* Obtained by combining Filled.PlayArrow and Filled.PlaylistPlay
18+
*/
19+
val Icons.Filled.PlayFromHere: ImageVector by lazy {
20+
materialIcon(name = "Filled.HeadsetPlus") {
21+
materialPath {
22+
moveTo(5.000f, 3.000f)
23+
verticalLineToRelative(11.200f)
24+
lineToRelative(8.800f, -5.600f)
25+
close()
26+
}
27+
materialPath {
28+
moveTo(15.817f, 16.202f)
29+
lineToRelative(-0.916f, 0.916f)
30+
lineToRelative(2.977f, 2.983f)
31+
lineToRelative(-2.977f, 2.983f)
32+
lineToRelative(0.916f, 0.916f)
33+
lineToRelative(3.900f, -3.900f)
34+
close()
35+
}
36+
materialPath {
37+
moveTo(20.100f, 16.202f)
38+
lineToRelative(-0.916f, 0.916f)
39+
lineToRelative(2.977f, 2.983f)
40+
lineToRelative(-2.977f, 2.983f)
41+
lineToRelative(0.916f, 0.916f)
42+
lineToRelative(3.900f, -3.900f)
43+
close()
44+
}
45+
}
46+
}
47+
48+
@Preview(showBackground = true, backgroundColor = 0xFFFFFFFF)
49+
@Composable
50+
private fun PlayFromHerePreview() {
51+
Icon(
52+
imageVector = Icons.Filled.PlayFromHere,
53+
contentDescription = null,
54+
modifier = Modifier.size(240.dp),
55+
)
56+
}

‎app/src/main/java/org/schabi/newpipe/ui/components/menu/icons/PopupFromHere.kt‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
@file:Suppress("UnusedReceiverParameter")
2+
3+
package org.schabi.newpipe.ui.components.menu.icons
4+
5+
import androidx.compose.foundation.layout.size
6+
import androidx.compose.material.icons.Icons
7+
import androidx.compose.material.icons.materialIcon
8+
import androidx.compose.material.icons.materialPath
9+
import androidx.compose.material3.Icon
10+
import androidx.compose.runtime.Composable
11+
import androidx.compose.ui.Modifier
12+
import androidx.compose.ui.graphics.vector.ImageVector
13+
import androidx.compose.ui.tooling.preview.Preview
14+
import androidx.compose.ui.unit.dp
15+
16+
/**
17+
* Obtained by combining Filled.PictureInPicture and Filled.PlaylistPlay
18+
*/
19+
val Icons.Filled.PopupFromHere: ImageVector by lazy {
20+
materialIcon(name = "Filled.HeadsetPlus") {
21+
materialPath {
22+
moveTo(14.320f, 3.200f)
23+
horizontalLineToRelative(-6.400f)
24+
verticalLineToRelative(4.800f)
25+
horizontalLineToRelative(6.400f)
26+
lineTo(14.320f, 3.200f)
27+
close()
28+
moveTo(15.920f, 0.000f)
29+
lineTo(1.520f, 0.000f)
30+
curveToRelative(-0.880f, 0.000f, -1.600f, 0.720f, -1.600f, 1.600f)
31+
verticalLineToRelative(11.200f)
32+
curveToRelative(0.000f, 0.880f, 0.720f, 1.584f, 1.600f, 1.584f)
33+
horizontalLineToRelative(14.400f)
34+
curveToRelative(0.880f, 0.000f, 1.600f, -0.704f, 1.600f, -1.584f)
35+
lineTo(17.520f, 1.600f)
36+
curveToRelative(0.000f, -0.880f, -0.720f, -1.600f, -1.600f, -1.600f)
37+
close()
38+
moveTo(15.920f, 12.808f)
39+
lineTo(1.520f, 12.808f)
40+
lineTo(1.520f, 1.584f)
41+
horizontalLineToRelative(14.400f)
42+
verticalLineToRelative(11.224f)
43+
close()
44+
}
45+
materialPath {
46+
moveTo(15.817f, 16.202f)
47+
lineToRelative(-0.916f, 0.916f)
48+
lineToRelative(2.977f, 2.983f)
49+
lineToRelative(-2.977f, 2.983f)
50+
lineToRelative(0.916f, 0.916f)
51+
lineToRelative(3.900f, -3.900f)
52+
close()
53+
}
54+
materialPath {
55+
moveTo(20.100f, 16.202f)
56+
lineToRelative(-0.916f, 0.916f)
57+
lineToRelative(2.977f, 2.983f)
58+
lineToRelative(-2.977f, 2.983f)
59+
lineToRelative(0.916f, 0.916f)
60+
lineToRelative(3.900f, -3.900f)
61+
close()
62+
}
63+
}
64+
}
65+
66+
@Preview(showBackground = true, backgroundColor = 0xFFFFFFFF)
67+
@Composable
68+
private fun PopupFromHerePreview() {
69+
Icon(
70+
imageVector = Icons.Filled.PopupFromHere,
71+
contentDescription = null,
72+
modifier = Modifier.size(240.dp),
73+
)
74+
}

‎app/src/main/res/values/strings.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -890,4 +890,7 @@
890890
<string name="trending_podcasts">Trending podcasts</string>
891891
<string name="trending_movies">Trending movies and shows</string>
892892
<string name="trending_music">Trending music</string>
893+
<string name="background_from_here">Background\nfrom here</string>
894+
<string name="popup_from_here">Popup\nfrom here</string>
895+
<string name="play_from_here">Play\nfrom here</string>
893896
</resources>

0 commit comments

Comments
 (0)