mirror of
https://github.com/kodjodevf/mangayomi.git
synced 2026-05-10 19:50:35 +00:00
Merge branch 'main' into dev
This commit is contained in:
commit
721f0dbace
11 changed files with 25 additions and 23 deletions
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
|
|
@ -216,7 +216,7 @@ jobs:
|
|||
build/windows/x64/runner/Release/Mangayomi-*.zip
|
||||
allowUpdates: true
|
||||
|
||||
build-and-release-linux-zip:
|
||||
build-and-release-linux-zip_AppImage_RPM:
|
||||
permissions:
|
||||
contents: write
|
||||
runs-on: ubuntu-latest
|
||||
|
|
|
|||
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -46,4 +46,5 @@ app.*.map.json
|
|||
/android/app/profile
|
||||
/android/app/release
|
||||
|
||||
/android/app/.cxx
|
||||
untranslated_messages.txt
|
||||
|
|
@ -31,7 +31,7 @@ if (flutterVersionName == null) {
|
|||
android {
|
||||
namespace "com.kodjodevf.mangayomi"
|
||||
compileSdkVersion 35
|
||||
ndkVersion flutter.ndkVersion
|
||||
ndkVersion "28.0.12674087"
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_17
|
||||
|
|
|
|||
|
|
@ -51,9 +51,6 @@
|
|||
<meta-data
|
||||
android:name="flutterEmbedding"
|
||||
android:value="2" />
|
||||
<meta-data
|
||||
android:name="io.flutter.embedding.android.EnableImpeller"
|
||||
android:value="false" />
|
||||
<meta-data android:name="flutter_deeplinking_enabled" android:value="false" />
|
||||
</application>
|
||||
</manifest>
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@ class Category {
|
|||
bool? forManga;
|
||||
@enumerated
|
||||
late ItemType forItemType;
|
||||
Category(
|
||||
{this.id = Isar.autoIncrement,
|
||||
required this.name,
|
||||
this.forManga = true,
|
||||
required this.forItemType});
|
||||
Category({
|
||||
this.id = Isar.autoIncrement,
|
||||
required this.name,
|
||||
required this.forItemType,
|
||||
});
|
||||
|
||||
Category.fromJson(Map<String, dynamic> json) {
|
||||
id = json['id'];
|
||||
|
|
@ -25,13 +25,17 @@ class Category {
|
|||
Category.fromJsonV1(Map<String, dynamic> json) {
|
||||
id = json['id'];
|
||||
name = json['name'];
|
||||
forItemType = json['forManga'] is bool
|
||||
? json['forManga'] == true
|
||||
? ItemType.manga
|
||||
: ItemType.anime
|
||||
: ItemType.manga;
|
||||
forItemType =
|
||||
json['forManga'] is bool
|
||||
? json['forManga'] == true
|
||||
? ItemType.manga
|
||||
: ItemType.anime
|
||||
: ItemType.manga;
|
||||
}
|
||||
|
||||
Map<String, dynamic> toJson() =>
|
||||
{'id': id, 'name': name, 'forItemType': forItemType.index};
|
||||
Map<String, dynamic> toJson() => {
|
||||
'id': id,
|
||||
'name': name,
|
||||
'forItemType': forItemType.index,
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -84,10 +84,10 @@ Category _categoryDeserialize(
|
|||
forItemType:
|
||||
_CategoryforItemTypeValueEnumMap[reader.readByteOrNull(offsets[0])] ??
|
||||
ItemType.manga,
|
||||
forManga: reader.readBoolOrNull(offsets[1]),
|
||||
id: id,
|
||||
name: reader.readStringOrNull(offsets[2]),
|
||||
);
|
||||
object.forManga = reader.readBoolOrNull(offsets[1]);
|
||||
return object;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ part of 'router.dart';
|
|||
// RiverpodGenerator
|
||||
// **************************************************************************
|
||||
|
||||
String _$routerHash() => r'7a4e8651b0f12561ff4be5ca85a0142ab64a3da3';
|
||||
String _$routerHash() => r'52271f834e5242820afdb209d765c3cee8f3fe5b';
|
||||
|
||||
/// See also [router].
|
||||
@ProviderFor(router)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ part of 'aniskip.dart';
|
|||
// RiverpodGenerator
|
||||
// **************************************************************************
|
||||
|
||||
String _$aniSkipHash() => r'2e5d19b025a2207ff64da7bf7908450ea9e5ff8c';
|
||||
String _$aniSkipHash() => r'887869b54e2e151633efd46da83bde845e14f421';
|
||||
|
||||
/// See also [AniSkip].
|
||||
@ProviderFor(AniSkip)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ part of 'anilist.dart';
|
|||
// RiverpodGenerator
|
||||
// **************************************************************************
|
||||
|
||||
String _$anilistHash() => r'ddd07acc8d28d2aa95c942566109e9393ca9e5ed';
|
||||
String _$anilistHash() => r'70e8cd537270a9054a1ef72de117fc7ad5545218';
|
||||
|
||||
/// Copied from Dart SDK
|
||||
class _SystemHash {
|
||||
|
|
|
|||
|
|
@ -2189,5 +2189,5 @@ packages:
|
|||
source: hosted
|
||||
version: "2.2.2"
|
||||
sdks:
|
||||
dart: ">=3.7.0-0 <4.0.0"
|
||||
dart: ">=3.7.0 <4.0.0"
|
||||
flutter: ">=3.27.0"
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ publish_to: "none"
|
|||
version: 0.5.1+79
|
||||
|
||||
environment:
|
||||
sdk: ^3.6.0
|
||||
sdk: ^3.7.0
|
||||
|
||||
dependencies:
|
||||
flutter:
|
||||
|
|
|
|||
Loading…
Reference in a new issue