sticks/nexus
1
0
Fork 0
forked from Henry-Hiles/nexus
Code Pull requests Activity

Fix inline widgets

Browse source
This commit is contained in:
Henry Hiles 2025-12-26 17:24:02 -05:00
commit 3ab8451a64
No known key found for this signature in database
7 changed files with 40 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/main.dart
View file

@ -34,6 +34,7 @@ New Value: ${newValue is AsyncData ? newValue.value : newValue}
void showError(Object error, [StackTrace? stackTrace]) { void showError(Object error, [StackTrace? stackTrace]) {
if (error.toString().contains("DioException")) return; if (error.toString().contains("DioException")) return;
if (error.toString().contains("UTF-16")) return; if (error.toString().contains("UTF-16")) return;
if (error.toString().contains("Invalid image data")) return;
debugPrintStack(stackTrace: stackTrace, label: error.toString()); debugPrintStack(stackTrace: stackTrace, label: error.toString());
if (navigatorKey.currentContext != null) { if (navigatorKey.currentContext != null) {

6
lib/widgets/chat_page/html/html.dart
View file

@ -10,7 +10,7 @@ import "package:nexus/models/image_data.dart";
import "package:nexus/widgets/chat_page/html/mention_chip.dart"; import "package:nexus/widgets/chat_page/html/mention_chip.dart";
import "package:nexus/widgets/chat_page/html/spoiler_text.dart"; import "package:nexus/widgets/chat_page/html/spoiler_text.dart";
import "package:nexus/widgets/chat_page/html/code_block.dart"; import "package:nexus/widgets/chat_page/html/code_block.dart";
import "package:nexus/widgets/chat_page/quoted.dart"; import "package:nexus/widgets/chat_page/html/quoted.dart";
import "package:nexus/widgets/error_dialog.dart"; import "package:nexus/widgets/error_dialog.dart";
class Html extends ConsumerWidget { class Html extends ConsumerWidget {
@ -23,7 +23,7 @@ class Html extends ConsumerWidget {
html, html,
customWidgetBuilder: (element) { customWidgetBuilder: (element) {
if (element.attributes.keys.contains("data-mx-spoiler")) { if (element.attributes.keys.contains("data-mx-spoiler")) {
return SpoilerText(text: element.text); return InlineCustomWidget(child: SpoilerText(text: element.text));
} }
final height = int.tryParse(element.attributes["height"] ?? "") ?? 300; final height = int.tryParse(element.attributes["height"] ?? "") ?? 300;
@ -42,7 +42,7 @@ class Html extends ConsumerWidget {
"a" => "a" =>
Uri.tryParse(element.attributes["href"] ?? "")?.host == "matrix.to" Uri.tryParse(element.attributes["href"] ?? "")?.host == "matrix.to"
? MentionChip(element.text) ? InlineCustomWidget(child: MentionChip(element.text))
: null, : null,
"img" => "img" =>

25
lib/widgets/chat_page/html/mention_chip.dart
View file

@ -1,5 +1,4 @@
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:matrix/matrix.dart"; import "package:matrix/matrix.dart";
class MentionChip extends StatelessWidget { class MentionChip extends StatelessWidget {
@ -7,20 +6,18 @@ class MentionChip extends StatelessWidget {
const MentionChip(this.label, {super.key}); const MentionChip(this.label, {super.key});
@override @override
Widget build(BuildContext context) => InlineCustomWidget( Widget build(BuildContext context) => ActionChip(
child: ActionChip( label: Text(
label: Text( label.parseIdentifierIntoParts()?.primaryIdentifier ?? label,
label.parseIdentifierIntoParts()?.primaryIdentifier ?? label, style: TextStyle(
style: TextStyle( fontWeight: FontWeight.bold,
fontWeight: FontWeight.bold, color: Theme.of(context).colorScheme.onPrimary,
color: Theme.of(context).colorScheme.onPrimary,
),
), ),
backgroundColor: Theme.of(context).colorScheme.primary,
onPressed: () {
// TODO: Open room or join room dialog, or user popover
showAboutDialog(context: context);
},
), ),
backgroundColor: Theme.of(context).colorScheme.primary,
onPressed: () {
// TODO: Open room or join room dialog, or user popover
showAboutDialog(context: context);
},
); );
} }

0
lib/widgets/chat_page/quoted.dart → lib/widgets/chat_page/html/quoted.dart
View file

27
lib/widgets/chat_page/html/spoiler_text.dart
View file

@ -1,6 +1,5 @@
import "package:flutter/material.dart"; import "package:flutter/material.dart";
import "package:flutter_hooks/flutter_hooks.dart"; import "package:flutter_hooks/flutter_hooks.dart";
import "package:flutter_widget_from_html_core/flutter_widget_from_html_core.dart";
class SpoilerText extends HookWidget { class SpoilerText extends HookWidget {
final String text; final String text;
@ -11,20 +10,18 @@ class SpoilerText extends HookWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
final revealed = useState(false); final revealed = useState(false);
return InlineCustomWidget( return InkWell(
child: InkWell( onTap: () => revealed.value = !revealed.value,
onTap: () => revealed.value = !revealed.value, child: AnimatedContainer(
child: AnimatedContainer( duration: const Duration(milliseconds: 100),
duration: const Duration(milliseconds: 100), padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 2),
padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 2), decoration: BoxDecoration(
decoration: BoxDecoration( color: revealed.value ? Colors.transparent : Colors.blueGrey,
color: revealed.value ? Colors.transparent : Colors.blueGrey, borderRadius: BorderRadius.circular(4),
borderRadius: BorderRadius.circular(4), ),
), child: Text(
child: Text( text,
text, style: TextStyle(color: revealed.value ? null : Colors.transparent),
style: TextStyle(color: revealed.value ? null : Colors.transparent),
),
), ),
), ),
); );

12
lib/widgets/chat_page/room_chat.dart
View file

@ -262,6 +262,18 @@ class RoomChat extends HookConsumerWidget {
groupStatus: groupStatus, groupStatus: groupStatus,
alwaysShow: true, alwaysShow: true,
), ),
errorBuilder:
(context, error, stackTrace) =>
Center(
child: Text(
"Image Failed to Load",
style: TextStyle(
color: Theme.of(
context,
).colorScheme.error,
),
),
),
message: message, message: message,
index: index, index: index,
headers: room.roomData.client.headers, headers: room.roomData.client.headers,

2
lib/widgets/chat_page/top_widget.dart
View file

@ -3,7 +3,7 @@ import "package:flutter/material.dart";
import "package:flutter_chat_core/flutter_chat_core.dart"; import "package:flutter_chat_core/flutter_chat_core.dart";
import "package:flutter_chat_ui/flutter_chat_ui.dart"; import "package:flutter_chat_ui/flutter_chat_ui.dart";
import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:flutter_riverpod/flutter_riverpod.dart";
import "package:nexus/widgets/chat_page/quoted.dart"; import "package:nexus/widgets/chat_page/html/quoted.dart";
class TopWidget extends ConsumerWidget { class TopWidget extends ConsumerWidget {
final Message message; final Message message;