From f0940e2947de4daf13cfac479f45b508670eae81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Clovis=20DUGU=C3=89?= Date: Thu, 22 Aug 2024 18:47:40 +0200 Subject: [PATCH] chore: remove in-app reader --- lib/main.dart | 3 --- lib/state/state.dart | 1 - lib/ui/epub_viewer.dart | 40 ++------------------------------------- lib/ui/settings_page.dart | 32 +------------------------------ 4 files changed, 3 insertions(+), 73 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index f5cb6ae..e5e3312 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -18,7 +18,6 @@ import 'package:openlib/state/state.dart' selectedIndexProvider, themeModeProvider, openPdfWithExternalAppProvider, - openEpubWithExternalAppProvider, userAgentProvider, cookieProvider, dbProvider; @@ -58,8 +57,6 @@ void main() async { (ref) => isDarkMode ? ThemeMode.dark : ThemeMode.light), openPdfWithExternalAppProvider .overrideWith((ref) => openPdfwithExternalapp), - openEpubWithExternalAppProvider - .overrideWith((ref) => openEpubwithExternalapp), userAgentProvider.overrideWith((ref) => browserUserAgent), cookieProvider.overrideWith((ref) => browserCookie), ], diff --git a/lib/state/state.dart b/lib/state/state.dart index fb381ff..cf95384 100644 --- a/lib/state/state.dart +++ b/lib/state/state.dart @@ -188,7 +188,6 @@ final getBookPosition = }); final openPdfWithExternalAppProvider = StateProvider((ref) => false); -final openEpubWithExternalAppProvider = StateProvider((ref) => false); final filePathProvider = FutureProvider.family((ref, fileName) async { diff --git a/lib/ui/epub_viewer.dart b/lib/ui/epub_viewer.dart index 1c360a0..1f2afa8 100644 --- a/lib/ui/epub_viewer.dart +++ b/lib/ui/epub_viewer.dart @@ -3,18 +3,12 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:epub_view/epub_view.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:vocsy_epub_viewer/epub_viewer.dart'; import 'package:open_file/open_file.dart'; import 'package:openlib/services/files.dart' show getFilePath; import 'package:openlib/ui/components/snack_bar_widget.dart'; import 'package:openlib/state/state.dart' - show - filePathProvider, - saveEpubState, - dbProvider, - getBookPosition, - openEpubWithExternalAppProvider; + show filePathProvider, saveEpubState, dbProvider, getBookPosition; Future launchEpubViewer( {required String fileName, @@ -23,37 +17,7 @@ Future launchEpubViewer( if (Platform.isAndroid || Platform.isIOS) { String path = await getFilePath(fileName); String? epubConfig = await ref.read(dbProvider).getBookState(fileName); - bool openWithExternalApp = ref.watch(openEpubWithExternalAppProvider); - - if (openWithExternalApp) { - await OpenFile.open(path); - } else { - try { - VocsyEpub.setConfig( - // ignore: use_build_context_synchronously - themeColor: const Color.fromARGB(255, 210, 15, 1), - identifier: "iosBook", - scrollDirection: EpubScrollDirection.HORIZONTAL, - ); - - if ((epubConfig?.isNotEmpty ?? true) && - (epubConfig != null) && - (!(epubConfig.startsWith('epubcfi')))) { - VocsyEpub.open(path, - lastLocation: EpubLocator.fromJson(json.decode(epubConfig))); - } else { - VocsyEpub.open(path); - } - - VocsyEpub.locatorStream.listen((locator) async { - await saveEpubState(fileName, locator, ref); - // convert locator from string to json and save to your database to be retrieved later - }); - } catch (e) { - // ignore: use_build_context_synchronously - showSnackBar(context: context, message: 'Unable to open pdf!'); - } - } + await OpenFile.open(path); } else { Navigator.push(context, MaterialPageRoute(builder: (BuildContext context) { return EpubViewerWidget( diff --git a/lib/ui/settings_page.dart b/lib/ui/settings_page.dart index 5ee5beb..87afc2d 100644 --- a/lib/ui/settings_page.dart +++ b/lib/ui/settings_page.dart @@ -6,11 +6,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:openlib/ui/components/page_title_widget.dart'; import 'package:openlib/ui/about_page.dart'; import 'package:openlib/state/state.dart' - show - themeModeProvider, - openPdfWithExternalAppProvider, - openEpubWithExternalAppProvider, - dbProvider; + show themeModeProvider, openPdfWithExternalAppProvider, dbProvider; class SettingsPage extends ConsumerWidget { const SettingsPage({super.key}); @@ -78,32 +74,6 @@ class SettingsPage extends ConsumerWidget { ) ], ), - _PaddedContainer( - children: [ - Text( - "Open Epub with External Reader", - style: TextStyle( - fontSize: 15, - fontWeight: FontWeight.bold, - color: Theme.of(context).colorScheme.tertiary, - ), - ), - Switch( - // This bool value toggles the switch. - value: ref.watch( - openEpubWithExternalAppProvider, - ), - activeColor: Colors.red, - onChanged: (bool value) { - ref.read(openEpubWithExternalAppProvider.notifier).state = - value; - ref - .read(dbProvider) - .savePreference('openEpubwithExternalApp', value); - }, - ) - ], - ), _PaddedContainer( onClick: () { Navigator.push(context,