## 0.5.1

### Fixed - Fixed Style
MoeKeyDev · Sep 10, 2024 · d07f162 · d07f162
1 parent 828380c
commit d07f162
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 35 deletions.
diff --git a/lib/pages/search/user_search.dart b/lib/pages/search/user_search.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_tabler_icons/flutter_tabler_icons.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:moekey/apis/models/user_full.dart';
@@ -23,8 +22,9 @@ class UserSearchPage extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     var status = ref.watch(userSearchStatusProvider);
     return LayoutBuilder(builder: (context, constraints) {
-      var padding =
-          EdgeInsets.symmetric(horizontal: getPaddingForNote(constraints));
+      var padding = EdgeInsets.symmetric(
+          horizontal: getPaddingForNote(constraints).clamp(8, double.infinity));
+
       double maxCrossAxisExtent = constraints.maxWidth < 580 ? 600 : 350;
       return MkRefreshLoadList(
         onLoad: () => ref.read(userSearchStatusProvider.notifier).load(),
@@ -33,6 +33,7 @@ class UserSearchPage extends HookConsumerWidget {
           const SliverToBoxAdapter(
             child: UserSearchPanel(),
           ),
+          const SliverToBoxAdapter(child: SizedBox(height: 16)),
           // 用户卡片Grid
           SliverGrid.builder(
             itemBuilder: (context, index) {

diff --git a/lib/status/themes.dart b/lib/status/themes.dart
@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:io';
 
 import 'package:chinese_font_library/chinese_font_library.dart';
 import 'package:flutter/material.dart';
@@ -150,8 +151,8 @@ class Themes extends _$Themes {
       canvasColor: colors.bgColor,
       cardColor: colors.panelColor,
       useMaterial3: true,
-      // fontFamily: Platform.isWindows ? "微软雅黑" : null,
-      fontFamilyFallback: [...SystemChineseFont.fontFamilyFallback],
+      fontFamily: Platform.isWindows ? "微软雅黑" : null,
+      // fontFamilyFallback: [...SystemChineseFont.fontFamilyFallback],
       textTheme: TextTheme(
         bodyMedium: TextStyle(
           color: colors.fgColor,

diff --git a/lib/widgets/mk_user_card.dart b/lib/widgets/mk_user_card.dart
@@ -120,27 +120,27 @@ class MkUserCard extends HookConsumerWidget {
                               textStyle.copyWith(fontWeight: FontWeight.bold),
                           child: MFMText(
                             text: user.name ?? user.username,
-                            after: [
-                              const TextSpan(text: "\n"),
-                              TextSpan(
-                                  text: "@${user.username ?? ""}",
-                                  style: textStyle.copyWith(
-                                    fontSize: 11,
-                                  )),
-                              TextSpan(
-                                text: user.host != null ? "@${user.host}" : "",
-                                style: textStyle.copyWith(
-                                    color: themes.fgColor.withAlpha(128),
-                                    fontSize: 11),
-                              ),
-                            ],
-                            maxLines: 2,
+                            maxLines: 1,
                             overflow: TextOverflow.ellipsis,
                             emojis: user.emojis,
                             bigEmojiCode: false,
                             feature: const [MFMFeature.emojiCode],
                           ),
-                        )
+                        ),
+                        RichText(
+                            text: TextSpan(children: [
+                          TextSpan(
+                              text: "@${user.username ?? ""}",
+                              style: textStyle.copyWith(
+                                fontSize: 11,
+                              )),
+                          TextSpan(
+                            text: user.host != null ? "@${user.host}" : "",
+                            style: textStyle.copyWith(
+                                color: themes.fgColor.withAlpha(128),
+                                fontSize: 11),
+                          ),
+                        ]))
                       ],
                     ),
                   ),
@@ -152,19 +152,21 @@ class MkUserCard extends HookConsumerWidget {
                   Expanded(
                     child: Padding(
                       padding: const EdgeInsets.all(16),
-                      child: Center(
-                        child: DefaultTextStyle(
-                          style: textStyle.copyWith(fontSize: 11),
-                          child: SizedBox(
-                            width: double.infinity,
-                            child: MFMText(
-                              text: user.description ?? "此用户尚无自我介绍",
-                              maxLines: 3,
-                              textAlign: TextAlign.start,
-                              overflow: TextOverflow.ellipsis,
-                              emojis: user.emojis,
-                              bigEmojiCode: false,
-                              feature: const [MFMFeature.emojiCode],
+                      child: ClipRect(
+                        child: Center(
+                          child: DefaultTextStyle(
+                            style: textStyle.copyWith(fontSize: 11),
+                            child: SizedBox(
+                              width: double.infinity,
+                              child: MFMText(
+                                text: user.description ?? "此用户尚无自我介绍",
+                                maxLines: 3,
+                                textAlign: TextAlign.start,
+                                overflow: TextOverflow.ellipsis,
+                                emojis: user.emojis,
+                                bigEmojiCode: false,
+                                feature: const [MFMFeature.emojiCode],
+                              ),
                             ),
                           ),
                         ),

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.5.0+37
+version: 0.5.1+38
 
 environment:
   sdk: '>=3.5.0 <4.0.0'