work_items: handle markdown comments

PurpleSoftSrl · Jun 25, 2024 · e5fcd51 · e5fcd51
1 parent 2656a10
commit e5fcd51
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 4 deletions.
diff --git a/lib/src/models/work_item_comments.dart b/lib/src/models/work_item_comments.dart
@@ -37,6 +37,7 @@ class Comment {
     required this.createdDate,
     required this.modifiedBy,
     required this.modifiedDate,
+    required this.format,
   });
 
   factory Comment.fromJson(Map<String, dynamic> json) => Comment(
@@ -48,6 +49,7 @@ class Comment {
         createdDate: DateTime.parse(json['createdDate']!.toString()).toLocal(),
         modifiedBy: EdBy.fromJson(json['modifiedBy'] as Map<String, dynamic>),
         modifiedDate: DateTime.parse(json['modifiedDate']!.toString()).toLocal(),
+        format: json['format'] as String,
       );
 
   final int workItemId;
@@ -58,6 +60,7 @@ class Comment {
   final DateTime createdDate;
   final EdBy modifiedBy;
   final DateTime modifiedDate;
+  final String format;
 }
 
 class EdBy {

diff --git a/lib/src/models/work_item_updates.dart b/lib/src/models/work_item_updates.dart
@@ -355,12 +355,14 @@ class CommentItemUpdate extends ItemUpdate {
     required this.id,
     required this.text,
     this.isEdited = false,
+    required this.format,
   });
 
   final int workItemId;
   final int id;
   final String text;
   final bool isEdited;
+  final String format;
 }
 
 final class UpdateUser {

diff --git a/lib/src/screens/work_item_detail/base_work_item_detail.dart b/lib/src/screens/work_item_detail/base_work_item_detail.dart
@@ -33,10 +33,12 @@ import 'package:azure_devops/src/widgets/work_item_type_icon.dart';
 import 'package:collection/collection.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:html_editor_enhanced/html_editor.dart';
 import 'package:open_filex/open_filex.dart';
 import 'package:path/path.dart' as path;
 import 'package:path_provider/path_provider.dart';
+import 'package:url_launcher/url_launcher_string.dart';
 import 'package:visibility_detector/visibility_detector.dart';
 
 part 'components_work_item_detail.dart';

diff --git a/lib/src/screens/work_item_detail/components_work_item_detail.dart b/lib/src/screens/work_item_detail/components_work_item_detail.dart
@@ -171,10 +171,23 @@ class _CommentWidget extends StatelessWidget {
             const SizedBox(
               height: 5,
             ),
-            HtmlWidget(
-              data: update.text,
-              padding: const EdgeInsets.all(3),
-            ),
+            if (update.format == 'markdown')
+              Padding(
+                padding: const EdgeInsets.only(left: 8, bottom: 8, right: 8),
+                child: MarkdownBody(
+                  data: update.text,
+                  styleSheet:
+                      MarkdownStyleSheet.fromTheme(Theme.of(context)).copyWith(p: context.textTheme.labelMedium),
+                  onTapLink: (_, url, ___) async {
+                    if (await canLaunchUrlString(url!)) await launchUrlString(url);
+                  },
+                ),
+              )
+            else if (update.format == 'html')
+              HtmlWidget(
+                data: update.text,
+                padding: const EdgeInsets.all(3),
+              ),
             const SizedBox(
               height: 4,
             ),

diff --git a/lib/src/services/azure_api_service.dart b/lib/src/services/azure_api_service.dart
@@ -1053,6 +1053,7 @@ class AzureApiServiceImpl with AppLogger implements AzureApiService {
           workItemId: c.workItemId,
           text: c.text,
           isEdited: c.createdDate.isBefore(c.modifiedDate),
+          format: c.format,
         ),
       ),
       ...updates.where((u) => u.hasSupportedChanges).map(