Skip to content

Commit 59af0fe

Browse files
StypoxStypox
committed
Improve icons for background/popup/play from here
TODO: remove the commented out alternatives
1 parent a898d75 commit 59af0fe

File tree

3 files changed

+291
-50
lines changed

3 files changed

+291
-50
lines changed

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

Lines changed: 103 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,114 @@ import androidx.compose.ui.graphics.vector.ImageVector
1313
import androidx.compose.ui.tooling.preview.Preview
1414
import androidx.compose.ui.unit.dp
1515

16+
/*
17+
materialPath {
18+
moveTo(12.0f, 4.0f)
19+
lineToRelative(-1.41f, 1.41f)
20+
lineToRelative(5.59f, 5.59f)
21+
horizontalLineToRelative(-12.17f)
22+
verticalLineToRelative(2.0f)
23+
horizontalLineToRelative(12.17f)
24+
lineToRelative(-5.59f, 5.59f)
25+
lineToRelative(1.41f, 1.41f)
26+
lineToRelative(8.0f, -8.0f)
27+
close()
28+
}
29+
*/
30+
1631
/**
17-
* Obtained by combining Filled.Headset and Filled.PlaylistPlay
32+
* Obtained by combining [androidx.compose.material.icons.filled.Headset]
33+
* and the tiny arrow in [androidx.compose.material.icons.filled.ContentPasteGo].
1834
*/
1935
val Icons.Filled.BackgroundFromHere: ImageVector by lazy {
20-
materialIcon(name = "Filled.HeadsetPlus") {
36+
materialIcon(name = "Filled.BackgroundFromHere") {
2137
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)
38+
moveTo(12.0f, 1.0f)
39+
curveToRelative(-4.97f, 0.0f, -9.0f, 4.03f, -9.0f, 9.0f)
40+
verticalLineToRelative(7.0f)
41+
curveToRelative(0.0f, 1.66f, 1.34f, 3.0f, 3.0f, 3.0f)
42+
horizontalLineToRelative(3.0f)
43+
verticalLineToRelative(-8.0f)
44+
horizontalLineTo(5.0f)
45+
verticalLineToRelative(-2.0f)
46+
curveToRelative(0.0f, -3.87f, 3.13f, -7.0f, 7.0f, -7.0f)
47+
reflectiveCurveToRelative(7.0f, 3.13f, 7.0f, 7.0f)
48+
horizontalLineToRelative(2.0f)
49+
curveToRelative(0.0f, -4.97f, -4.03f, -9.0f, -9.0f, -9.0f)
3950
close()
4051
}
4152
materialPath {
42-
moveTo(15.817f, 16.202f)
53+
moveTo(19f, 11.5f)
54+
lineToRelative(-1.42f, 1.41f)
55+
lineToRelative(1.58f, 1.58f)
56+
lineToRelative(-6.17f, 0.0f)
57+
lineToRelative(0.0f, 2.0f)
58+
lineToRelative(6.17f, 0.0f)
59+
lineToRelative(-1.58f, 1.59f)
60+
lineToRelative(1.42f, 1.41f)
61+
lineToRelative(3.99f, -4.0f)
62+
close()
63+
}
64+
/*materialPath {
65+
moveTo(18.6f, 11.00f)
66+
lineToRelative(-1.064f, 1.064f)
67+
lineToRelative(2.586f, 2.586f)
68+
horizontalLineToRelative(-5.622f)
69+
verticalLineToRelative(-2.086f)
70+
horizontalLineToRelative(-1.5f)
71+
verticalLineToRelative(5.672f)
72+
horizontalLineToRelative(1.5f)
73+
verticalLineToRelative(-2.086f)
74+
horizontalLineToRelative(5.622f)
75+
lineToRelative(-2.586f, 2.586f)
76+
lineToRelative(1.064f, 1.064f)
77+
lineToRelative(4.400f, -4.400f)
78+
close()
79+
}*/
80+
/*materialPath {
81+
moveTo(18.6f, 11.00f)
82+
lineToRelative(-1.064f, 1.064f)
83+
lineToRelative(3.336f, 3.336f)
84+
lineToRelative(-3.336f, 3.336f)
85+
lineToRelative(1.064f, 1.064f)
86+
lineToRelative(4.400f, -4.400f)
87+
close()
88+
}
89+
materialPath {
90+
moveTo(14f, 11.00f)
91+
lineToRelative(-1.064f, 1.064f)
92+
lineToRelative(3.336f, 3.336f)
93+
lineToRelative(-3.336f, 3.336f)
94+
lineToRelative(1.064f, 1.064f)
95+
lineToRelative(4.400f, -4.400f)
96+
close()
97+
}*/
98+
/*materialPath {
99+
moveTo(18.6f, 11.00f)
100+
lineToRelative(-1.064f, 1.064f)
101+
lineToRelative(2.586f, 2.586f)
102+
horizontalLineToRelative(-7.122f)
103+
verticalLineToRelative(1.500f)
104+
horizontalLineToRelative(7.122f)
105+
lineToRelative(-2.586f, 2.586f)
106+
lineToRelative(1.064f, 1.064f)
107+
lineToRelative(4.400f, -4.400f)
108+
close()
109+
}*/
110+
/*materialPath {
111+
moveTo(17.200f, 11.200f)
112+
lineToRelative(-0.775f, 0.775f)
113+
lineToRelative(3.075f, 3.075f)
114+
horizontalLineToRelative(-6.694f)
115+
verticalLineToRelative(1.100f)
116+
horizontalLineToRelative(6.694f)
117+
lineToRelative(-3.075f, 3.075f)
118+
lineToRelative(0.775f, 0.775f)
119+
lineToRelative(4.400f, -4.400f)
120+
close()
121+
}*/
122+
/*materialPath {
123+
moveTo(12.817f, 12.202f)
43124
lineToRelative(-0.916f, 0.916f)
44125
lineToRelative(2.977f, 2.983f)
45126
lineToRelative(-2.977f, 2.983f)
@@ -48,14 +129,14 @@ val Icons.Filled.BackgroundFromHere: ImageVector by lazy {
48129
close()
49130
}
50131
materialPath {
51-
moveTo(20.100f, 16.202f)
132+
moveTo(17.100f, 12.202f)
52133
lineToRelative(-0.916f, 0.916f)
53134
lineToRelative(2.977f, 2.983f)
54135
lineToRelative(-2.977f, 2.983f)
55136
lineToRelative(0.916f, 0.916f)
56137
lineToRelative(3.900f, -3.900f)
57138
close()
58-
}
139+
}*/
59140
}
60141
}
61142

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

Lines changed: 77 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,88 @@ import androidx.compose.ui.tooling.preview.Preview
1414
import androidx.compose.ui.unit.dp
1515

1616
/**
17-
* Obtained by combining Filled.PlayArrow and Filled.PlaylistPlay
17+
* Obtained by combining [androidx.compose.material.icons.filled.PlayArrow]
18+
* and the tiny arrow in [androidx.compose.material.icons.filled.ContentPasteGo].
1819
*/
1920
val Icons.Filled.PlayFromHere: ImageVector by lazy {
20-
materialIcon(name = "Filled.HeadsetPlus") {
21+
materialIcon(name = "Filled.PlayFromHere") {
2122
materialPath {
22-
moveTo(5.000f, 3.000f)
23-
verticalLineToRelative(11.200f)
24-
lineToRelative(8.800f, -5.600f)
23+
moveTo(2.5f, 2.5f)
24+
verticalLineToRelative(14.0f)
25+
lineToRelative(11.0f, -7.0f)
2526
close()
2627
}
2728
materialPath {
29+
moveTo(19f, 11.5f)
30+
lineToRelative(-1.42f, 1.41f)
31+
lineToRelative(1.58f, 1.58f)
32+
lineToRelative(-6.17f, 0.0f)
33+
lineToRelative(0.0f, 2.0f)
34+
lineToRelative(6.17f, 0.0f)
35+
lineToRelative(-1.58f, 1.59f)
36+
lineToRelative(1.42f, 1.41f)
37+
lineToRelative(3.99f, -4.0f)
38+
close()
39+
}
40+
/*materialPath {
41+
moveTo(18.6f, 11.00f)
42+
lineToRelative(-1.064f, 1.064f)
43+
lineToRelative(2.586f, 2.586f)
44+
horizontalLineToRelative(-5.622f)
45+
verticalLineToRelative(-2.086f)
46+
horizontalLineToRelative(-1.5f)
47+
verticalLineToRelative(5.672f)
48+
horizontalLineToRelative(1.5f)
49+
verticalLineToRelative(-2.086f)
50+
horizontalLineToRelative(5.622f)
51+
lineToRelative(-2.586f, 2.586f)
52+
lineToRelative(1.064f, 1.064f)
53+
lineToRelative(4.400f, -4.400f)
54+
close()
55+
}*/
56+
/*materialPath {
57+
moveTo(18.6f, 11.00f)
58+
lineToRelative(-1.064f, 1.064f)
59+
lineToRelative(3.336f, 3.336f)
60+
lineToRelative(-3.336f, 3.336f)
61+
lineToRelative(1.064f, 1.064f)
62+
lineToRelative(4.400f, -4.400f)
63+
close()
64+
}
65+
materialPath {
66+
moveTo(14f, 11.00f)
67+
lineToRelative(-1.064f, 1.064f)
68+
lineToRelative(3.336f, 3.336f)
69+
lineToRelative(-3.336f, 3.336f)
70+
lineToRelative(1.064f, 1.064f)
71+
lineToRelative(4.400f, -4.400f)
72+
close()
73+
}*/
74+
/*materialPath {
75+
moveTo(18.6f, 11.00f)
76+
lineToRelative(-1.064f, 1.064f)
77+
lineToRelative(2.586f, 2.586f)
78+
horizontalLineToRelative(-7.122f)
79+
verticalLineToRelative(1.500f)
80+
horizontalLineToRelative(7.122f)
81+
lineToRelative(-2.586f, 2.586f)
82+
lineToRelative(1.064f, 1.064f)
83+
lineToRelative(4.400f, -4.400f)
84+
close()
85+
}*/
86+
/*materialPath {
87+
moveTo(17.200f, 11.200f)
88+
lineToRelative(-0.775f, 0.775f)
89+
lineToRelative(3.075f, 3.075f)
90+
horizontalLineToRelative(-6.694f)
91+
verticalLineToRelative(1.100f)
92+
horizontalLineToRelative(6.694f)
93+
lineToRelative(-3.075f, 3.075f)
94+
lineToRelative(0.775f, 0.775f)
95+
lineToRelative(4.400f, -4.400f)
96+
close()
97+
}*/
98+
/*materialPath {
2899
moveTo(15.817f, 16.202f)
29100
lineToRelative(-0.916f, 0.916f)
30101
lineToRelative(2.977f, 2.983f)
@@ -41,7 +112,7 @@ val Icons.Filled.PlayFromHere: ImageVector by lazy {
41112
lineToRelative(0.916f, 0.916f)
42113
lineToRelative(3.900f, -3.900f)
43114
close()
44-
}
115+
}*/
45116
}
46117
}
47118

0 commit comments

Comments
 (0)