From 06694f5f0b9181eeed862ceaaaa2b30a22400e78 Mon Sep 17 00:00:00 2001 From: "Dr.Blank" <64108942+Dr-Blank@users.noreply.github.com> Date: Sat, 10 Jan 2026 14:43:59 +0530 Subject: [PATCH] chore: target android api 36 --- .fvmrc | 2 +- .vscode/settings.json | 2 +- android/app/build.gradle | 4 +- lib/db/cache/schemas/image.dart | 66 ++++++++++++++--------------- lib/db/player_prefs/book_prefs.dart | 50 +++++++++++----------- pubspec.lock | 2 +- pubspec.yaml | 4 +- 7 files changed, 64 insertions(+), 66 deletions(-) diff --git a/.fvmrc b/.fvmrc index c0ef54d..3ca65ff 100644 --- a/.fvmrc +++ b/.fvmrc @@ -1,3 +1,3 @@ { - "flutter": "3.32.0" + "flutter": "3.32.8" } \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 9185c43..8ba2d8f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -22,7 +22,7 @@ "utsname", "Vaani" ], - "dart.flutterSdkPath": ".fvm/versions/3.32.0", + "dart.flutterSdkPath": ".fvm/versions/3.32.8", "files.exclude": { "**/*.freezed.dart": true, "**/*.g.dart": true diff --git a/android/app/build.gradle b/android/app/build.gradle index 0161f0d..8200a20 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -30,7 +30,7 @@ if (keystorePropertiesFile.exists()) { android { namespace "dr.blank.vaani" - compileSdk flutter.compileSdkVersion + compileSdk 36 // ndkVersion flutter.ndkVersion // The NDK version is set to a specific version since it was not building // TODO remove when https://github.com/flutter/flutter/issues/139427 is closed @@ -65,7 +65,7 @@ android { // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. minSdkVersion 23 - targetSdkVersion flutter.targetSdkVersion + targetSdkVersion 36 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/lib/db/cache/schemas/image.dart b/lib/db/cache/schemas/image.dart index 9e93073..fef8025 100644 --- a/lib/db/cache/schemas/image.dart +++ b/lib/db/cache/schemas/image.dart @@ -1,39 +1,39 @@ -import 'package:isar/isar.dart'; +// import 'package:isar/isar.dart'; -part 'image.g.dart'; +// part 'image.g.dart'; -/// Represents a cover image for a library item -/// -/// stores 2 paths, one is thumbnail and the other is the full size image -/// both are optional -/// also stores last fetched date for the image -/// Id is passed as a parameter to the collection annotation (the lib_item_id) -/// also index the id -/// This is because the image is a part of the library item and the library item -/// is the parent of the image -@Collection(ignore: {'path'}) -@Name('CacheImage') -class Image { - @Id() - int id; +// /// Represents a cover image for a library item +// /// +// /// stores 2 paths, one is thumbnail and the other is the full size image +// /// both are optional +// /// also stores last fetched date for the image +// /// Id is passed as a parameter to the collection annotation (the lib_item_id) +// /// also index the id +// /// This is because the image is a part of the library item and the library item +// /// is the parent of the image +// @Collection(ignore: {'path'}) +// @Name('CacheImage') +// class Image { +// @Id() +// int id; - String? thumbnailPath; - String? imagePath; - DateTime lastSaved; +// String? thumbnailPath; +// String? imagePath; +// DateTime lastSaved; - Image({ - required this.id, - this.thumbnailPath, - this.imagePath, - }) : lastSaved = DateTime.now(); +// Image({ +// required this.id, +// this.thumbnailPath, +// this.imagePath, +// }) : lastSaved = DateTime.now(); - /// returns the path to the image - String? get path => thumbnailPath ?? imagePath; +// /// returns the path to the image +// String? get path => thumbnailPath ?? imagePath; - /// automatically updates the last fetched date when saving a new path - void updatePath(String? thumbnailPath, String? imagePath) async { - this.thumbnailPath = thumbnailPath; - this.imagePath = imagePath; - lastSaved = DateTime.now(); - } -} +// /// automatically updates the last fetched date when saving a new path +// void updatePath(String? thumbnailPath, String? imagePath) async { +// this.thumbnailPath = thumbnailPath; +// this.imagePath = imagePath; +// lastSaved = DateTime.now(); +// } +// } diff --git a/lib/db/player_prefs/book_prefs.dart b/lib/db/player_prefs/book_prefs.dart index b4e3807..ca610c8 100644 --- a/lib/db/player_prefs/book_prefs.dart +++ b/lib/db/player_prefs/book_prefs.dart @@ -1,29 +1,29 @@ -// a table to track preferences of player for each book -import 'package:isar/isar.dart'; +// // a table to track preferences of player for each book +// import 'package:isar/isar.dart'; -part 'book_prefs.g.dart'; +// part 'book_prefs.g.dart'; -/// stores the preferences of the player for a book -@Collection() -@Name('BookPrefs') -class BookPrefs { - @Id() - int libItemId; +// /// stores the preferences of the player for a book +// @Collection() +// @Name('BookPrefs') +// class BookPrefs { +// @Id() +// int libItemId; - double? speed; - // double? volume; - // Duration? sleepTimer; - // bool? showTotalProgress; - // bool? showChapterProgress; - // bool? useChapterInfo; +// double? speed; +// // double? volume; +// // Duration? sleepTimer; +// // bool? showTotalProgress; +// // bool? showChapterProgress; +// // bool? useChapterInfo; - BookPrefs({ - required this.libItemId, - this.speed, - // this.volume, - // this.sleepTimer, - // this.showTotalProgress, - // this.showChapterProgress, - // this.useChapterInfo, - }); -} +// BookPrefs({ +// required this.libItemId, +// this.speed, +// // this.volume, +// // this.sleepTimer, +// // this.showTotalProgress, +// // this.showChapterProgress, +// // this.useChapterInfo, +// }); +// } diff --git a/pubspec.lock b/pubspec.lock index 216ce34..f4c775c 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1597,4 +1597,4 @@ packages: version: "3.1.3" sdks: dart: ">=3.7.0 <4.0.0" - flutter: ">=3.32.0" + flutter: ">=3.32.8" diff --git a/pubspec.yaml b/pubspec.yaml index daa3a2e..7ccbe61 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -20,9 +20,7 @@ version: 0.0.18+9 environment: sdk: ">=3.3.4 <4.0.0" - flutter: 3.32.0 - -isar_version: &isar_version ^4.0.0-dev.13 # define the version to be used + flutter: 3.32.8 # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions