tweaks

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

lib/pages/live_room/contribution_rank/view.dart

@@ -9,6 +9,7 @@ import 'package:PiliPlus/models/common/live/live_contribution_rank_type.dart';
 import 'package:PiliPlus/models_new/live/live_contribution_rank/item.dart';
 import 'package:PiliPlus/pages/live_room/contribution_rank/controller.dart';
 import 'package:PiliPlus/pages/member/widget/medal_widget.dart';
+import 'package:PiliPlus/utils/color_utils.dart';
 import 'package:PiliPlus/utils/extension/scroll_controller_ext.dart';
 import 'package:PiliPlus/utils/utils.dart';
 import 'package:flutter/foundation.dart' show kDebugMode;
@@ -228,7 +229,7 @@ class _Item extends StatelessWidget {
                   textScaler: .noScaling,
                   style: TextStyle(
                     fontWeight: FontWeight.bold,
-                    color: Utils.index2Color(index, colorScheme.outline),
+                    color: ColourUtils.index2Color(index, colorScheme.outline),
                     fontSize: 16,
                     fontStyle: FontStyle.italic,
                   ),

lib/pages/live_room/controller.dart

@@ -26,6 +26,7 @@ import 'package:PiliPlus/plugin/pl_player/utils/danmaku_options.dart';
 import 'package:PiliPlus/services/service_locator.dart';
 import 'package:PiliPlus/tcp/live.dart';
 import 'package:PiliPlus/utils/accounts.dart';
+import 'package:PiliPlus/utils/connectivity_utils.dart';
 import 'package:PiliPlus/utils/danmaku_utils.dart';
 import 'package:PiliPlus/utils/duration_utils.dart';
 import 'package:PiliPlus/utils/extension/iterable_ext.dart';
@@ -33,6 +34,7 @@ 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';
+import 'package:PiliPlus/utils/theme_utils.dart';
 import 'package:PiliPlus/utils/utils.dart';
 import 'package:PiliPlus/utils/video_utils.dart';
 import 'package:canvas_danmaku/canvas_danmaku.dart';
@@ -177,7 +179,7 @@ class LiveRoomController extends GetxController {
   }
 
   Future<void> queryLiveUrl({bool autoFullScreenFlag = false}) async {
-    currentQn ??= await Utils.isWiFi
+    currentQn ??= await ConnectivityUtils.isWiFi
         ? Pref.liveQuality
         : Pref.liveQualityCellular;
     final res = await LiveHttp.liveRoomInfo(
@@ -244,7 +246,7 @@ class LiveRoomController extends GetxController {
             onPressed: Get.back,
             child: Text(
               '关闭',
-              style: TextStyle(color: Get.theme.colorScheme.outline),
+              style: TextStyle(color: ThemeUtils.theme.colorScheme.outline),
             ),
           ),
           TextButton(

lib/pages/live_room/superchat/superchat_card.dart

@@ -4,6 +4,7 @@ import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/models_new/live/live_superchat/item.dart';
 import 'package:PiliPlus/pages/member/widget/medal_widget.dart';
+import 'package:PiliPlus/utils/color_utils.dart';
 import 'package:PiliPlus/utils/image_utils.dart';
 import 'package:PiliPlus/utils/page_utils.dart';
 import 'package:PiliPlus/utils/platform_utils.dart';
@@ -135,7 +136,7 @@ class _SuperChatCardState extends State<SuperChatCard> {
   @override
   Widget build(BuildContext context) {
     final item = widget.item;
-    final bottomColor = Utils.parseColor(item.backgroundBottomColor);
+    final bottomColor = ColourUtils.parseColor(item.backgroundBottomColor);
     final border = BorderSide(color: bottomColor);
     void showMenu(TapUpDetails e) => _showMenu(e.globalPosition, item);
 
@@ -144,7 +145,7 @@ class _SuperChatCardState extends State<SuperChatCard> {
       maxLines: 1,
       overflow: .ellipsis,
       style: TextStyle(
-        color: Utils.parseColor(item.userInfo.nameColor),
+        color: ColourUtils.parseColor(item.userInfo.nameColor),
       ),
     );
     if (item.medalInfo case final medal?) {
@@ -175,7 +176,7 @@ class _SuperChatCardState extends State<SuperChatCard> {
           child: Container(
             decoration: BoxDecoration(
               borderRadius: const .vertical(top: .circular(8)),
-              color: Utils.parseColor(item.backgroundColor),
+              color: ColourUtils.parseColor(item.backgroundColor),
               border: Border(top: border, left: border, right: border),
               image: item.backgroundImage == null
                   ? null
@@ -205,7 +206,9 @@ class _SuperChatCardState extends State<SuperChatCard> {
                       Text(
                         "￥${item.price}",
                         style: TextStyle(
-                          color: Utils.parseColor(item.backgroundPriceColor),
+                          color: ColourUtils.parseColor(
+                            item.backgroundPriceColor,
+                          ),
                         ),
                       ),
                     ],
@@ -235,7 +238,7 @@ class _SuperChatCardState extends State<SuperChatCard> {
             child: Text(
               item.message,
               style: TextStyle(
-                color: Utils.parseColor(item.messageFontColor),
+                color: ColourUtils.parseColor(item.messageFontColor),
                 decoration: widget.persistentSC && item.deleted
                     ? .lineThrough
                     : null,

lib/pages/live_room/view.dart

@@ -43,6 +43,7 @@ import 'package:PiliPlus/utils/max_screen_size.dart';
 import 'package:PiliPlus/utils/mobile_observer.dart';
 import 'package:PiliPlus/utils/page_utils.dart';
 import 'package:PiliPlus/utils/platform_utils.dart';
+import 'package:PiliPlus/utils/share_utils.dart';
 import 'package:PiliPlus/utils/storage.dart';
 import 'package:PiliPlus/utils/storage_key.dart';
 import 'package:PiliPlus/utils/utils.dart';
@@ -633,7 +634,7 @@ class _LiveRoomPageState extends State<LiveRoomPage>
               ),
               if (PlatformUtils.isMobile)
                 PopupMenuItem(
-                  onTap: () => Utils.shareText(liveUrl),
+                  onTap: () => ShareUtils.shareText(liveUrl),
                   child: Row(
                     spacing: 10,
                     mainAxisSize: MainAxisSize.min,