beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Defer thumbnail loading

Browse source
This commit is contained in:
Vishnu Mohandas 2021-04-26 12:59:01 +05:30
parent 7fec8e6c79
commit cf9a19246c
2 changed files with 62 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ui/huge_listview/lazy_loading_gallery.dart
View file

@ -108,6 +108,7 @@ class _LazyLoadingGalleryState extends State<LazyLoadingGallery> {
}
class LazyLoadingGridView extends StatefulWidget {
static const kThumbnailLoadDeferDuration = Duration(milliseconds: 100);
final String tag;
final List<File> files;
final Future<List<File>> Function(int creationStartTime, int creationEndTime,
@ -188,7 +189,10 @@ class _LazyLoadingGridViewState extends State<LazyLoadingGridView> {
),
child: Hero(
tag: widget.tag + file.tag(),
child: ThumbnailWidget(file),
child: ThumbnailWidget(
file,
loadDeferDuration: LazyLoadingGridView.kThumbnailLoadDeferDuration,
),
),
),
);

92
lib/ui/thumbnail_widget.dart
View file

@ -15,12 +15,14 @@ class ThumbnailWidget extends StatefulWidget {
final File file;
final BoxFit fit;
final bool shouldShowSyncStatus;
final Duration loadDeferDuration;
ThumbnailWidget(
this.file, {
Key key,
this.fit = BoxFit.cover,
this.shouldShowSyncStatus = true,
this.loadDeferDuration,
}) : super(key: key ?? Key(file.generatedID.toString()));
@override
_ThumbnailWidgetState createState() => _ThumbnailWidgetState();
@ -127,46 +129,58 @@ class _ThumbnailWidgetState extends State<ThumbnailWidget> {
_imageProvider = Image.memory(cachedSmallThumbnail).image;
_hasLoadedThumbnail = true;
} else {
widget.file.getAsset().then((asset) async {
if (asset == null || !(await asset.exists)) {
if (widget.file.uploadedFileID != null) {
widget.file.localID = null;
FilesDB.instance.update(widget.file);
_loadNetworkImage();
} else {
FilesDB.instance.deleteLocalFile(widget.file.localID);
Bus.instance.fire(LocalPhotosUpdatedEvent([widget.file]));
if (widget.loadDeferDuration != null) {
Future.delayed(widget.loadDeferDuration, () {
if (mounted) {
_getThumbnailFromDisk();
}
return;
}
asset
.thumbDataWithSize(
THUMBNAIL_SMALL_SIZE,
THUMBNAIL_SMALL_SIZE,
quality: THUMBNAIL_QUALITY,
)
.then((data) {
if (data != null && mounted) {
final imageProvider = Image.memory(data).image;
precacheImage(imageProvider, context).then((value) {
if (mounted) {
setState(() {
_imageProvider = imageProvider;
_hasLoadedThumbnail = true;
});
}
});
}
ThumbnailLruCache.put(widget.file, THUMBNAIL_SMALL_SIZE, data);
});
}).catchError((e) {
_logger.warning("Could not load image: ", e);
_encounteredErrorLoadingThumbnail = true;
});
} else {
_getThumbnailFromDisk();
}
}
}
}
Future _getThumbnailFromDisk() async {
widget.file.getAsset().then((asset) async {
if (asset == null || !(await asset.exists)) {
if (widget.file.uploadedFileID != null) {
widget.file.localID = null;
FilesDB.instance.update(widget.file);
_loadNetworkImage();
} else {
FilesDB.instance.deleteLocalFile(widget.file.localID);
Bus.instance.fire(LocalPhotosUpdatedEvent([widget.file]));
}
return;
}
asset
.thumbDataWithSize(
THUMBNAIL_SMALL_SIZE,
THUMBNAIL_SMALL_SIZE,
quality: THUMBNAIL_QUALITY,
)
.then((data) {
if (data != null && mounted) {
final imageProvider = Image.memory(data).image;
precacheImage(imageProvider, context).then((value) {
if (mounted) {
setState(() {
_imageProvider = imageProvider;
_hasLoadedThumbnail = true;
});
}
});
}
ThumbnailLruCache.put(widget.file, THUMBNAIL_SMALL_SIZE, data);
});
}).catchError((e) {
_logger.warning("Could not load image: ", e);
_encounteredErrorLoadingThumbnail = true;
});
}
void _loadNetworkImage() {
if (!_hasLoadedThumbnail &&
!_encounteredErrorLoadingThumbnail &&
@ -178,7 +192,15 @@ class _ThumbnailWidgetState extends State<ThumbnailWidget> {
_hasLoadedThumbnail = true;
return;
}
_getThumbnailFromServer();
if (widget.loadDeferDuration != null) {
Future.delayed(widget.loadDeferDuration, () {
if (mounted) {
_getThumbnailFromServer();
}
});
} else {
_getThumbnailFromServer();
}
}
}