tweaks

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

lib/pages/live_room/contribution_rank/view.dart

@@ -200,7 +200,10 @@ class _Item extends StatelessWidget {
           crossAxisAlignment: .start,
           children: [
             child,
-            MedalWidget.fromMedalInfo(medal: uinfoMedal),
+            MedalWidget.fromMedalInfo(
+              medal: uinfoMedal,
+              padding: MedalWidget.mediumPadding,
+            ),
           ],
         );
       } catch (e, s) {

lib/pages/live_room/controller.dart

@@ -31,6 +31,7 @@ import 'package:PiliPlus/utils/danmaku_utils.dart';
 import 'package:PiliPlus/utils/duration_utils.dart';
 import 'package:PiliPlus/utils/extension/iterable_ext.dart';
 import 'package:PiliPlus/utils/extension/size_ext.dart';
+import 'package:PiliPlus/utils/global_data.dart';
 import 'package:PiliPlus/utils/num_utils.dart';
 import 'package:PiliPlus/utils/platform_utils.dart';
 import 'package:PiliPlus/utils/storage_pref.dart';
@@ -486,7 +487,6 @@ class LiveRoomController extends GetxController {
               name: extra['reply_uname'],
             );
           }
-          final medal = user['medal'];
           addDm(
             DanmakuMsg(
               name: name,
@@ -497,7 +497,9 @@ class LiveRoomController extends GetxController {
               uemote: uemote,
               extra: liveExtra,
               reply: reply,
-              medalInfo: medal == null ? null : UinfoMedal.fromJson(medal),
+              medalInfo: !GlobalData().showMedal || user['medal'] == null
+                  ? null
+                  : UinfoMedal.fromJson(user['medal']),
             ),
             DanmakuContentItem(
               msg,

lib/pages/live_room/superchat/superchat_card.dart

@@ -154,7 +154,10 @@ class _SuperChatCardState extends State<SuperChatCard> {
           spacing: 5,
           children: [
             Flexible(child: name),
-            MedalWidget.fromMedalInfo(medal: medal),
+            MedalWidget.fromMedalInfo(
+              medal: medal,
+              padding: MedalWidget.mediumPadding,
+            ),
           ],
         );
       } catch (e, s) {

lib/pages/live_room/widgets/chat_panel.dart

@@ -63,8 +63,11 @@ class LiveRoomChatPanel extends StatelessWidget {
                   try {
                     medal = WidgetSpan(
                       child: Padding(
-                        padding: const .symmetric(horizontal: 3),
-                        child: MedalWidget.fromMedalInfo(medal: medalInfo),
+                        padding: const .only(right: 4),
+                        child: MedalWidget.fromMedalInfo(
+                          medal: medalInfo,
+                          padding: MedalWidget.mediumPadding,
+                        ),
                       ),
                     );
                   } catch (e, s) {
@@ -78,21 +81,17 @@ class LiveRoomChatPanel extends StatelessWidget {
                   child: Builder(
                     builder: (itemContext) {
                       return Container(
-                        padding: const EdgeInsets.symmetric(
-                          horizontal: 10,
-                          vertical: 4,
-                        ),
+                        padding: const .symmetric(horizontal: 10, vertical: 4),
                         decoration: BoxDecoration(
                           color: bg,
-                          borderRadius: const BorderRadius.all(
-                            Radius.circular(14),
-                          ),
+                          borderRadius: const .all(.circular(14)),
                         ),
                         child: Text.rich(
                           TextSpan(
                             children: [
+                              ?medal,
                               TextSpan(
-                                text: item.name,
+                                text: '${item.name}: ',
                                 style: TextStyle(
                                   color: nameColor,
                                   fontSize: 14,
@@ -107,14 +106,6 @@ class LiveRoomChatPanel extends StatelessWidget {
                                           item,
                                         )),
                               ),
-                              ?medal,
-                              TextSpan(
-                                text: ': ',
-                                style: TextStyle(
-                                  color: nameColor,
-                                  fontSize: 14,
-                                ),
-                              ),
                               if (item.reply case final reply?)
                                 TextSpan(
                                   text: '@${reply.name} ',