Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve handling of tags

Browse Source
This commit is contained in:
Jobobby04 2022-06-27 09:16:19 -04:00
parent acc8ec6912
commit 447829b1b9
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
View File

@ -343,7 +343,7 @@ private fun MangaScreenSmallImpl(
openMetadataViewer = onMetadataViewerClicked, openMetadataViewer = onMetadataViewerClicked,
search = { onSearch(it, false) }, search = { onSearch(it, false) },
), ),
searchMetadataChips = remember { SearchMetadataChips(state.meta, state.source, state.manga.genre) }, searchMetadataChips = remember(state) { SearchMetadataChips(state.meta, state.source, state.manga.genre) },
scrollBehavior = scrollBehavior, scrollBehavior = scrollBehavior,
actionModeCounter = selected.size, actionModeCounter = selected.size,
onSelectAll = { onSelectAll = {
@ -708,7 +708,7 @@ fun MangaScreenLargeImpl(
openMetadataViewer = onMetadataViewerClicked, openMetadataViewer = onMetadataViewerClicked,
search = { onSearch(it, false) }, search = { onSearch(it, false) },
), ),
searchMetadataChips = remember { SearchMetadataChips(state.meta, state.source, state.manga.genre) }, searchMetadataChips = remember(state) { SearchMetadataChips(state.meta, state.source, state.manga.genre) },
) )
val chaptersWeight = if (windowWidthSizeClass == WindowWidthSizeClass.Medium) 1f else 2f val chaptersWeight = if (windowWidthSizeClass == WindowWidthSizeClass.Medium) 1f else 2f

14
app/src/main/java/eu/kanade/presentation/manga/components/NamespaceTags.kt
View File

@ -18,8 +18,8 @@ import androidx.compose.runtime.Immutable
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.google.accompanist.flowlayout.FlowRow import com.google.accompanist.flowlayout.FlowRow
import eu.kanade.presentation.components.SuggestionChip import eu.kanade.presentation.components.SuggestionChip
@ -38,7 +38,7 @@ data class DisplayTag(
val namespace: String?, val namespace: String?,
val text: String, val text: String,
val search: String, val search: String,
val border: Dp?, val border: Int?,
) )
@Immutable @Immutable
@ -63,8 +63,8 @@ value class SearchMetadataChips(
} ?: it.name, } ?: it.name,
border = if (source.id == EXH_SOURCE_ID || source.id == EH_SOURCE_ID) { border = if (source.id == EXH_SOURCE_ID || source.id == EH_SOURCE_ID) {
when (it.type) { when (it.type) {
EHentaiSearchMetadata.TAG_TYPE_NORMAL -> 3.dp EHentaiSearchMetadata.TAG_TYPE_NORMAL -> 3
EHentaiSearchMetadata.TAG_TYPE_LIGHT -> 1.dp EHentaiSearchMetadata.TAG_TYPE_LIGHT -> 1
else -> null else -> null
} }
} else null, } else null,
@ -110,7 +110,11 @@ fun NamespaceTags(
text = text, text = text,
onClick = { onClick(search) }, onClick = { onClick(search) },
onLongClick = { onLongClick(search) }, onLongClick = { onLongClick(search) },
border = border?.let { SuggestionChipDefaults.suggestionChipBorder(borderWidth = it) }, border = border?.let {
with(LocalDensity.current) {
SuggestionChipDefaults.suggestionChipBorder(borderWidth = it.toDp())
}
},
) )
} }
} }