Merge branch 'main' of gitlab.com:mysocialportal/relatica

This commit is contained in:
Hank Grabowski 2024-09-03 15:06:40 -04:00
commit 3eeef0640d
2 changed files with 4 additions and 18 deletions

View file

@ -1,11 +1,10 @@
import 'dart:async'; import 'dart:async';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_widget_from_html_core/flutter_widget_from_html_core.dart'; import 'package:flutter_widget_from_html_core/flutter_widget_from_html_core.dart';
import 'package:html/dom.dart' as dom; import 'package:html/dom.dart' as dom;
import '../globals.dart'; import 'image_control.dart';
const _emojiSize = {'width': '20px', 'height': '20px', 'margin-left': '-3px'}; const _emojiSize = {'width': '20px', 'height': '20px', 'margin-left': '-3px'};
@ -43,19 +42,6 @@ class MyWidgetFactory extends WidgetFactory {
return super.buildImageWidget(meta, src); return super.buildImageWidget(meta, src);
} }
Map<String, String> headers = {'user-agent': userAgent}; return ImageControl(imageUrl: url);
return CachedNetworkImage(
httpHeaders: headers,
errorWidget: (context, _, error) =>
onErrorBuilder(context, meta, error, src) ?? widget0,
fit: BoxFit.fill,
imageUrl: url,
progressIndicatorBuilder: (context, _, progress) {
final t = progress.totalSize;
final v = t != null && t > 0 ? progress.downloaded / t : null;
return onLoadingBuilder(context, meta, v, src) ?? widget0;
},
);
} }
} }

View file

@ -1,9 +1,9 @@
import 'package:cached_network_image/cached_network_image.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../../models/link_preview_data.dart'; import '../../models/link_preview_data.dart';
import '../../utils/string_utils.dart'; import '../../utils/string_utils.dart';
import '../../utils/url_opening_utils.dart'; import '../../utils/url_opening_utils.dart';
import '../image_control.dart';
class LinkPreviewControl extends StatelessWidget { class LinkPreviewControl extends StatelessWidget {
final LinkPreviewData preview; final LinkPreviewData preview;
@ -24,7 +24,7 @@ class LinkPreviewControl extends StatelessWidget {
}, },
child: Column( child: Column(
children: [ children: [
CachedNetworkImage(imageUrl: preview.selectedImageUrl), ImageControl(imageUrl: preview.selectedImageUrl),
ListTile( ListTile(
title: Text(preview.title, title: Text(preview.title,
style: const TextStyle(fontWeight: FontWeight.bold)), style: const TextStyle(fontWeight: FontWeight.bold)),