优化 markdown 显示

Author: CarGuo

ios/Podfile.lock

@@ -38,6 +38,7 @@ PODS:
     - Flutter
   - webview_flutter_wkwebview (0.0.1):
     - Flutter
+    - FlutterMacOS
 
 DEPENDENCIES:
   - connectivity_plus (from `.symlinks/plugins/connectivity_plus/darwin`)
@@ -53,7 +54,7 @@ DEPENDENCIES:
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - sqflite (from `.symlinks/plugins/sqflite/darwin`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
-  - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`)
+  - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/darwin`)
 
 SPEC REPOS:
   trunk:
@@ -88,7 +89,7 @@ EXTERNAL SOURCES:
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
   webview_flutter_wkwebview:
-    :path: ".symlinks/plugins/webview_flutter_wkwebview/ios"
+    :path: ".symlinks/plugins/webview_flutter_wkwebview/darwin"
 
 SPEC CHECKSUMS:
   connectivity_plus: ddd7f30999e1faaef5967c23d5b6d503d10434db
@@ -106,7 +107,7 @@ SPEC CHECKSUMS:
   sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
   Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
   url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
-  webview_flutter_wkwebview: 2a23822e9039b7b1bc52e5add778e5d89ad488d1
+  webview_flutter_wkwebview: a4af96a051138e28e29f60101d094683b9f82188
 
 PODFILE CHECKSUM: c4c93c5f6502fe2754f48404d3594bf779584011
 

lib/common/utils/common_utils.dart

@@ -485,3 +485,10 @@ class CommonUtils {
         });
   }
 }
+
+String getRawBaseUrl(
+    {required String userName,
+    required String repoName,
+    required String branch}) {
+  return "https://raw.githubusercontent.com/$userName/$repoName/$branch/";
+}

lib/page/issue/widget/issue_header_item.dart

@@ -41,8 +41,7 @@ class IssueHeaderItem extends StatelessWidget {
         const Padding(padding: EdgeInsets.all(2.0)),
 
         ///issue issue编码
-        Text(issueHeaderViewModel.issueTag,
-            style: GSYConstant.smallTextWhite),
+        Text(issueHeaderViewModel.issueTag, style: GSYConstant.smallTextWhite),
         const Padding(padding: EdgeInsets.all(2.0)),
 
         ///issue 评论数
@@ -107,8 +106,7 @@ class IssueHeaderItem extends StatelessWidget {
                           children: <Widget>[
                             ///名称
                             Expanded(
-                                child: Text(
-                                    issueHeaderViewModel.actionUser!,
+                                child: Text(issueHeaderViewModel.actionUser!,
                                     style: GSYConstant.normalTextWhite)),
 
                             ///时间
@@ -126,7 +124,8 @@ class IssueHeaderItem extends StatelessWidget {
                         Container(
 
                             ///评论标题
-                            margin: const EdgeInsets.only(top: 6.0, bottom: 2.0),
+                            margin:
+                                const EdgeInsets.only(top: 6.0, bottom: 2.0),
                             alignment: Alignment.topLeft,
 
                             ///评论标题
@@ -146,8 +145,10 @@ class IssueHeaderItem extends StatelessWidget {
 
               ///评论内容
               GSYMarkdownWidget(
-                  markdownData: issueHeaderViewModel.issueDesHtml,
-                  style: GSYMarkdownWidget.DARK_THEME),
+                markdownData: issueHeaderViewModel.issueDesHtml,
+                style: GSYMarkdownWidget.DARK_THEME,
+                baseUrl: "",
+              ),
 
               ///close 用户
               _renderCloseByText()
@@ -182,9 +183,8 @@ class IssueHeaderViewModel {
     closedBy = issueMap.closeBy != null ? issueMap.closeBy!.login : "";
     locked = issueMap.locked;
     issueComment = issueMap.title;
-    issueDesHtml = issueMap.bodyHtml ?? ((issueMap.body != null)
-            ? issueMap.body
-            : "");
+    issueDesHtml =
+        issueMap.bodyHtml ?? ((issueMap.body != null) ? issueMap.body : "");
     commentCount = "${issueMap.commentNum}";
     state = issueMap.state;
     issueDes = issueMap.body != null ? ": \n${issueMap.body!}" : '';

lib/page/issue/widget/issue_item.dart

@@ -27,7 +27,8 @@ class IssueItem extends StatelessWidget {
   final bool limitComment;
 
   const IssueItem(this.issueItemViewModel,
-      {super.key, this.onPressed,
+      {super.key,
+      this.onPressed,
       this.onLongPress,
       this.hideBottom = false,
       this.limitComment = true});
@@ -85,7 +86,10 @@ class IssueItem extends StatelessWidget {
               maxLines: limitComment ? 2 : 1000,
             ),
           )
-        : GSYMarkdownWidget(markdownData: issueItemViewModel.issueComment);
+        : GSYMarkdownWidget(
+            markdownData: issueItemViewModel.issueComment,
+            baseUrl: "",
+          );
   }
 
   @override
@@ -148,7 +152,8 @@ class IssueItem extends StatelessWidget {
 class IssueItemViewModel {
   String actionTime = "---";
   String? actionUser = "---";
-  String? actionUserPic ;
+  String? actionUserPic;
+
   String issueComment = "---";
   String commentCount = "---";
   String? state = "---";

lib/page/repos/repository_detail_readme_page.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_spinkit/flutter_spinkit.dart';
 import 'package:gsy_github_app_flutter/common/localization/extension.dart';
 import 'package:gsy_github_app_flutter/common/style/gsy_style.dart';
+import 'package:gsy_github_app_flutter/common/utils/common_utils.dart';
 import 'package:gsy_github_app_flutter/page/repos/provider/repos_detail_provider.dart';
 import 'package:gsy_github_app_flutter/widget/markdown/gsy_markdown_widget.dart';
 import 'package:provider/provider.dart';
@@ -49,6 +50,7 @@ class RepositoryDetailReadmePageState extends State<RepositoryDetailReadmePage>
     ///展示 select
     var markdownData =
         context.select<ReposDetailProvider, String?>((p) => p.markdownData);
+    var rp = context.read<ReposDetailProvider>();
     var widget = (markdownData == null)
         ? Center(
             child: Container(
@@ -66,7 +68,12 @@ class RepositoryDetailReadmePageState extends State<RepositoryDetailReadmePage>
               ),
             ),
           )
-        : GSYMarkdownWidget(markdownData: markdownData);
+        : GSYMarkdownWidget(
+            markdownData: markdownData,
+            baseUrl: getRawBaseUrl(
+                repoName: rp.reposName,
+                userName: rp.userName,
+                branch: rp.currentBranch));
 
     return widget;
   }