javara999/mihon-bookoasis
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases 3 Wiki Activity

Switch to Material Symbols and use Valkyrie for ImageVector generation (#3873)

Browse Source 
* Add material symbols icon module

Assisted-by: Claude:claude-opus-5

* Replace material icons with material symbols

Assisted-by: Claude:claude-opus-5

* Add simple icons module and migrate CustomIcons

Assisted-by: Claude:claude-opus-5
This commit is contained in:
AntsyLich
2026-08-29 21:39:55 +06:00
committed by GitHub
parent bb24e904a9
commit b695940114
224 changed files with 1449 additions and 1083 deletions
Download Patch File Download Diff File Expand all files Collapse all files
presentation-core/src/main/java/tachiyomi/presentation/core/components/CollapsibleBox.kt
+4 -4
View File
@@ -7,9 +7,6 @@ import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ExpandLess
import androidx.compose.material.icons.filled.ExpandMore
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
@@ -20,6 +17,9 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import mihon.icons.materialsymbols.MaterialSymbols
import mihon.icons.materialsymbols.rounded.ExpandLess
import mihon.icons.materialsymbols.rounded.ExpandMore
import tachiyomi.presentation.core.theme.header
@Composable
@@ -44,7 +44,7 @@ fun CollapsibleBox(
Spacer(modifier = Modifier.weight(1f))
Icon(
imageVector = if (expanded) Icons.Default.ExpandLess else Icons.Default.ExpandMore,
imageVector = if (expanded) MaterialSymbols.Rounded.ExpandLess else MaterialSymbols.Rounded.ExpandMore,
contentDescription = null,
)
}
presentation-core/src/main/java/tachiyomi/presentation/core/components/SettingsItems.kt
+11 -11
View File
@@ -15,12 +15,6 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.grid.GridCells
import androidx.compose.foundation.lazy.grid.LazyGridScope
import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowDownward
import androidx.compose.material.icons.filled.ArrowUpward
import androidx.compose.material.icons.rounded.CheckBox
import androidx.compose.material.icons.rounded.CheckBoxOutlineBlank
import androidx.compose.material.icons.rounded.DisabledByDefault
import androidx.compose.material3.Checkbox
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.ExposedDropdownMenuAnchorType
@@ -50,6 +44,12 @@ import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.tooling.preview.PreviewLightDark
import androidx.compose.ui.unit.dp
import dev.icerock.moko.resources.StringResource
import mihon.icons.materialsymbols.MaterialSymbols
import mihon.icons.materialsymbols.rounded.ArrowDownward
import mihon.icons.materialsymbols.rounded.ArrowUpward
import mihon.icons.materialsymbols.rounded.CheckBoxOutlineBlank
import mihon.icons.materialsymbols.roundedfilled.CheckBox
import mihon.icons.materialsymbols.roundedfilled.DisabledByDefault
import tachiyomi.core.common.preference.Preference
import tachiyomi.core.common.preference.TriState
import tachiyomi.core.common.preference.toggle
@@ -103,8 +103,8 @@ fun IconItem(label: String, icon: ImageVector, onClick: () -> Unit) {
@Composable
fun SortItem(label: String, sortDescending: Boolean?, onClick: () -> Unit) {
val arrowIcon = when (sortDescending) {
true -> Icons.Default.ArrowDownward
false -> Icons.Default.ArrowUpward
true -> MaterialSymbols.Rounded.ArrowDownward
false -> MaterialSymbols.Rounded.ArrowUpward
null -> null
}
@@ -361,9 +361,9 @@ fun TriStateItem(
Icon(
imageVector = when (state) {
TriState.DISABLED -> Icons.Rounded.CheckBoxOutlineBlank
TriState.ENABLED_IS -> Icons.Rounded.CheckBox
TriState.ENABLED_NOT -> Icons.Rounded.DisabledByDefault
TriState.DISABLED -> MaterialSymbols.Rounded.CheckBoxOutlineBlank
TriState.ENABLED_IS -> MaterialSymbols.RoundedFilled.CheckBox
TriState.ENABLED_NOT -> MaterialSymbols.RoundedFilled.DisabledByDefault
},
contentDescription = null,
tint = if (!enabled || state == TriState.DISABLED) {
presentation-core/src/main/java/tachiyomi/presentation/core/icons/CustomIcons.kt
-7
View File
@@ -1,7 +0,0 @@
package tachiyomi.presentation.core.icons
/**
* Icons imported from https://simpleicons.org using
* https://github.com/DevSrSouza/svg-to-compose
*/
object CustomIcons
presentation-core/src/main/java/tachiyomi/presentation/core/icons/Discord.kt
-86
View File
@@ -1,86 +0,0 @@
package tachiyomi.presentation.core.icons
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.PathFillType.Companion.NonZero
import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.graphics.StrokeCap.Companion.Butt
import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.graphics.vector.ImageVector.Builder
import androidx.compose.ui.graphics.vector.path
import androidx.compose.ui.unit.dp
@Suppress("UnusedReceiverParameter", "BooleanLiteralArgument")
val CustomIcons.Discord: ImageVector
get() {
if (_discord != null) {
return _discord!!
}
_discord = Builder(
name = "Discord",
defaultWidth = 24.0.dp,
defaultHeight = 24.0.dp,
viewportWidth = 24.0f,
viewportHeight = 24.0f,
).apply {
path(
fill = SolidColor(Color(0xFF000000)),
stroke = null,
strokeLineWidth = 0.0f,
strokeLineCap = Butt,
strokeLineJoin = Miter,
strokeLineMiter = 4.0f,
pathFillType = NonZero,
) {
moveTo(20.317f, 4.3698f)
arcToRelative(19.7913f, 19.7913f, 0.0f, false, false, -4.8851f, -1.5152f)
arcToRelative(0.0741f, 0.0741f, 0.0f, false, false, -0.0785f, 0.0371f)
curveToRelative(-0.211f, 0.3753f, -0.4447f, 0.8648f, -0.6083f, 1.2495f)
curveToRelative(-1.8447f, -0.2762f, -3.68f, -0.2762f, -5.4868f, 0.0f)
curveToRelative(-0.1636f, -0.3933f, -0.4058f, -0.8742f, -0.6177f, -1.2495f)
arcToRelative(0.077f, 0.077f, 0.0f, false, false, -0.0785f, -0.037f)
arcToRelative(19.7363f, 19.7363f, 0.0f, false, false, -4.8852f, 1.515f)
arcToRelative(0.0699f, 0.0699f, 0.0f, false, false, -0.0321f, 0.0277f)
curveTo(0.5334f, 9.0458f, -0.319f, 13.5799f, 0.0992f, 18.0578f)
arcToRelative(0.0824f, 0.0824f, 0.0f, false, false, 0.0312f, 0.0561f)
curveToRelative(2.0528f, 1.5076f, 4.0413f, 2.4228f, 5.9929f, 3.0294f)
arcToRelative(0.0777f, 0.0777f, 0.0f, false, false, 0.0842f, -0.0276f)
curveToRelative(0.4616f, -0.6304f, 0.8731f, -1.2952f, 1.226f, -1.9942f)
arcToRelative(0.076f, 0.076f, 0.0f, false, false, -0.0416f, -0.1057f)
curveToRelative(-0.6528f, -0.2476f, -1.2743f, -0.5495f, -1.8722f, -0.8923f)
arcToRelative(0.077f, 0.077f, 0.0f, false, true, -0.0076f, -0.1277f)
curveToRelative(0.1258f, -0.0943f, 0.2517f, -0.1923f, 0.3718f, -0.2914f)
arcToRelative(0.0743f, 0.0743f, 0.0f, false, true, 0.0776f, -0.0105f)
curveToRelative(3.9278f, 1.7933f, 8.18f, 1.7933f, 12.0614f, 0.0f)
arcToRelative(0.0739f, 0.0739f, 0.0f, false, true, 0.0785f, 0.0095f)
curveToRelative(0.1202f, 0.099f, 0.246f, 0.1981f, 0.3728f, 0.2924f)
arcToRelative(0.077f, 0.077f, 0.0f, false, true, -0.0066f, 0.1276f)
arcToRelative(12.2986f, 12.2986f, 0.0f, false, true, -1.873f, 0.8914f)
arcToRelative(0.0766f, 0.0766f, 0.0f, false, false, -0.0407f, 0.1067f)
curveToRelative(0.3604f, 0.698f, 0.7719f, 1.3628f, 1.225f, 1.9932f)
arcToRelative(0.076f, 0.076f, 0.0f, false, false, 0.0842f, 0.0286f)
curveToRelative(1.961f, -0.6067f, 3.9495f, -1.5219f, 6.0023f, -3.0294f)
arcToRelative(0.077f, 0.077f, 0.0f, false, false, 0.0313f, -0.0552f)
curveToRelative(0.5004f, -5.177f, -0.8382f, -9.6739f, -3.5485f, -13.6604f)
arcToRelative(0.061f, 0.061f, 0.0f, false, false, -0.0312f, -0.0286f)
close()
moveTo(8.02f, 15.3312f)
curveToRelative(-1.1825f, 0.0f, -2.1569f, -1.0857f, -2.1569f, -2.419f)
curveToRelative(0.0f, -1.3332f, 0.9555f, -2.4189f, 2.157f, -2.4189f)
curveToRelative(1.2108f, 0.0f, 2.1757f, 1.0952f, 2.1568f, 2.419f)
curveToRelative(0.0f, 1.3332f, -0.9555f, 2.4189f, -2.1569f, 2.4189f)
close()
moveTo(15.9948f, 15.3312f)
curveToRelative(-1.1825f, 0.0f, -2.1569f, -1.0857f, -2.1569f, -2.419f)
curveToRelative(0.0f, -1.3332f, 0.9554f, -2.4189f, 2.1569f, -2.4189f)
curveToRelative(1.2108f, 0.0f, 2.1757f, 1.0952f, 2.1568f, 2.419f)
curveToRelative(0.0f, 1.3332f, -0.946f, 2.4189f, -2.1568f, 2.4189f)
close()
}
}
.build()
return _discord!!
}
@Suppress("ObjectPropertyName")
private var _discord: ImageVector? = null
presentation-core/src/main/java/tachiyomi/presentation/core/icons/Facebook.kt
-68
View File
@@ -1,68 +0,0 @@
package tachiyomi.presentation.core.icons
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.PathFillType.Companion.NonZero
import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.graphics.StrokeCap.Companion.Butt
import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.graphics.vector.ImageVector.Builder
import androidx.compose.ui.graphics.vector.path
import androidx.compose.ui.unit.dp
@Suppress("UnusedReceiverParameter")
val CustomIcons.Facebook: ImageVector
get() {
if (_facebook != null) {
return _facebook!!
}
_facebook = Builder(
name = "Facebook",
defaultWidth = 24.0.dp,
defaultHeight = 24.0.dp,
viewportWidth = 24.0f,
viewportHeight = 24.0f,
).apply {
path(
fill = SolidColor(Color(0xFF000000)),
stroke = null,
strokeLineWidth = 0.0f,
strokeLineCap = Butt,
strokeLineJoin = Miter,
strokeLineMiter = 4.0f,
pathFillType = NonZero,
) {
moveTo(9.101f, 23.691f)
verticalLineToRelative(-7.98f)
horizontalLineTo(6.627f)
verticalLineToRelative(-3.667f)
horizontalLineToRelative(2.474f)
verticalLineToRelative(-1.58f)
curveToRelative(0.0f, -4.085f, 1.848f, -5.978f, 5.858f, -5.978f)
curveToRelative(0.401f, 0.0f, 0.955f, 0.042f, 1.468f, 0.103f)
arcToRelative(8.68f, 8.68f, 0.0f, false, true, 1.141f, 0.195f)
verticalLineToRelative(3.325f)
arcToRelative(8.623f, 8.623f, 0.0f, false, false, -0.653f, -0.036f)
arcToRelative(26.805f, 26.805f, 0.0f, false, false, -0.733f, -0.009f)
curveToRelative(-0.707f, 0.0f, -1.259f, 0.096f, -1.675f, 0.309f)
arcToRelative(1.686f, 1.686f, 0.0f, false, false, -0.679f, 0.622f)
curveToRelative(-0.258f, 0.42f, -0.374f, 0.995f, -0.374f, 1.752f)
verticalLineToRelative(1.297f)
horizontalLineToRelative(3.919f)
lineToRelative(-0.386f, 2.103f)
lineToRelative(-0.287f, 1.564f)
horizontalLineToRelative(-3.246f)
verticalLineToRelative(8.245f)
curveTo(19.396f, 23.238f, 24.0f, 18.179f, 24.0f, 12.044f)
curveToRelative(0.0f, -6.627f, -5.373f, -12.0f, -12.0f, -12.0f)
reflectiveCurveToRelative(-12.0f, 5.373f, -12.0f, 12.0f)
curveToRelative(0.0f, 5.628f, 3.874f, 10.35f, 9.101f, 11.647f)
close()
}
}
.build()
return _facebook!!
}
@Suppress("ObjectPropertyName")
private var _facebook: ImageVector? = null
presentation-core/src/main/java/tachiyomi/presentation/core/icons/Github.kt
-68
View File
@@ -1,68 +0,0 @@
package tachiyomi.presentation.core.icons
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.PathFillType.Companion.NonZero
import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.graphics.StrokeCap.Companion.Butt
import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.graphics.vector.ImageVector.Builder
import androidx.compose.ui.graphics.vector.path
import androidx.compose.ui.unit.dp
@Suppress("UnusedReceiverParameter")
val CustomIcons.Github: ImageVector
get() {
if (_github != null) {
return _github!!
}
_github = Builder(
name = "Github",
defaultWidth = 24.0.dp,
defaultHeight = 24.0.dp,
viewportWidth = 24.0f,
viewportHeight = 24.0f,
).apply {
path(
fill = SolidColor(Color(0xFF000000)),
stroke = null,
strokeLineWidth = 0.0f,
strokeLineCap = Butt,
strokeLineJoin = Miter,
strokeLineMiter = 4.0f,
pathFillType = NonZero,
) {
moveTo(12.0f, 0.297f)
curveToRelative(-6.63f, 0.0f, -12.0f, 5.373f, -12.0f, 12.0f)
curveToRelative(0.0f, 5.303f, 3.438f, 9.8f, 8.205f, 11.385f)
curveToRelative(0.6f, 0.113f, 0.82f, -0.258f, 0.82f, -0.577f)
curveToRelative(0.0f, -0.285f, -0.01f, -1.04f, -0.015f, -2.04f)
curveToRelative(-3.338f, 0.724f, -4.042f, -1.61f, -4.042f, -1.61f)
curveTo(4.422f, 18.07f, 3.633f, 17.7f, 3.633f, 17.7f)
curveToRelative(-1.087f, -0.744f, 0.084f, -0.729f, 0.084f, -0.729f)
curveToRelative(1.205f, 0.084f, 1.838f, 1.236f, 1.838f, 1.236f)
curveToRelative(1.07f, 1.835f, 2.809f, 1.305f, 3.495f, 0.998f)
curveToRelative(0.108f, -0.776f, 0.417f, -1.305f, 0.76f, -1.605f)
curveToRelative(-2.665f, -0.3f, -5.466f, -1.332f, -5.466f, -5.93f)
curveToRelative(0.0f, -1.31f, 0.465f, -2.38f, 1.235f, -3.22f)
curveToRelative(-0.135f, -0.303f, -0.54f, -1.523f, 0.105f, -3.176f)
curveToRelative(0.0f, 0.0f, 1.005f, -0.322f, 3.3f, 1.23f)
curveToRelative(0.96f, -0.267f, 1.98f, -0.399f, 3.0f, -0.405f)
curveToRelative(1.02f, 0.006f, 2.04f, 0.138f, 3.0f, 0.405f)
curveToRelative(2.28f, -1.552f, 3.285f, -1.23f, 3.285f, -1.23f)
curveToRelative(0.645f, 1.653f, 0.24f, 2.873f, 0.12f, 3.176f)
curveToRelative(0.765f, 0.84f, 1.23f, 1.91f, 1.23f, 3.22f)
curveToRelative(0.0f, 4.61f, -2.805f, 5.625f, -5.475f, 5.92f)
curveToRelative(0.42f, 0.36f, 0.81f, 1.096f, 0.81f, 2.22f)
curveToRelative(0.0f, 1.606f, -0.015f, 2.896f, -0.015f, 3.286f)
curveToRelative(0.0f, 0.315f, 0.21f, 0.69f, 0.825f, 0.57f)
curveTo(20.565f, 22.092f, 24.0f, 17.592f, 24.0f, 12.297f)
curveToRelative(0.0f, -6.627f, -5.373f, -12.0f, -12.0f, -12.0f)
}
}
.build()
return _github!!
}
@Suppress("ObjectPropertyName")
private var _github: ImageVector? = null
presentation-core/src/main/java/tachiyomi/presentation/core/icons/OpenCollective.kt
-47
View File
@@ -1,47 +0,0 @@
package tachiyomi.presentation.core.icons
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.graphics.vector.path
import androidx.compose.ui.unit.dp
@Suppress("UnusedReceiverParameter")
val CustomIcons.OpenCollective: ImageVector
get() {
if (_OpenCollective != null) {
return _OpenCollective!!
}
_OpenCollective = ImageVector.Builder(
name = "OpenCollective",
defaultWidth = 24.dp,
defaultHeight = 24.dp,
viewportWidth = 24f,
viewportHeight = 24f,
).apply {
path(fill = SolidColor(Color.Black)) {
moveTo(12f, 0f)
curveTo(5.373f, 0f, 0f, 5.373f, 0f, 12f)
reflectiveCurveToRelative(5.373f, 12f, 12f, 12f)
curveToRelative(2.54f, 0f, 4.894f, -0.79f, 6.834f, -2.135f)
lineToRelative(-3.107f, -3.109f)
arcToRelative(7.715f, 7.715f, 0f, isMoreThanHalf = true, isPositiveArc = true, 0f, -13.512f)
lineToRelative(3.107f, -3.109f)
arcTo(11.943f, 11.943f, 0f, isMoreThanHalf = false, isPositiveArc = false, 12f, 0f)
close()
moveTo(21.865f, 5.166f)
lineToRelative(-3.109f, 3.107f)
arcTo(7.67f, 7.67f, 0f, isMoreThanHalf = false, isPositiveArc = true, 19.715f, 12f)
arcToRelative(7.682f, 7.682f, 0f, isMoreThanHalf = false, isPositiveArc = true, -0.959f, 3.727f)
lineToRelative(3.109f, 3.107f)
arcTo(11.943f, 11.943f, 0f, isMoreThanHalf = false, isPositiveArc = false, 24f, 12f)
curveToRelative(0f, -2.54f, -0.79f, -4.894f, -2.135f, -6.834f)
close()
}
}.build()
return _OpenCollective!!
}
@Suppress("ObjectPropertyName")
private var _OpenCollective: ImageVector? = null
presentation-core/src/main/java/tachiyomi/presentation/core/icons/Patreon.kt
-39
View File
@@ -1,39 +0,0 @@
package tachiyomi.presentation.core.icons
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.graphics.vector.path
import androidx.compose.ui.unit.dp
@Suppress("UnusedReceiverParameter")
val CustomIcons.Patreon: ImageVector
get() {
if (_Patreon != null) {
return _Patreon!!
}
_Patreon = ImageVector.Builder(
name = "Patreon",
defaultWidth = 24.dp,
defaultHeight = 24.dp,
viewportWidth = 24f,
viewportHeight = 24f,
).apply {
path(fill = SolidColor(Color.Black)) {
moveTo(22.957f, 7.21f)
curveToRelative(-0.004f, -3.064f, -2.391f, -5.576f, -5.191f, -6.482f)
curveToRelative(-3.478f, -1.125f, -8.064f, -0.962f, -11.384f, 0.604f)
curveTo(2.357f, 3.231f, 1.093f, 7.391f, 1.046f, 11.54f)
curveToRelative(-0.039f, 3.411f, 0.302f, 12.396f, 5.369f, 12.46f)
curveToRelative(3.765f, 0.047f, 4.326f, -4.804f, 6.068f, -7.141f)
curveToRelative(1.24f, -1.662f, 2.836f, -2.132f, 4.801f, -2.618f)
curveToRelative(3.376f, -0.836f, 5.678f, -3.501f, 5.673f, -7.031f)
close()
}
}.build()
return _Patreon!!
}
@Suppress("ObjectPropertyName")
private var _Patreon: ImageVector? = null
presentation-core/src/main/java/tachiyomi/presentation/core/icons/Reddit.kt
-92
View File
@@ -1,92 +0,0 @@
package tachiyomi.presentation.core.icons
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.PathFillType.Companion.NonZero
import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.graphics.StrokeCap.Companion.Butt
import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.graphics.vector.ImageVector.Builder
import androidx.compose.ui.graphics.vector.path
import androidx.compose.ui.unit.dp
@Suppress("UnusedReceiverParameter")
val CustomIcons.Reddit: ImageVector
get() {
if (_reddit != null) {
return _reddit!!
}
_reddit = Builder(
name = "Reddit",
defaultWidth = 24.0.dp,
defaultHeight = 24.0.dp,
viewportWidth = 24.0f,
viewportHeight = 24.0f,
).apply {
path(
fill = SolidColor(Color(0xFF000000)),
stroke = null,
strokeLineWidth = 0.0f,
strokeLineCap = Butt,
strokeLineJoin = Miter,
strokeLineMiter = 4.0f,
pathFillType = NonZero,
) {
moveTo(12.0f, 0.0f)
curveTo(5.373f, 0.0f, 0.0f, 5.373f, 0.0f, 12.0f)
curveToRelative(0.0f, 3.314f, 1.343f, 6.314f, 3.515f, 8.485f)
lineToRelative(-2.286f, 2.286f)
curveTo(0.775f, 23.225f, 1.097f, 24.0f, 1.738f, 24.0f)
lineTo(12.0f, 24.0f)
curveToRelative(6.627f, 0.0f, 12.0f, -5.373f, 12.0f, -12.0f)
reflectiveCurveTo(18.627f, 0.0f, 12.0f, 0.0f)
close()
moveTo(16.388f, 3.199f)
curveToRelative(1.104f, 0.0f, 1.999f, 0.895f, 1.999f, 1.999f)
curveToRelative(0.0f, 1.105f, -0.895f, 2.0f, -1.999f, 2.0f)
curveToRelative(-0.946f, 0.0f, -1.739f, -0.657f, -1.947f, -1.539f)
verticalLineToRelative(0.002f)
curveToRelative(-1.147f, 0.162f, -2.032f, 1.15f, -2.032f, 2.341f)
verticalLineToRelative(0.007f)
curveToRelative(1.776f, 0.067f, 3.4f, 0.567f, 4.686f, 1.363f)
curveToRelative(0.473f, -0.363f, 1.064f, -0.58f, 1.707f, -0.58f)
curveToRelative(1.547f, 0.0f, 2.802f, 1.254f, 2.802f, 2.802f)
curveToRelative(0.0f, 1.117f, -0.655f, 2.081f, -1.601f, 2.531f)
curveToRelative(-0.088f, 3.256f, -3.637f, 5.876f, -7.997f, 5.876f)
curveToRelative(-4.361f, 0.0f, -7.905f, -2.617f, -7.998f, -5.87f)
curveToRelative(-0.954f, -0.447f, -1.614f, -1.415f, -1.614f, -2.538f)
curveToRelative(0.0f, -1.548f, 1.255f, -2.802f, 2.803f, -2.802f)
curveToRelative(0.645f, 0.0f, 1.239f, 0.218f, 1.712f, 0.585f)
curveToRelative(1.275f, -0.79f, 2.881f, -1.291f, 4.64f, -1.365f)
verticalLineToRelative(-0.01f)
curveToRelative(0.0f, -1.663f, 1.263f, -3.034f, 2.88f, -3.207f)
curveToRelative(0.188f, -0.911f, 0.993f, -1.595f, 1.959f, -1.595f)
close()
moveTo(8.303f, 11.575f)
curveToRelative(-0.784f, 0.0f, -1.459f, 0.78f, -1.506f, 1.797f)
curveToRelative(-0.047f, 1.016f, 0.64f, 1.429f, 1.426f, 1.429f)
curveToRelative(0.786f, 0.0f, 1.371f, -0.369f, 1.418f, -1.385f)
curveToRelative(0.047f, -1.017f, -0.553f, -1.841f, -1.338f, -1.841f)
close()
moveTo(15.709f, 11.575f)
curveToRelative(-0.786f, 0.0f, -1.385f, 0.824f, -1.338f, 1.841f)
curveToRelative(0.047f, 1.017f, 0.634f, 1.385f, 1.418f, 1.385f)
curveToRelative(0.785f, 0.0f, 1.473f, -0.413f, 1.426f, -1.429f)
curveToRelative(-0.046f, -1.017f, -0.721f, -1.797f, -1.506f, -1.797f)
close()
moveTo(12.006f, 15.588f)
curveToRelative(-0.974f, 0.0f, -1.907f, 0.048f, -2.77f, 0.135f)
curveToRelative(-0.147f, 0.015f, -0.241f, 0.168f, -0.183f, 0.305f)
curveToRelative(0.483f, 1.154f, 1.622f, 1.964f, 2.953f, 1.964f)
curveToRelative(1.33f, 0.0f, 2.47f, -0.81f, 2.953f, -1.964f)
curveToRelative(0.057f, -0.137f, -0.037f, -0.29f, -0.184f, -0.305f)
curveToRelative(-0.863f, -0.087f, -1.795f, -0.135f, -2.769f, -0.135f)
close()
}
}
.build()
return _reddit!!
}
@Suppress("ObjectPropertyName")
private var _reddit: ImageVector? = null
presentation-core/src/main/java/tachiyomi/presentation/core/icons/X.kt
-61
View File
@@ -1,61 +0,0 @@
package tachiyomi.presentation.core.icons
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.PathFillType.Companion.NonZero
import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.graphics.StrokeCap.Companion.Butt
import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.graphics.vector.ImageVector.Builder
import androidx.compose.ui.graphics.vector.path
import androidx.compose.ui.unit.dp
@Suppress("UnusedReceiverParameter")
val CustomIcons.X: ImageVector
get() {
if (_x != null) {
return _x!!
}
_x = Builder(
name = "X",
defaultWidth = 24.0.dp,
defaultHeight = 24.0.dp,
viewportWidth =
24.0f,
viewportHeight = 24.0f,
).apply {
path(
fill = SolidColor(Color(0xFF000000)),
stroke = null,
strokeLineWidth = 0.0f,
strokeLineCap = Butt,
strokeLineJoin = Miter,
strokeLineMiter = 4.0f,
pathFillType = NonZero,
) {
moveTo(18.901f, 1.153f)
horizontalLineToRelative(3.68f)
lineToRelative(-8.04f, 9.19f)
lineTo(24.0f, 22.846f)
horizontalLineToRelative(-7.406f)
lineToRelative(-5.8f, -7.584f)
lineToRelative(-6.638f, 7.584f)
horizontalLineTo(0.474f)
lineToRelative(8.6f, -9.83f)
lineTo(0.0f, 1.154f)
horizontalLineToRelative(7.594f)
lineToRelative(5.243f, 6.932f)
close()
moveTo(17.61f, 20.644f)
horizontalLineToRelative(2.039f)
lineTo(6.486f, 3.24f)
horizontalLineTo(4.298f)
close()
}
}
.build()
return _x!!
}
@Suppress("ObjectPropertyName")
private var _x: ImageVector? = null
presentation-core/src/main/java/tachiyomi/presentation/core/screens/InfoScreen.kt
+3 -3
View File
@@ -11,8 +11,6 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.windowInsetsPadding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Newspaper
import androidx.compose.material3.Button
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
@@ -28,6 +26,8 @@ import androidx.compose.ui.tooling.preview.PreviewLightDark
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.compose.ui.zIndex
import mihon.icons.materialsymbols.MaterialSymbols
import mihon.icons.materialsymbols.rounded.Newspaper
import tachiyomi.presentation.core.components.material.Scaffold
import tachiyomi.presentation.core.components.material.padding
import tachiyomi.presentation.core.util.secondaryItemAlpha
@@ -130,7 +130,7 @@ fun InfoScreen(
@Composable
private fun InfoScaffoldPreview() {
InfoScreen(
icon = Icons.Outlined.Newspaper,
icon = MaterialSymbols.Rounded.Newspaper,
headingText = "Heading",
subtitleText = "Subtitle",
acceptText = "Accept",