Merge pull request #25 from SifAa/update-web

Update ts-toolkit version

Author: m-abs

bin/forAll

@@ -11,7 +11,6 @@ fi
 dir=(
   "./flutter_readium"
 	"./flutter_readium_platform_interface"
-	"./flutter_readium_web"
 )
 for i in "${dir[@]}"; do
 	echo -e "\033[35;1m=== $@ $i ===\033[0m"

flutter_readium/example/lib/widgets/theme_selector.widget.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/gestures.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
 import '../extensions/index.dart';
@@ -16,42 +17,50 @@ class ThemeSelectorWidget extends StatelessWidget {
 
   @override
   Widget build(final BuildContext context) => BlocBuilder<TextSettingsBloc, TextSettingsState>(
-        builder: (final context, final state) => SingleChildScrollView(
-          scrollDirection: Axis.horizontal,
-          child: ToggleButtons(
-            isSelected: themes
-                .map(
-                  (final itemTheme) => itemTheme == (isHighlight ? state.highlight : state.theme),
-                )
-                .toList(),
-            selectedBorderColor: (isHighlight ? state.highlight : state.theme).textColor,
-            borderWidth: 4.0,
-            borderColor: Colors.transparent,
-            onPressed: (final index) {
-              if (isHighlight) {
-                context.read<TextSettingsBloc>().add(ChangeHighlight(themes[index]));
-              } else {
-                context.read<TextSettingsBloc>().add(ChangeTheme(themes[index]));
-              }
+        builder: (final context, final state) => ScrollConfiguration(
+          behavior: const MaterialScrollBehavior().copyWith(
+            dragDevices: {
+              PointerDeviceKind.touch,
+              PointerDeviceKind.mouse, // Enables mouse drag
             },
-            children: themes
-                .map(
-                  (final itemTheme) => Container(
-                    width: 80,
-                    height: 80,
-                    color: itemTheme.backgroundColor,
-                    child: Center(
-                      child: Text(
-                        'Aa',
-                        style: TextStyle(
-                          color: itemTheme.textColor,
-                          fontSize: 20,
+          ),
+          child: SingleChildScrollView(
+            scrollDirection: Axis.horizontal,
+            child: ToggleButtons(
+              isSelected: themes
+                  .map(
+                    (final itemTheme) => itemTheme == (isHighlight ? state.highlight : state.theme),
+                  )
+                  .toList(),
+              selectedBorderColor: (isHighlight ? state.highlight : state.theme).textColor,
+              borderWidth: 4.0,
+              borderColor: Colors.transparent,
+              onPressed: (final index) {
+                if (isHighlight) {
+                  context.read<TextSettingsBloc>().add(ChangeHighlight(themes[index]));
+                } else {
+                  context.read<TextSettingsBloc>().add(ChangeTheme(themes[index]));
+                }
+              },
+              children: themes
+                  .map(
+                    (final itemTheme) => Container(
+                      width: 80,
+                      height: 80,
+                      color: itemTheme.backgroundColor,
+                      child: Center(
+                        child: Text(
+                          'Aa',
+                          style: TextStyle(
+                            color: itemTheme.textColor,
+                            fontSize: 20,
+                          ),
                         ),
                       ),
                     ),
-                  ),
-                )
-                .toList(),
+                  )
+                  .toList(),
+            ),
           ),
         ),
       );

flutter_readium/example/pubspec.yaml

@@ -35,7 +35,8 @@ dev_dependencies:
 
 flutter:
   uses-material-design: true
-  disable-swift-package-manager: true
+  config:
+    enable-swift-package-manager: false
   assets:
     - assets/pubs/
     - assets/webManifestList.json

flutter_readium/example/web/readiumReader.js

@@ -1,9 +1,9 @@
 {
   "dependencies": {
     "@material/web": "^2.3.0",
-    "@readium/navigator": "^2.0.0",
-    "@readium/navigator-html-injectables": "^2.0.0",
-    "@readium/shared": "^2.0.0"
+    "@readium/navigator": "^2.1.1",
+    "@readium/navigator-html-injectables": "^2.1.1",
+    "@readium/shared": "^2.1.1"
   },
   "devDependencies": {
     "css-loader": "^7.1.2",

flutter_readium/lib/helpers/readiumReader.js

@@ -1,6 +1,5 @@
 import {
   TextAlignment,
-  Theme,
   IEpubPreferences,
   IEpubDefaults,
   EpubNavigator,
@@ -13,10 +12,6 @@ export function initializePreferencesFromString(
 
   convertVerticalScroll(prefs);
 
-  if (prefs.theme != null) {
-    prefs.theme = _themeFromJson(prefs.theme);
-  }
-
   if (prefs.textAlign != null) {
     prefs.textAlign = _textAlignFromJson(prefs.textAlign);
   }
@@ -56,7 +51,6 @@ export function initializePreferencesFromString(
     textAlign: prefs.textAlign ?? null,
     textColor: prefs.textColor ?? null,
     textNormalization: prefs.textNormalization ?? null,
-    theme: prefs.theme ?? null,
     visitedColor: prefs.visitedColor ?? null,
     wordSpacing: prefs.wordSpacing ?? null,
   };
@@ -87,23 +81,10 @@ export const defaults: IEpubDefaults = {
   textAlign: TextAlignment.justify,
   textColor: null,
   textNormalization: true,
-  theme: Theme.custom,
   visitedColor: '#551a8b',
   wordSpacing: 0,
 };
 
-function _themeFromJson(themeString: string): Theme {
-  switch (themeString) {
-    case 'sepia':
-      return Theme.sepia;
-    case 'night':
-      return Theme.night;
-    case 'custom':
-    default:
-      return Theme.custom;
-  }
-}
-
 function _textAlignFromJson(textAlignString: string): TextAlignment {
   switch (textAlignString) {
     case 'left':
@@ -160,9 +141,6 @@ export function setPreferencesFromString(
 
   convertVerticalScroll(newPreferences);
 
-  if (newPreferences.theme != null) {
-    newPreferences.theme = _themeFromJson(newPreferences.theme);
-  }
   if (newPreferences.textAlign != null) {
     newPreferences.textAlign = _textAlignFromJson(newPreferences.textAlign);
   }