Skip to content

Commit f618b76

Browse files
committed
Rearranging icons on the editor
1 parent 2bdb8dc commit f618b76

File tree

2 files changed

+91
-79
lines changed

2 files changed

+91
-79
lines changed

sample/common/src/commonMain/kotlin/com/kjcommunities/KJDemoPanel.kt

Lines changed: 20 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -96,35 +96,6 @@ fun KJDemoPanel(
9696
}
9797
*/
9898

99-
item {
100-
KJDemoPanelButton(
101-
onClick = {
102-
state.toggleH1()
103-
},
104-
isSelected = state.isH1,
105-
icon = Icons.Outlined.H1
106-
)
107-
}
108-
109-
item {
110-
KJDemoPanelButton(
111-
onClick = {
112-
state.toggleH2()
113-
},
114-
isSelected = state.isH2,
115-
icon = Icons.Outlined.H2
116-
)
117-
}
118-
119-
item {
120-
Box(
121-
Modifier
122-
.height(24.dp)
123-
.width(1.dp)
124-
.background(Color(0xFF393B3D))
125-
)
126-
}
127-
12899
item {
129100
KJDemoPanelButton(
130101
onClick = {
@@ -311,6 +282,26 @@ fun KJDemoPanel(
311282
)
312283
}
313284

285+
item {
286+
KJDemoPanelButton(
287+
onClick = {
288+
state.toggleH1()
289+
},
290+
isSelected = state.isH1,
291+
icon = Icons.Outlined.H1
292+
)
293+
}
294+
295+
item {
296+
KJDemoPanelButton(
297+
onClick = {
298+
state.toggleH2()
299+
},
300+
isSelected = state.isH2,
301+
icon = Icons.Outlined.H2
302+
)
303+
}
304+
314305
// Code span button removed - not supported in Lexical format
315306
/*
316307
item {

sample/common/src/commonMain/kotlin/com/kjcommunities/icons/CustomIcons.kt

Lines changed: 71 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -16,38 +16,45 @@ val Icons.Outlined.H1: ImageVector
1616
_h1 = materialIcon(name = "Outlined.H1") {
1717
materialPath {
1818
// Draw "H" - left vertical line
19-
moveTo(4f, 4f)
20-
lineTo(6f, 4f)
21-
lineTo(6f, 20f)
22-
lineTo(4f, 20f)
19+
moveTo(3f, 4f)
20+
lineTo(5f, 4f)
21+
lineTo(5f, 20f)
22+
lineTo(3f, 20f)
2323
close()
2424

25-
// Draw "H" - horizontal line
26-
moveTo(4f, 11f)
27-
lineTo(12f, 11f)
28-
lineTo(12f, 13f)
29-
lineTo(4f, 13f)
25+
// Draw "H" - horizontal crossbar
26+
moveTo(3f, 11f)
27+
lineTo(9f, 11f)
28+
lineTo(9f, 13f)
29+
lineTo(3f, 13f)
3030
close()
3131

3232
// Draw "H" - right vertical line
33-
moveTo(10f, 4f)
34-
lineTo(12f, 4f)
35-
lineTo(12f, 20f)
36-
lineTo(10f, 20f)
33+
moveTo(7f, 4f)
34+
lineTo(9f, 4f)
35+
lineTo(9f, 20f)
36+
lineTo(7f, 20f)
3737
close()
3838

39-
// Draw "1"
40-
moveTo(16f, 6f)
41-
lineTo(18f, 4f)
42-
lineTo(20f, 4f)
43-
lineTo(20f, 6f)
44-
lineTo(18f, 6f)
45-
lineTo(18f, 18f)
46-
lineTo(20f, 18f)
47-
lineTo(20f, 20f)
48-
lineTo(16f, 20f)
49-
lineTo(16f, 18f)
39+
// Draw "1" - simple vertical line
40+
moveTo(14f, 6f)
5041
lineTo(16f, 6f)
42+
lineTo(16f, 18f)
43+
lineTo(14f, 18f)
44+
close()
45+
46+
// Draw "1" - top left diagonal
47+
moveTo(12f, 8f)
48+
lineTo(14f, 6f)
49+
lineTo(15f, 7f)
50+
lineTo(13f, 9f)
51+
close()
52+
53+
// Draw "1" - bottom base
54+
moveTo(12f, 18f)
55+
lineTo(18f, 18f)
56+
lineTo(18f, 20f)
57+
lineTo(12f, 20f)
5158
close()
5259
}
5360
}
@@ -67,45 +74,59 @@ val Icons.Outlined.H2: ImageVector
6774
_h2 = materialIcon(name = "Outlined.H2") {
6875
materialPath {
6976
// Draw "H" - left vertical line
70-
moveTo(4f, 4f)
71-
lineTo(6f, 4f)
72-
lineTo(6f, 20f)
73-
lineTo(4f, 20f)
77+
moveTo(3f, 4f)
78+
lineTo(5f, 4f)
79+
lineTo(5f, 20f)
80+
lineTo(3f, 20f)
7481
close()
7582

76-
// Draw "H" - horizontal line
77-
moveTo(4f, 11f)
78-
lineTo(12f, 11f)
79-
lineTo(12f, 13f)
80-
lineTo(4f, 13f)
83+
// Draw "H" - horizontal crossbar
84+
moveTo(3f, 11f)
85+
lineTo(9f, 11f)
86+
lineTo(9f, 13f)
87+
lineTo(3f, 13f)
8188
close()
8289

8390
// Draw "H" - right vertical line
84-
moveTo(10f, 4f)
85-
lineTo(12f, 4f)
86-
lineTo(12f, 20f)
87-
lineTo(10f, 20f)
91+
moveTo(7f, 4f)
92+
lineTo(9f, 4f)
93+
lineTo(9f, 20f)
94+
lineTo(7f, 20f)
8895
close()
8996

9097
// Draw "2" - top horizontal line
91-
moveTo(16f, 4f)
92-
lineTo(20f, 4f)
93-
lineTo(20f, 6f)
98+
moveTo(12f, 6f)
9499
lineTo(18f, 6f)
95-
lineTo(18f, 10f)
96-
lineTo(20f, 10f)
97-
lineTo(20f, 12f)
100+
lineTo(18f, 8f)
101+
lineTo(12f, 8f)
102+
close()
103+
104+
// Draw "2" - right vertical part
105+
moveTo(16f, 8f)
106+
lineTo(18f, 8f)
107+
lineTo(18f, 12f)
98108
lineTo(16f, 12f)
99-
lineTo(16f, 10f)
100-
lineTo(16f, 6f)
101-
lineTo(16f, 4f)
109+
close()
110+
111+
// Draw "2" - middle horizontal line
112+
moveTo(12f, 12f)
113+
lineTo(18f, 12f)
114+
lineTo(18f, 14f)
115+
lineTo(12f, 14f)
116+
close()
117+
118+
// Draw "2" - left vertical part
119+
moveTo(12f, 14f)
120+
lineTo(14f, 14f)
121+
lineTo(14f, 18f)
122+
lineTo(12f, 18f)
102123
close()
103124

104125
// Draw "2" - bottom horizontal line
105-
moveTo(16f, 18f)
106-
lineTo(20f, 18f)
107-
lineTo(20f, 20f)
108-
lineTo(16f, 20f)
126+
moveTo(12f, 18f)
127+
lineTo(18f, 18f)
128+
lineTo(18f, 20f)
129+
lineTo(12f, 20f)
109130
close()
110131
}
111132
}

0 commit comments

Comments
 (0)