github/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-05-04 05:31:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge conflict and small refactor

Browse source
This commit is contained in:
Shamicen 2024-03-30 21:25:44 +01:00
parent 8a14f27eb4
commit feccfa1d56
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
data/src/main/sqldelight/tachiyomi/migrations/2.sqm → data/src/main/sqldelight/tachiyomi/migrations/4.sqm
View file

4
source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt
View file

@ -134,9 +134,9 @@ actual class LocalSource(
private fun loadMangaForPage(page: Int) { private fun loadMangaForPage(page: Int) {
if (page != loadedPages + 1 || page == currentlyLoadingPage) return if (page != loadedPages + 1 || page == currentlyLoadingPage) return
currentlyLoadingPage = loadedPages + 1 currentlyLoadingPage = page
val mangaDirPage = mangaDirChunks[page - 1] val mangaDirPage = mangaDirChunks[page - 1]
val dbManga = runBlocking { getDbManga(mangaDirPage) } val dbManga = runBlocking { getDbManga(mangaDirPage) }
val mangaPage = mangaDirPage.map { mangaDir -> val mangaPage = mangaDirPage.map { mangaDir ->
SManga.create().apply manga@{ SManga.create().apply manga@{

4
source-local/src/androidMain/kotlin/tachiyomi/source/local/filter/filter.kt
View file

@ -7,14 +7,18 @@ import tachiyomi.source.local.R
class GenreFilter(genre: String) : Filter.TriState(genre) class GenreFilter(genre: String) : Filter.TriState(genre)
class GenreGroup(context: Context, genres: List<GenreFilter>) : Filter.Group<GenreFilter>(context.getString(R.string.genres), genres) class GenreGroup(context: Context, genres: List<GenreFilter>) : Filter.Group<GenreFilter>(context.getString(R.string.genres), genres)
class GenreTextSearch(context: Context) : Filter.Text(context.getString(R.string.genres)) class GenreTextSearch(context: Context) : Filter.Text(context.getString(R.string.genres))
class AuthorFilter(author: String) : Filter.TriState(author) class AuthorFilter(author: String) : Filter.TriState(author)
class AuthorGroup(context: Context, authors: List<AuthorFilter>) : Filter.Group<AuthorFilter>(context.getString(R.string.authors), authors) class AuthorGroup(context: Context, authors: List<AuthorFilter>) : Filter.Group<AuthorFilter>(context.getString(R.string.authors), authors)
class AuthorTextSearch(context: Context) : Filter.Text(context.getString(R.string.authors)) class AuthorTextSearch(context: Context) : Filter.Text(context.getString(R.string.authors))
class ArtistFilter(genre: String) : Filter.TriState(genre) class ArtistFilter(genre: String) : Filter.TriState(genre)
class ArtistGroup(context: Context, artists: List<ArtistFilter>) : Filter.Group<ArtistFilter>(context.getString(R.string.artists), artists) class ArtistGroup(context: Context, artists: List<ArtistFilter>) : Filter.Group<ArtistFilter>(context.getString(R.string.artists), artists)
class ArtistTextSearch(context: Context) : Filter.Text(context.getString(R.string.artists)) class ArtistTextSearch(context: Context) : Filter.Text(context.getString(R.string.artists))
class StatusFilter(name: String) : Filter.TriState(name) class StatusFilter(name: String) : Filter.TriState(name)
class StatusGroup(context: Context, filters: List<StatusFilter>) : Filter.Group<StatusFilter>(context.getString(R.string.status), filters) class StatusGroup(context: Context, filters: List<StatusFilter>) : Filter.Group<StatusFilter>(context.getString(R.string.status), filters)
class TextSearchHeader(context: Context) : Filter.Header(context.getString(R.string.local_filter_text_search_header)) class TextSearchHeader(context: Context) : Filter.Header(context.getString(R.string.local_filter_text_search_header))
class LocalSourceInfoHeader(context: Context) : Filter.Header(context.getString(R.string.local_filter_info_header)) class LocalSourceInfoHeader(context: Context) : Filter.Header(context.getString(R.string.local_filter_info_header))
class Separator : Filter.Separator() class Separator : Filter.Separator()