From 1fd0b9b2d901ac65d000f37c52cdbacbb0cc7599 Mon Sep 17 00:00:00 2001 From: Matt Reid Date: Thu, 23 Dec 2021 17:27:40 +0000 Subject: [PATCH] Release 1.1.0. --- CHANGELOG.md | 6 ++++++ example/main.dart | 20 +++++++++++++------- lib/src/cache_manager.dart | 1 - lib/src/firebase_image.dart | 12 ++++++------ pubspec.yaml | 2 +- 5 files changed, 26 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00dafdd..09585f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## [1.1.0] 23/12/2021 + +- Merged [PR #33](https://github.com/mattreid1/firebase_image/pull/33) for pre-cache function +- Updated example/main.dart file +- Formatted code + ## [1.0.2] 23/12/2021 - Merged [PR #55](https://github.com/mattreid1/firebase_image/pull/55) to update dependancies diff --git a/example/main.dart b/example/main.dart index 0f72e97..af7cedc 100644 --- a/example/main.dart +++ b/example/main.dart @@ -1,7 +1,12 @@ import 'package:flutter/material.dart'; import 'package:firebase_image/firebase_image.dart'; +import 'package:firebase_core/firebase_core.dart'; -void main() => runApp(const MyApp()); +void main() async { + WidgetsFlutterBinding.ensureInitialized(); + await Firebase.initializeApp(); + runApp(const MyApp()); +} class MyApp extends StatelessWidget { const MyApp({Key? key}) : super(key: key); @@ -31,6 +36,7 @@ class _MyHomePageState extends State { @override void initState() { super.initState(); + FirebaseImage('gs://bucket123/otherUser123.jpg').preCache(); } @override @@ -40,12 +46,12 @@ class _MyHomePageState extends State { title: Text(widget.title), ), body: Image( - image: FirebaseImage( - 'gs://bucket123/userIcon123.jpg', - shouldCache: true, // The image should be cached (default: True) - maxSizeBytes: 3000 * 1000, // 3MB max file size (default: 2.5MB) - cacheRefreshStrategy: CacheRefreshStrategy.NEVER // Switch off update checking - ), + image: FirebaseImage('gs://bucket123/userIcon123.jpg', + shouldCache: true, // The image should be cached (default: True) + maxSizeBytes: 3000 * 1000, // 3MB max file size (default: 2.5MB) + cacheRefreshStrategy: + CacheRefreshStrategy.NEVER // Switch off update checking + ), width: 100, ), ); diff --git a/lib/src/cache_manager.dart b/lib/src/cache_manager.dart index db3dd46..4b6c3da 100644 --- a/lib/src/cache_manager.dart +++ b/lib/src/cache_manager.dart @@ -3,7 +3,6 @@ import 'dart:typed_data'; import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_image/firebase_image.dart'; -import 'package:firebase_image/src/firebase_image.dart'; import 'package:firebase_image/src/image_object.dart'; import 'package:firebase_storage/firebase_storage.dart'; import 'package:path/path.dart'; diff --git a/lib/src/firebase_image.dart b/lib/src/firebase_image.dart index b37b571..2b1813a 100644 --- a/lib/src/firebase_image.dart +++ b/lib/src/firebase_image.dart @@ -56,7 +56,9 @@ class FirebaseImage extends ImageProvider { /// Pre-caches an image Future preCache() async { - if (shouldCache == false) throw "Caching must be enabled to pre-cache an image."; + if (shouldCache == false) { + throw "Caching must be enabled to pre-cache an image."; + } await _fetchImage(); } @@ -90,14 +92,13 @@ class FirebaseImage extends ImageProvider { if (localObject != null) { bytes = await cacheManager.localFileBytes(localObject); bytes ??= await cacheManager.upsertRemoteFileToCache( - _imageObject, maxSizeBytes); + _imageObject, maxSizeBytes); } else { bytes = await cacheManager.upsertRemoteFileToCache( _imageObject, maxSizeBytes); } } else { - bytes = - await cacheManager.remoteFileBytes(_imageObject, maxSizeBytes); + bytes = await cacheManager.remoteFileBytes(_imageObject, maxSizeBytes); } return bytes!; @@ -133,6 +134,5 @@ class FirebaseImage extends ImageProvider { int get hashCode => hashValues(_imageObject.uri, scale); @override - String toString() => - '$runtimeType("${_imageObject.uri}", scale: $scale)'; + String toString() => '$runtimeType("${_imageObject.uri}", scale: $scale)'; } diff --git a/pubspec.yaml b/pubspec.yaml index ed7b68b..40a6b23 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: firebase_image description: A cached Flutter ImageProvider for Firebase Cloud Storage image objects. -version: 1.0.2 +version: 1.1.0 homepage: https://github.com/mattreid1/firebase_image environment: