Creepso/mangayomi
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge branch 'feature/light-novel' into feature/novel

Browse source
This commit is contained in:
Schnitzel5 2024-11-22 00:28:24 +01:00
commit ca16d34332
49 changed files with 5263 additions and 962 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/l10n/app_de.arb
View file

@ -210,6 +210,7 @@
"anime_sources": "Anime-Quellen",
"anime_extensions": "Anime-Erweiterungen",
"manga_extensions": "Manga-Erweiterungen",
"novel": "Novel",
"anime": "Anime",
"manga": "Manga",
"library_no_category_exist": "Sie haben noch keine Kategorien",

3
lib/l10n/app_en.arb
View file

@ -209,10 +209,13 @@
"n_episodes": "{n} episodes",
"manga_sources": "Manga Sources",
"anime_sources": "Anime Sources",
"novel_sources": "Novel Sources",
"anime_extensions": "Anime Extensions",
"manga_extensions": "Manga Extensions",
"novel_extensions": "Novel Extensions",
"anime": "Anime",
"manga": "Manga",
"novel": "Novel",
"library_no_category_exist": "You don't have any categories yet",
"watching": "Watching",
"plan_to_watch": "Plan to watch",

10
lib/models/category.dart
View file

@ -1,4 +1,5 @@
import 'package:isar/isar.dart';
import 'package:mangayomi/models/manga.dart';
part 'category.g.dart';
@collection
@ -6,18 +7,19 @@ part 'category.g.dart';
class Category {
Id? id;
String? name;
bool? forManga;
@enumerated
late ItemType forItemType;
Category(
{this.id = Isar.autoIncrement,
required this.name,
required this.forManga});
required this.forItemType});
Category.fromJson(Map<String, dynamic> json) {
id = json['id'];
name = json['name'];
forManga = json['forManga'];
forItemType = json['forItemType'];
}
Map<String, dynamic> toJson() =>
{'id': id, 'name': name, 'forManga': forManga};
{'id': id, 'name': name, 'forItemType': forItemType};
}

117
lib/models/category.g.dart
View file

@ -17,10 +17,11 @@ const CategorySchema = CollectionSchema(
name: r'Category',
id: 5751694338128944171,
properties: {
r'forManga': PropertySchema(
r'forItemType': PropertySchema(
id: 0,
name: r'forManga',
type: IsarType.bool,
name: r'forItemType',
type: IsarType.byte,
enumMap: _CategoryforItemTypeEnumValueMap,
),
r'name': PropertySchema(
id: 1,
@ -63,7 +64,7 @@ void _categorySerialize(
List<int> offsets,
Map<Type, List<int>> allOffsets,
) {
writer.writeBool(offsets[0], object.forManga);
writer.writeByte(offsets[0], object.forItemType.index);
writer.writeString(offsets[1], object.name);
}
@ -74,7 +75,9 @@ Category _categoryDeserialize(
Map<Type, List<int>> allOffsets,
) {
final object = Category(
forManga: reader.readBoolOrNull(offsets[0]),
forItemType:
_CategoryforItemTypeValueEnumMap[reader.readByteOrNull(offsets[0])] ??
ItemType.manga,
id: id,
name: reader.readStringOrNull(offsets[1]),
);
@ -89,7 +92,8 @@ P _categoryDeserializeProp<P>(
) {
switch (propertyId) {
case 0:
return (reader.readBoolOrNull(offset)) as P;
return (_CategoryforItemTypeValueEnumMap[reader.readByteOrNull(offset)] ??
ItemType.manga) as P;
case 1:
return (reader.readStringOrNull(offset)) as P;
default:
@ -97,6 +101,17 @@ P _categoryDeserializeProp<P>(
}
}
const _CategoryforItemTypeEnumValueMap = {
'manga': 0,
'anime': 1,
'novel': 2,
};
const _CategoryforItemTypeValueEnumMap = {
0: ItemType.manga,
1: ItemType.anime,
2: ItemType.novel,
};
Id _categoryGetId(Category object) {
return object.id ?? Isar.autoIncrement;
}
@ -186,32 +201,60 @@ extension CategoryQueryWhere on QueryBuilder<Category, Category, QWhereClause> {
extension CategoryQueryFilter
on QueryBuilder<Category, Category, QFilterCondition> {
QueryBuilder<Category, Category, QAfterFilterCondition> forMangaIsNull() {
return QueryBuilder.apply(this, (query) {
return query.addFilterCondition(const FilterCondition.isNull(
property: r'forManga',
));
});
}
QueryBuilder<Category, Category, QAfterFilterCondition> forMangaIsNotNull() {
return QueryBuilder.apply(this, (query) {
return query.addFilterCondition(const FilterCondition.isNotNull(
property: r'forManga',
));
});
}
QueryBuilder<Category, Category, QAfterFilterCondition> forMangaEqualTo(
bool? value) {
QueryBuilder<Category, Category, QAfterFilterCondition> forItemTypeEqualTo(
ItemType value) {
return QueryBuilder.apply(this, (query) {
return query.addFilterCondition(FilterCondition.equalTo(
property: r'forManga',
property: r'forItemType',
value: value,
));
});
}
QueryBuilder<Category, Category, QAfterFilterCondition>
forItemTypeGreaterThan(
ItemType value, {
bool include = false,
}) {
return QueryBuilder.apply(this, (query) {
return query.addFilterCondition(FilterCondition.greaterThan(
include: include,
property: r'forItemType',
value: value,
));
});
}
QueryBuilder<Category, Category, QAfterFilterCondition> forItemTypeLessThan(
ItemType value, {
bool include = false,
}) {
return QueryBuilder.apply(this, (query) {
return query.addFilterCondition(FilterCondition.lessThan(
include: include,
property: r'forItemType',
value: value,
));
});
}
QueryBuilder<Category, Category, QAfterFilterCondition> forItemTypeBetween(
ItemType lower,
ItemType upper, {
bool includeLower = true,
bool includeUpper = true,
}) {
return QueryBuilder.apply(this, (query) {
return query.addFilterCondition(FilterCondition.between(
property: r'forItemType',
lower: lower,
includeLower: includeLower,
upper: upper,
includeUpper: includeUpper,
));
});
}
QueryBuilder<Category, Category, QAfterFilterCondition> idIsNull() {
return QueryBuilder.apply(this, (query) {
return query.addFilterCondition(const FilterCondition.isNull(
@ -434,15 +477,15 @@ extension CategoryQueryLinks
on QueryBuilder<Category, Category, QFilterCondition> {}
extension CategoryQuerySortBy on QueryBuilder<Category, Category, QSortBy> {
QueryBuilder<Category, Category, QAfterSortBy> sortByForManga() {
QueryBuilder<Category, Category, QAfterSortBy> sortByForItemType() {
return QueryBuilder.apply(this, (query) {
return query.addSortBy(r'forManga', Sort.asc);
return query.addSortBy(r'forItemType', Sort.asc);
});
}
QueryBuilder<Category, Category, QAfterSortBy> sortByForMangaDesc() {
QueryBuilder<Category, Category, QAfterSortBy> sortByForItemTypeDesc() {
return QueryBuilder.apply(this, (query) {
return query.addSortBy(r'forManga', Sort.desc);
return query.addSortBy(r'forItemType', Sort.desc);
});
}
@ -461,15 +504,15 @@ extension CategoryQuerySortBy on QueryBuilder<Category, Category, QSortBy> {
extension CategoryQuerySortThenBy
on QueryBuilder<Category, Category, QSortThenBy> {
QueryBuilder<Category, Category, QAfterSortBy> thenByForManga() {
QueryBuilder<Category, Category, QAfterSortBy> thenByForItemType() {
return QueryBuilder.apply(this, (query) {
return query.addSortBy(r'forManga', Sort.asc);
return query.addSortBy(r'forItemType', Sort.asc);
});
}
QueryBuilder<Category, Category, QAfterSortBy> thenByForMangaDesc() {
QueryBuilder<Category, Category, QAfterSortBy> thenByForItemTypeDesc() {
return QueryBuilder.apply(this, (query) {
return query.addSortBy(r'forManga', Sort.desc);
return query.addSortBy(r'forItemType', Sort.desc);
});
}
@ -500,9 +543,9 @@ extension CategoryQuerySortThenBy
extension CategoryQueryWhereDistinct
on QueryBuilder<Category, Category, QDistinct> {
QueryBuilder<Category, Category, QDistinct> distinctByForManga() {
QueryBuilder<Category, Category, QDistinct> distinctByForItemType() {
return QueryBuilder.apply(this, (query) {
return query.addDistinctBy(r'forManga');
return query.addDistinctBy(r'forItemType');
});
}
@ -522,9 +565,9 @@ extension CategoryQueryProperty
});
}
QueryBuilder<Category, bool?, QQueryOperations> forMangaProperty() {
QueryBuilder<Category, ItemType, QQueryOperations> forItemTypeProperty() {
return QueryBuilder.apply(this, (query) {
return query.addPropertyName(r'forManga');
return query.addPropertyName(r'forItemType');
});
}

10
lib/models/history.dart
View file

@ -1,5 +1,6 @@
import 'package:isar/isar.dart';
import 'package:mangayomi/models/chapter.dart';
import 'package:mangayomi/models/manga.dart';
part 'history.g.dart';
@collection
@ -11,7 +12,8 @@ class History {
int? chapterId;
bool? isManga;
@enumerated
late ItemType itemType;
final chapter = IsarLink<Chapter>();
@ -19,7 +21,7 @@ class History {
History({
this.id = Isar.autoIncrement,
required this.isManga,
required this.itemType,
required this.chapterId,
required this.mangaId,
required this.date,
@ -29,7 +31,7 @@ class History {
chapterId = json['chapterId'];
date = json['date'];
id = json['id'];
isManga = json['isManga'];
itemType = json['itemType'];
mangaId = json['mangaId'];
}
@ -37,7 +39,7 @@ class History {
'chapterId': chapterId,
'date': date,
'id': id,
'isManga': isManga,
'itemType': itemType,
'mangaId': mangaId
};
}

115
lib/models/history.g.dart
View file

@ -27,10 +27,11 @@ const HistorySchema = CollectionSchema(
name: r'date',
type: IsarType.string,
),
r'isManga': PropertySchema(
r'itemType': PropertySchema(
id: 2,
name: r'isManga',
type: IsarType.bool,
name: r'itemType',
type: IsarType.byte,
enumMap: _HistoryitemTypeEnumValueMap,
),
r'mangaId': PropertySchema(
id: 3,
@ -82,7 +83,7 @@ void _historySerialize(
) {
writer.writeLong(offsets[0], object.chapterId);
writer.writeString(offsets[1], object.date);
writer.writeBool(offsets[2], object.isManga);
writer.writeByte(offsets[2], object.itemType.index);
writer.writeLong(offsets[3], object.mangaId);
}
@ -96,7 +97,8 @@ History _historyDeserialize(
chapterId: reader.readLongOrNull(offsets[0]),
date: reader.readStringOrNull(offsets[1]),
id: id,
isManga: reader.readBoolOrNull(offsets[2]),
itemType: _HistoryitemTypeValueEnumMap[reader.readByteOrNull(offsets[2])] ??
ItemType.manga,
mangaId: reader.readLongOrNull(offsets[3]),
);
return object;
@ -114,7 +116,8 @@ P _historyDeserializeProp<P>(
case 1:
return (reader.readStringOrNull(offset)) as P;
case 2:
return (reader.readBoolOrNull(offset)) as P;
return (_HistoryitemTypeValueEnumMap[reader.readByteOrNull(offset)] ??
ItemType.manga) as P;
case 3:
return (reader.readLongOrNull(offset)) as P;
default:
@ -122,6 +125,17 @@ P _historyDeserializeProp<P>(
}
}
const _HistoryitemTypeEnumValueMap = {
'manga': 0,
'anime': 1,
'novel': 2,
};
const _HistoryitemTypeValueEnumMap = {
0: ItemType.manga,
1: ItemType.anime,
2: ItemType.novel,
};
Id _historyGetId(History object) {
return object.id ?? Isar.autoIncrement;
}
@ -495,32 +509,59 @@ extension HistoryQueryFilter
});
}
QueryBuilder<History, History, QAfterFilterCondition> isMangaIsNull() {
return QueryBuilder.apply(this, (query) {
return query.addFilterCondition(const FilterCondition.isNull(
property: r'isManga',
));
});
}
QueryBuilder<History, History, QAfterFilterCondition> isMangaIsNotNull() {
return QueryBuilder.apply(this, (query) {
return query.addFilterCondition(const FilterCondition.isNotNull(
property: r'isManga',
));
});
}
QueryBuilder<History, History, QAfterFilterCondition> isMangaEqualTo(
bool? value) {
QueryBuilder<History, History, QAfterFilterCondition> itemTypeEqualTo(
ItemType value) {
return QueryBuilder.apply(this, (query) {
return query.addFilterCondition(FilterCondition.equalTo(
property: r'isManga',
property: r'itemType',
value: value,
));
});
}
QueryBuilder<History, History, QAfterFilterCondition> itemTypeGreaterThan(
ItemType value, {
bool include = false,
}) {
return QueryBuilder.apply(this, (query) {
return query.addFilterCondition(FilterCondition.greaterThan(
include: include,
property: r'itemType',
value: value,
));
});
}
QueryBuilder<History, History, QAfterFilterCondition> itemTypeLessThan(
ItemType value, {
bool include = false,
}) {
return QueryBuilder.apply(this, (query) {
return query.addFilterCondition(FilterCondition.lessThan(
include: include,
property: r'itemType',
value: value,
));
});
}
QueryBuilder<History, History, QAfterFilterCondition> itemTypeBetween(
ItemType lower,
ItemType upper, {
bool includeLower = true,
bool includeUpper = true,
}) {
return QueryBuilder.apply(this, (query) {
return query.addFilterCondition(FilterCondition.between(
property: r'itemType',
lower: lower,
includeLower: includeLower,
upper: upper,
includeUpper: includeUpper,
));
});
}
QueryBuilder<History, History, QAfterFilterCondition> mangaIdIsNull() {
return QueryBuilder.apply(this, (query) {
return query.addFilterCondition(const FilterCondition.isNull(
@ -635,15 +676,15 @@ extension HistoryQuerySortBy on QueryBuilder<History, History, QSortBy> {
});
}
QueryBuilder<History, History, QAfterSortBy> sortByIsManga() {
QueryBuilder<History, History, QAfterSortBy> sortByItemType() {
return QueryBuilder.apply(this, (query) {
return query.addSortBy(r'isManga', Sort.asc);
return query.addSortBy(r'itemType', Sort.asc);
});
}
QueryBuilder<History, History, QAfterSortBy> sortByIsMangaDesc() {
QueryBuilder<History, History, QAfterSortBy> sortByItemTypeDesc() {
return QueryBuilder.apply(this, (query) {
return query.addSortBy(r'isManga', Sort.desc);
return query.addSortBy(r'itemType', Sort.desc);
});
}
@ -698,15 +739,15 @@ extension HistoryQuerySortThenBy
});
}
QueryBuilder<History, History, QAfterSortBy> thenByIsManga() {
QueryBuilder<History, History, QAfterSortBy> thenByItemType() {
return QueryBuilder.apply(this, (query) {
return query.addSortBy(r'isManga', Sort.asc);
return query.addSortBy(r'itemType', Sort.asc);
});
}
QueryBuilder<History, History, QAfterSortBy> thenByIsMangaDesc() {
QueryBuilder<History, History, QAfterSortBy> thenByItemTypeDesc() {
return QueryBuilder.apply(this, (query) {
return query.addSortBy(r'isManga', Sort.desc);
return query.addSortBy(r'itemType', Sort.desc);
});
}
@ -738,9 +779,9 @@ extension HistoryQueryWhereDistinct
});
}
QueryBuilder<History, History, QDistinct> distinctByIsManga() {
QueryBuilder<History, History, QDistinct> distinctByItemType() {
return QueryBuilder.apply(this, (query) {
return query.addDistinctBy(r'isManga');
return query.addDistinctBy(r'itemType');
});
}
@ -771,9 +812,9 @@ extension HistoryQueryProperty
});
}
QueryBuilder<History, bool?, QQueryOperations> isMangaProperty() {
QueryBuilder<History, ItemType, QQueryOperations> itemTypeProperty() {
return QueryBuilder.apply(this, (query) {
return query.addPropertyName(r'isManga');
return query.addPropertyName(r'itemType');
});
}

15
lib/models/manga.dart
View file

@ -22,7 +22,8 @@ class Manga {
@enumerated
late Status status;
bool? isManga;
@enumerated
late ItemType itemType;
List<String>? genre;
@ -62,7 +63,7 @@ class Manga {
required this.name,
required this.status,
required this.description,
this.isManga = true,
this.itemType = ItemType.manga,
this.dateAdded,
this.lastUpdate,
this.categories,
@ -83,7 +84,7 @@ class Manga {
id = json['id'];
imageUrl = json['imageUrl'];
isLocalArchive = json['isLocalArchive'];
isManga = json['isManga'];
itemType = ItemType.values[json['itemType']];
lang = json['lang'];
lastRead = json['lastRead'];
lastUpdate = json['lastUpdate'];
@ -106,7 +107,7 @@ class Manga {
'id': id,
'imageUrl': imageUrl,
'isLocalArchive': isLocalArchive,
'isManga': isManga,
'itemType': itemType.index,
'lang': lang,
'lastRead': lastRead,
'lastUpdate': lastUpdate,
@ -126,3 +127,9 @@ enum Status {
onHiatus,
publishingFinished
}
enum ItemType {
manga,
anime,
novel
}

114
lib/models/manga.g.dart
View file

@ -72,10 +72,11 @@ const MangaSchema = CollectionSchema(
name: r'isLocalArchive',
type: IsarType.bool,
),
r'isManga': PropertySchema(
r'itemType': PropertySchema(
id: 11,
name: r'isManga',
type: IsarType.bool,
name: r'itemType',
type: IsarType.byte,
enumMap: _MangaitemTypeEnumValueMap,
),
r'lang': PropertySchema(
id: 12,
@ -240,7 +241,7 @@ void _mangaSerialize(
writer.writeStringList(offsets[8], object.genre);
writer.writeString(offsets[9], object.imageUrl);
writer.writeBool(offsets[10], object.isLocalArchive);
writer.writeBool(offsets[11], object.isManga);
writer.writeByte(offsets[11], object.itemType.index);
writer.writeString(offsets[12], object.lang);
writer.writeLong(offsets[13], object.lastRead);
writer.writeLong(offsets[14], object.lastUpdate);
@ -269,7 +270,8 @@ Manga _mangaDeserialize(
id: id,
imageUrl: reader.readStringOrNull(offsets[9]),
isLocalArchive: reader.readBoolOrNull(offsets[10]),
isManga: reader.readBoolOrNull(offsets[11]),
itemType: _MangaitemTypeValueEnumMap[reader.readByteOrNull(offsets[11])] ??
ItemType.manga,
lang: reader.readStringOrNull(offsets[12]),
lastRead: reader.readLongOrNull(offsets[13]),
lastUpdate: reader.readLongOrNull(offsets[14]),
@ -312,7 +314,8 @@ P _mangaDeserializeProp<P>(
case 10:
return (reader.readBoolOrNull(offset)) as P;
case 11:
return (reader.readBoolOrNull(offset)) as P;
return (_MangaitemTypeValueEnumMap[reader.readByteOrNull(offset)] ??
ItemType.manga) as P;
case 12:
return (reader.readStringOrNull(offset)) as P;
case 13:
@ -333,6 +336,16 @@ P _mangaDeserializeProp<P>(
}
}
const _MangaitemTypeEnumValueMap = {
'manga': 0,
'anime': 1,
'novel': 2,
};
const _MangaitemTypeValueEnumMap = {
0: ItemType.manga,
1: ItemType.anime,
2: ItemType.novel,
};
const _MangastatusEnumValueMap = {
'ongoing': 0,
'completed': 1,
@ -1911,32 +1924,59 @@ extension MangaQueryFilter on QueryBuilder<Manga, Manga, QFilterCondition> {
});
}
QueryBuilder<Manga, Manga, QAfterFilterCondition> isMangaIsNull() {
return QueryBuilder.apply(this, (query) {
return query.addFilterCondition(const FilterCondition.isNull(
property: r'isManga',
));
});
}
QueryBuilder<Manga, Manga, QAfterFilterCondition> isMangaIsNotNull() {
return QueryBuilder.apply(this, (query) {
return query.addFilterCondition(const FilterCondition.isNotNull(
property: r'isManga',
));
});
}
QueryBuilder<Manga, Manga, QAfterFilterCondition> isMangaEqualTo(
bool? value) {
QueryBuilder<Manga, Manga, QAfterFilterCondition> itemTypeEqualTo(
ItemType value) {
return QueryBuilder.apply(this, (query) {
return query.addFilterCondition(FilterCondition.equalTo(
property: r'isManga',
property: r'itemType',
value: value,
));
});
}
QueryBuilder<Manga, Manga, QAfterFilterCondition> itemTypeGreaterThan(
ItemType value, {
bool include = false,
}) {
return QueryBuilder.apply(this, (query) {
return query.addFilterCondition(FilterCondition.greaterThan(
include: include,
property: r'itemType',
value: value,
));
});
}
QueryBuilder<Manga, Manga, QAfterFilterCondition> itemTypeLessThan(
ItemType value, {
bool include = false,
}) {
return QueryBuilder.apply(this, (query) {
return query.addFilterCondition(FilterCondition.lessThan(
include: include,
property: r'itemType',
value: value,
));
});
}
QueryBuilder<Manga, Manga, QAfterFilterCondition> itemTypeBetween(
ItemType lower,
ItemType upper, {
bool includeLower = true,
bool includeUpper = true,
}) {
return QueryBuilder.apply(this, (query) {
return query.addFilterCondition(FilterCondition.between(
property: r'itemType',
lower: lower,
includeLower: includeLower,
upper: upper,
includeUpper: includeUpper,
));
});
}
QueryBuilder<Manga, Manga, QAfterFilterCondition> langIsNull() {
return QueryBuilder.apply(this, (query) {
return query.addFilterCondition(const FilterCondition.isNull(
@ -2863,15 +2903,15 @@ extension MangaQuerySortBy on QueryBuilder<Manga, Manga, QSortBy> {
});
}
QueryBuilder<Manga, Manga, QAfterSortBy> sortByIsManga() {
QueryBuilder<Manga, Manga, QAfterSortBy> sortByItemType() {
return QueryBuilder.apply(this, (query) {
return query.addSortBy(r'isManga', Sort.asc);
return query.addSortBy(r'itemType', Sort.asc);
});
}
QueryBuilder<Manga, Manga, QAfterSortBy> sortByIsMangaDesc() {
QueryBuilder<Manga, Manga, QAfterSortBy> sortByItemTypeDesc() {
return QueryBuilder.apply(this, (query) {
return query.addSortBy(r'isManga', Sort.desc);
return query.addSortBy(r'itemType', Sort.desc);
});
}
@ -3069,15 +3109,15 @@ extension MangaQuerySortThenBy on QueryBuilder<Manga, Manga, QSortThenBy> {
});
}
QueryBuilder<Manga, Manga, QAfterSortBy> thenByIsManga() {
QueryBuilder<Manga, Manga, QAfterSortBy> thenByItemType() {
return QueryBuilder.apply(this, (query) {
return query.addSortBy(r'isManga', Sort.asc);
return query.addSortBy(r'itemType', Sort.asc);
});
}
QueryBuilder<Manga, Manga, QAfterSortBy> thenByIsMangaDesc() {
QueryBuilder<Manga, Manga, QAfterSortBy> thenByItemTypeDesc() {
return QueryBuilder.apply(this, (query) {
return query.addSortBy(r'isManga', Sort.desc);
return query.addSortBy(r'itemType', Sort.desc);
});
}
@ -3239,9 +3279,9 @@ extension MangaQueryWhereDistinct on QueryBuilder<Manga, Manga, QDistinct> {
});
}
QueryBuilder<Manga, Manga, QDistinct> distinctByIsManga() {
QueryBuilder<Manga, Manga, QDistinct> distinctByItemType() {
return QueryBuilder.apply(this, (query) {
return query.addDistinctBy(r'isManga');
return query.addDistinctBy(r'itemType');
});
}
@ -3366,9 +3406,9 @@ extension MangaQueryProperty on QueryBuilder<Manga, Manga, QQueryProperty> {
});
}
QueryBuilder<Manga, bool?, QQueryOperations> isMangaProperty() {
QueryBuilder<Manga, ItemType, QQueryOperations> itemTypeProperty() {
return QueryBuilder.apply(this, (query) {
return query.addPropertyName(r'isManga');
return query.addPropertyName(r'itemType');
});
}

72
lib/models/settings.dart
View file

@ -185,11 +185,38 @@ class Settings {
int? animeGridSize;
int? novelGridSize;
@enumerated
late SectionType disableSectionType;
bool? useLibass;
int? libraryFilterNovelDownloadType;
int? libraryFilterNovelUnreadType;
int? libraryFilterNovelStartedType;
int? libraryFilterNovelBookMarkedType;
bool? novelLibraryShowCategoryTabs;
bool? novelLibraryDownloadedChapters;
bool? novelLibraryShowLanguage;
bool? novelLibraryShowNumbersOfItems;
bool? novelLibraryShowContinueReadingButton;
bool? novelLibraryLocalSource;
late SortLibraryManga? sortLibraryNovel;
@enumerated
late DisplayType novelDisplayType;
Settings(
{this.id = 227,
this.displayType = DisplayType.compactGrid,
@ -273,7 +300,19 @@ class Settings {
this.mangaGridSize,
this.animeGridSize,
this.disableSectionType = SectionType.all,
this.useLibass = true});
this.useLibass = true,
this.libraryFilterNovelDownloadType = 0,
this.libraryFilterNovelUnreadType = 0,
this.libraryFilterNovelStartedType = 0,
this.libraryFilterNovelBookMarkedType = 0,
this.novelLibraryShowCategoryTabs = false,
this.novelLibraryDownloadedChapters = false,
this.novelLibraryShowLanguage = false,
this.novelLibraryShowNumbersOfItems = false,
this.novelLibraryShowContinueReadingButton = false,
this.novelLibraryLocalSource,
this.sortLibraryNovel,
this.novelDisplayType = DisplayType.comfortableGrid});
Settings.fromJson(Map<String, dynamic> json) {
animatePageTransitions = json['animatePageTransitions'];
@ -428,6 +467,22 @@ class Settings {
disableSectionType =
SectionType.values[json['disableSectionType'] ?? SectionType.all];
useLibass = json['useLibass'];
libraryFilterNovelBookMarkedType = json['libraryFilterNovelBookMarkedType'];
libraryFilterNovelDownloadType = json['libraryFilterNovelDownloadType'];
libraryFilterNovelStartedType = json['libraryFilterNovelStartedType'];
libraryFilterNovelUnreadType = json['libraryFilterNovelUnreadType'];
novelLibraryShowCategoryTabs = json['novelLibraryShowCategoryTabs'];
novelLibraryDownloadedChapters = json['novelLibraryDownloadedChapters'];
novelLibraryShowLanguage = json['novelLibraryShowLanguage'];
novelLibraryShowNumbersOfItems = json['novelLibraryShowNumbersOfItems'];
novelLibraryShowContinueReadingButton =
json['novelLibraryShowContinueReadingButton'];
novelLibraryLocalSource = json['novelLibraryLocalSource'];
sortLibraryNovel = json['sortLibraryNovel'] != null
? SortLibraryManga.fromJson(json['sortLibraryNovel'])
: null;
novelDisplayType = DisplayType
.values[json['novelDisplayType'] ?? DisplayType.compactGrid.index];
}
Map<String, dynamic> toJson() => {
@ -527,7 +582,20 @@ class Settings {
'mangaGridSize': mangaGridSize,
'animeGridSize': animeGridSize,
'disableSectionType': disableSectionType.index,
'useLibass': useLibass
'useLibass': useLibass,
'libraryFilterNovelBookMarkedType': libraryFilterNovelBookMarkedType,
'libraryFilterNovelDownloadType': libraryFilterNovelDownloadType,
'libraryFilterNovelStartedType': libraryFilterNovelStartedType,
'libraryFilterNovelUnreadType': libraryFilterNovelUnreadType,
'novelLibraryShowCategoryTabs': novelLibraryShowCategoryTabs,
'novelLibraryDownloadedChapters': novelLibraryDownloadedChapters,
'novelLibraryShowLanguage': novelLibraryShowLanguage,
'novelLibraryShowNumbersOfItems': novelLibraryShowNumbersOfItems,
'novelLibraryShowContinueReadingButton':
novelLibraryShowContinueReadingButton,
'novelLibraryLocalSource': novelLibraryLocalSource,
'sortLibraryNovel': sortLibraryNovel?.toJson(),
'novelDisplayType': novelDisplayType.index,
};
}

1522
lib/models/settings.g.dart
View file

File diff suppressed because it is too large Load diff

7
lib/models/source.dart
View file

@ -1,5 +1,6 @@
import 'package:isar/isar.dart';
import 'package:mangayomi/eval/dart/model/m_source.dart';
import 'package:mangayomi/models/manga.dart';
part 'source.g.dart';
@collection
@ -49,6 +50,9 @@ class Source {
bool? isManga;
@enumerated
late ItemType itemType;
String? appMinVerReq;
String? additionalParams;
@ -83,6 +87,7 @@ class Source {
this.sourceCode = '',
this.headers = '',
this.isManga = true,
this.itemType = ItemType.manga,
this.appMinVerReq = "",
this.additionalParams = "",
this.isLocal = false,
@ -102,6 +107,7 @@ class Source {
isAdded = json['isAdded'];
isFullData = json['isFullData'];
isManga = json['isManga'];
itemType = ItemType.values[json['itemType'] ?? 0];
isNsfw = json['isNsfw'];
isPinned = json['isPinned'];
lang = json['lang'];
@ -133,6 +139,7 @@ class Source {
'isAdded': isAdded,
'isFullData': isFullData,
'isManga': isManga,
'itemType': itemType,
'isNsfw': isNsfw,
'isPinned': isPinned,
'lang': lang,

175
lib/models/source.g.dart
View file

@ -107,49 +107,55 @@ const SourceSchema = CollectionSchema(
name: r'isTorrent',
type: IsarType.bool,
),
r'lang': PropertySchema(
r'itemType': PropertySchema(
id: 18,
name: r'itemType',
type: IsarType.byte,
enumMap: _SourceitemTypeEnumValueMap,
),
r'lang': PropertySchema(
id: 19,
name: r'lang',
type: IsarType.string,
),
r'lastUsed': PropertySchema(
id: 19,
id: 20,
name: r'lastUsed',
type: IsarType.bool,
),
r'name': PropertySchema(
id: 20,
id: 21,
name: r'name',
type: IsarType.string,
),
r'sourceCode': PropertySchema(
id: 21,
id: 22,
name: r'sourceCode',
type: IsarType.string,
),
r'sourceCodeLanguage': PropertySchema(
id: 22,
id: 23,
name: r'sourceCodeLanguage',
type: IsarType.byte,
enumMap: _SourcesourceCodeLanguageEnumValueMap,
),
r'sourceCodeUrl': PropertySchema(
id: 23,
id: 24,
name: r'sourceCodeUrl',
type: IsarType.string,
),
r'typeSource': PropertySchema(
id: 24,
id: 25,
name: r'typeSource',
type: IsarType.string,
),
r'version': PropertySchema(
id: 25,
id: 26,
name: r'version',
type: IsarType.string,
),
r'versionLast': PropertySchema(
id: 26,
id: 27,
name: r'versionLast',
type: IsarType.string,
)
@ -291,15 +297,16 @@ void _sourceSerialize(
writer.writeBool(offsets[15], object.isObsolete);
writer.writeBool(offsets[16], object.isPinned);
writer.writeBool(offsets[17], object.isTorrent);
writer.writeString(offsets[18], object.lang);
writer.writeBool(offsets[19], object.lastUsed);
writer.writeString(offsets[20], object.name);
writer.writeString(offsets[21], object.sourceCode);
writer.writeByte(offsets[22], object.sourceCodeLanguage.index);
writer.writeString(offsets[23], object.sourceCodeUrl);
writer.writeString(offsets[24], object.typeSource);
writer.writeString(offsets[25], object.version);
writer.writeString(offsets[26], object.versionLast);
writer.writeByte(offsets[18], object.itemType.index);
writer.writeString(offsets[19], object.lang);
writer.writeBool(offsets[20], object.lastUsed);
writer.writeString(offsets[21], object.name);
writer.writeString(offsets[22], object.sourceCode);
writer.writeByte(offsets[23], object.sourceCodeLanguage.index);
writer.writeString(offsets[24], object.sourceCodeUrl);
writer.writeString(offsets[25], object.typeSource);
writer.writeString(offsets[26], object.version);
writer.writeString(offsets[27], object.versionLast);
}
Source _sourceDeserialize(
@ -327,17 +334,19 @@ Source _sourceDeserialize(
isNsfw: reader.readBoolOrNull(offsets[14]),
isObsolete: reader.readBoolOrNull(offsets[15]),
isPinned: reader.readBoolOrNull(offsets[16]),
lang: reader.readStringOrNull(offsets[18]),
lastUsed: reader.readBoolOrNull(offsets[19]),
name: reader.readStringOrNull(offsets[20]),
sourceCode: reader.readStringOrNull(offsets[21]),
sourceCodeUrl: reader.readStringOrNull(offsets[23]),
typeSource: reader.readStringOrNull(offsets[24]),
version: reader.readStringOrNull(offsets[25]),
versionLast: reader.readStringOrNull(offsets[26]),
itemType: _SourceitemTypeValueEnumMap[reader.readByteOrNull(offsets[18])] ??
ItemType.manga,
lang: reader.readStringOrNull(offsets[19]),
lastUsed: reader.readBoolOrNull(offsets[20]),
name: reader.readStringOrNull(offsets[21]),
sourceCode: reader.readStringOrNull(offsets[22]),
sourceCodeUrl: reader.readStringOrNull(offsets[24]),
typeSource: reader.readStringOrNull(offsets[25]),
version: reader.readStringOrNull(offsets[26]),
versionLast: reader.readStringOrNull(offsets[27]),
);
object.sourceCodeLanguage = _SourcesourceCodeLanguageValueEnumMap[
reader.readByteOrNull(offsets[22])] ??
reader.readByteOrNull(offsets[23])] ??
SourceCodeLanguage.dart;
return object;
}
@ -386,30 +395,43 @@ P _sourceDeserializeProp<P>(
case 17:
return (reader.readBool(offset)) as P;
case 18:
return (reader.readStringOrNull(offset)) as P;
return (_SourceitemTypeValueEnumMap[reader.readByteOrNull(offset)] ??
ItemType.manga) as P;
case 19:
return (reader.readBoolOrNull(offset)) as P;
case 20:
return (reader.readStringOrNull(offset)) as P;
case 20:
return (reader.readBoolOrNull(offset)) as P;
case 21:
return (reader.readStringOrNull(offset)) as P;
case 22:
return (reader.readStringOrNull(offset)) as P;
case 23:
return (_SourcesourceCodeLanguageValueEnumMap[
reader.readByteOrNull(offset)] ??
SourceCodeLanguage.dart) as P;
case 23:
return (reader.readStringOrNull(offset)) as P;
case 24:
return (reader.readStringOrNull(offset)) as P;
case 25:
return (reader.readStringOrNull(offset)) as P;
case 26:
return (reader.readStringOrNull(offset)) as P;
case 27:
return (reader.readStringOrNull(offset)) as P;
default:
throw IsarError('Unknown property with id $propertyId');
}
}
const _SourceitemTypeEnumValueMap = {
'manga': 0,
'anime': 1,
'novel': 2,
};
const _SourceitemTypeValueEnumMap = {
0: ItemType.manga,
1: ItemType.anime,
2: ItemType.novel,
};
const _SourcesourceCodeLanguageEnumValueMap = {
'dart': 0,
'javascript': 1,
@ -1997,6 +2019,59 @@ extension SourceQueryFilter on QueryBuilder<Source, Source, QFilterCondition> {
});
}
QueryBuilder<Source, Source, QAfterFilterCondition> itemTypeEqualTo(
ItemType value) {
return QueryBuilder.apply(this, (query) {
return query.addFilterCondition(FilterCondition.equalTo(
property: r'itemType',
value: value,
));
});
}
QueryBuilder<Source, Source, QAfterFilterCondition> itemTypeGreaterThan(
ItemType value, {
bool include = false,
}) {
return QueryBuilder.apply(this, (query) {
return query.addFilterCondition(FilterCondition.greaterThan(
include: include,
property: r'itemType',
value: value,
));
});
}
QueryBuilder<Source, Source, QAfterFilterCondition> itemTypeLessThan(
ItemType value, {
bool include = false,
}) {
return QueryBuilder.apply(this, (query) {
return query.addFilterCondition(FilterCondition.lessThan(
include: include,
property: r'itemType',
value: value,
));
});
}
QueryBuilder<Source, Source, QAfterFilterCondition> itemTypeBetween(
ItemType lower,
ItemType upper, {
bool includeLower = true,
bool includeUpper = true,
}) {
return QueryBuilder.apply(this, (query) {
return query.addFilterCondition(FilterCondition.between(
property: r'itemType',
lower: lower,
includeLower: includeLower,
upper: upper,
includeUpper: includeUpper,
));
});
}
QueryBuilder<Source, Source, QAfterFilterCondition> langIsNull() {
return QueryBuilder.apply(this, (query) {
return query.addFilterCondition(const FilterCondition.isNull(
@ -3321,6 +3396,18 @@ extension SourceQuerySortBy on QueryBuilder<Source, Source, QSortBy> {
});
}
QueryBuilder<Source, Source, QAfterSortBy> sortByItemType() {
return QueryBuilder.apply(this, (query) {
return query.addSortBy(r'itemType', Sort.asc);
});
}
QueryBuilder<Source, Source, QAfterSortBy> sortByItemTypeDesc() {
return QueryBuilder.apply(this, (query) {
return query.addSortBy(r'itemType', Sort.desc);
});
}
QueryBuilder<Source, Source, QAfterSortBy> sortByLang() {
return QueryBuilder.apply(this, (query) {
return query.addSortBy(r'lang', Sort.asc);
@ -3659,6 +3746,18 @@ extension SourceQuerySortThenBy on QueryBuilder<Source, Source, QSortThenBy> {
});
}
QueryBuilder<Source, Source, QAfterSortBy> thenByItemType() {
return QueryBuilder.apply(this, (query) {
return query.addSortBy(r'itemType', Sort.asc);
});
}
QueryBuilder<Source, Source, QAfterSortBy> thenByItemTypeDesc() {
return QueryBuilder.apply(this, (query) {
return query.addSortBy(r'itemType', Sort.desc);
});
}
QueryBuilder<Source, Source, QAfterSortBy> thenByLang() {
return QueryBuilder.apply(this, (query) {
return query.addSortBy(r'lang', Sort.asc);
@ -3887,6 +3986,12 @@ extension SourceQueryWhereDistinct on QueryBuilder<Source, Source, QDistinct> {
});
}
QueryBuilder<Source, Source, QDistinct> distinctByItemType() {
return QueryBuilder.apply(this, (query) {
return query.addDistinctBy(r'itemType');
});
}
QueryBuilder<Source, Source, QDistinct> distinctByLang(
{bool caseSensitive = true}) {
return QueryBuilder.apply(this, (query) {
@ -4065,6 +4170,12 @@ extension SourceQueryProperty on QueryBuilder<Source, Source, QQueryProperty> {
});
}
QueryBuilder<Source, ItemType, QQueryOperations> itemTypeProperty() {
return QueryBuilder.apply(this, (query) {
return query.addPropertyName(r'itemType');
});
}
QueryBuilder<Source, String?, QQueryOperations> langProperty() {
return QueryBuilder.apply(this, (query) {
return query.addPropertyName(r'lang');

2
lib/modules/anime/providers/anime_player_controller_provider.dart
View file

@ -133,7 +133,7 @@ class AnimeStreamController extends _$AnimeStreamController {
history = History(
mangaId: getAnime().id,
date: DateTime.now().millisecondsSinceEpoch.toString(),
isManga: getAnime().isManga,
itemType: getAnime().itemType,
chapterId: episode.id)
..chapter.value = episode;
} else {

2
lib/modules/anime/providers/anime_player_controller_provider.g.dart
View file

@ -7,7 +7,7 @@ part of 'anime_player_controller_provider.dart';
// **************************************************************************
String _$animeStreamControllerHash() =>
r'0d97207a4d015d5089766ccbeeba093c55cb1ef9';
r'd3ec7fe7ac2af84393b128e430fd2f5b9224ed14';
/// Copied from Dart SDK
class _SystemHash {

2
lib/modules/browse/global_search/global_search_screen.dart
View file

@ -236,7 +236,7 @@ class _MangaGlobalImageCardState extends ConsumerState<MangaGlobalImageCard>
context: context,
getManga: getMangaDetail,
lang: widget.source.lang!,
isManga: widget.source.isManga ?? true,
itemType: widget.source.itemType,
useMaterialRoute: true,
source: widget.source.name!);
},

27
lib/modules/history/history_screen.dart
View file

@ -119,10 +119,14 @@ class _HistoryScreenState extends ConsumerState<HistoryScreen>
List<History> histories = isar.historys
.filter()
.idIsNotNull()
.chapter((q) => q.manga((q) =>
q.isMangaEqualTo(
_tabBarController.index ==
0)))
.chapter((q) => q.manga((q) => q
.itemTypeEqualTo(_tabBarController
.index ==
0
? ItemType.manga
: _tabBarController.index == 1
? ItemType.anime
: ItemType.novel)))
.findAllSync()
.toList();
isar.writeTxnSync(() {
@ -150,6 +154,7 @@ class _HistoryScreenState extends ConsumerState<HistoryScreen>
tabs: [
Tab(text: l10n.manga),
Tab(text: l10n.anime),
Tab(text: l10n.novel),
],
),
),
@ -157,11 +162,15 @@ class _HistoryScreenState extends ConsumerState<HistoryScreen>
padding: const EdgeInsets.only(top: 10),
child: TabBarView(controller: _tabBarController, children: [
HistoryTab(
isManga: true,
itemType: ItemType.manga,
query: _textEditingController.text,
),
HistoryTab(
isManga: false,
itemType: ItemType.anime,
query: _textEditingController.text,
),
HistoryTab(
itemType: ItemType.novel,
query: _textEditingController.text,
)
]),
@ -173,8 +182,8 @@ class _HistoryScreenState extends ConsumerState<HistoryScreen>
class HistoryTab extends ConsumerStatefulWidget {
final String query;
final bool isManga;
const HistoryTab({required this.isManga, required this.query, super.key});
final ItemType itemType;
const HistoryTab({required this.itemType, required this.query, super.key});
@override
ConsumerState<HistoryTab> createState() => _HistoryTabState();
@ -185,7 +194,7 @@ class _HistoryTabState extends ConsumerState<HistoryTab> {
Widget build(BuildContext context) {
final l10n = l10nLocalizations(context)!;
final history =
ref.watch(getAllHistoryStreamProvider(isManga: widget.isManga));
ref.watch(getAllHistoryStreamProvider(itemType: widget.itemType));
return Scaffold(
body: history.when(
data: (data) {

8
lib/modules/history/providers/isar_providers.dart
View file

@ -10,22 +10,22 @@ part 'isar_providers.g.dart';
@riverpod
Stream<List<History>> getAllHistoryStream(Ref ref,
{required bool isManga}) async* {
{required ItemType itemType}) async* {
yield* isar.historys
.filter()
.idIsNotNull()
.and()
.chapter((q) => q.manga((q) => q.isMangaEqualTo(isManga)))
.chapter((q) => q.manga((q) => q.itemTypeEqualTo(itemType)))
.watch(fireImmediately: true);
}
@riverpod
Stream<List<Update>> getAllUpdateStream(Ref ref,
{required bool isManga}) async* {
{required ItemType itemType}) async* {
yield* isar.updates
.filter()
.idIsNotNull()
.and()
.chapter((q) => q.manga((q) => q.isMangaEqualTo(isManga)))
.chapter((q) => q.manga((q) => q.itemTypeEqualTo(itemType)))
.watch(fireImmediately: true);
}

56
lib/modules/history/providers/isar_providers.g.dart
View file

@ -41,10 +41,10 @@ class GetAllHistoryStreamFamily extends Family<AsyncValue<List<History>>> {
/// See also [getAllHistoryStream].
GetAllHistoryStreamProvider call({
required bool isManga,
required ItemType itemType,
}) {
return GetAllHistoryStreamProvider(
isManga: isManga,
itemType: itemType,
);
}
@ -53,7 +53,7 @@ class GetAllHistoryStreamFamily extends Family<AsyncValue<List<History>>> {
covariant GetAllHistoryStreamProvider provider,
) {
return call(
isManga: provider.isManga,
itemType: provider.itemType,
);
}
@ -77,11 +77,11 @@ class GetAllHistoryStreamProvider
extends AutoDisposeStreamProvider<List<History>> {
/// See also [getAllHistoryStream].
GetAllHistoryStreamProvider({
required bool isManga,
required ItemType itemType,
}) : this._internal(
(ref) => getAllHistoryStream(
ref as GetAllHistoryStreamRef,
isManga: isManga,
itemType: itemType,
),
from: getAllHistoryStreamProvider,
name: r'getAllHistoryStreamProvider',
@ -92,7 +92,7 @@ class GetAllHistoryStreamProvider
dependencies: GetAllHistoryStreamFamily._dependencies,
allTransitiveDependencies:
GetAllHistoryStreamFamily._allTransitiveDependencies,
isManga: isManga,
itemType: itemType,
);
GetAllHistoryStreamProvider._internal(
@ -102,10 +102,10 @@ class GetAllHistoryStreamProvider
required super.allTransitiveDependencies,
required super.debugGetCreateSourceHash,
required super.from,
required this.isManga,
required this.itemType,
}) : super.internal();
final bool isManga;
final ItemType itemType;
@override
Override overrideWith(
@ -120,7 +120,7 @@ class GetAllHistoryStreamProvider
dependencies: null,
allTransitiveDependencies: null,
debugGetCreateSourceHash: null,
isManga: isManga,
itemType: itemType,
),
);
}
@ -132,13 +132,13 @@ class GetAllHistoryStreamProvider
@override
bool operator ==(Object other) {
return other is GetAllHistoryStreamProvider && other.isManga == isManga;
return other is GetAllHistoryStreamProvider && other.itemType == itemType;
}
@override
int get hashCode {
var hash = _SystemHash.combine(0, runtimeType.hashCode);
hash = _SystemHash.combine(hash, isManga.hashCode);
hash = _SystemHash.combine(hash, itemType.hashCode);
return _SystemHash.finish(hash);
}
@ -147,8 +147,8 @@ class GetAllHistoryStreamProvider
@Deprecated('Will be removed in 3.0. Use Ref instead')
// ignore: unused_element
mixin GetAllHistoryStreamRef on AutoDisposeStreamProviderRef<List<History>> {
/// The parameter `isManga` of this provider.
bool get isManga;
/// The parameter `itemType` of this provider.
ItemType get itemType;
}
class _GetAllHistoryStreamProviderElement
@ -157,7 +157,7 @@ class _GetAllHistoryStreamProviderElement
_GetAllHistoryStreamProviderElement(super.provider);
@override
bool get isManga => (origin as GetAllHistoryStreamProvider).isManga;
ItemType get itemType => (origin as GetAllHistoryStreamProvider).itemType;
}
String _$getAllUpdateStreamHash() =>
@ -174,10 +174,10 @@ class GetAllUpdateStreamFamily extends Family<AsyncValue<List<Update>>> {
/// See also [getAllUpdateStream].
GetAllUpdateStreamProvider call({
required bool isManga,
required ItemType itemType,
}) {
return GetAllUpdateStreamProvider(
isManga: isManga,
itemType: itemType,
);
}
@ -186,7 +186,7 @@ class GetAllUpdateStreamFamily extends Family<AsyncValue<List<Update>>> {
covariant GetAllUpdateStreamProvider provider,
) {
return call(
isManga: provider.isManga,
itemType: provider.itemType,
);
}
@ -210,11 +210,11 @@ class GetAllUpdateStreamProvider
extends AutoDisposeStreamProvider<List<Update>> {
/// See also [getAllUpdateStream].
GetAllUpdateStreamProvider({
required bool isManga,
required ItemType itemType,
}) : this._internal(
(ref) => getAllUpdateStream(
ref as GetAllUpdateStreamRef,
isManga: isManga,
itemType: itemType,
),
from: getAllUpdateStreamProvider,
name: r'getAllUpdateStreamProvider',
@ -225,7 +225,7 @@ class GetAllUpdateStreamProvider
dependencies: GetAllUpdateStreamFamily._dependencies,
allTransitiveDependencies:
GetAllUpdateStreamFamily._allTransitiveDependencies,
isManga: isManga,
itemType: itemType,
);
GetAllUpdateStreamProvider._internal(
@ -235,10 +235,10 @@ class GetAllUpdateStreamProvider
required super.allTransitiveDependencies,
required super.debugGetCreateSourceHash,
required super.from,
required this.isManga,
required this.itemType,
}) : super.internal();
final bool isManga;
final ItemType itemType;
@override
Override overrideWith(
@ -253,7 +253,7 @@ class GetAllUpdateStreamProvider
dependencies: null,
allTransitiveDependencies: null,
debugGetCreateSourceHash: null,
isManga: isManga,
itemType: itemType,
),
);
}
@ -265,13 +265,13 @@ class GetAllUpdateStreamProvider
@override
bool operator ==(Object other) {
return other is GetAllUpdateStreamProvider && other.isManga == isManga;
return other is GetAllUpdateStreamProvider && other.itemType == itemType;
}
@override
int get hashCode {
var hash = _SystemHash.combine(0, runtimeType.hashCode);
hash = _SystemHash.combine(hash, isManga.hashCode);
hash = _SystemHash.combine(hash, itemType.hashCode);
return _SystemHash.finish(hash);
}
@ -280,8 +280,8 @@ class GetAllUpdateStreamProvider
@Deprecated('Will be removed in 3.0. Use Ref instead')
// ignore: unused_element
mixin GetAllUpdateStreamRef on AutoDisposeStreamProviderRef<List<Update>> {
/// The parameter `isManga` of this provider.
bool get isManga;
/// The parameter `itemType` of this provider.
ItemType get itemType;
}
class _GetAllUpdateStreamProviderElement
@ -290,7 +290,7 @@ class _GetAllUpdateStreamProviderElement
_GetAllUpdateStreamProviderElement(super.provider);
@override
bool get isManga => (origin as GetAllUpdateStreamProvider).isManga;
ItemType get itemType => (origin as GetAllUpdateStreamProvider).itemType;
}
// ignore_for_file: type=lint
// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

172
lib/modules/library/library_screen.dart
View file

@ -40,8 +40,8 @@ import 'package:mangayomi/modules/widgets/progress_center.dart';
import 'package:mangayomi/utils/global_style.dart';
class LibraryScreen extends ConsumerStatefulWidget {
final bool isManga;
const LibraryScreen({required this.isManga, super.key});
final ItemType itemType;
const LibraryScreen({required this.itemType, super.key});
@override
ConsumerState<LibraryScreen> createState() => _LibraryScreenState();
@ -83,13 +83,13 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
final settings = settingsList.first;
final categories =
ref.watch(getMangaCategorieStreamProvider(isManga: widget.isManga));
ref.watch(getMangaCategorieStreamProvider(itemType: widget.itemType));
final withoutCategories = ref.watch(
getAllMangaWithoutCategoriesStreamProvider(isManga: widget.isManga));
getAllMangaWithoutCategoriesStreamProvider(itemType: widget.itemType));
final showCategoryTabs = ref.watch(libraryShowCategoryTabsStateProvider(
isManga: widget.isManga, settings: settings));
itemType: widget.itemType, settings: settings));
final mangaAll = ref.watch(
getAllMangaStreamProvider(categoryId: null, isManga: widget.isManga));
getAllMangaStreamProvider(categoryId: null, itemType: widget.itemType));
final l10n = l10nLocalizations(context)!;
return Scaffold(
body: mangaAll.when(
@ -113,55 +113,55 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
return Consumer(builder: (context, ref, child) {
bool reverse = ref
.watch(sortLibraryMangaStateProvider(
isManga: widget.isManga, settings: settings))
itemType: widget.itemType, settings: settings))
.reverse!;
final continueReaderBtn = ref.watch(
libraryShowContinueReadingButtonStateProvider(
isManga: widget.isManga, settings: settings));
itemType: widget.itemType, settings: settings));
final showNumbersOfItems = ref.watch(
libraryShowNumbersOfItemsStateProvider(
isManga: widget.isManga, settings: settings));
itemType: widget.itemType, settings: settings));
final localSource = ref.watch(
libraryLocalSourceStateProvider(
isManga: widget.isManga, settings: settings));
itemType: widget.itemType, settings: settings));
final downloadedChapter = ref.watch(
libraryDownloadedChaptersStateProvider(
isManga: widget.isManga, settings: settings));
itemType: widget.itemType, settings: settings));
final language = ref.watch(
libraryLanguageStateProvider(
isManga: widget.isManga, settings: settings));
itemType: widget.itemType, settings: settings));
final displayType = ref.watch(
libraryDisplayTypeStateProvider(
isManga: widget.isManga, settings: settings));
itemType: widget.itemType, settings: settings));
final isNotFiltering = ref.watch(
mangasFilterResultStateProvider(
isManga: widget.isManga,
itemType: widget.itemType,
mangaList: _entries,
settings: settings));
final downloadFilterType = ref.watch(
mangaFilterDownloadedStateProvider(
isManga: widget.isManga,
itemType: widget.itemType,
mangaList: _entries,
settings: settings));
final unreadFilterType = ref.watch(
mangaFilterUnreadStateProvider(
isManga: widget.isManga,
itemType: widget.itemType,
mangaList: _entries,
settings: settings));
final startedFilterType = ref.watch(
mangaFilterStartedStateProvider(
isManga: widget.isManga,
itemType: widget.itemType,
mangaList: _entries,
settings: settings));
final bookmarkedFilterType = ref.watch(
mangaFilterBookmarkedStateProvider(
isManga: widget.isManga,
itemType: widget.itemType,
mangaList: _entries,
settings: settings));
final sortType = ref
.watch(sortLibraryMangaStateProvider(
isManga: widget.isManga, settings: settings))
itemType: widget.itemType, settings: settings))
.index as int;
final numberOfItemsList = _filterAndSortManga(
data: man,
@ -364,53 +364,53 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
return Consumer(builder: (context, ref, child) {
bool reverse = ref
.watch(sortLibraryMangaStateProvider(
isManga: widget.isManga, settings: settings))
itemType: widget.itemType, settings: settings))
.reverse!;
final continueReaderBtn = ref.watch(
libraryShowContinueReadingButtonStateProvider(
isManga: widget.isManga, settings: settings));
itemType: widget.itemType, settings: settings));
final showNumbersOfItems = ref.watch(
libraryShowNumbersOfItemsStateProvider(
isManga: widget.isManga, settings: settings));
itemType: widget.itemType, settings: settings));
final localSource = ref.watch(
libraryLocalSourceStateProvider(
isManga: widget.isManga, settings: settings));
itemType: widget.itemType, settings: settings));
final downloadedChapter = ref.watch(
libraryDownloadedChaptersStateProvider(
isManga: widget.isManga, settings: settings));
itemType: widget.itemType, settings: settings));
final language = ref.watch(libraryLanguageStateProvider(
isManga: widget.isManga, settings: settings));
itemType: widget.itemType, settings: settings));
final displayType = ref.watch(
libraryDisplayTypeStateProvider(
isManga: widget.isManga, settings: settings));
itemType: widget.itemType, settings: settings));
final isNotFiltering = ref.watch(
mangasFilterResultStateProvider(
isManga: widget.isManga,
itemType: widget.itemType,
mangaList: _entries,
settings: settings));
final downloadFilterType = ref.watch(
mangaFilterDownloadedStateProvider(
isManga: widget.isManga,
itemType: widget.itemType,
mangaList: _entries,
settings: settings));
final unreadFilterType = ref.watch(
mangaFilterUnreadStateProvider(
isManga: widget.isManga,
itemType: widget.itemType,
mangaList: _entries,
settings: settings));
final startedFilterType = ref.watch(
mangaFilterStartedStateProvider(
isManga: widget.isManga,
itemType: widget.itemType,
mangaList: _entries,
settings: settings));
final bookmarkedFilterType = ref.watch(
mangaFilterBookmarkedStateProvider(
isManga: widget.isManga,
itemType: widget.itemType,
mangaList: _entries,
settings: settings));
final sortType = ref
.watch(sortLibraryMangaStateProvider(
isManga: widget.isManga, settings: settings))
itemType: widget.itemType, settings: settings))
.index;
final numberOfItemsList = _filterAndSortManga(
data: man,
@ -518,9 +518,9 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
.set();
ref.invalidate(
getAllMangaWithoutCategoriesStreamProvider(
isManga: widget.isManga));
itemType: widget.itemType));
ref.invalidate(getAllMangaStreamProvider(
categoryId: null, isManga: widget.isManga));
categoryId: null, itemType: widget.itemType));
},
child: Icon(
Icons.done_all_sharp,
@ -545,9 +545,9 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
.set();
ref.invalidate(
getAllMangaWithoutCategoriesStreamProvider(
isManga: widget.isManga));
itemType: widget.itemType));
ref.invalidate(getAllMangaStreamProvider(
categoryId: null, isManga: widget.isManga));
categoryId: null, itemType: widget.itemType));
},
child: Icon(
Icons.remove_done_sharp,
@ -611,10 +611,10 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
required int categoryId,
required Settings settings}) {
final mangas = ref.watch(getAllMangaStreamProvider(
categoryId: categoryId, isManga: widget.isManga));
categoryId: categoryId, itemType: widget.itemType));
final sortType = ref
.watch(sortLibraryMangaStateProvider(
isManga: widget.isManga, settings: settings))
itemType: widget.itemType, settings: settings))
.index;
return mangas.when(
data: (data) {
@ -661,10 +661,10 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
required Settings settings}) {
final l10n = l10nLocalizations(context)!;
final mangas = ref.watch(getAllMangaStreamProvider(
categoryId: categoryId, isManga: widget.isManga));
categoryId: categoryId, itemType: widget.itemType));
final sortType = ref
.watch(sortLibraryMangaStateProvider(
isManga: widget.isManga, settings: settings))
itemType: widget.itemType, settings: settings))
.index;
final mangaIdsList = ref.watch(mangasListStateProvider);
return Scaffold(
@ -702,7 +702,7 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
language: language,
mangaIdsList: mangaIdsList,
localSource: localSource,
isManga: widget.isManga,
itemType: widget.itemType,
),
);
}
@ -733,13 +733,13 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
required Settings settings}) {
final sortType = ref
.watch(sortLibraryMangaStateProvider(
isManga: widget.isManga, settings: settings))
itemType: widget.itemType, settings: settings))
.index;
final manga = withouCategories
? ref.watch(
getAllMangaWithoutCategoriesStreamProvider(isManga: widget.isManga))
getAllMangaWithoutCategoriesStreamProvider(itemType: widget.itemType))
: ref.watch(getAllMangaStreamProvider(
categoryId: null, isManga: widget.isManga));
categoryId: null, itemType: widget.itemType));
final mangaIdsList = ref.watch(mangasListStateProvider);
final l10n = l10nLocalizations(context)!;
return manga.when(
@ -776,7 +776,7 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
language: language,
mangaIdsList: mangaIdsList,
localSource: localSource,
isManga: widget.isManga,
itemType: widget.itemType,
),
);
}
@ -954,7 +954,7 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
.filter()
.idIsNotNull()
.and()
.forMangaEqualTo(widget.isManga)
.forItemTypeEqualTo(widget.itemType)
.watch(fireImmediately: true),
builder: (context, snapshot) {
return AlertDialog(
@ -1006,7 +1006,7 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
onPressed: () {
context.push("/categories", extra: (
true,
widget.isManga ? 0 : 1
widget.itemType
));
Navigator.pop(context);
},
@ -1059,7 +1059,7 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
onPressed: () {
context.push("/categories", extra: (
true,
widget.isManga ? 0 : 1
widget.itemType
));
Navigator.pop(context);
},
@ -1270,13 +1270,13 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
ListTileChapterFilter(
label: l10n.downloaded,
type: ref.watch(mangaFilterDownloadedStateProvider(
isManga: widget.isManga,
itemType: widget.itemType,
mangaList: _entries,
settings: settings)),
onTap: () {
ref
.read(mangaFilterDownloadedStateProvider(
isManga: widget.isManga,
itemType: widget.itemType,
mangaList: _entries,
settings: settings)
.notifier)
@ -1285,13 +1285,13 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
ListTileChapterFilter(
label: l10n.unread,
type: ref.watch(mangaFilterUnreadStateProvider(
isManga: widget.isManga,
itemType: widget.itemType,
mangaList: _entries,
settings: settings)),
onTap: () {
ref
.read(mangaFilterUnreadStateProvider(
isManga: widget.isManga,
itemType: widget.itemType,
mangaList: _entries,
settings: settings)
.notifier)
@ -1300,13 +1300,13 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
ListTileChapterFilter(
label: l10n.started,
type: ref.watch(mangaFilterStartedStateProvider(
isManga: widget.isManga,
itemType: widget.itemType,
mangaList: _entries,
settings: settings)),
onTap: () {
ref
.read(mangaFilterStartedStateProvider(
isManga: widget.isManga,
itemType: widget.itemType,
mangaList: _entries,
settings: settings)
.notifier)
@ -1315,14 +1315,14 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
ListTileChapterFilter(
label: l10n.bookmarked,
type: ref.watch(mangaFilterBookmarkedStateProvider(
isManga: widget.isManga,
itemType: widget.itemType,
mangaList: _entries,
settings: settings)),
onTap: () {
setState(() {
ref
.read(mangaFilterBookmarkedStateProvider(
isManga: widget.isManga,
itemType: widget.itemType,
mangaList: _entries,
settings: settings)
.notifier)
@ -1335,11 +1335,11 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
Consumer(builder: (context, ref, chil) {
final reverse = ref
.read(sortLibraryMangaStateProvider(
isManga: widget.isManga, settings: settings)
itemType: widget.itemType, settings: settings)
.notifier)
.isReverse();
final reverseChapter = ref.watch(sortLibraryMangaStateProvider(
isManga: widget.isManga, settings: settings));
itemType: widget.itemType, settings: settings));
return Column(
children: [
for (var i = 0; i < 7; i++)
@ -1349,7 +1349,7 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
onTap: () {
ref
.read(sortLibraryMangaStateProvider(
isManga: widget.isManga, settings: settings)
itemType: widget.itemType, settings: settings)
.notifier)
.set(i);
},
@ -1360,25 +1360,25 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
}),
Consumer(builder: (context, ref, chil) {
final display = ref.watch(libraryDisplayTypeStateProvider(
isManga: widget.isManga, settings: settings));
itemType: widget.itemType, settings: settings));
final displayV = ref.read(libraryDisplayTypeStateProvider(
isManga: widget.isManga, settings: settings)
itemType: widget.itemType, settings: settings)
.notifier);
final showCategoryTabs = ref.watch(libraryShowCategoryTabsStateProvider(
isManga: widget.isManga, settings: settings));
itemType: widget.itemType, settings: settings));
final continueReaderBtn = ref.watch(
libraryShowContinueReadingButtonStateProvider(
isManga: widget.isManga, settings: settings));
itemType: widget.itemType, settings: settings));
final showNumbersOfItems = ref.watch(
libraryShowNumbersOfItemsStateProvider(
isManga: widget.isManga, settings: settings));
itemType: widget.itemType, settings: settings));
final downloadedChapter = ref.watch(
libraryDownloadedChaptersStateProvider(
isManga: widget.isManga, settings: settings));
itemType: widget.itemType, settings: settings));
final language = ref.watch(libraryLanguageStateProvider(
isManga: widget.isManga, settings: settings));
itemType: widget.itemType, settings: settings));
final localSource = ref.watch(libraryLocalSourceStateProvider(
isManga: widget.isManga, settings: settings));
itemType: widget.itemType, settings: settings));
return SingleChildScrollView(
physics: const NeverScrollableScrollPhysics(),
child: Column(
@ -1451,7 +1451,7 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
Consumer(
builder: (context, ref, child) {
final gridSize = ref.watch(libraryGridSizeStateProvider(
isManga: widget.isManga)) ??
itemType: widget.itemType)) ??
0;
return Padding(
padding: const EdgeInsets.only(left: 8, right: 8, top: 10),
@ -1484,14 +1484,14 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
HapticFeedback.vibrate();
ref
.read(libraryGridSizeStateProvider(
isManga: widget.isManga)
itemType: widget.itemType)
.notifier)
.set(value.toInt());
},
onChangeEnd: (value) {
ref
.read(libraryGridSizeStateProvider(
isManga: widget.isManga)
itemType: widget.itemType)
.notifier)
.set(value.toInt(), end: true);
},
@ -1521,7 +1521,7 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
onTap: () {
ref
.read(libraryDownloadedChaptersStateProvider(
isManga: widget.isManga,
itemType: widget.itemType,
settings: settings)
.notifier)
.set(!downloadedChapter);
@ -1532,7 +1532,7 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
onTap: () {
ref
.read(libraryLanguageStateProvider(
isManga: widget.isManga,
itemType: widget.itemType,
settings: settings)
.notifier)
.set(!language);
@ -1543,7 +1543,7 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
onTap: () {
ref
.read(libraryLocalSourceStateProvider(
isManga: widget.isManga,
itemType: widget.itemType,
settings: settings)
.notifier)
.set(!localSource);
@ -1555,7 +1555,7 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
ref
.read(
libraryShowContinueReadingButtonStateProvider(
isManga: widget.isManga,
itemType: widget.itemType,
settings: settings)
.notifier)
.set(!continueReaderBtn);
@ -1579,7 +1579,7 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
onTap: () {
ref
.read(libraryShowCategoryTabsStateProvider(
isManga: widget.isManga,
itemType: widget.itemType,
settings: settings)
.notifier)
.set(!showCategoryTabs);
@ -1590,7 +1590,7 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
onTap: () {
ref
.read(libraryShowNumbersOfItemsStateProvider(
isManga: widget.isManga,
itemType: widget.itemType,
settings: settings)
.notifier)
.set(!showNumbersOfItems);
@ -1636,9 +1636,9 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
final mangaIdsList = ref.watch(mangasListStateProvider);
final manga = categoryId == null
? ref.watch(
getAllMangaWithoutCategoriesStreamProvider(isManga: widget.isManga))
getAllMangaWithoutCategoriesStreamProvider(itemType: widget.itemType))
: ref.watch(getAllMangaStreamProvider(
categoryId: categoryId, isManga: widget.isManga));
categoryId: categoryId, itemType: widget.itemType));
final l10n = l10nLocalizations(context)!;
return PreferredSize(
preferredSize: Size.fromHeight(AppBar().preferredSize.height),
@ -1707,7 +1707,9 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
: Row(
children: [
Text(
widget.isManga ? l10n.manga : l10n.anime,
widget.itemType == ItemType.manga ?
l10n.manga : widget.itemType == ItemType.anime ?
l10n.anime : l10n.novel,
style:
TextStyle(color: Theme.of(context).hintColor),
),
@ -1783,7 +1785,7 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
value: 1, child: Text(l10n.open_random_entry)),
PopupMenuItem<int>(
value: 2, child: Text(l10n.import)),
if (!widget.isManga)
if (widget.itemType == ItemType.anime)
PopupMenuItem<int>(
value: 3, child: Text(l10n.torrent_stream)),
];
@ -1806,8 +1808,8 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
source: randomManga.source!);
});
} else if (value == 2) {
_importLocal(context, widget.isManga);
} else if (value == 3 && !widget.isManga) {
_importLocal(context, widget.itemType);
} else if (value == 3 && widget.itemType == ItemType.anime) {
addTorrent(context);
}
}),
@ -1816,7 +1818,7 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
}
}
void _importLocal(BuildContext context, bool isManga) {
void _importLocal(BuildContext context, ItemType itemType) {
final l10n = l10nLocalizations(context)!;
bool isLoading = false;
showDialog(
@ -1850,7 +1852,7 @@ void _importLocal(BuildContext context, bool isManga) {
});
await ref.watch(
importArchivesFromFileProvider(
isManga: isManga,
itemType: itemType,
null,
init: true)
.future);
@ -1865,7 +1867,7 @@ void _importLocal(BuildContext context, bool isManga) {
children: [
const Icon(Icons.archive_outlined),
Text(
"${l10n.import_files} ( ${isManga ? ".zip, .cbz" : ".mp4, .mkv, .avi, and more"} )",
"${l10n.import_files} ( ${itemType == ItemType.manga ? ".zip, .cbz" : ".mp4, .mkv, .avi, and more"} )",
style: TextStyle(
color: Theme.of(context)
.textTheme

2
lib/modules/library/providers/add_torrent.dart
View file

@ -32,7 +32,7 @@ Future addTorrentFromUrlOrFromFile(Ref ref, Manga? mManga,
favorite: true,
source: 'torrent',
author: '',
isManga: false,
itemType: ItemType.anime,
genre: [],
imageUrl: '',
lang: '',

12
lib/modules/library/providers/isar_providers.dart
View file

@ -8,14 +8,14 @@ part 'isar_providers.g.dart';
@riverpod
Stream<List<Manga>> getAllMangaStream(Ref ref,
{required int? categoryId, required bool? isManga}) async* {
{required int? categoryId, required ItemType itemType}) async* {
yield* categoryId == null
? isar.mangas
.filter()
.idIsNotNull()
.favoriteEqualTo(true)
.and()
.isMangaEqualTo(isManga)
.itemTypeEqualTo(itemType)
.watch(fireImmediately: true)
: isar.mangas
.filter()
@ -24,26 +24,26 @@ Stream<List<Manga>> getAllMangaStream(Ref ref,
.categoriesIsNotEmpty()
.categoriesElementEqualTo(categoryId)
.and()
.isMangaEqualTo(isManga)
.itemTypeEqualTo(itemType)
.watch(fireImmediately: true);
}
@riverpod
Stream<List<Manga>> getAllMangaWithoutCategoriesStream(Ref ref,
{required bool? isManga}) async* {
{required ItemType itemType}) async* {
yield* isar.mangas
.filter()
.idIsNotNull()
.favoriteEqualTo(true)
.categoriesIsEmpty()
.and()
.isMangaEqualTo(isManga)
.itemTypeEqualTo(itemType)
.or()
.idIsNotNull()
.categoriesIsNull()
.favoriteEqualTo(true)
.and()
.isMangaEqualTo(isManga)
.itemTypeEqualTo(itemType)
.watch(fireImmediately: true);
}

58
lib/modules/library/providers/isar_providers.g.dart
View file

@ -41,11 +41,11 @@ class GetAllMangaStreamFamily extends Family<AsyncValue<List<Manga>>> {
/// See also [getAllMangaStream].
GetAllMangaStreamProvider call({
required int? categoryId,
required bool? isManga,
required ItemType itemType,
}) {
return GetAllMangaStreamProvider(
categoryId: categoryId,
isManga: isManga,
itemType: itemType,
);
}
@ -55,7 +55,7 @@ class GetAllMangaStreamFamily extends Family<AsyncValue<List<Manga>>> {
) {
return call(
categoryId: provider.categoryId,
isManga: provider.isManga,
itemType: provider.itemType,
);
}
@ -79,12 +79,12 @@ class GetAllMangaStreamProvider extends AutoDisposeStreamProvider<List<Manga>> {
/// See also [getAllMangaStream].
GetAllMangaStreamProvider({
required int? categoryId,
required bool? isManga,
required ItemType itemType,
}) : this._internal(
(ref) => getAllMangaStream(
ref as GetAllMangaStreamRef,
categoryId: categoryId,
isManga: isManga,
itemType: itemType,
),
from: getAllMangaStreamProvider,
name: r'getAllMangaStreamProvider',
@ -96,7 +96,7 @@ class GetAllMangaStreamProvider extends AutoDisposeStreamProvider<List<Manga>> {
allTransitiveDependencies:
GetAllMangaStreamFamily._allTransitiveDependencies,
categoryId: categoryId,
isManga: isManga,
itemType: itemType,
);
GetAllMangaStreamProvider._internal(
@ -107,11 +107,11 @@ class GetAllMangaStreamProvider extends AutoDisposeStreamProvider<List<Manga>> {
required super.debugGetCreateSourceHash,
required super.from,
required this.categoryId,
required this.isManga,
required this.itemType,
}) : super.internal();
final int? categoryId;
final bool? isManga;
final ItemType itemType;
@override
Override overrideWith(
@ -127,7 +127,7 @@ class GetAllMangaStreamProvider extends AutoDisposeStreamProvider<List<Manga>> {
allTransitiveDependencies: null,
debugGetCreateSourceHash: null,
categoryId: categoryId,
isManga: isManga,
itemType: itemType,
),
);
}
@ -141,14 +141,14 @@ class GetAllMangaStreamProvider extends AutoDisposeStreamProvider<List<Manga>> {
bool operator ==(Object other) {
return other is GetAllMangaStreamProvider &&
other.categoryId == categoryId &&
other.isManga == isManga;
other.itemType == itemType;
}
@override
int get hashCode {
var hash = _SystemHash.combine(0, runtimeType.hashCode);
hash = _SystemHash.combine(hash, categoryId.hashCode);
hash = _SystemHash.combine(hash, isManga.hashCode);
hash = _SystemHash.combine(hash, itemType.hashCode);
return _SystemHash.finish(hash);
}
@ -160,8 +160,8 @@ mixin GetAllMangaStreamRef on AutoDisposeStreamProviderRef<List<Manga>> {
/// The parameter `categoryId` of this provider.
int? get categoryId;
/// The parameter `isManga` of this provider.
bool? get isManga;
/// The parameter `itemType` of this provider.
ItemType get itemType;
}
class _GetAllMangaStreamProviderElement
@ -172,7 +172,7 @@ class _GetAllMangaStreamProviderElement
@override
int? get categoryId => (origin as GetAllMangaStreamProvider).categoryId;
@override
bool? get isManga => (origin as GetAllMangaStreamProvider).isManga;
ItemType get itemType => (origin as GetAllMangaStreamProvider).itemType;
}
String _$getAllMangaWithoutCategoriesStreamHash() =>
@ -191,10 +191,10 @@ class GetAllMangaWithoutCategoriesStreamFamily
/// See also [getAllMangaWithoutCategoriesStream].
GetAllMangaWithoutCategoriesStreamProvider call({
required bool? isManga,
required ItemType itemType,
}) {
return GetAllMangaWithoutCategoriesStreamProvider(
isManga: isManga,
itemType: itemType,
);
}
@ -203,7 +203,7 @@ class GetAllMangaWithoutCategoriesStreamFamily
covariant GetAllMangaWithoutCategoriesStreamProvider provider,
) {
return call(
isManga: provider.isManga,
itemType: provider.itemType,
);
}
@ -227,11 +227,11 @@ class GetAllMangaWithoutCategoriesStreamProvider
extends AutoDisposeStreamProvider<List<Manga>> {
/// See also [getAllMangaWithoutCategoriesStream].
GetAllMangaWithoutCategoriesStreamProvider({
required bool? isManga,
required ItemType itemType,
}) : this._internal(
(ref) => getAllMangaWithoutCategoriesStream(
ref as GetAllMangaWithoutCategoriesStreamRef,
isManga: isManga,
itemType: itemType,
),
from: getAllMangaWithoutCategoriesStreamProvider,
name: r'getAllMangaWithoutCategoriesStreamProvider',
@ -242,7 +242,7 @@ class GetAllMangaWithoutCategoriesStreamProvider
dependencies: GetAllMangaWithoutCategoriesStreamFamily._dependencies,
allTransitiveDependencies: GetAllMangaWithoutCategoriesStreamFamily
._allTransitiveDependencies,
isManga: isManga,
itemType: itemType,
);
GetAllMangaWithoutCategoriesStreamProvider._internal(
@ -252,10 +252,10 @@ class GetAllMangaWithoutCategoriesStreamProvider
required super.allTransitiveDependencies,
required super.debugGetCreateSourceHash,
required super.from,
required this.isManga,
required this.itemType,
}) : super.internal();
final bool? isManga;
final ItemType itemType;
@override
Override overrideWith(
@ -271,7 +271,7 @@ class GetAllMangaWithoutCategoriesStreamProvider
dependencies: null,
allTransitiveDependencies: null,
debugGetCreateSourceHash: null,
isManga: isManga,
itemType: itemType,
),
);
}
@ -284,13 +284,13 @@ class GetAllMangaWithoutCategoriesStreamProvider
@override
bool operator ==(Object other) {
return other is GetAllMangaWithoutCategoriesStreamProvider &&
other.isManga == isManga;
other.itemType == itemType;
}
@override
int get hashCode {
var hash = _SystemHash.combine(0, runtimeType.hashCode);
hash = _SystemHash.combine(hash, isManga.hashCode);
hash = _SystemHash.combine(hash, itemType.hashCode);
return _SystemHash.finish(hash);
}
@ -300,8 +300,8 @@ class GetAllMangaWithoutCategoriesStreamProvider
// ignore: unused_element
mixin GetAllMangaWithoutCategoriesStreamRef
on AutoDisposeStreamProviderRef<List<Manga>> {
/// The parameter `isManga` of this provider.
bool? get isManga;
/// The parameter `itemType` of this provider.
ItemType get itemType;
}
class _GetAllMangaWithoutCategoriesStreamProviderElement
@ -310,8 +310,8 @@ class _GetAllMangaWithoutCategoriesStreamProviderElement
_GetAllMangaWithoutCategoriesStreamProviderElement(super.provider);
@override
bool? get isManga =>
(origin as GetAllMangaWithoutCategoriesStreamProvider).isManga;
ItemType get itemType =>
(origin as GetAllMangaWithoutCategoriesStreamProvider).itemType;
}
String _$getSettingsStreamHash() => r'c5a51e0e3473b25d2365025832a27ed2cc029b27';

345
lib/modules/library/providers/library_state_provider.dart
View file

@ -12,8 +12,15 @@ part 'library_state_provider.g.dart';
@riverpod
class LibraryDisplayTypeState extends _$LibraryDisplayTypeState {
@override
DisplayType build({required bool isManga, required Settings settings}) {
return isManga ? settings.displayType : settings.animeDisplayType;
DisplayType build({required ItemType itemType, required Settings settings}) {
switch (itemType) {
case ItemType.manga:
return settings.displayType;
case ItemType.anime:
return settings.animeDisplayType;
default:
return settings.novelDisplayType;
}
}
String getLibraryDisplayTypeName(
@ -31,10 +38,16 @@ class LibraryDisplayTypeState extends _$LibraryDisplayTypeState {
Settings appSettings = Settings();
state = displayType;
if (isManga) {
appSettings = settings..displayType = displayType;
} else {
appSettings = settings..animeDisplayType = displayType;
switch (itemType) {
case ItemType.manga:
appSettings = settings..displayType = displayType;
break;
case ItemType.anime:
appSettings = settings..animeDisplayType = displayType;
break;
default:
appSettings = settings..novelDisplayType = displayType;
}
isar.writeTxnSync(() {
@ -46,8 +59,15 @@ class LibraryDisplayTypeState extends _$LibraryDisplayTypeState {
@riverpod
class LibraryGridSizeState extends _$LibraryGridSizeState {
@override
int? build({required bool isManga}) {
return isManga ? settings.mangaGridSize : settings.animeGridSize;
int? build({required ItemType itemType}) {
switch (itemType) {
case ItemType.manga:
return settings.mangaGridSize;
case ItemType.anime:
return settings.animeGridSize;
default:
return settings.novelGridSize;
}
}
Settings get settings {
@ -59,10 +79,15 @@ class LibraryGridSizeState extends _$LibraryGridSizeState {
state = value;
if (end) {
if (isManga) {
appSettings = settings..mangaGridSize = value;
} else {
appSettings = settings..animeGridSize = value;
switch (itemType) {
case ItemType.manga:
appSettings = settings..mangaGridSize = value;
break;
case ItemType.anime:
appSettings = settings..animeGridSize = value;
break;
default:
appSettings = settings..novelGridSize = value;
}
isar.writeTxnSync(() {
@ -77,24 +102,34 @@ class MangaFilterDownloadedState extends _$MangaFilterDownloadedState {
@override
int build(
{required List<Manga> mangaList,
required bool isManga,
required ItemType itemType,
required Settings settings}) {
state = getType();
return getType();
}
int getType() {
return isManga
? settings.libraryFilterMangasDownloadType!
: settings.libraryFilterAnimeDownloadType ?? 0;
switch (itemType) {
case ItemType.manga:
return settings.libraryFilterMangasDownloadType!;
case ItemType.anime:
return settings.libraryFilterAnimeDownloadType!;
default:
return settings.libraryFilterNovelDownloadType ?? 0;
}
}
void setType(int type) {
Settings appSettings = Settings();
if (isManga) {
appSettings = settings..libraryFilterMangasDownloadType = type;
} else {
appSettings = settings..libraryFilterAnimeDownloadType = type;
switch (itemType) {
case ItemType.manga:
appSettings = settings..libraryFilterMangasDownloadType = type;
break;
case ItemType.anime:
appSettings = settings..libraryFilterAnimeDownloadType = type;
break;
default:
appSettings = settings..libraryFilterNovelDownloadType = type;
}
isar.writeTxnSync(() {
isar.settings.putSync(appSettings);
@ -118,24 +153,34 @@ class MangaFilterUnreadState extends _$MangaFilterUnreadState {
@override
int build(
{required List<Manga> mangaList,
required bool isManga,
required ItemType itemType,
required Settings settings}) {
state = getType();
return getType();
}
int getType() {
return isManga
? settings.libraryFilterMangasUnreadType!
: settings.libraryFilterAnimeUnreadType ?? 0;
switch (itemType) {
case ItemType.manga:
return settings.libraryFilterMangasUnreadType!;
case ItemType.anime:
return settings.libraryFilterAnimeUnreadType!;
default:
return settings.libraryFilterNovelUnreadType ?? 0;
}
}
void setType(int type) {
Settings appSettings = Settings();
if (isManga) {
appSettings = settings..libraryFilterMangasUnreadType = type;
} else {
appSettings = settings..libraryFilterAnimeUnreadType = type;
switch (itemType) {
case ItemType.manga:
appSettings = settings..libraryFilterMangasUnreadType = type;
break;
case ItemType.anime:
appSettings = settings..libraryFilterAnimeUnreadType = type;
break;
default:
appSettings = settings..libraryFilterNovelUnreadType = type;
}
isar.writeTxnSync(() {
isar.settings.putSync(appSettings);
@ -208,24 +253,34 @@ class MangaFilterStartedState extends _$MangaFilterStartedState {
@override
int build(
{required List<Manga> mangaList,
required bool isManga,
required ItemType itemType,
required Settings settings}) {
state = getType();
return getType();
}
int getType() {
return isManga
? settings.libraryFilterMangasStartedType!
: settings.libraryFilterAnimeStartedType ?? 0;
switch (itemType) {
case ItemType.manga:
return settings.libraryFilterMangasStartedType!;
case ItemType.anime:
return settings.libraryFilterAnimeStartedType!;
default:
return settings.libraryFilterNovelStartedType ?? 0;
}
}
void setType(int type) {
Settings appSettings = Settings();
if (isManga) {
appSettings = settings..libraryFilterMangasStartedType = type;
} else {
appSettings = settings..libraryFilterAnimeStartedType = type;
switch (itemType) {
case ItemType.manga:
appSettings = settings..libraryFilterMangasStartedType = type;
break;
case ItemType.anime:
appSettings = settings..libraryFilterAnimeStartedType = type;
break;
default:
appSettings = settings..libraryFilterNovelStartedType = type;
}
isar.writeTxnSync(() {
isar.settings.putSync(appSettings);
@ -298,24 +353,34 @@ class MangaFilterBookmarkedState extends _$MangaFilterBookmarkedState {
@override
int build(
{required List<Manga> mangaList,
required bool isManga,
required ItemType itemType,
required Settings settings}) {
state = getType();
return getType();
}
int getType() {
return isManga
? settings.libraryFilterMangasBookMarkedType!
: settings.libraryFilterAnimeBookMarkedType ?? 0;
switch (itemType) {
case ItemType.manga:
return settings.libraryFilterMangasBookMarkedType!;
case ItemType.anime:
return settings.libraryFilterAnimeBookMarkedType!;
default:
return settings.libraryFilterNovelBookMarkedType ?? 0;
}
}
void setType(int type) {
Settings appSettings = Settings();
if (isManga) {
appSettings = settings..libraryFilterMangasBookMarkedType = type;
} else {
appSettings = settings..libraryFilterAnimeBookMarkedType = type;
switch (itemType) {
case ItemType.manga:
appSettings = settings..libraryFilterMangasBookMarkedType = type;
break;
case ItemType.anime:
appSettings = settings..libraryFilterAnimeBookMarkedType = type;
break;
default:
appSettings = settings..libraryFilterNovelBookMarkedType = type;
}
isar.writeTxnSync(() {
isar.settings.putSync(appSettings);
@ -388,16 +453,16 @@ class MangasFilterResultState extends _$MangasFilterResultState {
@override
bool build(
{required List<Manga> mangaList,
required bool isManga,
required ItemType itemType,
required Settings settings}) {
final downloadFilterType = ref.watch(mangaFilterDownloadedStateProvider(
mangaList: mangaList, isManga: isManga, settings: settings));
mangaList: mangaList, itemType: itemType, settings: settings));
final unreadFilterType = ref.watch(mangaFilterUnreadStateProvider(
mangaList: mangaList, isManga: isManga, settings: settings));
mangaList: mangaList, itemType: itemType, settings: settings));
final startedFilterType = ref.watch(mangaFilterStartedStateProvider(
mangaList: mangaList, isManga: isManga, settings: settings));
mangaList: mangaList, itemType: itemType, settings: settings));
final bookmarkedFilterType = ref.watch(mangaFilterBookmarkedStateProvider(
mangaList: mangaList, isManga: isManga, settings: settings));
mangaList: mangaList, itemType: itemType, settings: settings));
return downloadFilterType == 0 &&
unreadFilterType == 0 &&
startedFilterType == 0 &&
@ -408,18 +473,28 @@ class MangasFilterResultState extends _$MangasFilterResultState {
@riverpod
class LibraryShowCategoryTabsState extends _$LibraryShowCategoryTabsState {
@override
bool build({required bool isManga, required Settings settings}) {
return isManga
? settings.libraryShowCategoryTabs!
: settings.animeLibraryShowCategoryTabs ?? false;
bool build({required ItemType itemType, required Settings settings}) {
switch (itemType) {
case ItemType.manga:
return settings.libraryShowCategoryTabs!;
case ItemType.anime:
return settings.animeLibraryShowCategoryTabs!;
default:
return settings.novelLibraryShowCategoryTabs ?? false;
}
}
void set(bool value) {
Settings appSettings = Settings();
if (isManga) {
appSettings = settings..libraryShowCategoryTabs = value;
} else {
appSettings = settings..animeLibraryShowCategoryTabs = value;
switch (itemType) {
case ItemType.manga:
appSettings = settings..libraryShowCategoryTabs = value;
break;
case ItemType.anime:
appSettings = settings..animeLibraryShowCategoryTabs = value;
break;
default:
appSettings = settings..novelLibraryShowCategoryTabs = value;
}
state = value;
isar.writeTxnSync(() {
@ -431,18 +506,28 @@ class LibraryShowCategoryTabsState extends _$LibraryShowCategoryTabsState {
@riverpod
class LibraryDownloadedChaptersState extends _$LibraryDownloadedChaptersState {
@override
bool build({required bool isManga, required Settings settings}) {
return isManga
? settings.libraryDownloadedChapters!
: settings.animeLibraryDownloadedChapters ?? false;
bool build({required ItemType itemType, required Settings settings}) {
switch (itemType) {
case ItemType.manga:
return settings.libraryDownloadedChapters!;
case ItemType.anime:
return settings.animeLibraryDownloadedChapters!;
default:
return settings.novelLibraryDownloadedChapters ?? false;
}
}
void set(bool value) {
Settings appSettings = Settings();
if (isManga) {
appSettings = settings..libraryDownloadedChapters = value;
} else {
appSettings = settings..animeLibraryDownloadedChapters = value;
switch (itemType) {
case ItemType.manga:
appSettings = settings..libraryDownloadedChapters = value;
break;
case ItemType.anime:
appSettings = settings..animeLibraryDownloadedChapters = value;
break;
default:
appSettings = settings..novelLibraryDownloadedChapters = value;
}
state = value;
isar.writeTxnSync(() {
@ -454,18 +539,28 @@ class LibraryDownloadedChaptersState extends _$LibraryDownloadedChaptersState {
@riverpod
class LibraryLanguageState extends _$LibraryLanguageState {
@override
bool build({required bool isManga, required Settings settings}) {
return isManga
? settings.libraryShowLanguage!
: settings.animeLibraryShowLanguage ?? false;
bool build({required ItemType itemType, required Settings settings}) {
switch (itemType) {
case ItemType.manga:
return settings.libraryShowLanguage!;
case ItemType.anime:
return settings.animeLibraryShowLanguage!;
default:
return settings.novelLibraryShowLanguage ?? false;
}
}
void set(bool value) {
Settings appSettings = Settings();
if (isManga) {
appSettings = settings..libraryShowLanguage = value;
} else {
appSettings = settings..animeLibraryShowLanguage = value;
switch (itemType) {
case ItemType.manga:
appSettings = settings..libraryShowLanguage = value;
break;
case ItemType.anime:
appSettings = settings..animeLibraryShowLanguage = value;
break;
default:
appSettings = settings..novelLibraryShowLanguage = value;
}
state = value;
isar.writeTxnSync(() {
@ -477,18 +572,28 @@ class LibraryLanguageState extends _$LibraryLanguageState {
@riverpod
class LibraryLocalSourceState extends _$LibraryLocalSourceState {
@override
bool build({required bool isManga, required Settings settings}) {
return isManga
? settings.libraryLocalSource ?? false
: settings.animeLibraryLocalSource ?? false;
bool build({required ItemType itemType, required Settings settings}) {
switch (itemType) {
case ItemType.manga:
return settings.libraryLocalSource!;
case ItemType.anime:
return settings.animeLibraryLocalSource!;
default:
return settings.novelLibraryLocalSource ?? false;
}
}
void set(bool value) {
Settings appSettings = Settings();
if (isManga) {
appSettings = settings..libraryLocalSource = value;
} else {
appSettings = settings..animeLibraryLocalSource = value;
switch (itemType) {
case ItemType.manga:
appSettings = settings..libraryLocalSource = value;
break;
case ItemType.anime:
appSettings = settings..animeLibraryLocalSource = value;
break;
default:
appSettings = settings..novelLibraryLocalSource = value;
}
state = value;
isar.writeTxnSync(() {
@ -500,18 +605,28 @@ class LibraryLocalSourceState extends _$LibraryLocalSourceState {
@riverpod
class LibraryShowNumbersOfItemsState extends _$LibraryShowNumbersOfItemsState {
@override
bool build({required bool isManga, required Settings settings}) {
return isManga
? settings.libraryShowNumbersOfItems!
: settings.animeLibraryShowNumbersOfItems ?? false;
bool build({required ItemType itemType, required Settings settings}) {
switch (itemType) {
case ItemType.manga:
return settings.libraryShowNumbersOfItems!;
case ItemType.anime:
return settings.animeLibraryShowNumbersOfItems!;
default:
return settings.novelLibraryShowNumbersOfItems ?? false;
}
}
void set(bool value) {
Settings appSettings = Settings();
if (isManga) {
appSettings = settings..libraryShowNumbersOfItems = value;
} else {
appSettings = settings..animeLibraryShowNumbersOfItems = value;
switch (itemType) {
case ItemType.manga:
appSettings = settings..libraryShowNumbersOfItems = value;
break;
case ItemType.anime:
appSettings = settings..animeLibraryShowNumbersOfItems = value;
break;
default:
appSettings = settings..novelLibraryShowNumbersOfItems = value;
}
state = value;
isar.writeTxnSync(() {
@ -524,18 +639,28 @@ class LibraryShowNumbersOfItemsState extends _$LibraryShowNumbersOfItemsState {
class LibraryShowContinueReadingButtonState
extends _$LibraryShowContinueReadingButtonState {
@override
bool build({required bool isManga, required Settings settings}) {
return isManga
? settings.libraryShowContinueReadingButton!
: settings.animeLibraryShowContinueReadingButton ?? false;
bool build({required ItemType itemType, required Settings settings}) {
switch (itemType) {
case ItemType.manga:
return settings.libraryShowContinueReadingButton!;
case ItemType.anime:
return settings.animeLibraryShowContinueReadingButton!;
default:
return settings.novelLibraryShowContinueReadingButton ?? false;
}
}
void set(bool value) {
Settings appSettings = Settings();
if (isManga) {
appSettings = settings..libraryShowContinueReadingButton = value;
} else {
appSettings = settings..animeLibraryShowContinueReadingButton = value;
switch (itemType) {
case ItemType.manga:
appSettings = settings..libraryShowContinueReadingButton = value;
break;
case ItemType.anime:
appSettings = settings..animeLibraryShowContinueReadingButton = value;
break;
default:
appSettings = settings..novelLibraryShowContinueReadingButton = value;
}
state = value;
isar.writeTxnSync(() {
@ -547,10 +672,15 @@ class LibraryShowContinueReadingButtonState
@riverpod
class SortLibraryMangaState extends _$SortLibraryMangaState {
@override
SortLibraryManga build({required bool isManga, required Settings settings}) {
return isManga
? settings.sortLibraryManga ?? SortLibraryManga()
: settings.sortLibraryAnime ?? SortLibraryManga();
SortLibraryManga build({required ItemType itemType, required Settings settings}) {
switch (itemType) {
case ItemType.manga:
return settings.sortLibraryManga ?? SortLibraryManga();
case ItemType.anime:
return settings.sortLibraryAnime ?? SortLibraryManga();
default:
return settings.sortLibraryNovel ?? SortLibraryManga();
}
}
void update(bool reverse, int index) {
@ -559,10 +689,15 @@ class SortLibraryMangaState extends _$SortLibraryMangaState {
..index = index
..reverse = state.index == index ? !reverse : reverse;
if (isManga) {
appSettings = settings..sortLibraryManga = value;
} else {
appSettings = settings..sortLibraryAnime = value;
switch (itemType) {
case ItemType.manga:
appSettings = settings..sortLibraryManga = value;
break;
case ItemType.anime:
appSettings = settings..sortLibraryAnime = value;
break;
default:
appSettings = settings..sortLibraryNovel = value;
}
isar.writeTxnSync(() {
isar.settings.putSync(appSettings);

541
lib/modules/library/providers/library_state_provider.g.dart
View file

File diff suppressed because it is too large Load diff

14
lib/modules/library/providers/local_archive.dart
View file

@ -11,11 +11,11 @@ part 'local_archive.g.dart';
@riverpod
Future importArchivesFromFile(Ref ref, Manga? mManga,
{required bool isManga, required bool init}) async {
{required ItemType itemType, required bool init}) async {
FilePickerResult? result = await FilePicker.platform.pickFiles(
allowMultiple: true,
type: FileType.custom,
allowedExtensions: isManga
allowedExtensions: itemType == ItemType.manga
? ['cbz', 'zip']
: ['mp4', 'mov', 'avi', 'flv', 'wmv', 'mpeg', 'mkv']);
if (result != null) {
@ -25,7 +25,7 @@ Future importArchivesFromFile(Ref ref, Manga? mManga,
favorite: true,
source: 'archive',
author: '',
isManga: isManga,
itemType: itemType,
genre: [],
imageUrl: '',
lang: '',
@ -39,20 +39,20 @@ Future importArchivesFromFile(Ref ref, Manga? mManga,
artist: '',
);
for (var file in result.files.reversed.toList()) {
(String, LocalExtensionType, Uint8List, String)? data = isManga
(String, LocalExtensionType, Uint8List, String)? data = itemType == ItemType.manga
? await ref.watch(getArchivesDataFromFileProvider(file.path!).future)
: null;
String name = _getName(file.path!);
if (init) {
manga.customCoverImage = isManga ? data!.$3 : null;
manga.customCoverImage = itemType == ItemType.manga ? data!.$3 : null;
}
isar.writeTxnSync(() {
isar.mangas.putSync(manga);
final chapters = Chapter(
name: isManga ? data!.$1 : name,
archivePath: isManga ? data!.$4 : file.path,
name: itemType == ItemType.manga ? data!.$1 : name,
archivePath: itemType == ItemType.manga ? data!.$4 : file.path,
mangaId: manga.id)
..manga.value = manga;
isar.chapters.putSync(chapters);

28
lib/modules/library/providers/local_archive.g.dart
View file

@ -42,12 +42,12 @@ class ImportArchivesFromFileFamily extends Family<AsyncValue> {
/// See also [importArchivesFromFile].
ImportArchivesFromFileProvider call(
Manga? mManga, {
required bool isManga,
required ItemType itemType,
required bool init,
}) {
return ImportArchivesFromFileProvider(
mManga,
isManga: isManga,
itemType: itemType,
init: init,
);
}
@ -58,7 +58,7 @@ class ImportArchivesFromFileFamily extends Family<AsyncValue> {
) {
return call(
provider.mManga,
isManga: provider.isManga,
itemType: provider.itemType,
init: provider.init,
);
}
@ -84,13 +84,13 @@ class ImportArchivesFromFileProvider
/// See also [importArchivesFromFile].
ImportArchivesFromFileProvider(
Manga? mManga, {
required bool isManga,
required ItemType itemType,
required bool init,
}) : this._internal(
(ref) => importArchivesFromFile(
ref as ImportArchivesFromFileRef,
mManga,
isManga: isManga,
itemType: itemType,
init: init,
),
from: importArchivesFromFileProvider,
@ -103,7 +103,7 @@ class ImportArchivesFromFileProvider
allTransitiveDependencies:
ImportArchivesFromFileFamily._allTransitiveDependencies,
mManga: mManga,
isManga: isManga,
itemType: itemType,
init: init,
);
@ -115,12 +115,12 @@ class ImportArchivesFromFileProvider
required super.debugGetCreateSourceHash,
required super.from,
required this.mManga,
required this.isManga,
required this.itemType,
required this.init,
}) : super.internal();
final Manga? mManga;
final bool isManga;
final ItemType itemType;
final bool init;
@override
@ -137,7 +137,7 @@ class ImportArchivesFromFileProvider
allTransitiveDependencies: null,
debugGetCreateSourceHash: null,
mManga: mManga,
isManga: isManga,
itemType: itemType,
init: init,
),
);
@ -152,7 +152,7 @@ class ImportArchivesFromFileProvider
bool operator ==(Object other) {
return other is ImportArchivesFromFileProvider &&
other.mManga == mManga &&
other.isManga == isManga &&
other.itemType == itemType &&
other.init == init;
}
@ -160,7 +160,7 @@ class ImportArchivesFromFileProvider
int get hashCode {
var hash = _SystemHash.combine(0, runtimeType.hashCode);
hash = _SystemHash.combine(hash, mManga.hashCode);
hash = _SystemHash.combine(hash, isManga.hashCode);
hash = _SystemHash.combine(hash, itemType.hashCode);
hash = _SystemHash.combine(hash, init.hashCode);
return _SystemHash.finish(hash);
@ -173,8 +173,8 @@ mixin ImportArchivesFromFileRef on AutoDisposeFutureProviderRef<Object?> {
/// The parameter `mManga` of this provider.
Manga? get mManga;
/// The parameter `isManga` of this provider.
bool get isManga;
/// The parameter `itemType` of this provider.
ItemType get itemType;
/// The parameter `init` of this provider.
bool get init;
@ -188,7 +188,7 @@ class _ImportArchivesFromFileProviderElement
@override
Manga? get mManga => (origin as ImportArchivesFromFileProvider).mManga;
@override
bool get isManga => (origin as ImportArchivesFromFileProvider).isManga;
ItemType get itemType => (origin as ImportArchivesFromFileProvider).itemType;
@override
bool get init => (origin as ImportArchivesFromFileProvider).init;
}

14
lib/modules/library/widgets/library_gridview_widget.dart
View file

@ -29,7 +29,7 @@ class LibraryGridViewWidget extends StatefulWidget {
final bool downloadedChapter;
final bool continueReaderBtn;
final bool localSource;
final bool isManga;
final ItemType itemType;
const LibraryGridViewWidget(
{super.key,
required this.entriesManga,
@ -40,7 +40,7 @@ class LibraryGridViewWidget extends StatefulWidget {
required this.continueReaderBtn,
required this.mangaIdsList,
required this.localSource,
required this.isManga});
required this.itemType});
@override
State<LibraryGridViewWidget> createState() => _LibraryGridViewWidgetState();
@ -51,10 +51,10 @@ class _LibraryGridViewWidgetState extends State<LibraryGridViewWidget> {
Widget build(BuildContext context) {
return Consumer(builder: (context, ref, child) {
final isLongPressed = ref.watch(isLongPressedMangaStateProvider);
final isManga = widget.isManga;
final itemType = widget.itemType;
final gridSize =
ref.watch(libraryGridSizeStateProvider(isManga: isManga));
ref.watch(libraryGridSizeStateProvider(itemType: itemType));
return GridViewWidget(
gridSize: gridSize,
childAspectRatio: widget.isComfortableGrid ? 0.642 : 0.69,
@ -97,9 +97,9 @@ class _LibraryGridViewWidgetState extends State<LibraryGridViewWidget> {
mangaM: entry,
source: entry.source!);
ref.invalidate(getAllMangaWithoutCategoriesStreamProvider(
isManga: widget.isManga));
itemType: widget.itemType));
ref.invalidate(getAllMangaStreamProvider(
categoryId: null, isManga: widget.isManga));
categoryId: null, itemType: widget.itemType));
}
},
onLongPress: () {
@ -279,7 +279,7 @@ class _LibraryGridViewWidgetState extends State<LibraryGridViewWidget> {
.idIsNotNull()
.and()
.chapter((q) => q.manga((q) =>
q.isMangaEqualTo(entry.isManga!)))
q.itemTypeEqualTo(entry.itemType!)))
.watch(fireImmediately: true),
builder: (context, snapshot) {
if (snapshot.hasData &&

6
lib/modules/library/widgets/library_listview_widget.dart
View file

@ -59,9 +59,9 @@ class LibraryListViewWidget extends StatelessWidget {
mangaM: entry,
source: entry.source!);
ref.invalidate(getAllMangaWithoutCategoriesStreamProvider(
isManga: entry.isManga));
itemType: entry.itemType));
ref.invalidate(getAllMangaStreamProvider(
categoryId: null, isManga: entry.isManga));
categoryId: null, itemType: entry.itemType));
}
},
onLongPress: () {
@ -264,7 +264,7 @@ class LibraryListViewWidget extends StatelessWidget {
.idIsNotNull()
.and()
.chapter((q) => q.manga((q) =>
q.isMangaEqualTo(entry.isManga!)))
q.itemTypeEqualTo(entry.itemType)))
.watch(fireImmediately: true),
builder: (context, snapshot) {
if (snapshot.hasData &&

23
lib/modules/main_view/main_screen.dart
View file

@ -39,14 +39,15 @@ class MainScreen extends ConsumerWidget {
routerCurrentLocationStateProvider(context),
);
bool isReadingScreen =
location == '/mangareaderview' || location == '/animePlayerView';
location == '/mangaReaderView' || location == '/animePlayerView' || location == '/novelReaderView';
int currentIndex = switch (location) {
null || '/MangaLibrary' => 0,
'/AnimeLibrary' => 1,
'/updates' => 2,
'/history' => 3,
'/browse' => 4,
_ => 5,
'/NovelLibrary' => 5,
_ => 6,
};
final incognitoMode = ref.watch(incognitoModeStateProvider);
@ -95,6 +96,7 @@ class MainScreen extends ConsumerWidget {
null => 100,
!= '/MangaLibrary' &&
!= '/AnimeLibrary' &&
!= '/NovelLibrary' &&
!= '/history' &&
!= '/updates' &&
!= '/browse' &&
@ -134,6 +136,15 @@ class MainScreen extends ConsumerWidget {
padding: const EdgeInsets.only(
top: 5),
child: Text(l10n.anime))),
NavigationRailDestination(
selectedIcon: const Icon(
Icons.local_library),
icon: const Icon(Icons
.local_library_outlined),
label: Padding(
padding: const EdgeInsets.only(
top: 5),
child: Text(l10n.novel))),
NavigationRailDestination(
selectedIcon:
const Icon(Icons.new_releases),
@ -180,9 +191,10 @@ class MainScreen extends ConsumerWidget {
final fn = switch (newIndex) {
0 => route.go('/MangaLibrary'),
1 => route.go('/AnimeLibrary'),
2 => route.go('/updates'),
3 => route.go('/history'),
4 => route.go('/browse'),
2 => route.go('/NovelLibrary'),
3 => route.go('/updates'),
4 => route.go('/history'),
5 => route.go('/browse'),
_ => route.go('/more'),
};
fn;
@ -216,6 +228,7 @@ class MainScreen extends ConsumerWidget {
null => null,
!= '/MangaLibrary' &&
!= '/AnimeLibrary' &&
!= '/NovelLibrary' &&
!= '/history' &&
!= '/updates' &&
!= '/browse' &&

13
lib/modules/main_view/providers/migration.dart
View file

@ -21,10 +21,8 @@ Future<void> migration(Ref ref) async {
.chapterIdIsNull()
.or()
.idIsNotNull()
.isMangaIsNull()
.findAllSync();
final tracks =
isar.tracks.filter().idIsNotNull().isMangaIsNull().findAllSync();
final tracks = isar.tracks.filter().idIsNotNull().findAllSync();
isar.writeTxnSync(() {
//mangaId in chapter
@ -40,14 +38,17 @@ Future<void> migration(Ref ref) async {
//chapterId and isManga in History
for (var history in histories) {
final chapterId = history.chapter.value?.id;
final isManga = history.chapter.value?.manga.value?.isManga;
final itemType =
history.chapter.value?.manga.value?.itemType ?? ItemType.manga;
isar.historys.putSync(history
..chapterId = chapterId
..isManga = isManga);
..itemType = itemType);
}
// isManga in Track
for (var track in tracks) {
final isManga = isar.mangas.getSync(track.mangaId!)?.isManga;
final isManga =
(isar.mangas.getSync(track.mangaId!)?.itemType ?? ItemType.manga) ==
ItemType.manga;
isar.tracks.putSync(track..isManga = isManga);
}
});

40
lib/modules/manga/detail/manga_detail_view.dart
View file

@ -509,7 +509,12 @@ class _MangaDetailViewState extends ConsumerState<MangaDetailView>
if (value == 0) {
context.push("/categories", extra: (
true,
widget.manga!.isManga! ? 0 : 1
widget.manga!.itemType == ItemType.manga
? 0
: widget.manga!.itemType ==
ItemType.anime
? 1
: 2
));
} else if (value == 1) {
} else if (value == 2) {
@ -583,7 +588,9 @@ class _MangaDetailViewState extends ConsumerState<MangaDetailView>
8),
child: Text(
widget.manga!
.isManga!
.itemType !=
ItemType
.anime
? l10n.n_chapters(
chapters
.length)
@ -612,7 +619,10 @@ class _MangaDetailViewState extends ConsumerState<MangaDetailView>
color: context
.secondaryColor),
label: Text(
widget.manga!.isManga!
widget.manga!
.itemType !=
ItemType
.anime
? l10n
.add_chapters
: l10n
@ -634,8 +644,9 @@ class _MangaDetailViewState extends ConsumerState<MangaDetailView>
manga: manga);
} else {
await ref.watch(importArchivesFromFileProvider(
isManga: manga
.isManga!,
itemType:
manga
.itemType,
manga,
init:
false)
@ -1360,7 +1371,7 @@ class _MangaDetailViewState extends ConsumerState<MangaDetailView>
padding:
const EdgeInsets.symmetric(horizontal: 8),
child: Text(
widget.manga!.isManga!
widget.manga!.itemType != ItemType.anime
? l10n.n_chapters(chapterLength)
: l10n.n_episodes(chapterLength),
style: const TextStyle(
@ -1377,7 +1388,7 @@ class _MangaDetailViewState extends ConsumerState<MangaDetailView>
icon: Icon(Icons.add,
color: context.secondaryColor),
label: Text(
widget.manga!.isManga!
widget.manga!.itemType != ItemType.anime
? l10n.add_chapters
: l10n.add_episodes,
style: TextStyle(
@ -1391,7 +1402,7 @@ class _MangaDetailViewState extends ConsumerState<MangaDetailView>
} else {
await ref.watch(
importArchivesFromFileProvider(
isManga: manga.isManga!,
itemType: manga.itemType,
manga,
init: false)
.future);
@ -1642,7 +1653,8 @@ class _MangaDetailViewState extends ConsumerState<MangaDetailView>
final trackSearch =
await trackersSearchraggableMenu(
context,
isManga: widget.manga!.isManga!,
isManga: widget.manga!.itemType !=
ItemType.anime,
track: Track(
status:
TrackStatus.planToRead,
@ -1960,14 +1972,16 @@ class _MangaDetailViewState extends ConsumerState<MangaDetailView>
mangaId: widget.manga!.id!,
syncId: entries[index].syncId!,
trackRes: trackRes.first,
isManga: widget.manga!.isManga!)
isManga:
widget.manga!.itemType == ItemType.manga)
: TrackListile(
text: l10nLocalizations(context)!.add_tracker,
onTap: () async {
final trackSearch =
await trackersSearchraggableMenu(
context,
isManga: widget.manga!.isManga!,
isManga: widget.manga!.itemType !=
ItemType.anime,
track: Track(
status: TrackStatus.planToRead,
syncId: entries[index].syncId!,
@ -1977,7 +1991,9 @@ class _MangaDetailViewState extends ConsumerState<MangaDetailView>
await ref
.read(trackStateProvider(
track: null,
isManga: widget.manga!.isManga!)
isManga:
widget.manga!.itemType !=
ItemType.anime)
.notifier)
.setTrackSearch(
trackSearch,

16
lib/modules/manga/detail/manga_details_view.dart
View file

@ -55,7 +55,7 @@ class _MangaDetailsViewState extends ConsumerState<MangaDetailsView> {
.idIsNotNull()
.and()
.chapter((q) => q.manga(
(q) => q.isMangaEqualTo(widget.manga.isManga!)))
(q) => q.itemTypeEqualTo(widget.manga.itemType)))
.watch(fireImmediately: true),
builder: (context, snapshot) {
final isFr =
@ -196,7 +196,7 @@ class _MangaDetailsViewState extends ConsumerState<MangaDetailsView> {
.filter()
.idIsNotNull()
.and()
.forMangaEqualTo(widget.manga.isManga)
.forItemTypeEqualTo(widget.manga.itemType)
.isNotEmptySync();
if (checkCategoryList) {
_openCategory(widget.manga);
@ -257,7 +257,7 @@ class _MangaDetailsViewState extends ConsumerState<MangaDetailsView> {
.filter()
.idIsNotNull()
.and()
.forMangaEqualTo(widget.manga.isManga)
.forItemTypeEqualTo(widget.manga.itemType)
.watch(fireImmediately: true),
builder: (context, snapshot) {
if (snapshot.hasData && snapshot.data!.isNotEmpty) {
@ -294,8 +294,14 @@ class _MangaDetailsViewState extends ConsumerState<MangaDetailsView> {
children: [
TextButton(
onPressed: () {
context.push("/categories",
extra: (true, widget.manga.isManga! ? 0 : 1));
context.push("/categories", extra: (
true,
widget.manga.itemType == ItemType.manga
? 0
: widget.manga.itemType == ItemType.anime
? 1
: 2
));
Navigator.pop(context);
},
child: Text(l10n.edit)),

2
lib/modules/manga/detail/providers/update_manga_detail_providers.dart
View file

@ -49,7 +49,7 @@ Future<dynamic> updateMangaDetail(Ref ref,
..link = getManga.link?.trim().trimLeft().trimRight() ?? manga.link
..source = manga.source
..lang = manga.lang
..isManga = source.isManga
..itemType = source.itemType
..lastUpdate = DateTime.now().millisecondsSinceEpoch;
final checkManga = isar.mangas.getSync(mangaId);
if (checkManga!.chapters.isNotEmpty && isInit) {

3
lib/modules/manga/detail/widgets/chapter_list_tile_widget.dart
View file

@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:mangayomi/models/chapter.dart';
import 'package:mangayomi/models/manga.dart';
import 'package:mangayomi/providers/l10n_providers.dart';
import 'package:mangayomi/utils/date.dart';
import 'package:mangayomi/utils/extensions/build_context_extensions.dart';
@ -89,7 +90,7 @@ class ChapterListTileWidget extends ConsumerWidget {
children: [
const Text(' • '),
Text(
!chapter.manga.value!.isManga!
chapter.manga.value!.itemType == ItemType.anime
? l10n.episode_progress(Duration(
milliseconds:
int.parse(chapter.lastPageRead!))

11
lib/modules/manga/download/providers/download_provider.dart
View file

@ -1,6 +1,7 @@
import 'dart:convert';
import 'dart:io';
import 'dart:typed_data';
import 'package:mangayomi/models/manga.dart';
import 'package:mangayomi/models/page.dart';
import 'package:mangayomi/services/background_downloader/background_downloader.dart';
import 'package:isar/isar.dart';
@ -45,9 +46,15 @@ Future<List<PageUrl>> downloadChapter(
: "";
final chapterName = chapter.name!.replaceForbiddenCharacters(' ');
final isManga = chapter.manga.value!.isManga!;
final itemType = chapter.manga.value!.itemType;
final isManga = itemType == ItemType.manga;
final itemTypePath = itemType == ItemType.manga
? "Manga"
: itemType == ItemType.anime
? "Anime"
: "Novel";
final finalPath =
"downloads/${isManga ? "Manga" : "Anime"}/${manga.source} (${manga.lang!.toUpperCase()})/${manga.name!.replaceForbiddenCharacters('_')}${isManga ? "/$scanlator${chapter.name!.replaceForbiddenCharacters('_')}" : ""}";
"downloads/$itemTypePath/${manga.source} (${manga.lang!.toUpperCase()})/${manga.name!.replaceForbiddenCharacters('_')}${isManga ? "/$scanlator${chapter.name!.replaceForbiddenCharacters('_')}" : ""}";
path = Directory("${path1!.path}$finalPath/");
Map<String, String> videoHeader = {};
bool hasM3U8File = false;

19
lib/modules/manga/home/manga_home_screen.dart
View file

@ -4,6 +4,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:go_router/go_router.dart';
import 'package:mangayomi/eval/dart/model/m_manga.dart';
import 'package:mangayomi/eval/dart/model/m_pages.dart';
import 'package:mangayomi/models/manga.dart';
import 'package:mangayomi/models/settings.dart';
import 'package:mangayomi/models/source.dart';
import 'package:mangayomi/modules/library/providers/library_state_provider.dart';
@ -520,14 +521,14 @@ class _MangaHomeScreenState extends ConsumerState<MangaHomeScreen> {
return buildProgressIndicator();
}
return MangaHomeImageCardListTile(
isManga: source.isManga ?? true,
itemType: source.itemType,
manga: _mangaList[index],
source: source);
})
: Consumer(builder: (context, ref, child) {
final gridSize = ref.watch(
libraryGridSizeStateProvider(
isManga: source.isManga!));
itemType: source.itemType));
return GridViewWidget(
gridSize: gridSize,
@ -540,7 +541,7 @@ class _MangaHomeScreenState extends ConsumerState<MangaHomeScreen> {
return buildProgressIndicator();
}
return MangaHomeImageCard(
isManga: source.isManga ?? true,
itemType: source.itemType,
manga: _mangaList[index],
source: source,
isComfortableGrid: isComfortableGrid,
@ -639,14 +640,14 @@ class _MangaHomeScreenState extends ConsumerState<MangaHomeScreen> {
class MangaHomeImageCard extends ConsumerStatefulWidget {
final MManga manga;
final bool isManga;
final ItemType itemType;
final Source source;
final bool isComfortableGrid;
const MangaHomeImageCard(
{super.key,
required this.manga,
required this.source,
required this.isManga,
required this.itemType,
required this.isComfortableGrid});
@override
@ -662,7 +663,7 @@ class _MangaHomeImageCardState extends ConsumerState<MangaHomeImageCard>
return MangaImageCardWidget(
getMangaDetail: widget.manga,
source: widget.source,
isManga: widget.isManga,
itemType: widget.itemType,
isComfortableGrid: widget.isComfortableGrid);
}
@ -672,13 +673,13 @@ class _MangaHomeImageCardState extends ConsumerState<MangaHomeImageCard>
class MangaHomeImageCardListTile extends ConsumerStatefulWidget {
final MManga manga;
final bool isManga;
final ItemType itemType;
final Source source;
const MangaHomeImageCardListTile(
{super.key,
required this.manga,
required this.source,
required this.isManga});
required this.itemType});
@override
ConsumerState<MangaHomeImageCardListTile> createState() =>
@ -695,7 +696,7 @@ class _MangaHomeImageCardListTileState
return MangaImageCardListTileWidget(
getMangaDetail: widget.manga,
source: widget.source,
isManga: widget.isManga);
itemType: widget.itemType);
}
@override

31
lib/modules/manga/reader/providers/push_router.dart
View file

@ -3,6 +3,7 @@ import 'package:go_router/go_router.dart';
import 'package:isar/isar.dart';
import 'package:mangayomi/main.dart';
import 'package:mangayomi/models/chapter.dart';
import 'package:mangayomi/models/manga.dart';
import 'package:mangayomi/models/source.dart';
Future<void> pushMangaReaderView({
@ -23,19 +24,31 @@ Future<void> pushMangaReaderView({
.findAllSync()
.isNotEmpty;
if (sourceExist || chapter.manga.value!.isLocalArchive!) {
if (chapter.manga.value!.isManga!) {
await context.push('/mangareaderview', extra: chapter);
} else {
await context.push('/animePlayerView', extra: chapter);
switch (chapter.manga.value!.itemType) {
case ItemType.manga:
await context.push('/mangaReaderView', extra: chapter);
break;
case ItemType.anime:
await context.push('/animePlayerView', extra: chapter);
break;
case ItemType.novel:
await context.push('/novelReaderView', extra: chapter);
break;
}
}
}
void pushReplacementMangaReaderView(
{required BuildContext context, required Chapter chapter}) {
if (chapter.manga.value!.isManga!) {
context.pushReplacement('/mangareaderview', extra: chapter);
} else {
context.pushReplacement('/animePlayerView', extra: chapter);
}
switch (chapter.manga.value!.itemType) {
case ItemType.manga:
context.pushReplacement('/mangaReaderView', extra: chapter);
break;
case ItemType.anime:
context.pushReplacement('/animePlayerView', extra: chapter);
break;
case ItemType.novel:
context.pushReplacement('/novelReaderView', extra: chapter);
break;
}
}

12
lib/modules/manga/reader/providers/reader_controller_provider.dart
View file

@ -171,7 +171,7 @@ class ReaderController extends _$ReaderController {
history = History(
mangaId: getManga().id,
date: DateTime.now().millisecondsSinceEpoch.toString(),
isManga: getManga().isManga,
itemType: getManga().itemType,
chapterId: chapter.id)
..chapter.value = chapter;
} else {
@ -379,7 +379,7 @@ extension ChapterExtensions on Chapter {
final tracks = isar.tracks
.filter()
.idIsNotNull()
.isMangaEqualTo(manga.isManga)
.isMangaEqualTo(manga.itemType == ItemType.manga)
.mangaIdEqualTo(manga.id!)
.findAllSync();
@ -398,15 +398,17 @@ extension ChapterExtensions on Chapter {
track.status = TrackStatus.completed;
track.finishedReadingDate = DateTime.now().millisecondsSinceEpoch;
} else {
track.status =
manga.isManga! ? TrackStatus.reading : TrackStatus.watching;
track.status = manga.itemType == ItemType.manga
? TrackStatus.reading
: TrackStatus.watching;
if (track.lastChapterRead == 1) {
track.startedReadingDate = DateTime.now().millisecondsSinceEpoch;
}
}
}
ref
.read(trackStateProvider(track: track, isManga: manga.isManga)
.read(trackStateProvider(
track: track, isManga: manga.itemType == ItemType.manga)
.notifier)
.updateManga();
}

2
lib/modules/manga/reader/providers/reader_controller_provider.g.dart
View file

@ -171,7 +171,7 @@ class _CurrentIndexProviderElement
Chapter get chapter => (origin as CurrentIndexProvider).chapter;
}
String _$readerControllerHash() => r'cc4f5fbe4192def4d19d9150340d305ba0ecf463';
String _$readerControllerHash() => r'6576f3506dc5ef309f870de3e5c6e92efe03eefd';
abstract class _$ReaderController extends BuildlessAutoDisposeNotifier<void> {
late final Chapter chapter;

20
lib/modules/more/categories/categories_screen.dart
View file

@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:mangayomi/main.dart';
import 'package:mangayomi/models/category.dart';
import 'package:mangayomi/models/manga.dart';
import 'package:mangayomi/modules/more/categories/providers/isar_providers.dart';
import 'package:mangayomi/modules/more/categories/widgets/custom_textfield.dart';
import 'package:mangayomi/modules/more/settings/sync/providers/sync_providers.dart';
@ -47,15 +48,19 @@ class _CategoriesScreenState extends ConsumerState<CategoriesScreen>
tabs: [
Tab(text: l10n.manga),
Tab(text: l10n.anime),
Tab(text: l10n.novel),
],
),
),
body: TabBarView(controller: _tabBarController, children: const [
CategoriesTab(
isManga: true,
itemType: ItemType.manga,
),
CategoriesTab(
isManga: false,
itemType: ItemType.anime,
),
CategoriesTab(
itemType: ItemType.novel,
)
]),
),
@ -64,8 +69,8 @@ class _CategoriesScreenState extends ConsumerState<CategoriesScreen>
}
class CategoriesTab extends ConsumerStatefulWidget {
final bool isManga;
const CategoriesTab({required this.isManga, super.key});
final ItemType itemType;
const CategoriesTab({required this.itemType, super.key});
@override
ConsumerState<CategoriesTab> createState() => _CategoriesTabState();
@ -77,7 +82,7 @@ class _CategoriesTabState extends ConsumerState<CategoriesTab> {
Widget build(BuildContext context) {
final l10n = l10nLocalizations(context)!;
final categories =
ref.watch(getMangaCategorieStreamProvider(isManga: widget.isManga));
ref.watch(getMangaCategorieStreamProvider(itemType: widget.itemType));
return Scaffold(
body: categories.when(
data: (data) {
@ -185,7 +190,8 @@ class _CategoriesTabState extends ConsumerState<CategoriesTab> {
.notifier)
.addDeletedCategoryAsync(
_entries[
index], false);
index],
false);
await isar
.categorys
.delete(_entries[
@ -279,7 +285,7 @@ class _CategoriesTabState extends ConsumerState<CategoriesTab> {
: () async {
await isar.writeTxn(() async {
await isar.categorys.put(Category(
forManga: widget.isManga,
forItemType: widget.itemType,
name: controller.text,
));
});

5
lib/modules/more/categories/providers/isar_providers.dart
View file

@ -1,17 +1,18 @@
import 'package:isar/isar.dart';
import 'package:mangayomi/main.dart';
import 'package:mangayomi/models/category.dart';
import 'package:mangayomi/models/manga.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
part 'isar_providers.g.dart';
@riverpod
Stream<List<Category>> getMangaCategorieStream(Ref ref,
{required bool isManga}) async* {
{required ItemType itemType}) async* {
yield* isar.categorys
.filter()
.idIsNotNull()
.and()
.forMangaEqualTo(isManga)
.forItemTypeEqualTo(itemType)
.watch(fireImmediately: true);
}

29
lib/modules/more/categories/providers/isar_providers.g.dart
View file

@ -41,10 +41,10 @@ class GetMangaCategorieStreamFamily extends Family<AsyncValue<List<Category>>> {
/// See also [getMangaCategorieStream].
GetMangaCategorieStreamProvider call({
required bool isManga,
required ItemType itemType,
}) {
return GetMangaCategorieStreamProvider(
isManga: isManga,
itemType: itemType,
);
}
@ -53,7 +53,7 @@ class GetMangaCategorieStreamFamily extends Family<AsyncValue<List<Category>>> {
covariant GetMangaCategorieStreamProvider provider,
) {
return call(
isManga: provider.isManga,
itemType: provider.itemType,
);
}
@ -77,11 +77,11 @@ class GetMangaCategorieStreamProvider
extends AutoDisposeStreamProvider<List<Category>> {
/// See also [getMangaCategorieStream].
GetMangaCategorieStreamProvider({
required bool isManga,
required ItemType itemType,
}) : this._internal(
(ref) => getMangaCategorieStream(
ref as GetMangaCategorieStreamRef,
isManga: isManga,
itemType: itemType,
),
from: getMangaCategorieStreamProvider,
name: r'getMangaCategorieStreamProvider',
@ -92,7 +92,7 @@ class GetMangaCategorieStreamProvider
dependencies: GetMangaCategorieStreamFamily._dependencies,
allTransitiveDependencies:
GetMangaCategorieStreamFamily._allTransitiveDependencies,
isManga: isManga,
itemType: itemType,
);
GetMangaCategorieStreamProvider._internal(
@ -102,10 +102,10 @@ class GetMangaCategorieStreamProvider
required super.allTransitiveDependencies,
required super.debugGetCreateSourceHash,
required super.from,
required this.isManga,
required this.itemType,
}) : super.internal();
final bool isManga;
final ItemType itemType;
@override
Override overrideWith(
@ -120,7 +120,7 @@ class GetMangaCategorieStreamProvider
dependencies: null,
allTransitiveDependencies: null,
debugGetCreateSourceHash: null,
isManga: isManga,
itemType: itemType,
),
);
}
@ -132,13 +132,14 @@ class GetMangaCategorieStreamProvider
@override
bool operator ==(Object other) {
return other is GetMangaCategorieStreamProvider && other.isManga == isManga;
return other is GetMangaCategorieStreamProvider &&
other.itemType == itemType;
}
@override
int get hashCode {
var hash = _SystemHash.combine(0, runtimeType.hashCode);
hash = _SystemHash.combine(hash, isManga.hashCode);
hash = _SystemHash.combine(hash, itemType.hashCode);
return _SystemHash.finish(hash);
}
@ -148,8 +149,8 @@ class GetMangaCategorieStreamProvider
// ignore: unused_element
mixin GetMangaCategorieStreamRef
on AutoDisposeStreamProviderRef<List<Category>> {
/// The parameter `isManga` of this provider.
bool get isManga;
/// The parameter `itemType` of this provider.
ItemType get itemType;
}
class _GetMangaCategorieStreamProviderElement
@ -158,7 +159,7 @@ class _GetMangaCategorieStreamProviderElement
_GetMangaCategorieStreamProviderElement(super.provider);
@override
bool get isManga => (origin as GetMangaCategorieStreamProvider).isManga;
ItemType get itemType => (origin as GetMangaCategorieStreamProvider).itemType;
}
// ignore_for_file: type=lint
// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

2424
lib/modules/novel/novel_reader_view.dart Normal file
View file

File diff suppressed because it is too large Load diff

33
lib/modules/updates/updates_screen.dart
View file

@ -42,7 +42,11 @@ class _UpdatesScreenState extends ConsumerState<UpdatesScreen>
.idIsNotNull()
.favoriteEqualTo(true)
.and()
.isMangaEqualTo(_tabBarController.index == 0)
.itemTypeEqualTo(_tabBarController.index == 0
? ItemType.manga
: _tabBarController.index == 1
? ItemType.anime
: ItemType.novel)
.findAllSync();
int numbers = 0;
@ -160,10 +164,14 @@ class _UpdatesScreenState extends ConsumerState<UpdatesScreen>
List<Update> updates = isar.updates
.filter()
.idIsNotNull()
.chapter((q) => q.manga((q) =>
q.isMangaEqualTo(
_tabBarController.index ==
0)))
.chapter((q) => q.manga((q) => q
.itemTypeEqualTo(_tabBarController
.index ==
0
? ItemType.manga
: _tabBarController.index == 1
? ItemType.anime
: ItemType.novel)))
.findAllSync()
.toList();
isar.writeTxnSync(() {
@ -191,6 +199,7 @@ class _UpdatesScreenState extends ConsumerState<UpdatesScreen>
tabs: [
Tab(text: l10n.manga),
Tab(text: l10n.anime),
Tab(text: l10n.novel),
],
),
),
@ -198,11 +207,15 @@ class _UpdatesScreenState extends ConsumerState<UpdatesScreen>
padding: const EdgeInsets.only(top: 10),
child: TabBarView(controller: _tabBarController, children: [
UpdateTab(
isManga: true,
itemType: ItemType.manga,
query: _textEditingController.text,
isLoading: _isLoading),
UpdateTab(
isManga: false,
itemType: ItemType.anime,
query: _textEditingController.text,
isLoading: _isLoading),
UpdateTab(
itemType: ItemType.novel,
query: _textEditingController.text,
isLoading: _isLoading)
]),
@ -214,10 +227,10 @@ class _UpdatesScreenState extends ConsumerState<UpdatesScreen>
class UpdateTab extends ConsumerStatefulWidget {
final String query;
final bool isManga;
final ItemType itemType;
final bool isLoading;
const UpdateTab(
{required this.isManga,
{required this.itemType,
required this.query,
required this.isLoading,
super.key});
@ -231,7 +244,7 @@ class _UpdateTabState extends ConsumerState<UpdateTab> {
Widget build(BuildContext context) {
final l10n = l10nLocalizations(context)!;
final update =
ref.watch(getAllUpdateStreamProvider(isManga: widget.isManga));
ref.watch(getAllUpdateStreamProvider(itemType: widget.itemType));
return Scaffold(
body: Stack(
children: [

24
lib/modules/widgets/manga_image_card_widget.dart
View file

@ -19,7 +19,7 @@ import 'package:mangayomi/modules/widgets/cover_view_widget.dart';
class MangaImageCardWidget extends ConsumerWidget {
final Source source;
final bool isManga;
final ItemType itemType;
final bool isComfortableGrid;
final MManga? getMangaDetail;
@ -28,7 +28,7 @@ class MangaImageCardWidget extends ConsumerWidget {
super.key,
required this.getMangaDetail,
required this.isComfortableGrid,
required this.isManga});
required this.itemType});
@override
Widget build(BuildContext context, WidgetRef ref) {
@ -68,7 +68,7 @@ class MangaImageCardWidget extends ConsumerWidget {
getManga: getMangaDetail!,
lang: source.lang!,
source: source.name!,
isManga: isManga);
itemType: itemType);
},
onLongPress: () {
pushToMangaReaderDetail(
@ -76,7 +76,7 @@ class MangaImageCardWidget extends ConsumerWidget {
getManga: getMangaDetail!,
lang: source.lang!,
source: source.name!,
isManga: isManga,
itemType: itemType,
addToFavourite: true);
},
onSecondaryTap: () {
@ -85,7 +85,7 @@ class MangaImageCardWidget extends ConsumerWidget {
getManga: getMangaDetail!,
lang: source.lang!,
source: source.name!,
isManga: isManga,
itemType: itemType,
addToFavourite: true);
},
children: [
@ -121,13 +121,13 @@ class MangaImageCardWidget extends ConsumerWidget {
class MangaImageCardListTileWidget extends ConsumerWidget {
final Source source;
final bool isManga;
final ItemType itemType;
final MManga? getMangaDetail;
const MangaImageCardListTileWidget(
{required this.source,
super.key,
required this.isManga,
required this.itemType,
required this.getMangaDetail});
@override
@ -166,7 +166,7 @@ class MangaImageCardListTileWidget extends ConsumerWidget {
getManga: getMangaDetail!,
lang: source.lang!,
source: source.name!,
isManga: isManga);
itemType: itemType);
},
onLongPress: () {
pushToMangaReaderDetail(
@ -174,7 +174,7 @@ class MangaImageCardListTileWidget extends ConsumerWidget {
getManga: getMangaDetail!,
lang: source.lang!,
source: source.name!,
isManga: isManga,
itemType: itemType,
addToFavourite: true);
},
onSecondaryTap: () {
@ -183,7 +183,7 @@ class MangaImageCardListTileWidget extends ConsumerWidget {
getManga: getMangaDetail!,
lang: source.lang!,
source: source.name!,
isManga: isManga,
itemType: itemType,
addToFavourite: true);
},
child: Row(
@ -252,7 +252,7 @@ Future<void> pushToMangaReaderDetail(
required String source,
int? archiveId,
Manga? mangaM,
bool? isManga,
ItemType? itemType,
bool useMaterialRoute = false,
bool addToFavourite = false}) async {
int? mangaId;
@ -269,7 +269,7 @@ Future<void> pushToMangaReaderDetail(
source: source,
lang: lang,
lastUpdate: 0,
isManga: isManga ?? true,
itemType: itemType ?? ItemType.manga,
artist: getManga.artist ?? '');
final empty = isar.mangas
.filter()

18
lib/providers/storage_provider.dart
View file

@ -83,18 +83,28 @@ class StorageProvider {
String scanlator = chapter.scanlator?.isNotEmpty ?? false
? "${chapter.scanlator!.replaceForbiddenCharacters('_')}_"
: "";
final isManga = chapter.manga.value!.isManga!;
final itemType = chapter.manga.value!.itemType;
final itemTypePath = itemType == ItemType.manga
? "Manga"
: itemType == ItemType.anime
? "Anime"
: "Novel";
final dir = await getDirectory();
return Directory(
"${dir!.path}/downloads/${isManga ? "Manga" : "Anime"}/${manga.source} (${manga.lang!.toUpperCase()})/${manga.name!.replaceForbiddenCharacters('_')}/$scanlator${chapter.name!.replaceForbiddenCharacters('_')}/");
"${dir!.path}/downloads/$itemTypePath/${manga.source} (${manga.lang!.toUpperCase()})/${manga.name!.replaceForbiddenCharacters('_')}/$scanlator${chapter.name!.replaceForbiddenCharacters('_')}/");
}
Future<Directory?> getMangaMainDirectory(Chapter chapter) async {
final manga = chapter.manga.value!;
final isManga = chapter.manga.value!.isManga!;
final itemType = chapter.manga.value!.itemType;
final itemTypePath = itemType == ItemType.manga
? "Manga"
: itemType == ItemType.anime
? "Anime"
: "Novel";
final dir = await getDirectory();
return Directory(
"${dir!.path}/downloads/${isManga ? "Manga" : "Anime"}/${manga.source} (${manga.lang!.toUpperCase()})/${manga.name!.replaceForbiddenCharacters('_')}/");
"${dir!.path}/downloads/$itemTypePath/${manga.source} (${manga.lang!.toUpperCase()})/${manga.name!.replaceForbiddenCharacters('_')}/");
}
Future<Directory?> getDatabaseDirectory() async {

46
lib/router/router.dart
View file

@ -3,6 +3,7 @@ import 'package:bot_toast/bot_toast.dart';
import 'package:flutter/foundation.dart';
import 'package:go_router/go_router.dart';
import 'package:mangayomi/models/chapter.dart';
import 'package:mangayomi/models/manga.dart';
import 'package:mangayomi/models/source.dart';
import 'package:mangayomi/models/track_preference.dart';
import 'package:mangayomi/modules/anime/anime_player_view.dart';
@ -10,6 +11,7 @@ import 'package:mangayomi/modules/browse/extension/edit_code.dart';
import 'package:mangayomi/modules/browse/extension/extension_detail.dart';
import 'package:mangayomi/modules/browse/extension/widgets/create_extension.dart';
import 'package:mangayomi/modules/browse/sources/sources_filter_screen.dart';
import 'package:mangayomi/modules/novel/novel_reader_view.dart';
import 'package:mangayomi/modules/updates/updates_screen.dart';
import 'package:mangayomi/modules/more/backup_and_restore/backup_and_restore.dart';
import 'package:mangayomi/modules/more/categories/categories_screen.dart';
@ -86,12 +88,12 @@ class RouterNotifier extends ChangeNotifier {
name: "MangaLibrary",
path: '/MangaLibrary',
builder: (context, state) => const LibraryScreen(
isManga: true,
itemType: ItemType.manga,
),
pageBuilder: (context, state) => transitionPage(
key: state.pageKey,
child: const LibraryScreen(
isManga: true,
itemType: ItemType.manga,
),
),
),
@ -99,12 +101,25 @@ class RouterNotifier extends ChangeNotifier {
name: "AnimeLibrary",
path: '/AnimeLibrary',
builder: (context, state) => const LibraryScreen(
isManga: false,
itemType: ItemType.anime,
),
pageBuilder: (context, state) => transitionPage(
key: state.pageKey,
child: const LibraryScreen(
isManga: false,
itemType: ItemType.anime,
),
),
),
GoRoute(
name: "NovelLibrary",
path: '/NovelLibrary',
builder: (context, state) => const LibraryScreen(
itemType: ItemType.novel,
),
pageBuilder: (context, state) => transitionPage(
key: state.pageKey,
child: const LibraryScreen(
itemType: ItemType.novel,
),
),
),
@ -184,8 +199,8 @@ class RouterNotifier extends ChangeNotifier {
));
}),
GoRoute(
path: "/mangareaderview",
name: "mangareaderview",
path: "/mangaReaderView",
name: "mangaReaderView",
builder: (context, state) {
final chapter = state.extra as Chapter;
return MangaReaderView(
@ -221,6 +236,25 @@ class RouterNotifier extends ChangeNotifier {
);
},
),
/*GoRoute(
path: "/novelReaderView",
name: "novelReaderView",
builder: (context, state) {
final chapter = state.extra as Chapter;
return NovelReaderView(
chapter: chapter,
);
},
pageBuilder: (context, state) {
final chapter = state.extra as Chapter;
return transitionPage(
key: state.pageKey,
child: NovelReaderView(
chapter: chapter,
),
);
},
),*/
GoRoute(
path: "/ExtensionLang",
name: "ExtensionLang",

2
lib/services/aniskip.g.dart
View file

@ -6,7 +6,7 @@ part of 'aniskip.dart';
// RiverpodGenerator
// **************************************************************************
String _$aniSkipHash() => r'2e5d19b025a2207ff64da7bf7908450ea9e5ff8c';
String _$aniSkipHash() => r'887869b54e2e151633efd46da83bde845e14f421';
/// See also [AniSkip].
@ProviderFor(AniSkip)

2
lib/services/trackers/anilist.g.dart
View file

@ -6,7 +6,7 @@ part of 'anilist.dart';
// RiverpodGenerator
// **************************************************************************
String _$anilistHash() => r'd3a8852d689b13c3bde46ec05b464e7779149e58';
String _$anilistHash() => r'87784b25bccf5b1c61d6c7494f0569a28494dd8b';
/// Copied from Dart SDK
class _SystemHash {