diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e82ef2b0..2516af0d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 diff --git a/.gitignore b/.gitignore index 0d4752b5..8742c9bb 100644 --- a/.gitignore +++ b/.gitignore @@ -46,4 +46,5 @@ app.*.map.json /android/app/profile /android/app/release +/android/app/.cxx untranslated_messages.txt \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle index da765dd2..3941c9ab 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -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 diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index e58dc590..6de00b03 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -51,9 +51,6 @@ - diff --git a/lib/models/category.dart b/lib/models/category.dart index 4d4d05c2..72fe5da2 100644 --- a/lib/models/category.dart +++ b/lib/models/category.dart @@ -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 json) { id = json['id']; @@ -25,13 +25,17 @@ class Category { Category.fromJsonV1(Map 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 toJson() => - {'id': id, 'name': name, 'forItemType': forItemType.index}; + Map toJson() => { + 'id': id, + 'name': name, + 'forItemType': forItemType.index, + }; } diff --git a/lib/models/category.g.dart b/lib/models/category.g.dart index c95018ac..2c8e619e 100644 --- a/lib/models/category.g.dart +++ b/lib/models/category.g.dart @@ -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; } diff --git a/lib/router/router.g.dart b/lib/router/router.g.dart index 9bc2d35e..ab12de06 100644 --- a/lib/router/router.g.dart +++ b/lib/router/router.g.dart @@ -6,7 +6,7 @@ part of 'router.dart'; // RiverpodGenerator // ************************************************************************** -String _$routerHash() => r'7a4e8651b0f12561ff4be5ca85a0142ab64a3da3'; +String _$routerHash() => r'52271f834e5242820afdb209d765c3cee8f3fe5b'; /// See also [router]. @ProviderFor(router) diff --git a/lib/services/aniskip.g.dart b/lib/services/aniskip.g.dart index c05db920..b2e1defb 100644 --- a/lib/services/aniskip.g.dart +++ b/lib/services/aniskip.g.dart @@ -6,7 +6,7 @@ part of 'aniskip.dart'; // RiverpodGenerator // ************************************************************************** -String _$aniSkipHash() => r'2e5d19b025a2207ff64da7bf7908450ea9e5ff8c'; +String _$aniSkipHash() => r'887869b54e2e151633efd46da83bde845e14f421'; /// See also [AniSkip]. @ProviderFor(AniSkip) diff --git a/lib/services/trackers/anilist.g.dart b/lib/services/trackers/anilist.g.dart index 834afd64..558da2c4 100644 --- a/lib/services/trackers/anilist.g.dart +++ b/lib/services/trackers/anilist.g.dart @@ -6,7 +6,7 @@ part of 'anilist.dart'; // RiverpodGenerator // ************************************************************************** -String _$anilistHash() => r'ddd07acc8d28d2aa95c942566109e9393ca9e5ed'; +String _$anilistHash() => r'70e8cd537270a9054a1ef72de117fc7ad5545218'; /// Copied from Dart SDK class _SystemHash { diff --git a/pubspec.lock b/pubspec.lock index ff730b7e..73d9126e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -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" diff --git a/pubspec.yaml b/pubspec.yaml index 6b00c3ef..c15490b2 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: "none" version: 0.5.1+79 environment: - sdk: ^3.6.0 + sdk: ^3.7.0 dependencies: flutter: