Merge branch 'main' into feat/readium-http

components/commons/example/pubspec.yaml

@@ -11,4 +11,4 @@ dependencies:
     path: ../
 
 dev_dependencies:
-  lints: ^2.0.1
+  lints: ^2.1.0

components/commons/lib/utils/predicate.dart

@@ -93,4 +93,7 @@ class AcceptAllPredicate<T> implements Predicate<T> {
   void addArrayContainsCondition(String field, String value) {}
 
   void addArrayContainsAllCondition(String field, List<Object> values) {}
+
+  @override
+  void addValueNotInCondition(String field, List<Object> values) {}
 }

components/navigator/lib/src/epub/epub_controller.dart

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:io';
+
 import 'package:dartx/dartx.dart';
 import 'package:fimber/fimber.dart';
 import 'package:flutter/widgets.dart';
@@ -56,7 +58,7 @@ class EpubController extends PublicationController {
       // to < 1.0, in order to get the WebViews to render! Otherwise they do load the data but don't render...
       keepPage: true,
       initialPage: initialPage,
-      viewportFraction: 0.99);
+      viewportFraction: Platform.isAndroid ? 0.99 : 1);
 
   @override
   void onSkipLeft({bool animated = true}) {

reader_widget/example/android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.8.20'
     repositories {
         google()
         mavenCentral()
@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

reader_widget/example/pubspec.yaml

@@ -18,7 +18,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: '>=2.18.0 <3.0.0'
+  sdk: ">=3.0.0 <4.0.0"
   flutter: '>=3.3.0'
 
 # Dependencies specify other packages that your package needs in order to work.
@@ -38,17 +38,20 @@ dependencies:
   flutter_fimber: ^0.6.5
   fimber: ^0.6.6
   flutter_inappwebview: ^5.7.2+3
-  path_provider: ^2.0.11
-  universal_io: ^2.0.4
+  path_provider: ^2.0.14
+  universal_io: ^2.2.1
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
-  cupertino_icons: ^1.0.5
+  #  cupertino_icons: ^1.0.5
 
   package_info_plus_web: ^2.0.0
+  url_launcher_web: ^2.0.16
+  shared_preferences: ^2.1.1
+
+dependency_overrides:
+  collection: ^1.17.2
   path: ^1.8.3
-  url_launcher_web: ^2.0.14
-  shared_preferences: ^2.0.17
 
 dev_dependencies:
   #  flutter_test:
@@ -61,14 +64,12 @@ dev_dependencies:
   # rules and activating additional ones.
   flutter_lints: ^2.0.1
 
-dependency_overrides:
-  collection: ^1.17.0
-
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
 
 # The following section is specific to Flutter.
 flutter:
+
   # The following line ensures that the Material Icons font is
   # included with your application, so that you can use the icons in
   # the material Icons class.

reader_widget/pubspec.yaml

@@ -5,8 +5,8 @@ publish_to: none
 homepage: https://iridium.rocks
 
 environment:
-  sdk: '>=2.18.0 <3.0.0'
-  flutter: '>=3.3.0'
+  sdk: ">=3.0.0 <4.0.0"
+  flutter: ">=3.7.0"
 
 dependencies:
   flutter:
@@ -25,7 +25,7 @@ dependencies:
     path: ../components/streamer
   mno_webview:
     path: ../components/webview
-  cupertino_icons: ^1.0.5
+  #  cupertino_icons: ^1.0.5
   dartx: ^1.1.0
   dfunc: ^0.9.0
   fimber: ^0.6.6