From 91e75b21554409047e900a32b3fdc1352ef92f2d Mon Sep 17 00:00:00 2001 From: Isaac Lyman Date: Thu, 15 Feb 2024 10:00:38 -0700 Subject: [PATCH] Finish Help page --- lib/pages/page_help.dart | 58 ++++++----- lib/search/book_tile.dart | 7 +- macos/Flutter/GeneratedPluginRegistrant.swift | 2 - pubspec.lock | 96 ------------------- pubspec.yaml | 1 - 5 files changed, 37 insertions(+), 127 deletions(-) diff --git a/lib/pages/page_help.dart b/lib/pages/page_help.dart index 0d3b2a9..2b5bdc5 100644 --- a/lib/pages/page_help.dart +++ b/lib/pages/page_help.dart @@ -16,33 +16,43 @@ class BKPageHelp extends StatelessWidget { ), child: Column( children: [ - Card( - child: Padding( - padding: const EdgeInsets.symmetric( - horizontal: 16, - vertical: 24, - ), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - const Text("Got a feature request? Found a bug? " + const Text( + "Bookoscope", + style: TextStyle(fontSize: 24), + ), + const Text("© 2024 by Isaac Lyman"), + Padding( + padding: const EdgeInsets.only(top: 16), + child: Card( + child: Padding( + padding: const EdgeInsets.symmetric( + horizontal: 16, + vertical: 24, + ), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + const Text( + "Got a feature request? Found a bug? " "OPDS feed not parsing correctly? " - "File an issue in Bookoscope's GitHub repository."), - Padding( - padding: const EdgeInsets.only(top: 16), - child: ElevatedButton( - onPressed: () async { - await launchUrl(Uri.parse( - "https://github.com/isaaclyman/bookoscope/issues")); - }, - style: ElevatedButton.styleFrom( - backgroundColor: context.colors.accent.withAlpha(180), - foregroundColor: context.colors.accentContrast, + "File an issue in Bookoscope's GitHub repository.", + ), + Padding( + padding: const EdgeInsets.only(top: 16), + child: ElevatedButton( + onPressed: () async { + await launchUrl(Uri.parse( + "https://github.com/isaaclyman/bookoscope/issues")); + }, + style: ElevatedButton.styleFrom( + backgroundColor: context.colors.accent.withAlpha(180), + foregroundColor: context.colors.accentContrast, + ), + child: const Text("File an issue"), ), - child: const Text("File an issue"), ), - ), - ], + ], + ), ), ), ), diff --git a/lib/search/book_tile.dart b/lib/search/book_tile.dart index f97bc99..13b9f87 100644 --- a/lib/search/book_tile.dart +++ b/lib/search/book_tile.dart @@ -4,7 +4,6 @@ import 'package:bookoscope/format/opds/opds_crawler.dart'; import 'package:bookoscope/render/link.dart'; import 'package:bookoscope/search/search_manager.dart'; import 'package:bookoscope/util/menu.dart'; -import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:url_launcher/url_launcher.dart'; @@ -40,10 +39,10 @@ class _BKBookTileState extends State { children: [ Expanded( child: imageUrl != null - ? CachedNetworkImage( - imageUrl: imageUrl, + ? Image.network( + imageUrl, fit: BoxFit.contain, - errorWidget: (_, __, err) { + errorBuilder: (_, err, ___) { debugPrint(err.toString()); return _DefaultBookCover( title: widget.result.title, diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 94ac6ba..adf3885 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -7,12 +7,10 @@ import Foundation import isar_flutter_libs import path_provider_foundation -import sqflite import url_launcher_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { IsarFlutterLibsPlugin.register(with: registry.registrar(forPlugin: "IsarFlutterLibsPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) - SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } diff --git a/pubspec.lock b/pubspec.lock index a848500..a83a162 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -136,30 +136,6 @@ packages: url: "https://pub.dev" source: hosted version: "8.8.1" - cached_network_image: - dependency: "direct main" - description: - name: cached_network_image - sha256: "28ea9690a8207179c319965c13cd8df184d5ee721ae2ce60f398ced1219cea1f" - url: "https://pub.dev" - source: hosted - version: "3.3.1" - cached_network_image_platform_interface: - dependency: transitive - description: - name: cached_network_image_platform_interface - sha256: "9e90e78ae72caa874a323d78fa6301b3fb8fa7ea76a8f96dc5b5bf79f283bf2f" - url: "https://pub.dev" - source: hosted - version: "4.0.0" - cached_network_image_web: - dependency: transitive - description: - name: cached_network_image_web - sha256: "42a835caa27c220d1294311ac409a43361088625a4f23c820b006dd9bffb3316" - url: "https://pub.dev" - source: hosted - version: "1.1.1" characters: dependency: transitive description: @@ -285,14 +261,6 @@ packages: description: flutter source: sdk version: "0.0.0" - flutter_cache_manager: - dependency: transitive - description: - name: flutter_cache_manager - sha256: "8207f27539deb83732fdda03e259349046a39a4c767269285f449ade355d54ba" - url: "https://pub.dev" - source: hosted - version: "3.3.1" flutter_driver: dependency: transitive description: flutter @@ -369,14 +337,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.3.1" - http: - dependency: transitive - description: - name: http - sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba - url: "https://pub.dev" - source: hosted - version: "1.2.0" http_multi_server: dependency: transitive description: @@ -526,14 +486,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.0" - octo_image: - dependency: transitive - description: - name: octo_image - sha256: "45b40f99622f11901238e18d48f5f12ea36426d8eced9f4cbf58479c7aa2430d" - url: "https://pub.dev" - source: hosted - version: "2.0.0" package_config: dependency: transitive description: @@ -670,14 +622,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.3" - rxdart: - dependency: transitive - description: - name: rxdart - sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb" - url: "https://pub.dev" - source: hosted - version: "0.27.7" scroll_to_index: dependency: transitive description: @@ -731,30 +675,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.10.0" - sprintf: - dependency: transitive - description: - name: sprintf - sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23" - url: "https://pub.dev" - source: hosted - version: "7.0.0" - sqflite: - dependency: transitive - description: - name: sqflite - sha256: a9016f495c927cb90557c909ff26a6d92d9bd54fc42ba92e19d4e79d61e798c6 - url: "https://pub.dev" - source: hosted - version: "2.3.2" - sqflite_common: - dependency: transitive - description: - name: sqflite_common - sha256: "28d8c66baee4968519fb8bd6cdbedad982d6e53359091f0b74544a9f32ec72d5" - url: "https://pub.dev" - source: hosted - version: "2.5.3" stack_trace: dependency: transitive description: @@ -795,14 +715,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.3.1" - synchronized: - dependency: transitive - description: - name: synchronized - sha256: "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558" - url: "https://pub.dev" - source: hosted - version: "3.1.0+1" term_glyph: dependency: transitive description: @@ -907,14 +819,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.1" - uuid: - dependency: transitive - description: - name: uuid - sha256: cd210a09f7c18cbe5a02511718e0334de6559871052c90a90c0cca46a4aa81c8 - url: "https://pub.dev" - source: hosted - version: "4.3.3" vector_math: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index e03dc60..8657d5c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -9,7 +9,6 @@ environment: dependencies: accordion: ^2.6.0 auto_size_text: ^3.0.0 - cached_network_image: ^3.3.1 collection: ^1.18.0 csv: ^5.1.1 flutter: