Switch to Material Symbols and use Valkyrie for ImageVector generation (#3873)
* 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:
@@ -19,18 +19,6 @@ import androidx.compose.foundation.lazy.items
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.Brush
|
||||
import androidx.compose.material.icons.filled.PersonOutline
|
||||
import androidx.compose.material.icons.filled.Warning
|
||||
import androidx.compose.material.icons.outlined.Add
|
||||
import androidx.compose.material.icons.outlined.AttachMoney
|
||||
import androidx.compose.material.icons.outlined.Block
|
||||
import androidx.compose.material.icons.outlined.Close
|
||||
import androidx.compose.material.icons.outlined.Done
|
||||
import androidx.compose.material.icons.outlined.DoneAll
|
||||
import androidx.compose.material.icons.outlined.Pause
|
||||
import androidx.compose.material.icons.outlined.Schedule
|
||||
import androidx.compose.material3.HorizontalDivider
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
@@ -66,6 +54,18 @@ import eu.kanade.presentation.more.settings.widget.TextPreferenceWidget
|
||||
import eu.kanade.tachiyomi.source.Source
|
||||
import eu.kanade.tachiyomi.source.model.SManga
|
||||
import mihon.app.di.appGraph
|
||||
import mihon.icons.materialsymbols.MaterialSymbols
|
||||
import mihon.icons.materialsymbols.rounded.Add
|
||||
import mihon.icons.materialsymbols.rounded.AttachMoney
|
||||
import mihon.icons.materialsymbols.rounded.Block
|
||||
import mihon.icons.materialsymbols.rounded.Brush
|
||||
import mihon.icons.materialsymbols.rounded.Close
|
||||
import mihon.icons.materialsymbols.rounded.Done
|
||||
import mihon.icons.materialsymbols.rounded.DoneAll
|
||||
import mihon.icons.materialsymbols.rounded.Pause
|
||||
import mihon.icons.materialsymbols.rounded.Person
|
||||
import mihon.icons.materialsymbols.rounded.Schedule
|
||||
import mihon.icons.materialsymbols.rounded.Warning
|
||||
import tachiyomi.domain.manga.model.Manga
|
||||
import tachiyomi.domain.manga.model.MangaWithChapterCount
|
||||
import tachiyomi.domain.source.model.StubSource
|
||||
@@ -141,7 +141,7 @@ fun DuplicateMangaDialog(
|
||||
|
||||
TextPreferenceWidget(
|
||||
title = stringResource(MR.strings.action_add_anyway),
|
||||
icon = Icons.Outlined.Add,
|
||||
icon = MaterialSymbols.Rounded.Add,
|
||||
onPreferenceClick = {
|
||||
onDismissRequest()
|
||||
onConfirm()
|
||||
@@ -230,7 +230,7 @@ private fun DuplicateMangaListItem(
|
||||
if (!manga.author.isNullOrBlank()) {
|
||||
MangaDetailRow(
|
||||
text = manga.author!!,
|
||||
iconImageVector = Icons.Filled.PersonOutline,
|
||||
iconImageVector = MaterialSymbols.Rounded.Person,
|
||||
maxLines = 2,
|
||||
)
|
||||
}
|
||||
@@ -238,7 +238,7 @@ private fun DuplicateMangaListItem(
|
||||
if (!manga.artist.isNullOrBlank() && manga.author != manga.artist) {
|
||||
MangaDetailRow(
|
||||
text = manga.artist!!,
|
||||
iconImageVector = Icons.Filled.Brush,
|
||||
iconImageVector = MaterialSymbols.Rounded.Brush,
|
||||
maxLines = 2,
|
||||
)
|
||||
}
|
||||
@@ -254,13 +254,13 @@ private fun DuplicateMangaListItem(
|
||||
else -> stringResource(MR.strings.unknown)
|
||||
},
|
||||
iconImageVector = when (manga.status) {
|
||||
SManga.ONGOING.toLong() -> Icons.Outlined.Schedule
|
||||
SManga.COMPLETED.toLong() -> Icons.Outlined.DoneAll
|
||||
SManga.LICENSED.toLong() -> Icons.Outlined.AttachMoney
|
||||
SManga.PUBLISHING_FINISHED.toLong() -> Icons.Outlined.Done
|
||||
SManga.CANCELLED.toLong() -> Icons.Outlined.Close
|
||||
SManga.ON_HIATUS.toLong() -> Icons.Outlined.Pause
|
||||
else -> Icons.Outlined.Block
|
||||
SManga.ONGOING.toLong() -> MaterialSymbols.Rounded.Schedule
|
||||
SManga.COMPLETED.toLong() -> MaterialSymbols.Rounded.DoneAll
|
||||
SManga.LICENSED.toLong() -> MaterialSymbols.Rounded.AttachMoney
|
||||
SManga.PUBLISHING_FINISHED.toLong() -> MaterialSymbols.Rounded.Done
|
||||
SManga.CANCELLED.toLong() -> MaterialSymbols.Rounded.Close
|
||||
SManga.ON_HIATUS.toLong() -> MaterialSymbols.Rounded.Pause
|
||||
else -> MaterialSymbols.Rounded.Block
|
||||
},
|
||||
)
|
||||
|
||||
@@ -272,7 +272,7 @@ private fun DuplicateMangaListItem(
|
||||
) {
|
||||
if (source is StubSource) {
|
||||
Icon(
|
||||
imageVector = Icons.Filled.Warning,
|
||||
imageVector = MaterialSymbols.Rounded.Warning,
|
||||
contentDescription = null,
|
||||
modifier = Modifier.size(16.dp),
|
||||
tint = MaterialTheme.colorScheme.error,
|
||||
|
||||
Reference in New Issue
Block a user