diff --git a/lib/pages/search_panel/widgets/article_panel.dart b/lib/pages/search_panel/widgets/article_panel.dart index 4870caad..a5eb5eef 100644 --- a/lib/pages/search_panel/widgets/article_panel.dart +++ b/lib/pages/search_panel/widgets/article_panel.dart @@ -257,6 +257,7 @@ class ArticlePanelController extends GetxController { showModalBottomSheet( context: context, isScrollControlled: true, + backgroundColor: Theme.of(context).colorScheme.surface, builder: (context) => SingleChildScrollView( child: Container( width: double.infinity, diff --git a/lib/pages/search_panel/widgets/user_panel.dart b/lib/pages/search_panel/widgets/user_panel.dart index 3dbe8147..a7f13059 100644 --- a/lib/pages/search_panel/widgets/user_panel.dart +++ b/lib/pages/search_panel/widgets/user_panel.dart @@ -184,6 +184,7 @@ class UserPanelController extends GetxController { showModalBottomSheet( context: context, isScrollControlled: true, + backgroundColor: Theme.of(context).colorScheme.surface, builder: (context) => SingleChildScrollView( child: Container( width: double.infinity, diff --git a/lib/pages/search_panel/widgets/video_panel.dart b/lib/pages/search_panel/widgets/video_panel.dart index 46b09084..1c6d8034 100644 --- a/lib/pages/search_panel/widgets/video_panel.dart +++ b/lib/pages/search_panel/widgets/video_panel.dart @@ -251,6 +251,7 @@ class VideoPanelController extends GetxController { showModalBottomSheet( context: context, isScrollControlled: true, + backgroundColor: Theme.of(context).colorScheme.surface, builder: (context) => StatefulBuilder( builder: (context, setState) { Widget dateWidget([bool isFirst = true]) { diff --git a/lib/pages/video/detail/reply/widgets/reply_item.dart b/lib/pages/video/detail/reply/widgets/reply_item.dart index b0041abf..e9142c6e 100644 --- a/lib/pages/video/detail/reply/widgets/reply_item.dart +++ b/lib/pages/video/detail/reply/widgets/reply_item.dart @@ -837,17 +837,19 @@ class ReplyItem extends StatelessWidget { ), recognizer: TapGestureRecognizer() ..onTap = () async { - late final String title = content.url[matchStr]!.title; + late final String title = + content.jumpUrl[matchStr]['title']; if (appUrlSchema == '') { if (RegExp(r'^(av|bv)', caseSensitive: false) .hasMatch(matchStr)) { UrlUtils.matchUrlPush(matchStr, ''); - } else if (RegExp(r'^[Cc][Vv][0-9]+$') + } else if (RegExp(r'^cv\d+$', caseSensitive: false) .hasMatch(matchStr)) { + String cvid = 'cv${matchStr.substring(2)}'; Get.toNamed('/htmlRender', parameters: { - 'url': 'https://www.bilibili.com/read/$matchStr', + 'url': 'https://www.bilibili.com/read/$cvid', 'title': title, - 'id': matchStr, + 'id': cvid, 'dynamicType': 'read' }); } else { diff --git a/lib/pages/video/detail/reply/widgets/reply_item_grpc.dart b/lib/pages/video/detail/reply/widgets/reply_item_grpc.dart index ef53b0ce..224c7579 100644 --- a/lib/pages/video/detail/reply/widgets/reply_item_grpc.dart +++ b/lib/pages/video/detail/reply/widgets/reply_item_grpc.dart @@ -882,12 +882,13 @@ class ReplyItemGrpc extends StatelessWidget { if (RegExp(r'^(av|bv)', caseSensitive: false) .hasMatch(matchStr)) { UrlUtils.matchUrlPush(matchStr, ''); - } else if (RegExp(r'^[Cc][Vv][0-9]+$') + } else if (RegExp(r'^cv\d+$', caseSensitive: false) .hasMatch(matchStr)) { + String cvid = 'cv${matchStr.substring(2)}'; Get.toNamed('/htmlRender', parameters: { - 'url': 'https://www.bilibili.com/read/$matchStr', + 'url': 'https://www.bilibili.com/read/$cvid', 'title': title, - 'id': matchStr, + 'id': cvid, 'dynamicType': 'read' }); } else {