From 830f3b60e09bf3b136785dc76dbdaf195472f889 Mon Sep 17 00:00:00 2001 From: bggRGjQaUbCoE Date: Wed, 17 Dec 2025 13:09:15 +0800 Subject: [PATCH] opt theme Signed-off-by: bggRGjQaUbCoE --- lib/common/widgets/badge.dart | 3 +-- lib/pages/article/widgets/opus_content.dart | 2 +- lib/pages/pgc_review/view.dart | 3 ++- lib/pages/save_panel/view.dart | 3 ++- lib/pages/whisper/widgets/item.dart | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/common/widgets/badge.dart b/lib/common/widgets/badge.dart index bd10cebe5..63f3a3027 100644 --- a/lib/common/widgets/badge.dart +++ b/lib/common/widgets/badge.dart @@ -2,7 +2,6 @@ import 'package:PiliPlus/models/common/badge_type.dart'; import 'package:PiliPlus/utils/extension/string_ext.dart'; import 'package:PiliPlus/utils/extension/theme_ext.dart'; import 'package:flutter/material.dart'; -import 'package:get/get.dart'; class PBadge extends StatelessWidget { final String? text; @@ -60,7 +59,7 @@ class PBadge extends StatelessWidget { bgColor = Colors.black45; color = Colors.white; case PBadgeType.error: - if (Get.isDarkMode) { + if (theme.isDark) { bgColor = theme.errorContainer; color = theme.onErrorContainer; } else { diff --git a/lib/pages/article/widgets/opus_content.dart b/lib/pages/article/widgets/opus_content.dart index 4a3ec66aa..9a285866c 100644 --- a/lib/pages/article/widgets/opus_content.dart +++ b/lib/pages/article/widgets/opus_content.dart @@ -678,7 +678,7 @@ Widget moduleBlockedItem( ModuleBlocked moduleBlocked, double maxWidth, ) { - late final isDarkMode = Get.isDarkMode; + late final isDarkMode = theme.brightness.isDark; BoxDecoration? bgImg() { return moduleBlocked.bgImg == null diff --git a/lib/pages/pgc_review/view.dart b/lib/pages/pgc_review/view.dart index 30175756f..aba240295 100644 --- a/lib/pages/pgc_review/view.dart +++ b/lib/pages/pgc_review/view.dart @@ -3,6 +3,7 @@ import 'package:PiliPlus/pages/pgc_review/child/controller.dart'; import 'package:PiliPlus/pages/pgc_review/child/view.dart'; import 'package:PiliPlus/pages/pgc_review/post/view.dart'; import 'package:PiliPlus/utils/extension/scroll_controller_ext.dart'; +import 'package:PiliPlus/utils/extension/theme_ext.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; @@ -147,7 +148,7 @@ class _PgcReviewPageState extends State '/webview', parameters: { 'url': - 'https://member.bilibili.com/article-text/mobile?theme=${Get.isDarkMode ? 1 : 0}&media_id=${widget.mediaId}', + 'https://member.bilibili.com/article-text/mobile?theme=${theme.brightness.isDark ? 1 : 0}&media_id=${widget.mediaId}', }, ), ), diff --git a/lib/pages/save_panel/view.dart b/lib/pages/save_panel/view.dart index 194447c03..fb9f76c50 100644 --- a/lib/pages/save_panel/view.dart +++ b/lib/pages/save_panel/view.dart @@ -15,6 +15,7 @@ import 'package:PiliPlus/pages/video/introduction/ugc/controller.dart'; import 'package:PiliPlus/pages/video/reply/widgets/reply_item_grpc.dart'; import 'package:PiliPlus/utils/date_utils.dart'; import 'package:PiliPlus/utils/extension/context_ext.dart'; +import 'package:PiliPlus/utils/extension/theme_ext.dart'; import 'package:PiliPlus/utils/image_utils.dart'; import 'package:PiliPlus/utils/platform_utils.dart'; import 'package:PiliPlus/utils/utils.dart'; @@ -510,7 +511,7 @@ class _SavePanelState extends State { padding: const EdgeInsets.all( 3, ), - color: Get.isDarkMode + color: theme.brightness.isDark ? Colors.white : theme.colorScheme.surface, child: PrettyQrView.data( diff --git a/lib/pages/whisper/widgets/item.dart b/lib/pages/whisper/widgets/item.dart index 29de0ac79..d175f18ae 100644 --- a/lib/pages/whisper/widgets/item.dart +++ b/lib/pages/whisper/widgets/item.dart @@ -98,7 +98,7 @@ class WhisperSessionItem extends StatelessWidget { safeArea: true, tileColor: item.isPinned ? theme.colorScheme.onInverseSurface.withValues( - alpha: Get.isDarkMode ? 0.4 : 0.8, + alpha: theme.brightness.isDark ? 0.4 : 0.8, ) : null, onLongPress: onLongPress,