diff --git a/lib/common/constants.dart b/lib/common/constants.dart index 993aac28d..aafff233e 100644 --- a/lib/common/constants.dart +++ b/lib/common/constants.dart @@ -7,9 +7,8 @@ class StyleString { static const BorderRadius mdRadius = BorderRadius.all(imgRadius); static const Radius imgRadius = Radius.circular(10); static const double aspectRatio = 16 / 10; - static const bottomSheetRadius = BorderRadius.only( - topLeft: Radius.circular(18), - topRight: Radius.circular(18), + static const bottomSheetRadius = BorderRadius.vertical( + top: Radius.circular(18), ); } diff --git a/lib/common/widgets/progress_bar/video_progress_indicator.dart b/lib/common/widgets/progress_bar/video_progress_indicator.dart index 29d840549..e284f3b77 100644 --- a/lib/common/widgets/progress_bar/video_progress_indicator.dart +++ b/lib/common/widgets/progress_bar/video_progress_indicator.dart @@ -4,10 +4,7 @@ import 'package:flutter/material.dart'; Widget videoProgressIndicator(double progress) => ClipRect( clipper: ProgressClipper(), child: ClipRRect( - borderRadius: const BorderRadius.only( - bottomLeft: StyleString.imgRadius, - bottomRight: StyleString.imgRadius, - ), + borderRadius: const BorderRadius.vertical(bottom: StyleString.imgRadius), child: LinearProgressIndicator( minHeight: 10, value: progress, diff --git a/lib/pages/dynamics/widgets/live_panel_sub.dart b/lib/pages/dynamics/widgets/live_panel_sub.dart index 8d2243779..e85453b7a 100644 --- a/lib/pages/dynamics/widgets/live_panel_sub.dart +++ b/lib/pages/dynamics/widgets/live_panel_sub.dart @@ -87,9 +87,8 @@ Widget livePanelSub( Colors.black45, ], ), - borderRadius: BorderRadius.only( - bottomLeft: StyleString.imgRadius, - bottomRight: StyleString.imgRadius, + borderRadius: BorderRadius.vertical( + bottom: StyleString.imgRadius, ), ), child: Text( diff --git a/lib/pages/dynamics/widgets/live_rcmd_panel.dart b/lib/pages/dynamics/widgets/live_rcmd_panel.dart index 280f9eaa9..17e08c9a8 100644 --- a/lib/pages/dynamics/widgets/live_rcmd_panel.dart +++ b/lib/pages/dynamics/widgets/live_rcmd_panel.dart @@ -81,9 +81,8 @@ Widget liveRcmdPanel( Colors.black45, ], ), - borderRadius: BorderRadius.only( - bottomLeft: StyleString.imgRadius, - bottomRight: StyleString.imgRadius, + borderRadius: BorderRadius.vertical( + bottom: StyleString.imgRadius, ), ), child: Text( diff --git a/lib/pages/dynamics/widgets/video_panel.dart b/lib/pages/dynamics/widgets/video_panel.dart index a2dc78080..bc79f2063 100644 --- a/lib/pages/dynamics/widgets/video_panel.dart +++ b/lib/pages/dynamics/widgets/video_panel.dart @@ -86,9 +86,8 @@ Widget videoSeasonWidget( Colors.black54, ], ), - borderRadius: BorderRadius.only( - bottomLeft: StyleString.imgRadius, - bottomRight: StyleString.imgRadius, + borderRadius: BorderRadius.vertical( + bottom: StyleString.imgRadius, ), ), child: DefaultTextStyle.merge( diff --git a/lib/pages/live_room/send_danmaku/view.dart b/lib/pages/live_room/send_danmaku/view.dart index 335a696c6..a99cc8724 100644 --- a/lib/pages/live_room/send_danmaku/view.dart +++ b/lib/pages/live_room/send_danmaku/view.dart @@ -56,10 +56,7 @@ class _ReplyPageState extends CommonRichTextPubPageState { child: Container( constraints: const BoxConstraints(maxWidth: 640), decoration: BoxDecoration( - borderRadius: const BorderRadius.only( - topLeft: Radius.circular(12), - topRight: Radius.circular(12), - ), + borderRadius: const BorderRadius.vertical(top: Radius.circular(12)), color: theme.colorScheme.surface, ), child: Column( diff --git a/lib/pages/live_room/superchat/superchat_card.dart b/lib/pages/live_room/superchat/superchat_card.dart index 8c2451697..d93287028 100644 --- a/lib/pages/live_room/superchat/superchat_card.dart +++ b/lib/pages/live_room/superchat/superchat_card.dart @@ -85,10 +85,7 @@ class _SuperChatCardState extends State { children: [ Container( decoration: BoxDecoration( - borderRadius: const BorderRadius.only( - topLeft: Radius.circular(8), - topRight: Radius.circular(8), - ), + borderRadius: const BorderRadius.vertical(top: Radius.circular(8)), color: Utils.parseColor(item.backgroundColor), border: Border(top: border, left: border, right: border), ), @@ -137,9 +134,8 @@ class _SuperChatCardState extends State { ), Container( decoration: BoxDecoration( - borderRadius: const BorderRadius.only( - bottomLeft: Radius.circular(8), - bottomRight: Radius.circular(8), + borderRadius: const BorderRadius.vertical( + bottom: Radius.circular(8), ), color: bottomColor, ), diff --git a/lib/pages/live_room/view.dart b/lib/pages/live_room/view.dart index f6b0b8742..a2c62a826 100644 --- a/lib/pages/live_room/view.dart +++ b/lib/pages/live_room/view.dart @@ -754,10 +754,7 @@ class _LiveRoomPageState extends State ), height: 70 + padding.bottom, decoration: const BoxDecoration( - borderRadius: BorderRadius.only( - topLeft: Radius.circular(20), - topRight: Radius.circular(20), - ), + borderRadius: BorderRadius.vertical(top: Radius.circular(20)), border: Border(top: BorderSide(color: Color(0x1AFFFFFF))), color: Color(0x1AFFFFFF), ), @@ -904,9 +901,8 @@ class _LiveRoomPageState extends State ), child: const DecoratedBox( decoration: BoxDecoration( - borderRadius: BorderRadius.only( - topLeft: Radius.circular(20), - topRight: Radius.circular(20), + borderRadius: BorderRadius.vertical( + top: Radius.circular(20), ), border: Border( top: BorderSide(color: Colors.white38), diff --git a/lib/pages/video/reply_new/view.dart b/lib/pages/video/reply_new/view.dart index cc802f538..6687bc22e 100644 --- a/lib/pages/video/reply_new/view.dart +++ b/lib/pages/video/reply_new/view.dart @@ -81,10 +81,7 @@ class _ReplyPageState extends CommonRichTextPubPageState { child: Container( constraints: const BoxConstraints(maxWidth: 640), decoration: BoxDecoration( - borderRadius: const BorderRadius.only( - topLeft: Radius.circular(12), - topRight: Radius.circular(12), - ), + borderRadius: const BorderRadius.vertical(top: Radius.circular(12)), color: themeData.colorScheme.surface, ), child: Column( diff --git a/lib/pages/video/send_danmaku/view.dart b/lib/pages/video/send_danmaku/view.dart index f21ced031..53103d4a0 100644 --- a/lib/pages/video/send_danmaku/view.dart +++ b/lib/pages/video/send_danmaku/view.dart @@ -150,10 +150,7 @@ class _SendDanmakuPanelState extends CommonTextPubPageState { child: Container( constraints: const BoxConstraints(maxWidth: 450), decoration: BoxDecoration( - borderRadius: const BorderRadius.only( - topLeft: Radius.circular(12), - topRight: Radius.circular(12), - ), + borderRadius: const BorderRadius.vertical(top: Radius.circular(12)), color: themeData.colorScheme.surface, ), child: Column( diff --git a/lib/pages/whisper_detail/view.dart b/lib/pages/whisper_detail/view.dart index cf9da110e..b66882069 100644 --- a/lib/pages/whisper_detail/view.dart +++ b/lib/pages/whisper_detail/view.dart @@ -233,10 +233,7 @@ class _WhisperDetailPageState padding: const EdgeInsets.symmetric(vertical: 8), decoration: BoxDecoration( color: theme.colorScheme.onInverseSurface, - borderRadius: const BorderRadius.only( - topLeft: Radius.circular(16), - topRight: Radius.circular(16), - ), + borderRadius: const BorderRadius.vertical(top: Radius.circular(16)), ), child: Row( crossAxisAlignment: CrossAxisAlignment.end, diff --git a/lib/pages/whisper_detail/widget/chat_item.dart b/lib/pages/whisper_detail/widget/chat_item.dart index 3419ba766..b04dc9fb5 100644 --- a/lib/pages/whisper_detail/widget/chat_item.dart +++ b/lib/pages/whisper_detail/widget/chat_item.dart @@ -100,12 +100,19 @@ class ChatItem extends StatelessWidget { color: isOwner ? theme.colorScheme.secondaryContainer : theme.colorScheme.onInverseSurface, - borderRadius: BorderRadius.only( - topLeft: const Radius.circular(16), - topRight: const Radius.circular(16), - bottomLeft: Radius.circular(isOwner ? 16 : 6), - bottomRight: Radius.circular(isOwner ? 6 : 16), - ), + borderRadius: isOwner + ? const BorderRadius.only( + topLeft: Radius.circular(16), + topRight: Radius.circular(16), + bottomLeft: Radius.circular(16), + bottomRight: Radius.circular(6), + ) + : const BorderRadius.only( + topLeft: Radius.circular(16), + topRight: Radius.circular(16), + bottomLeft: Radius.circular(6), + bottomRight: Radius.circular(16), + ), ), padding: EdgeInsets.only( top: 8,