opt ui

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>

lib/pages/common/dyn/common_dyn_page.dart

@@ -163,26 +163,34 @@ abstract class CommonDynPageState<T extends CommonDynPage> extends State<T>
     EasyThrottle.throttle('replyReply', const Duration(milliseconds: 500), () {
       int oid = replyItem.oid.toInt();
       int rpid = replyItem.id.toInt();
-      Widget replyReplyPage({bool showBackBtn = true}) => Scaffold(
+      Widget replyReplyPage({bool showBackBtn = true}) => Padding(
-        resizeToAvoidBottomInset: false,
+        padding: EdgeInsets.only(right: padding.right),
-        appBar: AppBar(
+        child: Scaffold(
-          toolbarHeight: showBackBtn ? null : 45,
+          resizeToAvoidBottomInset: false,
-          title: const Text('评论详情'),
+          appBar: AppBar(
-          titleSpacing: showBackBtn ? null : 12,
+            primary: showBackBtn,
-          automaticallyImplyLeading: showBackBtn,
+            toolbarHeight: showBackBtn ? null : 45,
-          actions: showBackBtn
+            title: const Text('评论详情'),
-              ? null
+            titleSpacing: showBackBtn ? null : 12,
-              : [
+            automaticallyImplyLeading: showBackBtn,
-                  IconButton(
+            actions: showBackBtn
-                    tooltip: '关闭',
+                ? null
-                    icon: const Icon(Icons.close, size: 20),
+                : [
-                    onPressed: Get.back,
+                    IconButton(
-                  ),
+                      tooltip: '关闭',
-                ],
+                      icon: const Icon(Icons.close, size: 20),
-        ),
+                      onPressed: Get.back,
-        body: Padding(
+                    ),
-          padding: EdgeInsets.only(right: padding.right),
+                  ],
-          child: VideoReplyReplyPanel(
+            shape: Border(
+              bottom: BorderSide(
+                color: Theme.of(
+                  context,
+                ).colorScheme.outline.withValues(alpha: 0.1),
+              ),
+            ),
+          ),
+          body: VideoReplyReplyPanel(
             enableSlide: false,
             id: id,
             oid: oid,
@@ -205,11 +213,7 @@ abstract class CommonDynPageState<T extends CommonDynPage> extends State<T>
           controller.hideFab();
           scaffoldState.showBottomSheet(
             backgroundColor: Colors.transparent,
-            (context) => MediaQuery.removePadding(
+            (context) => replyReplyPage(showBackBtn: false),
-              context: context,
-              removeLeft: true,
-              child: replyReplyPage(showBackBtn: false),
-            ),
           );
         } else {
           Get.to(

lib/pages/member/widget/user_info_card.dart

@@ -332,9 +332,10 @@ class UserInfoCard extends StatelessWidget {
       ),
       const SizedBox(height: 5),
       Row(
+        spacing: 10,
         mainAxisSize: MainAxisSize.min,
         children: [
-          if (!isOwner) ...[
+          if (!isOwner)
             IconButton.outlined(
               onPressed: () {
                 if (Accounts.main.isLogin) {
@@ -362,8 +363,6 @@ class UserInfoCard extends StatelessWidget {
                 visualDensity: VisualDensity.compact,
               ),
             ),
-            const SizedBox(width: 10),
-          ],
           Expanded(
             child: FilledButton.tonal(
               onPressed: onFollow,

lib/pages/pgc_review/post/view.dart

@@ -71,10 +71,8 @@ class _PgcReviewPostPanelState extends State<PgcReviewPostPanel> {
               ),
               const SizedBox(width: 12),
             ],
-            bottom: PreferredSize(
+            shape: Border(
-              preferredSize: const Size.fromHeight(1),
+              bottom: BorderSide(
-              child: Divider(
-                height: 1,
                 color: theme.colorScheme.outline.withValues(alpha: 0.1),
               ),
             ),

lib/pages/search_trending/view.dart

@@ -95,11 +95,9 @@ class _SearchTrendingPageState extends State<SearchTrendingPage> {
                           statusBarBrightness: Brightness.dark,
                           statusBarIconBrightness: Brightness.light,
                         ),
-                  bottom: scrollRatio == 1
+                  shape: scrollRatio == 1
-                      ? PreferredSize(
+                      ? Border(
-                          preferredSize: const Size.fromHeight(1),
+                          bottom: BorderSide(
-                          child: Divider(
-                            height: 1,
                             color: theme.colorScheme.outline.withValues(
                               alpha: 0.1,
                             ),

lib/pages/video/medialist/view.dart

@@ -72,6 +72,7 @@ class _MediaListPanelState
       child: Column(
         children: [
           AppBar(
+            primary: false,
             toolbarHeight: 45,
             automaticallyImplyLeading: false,
             titleSpacing: 16,
@@ -95,10 +96,11 @@ class _MediaListPanelState
               ),
               const SizedBox(width: 14),
             ],
-          ),
+            shape: Border(
-          Divider(
+              bottom: BorderSide(
-            height: 1,
+                color: theme.colorScheme.outline.withValues(alpha: 0.1),
-            color: theme.colorScheme.outline.withValues(alpha: 0.1),
+              ),
+            ),
           ),
           Expanded(
             child: enableSlide ? slideList(theme) : buildList(theme),

lib/pages/video/note/view.dart

@@ -60,6 +60,7 @@ class _NoteListPageState extends CommonSlidePageState<NoteListPage> {
           SizedBox(
             height: 45,
             child: AppBar(
+              primary: false,
               automaticallyImplyLeading: false,
               titleSpacing: 16,
               toolbarHeight: 45,
@@ -68,10 +69,8 @@ class _NoteListPageState extends CommonSlidePageState<NoteListPage> {
                 final count = _controller.count.value;
                 return Text('笔记${count == -1 ? '' : '($count)'}');
               }),
-              bottom: PreferredSize(
+              shape: Border(
-                preferredSize: const Size.fromHeight(1),
+                bottom: BorderSide(
-                child: Divider(
-                  height: 1,
                   color: theme.colorScheme.outline.withValues(alpha: 0.1),
                 ),
               ),

lib/pages/video/post_panel/view.dart

@@ -64,11 +64,14 @@ class _PostPanelState extends CommonCollapseSlidePageState<PostPanel> {
     return Scaffold(
       resizeToAvoidBottomInset: false,
       appBar: AppBar(
+        primary: false,
+        toolbarHeight: 45,
         automaticallyImplyLeading: false,
         titleSpacing: 16,
         title: const Text('提交片段'),
         actions: [
           iconButton(
+            size: 32,
             context: context,
             tooltip: '添加片段',
             onPressed: () {
@@ -90,6 +93,7 @@ class _PostPanelState extends CommonCollapseSlidePageState<PostPanel> {
           ),
           const SizedBox(width: 10),
           iconButton(
+            size: 32,
             context: context,
             tooltip: '关闭',
             onPressed: Get.back,

lib/pages/video/reply_reply/view.dart

@@ -101,13 +101,14 @@ class _VideoReplyReplyPanelState
 
   @override
   Widget buildPage(ThemeData theme) {
+    Widget child() => enableSlide ? slideList(theme) : buildList(theme);
     return Scaffold(
       key: _key,
       resizeToAvoidBottomInset: false,
-      body: Column(
+      body: widget.isVideoDetail
-        children: [
+          ? Column(
-          widget.isVideoDetail
+              children: [
-              ? Container(
+                Container(
                   height: 45,
                   decoration: BoxDecoration(
                     border: Border(
@@ -129,14 +130,11 @@ class _VideoReplyReplyPanelState
                       ),
                     ],
                   ),
-                )
-              : Divider(
-                  height: 1,
-                  color: theme.dividerColor.withValues(alpha: 0.1),
                 ),
-          Expanded(child: enableSlide ? slideList(theme) : buildList(theme)),
+                Expanded(child: child()),
-        ],
+              ],
-      ),
+            )
+          : child(),
     );
   }
 

lib/pages/video/view_point/view.dart

@@ -45,6 +45,7 @@ class _ViewPointsPageState
     return Scaffold(
       resizeToAvoidBottomInset: false,
       appBar: AppBar(
+        primary: false,
         automaticallyImplyLeading: false,
         titleSpacing: 16,
         title: const Text('分段信息'),
@@ -82,11 +83,9 @@ class _ViewPointsPageState
           ),
           const SizedBox(width: 16),
         ],
-        bottom: PreferredSize(
+        shape: Border(
-          preferredSize: const Size.fromHeight(1),
+          bottom: BorderSide(
-          child: Divider(
+            color: theme.colorScheme.outline.withValues(alpha: 0.1),
-            height: 1,
-            color: theme.dividerColor.withValues(alpha: 0.1),
           ),
         ),
       ),