chore: ui调整

.github/workflows/main.yml

@@ -32,7 +32,7 @@ jobs:
       - name: Flutter action
         uses: subosito/flutter-action@v2
         with:
-            flutter-version: 3.9.0-20.0.pre.76
+            flutter-version: 3.9.0-22.0.pre.102
             channel: master
 
       - name: Decode keystore

lib/pages/bili_video/view.dart

@@ -118,8 +118,9 @@ class _BiliVideoPageState extends State<BiliVideoPage> {
 
   @override
   void dispose() {
-    biliVideoController.onClose();
-    biliVideoController.onDelete();
+    // biliVideoController.onClose();
+    // biliVideoController.onDelete();
+    biliVideoController.dispose();
     super.dispose();
   }
 

lib/pages/bili_video/widgets/introduction/view.dart

@@ -352,8 +352,9 @@ class _IntroductionPageState extends State<IntroductionPage>
 
   @override
   void dispose() {
-    controller.onClose();
-    controller.onDelete();
+    // controller.onClose();
+    // controller.onDelete();
+    controller.dispose();
     super.dispose();
   }
 

lib/pages/home/view.dart

@@ -32,8 +32,9 @@ class _HomePageState extends State<HomePage>
 
   @override
   void dispose() {
-    controller.onClose();
-    controller.onDelete();
+    // controller.onClose();
+    // controller.onDelete();
+    controller.dispose();
     super.dispose();
   }
 

lib/pages/home/widgets/user_menu/view.dart

@@ -35,8 +35,12 @@ class UserMenuPage extends GetView<UserMenuController> {
                                 .listenable(keys: [UserStorageKeys.userFace]),
                             builder: (context, value, child) {
                               return CachedNetworkImage(
-                                cacheWidth: 100,
-                                cacheHeight: 100,
+                                cacheWidth: (80 *
+                                        MediaQuery.of(context).devicePixelRatio)
+                                    .toInt(),
+                                cacheHeight: (80 *
+                                        MediaQuery.of(context).devicePixelRatio)
+                                    .toInt(),
                                 //头像
                                 cacheManager: controller.cacheManager,
                                 width: 80,

lib/pages/main/view.dart

@@ -29,8 +29,9 @@ class _MainPageState extends State<MainPage> {
 
   @override
   void dispose() {
-    controller.onClose();
-    controller.onDelete();
+    // controller.onClose();
+    // controller.onDelete();
+    controller.dispose();
     super.dispose();
   }
 

lib/pages/recommend/view.dart

@@ -24,13 +24,15 @@ class _RecommendPageState extends State<RecommendPage>
 
   @override
   void dispose() {
-    controller.onClose();
-    controller.onDelete();
+    // controller.onClose();
+    // controller.onDelete();
+    controller.dispose();
     super.dispose();
   }
 
   // 主视图
   Widget _buildView(BuildContext context) {
+    controller.updateWidget = () => setState(() {});
     return EasyRefresh.builder(
       refreshOnStart: true,
       onLoad: () async {
@@ -75,8 +77,7 @@ class _RecommendPageState extends State<RecommendPage>
                         controller.recommendColumnCount) *
                     10 /
                     16 +
-                20 +
-                58),
+                83 * MediaQuery.of(context).textScaleFactor),
         itemCount: controller.recommendViewList.length,
         itemBuilder: (context, index) {
           return controller.recommendViewList[index];

lib/pages/recommend/widgets/recommend_card.dart

@@ -38,9 +38,6 @@ class RecommendCard extends StatelessWidget {
   final int cid;
   final int heroTagId;
 
-  final playInfoTextStyle = const TextStyle(
-      color: Colors.white, fontSize: 10, overflow: TextOverflow.ellipsis);
-
   void onTap(BuildContext context) {
     // Get.to(
     //   () => BiliVideoPage(
@@ -61,6 +58,11 @@ class RecommendCard extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    TextStyle playInfoTextStyle = TextStyle(
+        color: Theme.of(context).hintColor,
+        fontSize: 12,
+        overflow: TextOverflow.ellipsis);
+    Color iconColor = Theme.of(context).hintColor;
     return Card(
         margin: EdgeInsets.zero,
         child: Stack(children: [
@@ -69,108 +71,95 @@ class RecommendCard extends StatelessWidget {
             children: [
               ClipRRect(
                 borderRadius: BorderRadius.circular(12),
-                child: Stack(
-                  alignment: Alignment.bottomLeft,
+                child: AspectRatio(
+                  aspectRatio: 16 / 10,
+                  child: LayoutBuilder(builder: (context, boxConstraints) {
+                    return Hero(
+                        tag: heroTagId,
+                        transitionOnUserGestures: true,
+                        child: CachedNetworkImage(
+                          cacheWidth: (boxConstraints.maxWidth *
+                                  MediaQuery.of(context).devicePixelRatio)
+                              .toInt(),
+                          cacheHeight: (boxConstraints.maxHeight *
+                                  MediaQuery.of(context).devicePixelRatio)
+                              .toInt(),
+                          cacheManager: cacheManager,
+                          fit: BoxFit.cover,
+                          imageUrl: imageUrl,
+                          placeholder: () => Container(
+                            color: Theme.of(context).colorScheme.surfaceVariant,
+                          ),
+                          errorWidget: () => const Center(
+                            child: Icon(Icons.error),
+                          ),
+                          filterQuality: FilterQuality.none,
+                        ));
+                  }),
+                ),
+              ),
+              Padding(
+                padding: const EdgeInsets.all(6.0),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
-                    AspectRatio(
-                      aspectRatio: 16 / 10,
-                      child: LayoutBuilder(builder: (context, boxConstraints) {
-                        return Hero(
-                            tag: heroTagId,
-                            transitionOnUserGestures: true,
-                            child: CachedNetworkImage(
-                              cacheWidth: (boxConstraints.maxWidth *
-                                      MediaQuery.of(context).devicePixelRatio)
-                                  .toInt(),
-                              cacheHeight: (boxConstraints.maxHeight *
-                                      MediaQuery.of(context).devicePixelRatio)
-                                  .toInt(),
-                              cacheManager: cacheManager,
-                              fit: BoxFit.cover,
-                              imageUrl: imageUrl,
-                              placeholder: () => Container(
-                                color: Theme.of(context)
-                                    .colorScheme
-                                    .surfaceVariant,
-                              ),
-                              errorWidget: () => const Center(
-                                child: Icon(Icons.error),
-                              ),
-                              filterQuality: FilterQuality.none,
-                            ));
-                      }),
-                    ),
-                    Container(
-                      decoration: const BoxDecoration(
-                        boxShadow: [
-                          BoxShadow(
-                              color: Colors.black38,
-                              blurRadius: 12,
-                              spreadRadius: 10,
-                              offset: Offset(0, 12)),
-                        ],
+                    SizedBox(
+                      height: 40 * MediaQuery.of(context).textScaleFactor,
+                      child: Text(
+                        title,
+                        maxLines: 2,
+                        style: const TextStyle(fontSize: 14),
+                        overflow: TextOverflow.ellipsis,
                       ),
-                      padding:
-                          const EdgeInsets.only(left: 6, right: 6, bottom: 3),
-                      child: Row(
-                          mainAxisAlignment: MainAxisAlignment.center,
-                          children: [
-                            const Icon(
+                    ),
+                    Text.rich(
+                      TextSpan(children: [
+                        WidgetSpan(
+                            alignment: PlaceholderAlignment.middle,
+                            child: Icon(
                               Icons.slideshow_rounded,
-                              color: Colors.white,
-                              size: 11,
-                            ),
-                            Text(
-                              " $playNum  ",
-                              maxLines: 1,
-                              style: playInfoTextStyle,
-                            ),
-                            const Icon(
-                              Icons.format_list_bulleted_rounded,
-                              color: Colors.white,
-                              size: 11,
-                            ),
-                            Text(
-                              " $danmakuNum",
-                              maxLines: 1,
-                              style: playInfoTextStyle,
-                            ),
-                            const Spacer(),
-                            Text(
-                              timeLength,
-                              maxLines: 1,
-                              style: playInfoTextStyle,
-                            ),
-                          ]),
+                              color: iconColor,
+                              size: 12 * MediaQuery.of(context).textScaleFactor,
+                            )),
+                        TextSpan(
+                          text: " $playNum  ",
+                        ),
+                        WidgetSpan(
+                          alignment: PlaceholderAlignment.middle,
+                          child: Icon(
+                            Icons.format_list_bulleted_rounded,
+                            color: iconColor,
+                            size: 12 * MediaQuery.of(context).textScaleFactor,
+                          ),
+                        ),
+                        TextSpan(
+                          text: " $danmakuNum ",
+                        ),
+                        WidgetSpan(
+                          alignment: PlaceholderAlignment.middle,
+                          child: Icon(
+                            Icons.timer_outlined,
+                            color: iconColor,
+                            size: 12 * MediaQuery.of(context).textScaleFactor,
+                          ),
+                        ),
+                        TextSpan(
+                          text: ' $timeLength',
+                        ),
+                      ]),
+                      style: playInfoTextStyle,
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
                     ),
+                    Text(
+                      upName,
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
+                      style: playInfoTextStyle,
+                    )
                   ],
                 ),
-              ),
-              SizedBox(
-                height: 52,
-                child: Padding(
-                  padding: const EdgeInsets.only(
-                      top: 8, left: 5, right: 5, bottom: 2),
-                  child: Text(
-                    title,
-                    maxLines: 2,
-                    style: const TextStyle(fontSize: 14),
-                    overflow: TextOverflow.ellipsis,
-                  ),
-                ),
-              ),
-              Padding(
-                padding: const EdgeInsets.only(left: 10, bottom: 6),
-                child: Text(
-                  upName,
-                  maxLines: 1,
-                  overflow: TextOverflow.ellipsis,
-                  style: TextStyle(
-                    fontSize: 12,
-                    color: Theme.of(context).hintColor,
-                  ),
-                ),
-              ),
+              )
             ],
           ),
           Material(

lib/pages/search_input/view.dart

@@ -23,8 +23,9 @@ class _SearchInputPageState extends State<SearchInputPage> {
 
   @override
   void dispose() {
-    controller.onClose();
-    controller.onDelete();
+    // controller.onClose();
+    // controller.onDelete();
+    controller.dispose();
     super.dispose();
   }
 

lib/pages/search_result/view.dart

@@ -28,8 +28,9 @@ class _SearchResultPageState extends State<SearchResultPage>
 
   @override
   void dispose() {
-    controller.onClose();
-    controller.onDelete();
+    // controller.onClose();
+    // controller.onDelete();
+    controller.dispose();
     super.dispose();
   }
 

lib/pages/search_tab_view/view.dart

@@ -35,8 +35,9 @@ class _SearchTabViewPageState extends State<SearchTabViewPage>
 
   @override
   void dispose() {
-    controller.onClose();
-    controller.onDelete();
+    // controller.onClose();
+    // controller.onDelete();
+    controller.dispose();
     super.dispose();
   }