Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bruig: Add AVIF image support #663

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions bruig/flutterui/bruig/lib/components/attach_file.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import 'package:bruig/models/snackbar.dart';
import 'package:bruig/screens/compress.dart';
import 'package:bruig/theme_manager.dart';
import 'package:bruig/util.dart';
import 'package:flutter_avif/flutter_avif.dart';
import 'package:image_picker/image_picker.dart';
import 'package:file_picker/file_picker.dart';
import 'package:flutter/material.dart';
Expand Down Expand Up @@ -298,12 +299,20 @@ class _AttachFileScreenState extends State<AttachFileScreen> {
? Container(
margin: const EdgeInsets.symmetric(vertical: 8.0),
height: 200.0,
child: Image.memory(fileData!, errorBuilder:
(BuildContext context, Object error,
StackTrace? stackTrace) {
return const Center(
child: Text('This image type is not supported'));
}))
child: mime.contains("avif")
? AvifImage.memory(fileData!, errorBuilder:
(BuildContext context, Object error,
StackTrace? stackTrace) {
return const Center(
child: Text('Avif unable to be decoded'));
})
: Image.memory(fileData!, errorBuilder:
(BuildContext context, Object error,
StackTrace? stackTrace) {
return const Center(
child:
Text('This image type is not supported'));
}))
: mime.startsWith('text/')
? Container(
margin: const EdgeInsets.symmetric(vertical: 8.0),
Expand Down
58 changes: 57 additions & 1 deletion bruig/flutterui/bruig/lib/components/image_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import 'package:bruig/components/context_menu.dart';
import 'package:bruig/components/snackbars.dart';
import 'package:file_picker/file_picker.dart';
import 'package:flutter/material.dart';
import 'package:flutter_avif/flutter_avif.dart';
import 'package:path_provider/path_provider.dart';
import 'dart:typed_data';
import 'package:path/path.dart' as path;
Expand Down Expand Up @@ -59,7 +60,7 @@ class ImageDialog extends StatelessWidget {
}

File(fname).writeAsBytesSync(imgContent);
showSuccessSnackbar(this, "Written image file $fname");
showSuccessSnackbar(context, "Written image file $fname");
break;
case "share":
if (fname == "") {
Expand Down Expand Up @@ -93,3 +94,58 @@ class ImageDialog extends StatelessWidget {
));
}
}

class AvifDialog extends StatelessWidget {
final Uint8List imgContent;
const AvifDialog(this.imgContent, {super.key});

void contextMenuItemClicked(context, value) async {
var fname = "image.avif";

switch (value) {
case "save":
fname = await FilePicker.platform.saveFile(
dialogTitle: "Select filename",
fileName: fname,
) ??
"";

if (fname == "") {
return;
}

File(fname).writeAsBytesSync(imgContent);
showSuccessSnackbar(context, "Written avif file $fname");
break;
case "share":
if (fname == "") {
fname = "image.avif";
}
var dir = await _tempImgDir();
if (!Directory(dir).existsSync()) {
Directory(dir).createSync(recursive: true);
}
fname = path.join(dir, fname);
File(fname).writeAsBytesSync(imgContent);
Share.shareXFiles([XFile(fname)], text: "Image");
break;
}
}

@override
Widget build(BuildContext context) {
return Dialog(
child: ContextMenu(
handleItemTap: (v) => contextMenuItemClicked(context, v),
items: _contextMenuItems,
child: Container(
constraints: const BoxConstraints(maxHeight: 1000, maxWidth: 1000),
decoration: BoxDecoration(
image: DecorationImage(
image: AvifImage.memory(imgContent).image,
),
),
),
));
}
}
74 changes: 73 additions & 1 deletion bruig/flutterui/bruig/lib/components/md_elements.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import 'package:bruig/theme_manager.dart';
import 'package:bruig/components/image_dialog.dart';
import 'package:pdfrx/pdfrx.dart';
import 'package:path/path.dart' as path;
import 'package:flutter_avif/flutter_avif.dart';

class DownloadSource {
final String uid;
Expand Down Expand Up @@ -139,7 +140,6 @@ class EmbedInlineSyntax extends md.InlineSyntax {

var tag = "";
switch (parms["type"]) {
case "image/avif":
case "image/bmp":
case "image/gif":
case "image/jpeg":
Expand All @@ -148,6 +148,8 @@ class EmbedInlineSyntax extends md.InlineSyntax {
case "image/webp":
tag = "image";
break;
case "image/avif":
tag = "avif";
case "text/plain":
// Decode plain text directly.
tag = "pre";
Expand Down Expand Up @@ -325,6 +327,7 @@ class MarkdownArea extends StatelessWidget {
"download": DownloadLinkElementBuilder(),
"form": FormElementBuilder(),
"lnpay": _LNPayURLElementBuilder(),
"avif": AVIFElementBuilder(),
};

static final inlineSyntaxes = [
Expand Down Expand Up @@ -472,6 +475,37 @@ class ImageMd extends StatelessWidget {
);
}

class AvifMd extends StatelessWidget {
final String tip;
final Uint8List imgContent;
const AvifMd(this.tip, this.imgContent, {super.key});

@override
Widget build(BuildContext context) => Tooltip(
message: tip,
child: InkWell(
borderRadius: const BorderRadius.all(Radius.circular(30)),
onTap: () {
showDialog(
context: context, builder: (_) => AvifDialog(imgContent));
},
child: Container(
constraints: const BoxConstraints(maxHeight: 250, maxWidth: 250),
margin: const EdgeInsets.symmetric(horizontal: 2, vertical: 2),
decoration: BoxDecoration(
borderRadius: const BorderRadius.all(Radius.circular(8.0)),
image: DecorationImage(
image: AvifImage.memory(imgContent).image,
onError: (exception, stackTrace) {
debugPrint("AvifMd unable to decode image: $exception");
},
),
),
),
),
);
}

class PreformattedElementBuilder extends MarkdownElementBuilder {
@override
Widget visitText(md.Text text, TextStyle? preferredStyle) {
Expand Down Expand Up @@ -643,6 +677,44 @@ class ImageMarkdownElementBuilder extends MarkdownElementBuilder {
}
}

class AVIFElementBuilder extends MarkdownElementBuilder {
@override
Widget visitElementAfter(md.Element element, TextStyle? preferredStyle) {
Uint8List imgBytes;
try {
imgBytes = const Base64Decoder().convert(element.textContent);
} catch (exception) {
return Text("Unable to decode avif: $exception");
}

var alt = element.attributes["alt"] ?? "";
var download = element.attributes["fid"] ?? "";
var tip = "";
if (alt != "") {
tip = alt;
if (download != "") {
tip += "\n\n";
}
}
if (download != "") {
tip += "Click to download file $download";
}
var type = element.attributes["type"] ?? "";

try {
return AvifMd(tip, imgBytes);
} catch (exception) {
debugPrint("Unable to decode avif: $exception");
return Image.asset(
"assets/images/invalidimg.png",
width: 300,
height: 300,
fit: BoxFit.cover,
);
}
}
}

class _PayReqBtn extends StatefulWidget {
final PaymentsModel payments;
final String invoice;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

#include <emoji_picker_flutter/emoji_picker_flutter_plugin.h>
#include <file_selector_linux/file_selector_plugin.h>
#include <flutter_avif_linux/flutter_avif_linux_plugin.h>
#include <golib_plugin/golib_plugin.h>
#include <image_compression_flutter/image_compression_flutter_plugin.h>
#include <irondash_engine_context/irondash_engine_context_plugin.h>
Expand All @@ -23,6 +24,9 @@ void fl_register_plugins(FlPluginRegistry* registry) {
g_autoptr(FlPluginRegistrar) file_selector_linux_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin");
file_selector_plugin_register_with_registrar(file_selector_linux_registrar);
g_autoptr(FlPluginRegistrar) flutter_avif_linux_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterAvifLinuxPlugin");
flutter_avif_linux_plugin_register_with_registrar(flutter_avif_linux_registrar);
g_autoptr(FlPluginRegistrar) golib_plugin_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "GolibPlugin");
golib_plugin_register_with_registrar(golib_plugin_registrar);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
list(APPEND FLUTTER_PLUGIN_LIST
emoji_picker_flutter
file_selector_linux
flutter_avif_linux
golib_plugin
image_compression_flutter
irondash_engine_context
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import Foundation
import device_info_plus
import emoji_picker_flutter
import file_selector_macos
import flutter_avif_macos
import flutter_image_compress_macos
import flutter_local_notifications
import golib_plugin
Expand All @@ -28,6 +29,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
EmojiPickerFlutterPlugin.register(with: registry.registrar(forPlugin: "EmojiPickerFlutterPlugin"))
FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
FlutterAvifPlugin.register(with: registry.registrar(forPlugin: "FlutterAvifPlugin"))
FlutterImageCompressMacosPlugin.register(with: registry.registrar(forPlugin: "FlutterImageCompressMacosPlugin"))
FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))
GolibPlugin.register(with: registry.registrar(forPlugin: "GolibPlugin"))
Expand Down
Loading
Loading