Skip to content

Commit 80ba1bc

Browse files
committed
library: Add three new icon
1 parent af6383c commit 80ba1bc

File tree

11 files changed

+159
-325
lines changed

11 files changed

+159
-325
lines changed

composeApp/src/commonMain/kotlin/component/OtherComponent.kt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import androidx.compose.runtime.setValue
2727
import androidx.compose.ui.Alignment
2828
import androidx.compose.ui.Modifier
2929
import androidx.compose.ui.draw.clip
30+
import androidx.compose.ui.graphics.Color
3031
import androidx.compose.ui.platform.LocalFocusManager
3132
import androidx.compose.ui.text.font.FontWeight
3233
import androidx.compose.ui.text.input.ImeAction
@@ -57,11 +58,10 @@ import top.yukonga.miuix.kmp.icon.icons.useful.Confirm
5758
import top.yukonga.miuix.kmp.icon.icons.useful.Copy
5859
import top.yukonga.miuix.kmp.icon.icons.useful.Cut
5960
import top.yukonga.miuix.kmp.icon.icons.useful.Delete
60-
import top.yukonga.miuix.kmp.icon.icons.useful.DeselectAll
6161
import top.yukonga.miuix.kmp.icon.icons.useful.Edit
62-
import top.yukonga.miuix.kmp.icon.icons.useful.ImmersionDelete
6362
import top.yukonga.miuix.kmp.icon.icons.useful.ImmersionMore
6463
import top.yukonga.miuix.kmp.icon.icons.useful.Info
64+
import top.yukonga.miuix.kmp.icon.icons.useful.Like
6565
import top.yukonga.miuix.kmp.icon.icons.useful.More
6666
import top.yukonga.miuix.kmp.icon.icons.useful.Move
6767
import top.yukonga.miuix.kmp.icon.icons.useful.NavigatorSwitch
@@ -74,6 +74,7 @@ import top.yukonga.miuix.kmp.icon.icons.useful.Play
7474
import top.yukonga.miuix.kmp.icon.icons.useful.Reboot
7575
import top.yukonga.miuix.kmp.icon.icons.useful.Redo
7676
import top.yukonga.miuix.kmp.icon.icons.useful.Refresh
77+
import top.yukonga.miuix.kmp.icon.icons.useful.Remove
7778
import top.yukonga.miuix.kmp.icon.icons.useful.RemoveBlocklist
7879
import top.yukonga.miuix.kmp.icon.icons.useful.RemoveSecret
7980
import top.yukonga.miuix.kmp.icon.icons.useful.Rename
@@ -82,11 +83,11 @@ import top.yukonga.miuix.kmp.icon.icons.useful.Save
8283
import top.yukonga.miuix.kmp.icon.icons.useful.Scan
8384
import top.yukonga.miuix.kmp.icon.icons.useful.Search
8485
import top.yukonga.miuix.kmp.icon.icons.useful.SelectAll
85-
import top.yukonga.miuix.kmp.icon.icons.useful.Send
8686
import top.yukonga.miuix.kmp.icon.icons.useful.Settings
8787
import top.yukonga.miuix.kmp.icon.icons.useful.Share
8888
import top.yukonga.miuix.kmp.icon.icons.useful.Stick
8989
import top.yukonga.miuix.kmp.icon.icons.useful.Undo
90+
import top.yukonga.miuix.kmp.icon.icons.useful.Unlike
9091
import top.yukonga.miuix.kmp.icon.icons.useful.Unstick
9192
import top.yukonga.miuix.kmp.icon.icons.useful.Update
9293
import top.yukonga.miuix.kmp.theme.MiuixTheme
@@ -127,11 +128,10 @@ fun OtherComponent(padding: PaddingValues) {
127128
MiuixIcons.Useful.Copy,
128129
MiuixIcons.Useful.Cut,
129130
MiuixIcons.Useful.Delete,
130-
MiuixIcons.Useful.DeselectAll,
131131
MiuixIcons.Useful.Edit,
132-
MiuixIcons.Useful.ImmersionDelete,
133132
MiuixIcons.Useful.ImmersionMore,
134133
MiuixIcons.Useful.Info,
134+
MiuixIcons.Useful.Like,
135135
MiuixIcons.Useful.More,
136136
MiuixIcons.Useful.Move,
137137
MiuixIcons.Useful.NavigatorSwitch,
@@ -144,6 +144,7 @@ fun OtherComponent(padding: PaddingValues) {
144144
MiuixIcons.Useful.Reboot,
145145
MiuixIcons.Useful.Redo,
146146
MiuixIcons.Useful.Refresh,
147+
MiuixIcons.Useful.Remove,
147148
MiuixIcons.Useful.RemoveBlocklist,
148149
MiuixIcons.Useful.RemoveSecret,
149150
MiuixIcons.Useful.Rename,
@@ -152,11 +153,11 @@ fun OtherComponent(padding: PaddingValues) {
152153
MiuixIcons.Useful.Scan,
153154
MiuixIcons.Useful.Search,
154155
MiuixIcons.Useful.SelectAll,
155-
MiuixIcons.Useful.Send,
156156
MiuixIcons.Useful.Settings,
157157
MiuixIcons.Useful.Share,
158158
MiuixIcons.Useful.Stick,
159159
MiuixIcons.Useful.Undo,
160+
MiuixIcons.Useful.Unlike,
160161
MiuixIcons.Useful.Unstick,
161162
MiuixIcons.Useful.Update
162163
)
@@ -356,6 +357,7 @@ fun OtherComponent(padding: PaddingValues) {
356357
Icon(
357358
imageVector = icon,
358359
contentDescription = null,
360+
tint = if (icon != MiuixIcons.Useful.Like) MiuixTheme.colorScheme.onBackground else Color.Unspecified,
359361
modifier = Modifier.size(24.dp)
360362
)
361363
}

miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/Divider.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import top.yukonga.miuix.kmp.theme.MiuixTheme
2525
fun HorizontalDivider(
2626
modifier: Modifier = Modifier,
2727
thickness: Dp = DividerDefaults.Thickness,
28-
color: Color = DividerDefaults.Color
28+
color: Color = DividerDefaults.DividerColor
2929
) =
3030
Canvas(modifier.fillMaxWidth().height(thickness)) {
3131
drawLine(
@@ -48,7 +48,7 @@ fun HorizontalDivider(
4848
fun VerticalDivider(
4949
modifier: Modifier = Modifier,
5050
thickness: Dp = DividerDefaults.Thickness,
51-
color: Color = DividerDefaults.Color
51+
color: Color = DividerDefaults.DividerColor
5252
) =
5353
Canvas(modifier.fillMaxHeight().width(thickness)) {
5454
drawLine(
@@ -69,6 +69,6 @@ object DividerDefaults {
6969
/**
7070
* Default color of the divider line.
7171
*/
72-
val Color @Composable get() = MiuixTheme.colorScheme.dividerLine
72+
val DividerColor @Composable get() = MiuixTheme.colorScheme.dividerLine
7373

7474
}

miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/Icon.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import androidx.compose.ui.semantics.role
2222
import androidx.compose.ui.semantics.semantics
2323
import androidx.compose.ui.unit.dp
2424
import org.jetbrains.compose.resources.stringResource
25-
import top.yukonga.miuix.kmp.theme.MiuixTheme
2625

2726
/**
2827
* A [Icon] component that draws [imageVector] using [tint], with a default value.
@@ -137,5 +136,5 @@ object IconDefaults {
137136
* The default tint of the [Icon].
138137
*/
139138
@Composable
140-
fun DefaultTint() = MiuixTheme.colorScheme.onBackground
139+
fun DefaultTint() = Color.Unspecified
141140
}

miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/icon/icons/useful/AddSecret.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ import androidx.compose.ui.graphics.vector.path
88
import androidx.compose.ui.unit.dp
99
import top.yukonga.miuix.kmp.icon.MiuixIcons
1010

11-
/**
12-
* AddSecret icon with Miuix style.
13-
*/
1411
val MiuixIcons.Useful.AddSecret: ImageVector
1512
get() {
1613
if (_addSecret != null) return _addSecret!!

miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/icon/icons/useful/Back.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ import androidx.compose.ui.graphics.vector.path
88
import androidx.compose.ui.unit.dp
99
import top.yukonga.miuix.kmp.icon.MiuixIcons
1010

11-
/**
12-
* Back icon with Miuix style.
13-
*/
1411
val MiuixIcons.Useful.Back: ImageVector
1512
get() {
1613
if (_back != null) return _back!!

miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/icon/icons/useful/DeselectAll.kt

Lines changed: 0 additions & 105 deletions
This file was deleted.

miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/icon/icons/useful/ImmersionDelete.kt

Lines changed: 0 additions & 98 deletions
This file was deleted.
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
package top.yukonga.miuix.kmp.icon.icons.useful
2+
3+
import androidx.compose.ui.graphics.Color
4+
import androidx.compose.ui.graphics.PathFillType
5+
import androidx.compose.ui.graphics.SolidColor
6+
import androidx.compose.ui.graphics.vector.ImageVector
7+
import androidx.compose.ui.graphics.vector.path
8+
import androidx.compose.ui.unit.dp
9+
import top.yukonga.miuix.kmp.icon.MiuixIcons
10+
11+
val MiuixIcons.Useful.Like: ImageVector
12+
get() {
13+
if (_like != null) return _like!!
14+
_like = ImageVector.Builder("Like", 26.0.dp, 26.0.dp, 26.0f, 26.0f).apply {
15+
path(
16+
fill = SolidColor(Color(0xFFFA311B)),
17+
pathFillType = PathFillType.EvenOdd
18+
) {
19+
moveTo(21.9482f, 13.9362f)
20+
lineTo(13.4026f, 22.7729f)
21+
curveTo(13.1825f, 23.0005f, 12.8176f, 23.0005f, 12.5975f, 22.7729f)
22+
lineTo(4.0533f, 13.9376f)
23+
curveTo(4.0096f, 13.8937f, 3.9666f, 13.8492f, 3.9243f, 13.8041f)
24+
lineTo(3.9047f, 13.7839f)
25+
curveTo(2.8702f, 12.6721f, 2.2382f, 11.1816f, 2.2382f, 9.5433f)
26+
curveTo(2.2382f, 6.1045f, 5.0259f, 3.3167f, 8.4647f, 3.3167f)
27+
curveTo(10.2526f, 3.3167f, 11.8644f, 4.0703f, 13.0001f, 5.277f)
28+
curveTo(14.1357f, 4.0703f, 15.7475f, 3.3167f, 17.5354f, 3.3167f)
29+
curveTo(20.9742f, 3.3167f, 23.762f, 6.1045f, 23.762f, 9.5433f)
30+
curveTo(23.762f, 11.1816f, 23.1292f, 12.6721f, 22.0948f, 13.7839f)
31+
lineTo(22.0745f, 13.8056f)
32+
curveTo(22.033f, 13.8497f, 21.9909f, 13.8932f, 21.9482f, 13.9362f)
33+
close()
34+
}
35+
}.build()
36+
return _like!!
37+
}
38+
private var _like: ImageVector? = null

0 commit comments

Comments
 (0)