tweak

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

lib/pages/article/view.dart

@@ -179,7 +179,6 @@ class _ArticlePageState extends State<ArticlePage>
         VoidCallback? onDispose,
       }) =>
           Scaffold(
-            resizeToAvoidBottomInset: false,
             appBar: AppBar(
               title: const Text('评论详情'),
               titleSpacing: automaticallyImplyLeading ? null : 12,

lib/pages/dynamics/view.dart

@@ -130,7 +130,6 @@ class _DynamicsPageState extends State<DynamicsPage>
     super.build(context);
     ThemeData theme = Theme.of(context);
     return Scaffold(
-      resizeToAvoidBottomInset: false,
       appBar: AppBar(
         leading: upPanelPosition == UpPanelPosition.rightDrawer
             ? _createDynamicBtn(theme, false)

lib/pages/dynamics_create/view.dart

@@ -57,13 +57,10 @@ class _CreateDynPanelState extends CommonPublishPageState<CreateDynPanel> {
   @override
   Widget build(BuildContext context) {
     final ThemeData theme = Theme.of(context);
-    return Scaffold(
+    return Column(
-      backgroundColor: Colors.transparent,
-      resizeToAvoidBottomInset: false,
-      appBar: _buildAppBar(theme),
-      body: Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
+        _buildAppBar(theme),
         Expanded(
           child: ListView(
             padding: EdgeInsets.zero,
@@ -80,8 +77,7 @@ class _CreateDynPanelState extends CommonPublishPageState<CreateDynPanel> {
                       children: [
                         TextButton(
                           style: TextButton.styleFrom(
-                              overlayColor:
+                            overlayColor: hasTopic ? Colors.transparent : null,
-                                  hasTopic ? Colors.transparent : null,
                             splashFactory:
                                 hasTopic ? NoSplash.splashFactory : null,
                             shape: hasTopic
@@ -121,8 +117,7 @@ class _CreateDynPanelState extends CommonPublishPageState<CreateDynPanel> {
                                   ),
                                 ),
                                 TextSpan(
-                                    text:
+                                  text: hasTopic ? topic.value!.second : '选择话题',
-                                        hasTopic ? topic.value!.second : '选择话题',
                                   style: TextStyle(
                                     color: hasTopic
                                         ? null
@@ -202,7 +197,6 @@ class _CreateDynPanelState extends CommonPublishPageState<CreateDynPanel> {
         _buildToolbar,
         buildPanelContainer(Colors.transparent),
       ],
-      ),
     );
   }
 

lib/pages/dynamics_detail/view.dart

@@ -125,7 +125,6 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
         VoidCallback? onDispose,
       }) =>
           Scaffold(
-            resizeToAvoidBottomInset: false,
             appBar: AppBar(
               title: const Text('评论详情'),
               titleSpacing: automaticallyImplyLeading ? null : 12,

lib/pages/live_room/view.dart

@@ -272,19 +272,14 @@ class _LiveRoomPageState extends State<LiveRoomPage>
     );
   }
 
-  Widget get _buildPH => Scaffold(
+  Widget get _buildPH => Column(
-        resizeToAvoidBottomInset: false,
+        children: [
-        appBar: _buildAppBar,
+          _buildAppBar,
-        backgroundColor: Colors.transparent,
+          ..._buildBodyP,
-        body: Column(
+        ],
-          children: _buildBodyP,
-        ),
       );
 
-  Widget get _buildPP => Scaffold(
+  Widget get _buildPP => Stack(
-        resizeToAvoidBottomInset: false,
-        backgroundColor: Colors.transparent,
-        body: Stack(
         clipBehavior: Clip.none,
         children: [
           _buildAppBar,
@@ -336,7 +331,6 @@ class _LiveRoomPageState extends State<LiveRoomPage>
                   ),
           ),
         ],
-        ),
       );
 
   @override

lib/pages/main/view.dart

@@ -202,7 +202,6 @@ class _MainAppState extends State<MainApp>
           systemNavigationBarIconBrightness: theme.brightness.reverse,
         ),
         child: Scaffold(
-          resizeToAvoidBottomInset: false,
           extendBody: true,
           body: Row(
             mainAxisAlignment: MainAxisAlignment.center,

lib/pages/search/view.dart

@@ -29,7 +29,6 @@ class _SearchPageState extends State<SearchPage> {
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
     return Scaffold(
-      resizeToAvoidBottomInset: true,
       appBar: AppBar(
         shape: Border(
           bottom: BorderSide(

lib/pages/video/controller.dart

@@ -357,15 +357,11 @@ class VideoDetailController extends GetxController
             }
           } catch (_) {}
         } else if (isLoadPrevious) {
-          if (data.mediaList?.isNotEmpty == true) {
           mediaList.insertAll(0, data.mediaList!);
-          }
         } else {
-          if (data.mediaList?.isNotEmpty == true) {
           mediaList.addAll(data.mediaList!);
         }
       }
-      }
     } else {
       SmartDialog.showToast(res['msg']);
     }
@@ -1477,7 +1473,7 @@ class VideoDetailController extends GetxController
         } catch (_) {}
       }
 
-      if (GStorage.showViewPoints && playInfo.viewPoints?.isNotEmpty == true) {
+      if (playInfo.viewPoints?.isNotEmpty == true && GStorage.showViewPoints) {
         try {
           viewPointList = playInfo.viewPoints!.map((item) {
             double start =

lib/pages/video/introduction/pgc/view.dart

@@ -416,8 +416,9 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
     return Row(
       spacing: 6,
       children: [
+        if (bangumiItem.areas?.isNotEmpty == true)
           Text(
-          (bangumiItem.areas!.isNotEmpty ? bangumiItem.areas!.first.name! : ''),
+            bangumiItem.areas!.first.name!,
             style: TextStyle(
               fontSize: 12,
               color: theme.colorScheme.outline,

lib/pages/video/medialist/view.dart

@@ -259,7 +259,7 @@ class _MediaListPanelState
                           ],
                         ),
                       ),
-                      if (showDelBtn && isCurr)
+                      if (showDelBtn && !isCurr)
                         Positioned(
                           right: 12,
                           bottom: -6,

lib/pages/video/note/view.dart

@@ -54,11 +54,11 @@ class _NoteListPageState extends CommonSlidePageState<NoteListPage> {
   Widget buildPage(ThemeData theme) {
     return Scaffold(
       key: _key,
-      resizeToAvoidBottomInset: false,
+      body: Column(
-      body: Scaffold(
+        children: [
-        backgroundColor: Colors.transparent,
+          SizedBox(
-        resizeToAvoidBottomInset: false,
+            height: 45,
-        appBar: AppBar(
+            child: AppBar(
               automaticallyImplyLeading: false,
               titleSpacing: 16,
               toolbarHeight: 45,
@@ -84,7 +84,9 @@ class _NoteListPageState extends CommonSlidePageState<NoteListPage> {
                 const SizedBox(width: 16),
               ],
             ),
-        body: enableSlide ? slideList(theme) : buildList(theme),
+          ),
+          Expanded(child: enableSlide ? slideList(theme) : buildList(theme))
+        ],
       ),
     );
   }

lib/pages/video/view_point/view.dart

@@ -35,7 +35,6 @@ class _ViewPointsPageState
   @override
   Widget buildPage(ThemeData theme) {
     return Scaffold(
-      resizeToAvoidBottomInset: false,
       appBar: AppBar(
         automaticallyImplyLeading: false,
         titleSpacing: 16,

lib/utils/app_scheme.dart

@@ -119,7 +119,6 @@ class PiliScheme {
                     'id': commentSecondaryId,
                   },
                   () => Scaffold(
-                    resizeToAvoidBottomInset: false,
                     appBar: AppBar(
                       title: const Text('评论详情'),
                       actions: [
@@ -257,7 +256,6 @@ class PiliScheme {
                   'enterUri': queryParameters['enterUri'],
                 },
                 () => Scaffold(
-                  resizeToAvoidBottomInset: false,
                   appBar: AppBar(
                     title: const Text('评论详情'),
                     actions: [
@@ -306,7 +304,6 @@ class PiliScheme {
                   'type': type,
                 },
                 () => Scaffold(
-                  resizeToAvoidBottomInset: false,
                   appBar: AppBar(
                     title: const Text('评论详情'),
                     actions: [
@@ -381,7 +378,6 @@ class PiliScheme {
                       'id': commentSecondaryId,
                     },
                     () => Scaffold(
-                      resizeToAvoidBottomInset: false,
                       appBar: AppBar(
                         title: const Text('评论详情'),
                         actions: [
@@ -767,7 +763,6 @@ class PiliScheme {
               'id': commentSecondaryId,
             },
             () => Scaffold(
-              resizeToAvoidBottomInset: false,
               appBar: AppBar(
                 title: const Text('评论详情'),
                 actions: pageType == '1'