Merge pull request #2501 from nextcloud/fix/nextcloud/rich-objects

nextcloud · Sep 15, 2024 · cd20549 · cd20549
2 parents c95309b + f4fd9cf
commit cd20549
Show file tree

Hide file tree

Showing 24 changed files with 1,776 additions and 3,080 deletions.
diff --git a/packages/neon_framework/packages/talk_app/lib/src/widgets/message.dart b/packages/neon_framework/packages/talk_app/lib/src/widgets/message.dart
@@ -8,6 +8,7 @@ import 'package:neon_framework/models.dart';
 import 'package:neon_framework/theme.dart';
 import 'package:neon_framework/utils.dart';
 import 'package:neon_framework/widgets.dart';
+import 'package:nextcloud/core.dart' as core;
 import 'package:nextcloud/spreed.dart' as spreed;
 import 'package:talk_app/l10n/localizations.dart';
 import 'package:talk_app/src/blocs/message_bloc.dart';
@@ -55,7 +56,7 @@ TextSpan buildChatMessage({
     message = message.replaceAll('\n', ' ');
   }
 
-  final unusedParameters = <String, spreed.RichObjectParameter>{};
+  final unusedParameters = <String, core.RichObjectParameter>{};
 
   var parts = [message];
   for (final entry in chatMessage.messageParameters.entries) {
@@ -71,7 +72,9 @@ TextSpan buildChatMessage({
     }
 
     if (!found) {
-      unusedParameters[entry.key] = entry.value;
+      unusedParameters[entry.key] = core.RichObjectParameter.fromJson(
+        entry.value.map((key, value) => MapEntry(key, value.toString())).toMap(),
+      );
     }
 
     parts = newParts;
@@ -111,7 +114,9 @@ TextSpan buildChatMessage({
       if ('{${entry.key}}' == part) {
         children.add(
           buildRichObjectParameter(
-            parameter: entry.value,
+            parameter: core.RichObjectParameter.fromJson(
+              entry.value.map((key, value) => MapEntry(key, value.toString())).toMap(),
+            ),
             textStyle: style,
             isPreview: isPreview,
           ),
@@ -157,7 +162,7 @@ TextSpan buildChatMessage({
 
 /// Renders a rich object [parameter] to be interactive.
 InlineSpan buildRichObjectParameter({
-  required spreed.RichObjectParameter parameter,
+  required core.RichObjectParameter parameter,
   required TextStyle? textStyle,
   required bool isPreview,
 }) {
@@ -171,19 +176,19 @@ InlineSpan buildRichObjectParameter({
   return WidgetSpan(
     alignment: PlaceholderAlignment.middle,
     child: switch (parameter.type) {
-      spreed.RichObjectParameter_Type.user ||
-      spreed.RichObjectParameter_Type.call ||
-      spreed.RichObjectParameter_Type.guest ||
-      spreed.RichObjectParameter_Type.userGroup =>
+      core.RichObjectParameter_Type.user ||
+      core.RichObjectParameter_Type.call ||
+      core.RichObjectParameter_Type.guest ||
+      core.RichObjectParameter_Type.userGroup =>
         TalkRichObjectMention(
           parameter: parameter,
           textStyle: textStyle,
         ),
-      spreed.RichObjectParameter_Type.file => TalkRichObjectFile(
+      core.RichObjectParameter_Type.file => TalkRichObjectFile(
           parameter: parameter,
           textStyle: textStyle,
         ),
-      spreed.RichObjectParameter_Type.deckCard => TalkRichObjectDeckCard(
+      core.RichObjectParameter_Type.deckCard => TalkRichObjectDeckCard(
           parameter: parameter,
         ),
       _ => TalkRichObjectFallback(

diff --git a/packages/neon_framework/packages/talk_app/lib/src/widgets/rich_object/deck_card.dart b/packages/neon_framework/packages/talk_app/lib/src/widgets/rich_object/deck_card.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_material_design_icons/flutter_material_design_icons.dart';
 import 'package:neon_framework/models.dart';
 import 'package:neon_framework/utils.dart';
-import 'package:nextcloud/spreed.dart' as spreed;
+import 'package:nextcloud/core.dart' as core;
 
 /// Widget to display a Deck card from a rich object.
 class TalkRichObjectDeckCard extends StatelessWidget {
@@ -13,7 +13,7 @@ class TalkRichObjectDeckCard extends StatelessWidget {
   });
 
   /// The parameter to display.
-  final spreed.RichObjectParameter parameter;
+  final core.RichObjectParameter parameter;
 
   @override
   Widget build(BuildContext context) {

diff --git a/packages/neon_framework/packages/talk_app/lib/src/widgets/rich_object/fallback.dart b/packages/neon_framework/packages/talk_app/lib/src/widgets/rich_object/fallback.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:neon_framework/models.dart';
 import 'package:neon_framework/utils.dart';
 import 'package:neon_framework/widgets.dart';
-import 'package:nextcloud/spreed.dart' as spreed;
+import 'package:nextcloud/core.dart' as core;
 
 /// Widget used to render rich object parameters with unknown types.
 class TalkRichObjectFallback extends StatelessWidget {
@@ -14,7 +14,7 @@ class TalkRichObjectFallback extends StatelessWidget {
   });
 
   /// The parameter to display.
-  final spreed.RichObjectParameter parameter;
+  final core.RichObjectParameter parameter;
 
   /// The TextStyle to applied to all text elements in this rich object.
   final TextStyle? textStyle;

diff --git a/packages/neon_framework/packages/talk_app/lib/src/widgets/rich_object/file.dart b/packages/neon_framework/packages/talk_app/lib/src/widgets/rich_object/file.dart
@@ -3,7 +3,6 @@ import 'package:neon_framework/models.dart';
 import 'package:neon_framework/utils.dart';
 import 'package:neon_framework/widgets.dart';
 import 'package:nextcloud/core.dart' as core;
-import 'package:nextcloud/spreed.dart' as spreed;
 
 /// Displays a file from a rich object.
 class TalkRichObjectFile extends StatelessWidget {
@@ -15,13 +14,11 @@ class TalkRichObjectFile extends StatelessWidget {
   });
 
   /// The parameter to display.
-  final spreed.RichObjectParameter parameter;
+  final core.RichObjectParameter parameter;
 
   /// The TextStyle to applied to all text elements in this rich object.
   final TextStyle? textStyle;
 
-  int _parseDimension(({int? $int, String? string}) dimension) => dimension.$int ?? int.parse(dimension.string!);
-
   @override
   Widget build(BuildContext context) {
     final child = LayoutBuilder(
@@ -35,8 +32,8 @@ class TalkRichObjectFile extends StatelessWidget {
 
         if (parameter.width != null && parameter.height != null) {
           deviceSize = Size(
-            _parseDimension(parameter.width!).toDouble(),
-            _parseDimension(parameter.height!).toDouble(),
+            double.parse(parameter.width!),
+            double.parse(parameter.height!),
           );
 
           // Convert to logical pixels

diff --git a/packages/neon_framework/packages/talk_app/lib/src/widgets/rich_object/mention.dart b/packages/neon_framework/packages/talk_app/lib/src/widgets/rich_object/mention.dart
@@ -5,7 +5,7 @@ import 'package:neon_framework/models.dart';
 import 'package:neon_framework/theme.dart';
 import 'package:neon_framework/utils.dart';
 import 'package:neon_framework/widgets.dart';
-import 'package:nextcloud/spreed.dart' as spreed;
+import 'package:nextcloud/core.dart' as core;
 
 /// Displays a mention chip from a rich object.
 class TalkRichObjectMention extends StatelessWidget {
@@ -17,7 +17,7 @@ class TalkRichObjectMention extends StatelessWidget {
   });
 
   /// The parameter to display.
-  final spreed.RichObjectParameter parameter;
+  final core.RichObjectParameter parameter;
 
   /// The TextStyle to applied to all text elements in this rich object.
   final TextStyle? textStyle;
@@ -28,7 +28,7 @@ class TalkRichObjectMention extends StatelessWidget {
     final bool highlight;
 
     switch (parameter.type) {
-      case spreed.RichObjectParameter_Type.user:
+      case core.RichObjectParameter_Type.user:
         final account = NeonProvider.of<Account>(context);
 
         highlight = account.username == parameter.id;
@@ -37,7 +37,7 @@ class TalkRichObjectMention extends StatelessWidget {
           account: NeonProvider.of<Account>(context),
           userStatusBloc: null,
         );
-      case spreed.RichObjectParameter_Type.call:
+      case core.RichObjectParameter_Type.call:
         highlight = true;
         child = CircleAvatar(
           child: ClipOval(
@@ -47,13 +47,13 @@ class TalkRichObjectMention extends StatelessWidget {
             ),
           ),
         );
-      case spreed.RichObjectParameter_Type.guest:
+      case core.RichObjectParameter_Type.guest:
         // TODO: Add highlighting when the mention is about the current guest user.
         highlight = false;
         child = CircleAvatar(
           child: Icon(AdaptiveIcons.person),
         );
-      case spreed.RichObjectParameter_Type.userGroup:
+      case core.RichObjectParameter_Type.userGroup:
         final userDetailsBloc = NeonProvider.of<UserDetailsBloc>(context);
         final groups = userDetailsBloc.userDetails.valueOrNull?.data?.groups ?? BuiltList();
 

diff --git a/packages/neon_framework/packages/talk_app/pubspec.yaml b/packages/neon_framework/packages/talk_app/pubspec.yaml
@@ -31,6 +31,7 @@ dependencies:
 
 dev_dependencies:
   build_runner: ^2.4.12
+  built_value: ^8.9.2
   custom_lint: ^0.6.5
   flutter_keyboard_visibility: ^6.0.0
   flutter_test:

diff --git a/packages/neon_framework/packages/talk_app/test/message_test.dart b/packages/neon_framework/packages/talk_app/test/message_test.dart
@@ -1,4 +1,5 @@
 import 'package:built_collection/built_collection.dart';
+import 'package:built_value/json_object.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -1520,10 +1521,10 @@ void main() {
       group(isPreview ? 'As preview' : 'Complete', () {
         group('Mention', () {
           for (final type in [
-            spreed.RichObjectParameter_Type.user,
-            spreed.RichObjectParameter_Type.call,
-            spreed.RichObjectParameter_Type.guest,
-            spreed.RichObjectParameter_Type.userGroup,
+            core.RichObjectParameter_Type.user,
+            core.RichObjectParameter_Type.call,
+            core.RichObjectParameter_Type.guest,
+            core.RichObjectParameter_Type.userGroup,
           ]) {
             testWidgets(type.value, (tester) async {
               final userDetails = MockUserDetails();
@@ -1543,7 +1544,7 @@ void main() {
                   ],
                   child: RichText(
                     text: buildRichObjectParameter(
-                      parameter: spreed.RichObjectParameter(
+                      parameter: core.RichObjectParameter(
                         (b) => b
                           ..type = type
                           ..id = ''
@@ -1573,9 +1574,9 @@ void main() {
               ],
               child: RichText(
                 text: buildRichObjectParameter(
-                  parameter: spreed.RichObjectParameter(
+                  parameter: core.RichObjectParameter(
                     (b) => b
-                      ..type = spreed.RichObjectParameter_Type.file
+                      ..type = core.RichObjectParameter_Type.file
                       ..id = '0'
                       ..name = 'name',
                   ),
@@ -1595,9 +1596,9 @@ void main() {
             TestApp(
               child: RichText(
                 text: buildRichObjectParameter(
-                  parameter: spreed.RichObjectParameter(
+                  parameter: core.RichObjectParameter(
                     (b) => b
-                      ..type = spreed.RichObjectParameter_Type.deckCard
+                      ..type = core.RichObjectParameter_Type.deckCard
                       ..id = ''
                       ..name = 'name'
                       ..boardname = 'boardname'
@@ -1619,9 +1620,9 @@ void main() {
             TestApp(
               child: RichText(
                 text: buildRichObjectParameter(
-                  parameter: spreed.RichObjectParameter(
+                  parameter: core.RichObjectParameter(
                     (b) => b
-                      ..type = spreed.RichObjectParameter_Type.addressbook
+                      ..type = core.RichObjectParameter_Type.addressbook
                       ..id = ''
                       ..name = 'name',
                   ),
@@ -1671,12 +1672,11 @@ void main() {
             when(() => chatMessage.message).thenReturn('test');
             when(() => chatMessage.messageParameters).thenReturn(
               BuiltMap({
-                type: spreed.RichObjectParameter(
-                  (b) => b
-                    ..type = spreed.RichObjectParameter_Type.user
-                    ..id = ''
-                    ..name = '',
-                ),
+                type: BuiltMap<String, JsonObject>({
+                  'type': JsonObject('user'),
+                  'id': JsonObject(''),
+                  'name': JsonObject(''),
+                }),
               }),
             );
 
@@ -1696,12 +1696,11 @@ void main() {
         when(() => chatMessage.message).thenReturn('test');
         when(() => chatMessage.messageParameters).thenReturn(
           BuiltMap({
-            'file': spreed.RichObjectParameter(
-              (b) => b
-                ..type = spreed.RichObjectParameter_Type.file
-                ..id = ''
-                ..name = '',
-            ),
+            'file': BuiltMap<String, JsonObject>({
+              'type': JsonObject('file'),
+              'id': JsonObject(''),
+              'name': JsonObject(''),
+            }),
           }),
         );
 
@@ -1723,18 +1722,16 @@ void main() {
       when(() => chatMessage.message).thenReturn('123 {actor1} 456 {actor2} 789');
       when(() => chatMessage.messageParameters).thenReturn(
         BuiltMap({
-          'actor1': spreed.RichObjectParameter(
-            (b) => b
-              ..type = spreed.RichObjectParameter_Type.user
-              ..id = ''
-              ..name = '',
-          ),
-          'actor2': spreed.RichObjectParameter(
-            (b) => b
-              ..type = spreed.RichObjectParameter_Type.user
-              ..id = ''
-              ..name = '',
-          ),
+          'actor1': BuiltMap<String, JsonObject>({
+            'type': JsonObject('user'),
+            'id': JsonObject(''),
+            'name': JsonObject(''),
+          }),
+          'actor2': BuiltMap<String, JsonObject>({
+            'type': JsonObject('user'),
+            'id': JsonObject(''),
+            'name': JsonObject(''),
+          }),
         }),
       );